From 70b448c6c1ceee396296bc4191354719305edda2 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Mon, 4 Mar 2024 15:30:06 +0800
Subject: [PATCH] =?UTF-8?q?=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/goods/detail.vue            | 19 +++++--------
 pages/news/recycling/confirm1.vue |  4 +--
 pages/news/recycling/order.vue    |  8 +++---
 pages/order/detail.vue            | 47 +++++++++++++++++++++++++++++--
 pages/user/index.vue              |  3 +-
 5 files changed, 58 insertions(+), 23 deletions(-)

diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index 96e7cc5..3f38321 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -553,12 +553,12 @@
 		methods: {
 			getprice(e) {
 				console.log(e)
-				let params={
-					secondPrice:e.secondPrice,
-					startTime:e.startTime,
-					endTime:e.endTime,
-					secondQuota:e.secondQuota,
-					quotaNum:e.quotaNum
+				let params = {
+					secondPrice: e.secondPrice,
+					startTime: e.startTime,
+					endTime: e.endTime,
+					secondQuota: e.secondQuota,
+					quotaNum: e.quotaNum
 				}
 				GoodsApi.editGoodsPrice(params).then(res => {
 						if (res.status == 200) {
@@ -587,11 +587,6 @@
 						.catch(reject)
 				})
 			},
-
-			// 更新购物车数量
-			onAddCart(total) {
-				this.getCartTotal()
-			},
 			//修改商品价格
 			async toUnpdatePrice() {
 				const that = this;
@@ -780,7 +775,7 @@
 			},
 			// 更新购物车数量
 			onAddCart(total) {
-				console.log(total)
+				this.getCartTotal()
 			},
 			choseSku(skuMode) {
 				console.log(this.goods)
diff --git a/pages/news/recycling/confirm1.vue b/pages/news/recycling/confirm1.vue
index 76aff03..578961e 100644
--- a/pages/news/recycling/confirm1.vue
+++ b/pages/news/recycling/confirm1.vue
@@ -336,8 +336,8 @@
 				}
 				if (i == 2) { //导航
 					uni.openLocation({
-						latitude: this.storeInfo.latitude,
-						longitude: this.storeInfo.longitude,
+						latitude: Number(this.storeInfo.latitude),
+						longitude: Number(this.storeInfo.longitude),
 						complete: function(res) {
 							console.log(res);
 						}
diff --git a/pages/news/recycling/order.vue b/pages/news/recycling/order.vue
index ccd7f7c..71ef8cb 100644
--- a/pages/news/recycling/order.vue
+++ b/pages/news/recycling/order.vue
@@ -118,7 +118,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="order-bd">
+		<view class="order-bd" v-if="infor.remake">
 			<view class="b" style="margin-top: 0;">
 				<view class="item">
 					<view class="l">留言：</view>
@@ -127,7 +127,7 @@
 			</view>
 		</view>
 		<view class="order-fd" v-if="infor.order_status==10">
-			<view class="a">
+			<view class="a" @click="openPage(1)">
 				联系商家
 			</view>
 			<view class="b" @click="reservation">
@@ -220,8 +220,8 @@
 				}
 				if (i == 2) { //导航
 					uni.openLocation({
-						latitude: this.infor.shop_info.latitude,
-						longitude: this.infor.shop_info.longitude,
+						latitude: Number(this.infor.shop_info.latitude),
+						longitude: Number(this.infor.shop_info.longitude),
 						complete: function(res) {}
 					});
 				}
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 71bde21..1908af0 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -222,8 +222,10 @@
 			</view>
 			<view class="amount">
 				<view class="share">
-					<image src="/static/order/share.png" mode=""></image>
-					分享
+					<button open-type="share">
+						<image src="/static/order/share.png" mode=""></image>
+						分享
+					</button>
 				</view>
 				<view class="sp">
 
@@ -401,6 +403,7 @@
 				canReset: false,
 				cdDia: false,
 				menushow: false,
+				Store:''
 			}
 		},
 		/**
@@ -413,6 +416,7 @@
 			this.orderId = orderId
 			// 获取当前订单信息
 			this.getOrderDetail()
+			this.Store=uni.getStorageSync('Store')
 			// 注册全局事件订阅: 是否刷新当前订单数据
 			uni.$on('syncRefresh', (val, isCur) => {
 				if (!isCur) {
@@ -428,7 +432,27 @@
 			this.canReset && this.getOrderDetail()
 			this.canReset = false
 		},
-
+		onShareAppMessage(res) {
+			return {
+				title: this.Store.storeInfo.store_name,
+				path: "pages/order/detail?orderId="+this.orderId, //这是打开后的跳转路径
+				imageUrl:this.Store.storeInfo.image_url,
+				 success: function(res){
+				          // 转发成功之后的回调
+				          if(res.errMsg == 'shareAppMessage:ok'){
+							  this.$toast('分享成功')
+				          }
+				        },
+				        fail: function(){
+				          // 转发失败之后的回调
+				          if(res.errMsg == 'shareAppMessage:fail cancel'){
+				             this.$toast('取消分享')
+				          }else if(res.errMsg == 'shareAppMessage:fail'){
+				            this.$toast('分享失败')
+				          }
+				        }
+			}
+		},
 		methods: {
 			// 联系商家
 			callStore(phone) {
@@ -1125,6 +1149,23 @@
 					margin-right: 14rpx;
 				}
 
+				button {
+					background: none !important;
+					border: none !important;
+					padding: 0;
+					line-height: 34rpx;
+					height: 34rpx;
+					font-size: 24rpx;
+					font-family: PingFang SC,
+						PingFang SC;
+					font-weight: 400;
+
+				}
+
+				button:after {
+					border: none !important;
+				}
+
 				height: 34rpx;
 				font-size: 24rpx;
 				font-family: PingFang SC,
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 2f79101..dc39f44 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -14,8 +14,7 @@
 					</view>
 					<button class="avatar-wrapper" v-else type="primary" open-type="chooseAvatar"
 						@chooseavatar="onChooseAvatar">
-						<!-- <button class="avatar-wrapper" v-else @click="onChooseAvatar"> -->
-						<text lines="1" class="text-group_1">{{userInfo.nick_name}}3</text>
+						<text lines="1" class="text-group_1">{{userInfo.nick_name}}</text>
 						<image :src="$picUrl+'/static/user/weChat.png'" class="thumbnail_1"></image>
 					</button>
 					<view class="text-wrapper_1" v-if="isLogin" @click="wechatLogin">