From af52af22c80d9e76d1ee4e18c0a031c97fad095b Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Wed, 31 Jul 2024 15:12:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81=E6=9F=A5=E8=AF=A2=20?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E4=BA=A7=E5=93=81=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/change/change.vue   | 25 +++++++++++++++++--------
 packages/myorder/myorder.vue | 23 ++++++++++++++++++++---
 packages/product/public.vue  | 11 +++++++++--
 pages/home/home.vue          | 10 ++++++++++
 pages/talk/talk.vue          | 16 ++++++++++++++--
 5 files changed, 70 insertions(+), 15 deletions(-)

diff --git a/packages/change/change.vue b/packages/change/change.vue
index ad0ea9e..5003ff7 100644
--- a/packages/change/change.vue
+++ b/packages/change/change.vue
@@ -6,10 +6,9 @@
 		<view class="formSystem">
 			<view class="systemtop">
 				<view class="systemtitle">蟹太太提货系统</view>
-				<view class="systemtext">
-					<text>2024年提货已开放!</text>
-					<text>自2024年<text class="colorOrange">9月25日</text>起 至2024年<text
-							class="colorOrange">12月15日</text></text>
+				<view class="systemtext" v-if="showHelp">
+					<text style="width: 70%;margin: 0 auto;margin-top: 20rpx;">该产品于<text class="colorOrange">{{openDate}}</text>至<text
+							class="colorOrange">{{endDate}}</text>可提货</text>
 				</view>
 			</view>
 			<view class="formChange">
@@ -54,7 +53,10 @@
 						trigger: 'change'
 					}]
 				},
-				dateFalse:'',
+				dateFalse:'',
+				showHelp:false,
+				openDate:'',
+				endDate:''
 			};
 		},
 		onLoad() {
@@ -76,8 +78,15 @@
 					let today = this.$moment().format('YYYY-MM-DD')
 					console.log(today,open_date,this.$moment(today).isBefore(open_date))
 					if(open_date){
+						this.openDate = this.$moment(res.card.sku.open).format('YYYY年MM月DD日')
+						this.endDate = this.$moment(res.card.sku.end).format('YYYY年MM月DD日')
+						this.showHelp = true
 						if(this.$moment(today).isBefore(open_date)){
-							toast(this.dateFalse+'，请于'+open_date+'再次提货',4000)
+							if(!isNull(res.card.sku.help)){
+								toast(res.card.sku.help,4000)
+							}else{
+								toast(this.dateFalse,4000)
+							}
 							return
 						}
 					}
@@ -143,7 +152,7 @@
 	.systemtop {
 		padding-top: 80rpx;
 		text-align: center;
-		padding-bottom: 58rpx;
+		padding-bottom: 38rpx;
 		border-bottom: 1rpx dashed #a4a5a4;
 		position: relative;
 		margin-bottom: 80rpx;
@@ -173,7 +182,7 @@
 		font-size: 36rpx;
 		font-weight: 700;
 		color: #b98b44;
-		margin-bottom: 25rpx;
+		/* margin-bottom: 25rpx; */
 	}
 
 	.systemtext text {
diff --git a/packages/myorder/myorder.vue b/packages/myorder/myorder.vue
index 0253bf0..c2ba2d3 100644
--- a/packages/myorder/myorder.vue
+++ b/packages/myorder/myorder.vue
@@ -44,7 +44,7 @@
 						</view>
 						<view class="ordertab">
 							<!--  -->
-							<text class="deleteorder" @click="copyText(item.express_number)" v-if="item.status==1">物流查询</text>
+							<text class="deleteorder" @click="copyText(item)" v-if="item.status==1">物流查询</text>
 							<text class="deleteorder" @click="edit(item)" v-if="item.status===0">修改</text>
 							<text class="orderinform" @click="copyText(item,'send')">通知收件人</text>
 						</view>
@@ -143,7 +143,7 @@
 				if(type=='send'){
 					message = `${item.contact}先生/女士，您兑换的${item.sku.name}（${item.sku.specs}）将于${item.send_date}发货，请保持电话${item.mobile}畅通。`
 				}else{
-					message = item
+					message = item.express_number
 				} 
 				uni.setClipboardData({
 					data: message,
@@ -158,8 +158,25 @@
 							uni.showToast({
 								title: '单号复制成功',
 								icon: 'none',
-								duration: 2000
+								duration: 2000,
 							});
+							if(item.express_type.appid){
+								setTimeout(function(){
+									uni.navigateToMiniProgram({
+									    appId: item.express_type.appid, // 小程序appid
+									    path: '', // 打开的页面路径，若为空则打开首页
+									    extraData: {
+									        // 需要传递给小程序的数据
+									    },
+									    success(res) {
+									        // 打开成功的回调
+									    },
+									    fail(err) {
+									        // 打开失败的回调
+									    }
+									})
+								},2000)
+							}
 						}
 					},
 					fail: function(e) {
diff --git a/packages/product/public.vue b/packages/product/public.vue
index a3dcb80..53f03f8 100644
--- a/packages/product/public.vue
+++ b/packages/product/public.vue
@@ -15,7 +15,7 @@
 				<view class="exchange-brief">
 					<view class="qrCodebox">
 						<view class="codeimg">
-							<image show-menu-by-longpress src="../../static/ewmimg.jpg" mode="widthFix"></image>
+							<image show-menu-by-longpress :src="img" mode="widthFix"></image>
 						</view>
 					</view>
 					<text class="taphold">长按扫码即可关注</text>
@@ -44,9 +44,16 @@
 	export default{
 		data(){
 			return{
-				
+				img:''
 			}
 		},
+		onLoad(){
+			const banner4 = uni.getStorageSync('banner4')?uni.getStorageSync('banner4'):[]
+			if(banner4.length>0){
+				this.img = banner4[0].image
+			}
+			
+		},
 		methods:{
 			toHome(){
 				uni.switchTab({
diff --git a/pages/home/home.vue b/pages/home/home.vue
index eea39b0..d37c913 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -172,6 +172,16 @@
 					})
 					uni.setStorageSync('banner3',_arr)
 				}
+				// 客服二维码
+				let _arr1 = []
+				if(res.banner4.length>0){
+					res.banner4.map(item=>{
+						_arr1.push({
+							image:item.upfile_url
+						})
+					})
+					uni.setStorageSync('banner4',_arr1)
+				}
 				// 文字信息
 				uni.setStorageSync('configs',res.config)
 			},
diff --git a/pages/talk/talk.vue b/pages/talk/talk.vue
index 60de598..c7a19cb 100644
--- a/pages/talk/talk.vue
+++ b/pages/talk/talk.vue
@@ -11,7 +11,7 @@
 				</view>
 				<view class="qrCodebox">
 					<view class="codeimg">
-						<image show-menu-by-longpress src="../../static/ewmimg.jpg" mode="widthFix"></image>
+						<image show-menu-by-longpress :src="img" mode="widthFix"></image>
 					</view>
 				</view>
 				<view class="textbottom">长按扫码添加企业微信</view>
@@ -27,7 +27,19 @@
 	export default {
 		components: {
 			tabbar
-		}
+		},
+		data(){
+			return{
+				img:''
+			}
+		},
+		onLoad(){
+			const banner4 = uni.getStorageSync('banner4')?uni.getStorageSync('banner4'):[]
+			if(banner4.length>0){
+				this.img = banner4[0].image
+			}
+			
+		},
 	}
 </script>
 <style type="text/css" scoped>