From dbc79ab43fced444933174bd4148ee9f5dd777c3 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期五, 12 七月 2024 14:20:39 +0800
Subject: [PATCH] fix:修改测试问题
---
pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue | 66 +++++++++++++++++----------------
1 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue
index 7a669c3..db6ecee 100644
--- a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue
+++ b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue
@@ -122,16 +122,7 @@
<view class="origin-info_wrapper">
<view class="origin-info_content">
<!-- 鎶樺彔 -->
- <zh-collapse
- :default_unfold='[1]'
- accordion>
- <zh-collapse-item
- :id='1'
- class="collItem">
- <!-- title -->
- <view slot="title">
<view class="first-line"><combined-title title="鍘熷彂淇℃伅"></combined-title></view>
- </view>
<view class="" slot='cont'>
<u-form :model="originInfoForm"
:rules="rules"
@@ -231,14 +222,15 @@
<u-form-item prop='contactPicture'>
<view class="label-text">
- <text style="color: #f56c6c;">*</text>鍘熷彂纾呭崟
+ <text style="color: #f56c6c;">*</text>鍘熷彂鍗曟嵁
</view>
- <u-upload :fileList="fileList1"
+ <u-upload
+ :fileList="fileList1"
@afterRead="afterRead"
@delete="deletePic"
name="1"
multiple
- :maxCount="2"
+ :maxCount="fileList1.length ? fileList1.length : 2"
width="250"
height="150"
:previewFullImage="true"
@@ -246,16 +238,7 @@
:deletable="!deletable"></u-upload>
</u-form-item>
</u-form>
- <view class="submit-button">
- <u-button text="鎻愪氦"
- type="primary"
- @click.stop="submitOriginInfo"
- :disabled="isModifyoriginInfo"
- :loading="submitOriginInfoLoading"></u-button>
- </view>
</view>
- </zh-collapse-item>
- </zh-collapse>
</view>
@@ -278,7 +261,7 @@
<!-- <view class="completeOutSale">
<u-modal :show="completeOutSaleShow"
title="纭"
- content="鏄惁瀹屾垚澶栭攢鎻愮叅鍗�"
+ content="鏄惁瀹屾垚澶栭攢鏀跺彂鍗�"
:showCancelButton="true"
@confirm="completeOutSaleConfirm"
@cancel="completeOutSaleCancel"></u-modal>
@@ -297,7 +280,7 @@
combinedTitle,
},
onPullDownRefresh() {
- this.getTakeCoal(); //鑾峰彇鎻愮叅鍗曡鎯�
+ this.getTakeCoal(); //鑾峰彇鏀跺彂鍗曡鎯�
uni.stopPullDownRefresh();
},
onLoad(value) {
@@ -310,14 +293,14 @@
// this.getWeightHouseObj.overTmWaixiao = value.overTmWaixiao
// }
if (this.globalIsFirstWeighing === 1) {
- this.getTakeCoal(); //鑾峰彇鎻愮叅鍗曡鎯�
+ this.getTakeCoal(); //鑾峰彇鏀跺彂鍗曡鎯�
}
this.init(); //鑾峰彇鏃ュ織
},
onShow() {
this.coalDayPage(); //鑾峰彇鏃ュ織 瀹氭椂浠诲姟
if (this.globalIsFirstWeighing === 2) {
- this.getTakeCoal(); //鑾峰彇鎻愮叅鍗曡鎯�
+ this.getTakeCoal(); //鑾峰彇鏀跺彂鍗曡鎯�
}
},
onReady() {
@@ -346,8 +329,8 @@
wareList:[],
coalDetailsData: {
tmTaskCoalList:[]
- }, // 鎻愮叅鍗曡鎯�
- currentPageCoalStatus: 0, // 褰撳墠椤甸潰鎻愮叅鍗曠姸鎬�
+ }, // 鏀跺彂鍗曡鎯�
+ currentPageCoalStatus: 0, // 褰撳墠椤甸潰鏀跺彂鍗曠姸鎬�
// 鑾峰彇鎵�鍦ㄧ鎴垮弬鏁�
getWeightHouseObj: {
deptId: '',
@@ -581,7 +564,7 @@
}
})
},
- // 鑾峰彇鎻愮叅鍗曡鎯�
+ // 鑾峰彇鏀跺彂鍗曡鎯�
getTakeCoal() {
uni.showLoading({
title: '鍔犺浇涓�'
@@ -589,7 +572,7 @@
this.$reqGet('getTakeCoal', { takeCoalId: this.orderPlanId }).then(res => {
if (res.code == 0) {
uni.hideLoading();
- console.log(res, '鎻愮叅鍗曡鎯�');
+ console.log(res, '鏀跺彂鍗曡鎯�');
this.coalDetailsData = res.data;
this.orderType = this.coalDetailsData.orderType;
//
@@ -613,7 +596,7 @@
// 鑾峰彇瀹㈡湇openId鍙傛暟璧嬪��
this.getServiceOpenid.deptId = this.coalDetailsData.deptId;
this.getServiceOpenid.filedId = this.coalDetailsData.filedId;
- // 鑾峰彇鎻愮叅鍗曠姸鎬�
+ // 鑾峰彇鏀跺彂鍗曠姸鎬�
this.currentPageCoalStatus = this.coalDetailsData.status;
// 鑾峰彇鍘熷彂淇℃伅
this.primarySkin = this.coalDetailsData.skinTwo;
@@ -674,7 +657,7 @@
}
});
},
- // 灞曠ず鎻愮叅鍗曡鎯�
+ // 灞曠ず鏀跺彂鍗曡鎯�
showCaolPickUpBill() {
uni.navigateTo({
url: `/pages/driver-page/driver-index/bill-of-lading-details/coal-pick-up-bill/coal-pick-up-bill?orderPlanId=${this.orderPlanId}`
@@ -1131,6 +1114,25 @@
</script>
<style lang="scss" scoped>
+ .sub-table{
+ width: 690rpx;
+ min-height: 300rpx;
+ margin: vww(30) vww(15) vww(13) !important;
+ 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;
+ flex-direction: column;
+ justify-content: center;
+ overflow: hidden;
+ position: relative;
+ top: vww(130);
+ align-items: flex-start;
+ /deep/ .uni-table{
+ min-width: 0!important;
+ }
+
+ }
.codeBox{
height: 100rpx;
display: flex;
@@ -1367,7 +1369,7 @@
.sub-table{
width: 690rpx;
min-height: 300rpx;
- margin: vww(20) vww(15) vww(13);
+ margin: vww(30) vww(15) vww(13) !important;
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;
--
Gitblit v1.9.1