diff --git a/api/fetch.js b/api/fetch.js index 6443777..848bd68 100644 --- a/api/fetch.js +++ b/api/fetch.js @@ -10,6 +10,8 @@ const fetch = (key, data = {}, transform = true, loadingTitle) => { } if (res.code == 200) { resolve(res.result) + } else { + reject(res) } } diff --git a/pages.json b/pages.json index bfefd07..20ad1c9 100644 --- a/pages.json +++ b/pages.json @@ -72,9 +72,6 @@ { "path": "auth/wxUserInfo" }, - { - "path": "auth/facialVerify" - }, { "path": "report/test/intro" }, @@ -102,6 +99,18 @@ { "path": "product/productDetail" }, + { + "path": "order/userInfo/infoFill" + }, + { + "path": "order/userInfo/idUpload" + }, + { + "path": "order/userInfo/facialVerify" + }, + { + "path": "order/userInfo/facialVerifyCustom" + }, { "path": "order/orderConfirm/index" }, diff --git a/pages/index/index.vue b/pages/index/index.vue index 51b5c63..689a64c 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -73,9 +73,6 @@ }, onLoad() { - // todo: delete - // this.$utils.navigateTo('/pages_order/auth/facialVerify') - this.productSwiperList = [ { id: '001', diff --git a/pages_order/address/addressPopup.vue b/pages_order/address/addressPopup.vue index f8ecb6e..17e29e2 100644 --- a/pages_order/address/addressPopup.vue +++ b/pages_order/address/addressPopup.vue @@ -39,7 +39,6 @@ 选择省市区街道 - diff --git a/pages_order/comment/commentRecords.vue b/pages_order/comment/commentRecords.vue index 2a6de7f..59c1c7b 100644 --- a/pages_order/comment/commentRecords.vue +++ b/pages_order/comment/commentRecords.vue @@ -100,9 +100,9 @@ createTime: '2023-04-18', content: '包装很精致,性价比非常高,终于收到啦,期待效果,每日一包,超级方便,真的能坚持服用', images: [ - '/pages_order/static/index/medicine-1.png', - '/pages_order/static/index/medicine-2.png', - '/pages_order/static/index/medicine-3.png', + '/pages_order/static/index/recommend-pic.png', + '/pages_order/static/index/recommend-pic.png', + '/pages_order/static/index/recommend-pic.png', ], productServeScore: 5, questionExperienceScore: 4, @@ -116,9 +116,9 @@ createTime: '2023-04-18', content: '包装很精致,性价比非常高,终于收到啦,期待效果,每日一包,超级方便,真的能坚持服用', images: [ - '/pages_order/static/index/medicine-1.png', - '/pages_order/static/index/medicine-2.png', - '/pages_order/static/index/medicine-3.png', + '/pages_order/static/index/recommend-pic.png', + '/pages_order/static/index/recommend-pic.png', + '/pages_order/static/index/recommend-pic.png', ], productServeScore: 5, questionExperienceScore: 4, @@ -132,9 +132,9 @@ createTime: '2023-04-18', content: '包装很精致,性价比非常高,终于收到啦,期待效果,每日一包,超级方便,真的能坚持服用', images: [ - '/pages_order/static/index/medicine-1.png', - '/pages_order/static/index/medicine-2.png', - '/pages_order/static/index/medicine-3.png', + '/pages_order/static/index/recommend-pic.png', + '/pages_order/static/index/recommend-pic.png', + '/pages_order/static/index/recommend-pic.png', ], productServeScore: 5, questionExperienceScore: 4, diff --git a/pages_order/order/orderConfirm/index.vue b/pages_order/order/orderConfirm/index.vue index be11046..b5e156f 100644 --- a/pages_order/order/orderConfirm/index.vue +++ b/pages_order/order/orderConfirm/index.vue @@ -95,7 +95,7 @@ return { addressData: null, orderData: null, - checkboxValue : [] + checkboxValue : [], } }, computed: { @@ -124,6 +124,9 @@ console.log('onLoad') console.log('payOrderProduct', this.payOrderProduct) + // todo: check include Overseas Product ? + this.$utils.navigateTo('/pages_order/order/userInfo/infoFill') + this.orderData = { id: '001', number: 'BH872381728321983929', diff --git a/pages_order/order/orderDetail/index.vue b/pages_order/order/orderDetail/index.vue index f1334e3..59207bb 100644 --- a/pages_order/order/orderDetail/index.vue +++ b/pages_order/order/orderDetail/index.vue @@ -215,7 +215,7 @@ productList: [ { id: '0011', - url: '/pages_order/static/index/medicine-1.png', + url: '/pages_order/static/index/recommend-pic.png', name: '月度装定制营养包', type: '保健品', content: '控糖精华萃 x30颗、膳食纤维 ×30颗', @@ -226,7 +226,7 @@ }, { id: '0012', - url: '/pages_order/static/index/medicine-2.png', + url: '/pages_order/static/index/recommend-pic.png', name: '月度装定制营养包', type: '保健品', content: '控糖精华萃 x30颗、膳食纤维 ×30颗', @@ -237,7 +237,7 @@ }, { id: '0013', - url: '/pages_order/static/index/medicine-3.png', + url: '/pages_order/static/index/recommend-pic.png', name: '月度装定制营养包', type: '保健品', content: '控糖精华萃 x30颗、膳食纤维 ×30颗', diff --git a/pages_order/order/orderList/index.vue b/pages_order/order/orderList/index.vue index b8bfe59..7d2813e 100644 --- a/pages_order/order/orderList/index.vue +++ b/pages_order/order/orderList/index.vue @@ -109,7 +109,7 @@ productList: [ { id: '0011', - url: '/pages_order/static/index/medicine-1.png', + url: '/pages_order/static/index/recommend-pic.png', name: '月度装定制营养包', type: '保健品', content: '控糖精华萃 x30颗、膳食纤维 ×30颗', @@ -120,7 +120,7 @@ }, { id: '0012', - url: '/pages_order/static/index/medicine-2.png', + url: '/pages_order/static/index/recommend-pic.png', name: '月度装定制营养包', type: '保健品', content: '控糖精华萃 x30颗、膳食纤维 ×30颗', @@ -131,7 +131,7 @@ }, { id: '0013', - url: '/pages_order/static/index/medicine-3.png', + url: '/pages_order/static/index/recommend-pic.png', name: '月度装定制营养包', type: '保健品', content: '控糖精华萃 x30颗、膳食纤维 ×30颗', @@ -154,7 +154,7 @@ productList: [ { id: '0011', - url: '/pages_order/static/index/medicine-1.png', + url: '/pages_order/static/index/recommend-pic.png', name: '月度装定制营养包', type: '保健品', content: '控糖精华萃 x30颗、膳食纤维 ×30颗', @@ -165,7 +165,7 @@ }, { id: '0012', - url: '/pages_order/static/index/medicine-2.png', + url: '/pages_order/static/index/recommend-pic.png', name: '月度装定制营养包', type: '保健品', content: '控糖精华萃 x30颗、膳食纤维 ×30颗', @@ -176,7 +176,7 @@ }, { id: '0013', - url: '/pages_order/static/index/medicine-3.png', + url: '/pages_order/static/index/recommend-pic.png', name: '月度装定制营养包', type: '保健品', content: '控糖精华萃 x30颗、膳食纤维 ×30颗', @@ -199,7 +199,7 @@ productList: [ { id: '0011', - url: '/pages_order/static/index/medicine-1.png', + url: '/pages_order/static/index/recommend-pic.png', name: '月度装定制营养包', type: '保健品', content: '控糖精华萃 x30颗、膳食纤维 ×30颗', @@ -210,7 +210,7 @@ }, { id: '0012', - url: '/pages_order/static/index/medicine-2.png', + url: '/pages_order/static/index/recommend-pic.png', name: '月度装定制营养包', type: '保健品', content: '控糖精华萃 x30颗、膳食纤维 ×30颗', @@ -221,7 +221,7 @@ }, { id: '0013', - url: '/pages_order/static/index/medicine-3.png', + url: '/pages_order/static/index/recommend-pic.png', name: '月度装定制营养包', type: '保健品', content: '控糖精华萃 x30颗、膳食纤维 ×30颗', @@ -244,7 +244,7 @@ productList: [ { id: '0011', - url: '/pages_order/static/index/medicine-1.png', + url: '/pages_order/static/index/recommend-pic.png', name: '月度装定制营养包', type: '保健品', content: '控糖精华萃 x30颗、膳食纤维 ×30颗', @@ -255,7 +255,7 @@ }, { id: '0012', - url: '/pages_order/static/index/medicine-2.png', + url: '/pages_order/static/index/recommend-pic.png', name: '月度装定制营养包', type: '保健品', content: '控糖精华萃 x30颗、膳食纤维 ×30颗', @@ -266,7 +266,7 @@ }, { id: '0013', - url: '/pages_order/static/index/medicine-3.png', + url: '/pages_order/static/index/recommend-pic.png', name: '月度装定制营养包', type: '保健品', content: '控糖精华萃 x30颗、膳食纤维 ×30颗', @@ -289,7 +289,7 @@ productList: [ { id: '0011', - url: '/pages_order/static/index/medicine-1.png', + url: '/pages_order/static/index/recommend-pic.png', name: '月度装定制营养包', type: '保健品', content: '控糖精华萃 x30颗、膳食纤维 ×30颗', @@ -300,7 +300,7 @@ }, { id: '0012', - url: '/pages_order/static/index/medicine-2.png', + url: '/pages_order/static/index/recommend-pic.png', name: '月度装定制营养包', type: '保健品', content: '控糖精华萃 x30颗、膳食纤维 ×30颗', @@ -311,7 +311,7 @@ }, { id: '0013', - url: '/pages_order/static/index/medicine-3.png', + url: '/pages_order/static/index/recommend-pic.png', name: '月度装定制营养包', type: '保健品', content: '控糖精华萃 x30颗、膳食纤维 ×30颗', @@ -334,7 +334,7 @@ productList: [ { id: '0011', - url: '/pages_order/static/index/medicine-1.png', + url: '/pages_order/static/index/recommend-pic.png', name: '月度装定制营养包', type: '保健品', content: '控糖精华萃 x30颗、膳食纤维 ×30颗', @@ -345,7 +345,7 @@ }, { id: '0012', - url: '/pages_order/static/index/medicine-2.png', + url: '/pages_order/static/index/recommend-pic.png', name: '月度装定制营养包', type: '保健品', content: '控糖精华萃 x30颗、膳食纤维 ×30颗', @@ -356,7 +356,7 @@ }, { id: '0013', - url: '/pages_order/static/index/medicine-3.png', + url: '/pages_order/static/index/recommend-pic.png', name: '月度装定制营养包', type: '保健品', content: '控糖精华萃 x30颗、膳食纤维 ×30颗', diff --git a/pages_order/auth/facialVerify.vue b/pages_order/order/userInfo/facialVerify.vue similarity index 98% rename from pages_order/auth/facialVerify.vue rename to pages_order/order/userInfo/facialVerify.vue index 132edb3..2da0d8a 100644 --- a/pages_order/auth/facialVerify.vue +++ b/pages_order/order/userInfo/facialVerify.vue @@ -1,4 +1,4 @@ -<