From d4bffaa2419bc3e3d6b1af4a6314065c67a8cbc0 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 03 七月 2023 16:57:13 +0800
Subject: [PATCH] ws增加报错关闭重连功能
---
pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue | 72 +++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 30 deletions(-)
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
index cdd4203..ba0d57b 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
@@ -12,21 +12,21 @@
<view class="weigh-item">
<view class="item">
<view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/skin.png') no-repeat;background-size: cover;">
+ :style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/skin.png)`, backgroundSize: 'cover', backgroundRepeat: 'no-repeat' }">
鐨�
</view>
<view class="num">{{ item.skin }}</view>
</view>
<view class="item">
<view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/hair.png') no-repeat;background-size: cover;">
+ :style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/hair.png)`, backgroundSize: 'cover', backgroundRepeat: 'no-repeat' }">
姣�
</view>
<view class="num">{{ item.hair }}</view>
</view>
<view class="item">
<view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
+ :style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/clean.png)`, backgroundSize: 'cover', backgroundRepeat: 'no-repeat' }">
鍑�
</view>
<view class="num">{{ item.clean }}</view>
@@ -37,16 +37,16 @@
<view class="label-text">
鎶樻墸鐜�
</view>
- <view v-if='roleType!==1'
- class="count">{{ item.discount }}%
- </view>
- <view v-else
+ <view v-if='roleType===4&&!flag'
class="count-input">
<u--input placeholder="璇疯緭鍏ユ姌鎵ｇ巼"
border="bottom"
clearable
v-model="item.discount"
@input='v=>discountInputHandle(v,i,item.clean)'></u--input>
+ </view>
+ <view v-else-if='flag'
+ class="count">{{ item.discount }}%
</view>
</view>
<view class="weigh">
@@ -60,13 +60,13 @@
<u-tag :text="item.level||'璇烽�夋嫨'"
plain
@click="popoverShow(i)"
- v-if='item.level||roleType===1'></u-tag>
+ v-if='item.level||roleType===4'></u-tag>
<u-tag :text="item.productName||'璇烽�夋嫨'"
plain
@click="productNamePopoverShow(i)"
- v-if='item.level||roleType===1'></u-tag>
+ v-if='item.level||roleType===4'></u-tag>
</view>
- <view v-if='roleType===1'>
+ <view v-if='roleType===4'>
<u-picker :show="show"
:columns="columns"
@cancel='cancel'
@@ -82,7 +82,7 @@
</view>
</view>
<view class="confirm-button"
- v-if='roleType===1'>
+ v-if='roleType===4&&!flag'>
<u-button type="primary"
shape="circle"
text="纭"
@@ -94,11 +94,11 @@
</template>
<script>
+ import { onlineurl } from '@/api/request.js'
export default {
data() {
return {
orderPlanId: "",
- index: null,
coalDetailsData: {},
showWeigh: [],
discountrate: "",
@@ -112,7 +112,10 @@
// 浜у搧鍒楄〃
actionsList: [],
actionShow: false,
- actionIndex: null
+ actionIndex: null,
+ onlineurl,
+ havedInput: false,
+ flag: false
};
},
computed: {
@@ -122,7 +125,7 @@
},
onLoad(params) {
this.orderPlanId = params.orderPlanId ? params.orderPlanId : ''
- this.index = params.index ? params.index : ''
+ this.flag = params.flag ? params.flag : false
},
onShow() {
this.roleType === 1 ? this.GetOrderPlan() : this.getTakeCoal()
@@ -138,7 +141,12 @@
this.coalDetailsData = res.data;
this.showWeigh = this.coalDetailsData.tmTaskCoalItems ? this.coalDetailsData
.tmTaskCoalItems : [],
- uni.hideLoading()
+ this.showWeigh.forEach(v => {
+ if (!v.discount) {
+ v.discount = ''
+ }
+ })
+ uni.hideLoading()
} else {
this.$u.toast('鍔犺浇澶辫触')
uni.hideLoading()
@@ -150,8 +158,8 @@
this.$reqGet('GetOrderPlan').then(res => {
if (res.data) {
this.coalDetailsData = res.data;
- this.showWeigh = this.coalDetailsData[this.index].tmTaskCoalItems ? this.coalDetailsData[
- this.index].tmTaskCoalItems : [],
+ this.showWeigh = this.coalDetailsData[this.index].tmTaskCoals ? this.coalDetailsData[
+ this.index].tmTaskCoals : [],
uni.hideLoading();
} else {
this.$u.toast('鍔犺浇澶辫触')
@@ -178,7 +186,12 @@
res => {
if (res.code == 0) {
this.loading = false
- this.$u.toast('鎿嶄綔鎴愬姛')
+ this.$u.toast('鎿嶄綔鎴愬姛,鍗冲皢杩斿洖涓婁竴椤�')
+ setTimeout(() => {
+ uni.navigateBack({
+ delta: 1
+ })
+ }, 800)
} else {
this.loading = false
this.$u.toast('鎿嶄綔澶辫触')
@@ -187,14 +200,15 @@
},
// 閫夋嫨璐ㄩ噺
popoverShow(i) {
- if (this.roleType === 1) {
+ console.log();
+ if (this.roleType === 4 && !this.flag) {
this.show = true
this.selectIndex = i
}
},
// 閫夋嫨浜у搧
productNamePopoverShow(i) {
- if (this.roleType === 1) {
+ if (this.roleType === 4 && !this.flag) {
this.actionShow = true
this.actionIndex = i
}
@@ -210,13 +224,12 @@
this.actionShow = false
},
selectClick(val) {
- console.log(this.showWeigh);
this.showWeigh[this.actionIndex].productName = val.productName
this.showWeigh[this.actionIndex].productId = val.id
},
// 鎶樻墸鐜囪緭鍏�
discountInputHandle(value, index, clean) {
- this.showWeigh[index].discountWeight = (Number(value) * clean) / 100
+ this.showWeigh[index].discountWeight = ((Number(value) * clean) / 100).toFixed(2)
}
},
}
@@ -235,10 +248,11 @@
}
.main {
- width: 100%;
- height: 100vh;
+ width: 96%;
+ height: 100%;
+ min-height: 400rpx;
background-color: #fff;
- margin: 0 auto;
+ margin: 10rpx auto;
display: flex;
flex-direction: column;
@@ -313,8 +327,8 @@
.level {
width: 40%;
- margin-top: 30 rpx;
- margin-left: 80 rpx;
+ margin-top: 30rpx;
+ margin-left: 80rpx;
display: flex;
justify-content: space-between;
}
@@ -322,12 +336,10 @@
}
.confirm-button {
- // position: relative;
- // bottom: 10rpx;
- // right: 10rpx;
width: 100%;
@include flex;
justify-content: center;
+ margin-bottom: 40rpx;
/deep/ .u-button {
width: 180 rpx !important;
--
Gitblit v1.9.1