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 | 86 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 76 insertions(+), 10 deletions(-)
diff --git a/pages/customer-page/customer-my/customer-my.vue b/pages/customer-page/customer-my/customer-my.vue
index a2d91a3..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,6 +106,12 @@
type="primary"
@click="userManage"
v-if="roleType == 1 && userEntity.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>
@@ -103,9 +140,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="娣诲姞"
@@ -138,7 +172,7 @@
<view class="slot-content"><rich-text :nodes="deleteFleetContent"></rich-text></view>
</u-modal>
</view>
-
+ <!-- 閫�鍑虹櫥褰曞脊鍑烘 -->
<view class="logoutModel">
<u-modal :show="logoutShow"
:title="logoutTitle"
@@ -159,7 +193,9 @@
},
data() {
return {
+ userInfo: {},
huoDaiData: [],
+ BuyCardData:[],
fleetData: [],
// 鏂板缓杞﹂槦
addGroupForm: {
@@ -185,7 +221,10 @@
logoutTitle: '鎻愮ず',
logoutContent: '鏄惁纭閫�鍑�',
// 鐢ㄦ埛淇℃伅瀵硅薄
- userEntity: {}
+ userEntity: {},
+ initPwdShow: false,
+ modifyPwdShow: false,
+ passwordModified: ''
};
},
computed: {
@@ -193,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;
});
},
// 鑾峰彇璐т唬鍒楄〃
@@ -232,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'
});
},
// 娣诲姞杞﹂槦
@@ -365,6 +419,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() {
@@ -515,5 +576,10 @@
}
}
}
+
+ .modifyPwd {
+ width: 100%;
+ border: 1rpx solid rgb(220, 223, 230);
+ }
}
</style>
\ No newline at end of file
--
Gitblit v1.9.1