From 88ae90eaf990174b57199c060c2265af57cb4f5e Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Tue, 9 Jan 2024 20:41:06 +0800
Subject: [PATCH] 1111

---
 App.vue                      | 81 ++++++++++++++++++------------------
 pages/cloud/optionalCard.vue | 12 ++++--
 pages/home/cloudCard.vue     |  1 +
 pages/home/pickUpCard.vue    |  5 ++-
 pages/home/recordList.vue    |  8 ++--
 pages/home/recordList2.vue   |  8 ++--
 6 files changed, 62 insertions(+), 53 deletions(-)

diff --git a/App.vue b/App.vue
index 9f424f8..737b05f 100644
--- a/App.vue
+++ b/App.vue
@@ -41,46 +41,47 @@
 			
 			
 			this.globalData.navInfo = navParams()
-			let _this = this;
-			wx.login({
-				success: function(res) {
-					uni.request({
-						// 组装请求地址
-						url:_this.globalData.wxSilentLoginURL + "?wxCode=" + res.code,
-						method: "GET",
-						header: {
-							'content-type': "application/x-www-form-urlencoded"
-						},
-						data: {
-							"wxCode": res.code
-						},
-						success: res => {
-							if (res.statusCode == 200) {
-								if (!res.data.success) {
-									if (res.data.code == "110") {
-										// 需要绑定手机号
-										uni.reLaunch({
-											url: '/pages/index/BindPhone?openid=' +
-												res.data.data.wxMpOpenid
-										})
-									} else {
-										// _this.status = 'more'
-									}
-								} else {
-									// 成功后跳转主页
-									_this.globalData.sid = res.data.data.sid
-									console.log("用户sid",_this.globalData.sid)
-								}
-							} else {
-							}
-						},
-						fail: (err) => {
-						}
-					});
-				},
-				fail: function(res) {
-				}
-			});
+			
+			// let _this = this;
+			// wx.login({
+			// 	success: function(res) {
+			// 		uni.request({
+			// 			// 组装请求地址
+			// 			url:_this.globalData.wxSilentLoginURL + "?wxCode=" + res.code,
+			// 			method: "GET",
+			// 			header: {
+			// 				'content-type': "application/x-www-form-urlencoded"
+			// 			},
+			// 			data: {
+			// 				"wxCode": res.code
+			// 			},
+			// 			success: res => {
+			// 				if (res.statusCode == 200) {
+			// 					if (!res.data.success) {
+			// 						if (res.data.code == "110") {
+			// 							// 需要绑定手机号
+			// 							uni.reLaunch({
+			// 								url: '/pages/index/BindPhone?openid=' +
+			// 									res.data.data.wxMpOpenid
+			// 							})
+			// 						} else {
+			// 							// _this.status = 'more'
+			// 						}
+			// 					} else {
+			// 						// 成功后跳转主页
+			// 						_this.globalData.sid = res.data.data.sid
+			// 						console.log("用户sid",_this.globalData.sid)
+			// 					}
+			// 				} else {
+			// 				}
+			// 			},
+			// 			fail: (err) => {
+			// 			}
+			// 		});
+			// 	},
+			// 	fail: function(res) {
+			// 	}
+			// });
 		},
 		onShow: function() {
 			console.log('App Show')
diff --git a/pages/cloud/optionalCard.vue b/pages/cloud/optionalCard.vue
index f62a985..ed30c63 100644
--- a/pages/cloud/optionalCard.vue
+++ b/pages/cloud/optionalCard.vue
@@ -1,6 +1,7 @@
 <template>
 
-	<view style="display: flex;flex-direction: column; height: 100vh;box-sizing: border-box; background-color: #fff;" id="page">
+	<view style="display: flex;flex-direction: column; height: 100vh;box-sizing: border-box; background-color: #fff;"
+		id="page">
 
 		<view class="top">
 			<NavBar ref="nav" navTitle="详情" :showIcon="true" :start-change-height="page.startHeight"
@@ -59,7 +60,8 @@
 								</view>
 
 
-								<text style="color: #AEAEAE;font-size: 14px;margin-top: 5px;line-height: 20px;">{{item.remark}}</text>
+								<text
+									style="color: #AEAEAE;font-size: 14px;margin-top: 5px;line-height: 20px;">{{item.remark}}</text>
 
 								<view
 									style="display: flex;flex-direction: row;justify-content:space-between;margin-top: 5px;">
@@ -82,8 +84,8 @@
 
 
 					</view>
-					
-					
+
+
 
 				</view>
 				<view style="height: 200px;background: #fff; "></view>
@@ -221,6 +223,8 @@
 
 					item.price = Number(item.goodsNumber * item.jprice * item.weight).toFixed(2)
 
+				else
+					item.price = "0"
 			},
 			getweight() {
 
diff --git a/pages/home/cloudCard.vue b/pages/home/cloudCard.vue
index 66ea046..c4681ba 100644
--- a/pages/home/cloudCard.vue
+++ b/pages/home/cloudCard.vue
@@ -191,6 +191,7 @@
 				uni.navigateTo({
 					url: '/pages/cloud/optionalCard'
 				})
+			
 			}
 			
 		}
diff --git a/pages/home/pickUpCard.vue b/pages/home/pickUpCard.vue
index c51207a..7c34242 100644
--- a/pages/home/pickUpCard.vue
+++ b/pages/home/pickUpCard.vue
@@ -25,7 +25,7 @@
 
 		<!-- <view
 			style="display: flex;flex-direction: column;background: #f0f; height: auto; border-top-left-radius: 25px;border-top-right-radius: 25px;margin-top: -9.1vw;"> -->
-		<z-paging ref="paging" v-model="data" :pagingStyle='styleObject' @query="queryList" :refresher-enabled="true">
+		<z-paging ref="paging" v-model="data" :pagingStyle='styleObject' @query="queryList" :refresher-enabled="true" :auto="false">
 
 			<view v-for="(item,index) in data" :key="index"
 				style="display: flex;flex-direction: column;align-items: center;margin-top: 14px; "
@@ -298,6 +298,9 @@
 			this.page.startHeight = info.windowWidth * 0.6
 			this.page.endHeight = info.windowWidth * 0.8
 		},
+		onShow() {
+			this.$refs.paging.reload(true);
+		},
 		onUnload() {
 			uni.$off('order');
 		},
diff --git a/pages/home/recordList.vue b/pages/home/recordList.vue
index 375d565..768b121 100644
--- a/pages/home/recordList.vue
+++ b/pages/home/recordList.vue
@@ -187,10 +187,10 @@
 			}
 		},
 		created() {
-			this.$bus.$on('order', msg => {
-				console.log("aaaaaaaaaaa4", msg)
-				this.$refs.paging.reload(true);
-			});
+			// this.$bus.$on('order', msg => {
+			// 	console.log("aaaaaaaaaaa4", msg)
+			// 	this.$refs.paging.reload(true);
+			// });
 			this.$bus.$on('order2', msg => {
 				console.log("aaaaaaaaaaa4", msg)
 				this.$refs.paging.reload(true);
diff --git a/pages/home/recordList2.vue b/pages/home/recordList2.vue
index 2d01a91..16ea9de 100644
--- a/pages/home/recordList2.vue
+++ b/pages/home/recordList2.vue
@@ -188,10 +188,10 @@
 			}
 		},
 		created() {
-			this.$bus.$on('order', msg => {
-				console.log("aaaaaaaaaaa4", msg)
-				this.$refs.paging.reload(true);
-			});
+			// this.$bus.$on('order', msg => {
+			// 	console.log("aaaaaaaaaaa4", msg)
+			// 	this.$refs.paging.reload(true);
+			// });
 			this.$bus.$on('order2', msg => {
 				console.log("aaaaaaaaaaa4", msg)
 				this.$refs.paging.reload(true);