diff --git a/pages/index/center.vue b/pages/index/center.vue index 2ffcbd3..882a72b 100644 --- a/pages/index/center.vue +++ b/pages/index/center.vue @@ -241,7 +241,7 @@ customerServicePopup, }, computed: { - ...mapState(['riceInfo']), + ...mapState(['userInfo', 'riceInfo']), adList() { let arr = []; if (this.configList?.shop_get_image) { diff --git a/pages_order/components/progress.vue b/pages_order/components/progress.vue new file mode 100644 index 0000000..479bee1 --- /dev/null +++ b/pages_order/components/progress.vue @@ -0,0 +1,90 @@ + + + + + \ No newline at end of file diff --git a/pages_order/mine/memberCenter.vue b/pages_order/mine/memberCenter.vue index 90cc64f..5e84e2f 100644 --- a/pages_order/mine/memberCenter.vue +++ b/pages_order/mine/memberCenter.vue @@ -1,444 +1,391 @@ + - - (不同会员等级商品价格不一样,可以设置给与推荐人佣金。) + + + + {{ `累积消费达到${3800}元或直接充值即可成为会员` }} - --> - - - - - - - - - 累计消费满{{ item.money }},将获得{{ item.title }} - - - - - + + + 充值会员 + - - - - + + + + + 合计: + + ¥ + + {{ totalPrice }} + + + + 开通会员 + + - \ No newline at end of file diff --git a/pages_order/mine/partner.vue b/pages_order/mine/partner.vue index 25919fb..2d6d702 100644 --- a/pages_order/mine/partner.vue +++ b/pages_order/mine/partner.vue @@ -1,77 +1,88 @@ - @@ -131,6 +142,151 @@