diff --git a/config.js b/config.js index 3379f1a..ca65835 100644 --- a/config.js +++ b/config.js @@ -7,7 +7,7 @@ import uvUI from '@/uni_modules/uv-ui-tools' Vue.use(uvUI); // 当前环境 -const type = 'dev' +const type = 'prod' // 环境配置 diff --git a/mixins/product.js b/mixins/product.js index fedb612..ddb3a82 100644 --- a/mixins/product.js +++ b/mixins/product.js @@ -11,7 +11,7 @@ export default { return [2].includes(detail.className) }, isProductPrice(detail){ - return [0, 1].includes(detail.className) + return [0, 1, 3].includes(detail.className) }, } } \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index aad3555..09d5290 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -76,7 +76,10 @@ - + @@ -85,8 +88,15 @@ - - 更多 + + + + + + 更多 + diff --git a/pages/index/product.vue b/pages/index/product.vue index 1dcd686..599ca56 100644 --- a/pages/index/product.vue +++ b/pages/index/product.vue @@ -143,6 +143,10 @@ name : '积分商城', value : 2, }, + { + name : '二手集市', + value : 3, + }, ], } }, diff --git a/pages_order/components/product/submit.vue b/pages_order/components/product/submit.vue index 46d6951..def10d2 100644 --- a/pages_order/components/product/submit.vue +++ b/pages_order/components/product/submit.vue @@ -62,8 +62,9 @@ } }, methods: { + // 美食商城、二手集市 submit(){ - if(this.detail.className == 0){ + if([0, 3].includes(this.detail.className)){ uni.navigateTo({ url: '/pages_order/gourmet/gourmetDetail?id=' + this.detail.shopId }) diff --git a/pages_order/components/product/submitUnitSelect.vue b/pages_order/components/product/submitUnitSelect.vue index 180f23a..bd2fa4c 100644 --- a/pages_order/components/product/submitUnitSelect.vue +++ b/pages_order/components/product/submitUnitSelect.vue @@ -33,13 +33,15 @@ mode=""> - + 价格¥{{ detail.price }} - + 积分兑换 @@ -76,9 +78,14 @@ 费用明细 - + 积分:{{ detail.points }} + + 金额:{{ detail.price }} +