Merge branch 'master' of http://122.51.230.86:3000/sunliwei/lanan-repair
This commit is contained in:
commit
5076f85835
@ -70,8 +70,7 @@
|
||||
tabBarVue,
|
||||
VNavigationBar
|
||||
},
|
||||
|
||||
onLoad(data) {
|
||||
onShow(data) {
|
||||
this.getServer()
|
||||
},
|
||||
data() {
|
||||
@ -109,13 +108,8 @@
|
||||
params:{}
|
||||
})
|
||||
this.customInfo = res.data
|
||||
uni.setStorageSync('customerInfo', JSON.stringify(this.customInfo))
|
||||
// JSON.parse(JSON.stringify(files))
|
||||
// const a = uni.getStorageSync('customerInfo')
|
||||
// console.log(JSON.parse(a),115)
|
||||
|
||||
|
||||
}
|
||||
uni.setStorageSync('customerInfo', JSON.stringify(this.customInfo))
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
@ -80,7 +80,7 @@
|
||||
levelEquityList: []
|
||||
};
|
||||
},
|
||||
onLoad(data) {
|
||||
onShow(data) {
|
||||
//当前登录用户信息
|
||||
this.customInfo = JSON.parse(uni.getStorageSync('customerInfo'))
|
||||
this.getMemberList()
|
||||
|
@ -37,7 +37,7 @@
|
||||
customInfo:{}
|
||||
};
|
||||
},
|
||||
onLoad(data) {
|
||||
onShow(data) {
|
||||
//当前登录用户信息
|
||||
this.customInfo = JSON.parse(uni.getStorageSync('customerInfo'))
|
||||
},
|
||||
|
@ -37,9 +37,9 @@
|
||||
<text>{{ formatTimestamp(item.createTime) }}</text>
|
||||
</view>
|
||||
<view class="line3">
|
||||
<view @click="goPay(item)" class="showOrder">支付</view>
|
||||
<view @click="gotoDetail(item)" class="showOrder">查看订单</view>
|
||||
<view @click="gotoEvaluate(item)" class="evaluate" v-if="item.orderStatus === '1' && !item.commentDesc">评价订单</view>
|
||||
<view v-if="item.orderStatus == '0'" @click="goPay(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.goodsType == '2' && item.orderStatus === '1' && !item.commentDesc">评价订单</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@ -176,7 +176,7 @@ export default {
|
||||
async goPay(data) {
|
||||
let that = this
|
||||
await request({
|
||||
url: '/pay/toPay',
|
||||
url: '/userClient/pay/toPay',
|
||||
method: 'get',
|
||||
params: {orderId: data.id}
|
||||
}).then((res) => {
|
||||
|
Loading…
Reference in New Issue
Block a user