From 971e1fa03492e34e67edd6346f442d120fbe5343 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期五, 14 七月 2023 16:21:31 +0800
Subject: [PATCH] 展示字段和样式修改

---
 pages/customer-page/customer-index/customer-index.vue |   67 +++++++++++++++++++--------------
 1 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/pages/customer-page/customer-index/customer-index.vue b/pages/customer-page/customer-index/customer-index.vue
index 37f6ad4..b5e121c 100644
--- a/pages/customer-page/customer-index/customer-index.vue
+++ b/pages/customer-page/customer-index/customer-index.vue
@@ -2,9 +2,9 @@
 	<view class="">
 		<view class="customer-index">
 			<view class="customer-index-body">
-				<!-- 寰呴鍙栧拰杞彂鎻愮叅鍗� -->
+				<!-- 寰呴鍙栧拰杞彂閫氱煡鍗� -->
 				<view class="wait-collection"
-					style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/customerbanner.png') no-repeat;background-size:contain">
+					:style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/customerbanner.png)`, backgroundSize: 'contain', backgroundRepeat: 'no-repeat' }">
 				</view>
 				<view style="position: relative;top: -120px;">
 					<u-empty mode="data"
@@ -22,7 +22,8 @@
 							<view class="dispatch-receive">
 								<view class="dispatch">{{ item.filedName||'' }}</view>
 							</view>
-							<view class="point-number">
+							<view class="point-number"
+								v-if="roleType == 1">
 								<text class="residue">{{ item.cars2||'' }}</text>
 								<text>/{{ item.carNum ||''}}</text>
 							</view>
@@ -36,17 +37,17 @@
 							</view>
 						</view>
 						<view class="third-line">
-							<view class="time-icon">
+							<!-- <view class="time-icon">
 								<view
-									style="width: 24rpx;height: 24rpx;li ne-height: 24rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/carNO.png') no-repeat;background-size: cover">
+									:style="{backgroundImage: `url(${onlineurl}/appimg/image/banner/carNO.png)`,backgroundSize: 'cover',backgroundRepeat: 'no-repeat',width:'24rpx',height:'24rpx',lineHeight:'24rpx'}">
 								</view>
-							</view>
-							<view class="car-num">{{ item.carNos||''}}</view>
+							</view> -->
+							<view class="car-num">{{ item.code||''}}</view>
 						</view>
 						<view class="third-line">
 							<view class="time-icon">
 								<view
-									style="width: 24rpx;height: 24rpx;li ne-height: 24rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clock.png') no-repeat;background-size: cover">
+									:style="{backgroundImage: `url(${onlineurl}/appimg/image/banner/clock.png)`,backgroundSize: 'cover',backgroundRepeat: 'no-repeat',width:'24rpx',height:'24rpx',lineHeight:'24rpx'}">
 								</view>
 							</view>
 							<view class="send-date">{{ item.sendDate }}</view>
@@ -62,18 +63,18 @@
 								v-if="item.orderType!=='澶栬喘'">
 								<view class="button-image">杞彂</view>
 							</view>
-							<view class="forward"
+							<!-- <view class="forward"
 								@click.stop="validateClick(index)"
 								v-if='roleType===4'>
 								<view class="button-image">楠岃川</view>
-							</view>
+							</view> -->
 						</view>
 					</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"
@@ -110,14 +111,14 @@
 										v-else-if="roleType == 2">{{ item.carNumSurplus }}</view>
 								</view>
 								<view class="third-line">
-									<view class="third-line_text">鎻愮叅鍗曚釜鏁�:</view>
+									<view class="third-line_text">閫氱煡鍗曚釜鏁�:</view>
 									<view class="third-line_num">{{ item.tmCount }}</view>
 								</view>
 							</view>
 							<view class="fourth">
 								<view class="fourth-icon">
 									<view
-										style="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clock.png') no-repeat;background-size: cover">
+										:style="{backgroundImage: `url(${onlineurl}/appimg/image/banner/clock.png)`,backgroundSize: 'cover',backgroundRepeat: 'no-repeat',width:'24rpx',height:'24rpx',lineHeight:'24rpx'}">
 									</view>
 								</view>
 								<view class="senddate">{{ item.sendDate }}</view>
@@ -125,7 +126,7 @@
 							<view class="fourth">
 								<view class="fourth-icon">
 									<view
-										style="width: 26rpx;height: 26rpx;line-height: 26rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/carnNUm.png') no-repeat;background-size: cover;">
+										:style="{backgroundImage: `url(${onlineurl}/appimg/image/banner/carnNUm.png)`,backgroundSize: 'cover',backgroundRepeat: 'no-repeat',width:'26rpx',height:'26rpx',lineHeight:'26rpx'}">
 									</view>
 								</view>
 								<view class="senddate">{{ item.orderCode }}</view>
@@ -161,7 +162,7 @@
 </template>
 
 <script>
-	import card from '@/components/card/card.vue';
+	import { onlineurl } from '@/api/request.js'
 	import combinedTitle from '@/components/combined-title/combined-title.vue';
 	import { customerId } from '@/utils/status';
 	export default {
@@ -172,7 +173,6 @@
 			}
 		},
 		components: {
-			card,
 			combinedTitle
 		},
 		watch: {
@@ -187,12 +187,12 @@
 		computed: {
 			roleType() {
 				return uni.getStorageSync('roleType');
-			}
+			},
 		},
 		data() {
 			return {
 				orderPlanData: [],
-				show: false, // 棰嗗彇鎻愮叅鍗曞脊鍑烘
+				show: false, // 棰嗗彇閫氱煡鍗曞脊鍑烘
 				receiveNum: null,
 				getOrderNum: {
 					num: '',
@@ -212,9 +212,10 @@
 				showMoreData: false,
 				cars2: "",
 				carNum: "",
-				// 鍓╀綑鐨勬彁鐓ゅ崟鏁伴噺
+				// 鍓╀綑鐨勯�氱煡鍗曟暟閲�
 				carNumSurplus: '',
-				canClick: false
+				canClick: false,
+				onlineurl: ''
 			};
 		},
 		onLoad() {},
@@ -225,6 +226,7 @@
 			init() {
 				this.GetOrderPlan();
 				this.getJhOrderPlanDataPage();
+				this.onlineurl = onlineurl;
 			},
 			// 鑾峰彇鍙戣繍璁″垝鍒楄〃
 			GetOrderPlan() {
@@ -236,7 +238,7 @@
 					}
 				});
 			},
-			// 鑾峰彇鍘嗗彶鎻愮叅鍗�
+			// 鑾峰彇鍘嗗彶閫氱煡鍗�
 			getJhOrderPlanDataPage() {
 				uni.showLoading({
 					title: '鍔犺浇涓�'
@@ -261,7 +263,7 @@
 				this.pageCurrent++;
 				this.getJhOrderPlanDataPage();
 			},
-			//fix 鐐瑰嚮鎻愮叅鍗曡繑鍥炰細澧炲姞閲嶅鏁版嵁
+			//fix 鐐瑰嚮閫氱煡鍗曡繑鍥炰細澧炲姞閲嶅鏁版嵁
 			ArrSet(Arr, id) {
 				var obj = {};
 				const arrays = Arr.reduce((setArr, item) => {
@@ -309,7 +311,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
 			},
@@ -322,15 +324,15 @@
 				console.log('杈撳叆妗�', e);
 				this.canClick = e > (this.carNum - this.cars2)
 				if (this.canClick) {
-					this.$u.toast('宸茶秴杩囧綋鍓嶆棩璁″垝鎻愮叅鍗曟暟閲�,璇烽噸鏂拌緭鍏�')
+					this.$u.toast('宸茶秴杩囧綋鍓嶆棩璁″垝閫氱煡鍗曟暟閲�,璇烽噸鏂拌緭鍏�')
 				}
 			},
-			// 鎻愮叅鍗曡鎯�
+			// 閫氱煡鍗曡鎯�
 			cardBodyClick(v) {
 				uni
-					.navigateTo({ url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&code=${v.code}&cars2=${v.cars2}` });
+					.navigateTo({ url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&code=${v.code}&cars2=${v.cars2?v.cars2:""}` });
 			},
-			// 鐐瑰嚮鍘嗗彶鎻愮叅鍗曡幏鍙栬鎯�
+			// 鐐瑰嚮鍘嗗彶閫氱煡鍗曡幏鍙栬鎯�
 			faYundetail(v) {
 				uni.navigateTo({
 					url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&cars2=${v.cars2}&coalName=${v.coalName}&deptName=${v.deptName}`
@@ -345,7 +347,7 @@
 			// 楠岃川
 			validateClick(index) {
 				uni
-					.navigateTo({ url: `/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail?index=${index}` });
+					.navigateTo({ url: `/pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan?index=${index}` });
 			},
 		}
 	};
@@ -590,10 +592,17 @@
 						}
 
 						.car-num {
+							color: #515151;
 							white-space: nowrap;
 							overflow: hidden;
 							text-overflow: ellipsis;
 						}
+
+						.time-icon {
+							width: 24rpx;
+							height: 24rpx;
+							line-height: 24rpx;
+						}
 					}
 
 					.fourth-line {

--
Gitblit v1.9.1