From 3d87bf45986772678752aa2d53a2d2dba51efc0b Mon Sep 17 00:00:00 2001 From: yangan <yangan0921@163.com> Date: 星期五, 16 八月 2024 17:22:11 +0800 Subject: [PATCH] feat:货代首页单位显示问题 --- pages/customer-page/customer-my/customer-my.vue | 222 +++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 198 insertions(+), 24 deletions(-) diff --git a/pages/customer-page/customer-my/customer-my.vue b/pages/customer-page/customer-my/customer-my.vue index 7d3cf26..994e29d 100644 --- a/pages/customer-page/customer-my/customer-my.vue +++ b/pages/customer-page/customer-my/customer-my.vue @@ -4,10 +4,65 @@ <view class="navgation">鎴戠殑</view> </view> <view class="personal-information"> + <view class="personal-information-block" v-if="userInfo.isBuyFlag=='1'?true:false"> + <view class="block-main"> + <view class="huodai"> + <combined-title title="鎴戠殑璐拱璇�" + @rightText="addGouMai"> + <template v-slot:rightText> + <text>娣诲姞</text> + </template> + </combined-title> + <view class="chage"> + <u-tag text="寰呯敓鏁�" + :type="radio==0?'primary':'info'" + plain + size="mini" + class="tags" + @click="checkRadio(0)"></u-tag> + <u-tag text="鐢熸晥" + :type="radio==1?'primary':'info'" + plain + size="mini" + class="tags" + @click="checkRadio(1)"></u-tag> + <u-tag text="杩囨湡" + :type="radio==2?'primary':'info'" + plain + size="mini" + class="tags" + @click="checkRadio(2)"></u-tag> + </view> + <view class="huodai-list"> + <view class="buylist"> + <view v-for="(item, index) in BuyCardData" :key="index" class="buylists"> + <view >{{item.productName}}</view> + <view >{{item.buyTotal}}/{{item.surplus}}</view> + <view >{{item.endDate}}</view> + <view >{{item.status==0?'寰呯敓鏁�':item.status==1?'鐢熸晥':'搴熷純'}}</view> + </view> + </view> + <!-- <u-swipe-action> + <u-cell-group :border="false"> + <u-swipe-action-item :options="options1" + v-for="(item, index) in BuyCardData" + :key="item.userId" + :name="item.productName"> + <u-cell :title="item.productName" + :value=" + > + </u-cell> + </u-swipe-action-item> + </u-cell-group> + </u-swipe-action> --> + </view> + </view> + </view> + </view> <view class="personal-information-block"> <view class="block-main"> <view class="huodai"> - <combined-title title="鎴戠殑璐т唬" + <combined-title title="鎴戠殑鎵胯繍鍟�" @rightText="addHuoDai"> <template v-slot:rightText> <text>娣诲姞</text> @@ -74,10 +129,19 @@ <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> + <!-- <view class="logout"><u-button text="閲嶇疆瀵嗙爜" + type="primary" + @click="initPwd"></u-button></view> --> <view class="logout"><u-button text="閫�鍑虹櫥褰�" type="primary" @click="logout()"></u-button></view> + <view class="logout"><u-button text="鑱旂郴鎴戜滑" + type="primary" + @click="contactUs()"></u-button></view> </view> <u-toast ref="uToast"></u-toast> <!-- 鏂板缓杞﹂槦寮瑰嚭妗� --> @@ -103,9 +167,6 @@ border="none" placeholder="璇疯緭鍏ヨ溅闃熷悕绉�"></u--input> </u-form-item> - <!-- <u-form-item label="杞︾墝" borderBottom ref="cars" labelWidth="80"> - <u--textarea maxlength="2000" v-model="addGroupForm.carNums" placeholder="璇疯緭鍏ヨ溅鐗�" height="150"></u--textarea> - </u-form-item> --> </u--form> </view> <view class="addCarButton"><u-button text="娣诲姞" @@ -113,8 +174,7 @@ @click="addNewGroupClick"></u-button></view> </u-popup> </view> - - <!-- 鍒犻櫎璐т唬妯℃�佹 --> + <!-- 鍒犻櫎鎵胯繍鍟嗘ā鎬佹 --> <view class="deleteHuoDaiModal"> <u-modal :show="deleteHuoDaiShow" :title="deleteHuoDaiTitle" @@ -138,7 +198,7 @@ <view class="slot-content"><rich-text :nodes="deleteFleetContent"></rich-text></view> </u-modal> </view> - + <!-- 閫�鍑虹櫥褰曞脊鍑烘 --> <view class="logoutModel"> <u-modal :show="logoutShow" :title="logoutTitle" @@ -151,6 +211,7 @@ </template> <script> + import { BaseUrl } from '@/api/publicInterface.js' import combinedTitle from '@/components/combined-title/combined-title.vue'; import { customerId, redirectLogin } from '@/utils/status'; export default { @@ -159,7 +220,10 @@ }, data() { return { + radio:'1', + userInfo: {}, huoDaiData: [], + BuyCardData:[], fleetData: [], // 鏂板缓杞﹂槦 addGroupForm: { @@ -170,8 +234,8 @@ options1: [{ text: '鍒犻櫎' }], - // 鍒犻櫎璐т唬妯℃�佹 - deleteHuoDaiId: null, // 鍒犻櫎璐т唬id + // 鍒犻櫎鎵胯繍鍟嗘ā鎬佹 + deleteHuoDaiId: null, // 鍒犻櫎鎵胯繍鍟唅d deleteHuoDaiShow: false, deleteHuoDaiTitle: '', deleteHuoDaiContent: '', @@ -185,30 +249,88 @@ logoutTitle: '鎻愮ず', logoutContent: '鏄惁纭閫�鍑�', // 鐢ㄦ埛淇℃伅瀵硅薄 - userEntity: {} + userEntity: {}, + initPwdShow: false, + modifyPwdShow: false, + passwordModified: '', + phoneList:[] }; }, computed: { roleType() { return uni.getStorageSync('roleType'); + }, + userInfo(){ + return uni.getStorageSync('userInfo'); } }, - onShow() { - this.init(); - }, methods: { + checkRadio(e){ + this.radio=e + this.getBuyCardList() + }, init() { this.getAllHuoDaiByCustomerId(); this.getFleet(); this.getUserEntity(); + uni.request({ + url: `${BaseUrl}/admin/dict/page`, + method: 'GET', + data: { + dictType:'Setings' + }, + header: { + Authorization: 'Bearer' + ' ' + uni.getStorageSync('token'), + clientToc: 'Y', + 'CLIENT_TOC': 'Y', + }, + success: res => { + let dictId=res.data.data?.records[0].id + uni.request({ + url: `${BaseUrl}/admin/dict/item/page`, + method: 'GET', + data: { + dictId:dictId + }, + header: { + Authorization: 'Bearer' + ' ' + uni.getStorageSync('token'), + clientToc: 'Y', + 'CLIENT_TOC': 'Y', + }, + success: res => { + res.data.data.records.forEach(item=>{ + if(item.description.includes('鑱旂郴')){ + this.phoneList=item.value.split(',') + } + }) + }, + fail: err => { + } + }) + }, + fail: err => { + } + }) }, - // 鑾峰彇鐢ㄦ埛淇℃伅 getUserEntity() { + uni.showLoading({ + title: '鍔犺浇涓�...' + }); this.$reqGet('getUserEntity').then(res => { - this.userEntity = res.data; + this.userInfo = res.data; + this.getBuyCardList(); + }) + }, + getBuyCardList() { + uni.showLoading({ + title: '鍔犺浇涓�...' + }); + this.$reqGet('getBuyCardList',{customerId: this.userInfo.customerid,status:this.radio}).then(res => { + uni.hideLoading(); + this.BuyCardData = res.data; }); }, - // 鑾峰彇璐т唬鍒楄〃 + // 鑾峰彇鎵胯繍鍟嗗垪琛� getAllHuoDaiByCustomerId() { uni.showLoading({ title: '鍔犺浇涓�...' @@ -228,10 +350,16 @@ this.fleetData = res.data; }); }, - // 娣诲姞璐т唬 + // 娣诲姞鎵胯繍鍟� addHuoDai() { uni.navigateTo({ - url: '/pages/customer-page/addTo-freightForwarder-driver/addTo-freightForwarder-driver?role=1' // 1浠h〃鐨勬槸璐т唬 + url: '/pages/customer-page/addTo-freightForwarder-driver/addTo-freightForwarder-driver?role=1' // 1浠h〃鐨勬槸鎵胯繍鍟� + }); + }, + // 娣诲姞璐拱璇� + addGouMai(){ + uni.navigateTo({ + url: '/subPages/addTo-freightForwarder-purchasePermit/addTo-freightForwarder-purchasePermit' }); }, // 娣诲姞杞﹂槦 @@ -272,14 +400,14 @@ }); this.updateGroupShow = false; }, - // 鍒犻櫎璐т唬 + // 鍒犻櫎鎵胯繍鍟� deleteHuoDaiClick(args) { - console.log(args, '璐т唬id'); + console.log(args, '鎵胯繍鍟唅d'); this.deleteHuoDaiId = args.name; this.deleteHuoDaiShow = true; this.huoDaiData.forEach(item => { if (item.userId == this.deleteHuoDaiId) { - this.deleteHuoDaiContent = '纭鍒犻櫎璐т唬' + item.name + '鍚楋紵'; + this.deleteHuoDaiContent = '纭鍒犻櫎鎵胯繍鍟�' + item.name + '鍚楋紵'; } }); }, @@ -343,7 +471,7 @@ this.getFleet(); }); }, - // 璐т唬璇︽儏 + // 鎵胯繍鍟嗚鎯� toFreightForwarderDetails(userId) { uni.navigateTo({ url: `/pages/customer-page/freight-forwarder-details/freight-forwarder-details?userId=${userId}` @@ -358,11 +486,33 @@ logout() { this.logoutShow = true; }, + contactUs(){ + uni.showActionSheet({ + itemList: this.phoneList, + success: (res) => { + uni.makePhoneCall({ + phoneNumber:this.phoneList[res.tapIndex].split(":")[1] + }) + }, + fail: (err) => { + console.log('寮圭獥鍙栨秷'); + } + }); + }, logoutConfirm() { redirectLogin(); + this.$store.commit('changeisLogin', false) + this.$store.dispatch('websocketOnClose') }, logoutCancel() { this.logoutShow = false; + }, + modifyPwd() { + this.$store.commit('changeisLogin', false) + this.$store.dispatch('websocketOnClose') + uni.reLaunch({ + url: `/pages/login/resetPassword/resetPassword?phone=${this.userInfo.phone}&idCard=${this.userInfo.idCard}` + }) }, // 璺宠浆鐢ㄦ埛绠$悊椤甸潰 userManage() { @@ -381,7 +531,19 @@ justify-content: space-between; align-items: center; } - + .buylist{ + width: 100%; + height: 80%; + } + .buylists { + position: relative; + overflow: hidden; + @include flex; + align-items: center; + font-size: 15px; + height: 80rpx; + border-bottom: 1rpx solid rgb(220, 223, 230); + } .utils-button { margin-top: vww(35); @@ -513,5 +675,17 @@ } } } + + .modifyPwd { + width: 100%; + border: 1rpx solid rgb(220, 223, 230); + } + } + .chage{ + width: 280rpx; + height: 50rpx; + display: flex; + justify-content: space-between; + align-items: center; } </style> \ No newline at end of file -- Gitblit v1.9.1