sunliwei/lanan-repair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://122.51.230.86:3000/sunliwei/lanan-repair

Browse Source
This commit is contained in:
Vinjor 2024-09-24 22:41:09 +08:00
commit 5076f85835
4 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pages/my/my.vue
View File

@ -70,8 +70,7 @@
tabBarVue, tabBarVue,
VNavigationBar VNavigationBar
}, },
onShow(data) {
onLoad(data) {
this.getServer() this.getServer()
}, },
data() { data() {
@ -109,13 +108,8 @@
params:{} params:{}
}) })
this.customInfo = res.data this.customInfo = res.data
uni.setStorageSync('customerInfo', JSON.stringify(this.customInfo)) uni.setStorageSync('customerInfo', JSON.stringify(this.customInfo))
// JSON.parse(JSON.stringify(files)) }
// const a = uni.getStorageSync('customerInfo')
// console.log(JSON.parse(a),115)
}
} }
} }
</script> </script>

2
pages/my/myEquity.vue
View File

@ -80,7 +80,7 @@
levelEquityList: [] levelEquityList: []
}; };
}, },
onLoad(data) { onShow(data) {
//当前登录用户信息 //当前登录用户信息
this.customInfo = JSON.parse(uni.getStorageSync('customerInfo')) this.customInfo = JSON.parse(uni.getStorageSync('customerInfo'))
this.getMemberList() this.getMemberList()

2
pages/my/myInfo.vue
View File

@ -37,7 +37,7 @@
customInfo:{} customInfo:{}
}; };
}, },
onLoad(data) { onShow(data) {
//当前登录用户信息 //当前登录用户信息
this.customInfo = JSON.parse(uni.getStorageSync('customerInfo')) this.customInfo = JSON.parse(uni.getStorageSync('customerInfo'))
}, },

8
pages/orderList/orderList.vue
View File

@ -37,9 +37,9 @@
<text>{{ formatTimestamp(item.createTime) }}</text> <text>{{ formatTimestamp(item.createTime) }}</text>
</view> </view>
<view class="line3"> <view class="line3">
<view @click="goPay(item)" class="showOrder">支付</view> <view v-if="item.orderStatus == '0'" @click="goPay(item)" class="showOrder">支付</view>
<view @click="gotoDetail(item)" class="showOrder">查看订单</view> <view v-if="item.goodsType == '2'" @click="gotoDetail(item)" class="showOrder">查看订单</view>
<view @click="gotoEvaluate(item)" class="evaluate" v-if="item.orderStatus === '1' && !item.commentDesc">评价订单</view> <view @click="gotoEvaluate(item)" class="evaluate" v-if="item.goodsType == '2' && item.orderStatus === '1' && !item.commentDesc">评价订单</view>
</view> </view>
</view> </view>
@ -176,7 +176,7 @@ export default {
async goPay(data) { async goPay(data) {
let that = this let that = this
await request({ await request({
url: '/pay/toPay', url: '/userClient/pay/toPay',
method: 'get', method: 'get',
params: {orderId: data.id} params: {orderId: data.id}
}).then((res) => { }).then((res) => {