From 0158518387ea32e75a9f72e3c60055878570e15f Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 06 六月 2024 11:55:01 +0800
Subject: [PATCH] feat:客户转发提交两次错误
---
pages/customer-page/customer-index/customer-index.vue | 81 ++++++++++++++++++++++++++++++++++------
1 files changed, 69 insertions(+), 12 deletions(-)
diff --git a/pages/customer-page/customer-index/customer-index.vue b/pages/customer-page/customer-index/customer-index.vue
index 3f52405..0f4f814 100644
--- a/pages/customer-page/customer-index/customer-index.vue
+++ b/pages/customer-page/customer-index/customer-index.vue
@@ -2,9 +2,22 @@
<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="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/customerbanner.png') no-repeat;background-size:contain">
+ </view>
+ <!-- 鑷富閰嶉�佺晫闈� -->
+ <view class="self-deliver">
+ <view class="self-deliver_text">
+ 鍒涘缓鏃ヨ鍒掕鍗�
+ </view>
+ <view class="self-deliver_btn">
+ <u-button text="鍘诲垱寤�"
+ type="primary"
+ shape="cirle"
+ @click="selfDeliver"></u-button>
+ </view>
</view>
<view style="position: relative;top: -120px;">
<u-empty mode="data"
@@ -30,18 +43,26 @@
<text>/{{ item.carNum }}</text>
</view>
</view>
+ <view class="second-line"
+ style="width: 94%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
+ v-if="item.orderType==='鍐呴攢'||item.orderType==='澶栬喘'">
+ {{item.customerName}}
+ </view>
<view class="second-line">
<view class="coal-name">
- <view class="">{{ item.coalName }}</view>
+ <view class="">{{ item.productName }}</view>
<view class="black-bar"></view>
<view class="coal-type"
v-if="item.orderType">{{ item.orderType }}</view>
</view>
</view>
+ <view class="second-line">
+ {{item.orderCode}}
+ </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="width: 24rpx;height: 24rpx;li ne-height: 24rpx;background: url('https://mx.jzeg.cn:9096/appimg/image/banner/clock.png') no-repeat;background-size: cover">
</view>
</view>
<view class="send-date">{{ item.sendDate }}</view>
@@ -83,7 +104,7 @@
size="40"></u-icon></view>
</view>
<view class="second">
- <view class="coal-name">{{ item.coalName || '' }}</view>
+ <view class="coal-name">{{ item.coalName || item.productName }}</view>
<view class="order-type">{{ item.orderType || '' }}</view>
</view>
<view class="third">
@@ -106,7 +127,7 @@
<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="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://mx.jzeg.cn:9096/appimg/image/banner/clock.png') no-repeat;background-size: cover">
</view>
</view>
<view class="senddate">{{ item.sendDate }}</view>
@@ -114,7 +135,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="width: 26rpx;height: 26rpx;line-height: 26rpx;background: url('https://mx.jzeg.cn:9096/appimg/image/banner/carnNUm.png') no-repeat;background-size: cover;">
</view>
</view>
<view class="senddate">{{ item.orderCode }}</view>
@@ -200,8 +221,8 @@
total: 0,
// 鏄惁鏄剧ず鏇村鏁版嵁
showMoreData: false,
- cars2: "",
- carNum: "",
+ cars2: "", //棰嗗彇鏃ヨ鍒掔殑杞︽暟
+ carNum: "", //鏃ヨ鍒掔殑鎬昏溅鏁�
// 鍓╀綑鐨勬彁鐓ゅ崟鏁伴噺
carNumSurplus: '',
canClick: false,
@@ -219,7 +240,7 @@
// 鑾峰彇鍙戣繍璁″垝鍒楄〃
GetOrderPlan() {
uni.showLoading({ title: '鍔犺浇涓�...' });
- this.$reqGet('GetOrderPlan').then(res => {
+ this.$reqGet('GetOrderPlan',{orderType:"澶栬喘"}).then(res => {
if (res.data) {
this.orderPlanData = res.data;
uni.hideLoading();
@@ -260,6 +281,7 @@
}, []);
return arrays;
},
+ //棰嗗彇寮规
popupDetermineClick() {
if (this.receiveNum > 0) {
this.popupDetermineClickLoading = true;
@@ -318,7 +340,7 @@
this.$u.toast('宸茶秴杩囧綋鍓嶆棩璁″垝鎻愮叅鍗曟暟閲�,璇烽噸鏂拌緭鍏�')
}
},
- // 鎻愮叅鍗曡鎯�
+ // 锛堥《閮級鍙戣繍璁″垝璇︽儏
cardBodyClick(v) {
uni
.navigateTo({ url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&code=${v.code}&cars2=${v.cars2}` });
@@ -334,6 +356,12 @@
if (obj.cars2 == 0) return this.$u.toast('璇峰厛棰嗗彇鍚庡啀杞彂');
uni
.navigateTo({ url: `/pages/public-page/forward/forward?orderPlanId=${obj.id}&carNumSurplus1=${obj.carNumSurplus1}&carNum=${obj.carNum}&cars2=${obj.cars2}` });
+ },
+ // 鑷富閰嶉��
+ selfDeliver() {
+ uni.navigateTo({
+ url: '/pages/customer-page/addDailyPlan/addDailyPlan'
+ })
}
}
};
@@ -341,11 +369,40 @@
<style lang="scss"
scoped>
+
@mixin flex {
display: flex;
justify-content: space-between;
align-items: center;
}
+ // 鑷富閰嶉��
+ .self-deliver {
+ position: relative;
+ top: vww(-150);
+ width: 88%;
+ height: vww(50);
+ margin: vww(8) auto;
+ padding: 0 vww(8);
+ background: #ffffff;
+ box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
+ border-radius: 20rpx;
+ @include flex;
+
+
+ }
+ /deep/.u-button {
+ width: 100%;
+ height: 28px !important;
+ line-height: 40px;
+ padding: 0 12px;
+ font-size: 28rpx;
+ font-weight: 300;
+ color: #ffffff;
+ background: #497bfb !important;
+ letter-spacing: 4rpx;
+ border-radius: 37rpx 37rpx 37rpx 37rpx !important;
+ box-shadow: 2rpx 3rpx 13rpx 0rpx rgba(43, 98, 239, 0.5), 0rpx 0rpx 9rpx 0rpx rgba(247, 250, 253, 0.29);
+ }
.wait-collection {
width: 100%;
@@ -481,7 +538,7 @@
.collection-form-item {
width: 690rpx;
- height: 300rpx;
+ height: 370rpx;
background: #ffffff;
box-shadow: 4rpx 6rpx 25rpx 0rpx rgba(73, 120, 240, 0.15);
border-radius: 20rpx;
@@ -684,4 +741,4 @@
}
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.1