From 8422538299124a3897a45f53d43b091f3880f99b Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 23 七月 2024 17:11:55 +0800
Subject: [PATCH] feat:h5 小程序打包上传

---
 pages/customer-page/customer-index/customer-index.vue |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pages/customer-page/customer-index/customer-index.vue b/pages/customer-page/customer-index/customer-index.vue
index 1baa345..0de4f52 100644
--- a/pages/customer-page/customer-index/customer-index.vue
+++ b/pages/customer-page/customer-index/customer-index.vue
@@ -3,7 +3,7 @@
 		<view class="customer-index">
 			<view class="customer-index-body">
 				
-				<!-- 寰呴鍙栧拰杞彂鎻愮叅鍗� -->
+				<!-- 寰呴鍙栧拰杞彂鏀跺彂鍗� -->
 				<view class="wait-collection"
 					style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/customerbanner.png') no-repeat;background-size:contain">
 				</view>
@@ -45,7 +45,7 @@
 						</view>
 						<view class="second-line"
 							style="width: 94%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
-							v-if="item.orderType==='鍐呴攢'||item.orderType==='澶栬喘'">
+							v-if="item.orderType==='鍐呴攢'||item.orderType==='澶栬喘' || item.orderType==='澶栬喘閫�'">
 							{{item.customerName}}
 						</view>
 						<view class="second-line">
@@ -80,9 +80,9 @@
 					</view>
 				</view>
 
-				<!-- 鍘嗗彶鎻愮叅鍗� -->
+				<!-- 鍘嗗彶鏀跺彂鍗� -->
 				<view class="history-numbers">
-					<combined-title title="鍘嗗彶鎻愮叅鍗�"></combined-title>
+					<combined-title title="鍘嗗彶鏀跺彂鍗�"></combined-title>
 					<scroll-view :scroll-top="scrollTop"
 						scroll-y="true"
 						class="scroll-Y"
@@ -203,7 +203,7 @@
 		data() {
 			return {
 				orderPlanData: [],
-				show: false, // 棰嗗彇鎻愮叅鍗曞脊鍑烘
+				show: false, // 棰嗗彇鏀跺彂鍗曞脊鍑烘
 				receiveNum: null,
 				getOrderNum: {
 					num: '',
@@ -223,7 +223,7 @@
 				showMoreData: false,
 				cars2: "",  //棰嗗彇鏃ヨ鍒掔殑杞︽暟
 				carNum: "",  //鏃ヨ鍒掔殑鎬昏溅鏁�
-				// 鍓╀綑鐨勬彁鐓ゅ崟鏁伴噺
+				// 鍓╀綑鐨勬敹鍙戝崟鏁伴噺
 				carNumSurplus: '',
 				canClick: false,
 				popupDetermineClickLoading: false
@@ -247,7 +247,7 @@
 					}
 				});
 			},
-			// 鑾峰彇鍘嗗彶鎻愮叅鍗�
+			// 鑾峰彇鍘嗗彶鏀跺彂鍗�
 			getJhOrderPlanDataPage() {
 				uni.showLoading({
 					title: '鍔犺浇涓�'
@@ -272,7 +272,7 @@
 				this.pageCurrent++;
 				this.getJhOrderPlanDataPage();
 			},
-			//fix 鐐瑰嚮鎻愮叅鍗曡繑鍥炰細澧炲姞閲嶅鏁版嵁
+			//fix 鐐瑰嚮鏀跺彂鍗曡繑鍥炰細澧炲姞閲嶅鏁版嵁
 			ArrSet(Arr, id) {
 				var obj = {};
 				const arrays = Arr.reduce((setArr, item) => {
@@ -324,7 +324,7 @@
 			 */
 			receiveClick(item) {
 				this.show = true;
-				this.getOrderNum.id = item.id; // 鑾峰彇棰嗗彇鎻愮叅鍗曠殑id
+				this.getOrderNum.id = item.id; // 鑾峰彇棰嗗彇鏀跺彂鍗曠殑id
 				this.cars2 = item.cars2
 				this.carNum = item.carNum
 			},
@@ -337,7 +337,7 @@
 				console.log('杈撳叆妗�', e);
 				this.canClick = e > (this.carNum - this.cars2)
 				if (this.canClick) {
-					this.$u.toast('宸茶秴杩囧綋鍓嶆棩璁″垝鎻愮叅鍗曟暟閲�,璇烽噸鏂拌緭鍏�')
+					this.$u.toast('宸茶秴杩囧綋鍓嶆棩璁″垝鏀跺彂鍗曟暟閲�,璇烽噸鏂拌緭鍏�')
 				}
 			},
 			// 锛堥《閮級鍙戣繍璁″垝璇︽儏
@@ -345,10 +345,10 @@
 				uni
 					.navigateTo({ url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&code=${v.code}&cars2=${v.cars2}` });
 			},
-			// 鐐瑰嚮鍘嗗彶鎻愮叅鍗曡幏鍙栬鎯�
+			// 鐐瑰嚮鍘嗗彶鏀跺彂鍗曡幏鍙栬鎯�
 			faYundetail(v) {
 				uni.navigateTo({
-					url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&cars2=${v.cars2}&productNames=${v.productNames}&deptName=${v.deptName}`
+					url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&cars2=${v.cars2}&productNames=${v.productNames || v.productName}&deptName=${v.deptName}`
 				});
 			},
 			// 杞彂

--
Gitblit v1.9.1