From 040acd447439dc98536281414a6d43a54b00719d Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期五, 09 八月 2024 13:34:42 +0800
Subject: [PATCH] feat:发版
---
pages/public-page/forward/forward.vue | 63 +++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 17 deletions(-)
diff --git a/pages/public-page/forward/forward.vue b/pages/public-page/forward/forward.vue
index 3362eb1..3b13d74 100644
--- a/pages/public-page/forward/forward.vue
+++ b/pages/public-page/forward/forward.vue
@@ -15,7 +15,7 @@
<u-notice-bar :text="text"
:fontSize="30"></u-notice-bar>
<view class="notice-icon"
- style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/notice.png') no-repeat;background-size: cover; width: 42rpx;height: 42rpx;">
+ style="background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/notice.png') no-repeat;background-size: cover; width: 42rpx;height: 42rpx;">
</view>
</view>
<view v-else-if="roleType == 2"
@@ -88,15 +88,21 @@
:hairline="false"
@click.stop="addForm"
:disabled="whetherClick"></u-button></view>
+ <!--鍒嗕韩鏃ヨ鍒� -->
+ <view
+ class="AdddBtn" v-if="isshow"><u-button text="鍒嗕韩鏃ヨ鍒�"
+ :hairline="false"
+ open-type="share"
+ :loading='loading'></u-button></view>
<!-- 鎻愪氦鎸夐挳 -->
<view
- @click.stop="submitForm"
class="forwardBtn"><u-button text="鎻愪氦"
:hairline="false"
type="warning"
@click.stop="submitForm"
:disabled="whetherClick1"
:loading='loading'></u-button></view>
+
</view>
<!-- 澧炲姞鎸夐挳 -->
@@ -154,6 +160,8 @@
export default {
onLoad(params) {
console.log(params, '杞彂椤甸潰鐨勫弬鏁�');
+ let reg=RegExp(/閿�/)
+ this.isshow=!reg.test(params.orderType)
// 瀹㈡埛
this.cars2 = Number(params.cars2);
this.tempcarNumSurplus1 = this.carNumSurplus1 = Number(params.carNumSurplus1 || 0);
@@ -169,12 +177,26 @@
}
this.getOrderPlan()
},
+ onShareAppMessage(res) {
+ 銆�銆�if (res.from === 'button') {// 鏉ヨ嚜椤甸潰鍐呭垎浜寜閽�
+ 銆�銆�銆�銆�console.log(res.target)
+ 銆�銆�}
+ 銆�銆�return {
+ 銆�銆�銆�銆�title: '鍒嗕韩鏃ヨ鍒�',
+ 銆�銆�銆�銆�path: 'pages/driver-page/delivery-my/delivery-my/delivery-my?'+ `id=${this.orderPlanId}`
+ 銆�銆�}
+
+ },
+
+
data() {
return {
+ isshow:false,
forwardSurplus: 0,
paramsName: {},
- huoDaiData: [], //璐т唬Data
- fleetData: [], //杞﹂槦Data
+ huoDaiData: [],
+ isClickFlag:true,// true 鍙互 or false for forward and back to the direction of the car direction (default
+ fleetData: [],
// 鏃ヨ鍒抜d
orderPlanId: '',
jhOrderPlanForwardList: [{ //杞彂瀵硅薄
@@ -192,7 +214,7 @@
selectPopupShow: false,
list1: [{ name: '杞﹂槦' }, { name: '璐т唬' }],
tabHuoDai: false,
- carNumSurplus1: '', //鍓╀綑鐨勬彁鐓ゅ崟鏁伴噺锛堣浆鍙戠殑鏁伴噺 - 棰嗗彇鐨勬暟閲忥級
+ carNumSurplus1: '', //鍓╀綑鐨勬敹鍙戝崟鏁伴噺锛堣浆鍙戠殑鏁伴噺 - 棰嗗彇鐨勬暟閲忥級
tempcarNumSurplus1: '',
cars2: '', //宸茬粡棰嗗彇鐨勮溅鏁�
carNum: '',
@@ -229,10 +251,10 @@
return uni.getStorageSync('roleType');
},
text() {
- return `宸查鍙�${this.cars2}寮犳彁鐓ゅ崟,鍓╀綑${this.carNumSurplus1}寮犳彁鐓ゅ崟`;
+ return `宸查鍙�${this.cars2}寮犳敹鍙戝崟,鍓╀綑${this.carNumSurplus1}寮犳敹鍙戝崟`;
},
text1() {
- return `宸叉嫢鏈�${this.carNum}寮犳彁鐓ゅ崟,鍓╀綑${this.carNumSurplusHuodai}寮犳彁鐓ゅ崟`;
+ return `宸叉嫢鏈�${this.carNum}寮犳敹鍙戝崟,鍓╀綑${this.carNumSurplusHuodai}寮犳敹鍙戝崟`;
}
},
methods: {
@@ -366,11 +388,16 @@
},
// 杞彂瀵硅薄
forwardObjectClick(index, name, id) {
+ if(!id){
this.selectPopupShow = true;
this.index = index;
this.originForwardName = name || ''
this.isDirectAdd = this.originForwardName !== ''
this.forwardId = id
+ }else{
+ return
+ }
+
},
selectPopupClose() {
this.selectPopupShow = false;
@@ -399,7 +426,7 @@
// })
// this.selectPopupShow = false;
// } else {
- // this.$u.toast('鎻愮叅鍗曞墿浣欐暟涓�0鎴栧凡娣诲姞');
+ // this.$u.toast('鏀跺彂鍗曞墿浣欐暟涓�0鎴栧凡娣诲姞');
// this.selectPopupShow = true;
// }
// } else {
@@ -440,7 +467,7 @@
// })
// this.selectPopupShow = false;
// } else {
- // this.$u.toast('鎻愮叅鍗曞墿浣欐暟涓�0鎴栧凡娣诲姞');
+ // this.$u.toast('鏀跺彂鍗曞墿浣欐暟涓�0鎴栧凡娣诲姞');
// this.selectPopupShow = true;
// }
// } else {
@@ -458,25 +485,25 @@
// }
});
},
- // 璁＄畻鎻愮叅鍗曟暟閲忥紝娣诲姞鎴栧垹闄ゆ椂璋冪敤
+ // 璁＄畻鏀跺彂鍗曟暟閲忥紝娣诲姞鎴栧垹闄ゆ椂璋冪敤
calculate(arr) {
let total = arr.reduce((prev, cur) => {
return cur.carNum + prev;
}, 0);
- console.log(total, '鎻愮叅鍗曚竴鍏辩殑鏁版嵁');
+ console.log(total, '鏀跺彂鍗曚竴鍏辩殑鏁版嵁');
//roleType 1瀹㈡埛 2 璐т唬 3鍙告満 5瑁呭嵏鍛�
if (this.roleType == 1) {
if (Number(this.cars2) > total) {
this.carNumSurplus1 = Number(this.cars2) - total;
this.whetherClick = false;
this.whetherClick1 = false;
- } else if (Number(this.cars2) == total) { //鍓╀綑鐨勬彁鐓ゅ崟涓�0锛堟坊鍔犮�佹彁浜ゆ寜閽笉鑳界偣鍑伙級
+ } else if (Number(this.cars2) == total) { //鍓╀綑鐨勬敹鍙戝崟涓�0锛堟坊鍔犮�佹彁浜ゆ寜閽笉鑳界偣鍑伙級
this.whetherClick = true;
this.whetherClick1 = false;
this.carNumSurplus1 = Number(this.cars2) - total;
} else {
this.carNumSurplus1 = 0;
- this.$u.toast('鍓╀綑鎻愮叅鍗曟暟閲忎笉瓒�');
+ this.$u.toast('鍓╀綑鏀跺彂鍗曟暟閲忎笉瓒�');
this.whetherClick = true;
this.whetherClick1 = true;
}
@@ -492,7 +519,7 @@
this.carNumSurplusHuodai = Number(this.carNum) - total;
} else {
this.carNumSurplusHuodai = 0;
- this.$u.toast('鍓╀綑鎻愮叅鍗曟暟閲忎笉瓒�');
+ this.$u.toast('鍓╀綑鏀跺彂鍗曟暟閲忎笉瓒�');
this.whetherClick = true;
this.whetherClick1 = true;
}
@@ -595,6 +622,7 @@
return isPass;
}
});
+ console.log(this.jhOrderPlanForwardList,'jhOderPlan')
if (isPass) {
this.loading = true;
this.$reqPost('forward', this.jhOrderPlanForwardList, 'json').then(res => {
@@ -622,7 +650,7 @@
} else {
this.tabHuoDai = false;
}
- }
+ },
}
};
</script>
@@ -786,11 +814,12 @@
}
.utils-buttonGroup {
- width: 610rpx;
+ width: 700rpx;
@include flex;
+ justify-content: space-between;
position: fixed;
bottom: vww(30);
- left: vww(30);
+ left: vww(18);
z-index: 3;
.AdddBtn,
--
Gitblit v1.9.1