From 8bedb5a0c09876046b397a94a9b12bb6e805d284 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期三, 19 六月 2024 17:13:23 +0800
Subject: [PATCH] Merge branch 'jlhg' of http://39.96.92.240:10000/r/~fyy/unattended-app into jlhg
---
pages/customer-page/customer-my/customer-my.vue | 138 ++++++++++++++++++++-------------------------
1 files changed, 62 insertions(+), 76 deletions(-)
diff --git a/pages/customer-page/customer-my/customer-my.vue b/pages/customer-page/customer-my/customer-my.vue
index 93236cf..90cb958 100644
--- a/pages/customer-page/customer-my/customer-my.vue
+++ b/pages/customer-page/customer-my/customer-my.vue
@@ -4,6 +4,37 @@
<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="huodai-list">
+ <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="item.status==0?'寰呯敓鏁�':item.status==1?'鐢熸晥':'搴熷純'"
+ >
+ <u-icon name="arrow-right"
+ color="#999999"
+ size="30"
+ slot="right-icon"></u-icon>
+ </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">
@@ -75,10 +106,10 @@
type="primary"
@click="userManage"
v-if="roleType == 1 && userEntity.isHostUser === '0'"></u-button></view>
- <!-- <view class="logout"><u-button text="淇敼瀵嗙爜"
+ <view class="logout"><u-button text="淇敼瀵嗙爜"
type="primary"
@click="modifyPwd"></u-button></view>
- <view class="logout"><u-button text="閲嶇疆瀵嗙爜"
+ <!-- <view class="logout"><u-button text="閲嶇疆瀵嗙爜"
type="primary"
@click="initPwd"></u-button></view> -->
<view class="logout"><u-button text="閫�鍑虹櫥褰�"
@@ -150,30 +181,6 @@
@confirm="logoutConfirm"
@cancel="logoutCancel"></u-modal>
</view>
- <!-- 閲嶇疆瀵嗙爜寮瑰嚭妗� -->
- <!-- <view class="initPwdModal">
- <u-modal :show="initPwdShow"
- title="閲嶇疆瀵嗙爜"
- showCancelButton
- content="鍒濆瀵嗙爜灏嗗彉鏇翠负123456,鏄惁纭閲嶇疆"
- @confirm="initPwdConfirm"
- @cancel="initPwdCancel"></u-modal>
- </view> -->
- <!-- 淇敼瀵嗙爜寮瑰嚭妗� -->
- <!-- <view class="modifyPwdModal">
- <u-modal :show="modifyPwdShow"
- title="淇敼瀵嗙爜"
- showCancelButton
- @confirm="modifyPwdConfirm"
- @cancel="modifyPwdCancel">
- <view class="modifyPwd">
- <u-input v-model="passwordModified"
- placeholder="璇疯緭鍏ヤ慨鏀瑰悗鐨勫瘑鐮�"
- border="surround"
- type="password"></u-input>
- </view>
- </u-modal>
- </view> -->
</view>
</template>
@@ -186,7 +193,9 @@
},
data() {
return {
+ userInfo: {},
huoDaiData: [],
+ BuyCardData:[],
fleetData: [],
// 鏂板缓杞﹂槦
addGroupForm: {
@@ -223,19 +232,28 @@
return uni.getStorageSync('roleType');
}
},
- onShow() {
- this.init();
- },
methods: {
init() {
this.getAllHuoDaiByCustomerId();
this.getFleet();
this.getUserEntity();
},
- // 鑾峰彇鐢ㄦ埛淇℃伅
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}).then(res => {
+ uni.hideLoading();
+ this.BuyCardData = res.data;
});
},
// 鑾峰彇璐т唬鍒楄〃
@@ -262,6 +280,12 @@
addHuoDai() {
uni.navigateTo({
url: '/pages/customer-page/addTo-freightForwarder-driver/addTo-freightForwarder-driver?role=1' // 1浠ｈ〃鐨勬槸璐т唬
+ });
+ },
+ // 娣诲姞璐拱璇�
+ addGouMai(){
+ uni.navigateTo({
+ url: '/pages/customer-page/addTo-freightForwarder-purchasePermit/addTo-freightForwarder-purchasePermit'
});
},
// 娣诲姞杞﹂槦
@@ -385,51 +409,6 @@
url: `/pages/customer-page/fleet-management/fleet-management?id=${id}`
});
},
- updateInfo() {
- this.$reqPost('updateUser', this.userEntity, 'json').then(res => {
- uni.hideLoading()
- if (res.code == 0) {
- uni.showToast({
- title: '閲嶇疆鎴愬姛',
- duration: 2000,
- icon: 'success'
- })
- } else {
- this.$u.toast(res.msg ? res.msg : '淇敼澶辫触');
- }
- }).catch(err => {
- this.$u.toast('淇敼澶辫触');
- });
- },
- initPwd() {
- this.initPwdShow = true
- },
- initPwdConfirm() {
- this.initPwdShow = false
- uni.showLoading({
- title: '鍔犺浇涓�'
- })
- this.userEntity.password = '123456'
- this.updateInfo()
- },
- initPwdCancel() {
- this.initPwdShow = false
- },
- modifyPwd() {
- this.modifyPwdShow = true
- this.passwordModified = ''
- },
- modifyPwdConfirm() {
- if (this.passwordModified.length === 0) {
- return this.$u.toast('瀵嗙爜涓嶈兘涓虹┖')
- }
- this.modifyPwdShow = false
- this.userEntity.password = this.passwordModified
- this.updateInfo()
- },
- modifyPwdCancel() {
- this.modifyPwdShow = false
- },
logout() {
this.logoutShow = true;
},
@@ -441,6 +420,13 @@
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() {
uni.navigateTo({
--
Gitblit v1.9.1