From f8867b8df117d1ac0f1311970994e15059c3da03 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 05 九月 2024 15:57:36 +0800
Subject: [PATCH] add 兼容扫码问题

---
 pages/user/supplier-user.vue |   61 +++++++++++++++++++++++-------
 1 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/pages/user/supplier-user.vue b/pages/user/supplier-user.vue
index 8c2da6b..a247935 100644
--- a/pages/user/supplier-user.vue
+++ b/pages/user/supplier-user.vue
@@ -100,14 +100,16 @@
 						<view>待付款</view>
 					</view>
 					<view class="order-icons" @click="goto('/pages/order/order?status=SEND',true)">
-						<image src="../../static/images/customer/order/order-type-2.png" class="order-icon dfh" style="position: relative;">
+						<image src="../../static/images/customer/order/order-type-2.png" class="order-icon dfh"
+							style="position: relative;">
 							<view class="image-shop-number" v-if="tj_order.sendCount">{{tj_order.sendCount||''}}</view>
 
 						</image>
 						<view>待发货</view>
 					</view>
 					<view class="order-icons" @click="goto('/pages/order/order?status=RECEIVE',true)">
-						<image src="../../static/images/customer/order/order-type-3.png" class="order-icon dsh" style="position: relative;">
+						<image src="../../static/images/customer/order/order-type-3.png" class="order-icon dsh"
+							style="position: relative;">
 							<view class="image-shop-number" v-if="tj_order.receiveCount">{{tj_order.receiveCount||''}}
 							</view>
 
@@ -115,7 +117,8 @@
 						<view>待收货</view>
 					</view>
 					<view class="order-icons" @click="goto('/pages/order/order?status=EVALUATE',true)">
-						<image src="../../static/images/customer/order/order-type-4.png" class="order-icon dpj" style="position: relative;">
+						<image src="../../static/images/customer/order/order-type-4.png" class="order-icon dpj"
+							style="position: relative;">
 							<view class="image-shop-number" v-if="tj_order.evaluateCount">{{tj_order.evaluateCount||''}}
 							</view>
 
@@ -123,9 +126,11 @@
 						<view>待评价</view>
 					</view>
 					<view class="order-icons" @click="goto('/pages/order/order-sale/order-sale',true)">
-						<image src="../../static/images/customer/order/order-type-5.png" class="order-icon sh" style="position: relative;">
+						<image src="../../static/images/customer/order/order-type-5.png" class="order-icon sh"
+							style="position: relative;">
 							<view class="image-shop-number" v-if="tj_order.salesPendingCount">
-								{{tj_order.salesPendingCount||''}}</view>
+								{{tj_order.salesPendingCount||''}}
+							</view>
 
 						</image>
 						<view>售后</view>
@@ -166,16 +171,24 @@
 						</image>
 						<view>新手帮助</view>
 					</view>
-					<!-- 			<view class="service-icons" @click.stop="$meesage.showToast('敬请期待')">
-						<image src="../../static/images/customer/service/service-icon-6.png" class="t2 service-icon ">
+					<view class="service-icons" @click="goto('/sub_pages/customer/self/feedback',true)">
+						<image src="../../static/images/customer/service/service-icon-7.png" class="t2 service-icon ">
 						</image>
-						<view>运费详查</view>
-					</view> -->
+						<view>投诉反馈</view>
+					</view>
+					<!-- #ifdef PUB_CUSTOMER_DEV -->
+					<view class="service-icons" @click="goto('/sub_pages/customer/coupon/coupon-self',true)">
+						<image src="../../static/images/customer/service/service-icon-8.png" class="t2 service-icon ">
+						</image>
+						<view>优惠券</view>
+					</view>
 
-					<view class="service-icons"></view>
-
-					<view class="service-icons"></view>
-					<view class="service-icons"></view>
+					<view class="service-icons" @click="goto('/sub_pages/customer/coupon/good-self',true)">
+						<image src="../../static/images/customer/service/service-icon-9.png" class="t2 service-icon ">
+						</image>
+						<view>兑换券</view>
+					</view>
+					<!-- #endif -->
 				</view>
 			</view>
 		</view>
@@ -244,6 +257,13 @@
 					<uni-icons type="right"></uni-icons>
 				</view>
 			</view>
+
+			<!-- <view class="user-util m-t-12 flex" @click="goto('/sub_pages/partner/delivery/delivery-detail',true)">
+				<view class="title">debug</view>
+				<view class="right-icon">
+					<uni-icons type="right"></uni-icons>
+				</view>
+			</view> -->
 			<view class="user-util m-t-12 flex" v-if="currentInfo&&currentInfo.id"
 				@click="goto('/pages/user/user-bind-wx/user-bind-wx',true)">
 				<view class="title">绑定当前微信</view>
@@ -251,6 +271,13 @@
 					<uni-icons type="right"></uni-icons>
 				</view>
 			</view>
+			<!-- 	<view class="user-util m-t-12 flex" @click="goto('/sub_pages/customer/self/feedback',true)">
+				<view class="title">投诉反馈</view>
+				<view class="right-icon">
+					<uni-icons type="right"></uni-icons>
+				</view>
+			</view> -->
+
 			<!-- v-if="selftype==='customer'" -->
 			<view class="user-util m-t-12 flex" @click="clearlogout">
 				<view class="title">退出登录</view>
@@ -258,6 +285,10 @@
 					<uni-icons type="right"></uni-icons>
 				</view>
 			</view>
+
+
+
+
 
 			<view class="user-util m-t-12 " v-if="selftype==='supplier'||selftype==='customer' || !selftype">
 				<view class="title">我的客服</view>
@@ -287,7 +318,7 @@
 
 
 		<!-- #ifdef PUB_CUSTOMER -->
-		<view style="padding-bottom:200rpx">
+		<view style="padding-bottom:140rpx">
 		</view>
 		<common-footer flg="3"></common-footer>
 
@@ -459,7 +490,7 @@
 					success: async function(res) {
 						console.log('条码内容:' + res.result);
 						if (!res.result) {
-							that.$message.showToast('未识别出合伙人信息,如果是微信小程序二维码,请微信扫码打开')
+							that.$message.showToast('未识别出合伙人信息,请用微信扫码打开')
 							return
 						}
 						var dto = undefined

--
Gitblit v1.9.3