diff --git a/api/order.js b/api/order.js new file mode 100644 index 00000000..3f115aee --- /dev/null +++ b/api/order.js @@ -0,0 +1,3 @@ +export const apiArr = { + orderList: '/api/v2/wechat/commodity/order', // 商品订单列表 +} \ No newline at end of file diff --git a/manifest.json b/manifest.json index 2208364f..889138cc 100644 --- a/manifest.json +++ b/manifest.json @@ -19,8 +19,7 @@ /* 模块配置 */ "modules" : { "Payment" : {}, - "OAuth" : {}, - "Share" : {} + "OAuth" : {} }, /* 应用发布信息 */ "distribute" : { @@ -52,7 +51,7 @@ "appleiap" : {}, "weixin" : { "__platform__" : [ "ios", "android" ], - "appid" : "wxb4018c78fa143450", + "appid" : "", "UniversalLinks" : "" } }, @@ -61,12 +60,6 @@ "appid" : "wxb4018c78fa143450", "UniversalLinks" : "" } - }, - "share" : { - "weixin" : { - "appid" : "wxb4018c78fa143450", - "UniversalLinks" : "" - } } } } diff --git a/packages/myOrders/index/index.vue b/packages/myOrders/index/index.vue index 14250f12..7ce67d01 100644 --- a/packages/myOrders/index/index.vue +++ b/packages/myOrders/index/index.vue @@ -17,26 +17,27 @@ - - 提交订单:{{ item.createTime }} + + 提交订单:{{ item.order_time }} {{ item.status }}{{ getOrderStatus(item.order_status) }} - - - {{ item.status }} + + + {{ getOrderStatus(item.order_status) }} - {{ item.status }} + {{ + getOrderStatus(item.order_status) + }} - + @@ -46,28 +47,30 @@ - 共{{ item.totalCount }}件商品,共计 - {{ item.totalPrice }} + 共{{ item.total_count }}件商品,共计 + {{ item.total_amount }} - + - + - + - + @@ -76,7 +79,7 @@ 再来一单 - + @@ -85,7 +88,7 @@ 再来一单 - + @@ -100,7 +103,8 @@ \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/project.private.config.json b/unpackage/dist/dev/mp-weixin/project.private.config.json index dd6c8564..c210ad91 100644 --- a/unpackage/dist/dev/mp-weixin/project.private.config.json +++ b/unpackage/dist/dev/mp-weixin/project.private.config.json @@ -8,15 +8,15 @@ "miniprogram": { "list": [ { - "name": "packages/shop/goods/index", - "pathName": "packages/shop/goods/index", - "query": "id=30", + "name": "packages/shop/address/index", + "pathName": "packages/shop/address/index", + "query": "", "scene": null, "launchMode": "default" }, { - "name": "packages/shop/shopCar/index", - "pathName": "packages/shop/shopCar/index", + "name": "packages/shop/addAddress/index", + "pathName": "packages/shop/addAddress/index", "query": "", "launchMode": "default", "scene": null