From 56ef0500de7867dc11f723fb59dc3cbbf7e63d10 Mon Sep 17 00:00:00 2001
From: 819527061@qq.com <123456>
Date: 星期二, 11 六月 2024 16:28:37 +0800
Subject: [PATCH] docs:密码强度细节完善
---
pages/driver-page/driver-index/driver-index.vue | 207 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 182 insertions(+), 25 deletions(-)
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index f60a2e6..ef9e243 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -8,6 +8,18 @@
</view>
<!-- 寮曞椤� -->
<noob-tour></noob-tour>
+ <!-- 鑷富閰嶉�佺晫闈� -->
+ <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 class="collection-form">
<view class="collection-form-item"
v-for="(item, index) in driverBillOfLoadingData.list1"
@@ -77,7 +89,6 @@
@confirm="qiangDanConfirm"
@cancel="qiangDanCancel"></u-modal>
</view>
-
<!-- 寰呴绾︽彁鐓ゅ崟 -->
<view class="wait-appointment">
<combined-title title="寰呴绾︽彁鐓ゅ崟"></combined-title>
@@ -164,6 +175,28 @@
@confirm="cancelAppointConfirm"
@cancel="cancelAppointCancel"></u-modal>
</view>
+ <!-- 鍦哄唴鎺ュ崟寮圭獥 -->
+ <view class="">
+ <u-modal :show="insideConnectShow"
+ title="鎺ュ崟閫夋嫨"
+ showCancelButton
+ cancel-text="姝ｅ父鎺ュ崟"
+ confirm-text="鍦哄唴鎺ュ崟"
+ content="鍦哄唴鎺ュ崟鏃犻渶绉扮毊,鏄惁纭鎺ュ崟"
+ @confirm="insideConnectConfirm"
+ @cancel="insideConnectCancel"></u-modal>
+ </view>
+ <!-- 璺濈杩囧ぇ鎻愮ず -->
+ <view class="">
+ <u-modal :show="isOutFlag"
+ title="鏄惁鎺ュ崟"
+ showCancelButton
+ cancel-text="浠嶇劧鎺ュ崟"
+ confirm-text="鏆傛椂涓嶆帴"
+ content="褰撳墠璺濈杩囪繙鏄惁鎺ュ崟锛�"
+ @confirm="isCancel"
+ @cancel="isOk"></u-modal>
+ </view>
<!-- 宸查绾︽彁鐓ゅ崟 -->
<view class="Reserved">
<combined-title title="宸查绾︽彁鐓ゅ崟"></combined-title>
@@ -233,6 +266,13 @@
<!-- <view class="order-type">{{ item.orderType }}</view> -->
</view>
</view>
+ <view class="fourth-line"
+ v-if="item.status<3">
+ <view class="button-img"
+ @click.stop="cancelAppoint(item)">
+ 璇锋眰閫�鍗�
+ </view>
+ </view>
</view>
</view>
<view class="white-block"></view>
@@ -284,18 +324,25 @@
list3: []
},
// 鎺ュ崟妯℃�佹
+ isOutFlag:false,
qiangDanShow: false,
qiangDanTitle: '鎺ュ崟鎻愮ず',
+ qiangdanItem:{}, //鎶㈠崟瀵硅薄
qiangDanContent: '',
qiangDanOrderPlanId: null,
- fleetId: '',
- xsUserId: '',
- customerId: '',
isFirstLogin: true, //鏄惁鏄涓�娆＄櫥褰�
phone: "",
isFirstTime: false, //鏄惁鏄櫥褰曡繘鍏ラ椤碉紝杩樻槸鍒殑椤甸潰杩斿洖 false鏄櫥褰� true鏄埆鐨勯〉闈�
cancelAppointShow: false, //纭閫�鍗曞脊绐楁帶鍒�
- cancelAppointId: ''
+ cancelAppointId: '',
+ insideConnectShow: false,
+ orderPlanId: '',
+ fleetId: '',
+ latitude:'',
+ longitude:'',
+ customerId: '',
+ xsUserId: '',
+ filedId: '',
};
},
onShow() {
@@ -325,16 +372,27 @@
},
// 鎺ュ崟鎸夐挳
qiangDanBtn(value) {
- if (value.tmcCount == '0') {
- this.qiangDan(value.orderPlanId, value.fleetId, value.customerId === null ? '0' : value.customerId,
- value.xsUserId === null ? '0' : value.xsUserId);
+ this.qiangdanItem = value;
+ //鏄惁鍙互鍦哄唴鎺ュ崟锛�1 鍙互2涓嶅彲浠�
+ if (value.isInsideConnect === 1) {
+ this.insideConnectShow = true
+ this.orderPlanId = value.orderPlanId
+ this.fleetId = value.fleetId
+ this.customerId = !value.customerId ? '0' : value.customerId
+ this.xsUserId = !value.xsUserId ? '0' : value.xsUserId
+ this.filedId = value.filedId
} else {
- this.qiangDanOrderPlanId = value.orderPlanId;
- this.fleetId = value.fleetId;
- this.customerId = value.customerId === null ? '0' : value.customerId;
- this.xsUserId = value.xsUserId === null ? '0' : value.xsUserId;
- this.qiangDanShow = true;
- this.qiangDanContent = `宸叉帴${value.tmcCount}鍗曪紝纭畾鎺ュ崟锛焋;
+ if (value.tmcCount == '0') {
+ this.qiangDan(value.orderPlanId, value.fleetId, !value.customerId ? '0' : value.customerId,
+ !value.xsUserId ? '0' : value.xsUserId);
+ } else {
+ this.qiangDanOrderPlanId = value.orderPlanId;
+ this.fleetId = value.fleetId;
+ this.customerId = !value.customerId ? '0' : value.customerId;
+ this.xsUserId = !value.xsUserId ? '0' : value.xsUserId;
+ this.qiangDanShow = true;
+ this.qiangDanContent = `宸叉帴${value.tmcCount}鍗曪紝纭畾鎺ュ崟锛焋;
+ }
}
},
// 鎺ュ崟妯℃�佹
@@ -351,27 +409,72 @@
uni.showLoading({
title: '鍔犺浇涓�'
})
- this.$reqPost('qiangDan', {
+ let that = this;
+ uni.getFuzzyLocation({
+ type: 'wgs84', // 杩斿洖鍙互鐢ㄤ簬wx.openLocation鐨勭粡绾害锛岄粯璁や负wgs84鐨刧ps鍧愭爣
+ success: function(res) {
+ that.latitude = res.latitude;
+ that.longitude = res.longitude;
+ // 鍙互鍦ㄨ繖閲岀户缁鐞嗚幏鍙栧埌鐨勭粡绾害淇℃伅
+ console.log(that.latitude,that.longitude,'132')
+ },
+ fail: function(err) {
+ // 鑾峰彇鍦扮悊浣嶇疆澶辫触
+ console.log(err,'鑾峰彇鍦扮悊浣嶇疆澶辫触');
+ },
+ complete :()=>{
+ this.$reqPost('qiangDan', {
orderPlanId: id,
fleetId: fleetId,
customerId: customerId,
- xsUserId: xsUserId
+ xsUserId: xsUserId,
+ latitude:this.latitude,
+ longitude:this.longitude
}, 'params')
.then(res => {
uni.hideLoading()
if (res.code == 0) {
this.$u.toast('鎺ュ崟鎴愬姛');
- } else {
- this.$u.toast(res.msg ? res.msg : '鎺ュ崟澶辫触');
- }
- })
- .then(() => {
- setTimeout(() => {
+ setTimeout(() => {
this.qiangDanList();
}, 1500);
+ } else if (res.code == 2){
+ //璺濈杩囪繙
+ this.isOutFlag = true;
+ } else {
+ this.$u.toast(res.msg ? res.msg : '鎺ュ崟澶辫触');
+ setTimeout(() => {
+ this.qiangDanList();
+ }, 1500);
+ }
+ })
+ .then(() => {
+
}).catch(e => {
uni.hideLoading()
})
+ }
+ });
+
+ },
+ insideConnectHandle(orderPlanId, fleetId, customerId, xsUserId, filedId) {
+ uni.showLoading({
+ title: '鍔犺浇涓�'
+ })
+ this.$reqPost('insideConnect', {
+ orderPlanId,
+ fleetId,
+ customerId,
+ xsUserId,
+ filedId
+ }, 'params').then(res => {
+ uni.hideLoading()
+ if (res.code == 0) {
+ this.$u.toast('鍦哄唴鎺ュ崟鎴愬姛');
+ } else {
+ this.$u.toast(res.msg ? res.msg : '鍦哄唴鎺ュ崟澶辫触');
+ }
+ })
},
list3CardIconClick(value) {
uni.navigateTo({
@@ -386,6 +489,10 @@
},
// 璇锋眰閫�鍗�
cancelAppoint(item) {
+ if (item.status >= 3) {
+ this.$u.toast('褰撳墠鐘舵�佷笉鍙��鍗�')
+ return
+ }
this.cancelAppointShow = true
this.cancelAppointId = item.id
},
@@ -414,12 +521,42 @@
cancelAppointCancel() {
this.cancelAppointShow = false
},
+ insideConnectCancel() {
+ this.insideConnectShow = false
+ this.qiangDan(this.orderPlanId, this.fleetId, this.customerId, this.xsUserId)
+ },
+ // 鍦哄唴鎺ュ崟
+ insideConnectConfirm() {
+ this.insideConnectShow = false
+ this.insideConnectHandle(this.orderPlanId, this.fleetId, this.customerId, this.xsUserId, this.filedId)
+ },
// 鍘婚绾�
toAppointmentClick(value) {
- uni.navigateTo({
- url: `/pages/driver-page/appointment/appointment?takeCoalId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}`
- });
+ // 鐢变簬鑷富閰嶉�佸崟 鏄璐崟 浣嗘槸涓嶉渶瑕佸～鍐欏師鍙戜负1涓嶉渶瑕佸～鍐欏師鍙�
+ uni.setStorageSync('isNeedOrigin', value.orderType === '澶栬喘' && value.isSpecial === 1 ? 1 : 0)
+ if (value.orderType === '澶栬喘') {
+ uni.navigateTo({
+ url: `/pages/driver-page/driver-index/bill-of-lading-details/originInfo/originInfo?orderPlanId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}&isSpecial=${value.isSpecial}`
+ });
+ } else {
+ uni.navigateTo({
+ url: `/pages/driver-page/appointment/appointment?takeCoalId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}`
+ });
+ }
},
+ // 鑷富閰嶉��
+ selfDeliver() {
+ uni.navigateTo({
+ url: '/pages/driver-page/driver-index/SelfDelivery/SelfDelivery'
+ })
+ },
+ isOk(){
+ this.isOutFlag = false
+ this.qiangDanBtn(this.qiangdanItem);
+ },
+ isCancel(){
+ this.isOutFlag = false
+ }
}
};
</script>
@@ -536,6 +673,20 @@
.wait-collection {
width: 100%;
height: 600rpx;
+ }
+
+ // 鑷富閰嶉��
+ .self-deliver {
+ position: relative;
+ top: vww(-120);
+ 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;
}
.collection-form {
@@ -931,6 +1082,12 @@
}
.Reserved {
+ .fourth-line {
+ justify-content: flex-end;
+ letter-spacing: vww(2);
+ left: 223rpx !important;
+ }
+
.white-block {
width: 100%;
height: vww(50);
--
Gitblit v1.9.1