From e0e379a7764f65785e3ac187137bdac9fb037623 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Wed, 21 Feb 2024 19:40:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/news3/LogisticsInquiry.vue | 59 ++++++++++++-------------
 pages/news3/ManualEntry.vue      | 76 ++++++++++++++++----------------
 2 files changed, 66 insertions(+), 69 deletions(-)

diff --git a/pages/news3/LogisticsInquiry.vue b/pages/news3/LogisticsInquiry.vue
index e1cf13e..5f0ec98 100644
--- a/pages/news3/LogisticsInquiry.vue
+++ b/pages/news3/LogisticsInquiry.vue
@@ -1,26 +1,29 @@
 <template>
 	<view>
-		<view style="width:100%;position: fixed;top:0;z-index:99">
-			<view class="navBarContent">
-				<u-icon name="arrow-left" @click="onBack"
-					style="position: absolute;top:50%;left:40upx;transform: translateY(-50%);" color="#000" size="35">
-				</u-icon>
-				<text>物流查询</text>
-			</view>
-
-		</view>
-		<image :src="$picUrl+'/static/news3/walletBg.png'" mode="widthFix" class="bgImg"></image>
-		<view class="contentDes">
-			<u-field v-model="logisticsNum" label="物流单号" placeholder="请填写物流单号">
-			</u-field>
-			<view class="btnGroup">
-				<view class="btnItem" @click="scanCode">
-					<image :src="$picUrl+'/static/news3/scan.png'" mode="widthFix"></image>
-					<text>扫码识别</text>
+		<view class="bgImg"
+			:style="{ background: `url(${$picUrl+'/static/news3/walletBg.png'})`, 'background-size': 'cover' }">
+			<view style="width:100%;">
+				<view class="navBarContent">
+					<u-icon name="arrow-left" @click="onBack"
+						style="position: absolute;top:50%;left:40upx;transform: translateY(-50%);" color="#000"
+						size="35">
+					</u-icon>
+					<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>
+			<!-- <image :src="$picUrl+'/static/news3/walletBg.png'" mode="widthFix" class="bgImg"></image> -->
+			<view class="contentDes">
+				<u-field v-model="logisticsNum" label="物流单号" placeholder="请填写物流单号">
+				</u-field>
+				<view class="btnGroup">
+					<view class="btnItem" @click="scanCode">
+						<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>
 			</view>
 		</view>
@@ -85,30 +88,24 @@
 		background-color: #F7F8FA;
 		min-height: 100%;
 		padding-bottom: 140upx;
-		padding-top: 130upx;
+		background: linear-gradient(180deg, #FFE4E8 0%, #F7F8FA 40%);
 	}
 
 	.bgImg {
 		width: 100%;
-		height: auto;
-		position: absolute;
-		top: 0;
-		left: 0;
-		z-index: 1;
+		height: 200px;
+		position: relative;
 	}
 
 	.contentDes {
 		position: relative;
 		z-index: 2;
-		margin: 0upx 26upx;
-
+		margin: 26upx;
 		background-color: #fff;
-
 		background: #FFFFFF;
 		border-radius: 6px 6px 6px 6px;
 		opacity: 1;
-		padding: 0 28upx;
-
+		padding: 28upx;
 	}
 
 	.navBarContent {
diff --git a/pages/news3/ManualEntry.vue b/pages/news3/ManualEntry.vue
index 0a3fa77..e4f251b 100644
--- a/pages/news3/ManualEntry.vue
+++ b/pages/news3/ManualEntry.vue
@@ -16,9 +16,9 @@
 			</view>
 		</view>
 		<view class="section">
-			<u-field v-model="form.getPeopleName" label="收货人" placeholder="请输入收货人姓名">
+			<u-field v-model="form.receiver" label="收货人" placeholder="请输入收货人姓名">
 			</u-field>
-			<u-field v-model="form.getPeoplePhone" label="手机号" placeholder="请输入收货人手机号">
+			<u-field v-model="form.receiver_phone" label="手机号" placeholder="请输入收货人手机号">
 			</u-field>
 			<u-field @click="cityShow=true" v-model="form.city" :disabled="true" label="所属城市" placeholder="请选择所属城市"
 				right-icon="arrow-right">
@@ -28,28 +28,28 @@
 				<view class="addrTitle">
 					详细地址
 				</view>
-				<u-input type="textarea" v-model="form.address" placeholder="请输入详细地址"></u-input>
+				<u-input type="textarea" v-model="form.detail" placeholder="请输入详细地址"></u-input>
 			</view>
 		</view>
 		<view class="section">
 			<picker @change="changeMode" mode="selector" range-key="text" :value="index" :range="modeList">
-				<u-field v-model="form.setGoodsMode" :disabled="true" label="发货模式" placeholder="请选择发货模式"
+				<u-field v-model="form.send_type" :disabled="true" label="发货模式" placeholder="请选择发货模式"
 					right-icon="arrow-right">
 				</u-field>
 			</picker>
 			<u-action-sheet :list="modeList" v-model="modeShow"></u-action-sheet>
-			<u-field v-model="form.setGoodsCompany" label="发货公司" placeholder="请输入发货公司">
+			<u-field v-model="form.send_company" label="发货公司" placeholder="请输入发货公司">
 			</u-field>
-			<u-field v-model="form.setGoodsName" label="发货人" placeholder="请输入发货人">
+			<u-field v-model="form.sender" label="发货人" placeholder="请输入发货人">
 			</u-field>
-			<u-field v-model="form.setGoodsPhone" label="发货人电话" placeholder="请输入发货人电话">
+			<u-field v-model="form.send_phone" label="发货人电话" placeholder="请输入发货人电话">
 			</u-field>
 			<picker @change="changeOption" mode="selector" range-key="express_name" :value="index" :range="expressList">
-				<u-field v-model="form.logisticsName" :disabled="true" label="物流公司" placeholder="请选择物流公司"
+				<u-field v-model="form.express_name" :disabled="true" label="物流公司" placeholder="请选择物流公司"
 					right-icon="arrow-right">
 				</u-field>
 			</picker>
-			<u-field v-model="form.logisticsNo" label="物流单号" placeholder="请输入物流单号">
+			<u-field v-model="form.express_no" label="物流单号" placeholder="请输入物流单号">
 			</u-field>
 		</view>
 		<view class="recordList">
@@ -101,19 +101,19 @@
 					shopModel: '',
 					shopNum: null,
 					auto: '',
-					getPeopleName: '',
-					getPeoplePhone: '',
+					receiver: '',
+					receiver_phone: '',
 					city: null,
-					address: '',
-					setGoodsMode: null,
-					setGoodsCompany: '',
-					setGoodsName: '',
-					setGoodsPhone: '',
-					logisticsName: '',
-					logisticsId:'',
-					logisticsNo: '',
-					transferImgId: '',
-					chatImgId: ''
+					detail: '',
+					send_type: null,
+					send_company: '',
+					sender: '',
+					send_phone: '',
+					express_name: '',
+					express_id:'',
+					express_no: '',
+					transfer_image_id: '',
+					chat_image_id: ''
 				},
 				content: '',
 				modeList: [{
@@ -148,9 +148,9 @@
 						if (res.status) {
 							let data = res.data.detail
 							this.form.city = data.region.province + data.region.city + data.region.region;
-							this.form.getPeopleName = data.name
-							this.form.getPeoplePhone = data.phone
-							this.form.address = data.detail
+							this.form.receiver = data.name
+							this.form.receiver_phone = data.phone
+							this.form.detail = data.detail
 							console.log(data)
 							uni.showToast({
 								title: '识别成功',
@@ -176,37 +176,37 @@
 				if (!that.form.shopNum) {
 					return that.$toast('请输入商品数量')
 				}
-				if (!that.form.getPeopleName) {
+				if (!that.form.receiver) {
 					return that.$toast('请输入收货人姓名')
 				}
-				if (!that.form.getPeoplePhone) {
+				if (!that.form.receiver_phone) {
 					return that.$toast('请输入收货人手机号')
 				}
 				if (!that.form.city) {
 					return that.$toast('请选择所属城市')
 				}
-				if (!that.form.address) {
+				if (!that.form.detail) {
 					return that.$toast('请输入详细地址')
 				}
-				if (!that.form.setGoodsMode) {
+				if (!that.form.send_type) {
 					return that.$toast('请选择发货模式')
 				}
-				if (!that.form.setGoodsCompany) {
+				if (!that.form.send_company) {
 					return that.$toast('请输入发货公司')
 				}
-				if (!that.form.setGoodsName) {
+				if (!that.form.sender) {
 					return that.$toast('请输入发货人')
 				}
-				if (!that.form.setGoodsPhone) {
+				if (!that.form.send_phone) {
 					return that.$toast('请输入发货电话号')
 				}
 				if (!that.form.express_name) {
 					return that.$toast('请选择物流公司')
 				}
-				if (!that.form.logisticsNo) {
+				if (!that.form.express_no) {
 					return that.$toast('请输入物流单号')
 				}
-				if (!that.form.transferImgId) {
+				if (!that.form.transfer_image_id) {
 					return that.$toast('请上传转账记录')
 				}
 				let params = {
@@ -214,12 +214,12 @@
 				}
 			},
 			changeMode(e) {
-				this.form.setGoodsMode = this.modeList[e.detail.value].text;
+				this.form.send_type = this.modeList[e.detail.value].text;
 			},
 			// 选择物流
 			changeOption(e) {
-				this.form.logisticsName = this.expressList[e.detail.value].express_name;
-				this.form.logisticsId = this.expressList[e.detail.value].express_id
+				this.form.express_name = this.expressList[e.detail.value].express_name;
+				this.form.express_id = this.expressList[e.detail.value].express_id
 			},
 			/**
 			 * 物流
@@ -247,7 +247,7 @@
 						uni.showToast({
 							title: "上传成功"
 						})
-						this.form.transferImgId = response.data.fileInfo.file_id
+						this.form.transfer_image_id = response.data.fileInfo.file_id
 					}
 				}
 			},
@@ -262,7 +262,7 @@
 							title: "上传成功"
 						})
 						console.log(response.data.fileInfo.file_id)
-						this.form.chatImgId = response.data.fileInfo.file_id
+						this.form.chat_image_id = response.data.fileInfo.file_id
 					}
 				}
 			},