From 6a1b1e5d31a30b27ab1a7fe21d3d7805dbbdae77 Mon Sep 17 00:00:00 2001 From: ch Date: Fri, 15 Apr 2022 18:35:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/api/base.js | 6 +- common/api/order.js | 13 +- common/store/index.js | 7 +- common/utils/requset.js | 8 +- components/UiButton.vue | 4 +- mobile/index.html | 2 + mobile/static/account/bg.png | Bin 0 -> 5262 bytes mobile/static/account/dz.png | Bin 0 -> 1312 bytes mobile/static/account/edit.png | Bin 0 -> 539 bytes mobile/static/account/fh.png | Bin 0 -> 906 bytes mobile/static/account/fk.png | Bin 0 -> 915 bytes mobile/static/account/kf.png | Bin 0 -> 827 bytes mobile/static/account/sh.png | Bin 0 -> 976 bytes mobile/static/account/sz.png | Bin 0 -> 884 bytes mobile/static/account/tk.png | Bin 0 -> 1494 bytes mobile/static/account/tx.png | Bin 0 -> 6689 bytes mobile/static/account/xx.png | Bin 0 -> 536 bytes mobile/static/common/arrow.png | Bin 0 -> 324 bytes mobile/static/common/dz.png | Bin 0 -> 1312 bytes .../static/common}/tabbar/account-active.png | Bin .../static/common}/tabbar/account.png | Bin .../static/common}/tabbar/category-active.png | Bin .../static/common}/tabbar/category.png | Bin .../static/common}/tabbar/home-active.png | Bin .../static/common}/tabbar/home.png | Bin .../common}/tabbar/shopping-cart-active.png | Bin .../static/common}/tabbar/shopping-cart.png | Bin mobile/static/goods/back.png | Bin 0 -> 393 bytes mobile/static/goods/buy.png | Bin 0 -> 2236 bytes mobile/static/goods/buy_max.png | Bin 0 -> 1321 bytes mobile/static/goods/cart.png | Bin 0 -> 19387 bytes mobile/static/goods/cart_icon.png | Bin 0 -> 869 bytes mobile/static/goods/category_banner.jpg | Bin 0 -> 101365 bytes mobile/static/goods/seckill.png | Bin 0 -> 7207 bytes mobile/static/goods/service_icon.png | Bin 0 -> 983 bytes mobile/static/img/banner.d90fa59b.png | Bin 0 -> 290330 bytes mobile/static/img/bg.8abe32c0.png | Bin 0 -> 5262 bytes mobile/static/img/cart.5b9fd199.png | Bin 0 -> 19387 bytes .../static/img/category_banner.af669ac8.jpg | Bin 0 -> 101365 bytes mobile/static/img/empty.bdec362e.png | Bin 0 -> 20052 bytes mobile/static/img/empty.c4b1f0ad.png | Bin 0 -> 15085 bytes mobile/static/img/payFail.56d373f0.png | Bin 0 -> 12893 bytes mobile/static/img/paySuccess.c4840d30.png | Bin 0 -> 14330 bytes mobile/static/img/seckill.b74bac11.png | Bin 0 -> 7207 bytes mobile/static/img/tx.71ed472a.png | Bin 0 -> 6689 bytes mobile/static/index.a5c69d49.css | 1 + mobile/static/index/banner.jpg | Bin 0 -> 171718 bytes mobile/static/index/bz.png | Bin 0 -> 1092 bytes mobile/static/index/logo.png | Bin 0 -> 3511 bytes mobile/static/index/msg.png | Bin 0 -> 946 bytes mobile/static/index/search.png | Bin 0 -> 696 bytes mobile/static/index/time.png | Bin 0 -> 432 bytes mobile/static/js/chunk-vendors.a572362a.js | 20 ++ mobile/static/js/index.31aa826a.js | 1 + .../pages-account-address-create.035e7c86.js | 1 + ...ate~pages-account-address-edit.e9038bc1.js | 0 ...ist~pages-account-set~b5c0a9b8.867d7867.js | 2 +- ...etUserInfo~pages-good~c5c5f8ee.99503546.js | 1 + ...etUserInfo~pages-orde~bbb2dfdd.8635c79d.js | 1 + .../js/pages-account-address-edit.2ff96ff1.js | 1 + .../js/pages-account-address-list.b4ec0ec4.js | 1 + ...tegory~pages-goods-li~44ded30c.80ed3bf3.js | 1 + .../static/js/pages-account-index.f47c44ef.js | 2 +- .../pages-account-message-group.44374f23.js | 1 + .../js/pages-account-message-list.e9400c62.js | 1 + .../pages-account-setting-index.83bc1b06.js | 1 + .../pages-account-setting-setName.0fad4e4f.js | 1 + ...egory~pages-goods-lis~0a59f9e5.d6544611.js | 1 + ...-list-index~pages-goods-search.c3fbf84d.js | 1 + ...es-account-setting-setUserInfo.fcefb09c.js | 1 + mobile/static/js/pages-cart-cart.d6d53070.js | 1 + ...rCart~pages-goods-detail-index.e15287f4.js | 1 + ...t-tabBarCart~pages-index-index.2ea55f2c.js | 1 + .../js/pages-cart-tabBarCart.9c6d9646.js | 1 + .../js/pages-goods-category.101193d8.js | 1 + .../js/pages-goods-detail-index.a514de89.js | 1 + ...erDetail-index~pages-~91194ab6.ce51eea8.js | 1 + .../js/pages-goods-list-index.b4529011.js | 1 + .../static/js/pages-goods-search.68742121.js | 1 + .../static/js/pages-index-index.fb25e301.js | 1 + mobile/static/js/pages-login.59d77935.js | 1 + .../js/pages-order-detail-index.e477f78e.js | 1 + mobile/static/js/pages-order-list.b8d8780f.js | 1 + ...-order-saleAfter-saleAfterList.371dafda.js | 1 + .../static/js/pages-order-payFail.03953c33.js | 1 + .../js/pages-order-paySuccess.51a53816.js | 1 + ...order-saleAfter-saleAfterApply.c4d8c193.js | 1 + ...-order-saleAfter-saleAfterEdit.96148f0c.js | 1 + ...aleAfter-saleAfterDetail-index.98a325f9.js | 1 + ...-order-saleAfter-saleAfterEdit.6fe35baf.js | 1 + ...-order-saleAfter-saleAfterList.89d33c18.js | 1 + ...rder-saleAfter-saleAfterSelect.47a6eb48.js | 1 + .../static/js/pages-order-submit.617edd9c.js | 1 + .../static/js/pages-seckill.4ae35db6.js | 2 +- mobile/static/message/empty.png | Bin 0 -> 20052 bytes mobile/static/order/cg.png | Bin 0 -> 2277 bytes mobile/static/order/dw.png | Bin 0 -> 760 bytes mobile/static/order/empty.png | Bin 0 -> 15085 bytes mobile/static/order/fh.png | Bin 0 -> 2442 bytes mobile/static/order/fk.png | Bin 0 -> 2430 bytes mobile/static/order/payFail.png | Bin 0 -> 12893 bytes mobile/static/order/paySuccess.png | Bin 0 -> 14330 bytes mobile/static/order/qx.png | Bin 0 -> 2341 bytes mobile/static/order/wx.png | Bin 0 -> 728 bytes mobile/static/order/zfb.png | Bin 0 -> 782 bytes mobile/static/search/arrow.png | Bin 0 -> 393 bytes mobile/static/search/del.png | Bin 0 -> 525 bytes mobile/static/search/search.png | Bin 0 -> 730 bytes mobile/static/seckill/banner.png | Bin 0 -> 290330 bytes mobile/static/seckill/btn.png | Bin 0 -> 1995 bytes mobile/static/seckill/btn2.png | Bin 0 -> 410 bytes mobile/static/seckill/jz.png | Bin 0 -> 435 bytes pages/account/message/list.vue | 4 +- pages/goods/category.vue | 1 - .../order/detail/components/LogisitcsInfo.vue | 36 ++++ pages/order/detail/components/Operation.vue | 112 ++++++++++ pages/order/detail/components/OrderInfo.vue | 72 +++++++ pages/order/detail/components/StatusTips.vue | 79 ++++--- pages/order/detail/index.vue | 203 ++---------------- pages/order/saleAfter/saleAfterList.vue | 4 +- pages/order/saleAfter/saleAfterSelect.vue | 21 +- unpackage/dist/build/h5/index.html | 2 +- unpackage/dist/build/h5/static/.DS_Store | Bin 12292 -> 10244 bytes .../dist/build/h5/static/js/index.c0366e50.js | 1 - ...es-account-setting-setUserInfo.36f97bd9.js | 1 - ...etUserInfo~pages-good~0ec021a1.a8da2200.js | 1 - .../js/pages-account-address-list.8ef835db.js | 1 - .../js/pages-account-message-list.ac001162.js | 1 - .../pages-account-setting-index.6dccc25f.js | 1 - .../pages-account-setting-setName.f327f1a8.js | 1 - ...-category~pages-goods~8dc6b344.84e17f50.js | 1 - ...es-account-setting-setUserInfo.d8236988.js | 1 - .../h5/static/js/pages-cart-cart.d3610b36.js | 1 - .../js/pages-cart-tabBarCart.f71cc167.js | 1 - .../js/pages-goods-category.3912445a.js | 1 - .../js/pages-goods-detail-index.3fd7169e.js | 1 - ...etail-index~pages-order-submit.1bd99594.js | 1 - .../js/pages-goods-list-index.ba098250.js | 1 - .../static/js/pages-goods-search.92210050.js | 1 - .../static/js/pages-index-index.02c22eeb.js | 1 - .../h5/static/js/pages-login.b9376b22.js | 1 - .../js/pages-order-detail-index.fb90f1b4.js | 1 - ...aleAfter-saleAfterDetail-index.c2da35d9.js | 1 - ...-order-saleAfter-saleAfterList.bc7fe445.js | 1 - .../static/js/pages-order-payFail.490302b5.js | 1 - .../js/pages-order-paySuccess.d4736e8f.js | 1 - ...order-saleAfter-saleAfterApply.e3b56054.js | 1 - ...aleAfter-saleAfterDetail-index.3f260219.js | 1 - ...aleAfter-saleAfterDetail-index.58caa4bf.js | 1 - ...-order-saleAfter-saleAfterList.3104c762.js | 1 - .../static/js/pages-order-submit.a6569824.js | 1 - .../dist/build/h5/static/testImg/.DS_Store | Bin 6148 -> 0 bytes unpackage/dist/build/h5/static/testImg/1.png | Bin 6878 -> 0 bytes unpackage/dist/build/h5/static/testImg/2.png | Bin 6119 -> 0 bytes unpackage/dist/build/h5/static/testImg/3.png | Bin 2654 -> 0 bytes 155 files changed, 394 insertions(+), 272 deletions(-) create mode 100644 mobile/index.html create mode 100644 mobile/static/account/bg.png create mode 100644 mobile/static/account/dz.png create mode 100644 mobile/static/account/edit.png create mode 100644 mobile/static/account/fh.png create mode 100644 mobile/static/account/fk.png create mode 100644 mobile/static/account/kf.png create mode 100644 mobile/static/account/sh.png create mode 100644 mobile/static/account/sz.png create mode 100644 mobile/static/account/tk.png create mode 100644 mobile/static/account/tx.png create mode 100644 mobile/static/account/xx.png create mode 100644 mobile/static/common/arrow.png create mode 100644 mobile/static/common/dz.png rename {unpackage/dist/build/h5/static => mobile/static/common}/tabbar/account-active.png (100%) rename {unpackage/dist/build/h5/static => mobile/static/common}/tabbar/account.png (100%) rename {unpackage/dist/build/h5/static => mobile/static/common}/tabbar/category-active.png (100%) rename {unpackage/dist/build/h5/static => mobile/static/common}/tabbar/category.png (100%) rename {unpackage/dist/build/h5/static => mobile/static/common}/tabbar/home-active.png (100%) rename {unpackage/dist/build/h5/static => mobile/static/common}/tabbar/home.png (100%) rename {unpackage/dist/build/h5/static => mobile/static/common}/tabbar/shopping-cart-active.png (100%) rename {unpackage/dist/build/h5/static => mobile/static/common}/tabbar/shopping-cart.png (100%) create mode 100644 mobile/static/goods/back.png create mode 100644 mobile/static/goods/buy.png create mode 100644 mobile/static/goods/buy_max.png create mode 100644 mobile/static/goods/cart.png create mode 100644 mobile/static/goods/cart_icon.png create mode 100644 mobile/static/goods/category_banner.jpg create mode 100644 mobile/static/goods/seckill.png create mode 100644 mobile/static/goods/service_icon.png create mode 100644 mobile/static/img/banner.d90fa59b.png create mode 100644 mobile/static/img/bg.8abe32c0.png create mode 100644 mobile/static/img/cart.5b9fd199.png create mode 100644 mobile/static/img/category_banner.af669ac8.jpg create mode 100644 mobile/static/img/empty.bdec362e.png create mode 100644 mobile/static/img/empty.c4b1f0ad.png create mode 100644 mobile/static/img/payFail.56d373f0.png create mode 100644 mobile/static/img/paySuccess.c4840d30.png create mode 100644 mobile/static/img/seckill.b74bac11.png create mode 100644 mobile/static/img/tx.71ed472a.png create mode 100644 mobile/static/index.a5c69d49.css create mode 100644 mobile/static/index/banner.jpg create mode 100644 mobile/static/index/bz.png create mode 100644 mobile/static/index/logo.png create mode 100644 mobile/static/index/msg.png create mode 100644 mobile/static/index/search.png create mode 100644 mobile/static/index/time.png create mode 100644 mobile/static/js/chunk-vendors.a572362a.js create mode 100644 mobile/static/js/index.31aa826a.js create mode 100644 mobile/static/js/pages-account-address-create.035e7c86.js rename unpackage/dist/build/h5/static/js/pages-account-address-create~pages-account-address-edit.6044b33d.js => mobile/static/js/pages-account-address-create~pages-account-address-edit.e9038bc1.js (100%) rename unpackage/dist/build/h5/static/js/pages-account-address-create~pages-account-address-edit~pages-account-address-list~pages-account-set~fbdcb16b.ed219115.js => mobile/static/js/pages-account-address-create~pages-account-address-edit~pages-account-address-list~pages-account-set~b5c0a9b8.867d7867.js (73%) create mode 100644 mobile/static/js/pages-account-address-create~pages-account-address-edit~pages-account-setting-setUserInfo~pages-good~c5c5f8ee.99503546.js create mode 100644 mobile/static/js/pages-account-address-create~pages-account-address-edit~pages-account-setting-setUserInfo~pages-orde~bbb2dfdd.8635c79d.js create mode 100644 mobile/static/js/pages-account-address-edit.2ff96ff1.js create mode 100644 mobile/static/js/pages-account-address-list.b4ec0ec4.js create mode 100644 mobile/static/js/pages-account-address-list~pages-cart-cart~pages-cart-tabBarCart~pages-goods-category~pages-goods-li~44ded30c.80ed3bf3.js rename unpackage/dist/build/h5/static/js/pages-account-index.1813ddd2.js => mobile/static/js/pages-account-index.f47c44ef.js (63%) create mode 100644 mobile/static/js/pages-account-message-group.44374f23.js create mode 100644 mobile/static/js/pages-account-message-list.e9400c62.js create mode 100644 mobile/static/js/pages-account-setting-index.83bc1b06.js create mode 100644 mobile/static/js/pages-account-setting-setName.0fad4e4f.js create mode 100644 mobile/static/js/pages-account-setting-setName~pages-account-setting-setUserInfo~pages-goods-category~pages-goods-lis~0a59f9e5.d6544611.js create mode 100644 mobile/static/js/pages-account-setting-setName~pages-goods-category~pages-goods-list-index~pages-goods-search.c3fbf84d.js create mode 100644 mobile/static/js/pages-account-setting-setUserInfo.fcefb09c.js create mode 100644 mobile/static/js/pages-cart-cart.d6d53070.js create mode 100644 mobile/static/js/pages-cart-cart~pages-cart-tabBarCart~pages-goods-detail-index.e15287f4.js create mode 100644 mobile/static/js/pages-cart-cart~pages-cart-tabBarCart~pages-index-index.2ea55f2c.js create mode 100644 mobile/static/js/pages-cart-tabBarCart.9c6d9646.js create mode 100644 mobile/static/js/pages-goods-category.101193d8.js create mode 100644 mobile/static/js/pages-goods-detail-index.a514de89.js create mode 100644 mobile/static/js/pages-goods-detail-index~pages-order-detail-index~pages-order-saleAfter-saleAfterDetail-index~pages-~91194ab6.ce51eea8.js create mode 100644 mobile/static/js/pages-goods-list-index.b4529011.js create mode 100644 mobile/static/js/pages-goods-search.68742121.js create mode 100644 mobile/static/js/pages-index-index.fb25e301.js create mode 100644 mobile/static/js/pages-login.59d77935.js create mode 100644 mobile/static/js/pages-order-detail-index.e477f78e.js create mode 100644 mobile/static/js/pages-order-list.b8d8780f.js create mode 100644 mobile/static/js/pages-order-list~pages-order-saleAfter-saleAfterList.371dafda.js create mode 100644 mobile/static/js/pages-order-payFail.03953c33.js create mode 100644 mobile/static/js/pages-order-paySuccess.51a53816.js create mode 100644 mobile/static/js/pages-order-saleAfter-saleAfterApply.c4d8c193.js create mode 100644 mobile/static/js/pages-order-saleAfter-saleAfterApply~pages-order-saleAfter-saleAfterEdit.96148f0c.js create mode 100644 mobile/static/js/pages-order-saleAfter-saleAfterDetail-index.98a325f9.js create mode 100644 mobile/static/js/pages-order-saleAfter-saleAfterEdit.6fe35baf.js create mode 100644 mobile/static/js/pages-order-saleAfter-saleAfterList.89d33c18.js create mode 100644 mobile/static/js/pages-order-saleAfter-saleAfterSelect.47a6eb48.js create mode 100644 mobile/static/js/pages-order-submit.617edd9c.js rename unpackage/dist/build/h5/static/js/pages-seckill.c3e9c645.js => mobile/static/js/pages-seckill.4ae35db6.js (50%) create mode 100644 mobile/static/message/empty.png create mode 100644 mobile/static/order/cg.png create mode 100644 mobile/static/order/dw.png create mode 100644 mobile/static/order/empty.png create mode 100644 mobile/static/order/fh.png create mode 100644 mobile/static/order/fk.png create mode 100644 mobile/static/order/payFail.png create mode 100644 mobile/static/order/paySuccess.png create mode 100644 mobile/static/order/qx.png create mode 100644 mobile/static/order/wx.png create mode 100644 mobile/static/order/zfb.png create mode 100644 mobile/static/search/arrow.png create mode 100644 mobile/static/search/del.png create mode 100644 mobile/static/search/search.png create mode 100644 mobile/static/seckill/banner.png create mode 100644 mobile/static/seckill/btn.png create mode 100644 mobile/static/seckill/btn2.png create mode 100644 mobile/static/seckill/jz.png create mode 100644 pages/order/detail/components/LogisitcsInfo.vue create mode 100644 pages/order/detail/components/Operation.vue create mode 100644 pages/order/detail/components/OrderInfo.vue delete mode 100644 unpackage/dist/build/h5/static/js/index.c0366e50.js delete mode 100644 unpackage/dist/build/h5/static/js/pages-account-address-create~pages-account-address-edit~pages-account-setting-setUserInfo.36f97bd9.js delete mode 100644 unpackage/dist/build/h5/static/js/pages-account-address-create~pages-account-address-edit~pages-account-setting-setUserInfo~pages-good~0ec021a1.a8da2200.js delete mode 100644 unpackage/dist/build/h5/static/js/pages-account-address-list.8ef835db.js delete mode 100644 unpackage/dist/build/h5/static/js/pages-account-message-list.ac001162.js delete mode 100644 unpackage/dist/build/h5/static/js/pages-account-setting-index.6dccc25f.js delete mode 100644 unpackage/dist/build/h5/static/js/pages-account-setting-setName.f327f1a8.js delete mode 100644 unpackage/dist/build/h5/static/js/pages-account-setting-setName~pages-cart-cart~pages-cart-tabBarCart~pages-goods-category~pages-goods~8dc6b344.84e17f50.js delete mode 100644 unpackage/dist/build/h5/static/js/pages-account-setting-setUserInfo.d8236988.js delete mode 100644 unpackage/dist/build/h5/static/js/pages-cart-cart.d3610b36.js delete mode 100644 unpackage/dist/build/h5/static/js/pages-cart-tabBarCart.f71cc167.js delete mode 100644 unpackage/dist/build/h5/static/js/pages-goods-category.3912445a.js delete mode 100644 unpackage/dist/build/h5/static/js/pages-goods-detail-index.3fd7169e.js delete mode 100644 unpackage/dist/build/h5/static/js/pages-goods-detail-index~pages-order-detail-index~pages-order-submit.1bd99594.js delete mode 100644 unpackage/dist/build/h5/static/js/pages-goods-list-index.ba098250.js delete mode 100644 unpackage/dist/build/h5/static/js/pages-goods-search.92210050.js delete mode 100644 unpackage/dist/build/h5/static/js/pages-index-index.02c22eeb.js delete mode 100644 unpackage/dist/build/h5/static/js/pages-login.b9376b22.js delete mode 100644 unpackage/dist/build/h5/static/js/pages-order-detail-index.fb90f1b4.js delete mode 100644 unpackage/dist/build/h5/static/js/pages-order-detail-index~pages-order-saleAfter-saleAfterDetail-index.c2da35d9.js delete mode 100644 unpackage/dist/build/h5/static/js/pages-order-list~pages-order-saleAfter-saleAfterList.bc7fe445.js delete mode 100644 unpackage/dist/build/h5/static/js/pages-order-payFail.490302b5.js delete mode 100644 unpackage/dist/build/h5/static/js/pages-order-paySuccess.d4736e8f.js delete mode 100644 unpackage/dist/build/h5/static/js/pages-order-saleAfter-saleAfterApply.e3b56054.js delete mode 100644 unpackage/dist/build/h5/static/js/pages-order-saleAfter-saleAfterApply~pages-order-saleAfter-saleAfterDetail-index.3f260219.js delete mode 100644 unpackage/dist/build/h5/static/js/pages-order-saleAfter-saleAfterDetail-index.58caa4bf.js delete mode 100644 unpackage/dist/build/h5/static/js/pages-order-saleAfter-saleAfterList.3104c762.js delete mode 100644 unpackage/dist/build/h5/static/js/pages-order-submit.a6569824.js delete mode 100644 unpackage/dist/build/h5/static/testImg/.DS_Store delete mode 100644 unpackage/dist/build/h5/static/testImg/1.png delete mode 100644 unpackage/dist/build/h5/static/testImg/2.png delete mode 100644 unpackage/dist/build/h5/static/testImg/3.png diff --git a/common/api/base.js b/common/api/base.js index ab47109..8195f71 100644 --- a/common/api/base.js +++ b/common/api/base.js @@ -2,7 +2,7 @@ * @Author: ch * @Date: 2022-04-06 17:29:13 * @LastEditors: ch - * @LastEditTime: 2022-04-07 09:58:34 + * @LastEditTime: 2022-04-15 14:17:14 * @Description: file content */ @@ -20,12 +20,12 @@ export const ApiGetAddress = () => export const ApiPostAddress = (data) => ToAsyncAwait(MsbRequestTk.post(`${BASE_URL}/receiveAddress`, data)); /** - * 修改 + * 收货地址修改 */ export const ApiPutAddress = (data) => ToAsyncAwait(MsbRequestTk.put(`${BASE_URL}/receiveAddress`, data)); /** - * 删除 + * 收货删除 */ export const ApiDeleteAddress = (data) => ToAsyncAwait(MsbRequestTk.delete(`${BASE_URL}/receiveAddress?idList=${data.idList}`)); \ No newline at end of file diff --git a/common/api/order.js b/common/api/order.js index 81a2900..00141fc 100644 --- a/common/api/order.js +++ b/common/api/order.js @@ -2,7 +2,7 @@ * @Author: ch * @Date: 2022-03-29 17:38:17 * @LastEditors: ch - * @LastEditTime: 2022-04-15 11:09:37 + * @LastEditTime: 2022-04-15 11:29:32 * @Description: file content */ import {ToAsyncAwait, MsbRequestTk} from '@/common/utils'; @@ -34,6 +34,13 @@ export const ApiGetBeforeCartOrder = (data) => */ export const ApiGetOrderDetail = (id) => ToAsyncAwait(MsbRequestTk.get(`${BASE_URL}/app/tradeOrder/${id}`)); + +/** + * 订单商品详情信息 + * @param {*} orderProductId + */ +export const ApiGetOrderProductDetail = ({orderProductId}) => + ToAsyncAwait(MsbRequestTk.get(`${BASE_URL}/app/tradeOrder/product/${orderProductId}`)); /** * 提交订单 * @param {*} data @@ -55,6 +62,10 @@ export const ApiPutCancelOrder = (data) => export const ApiPostWxPay = (data) => ToAsyncAwait(MsbRequestTk.post(`${BASE_URL}/pay/wxPay/app`, data)); + + + + /** * 申请售后 * @param {*} data diff --git a/common/store/index.js b/common/store/index.js index 90c5e1d..1858125 100644 --- a/common/store/index.js +++ b/common/store/index.js @@ -2,7 +2,7 @@ * @Author: ch * @Date: 2022-03-22 18:28:52 * @LastEditors: ch - * @LastEditTime: 2022-04-08 16:23:33 + * @LastEditTime: 2022-04-15 14:14:20 * @Description: file content */ import Vue from 'vue' @@ -37,10 +37,5 @@ export default new Vuex.Store({ state.address = address; uni.setStorageSync(ADDRESS, JSON.stringify(address)); } - }, - actions:{ - UPDATE_ADDRESS(){ - - } } }) \ No newline at end of file diff --git a/common/utils/requset.js b/common/utils/requset.js index 2bfc138..96b54c0 100644 --- a/common/utils/requset.js +++ b/common/utils/requset.js @@ -2,7 +2,7 @@ * @Author: ch * @Date: 2022-03-17 17:42:32 * @LastEditors: ch - * @LastEditTime: 2022-04-14 15:19:47 + * @LastEditTime: 2022-04-15 18:30:31 * @Description: 项目接口请求统一处理器,返回一个需要token和不需要token的请求封装方法 */ @@ -11,8 +11,8 @@ import $store from '@/common/store'; const ENV = 'test'; const BASE_URL = { - // 'test' : 'http://k8s-horse-gateway.mashibing.cn', - 'test' : '', + 'test' : 'http://k8s-horse-gateway.mashibing.cn', + // 'test' : '', 'release' : '', 'prod' : '' }; @@ -51,7 +51,7 @@ MsbRequestTk.baseUrl = BASE_URL[ENV]; MsbRequestTk.use('request', (option) => { - const token = $store.state.token + const token = $store.state.token; if(!token){ const pages = getCurrentPages(); const page = pages[pages.length - 1]; diff --git a/components/UiButton.vue b/components/UiButton.vue index 7fd9880..74dbf98 100644 --- a/components/UiButton.vue +++ b/components/UiButton.vue @@ -2,7 +2,7 @@ * @Author: ch * @Date: 2022-03-26 10:06:38 * @LastEditors: ch - * @LastEditTime: 2022-04-13 17:44:38 + * @LastEditTime: 2022-04-15 15:43:12 * @Description: file content -->