From 00267b4ddebbefba7ed6d802b26210317373badb Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Thu, 22 Feb 2024 17:36:20 +0800
Subject: [PATCH] =?UTF-8?q?=E9=92=B1=E5=8C=85=20=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=BB=86=E8=8A=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/news/user/rechargeList.vue          |  5 +-
 pages/news1/wallet.vue                    | 42 ++++++++-----
 pages/news3/LogisticsDetails.vue          | 76 +++++++----------------
 pages/news3/LogisticsInquiry.vue          | 53 ++++++----------
 pages/news3/ManualEntry.vue               | 45 ++++++++------
 pages/news3/seasoningCondimentsRecord.vue | 59 ++++++++++++------
 pages/news3/setOutRecords.vue             | 46 +++++++-------
 7 files changed, 161 insertions(+), 165 deletions(-)

diff --git a/pages/news/user/rechargeList.vue b/pages/news/user/rechargeList.vue
index e682695..be8aa94 100644
--- a/pages/news/user/rechargeList.vue
+++ b/pages/news/user/rechargeList.vue
@@ -12,10 +12,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="empty" v-if="list.length==0">
-			<image :src="$picUrl+'/static/news1/walletEmpty.png'" mode="widthFix"></image>
-			<text>暂无数据显示哦～</text>
-		</view>
+		<u-empty text="暂无数据显示哦～" v-if="list.length==0" mode="list"></u-empty>
 	</view>
 </template>
 
diff --git a/pages/news1/wallet.vue b/pages/news1/wallet.vue
index 5c9f6e2..ea32ef8 100644
--- a/pages/news1/wallet.vue
+++ b/pages/news1/wallet.vue
@@ -1,7 +1,8 @@
 <template>
 	<view class="wallet">
 		<view>
-			<u-navbar title="我的钱包" :background="background" title-color="#fff"></u-navbar>
+			<u-navbar title="我的钱包" :border-bottom="false" :background="background" title-color="#fff"
+				back-icon-color='#fff'></u-navbar>
 		</view>
 		<image :src="$picUrl+'/static/news1/walletBg.png'" class="bgImg" mode="widthFix"></image>
 		<view class="walletContainer">
@@ -9,7 +10,9 @@
 				<view class="yue" @click="introShow=true">余额说明</view>
 				<view class="accountNum">
 					<text>账户余额</text>
-					<view style="margin-left: 5px;" @click="isEye=!isEye"><u-icon :name="isEye?'eye':'eye-off'" color="#652F17" size="34"></u-icon></view>
+					<view style="margin-left: 5px;" @click="isEye=!isEye">
+						<u-icon :name="isEye?'eye':'eye-off'" color="#652F17" size="34"></u-icon>
+					</view>
 				</view>
 				<view class="walletHandle">
 					<text>{{isEye?infor.balance:'****'}}</text>
@@ -72,8 +75,9 @@
 				</view>
 			</view>
 			<u-picker mode="time" v-model="timeShow" :params="timeParams" @confirm="getTime"></u-picker>
-			<u-dropdown class="dropdownStyle" ref="dropdown1" height="100" active-color="#FE422B" @open="dropOpen"
-				@close="dropClose">
+			<!-- menu-icon='/static/shai.png' menu-icon-size='30' active-color="#464646" -->
+			<u-dropdown class="dropdownStyle" ref="dropdown1" height="100" title-size='28' active-color="#464646"
+				@open="dropOpen" @close="dropClose">
 				<u-dropdown-item title="属性" @update:modelValue="open()">
 					<view class="slot-content">
 						<view class="slotItem">
@@ -112,10 +116,7 @@
 					<view class="a">{{item.money}}</view>
 				</view>
 			</view>
-			<view class="empty" v-else>
-				<image :src="$picUrl+'/static/news1/walletEmpty.png'" mode="widthFix"></image>
-				<text>暂无数据显示哦～</text>
-			</view>
+			<u-empty text="暂无数据显示哦～" v-else  mode="list"></u-empty>
 		</view>
 		<u-popup v-model="introShow" mode="center" border-radius="12">
 			<view class="introContent">
@@ -139,7 +140,7 @@
 					background: 'url(' + img + ') center top no-repeat',
 					backgroundSize: '100% auto',
 				},
-				isEye:true,
+				isEye: true,
 				OrderType: 0,
 				timeShow: false,
 				timeParams: {
@@ -185,7 +186,7 @@
 				this.OrderType = 999
 			},
 			dropClose() {
-				this.OrderType =''
+				this.OrderType = ''
 				this.getBalance('')
 			},
 			onRecharge() {
@@ -273,6 +274,7 @@
 		.wallet {
 			height: 100%;
 			position: relative;
+			background-color: #fff;
 
 			.bgImg {
 				width: 100%;
@@ -515,18 +517,18 @@
 
 						.btn {
 							flex: 1;
-							height: 100rpx;
-							line-height: 100rpx;
+							line-height: 85upx;
 							text-align: center;
 							font-size: 26rpx;
-							border: none !important;
+							// border: none !important;
+							width: 260rpx;
+							height: 85upx
 						}
 
 						.resetBtn {
-							background-color: #F3F4F6;
+							background-color: #fff;
 							border-radius: 29px 29px 29px 29px;
-							opacity: 1;
-							// border: 1px solid #F3F4F6;
+							border: 1px solid #DDDDDD;
 							color: #222;
 						}
 
@@ -541,6 +543,10 @@
 				}
 			}
 
+			::v-deep .uni-button:after {
+				border: none !important;
+			}
+
 			::v-deep .u-dropdown__menu {
 				height: 100upx !important;
 			}
@@ -703,12 +709,14 @@
 				font-size: 28rpx;
 				font-weight: 400;
 				color: #595959;
+				margin: 0 6rpx;
 			}
 
 			.b {
 				font-size: 26rpx;
 				font-weight: 400;
 				color: #A3A3A3;
+				margin: 0 6rpx;
 			}
 		}
 
@@ -720,12 +728,14 @@
 				font-size: 40rpx;
 				font-weight: 500;
 				color: #414141;
+				margin: 0 6rpx;
 			}
 
 			.b {
 				font-size: 28rpx;
 				font-weight: 400;
 				color: #A3A3A3;
+				margin: 0 6rpx;
 			}
 		}
 	}
diff --git a/pages/news3/LogisticsDetails.vue b/pages/news3/LogisticsDetails.vue
index 19a2a75..141a280 100644
--- a/pages/news3/LogisticsDetails.vue
+++ b/pages/news3/LogisticsDetails.vue
@@ -1,28 +1,20 @@
 <template>
-	<view class="bg_style">
-		<view class="bgImg">
-			<view style="width:100%;position:sticky;">
-				<view class="navBarContent">
-					<u-icon name="arrow-left" @click="onBack"
-						style="position: absolute;top:50%;left:16px;transform: translateY(-50%);" color="#000"
-						size="35"></u-icon>
-					<text>物流信息</text>
+	<view class="park">
+		<view class="park-navbar">
+			<u-navbar title="物流信息" :border-bottom="false" :background="background"></u-navbar>
+		</view>
+		<view class="logis-box">
+			<image src="/static/default-logo.png" alt=""></image>
+			<view class="logis-pany">
+				<view class="logis-text">
+					<text>物流公司：</text>{{logisticsItem.express_name}}
 				</view>
-			</view>
-			<view class="logis-box">
-				<image src="/static/default-logo.png" alt=""></image>
-				<view class="logis-pany">
-					<view class="logis-text">
-						<text>物流公司：</text>{{logisticsItem.express_name}}
-					</view>
-					<view class="logis-text">
-						<text>物流单号：</text>{{logisticsItem.express_no}}<text
-							style="color: #FF6565; font-size:15px;margin-left: 20px;" @click="copy">复制</text>
-					</view>
+				<view class="logis-text">
+					<text>物流单号：</text>{{logisticsItem.express_no}}<text
+						style="color: #FF6565; font-size:15px;margin-left: 20px;" @click="copy">复制</text>
 				</view>
 			</view>
 		</view>
-		<!-- 物流轨迹 -->
 		<view class="logis-detail" v-if="logisticsItem">
 			<view class="logis-item" :class="{ first: index === 0 }" v-for="(item, index) in logisticsItem.items"
 				:key="index">
@@ -32,14 +24,11 @@
 					</view>
 					<view class="logis-item-content__time">
 						<text class="f-22">{{ item.time }}</text>
-					</view>
 				</view>
+					</view>
 			</view>
 		</view>
-		<view class="empty" v-else>
-			<image :src="$picUrl+'/static/news1/walletEmpty.png'" mode="widthFix"></image>
-			<text>暂无物流信息～</text>
-		</view>
+		<u-empty text="暂无物流信息～" v-else mode="list"></u-empty>
 	</view>
 </template>
 
@@ -48,6 +37,10 @@
 	export default {
 		data() {
 			return {
+				background: {
+					background: `url(${this.$picUrl}/static/news/login-bg.png) center top no-repeat`,
+					backgroundSize: '100%',
+				},
 				traces: [],
 				logisticsItem: ''
 			};
@@ -108,40 +101,13 @@
 		padding-bottom: 40upx;
 	}
 
-	.bg_style {
+	.park {
 		width: 100%;
 		background: url(https://www.royaum.com.cn/static/news/login-bg.png) center 0 no-repeat;
 		background-size: 100% auto;
 		min-height: 100vh;
 	}
 
-	.all-details {
-		width: 100%;
-		font-size: 14px;
-		text-align: center;
-	}
-
-	.navBarContent {
-		height: 140upx;
-		line-height: 140upx;
-		text-align: center;
-		position: relative;
-
-		text {
-			font-size: 32upx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			color: #000;
-		}
-
-	}
-
-	.bgImg {
-		width: 100%;
-		height: 160px;
-		position: relative;
-	}
-
 	// 物流轨迹
 	.logis-box {
 		width: 100%;
@@ -223,6 +189,7 @@
 			}
 		}
 	}
+
 	.empty {
 		display: flex;
 		flex-direction: column;
@@ -230,7 +197,8 @@
 		justify-content: center;
 		width: 100%;
 		height: 400rpx;
-	   background-color: #fff;
+		background-color: #fff;
+
 		image {
 			width: 114rpx;
 			height: auto;
diff --git a/pages/news3/LogisticsInquiry.vue b/pages/news3/LogisticsInquiry.vue
index 01a5a3b..3dd1a70 100644
--- a/pages/news3/LogisticsInquiry.vue
+++ b/pages/news3/LogisticsInquiry.vue
@@ -1,27 +1,19 @@
 <template>
-	<view class="bg_style">
-		<view class="bgImg">
-			<view style="width:100%;">
-				<view class="navBarContent">
-					<u-icon name="arrow-left" @click="onBack"
-						style="position: absolute;top:50%;left:16px;transform: translateY(-50%);" color="#000"
-						size="35">
-					</u-icon>
-					<text>物流查询</text>
+	<view class="park">
+		<view class="park-navbar">
+			<u-navbar title="物流查询" :border-bottom="false" :background="background"></u-navbar>
+		</view>
+		<view class="contentDes">
+			<u-field v-model="logisticsNum" label="物流单号" placeholder="请填写物流单号">
+			</u-field>
+			<view class="btnGroup">
+				<view class="btnItem" @click="scanCode" style="margin-right:35px;">
+					<image :src="$picUrl+'/static/news3/scan.png'" mode="widthFix"></image>
+					<text>扫码识别</text>
 				</view>
-			</view>
-			<view class="contentDes">
-				<u-field v-model="logisticsNum" label="物流单号" placeholder="请填写物流单号">
-				</u-field>
-				<view class="btnGroup">
-					<view class="btnItem" @click="scanCode" style="margin-right:35px;">
-						<image :src="$picUrl+'/static/news3/scan.png'" mode="widthFix"></image>
-						<text>扫码识别</text>
-					</view>
-					<view class="btnItem" style="margin-left:66upx;" @click="getClipboardData">
-						<image :src="$picUrl+'/static/news3/copy.png'" mode="widthFix"></image>
-						<text>粘贴单号</text>
-					</view>
+				<view class="btnItem" style="margin-left:66upx;" @click="getClipboardData">
+					<image :src="$picUrl+'/static/news3/copy.png'" mode="widthFix"></image>
+					<text>粘贴单号</text>
 				</view>
 			</view>
 		</view>
@@ -35,6 +27,10 @@
 	export default {
 		data() {
 			return {
+				background: {
+					background: `url(${this.$picUrl}/static/news/login-bg.png) center top no-repeat`,
+					backgroundSize: '100%',
+				},
 				logisticsNum: '',
 			};
 		},
@@ -89,24 +85,15 @@
 
 	}
 
-	.bg_style {
+	.park {
 		width: 100%;
 		background: url(https://www.royaum.com.cn/static/news/login-bg.png) center 0 no-repeat;
 		background-size: 100% auto;
 		min-height: 100vh;
 	}
 
-	.bgImg {
-		width: 100%;
-		height: 180px;
-		position: relative;
-	}
-
 	.contentDes {
-		position: relative;
-		z-index: 2;
 		margin: 0upx 26upx;
-
 		background-color: #fff;
 
 		background: #FFFFFF;
@@ -132,7 +119,7 @@
 	}
 
 	::v-deep .u-field {
-		padding: 30upx 10upx;
+		padding: 45rpx 28upx !important;
 	}
 
 	.btnGroup {
diff --git a/pages/news3/ManualEntry.vue b/pages/news3/ManualEntry.vue
index d5efccb..18785c0 100644
--- a/pages/news3/ManualEntry.vue
+++ b/pages/news3/ManualEntry.vue
@@ -1,5 +1,5 @@
 <template>
-	<view style="padding-bottom: 60rpx;">
+	<view style="padding-bottom: 200rpx;">
 		<view class="section">
 			<u-field v-model="form.goods_name" label="商品名称" placeholder="请输入商品名称">
 			</u-field>
@@ -64,7 +64,7 @@
 					:file-list="transferList" :custom-btn="true" max-count="6">
 					<template v-slot:addBtn>
 						<view class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
-							<image src="/static/news/icon-upload.png"></image>
+							<image :src="$picUrl+'/static/news/icon-upload.png'"></image>
 							<view class="1">上传图片</view>
 						</view>
 					</template>
@@ -78,15 +78,18 @@
 					:file-list="chatList" :custom-btn="true" max-count="6">
 					<template v-slot:addBtn>
 						<view class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
-							<image src="/static/news/icon-upload.png"></image>
+							<image :src="$picUrl+'/static/news/icon-upload.png'"></image>
 							<view class="1">上传图片</view>
 						</view>
 					</template>
 				</u-upload>
 			</view>
 		</view>
-		<view class="footerBtn" @click="onSubmit">
+	<!-- 	<view class="footerBtn" @click="onSubmit">
 			提交
+		</view> -->
+		<view class="goods-fd">
+			<view class="btn" @click="onSubmit">提交</view>
 		</view>
 	</view>
 </template>
@@ -467,22 +470,28 @@
 		}
 	}
 
-	.footerBtn {
-		width: 86%;
-		height: 88upx;
-		background: #FF5050;
-		border-radius: 36px 36px 36px 36px;
-		opacity: 1;
-		font-size: 28upx;
-		font-family: PingFang SC, PingFang SC;
-		font-weight: 500;
-		color: #FFFFFF;
-		line-height: 88upx;
-		text-align: center;
-		margin: 76upx auto 0upx auto;
+	.goods-fd {
+		width: 100%;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		padding: 0.9375rem;
+		z-index: 99;
+		background-color: #fafafa;
+		box-sizing: border-box;
 
+		.btn {
+			width: 630rpx;
+			line-height: 88rpx;
+			background: #F34A40;
+			border-radius: 88rpx;
+			text-align: center;
+			font-size: 28rpx;
+			font-weight: 500;
+			color: #FFFFFF;
+			margin: auto;
+		}
 	}
-
 	.c {
 		padding-top: 20rpx;
 		overflow: hidden;
diff --git a/pages/news3/seasoningCondimentsRecord.vue b/pages/news3/seasoningCondimentsRecord.vue
index 74b8e65..72b50d0 100644
--- a/pages/news3/seasoningCondimentsRecord.vue
+++ b/pages/news3/seasoningCondimentsRecord.vue
@@ -1,5 +1,5 @@
 <template>
-	<view style="padding-bottom: 42rpx;">
+	<view style="padding-bottom: 200rpx;">
 		<view class="selectContent" style="border:none;background-color: #fff;">
 			<picker @change="changeMode" mode="selector" range-key="text" :value="index" :range="modeList">
 				<u-field v-model="send_name" :disabled="true" label="发货模式" placeholder="请选择发货模式"
@@ -36,7 +36,7 @@
 						:custom-btn="true" max-count="6">
 						<template v-slot:addBtn>
 							<view class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
-								<image src="/static/news/icon-upload.png"></image>
+								<image :src="$picUrl+'/static/news/icon-upload.png'"></image>
 								<view class="1">上传图片</view>
 							</view>
 						</template>
@@ -50,7 +50,7 @@
 						@on-remove="onRemoveChat" height="180" :file-list="chatList" :custom-btn="true" max-count="6">
 						<template v-slot:addBtn>
 							<view class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
-								<image src="/static/news/icon-upload.png"></image>
+								<image :src="$picUrl+'/static/news/icon-upload.png'"></image>
 								<view class="1">上传图片</view>
 							</view>
 						</template>
@@ -58,8 +58,8 @@
 				</view>
 			</view>
 		</view>
-		<view class="footerBtn" @click="onSubmit">
-			保存
+		<view class="goods-fd">
+			<view class="btn" @click="onSubmit">保存</view>
 		</view>
 	</view>
 </template>
@@ -386,22 +386,43 @@
 			}
 		}
 	}
+	.goods-fd {
+		width: 100%;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		padding: 0.9375rem;
+		z-index: 99;
+		background-color: #fafafa;
+		box-sizing: border-box;
 
-	.footerBtn {
-		width: 86%;
-		height: 88upx;
-		background: #FF5050;
-		border-radius: 36px 36px 36px 36px;
-		opacity: 1;
-		font-size: 28upx;
-		font-family: PingFang SC, PingFang SC;
-		font-weight: 500;
-		color: #FFFFFF;
-		line-height: 88upx;
-		text-align: center;
-		margin: 42upx auto 0 auto;
-
+		.btn {
+			width: 630rpx;
+			line-height: 88rpx;
+			background: #F34A40;
+			border-radius: 88rpx;
+			text-align: center;
+			font-size: 28rpx;
+			font-weight: 500;
+			color: #FFFFFF;
+			margin: auto;
+		}
 	}
+	// .footerBtn {
+	// 	width: 86%;
+	// 	height: 88upx;
+	// 	background: #FF5050;
+	// 	border-radius: 36px 36px 36px 36px;
+	// 	opacity: 1;
+	// 	font-size: 28upx;
+	// 	font-family: PingFang SC, PingFang SC;
+	// 	font-weight: 500;
+	// 	color: #FFFFFF;
+	// 	line-height: 88upx;
+	// 	text-align: center;
+	// 	margin: 42upx auto 0 auto;
+
+	// }
 
 	.c {
 		padding-top: 20rpx;
diff --git a/pages/news3/setOutRecords.vue b/pages/news3/setOutRecords.vue
index 6db54fe..2097561 100644
--- a/pages/news3/setOutRecords.vue
+++ b/pages/news3/setOutRecords.vue
@@ -48,12 +48,9 @@
 				</view>
 			</view>
 		</view>
-		<view class="empty" v-else>
-			<image :src="$picUrl+'/static/news1/walletEmpty.png'" mode="widthFix"></image>
-			<text>暂无物流信息～</text>
-		</view>
-		<view class="footerBtns" @click="manualEntry">
-			手动录入
+		<u-empty v-else text="暂无发货记录～" mode="list"></u-empty>
+		<view class="goods-fd">
+			<view class="btn" @click="manualEntry">手动录入</view>
 		</view>
 	</view>
 </template>
@@ -338,29 +335,36 @@
 		width: 180upx;
 	}
 
-	.footerBtns {
-		width: 86%;
-		height: 88upx;
-		background: #F55349;
-		border-radius: 6px;
-		opacity: 1;
-		font-size: 28upx;
-		font-family: PingFang SC, PingFang SC;
-		font-weight: 500;
-		color: #FFFFFF;
-		line-height: 88upx;
-		text-align: center;
+	.goods-fd {
+		width: 100%;
 		position: fixed;
-		bottom: 20rpx;
-		left: 7%;
+		left: 0;
+		bottom: 0;
+		padding: 0.9375rem;
+		z-index: 99;
+		background-color: #fafafa;
+		box-sizing: border-box;
+
+		.btn {
+			width: 630rpx;
+			line-height: 88rpx;
+			background: #F34A40;
+			border-radius: 88rpx;
+			text-align: center;
+			font-size: 28rpx;
+			font-weight: 500;
+			color: #FFFFFF;
+			margin: auto;
+		}
 	}
+
 	.empty {
 		display: flex;
 		flex-direction: column;
 		align-items: center;
 		justify-content: center;
 		width: 100%;
-	
+
 		image {
 			width: 114rpx;
 			height: auto;