From 94d99fe564e8b927709221846aa4fb94f3ddff78 Mon Sep 17 00:00:00 2001 From: yangan <yangan0921@163.com> Date: 星期一, 02 十二月 2024 09:15:47 +0800 Subject: [PATCH] fix:历史收发单时间筛选bug --- pages/customer-page/customer-my/customer-my.vue | 249 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 238 insertions(+), 11 deletions(-) diff --git a/pages/customer-page/customer-my/customer-my.vue b/pages/customer-page/customer-my/customer-my.vue index 56cae2e..1e2068c 100644 --- a/pages/customer-page/customer-my/customer-my.vue +++ b/pages/customer-page/customer-my/customer-my.vue @@ -32,14 +32,20 @@ size="mini" class="tags" @click="checkRadio(2)"></u-tag> + <u-tag text="鎷掔粷" + :type="radio==3?'primary':'info'" + plain + size="mini" + class="tags" + @click="checkRadio(3)"></u-tag> </view> <view class="huodai-list"> <view class="buylist"> - <view v-for="(item, index) in BuyCardData" :key="index" class="buylists"> + <view v-for="(item, index) in BuyCardData" :key="index" class="buylists" @click=addGouMai(item)> <view >{{item.productName}}</view> <view >{{item.buyTotal}}/{{item.surplus}}</view> <view >{{item.endDate}}</view> - <view >{{item.status==0?'寰呯敓鏁�':item.status==1?'鐢熸晥':'搴熷純'}}</view> + <view >{{item.status==0?'寰呯敓鏁�':item.status==1?'鐢熸晥':item.status==2?'搴熷純':'鎷掔粷'}}</view> </view> </view> <!-- <u-swipe-action> @@ -59,7 +65,7 @@ </view> </view> </view> - <view class="personal-information-block"> + <!-- <view class="personal-information-block"> <view class="block-main"> <view class="huodai"> <combined-title title="鎴戠殑鎵胯繍鍟�" @@ -90,7 +96,140 @@ </view> </view> </view> + </view> --> + <view class="information-block"> + <view class="personal-information"> + <view class="personal-information-block"> + <view class="block-main"> + <view class="information-line"> + <view class="line-label"> + <image src="https://wrzs.czjlchem.com:9090/appimg/image/banner/phonenum.png" + mode="widthFix"></image> + <view class="label-text">鎵嬫満鍙�</view> + </view> + <view class="information-value"> + {{ userInfo.phone || '' }} + </view> + </view> + <view class="information-line"> + <view class="line-label"> + <image src="https://wrzs.czjlchem.com:9090/appimg/image/banner/carnum.png" + mode="widthFix"></image> + <view class="label-text">濮撳悕</view> + </view> + <view class="information-value"> + {{ userInfo.name || '' }} + </view> + </view> + <view class="information-line"> + <view class="line-label"> + <image src="https://wrzs.czjlchem.com:9090/appimg/image/banner/carnum.png" + mode="widthFix"></image> + <view class="label-text">瑙掕壊</view> + </view> + <view class="information-value"> + {{ '瀹㈡埛' }} + </view> + </view> + <!-- <view class="information-line" + @click=""> + <view class="line-label"> + <image src="https://wrzs.czjlchem.com:9090/appimg/image/banner/personalicon.png" + mode="widthFix"></image> + <view class="label-text">韬唤璇佸彿</view> + </view> + <view class="information-value"> + {{ idCard || '' }} + </view> + </view> --> + + <!-- <view class="information-line"> + <view class="line-label"> + <image src="https://wrzs.czjlchem.com:9090/appimg/image/banner/weighnum.png" + mode="widthFix"></image> + <view class="label-text">浣撻噸</view> + </view> + <view class="information-value"> + {{ userInfo.weight || '' }} + </view> + </view> --> + <!-- 鐢变簬鏄嚜瀹氫箟icon 闈炶璁″浘icon 鎵�浠ヨ鍔犱笂杩欎釜style="margin-left: 1.5%;" + icon 涓嬭浇鏍煎紡涓�18x18--> + <!-- <view class="information-line" + @click="modifyPrint"> + + <view class="line-label" + style="margin-left: 1.5%;"> + <image src="https://wrzs.czjlchem.com:9090/appimg/image/banner/printer.png" + mode="widthFix" + style="width: 18px;"></image> + <view class="label-text">纾呭崟鏍峰紡</view> + </view> + <view class="information-value"> + <view class=""> + {{ currentSelectedPrintStyle===1?'涓�椤典袱鑱�':'涓�椤靛洓鑱�'}} + </view> + <u-icon name="arrow-right" + size="36"></u-icon> + </view> + </view> --> + <!-- <view class="information-line" + @click="addressManageHandle"> + <view class="line-label" + style="margin-left: 1.5%;"> + <image src="https://wrzs.czjlchem.com:9090/appimg/image/banner/address.png" + mode="widthFix" + style="width: 18px;"></image> + <view class="label-text" + style="width:220rpx ;">閫佽揣瀹㈡埛绠$悊</view> + </view> + <view class=""> + <u-icon name="arrow-right" + size="36"></u-icon> + </view> + </view> --> + <!-- <view class="information-line" + @click="scoreDetail"> + <view class="line-label" + style="margin-left: 1.5%;"> + <image src="https://wrzs.czjlchem.com:9090/appimg/image/banner/score.png" + mode="widthFix" + style="width: 36rpx;position: relative;left: 8rpx;"></image> + <view class="label-text">鎴戠殑绉垎</view> + </view> + <view class="information-value"> + <view class=""> + {{ userInfo.integral || '' }} + </view> + <view class=""> + <u-icon name="arrow-right" + size="36"></u-icon> + </view> + </view> + </view> --> + <!-- <view class="information-line last" + @click="scoreCert"> + <view class="line-label" + style="margin-left: 1.5%;"> + <image src="https://wrzs.czjlchem.com:9090/appimg/image/banner/score.png" + mode="widthFix" + style="width: 36rpx;position: relative;left: 8rpx;"></image> + <view class="label-text">鍓ф瘨鍖栧鍝侀亾璺繍杈撻�氳璇�</view> + </view> + <view class="information-value"> + <view class=""> + {{ '' }} + </view> + <view class=""> + <u-icon name="arrow-right" + size="36"></u-icon> + </view> + </view> + </view> --> + </view> + </view> </view> + </view> <view class="personal-information-block"> <view class="block-main"> <view class="fleet-container"> @@ -102,11 +241,12 @@ </combined-title> <view class="fleet-list"> <u-swipe-action> - <u-cell-group :border="false"> + <u-cell-group :border="false" style="z-index: 0;"> <u-swipe-action-item :options="options1" v-for="(item, index) in fleetData" :key="item.id" :name="item.id" + style="z-index: 0;" @click="deleteFleetClick"> <u-cell :title="item.name" :value="item.userSijisum + '杈�'" @@ -129,7 +269,7 @@ <view class="statistics"><u-button text="鐢ㄦ埛绠$悊" type="primary" @click="userManage" - v-if="roleType == 1 && userEntity.isHostUser === '0'"></u-button></view> + v-if="roleType == 1 && userInfo.isHostUser === 0"></u-button></view> <view class="logout"><u-button text="淇敼瀵嗙爜" type="primary" @click="modifyPwd"></u-button></view> @@ -259,6 +399,9 @@ computed: { roleType() { return uni.getStorageSync('roleType'); + }, + userInfo(){ + return uni.getStorageSync('userInfo'); } }, methods: { @@ -354,10 +497,18 @@ }); }, // 娣诲姞璐拱璇� - addGouMai(){ - uni.navigateTo({ - url: '/subPages/addTo-freightForwarder-purchasePermit/addTo-freightForwarder-purchasePermit' - }); + addGouMai(data){ + if(data){ + if(data.status==3){ + uni.navigateTo({ + url: '/subPages/addTo-freightForwarder-purchasePermit/addTo-freightForwarder-purchasePermit?data='+encodeURIComponent(JSON.stringify(data)) + }); + } + }else{ + uni.navigateTo({ + url: '/subPages/addTo-freightForwarder-purchasePermit/addTo-freightForwarder-purchasePermit' + }); + } }, // 娣诲姞杞﹂槦 addFleet() { @@ -563,6 +714,9 @@ ::v-deep.customer-my { width: 100%; margin: vww(90) auto; + :v-deep .u-cell-group__wrapper{ + z-index: 0!important; + } .driver-banner { width: 100%; @@ -594,7 +748,7 @@ &-block { width: 690rpx; - min-height: 478rpx; + min-height: 300rpx; 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; @@ -609,7 +763,77 @@ } } } + .information-block { + width: 100%; + .personal-information { + width: 100%; + display: flex; + justify-content: center; + position: relative; + top: vww(-10); + + &-block { + width: 690rpx; + height: 350rpx; + 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; + display: flex; + flex-direction: column; + justify-content: space-between; + + .block-main { + width: 636rpx; + margin: vww(10) vww(14); + } + + .information-line { + @include flex; + width: 636rpx; + height: vww(45); + border-bottom: 1rpx solid #f0f1f6; + + .line-label { + width: 50%; + height: 90rpx; + @include flex; + + image { + width: 50rpx; + height: 50rpx; + } + + .label-text { + flex: 0.8; + font-size: 30rpx; + font-weight: 400; + color: #000000; + line-height: 32rpx; + text-align: left; + } + } + + .information-value { + min-width: vww(125); + @include flex; + font-size: 30rpx; + font-weight: 400; + color: #000000; + line-height: 85rpx; + } + } + + .last { + border-bottom: 0; + + .information-value { + justify-content: space-between; + } + } + } + } + } .huodai { .huodai-list { .u-swipe-action { @@ -629,6 +853,9 @@ .fleet-container { .fleet-list { .u-swipe-action { + .u-cell-group__wrapper { + z-index: 0; + } .u-swipe-action-item { .u-swipe-action-item__right { .u-swipe-action-item__right__button { @@ -679,7 +906,7 @@ } } .chage{ - width: 280rpx; + width: 400rpx; height: 50rpx; display: flex; justify-content: space-between; -- Gitblit v1.9.1