diff --git a/pages/index/center.vue b/pages/index/center.vue index fd036a7..1ae52a7 100644 --- a/pages/index/center.vue +++ b/pages/index/center.vue @@ -2,7 +2,7 @@ - + {{ userInfo.nickName }} @@ -86,7 +86,7 @@ - + 常用功能 @@ -126,7 +126,7 @@ - + 商家功能 @@ -168,6 +168,9 @@ computed: { ...mapGetters(['role']), ...mapState(['userInfo', 'riceInfo']), + isMerchants() { + return this.userInfo.isMerchants === '1' + }, }, data() { return { diff --git a/pages_order/mine/cooperation.vue b/pages_order/mine/cooperation.vue index 992edf0..f48d196 100644 --- a/pages_order/mine/cooperation.vue +++ b/pages_order/mine/cooperation.vue @@ -204,6 +204,7 @@ export default { id, status, status_dictText, + remark, image, shop, name, @@ -227,7 +228,7 @@ export default { this.id = id this.status = status - this.statusDesc = status_dictText + this.statusDesc = status == '2' ? `${status_dictText}:${remark}` : status_dictText } catch (err) { @@ -239,13 +240,15 @@ export default { } try { - const { status, status_dictText } = await this.$fetch('queryShopById', { id: this.id }) + const { status, status_dictText, remark } = await this.$fetch('queryShopById', { id: this.id }) this.status = status - this.statusDesc = status_dictText + this.statusDesc = status == '2' ? `${status_dictText}:${remark}` : status_dictText } catch (err) { - + console.log('--err', err) } + + uni.stopPullDownRefresh(); }, async onSubmit() { try {