diff --git a/components/paymentMethod.vue b/components/paymentMethod.vue index d9c3121..1c2c9fb 100644 --- a/components/paymentMethod.vue +++ b/components/paymentMethod.vue @@ -163,7 +163,7 @@ const radiovalue = defineModel({ watch( () => props.disablePayType, (newval) => { - + console.log('props.disablePayType',newval) const canUsePayType = paymentMethodList.value.filter((item) => { return !newval.includes(item.name); }); @@ -195,9 +195,12 @@ const groupChanges = (type) => { // return; // } radiovalue.value = item; - emits("groupChange", paymentMethodName.value[type - 1]); }; +watch(()=> radiovalue.value.type,(newval)=>{ + emits("groupChange", radiovalue.value); +}) + // 去充值 const goRecharge = () => { if (props.disablePayType.includes("余额支付")) { diff --git a/groupBuying/index/index.vue b/groupBuying/index/index.vue new file mode 100644 index 0000000..17fdc85 --- /dev/null +++ b/groupBuying/index/index.vue @@ -0,0 +1,197 @@ + + + + + \ No newline at end of file diff --git a/groupBuying/my/my.vue b/groupBuying/my/my.vue new file mode 100644 index 0000000..2a20df7 --- /dev/null +++ b/groupBuying/my/my.vue @@ -0,0 +1,188 @@ + + + + + \ No newline at end of file diff --git a/pages.json b/pages.json index 7e00b9c..6980d60 100644 --- a/pages.json +++ b/pages.json @@ -221,11 +221,9 @@ } } ], - "subPackages": [ - { + "subPackages": [{ "root": "user", - "pages": [ - { + "pages": [{ "path": "vip/vip", "style": { "navigationBarTitleText": "", @@ -256,8 +254,7 @@ }, { "root": "distribution", - "pages": [ - { + "pages": [{ "path": "index", "style": { "navigationBarTitleText": "分销中心", @@ -306,8 +303,7 @@ }, { "root": "scoreShop", - "pages": [ - { + "pages": [{ "path": "index/index", "style": { "navigationBarTitleText": "积分商城", @@ -358,6 +354,26 @@ // } // ] // } + ,{ + "root": "groupBuying", + "pages": [ + { + "path": "index/index", + "style": { + "navigationBarTitleText": "拼团特惠", + "navigationStyle": "custom" + } + }, + { + "path": "my/my", + "style": { + "navigationBarTitleText": "拼团特惠", + "navigationStyle": "custom" + } + } + + ] + } ], "uniIdRouter": {}, "globalStyle": { @@ -371,8 +387,7 @@ "color": "#999", "selectedColor": "#000", "borderStyle": "white", - "list": [ - { + "list": [{ "iconPath": "static/tabbar/1.png", "selectedIconPath": "static/tabbar/1-1.png", "pagePath": "pages/index/index", diff --git a/pages/user/member/billDetails.vue b/pages/user/member/billDetails.vue index 1849d52..236656c 100644 --- a/pages/user/member/billDetails.vue +++ b/pages/user/member/billDetails.vue @@ -155,7 +155,7 @@ size: formData.form.size, // status: formData.form.status, shopId: formData.shopId, - id: formData.id + id: formData.id||'' }) } if (res.totalPage == 0 || res.totalPage == 1 && res.totalRow <= 10) {