From 038f98397744308f83956d510e12f587eba47391 Mon Sep 17 00:00:00 2001
From: yuanteng0011 <1876787513@qq.com>
Date: Sun, 23 Mar 2025 12:16:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/request.ts | 2 +-
common/global.js | 54 +-
pages.json | 501 +-
.../clotherRentOrderList.vue | 721 +-
.../clothesRentOrderDetail.vue | 2 +
pages/login/login.vue | 2 +-
pages/workshop/index/index.vue | 46 +-
.../dist/cache/.vite/deps/_metadata.json | 8 -
unpackage/dist/cache/.vite/deps/package.json | 3 -
.../dist/dev/.vue-devtools/frontServer.js | 0
unpackage/dist/dev/.vue-devtools/port.js | 1 -
unpackage/dist/dev/mp-alipay/App.axml | 0
unpackage/dist/dev/mp-alipay/addProduct.js | 79 -
unpackage/dist/dev/mp-alipay/api/request.js | 3 -
unpackage/dist/dev/mp-alipay/app.acss | 1 -
unpackage/dist/dev/mp-alipay/app.js | 47 -
unpackage/dist/dev/mp-alipay/app.json | 68 -
.../dev/mp-alipay/assets/add.c73b1e4b.png | Bin 688 -> 0 bytes
.../dev/mp-alipay/assets/add.dace8cf5.png | Bin 657 -> 0 bytes
.../dev/mp-alipay/assets/address.e91cc3a1.png | Bin 1579 -> 0 bytes
.../dev/mp-alipay/assets/avator.7ac17437.png | Bin 41943 -> 0 bytes
.../mp-alipay/assets/background.27d7292c.png | Bin 77681 -> 0 bytes
.../mp-alipay/assets/cailiaobao.52f9097b.png | Bin 2799 -> 0 bytes
.../dev/mp-alipay/assets/choose.f501b5d4.png | Bin 911 -> 0 bytes
.../dev/mp-alipay/assets/choosed.ea32c69c.png | Bin 1025 -> 0 bytes
.../mp-alipay/assets/daifahuo.8369326b.png | Bin 1148 -> 0 bytes
.../mp-alipay/assets/daishouhuo.ff694766.png | Bin 1639 -> 0 bytes
.../dev/mp-alipay/assets/dec.1cf16d78.png | Bin 20108 -> 0 bytes
.../mp-alipay/assets/denglong.a91d13af.png | Bin 1613 -> 0 bytes
.../dev/mp-alipay/assets/dingdan.6b4043d6.png | Bin 2434 -> 0 bytes
.../dev/mp-alipay/assets/dingwei.69908177.png | Bin 1141 -> 0 bytes
.../dev/mp-alipay/assets/dingwei.a57a6fb6.png | Bin 1482 -> 0 bytes
.../dev/mp-alipay/assets/dingzhi.d6614f9f.png | Bin 1410 -> 0 bytes
.../dev/mp-alipay/assets/haibao.2883ea9c.png | Bin 1011459 -> 0 bytes
.../assets/jifenduihuan.a1c23524.png | Bin 2565 -> 0 bytes
.../dev/mp-alipay/assets/kefu.eef0848c.png | Bin 1447 -> 0 bytes
.../dev/mp-alipay/assets/left.ddabbcdb.png | Bin 1034 -> 0 bytes
.../mp-alipay/assets/lianxiren_s.17e4954c.png | Bin 1202 -> 0 bytes
.../dev/mp-alipay/assets/product.72fb10c1.png | Bin 35022 -> 0 bytes
.../dev/mp-alipay/assets/product.7900e336.png | Bin 103783 -> 0 bytes
.../dev/mp-alipay/assets/product.d45a003d.png | Bin 105973 -> 0 bytes
.../mp-alipay/assets/productimg.a8fe2d32.png | Bin 32627 -> 0 bytes
.../dev/mp-alipay/assets/pull.902be841.png | Bin 308 -> 0 bytes
.../dev/mp-alipay/assets/qianbao.bbfd6c3d.png | Bin 1256 -> 0 bytes
.../dev/mp-alipay/assets/right.99910151.png | Bin 946 -> 0 bytes
.../dev/mp-alipay/assets/rili.7746043b.png | Bin 3481 -> 0 bytes
.../dev/mp-alipay/assets/rmb.6e85dd4a.png | Bin 545 -> 0 bytes
.../dev/mp-alipay/assets/rmb.dd886a2c.png | Bin 551 -> 0 bytes
.../dev/mp-alipay/assets/rmb_32.6ba70d59.png | Bin 555 -> 0 bytes
.../mp-alipay/assets/rmb_36px.929d25f5.png | Bin 624 -> 0 bytes
.../mp-alipay/assets/rmb_cheng.03ace464.png | Bin 663 -> 0 bytes
.../mp-alipay/assets/rmb_huang.28b44dfc.png | Bin 679 -> 0 bytes
.../mp-alipay/assets/selected.c24e4f58.png | Bin 895 -> 0 bytes
.../mp-alipay/assets/setting_s.3e5c5149.png | Bin 1806 -> 0 bytes
.../assets/shangpingtupian.ec8c0440.png | Bin 46892 -> 0 bytes
.../dev/mp-alipay/assets/shizi.dd0347ec.png | Bin 12084 -> 0 bytes
.../dev/mp-alipay/assets/short.2191a0bf.png | Bin 494 -> 0 bytes
.../dev/mp-alipay/assets/short.be252386.png | Bin 482 -> 0 bytes
.../mp-alipay/assets/shouchiwu.37cdee46.png | Bin 2729 -> 0 bytes
.../dev/mp-alipay/assets/show1.6119e6ca.png | Bin 18500 -> 0 bytes
.../dev/mp-alipay/assets/show2.6ef01c5d.png | Bin 26739 -> 0 bytes
.../dev/mp-alipay/assets/show3.4b906849.png | Bin 13819 -> 0 bytes
.../dev/mp-alipay/assets/show4.00c949b6.png | Bin 16102 -> 0 bytes
.../mp-alipay/assets/sousuokuang.6160c4c7.png | Bin 1599 -> 0 bytes
.../dev/mp-alipay/assets/success.3df77989.png | Bin 1330 -> 0 bytes
.../dev/mp-alipay/assets/tianjia.187834c9.png | Bin 1220 -> 0 bytes
.../dev/mp-alipay/assets/toushi.6558cc23.png | Bin 3025 -> 0 bytes
.../dev/mp-alipay/assets/tuikuan.d34aac5f.png | Bin 5174 -> 0 bytes
.../dev/mp-alipay/assets/xian.51ee54bc.png | Bin 145 -> 0 bytes
.../dev/mp-alipay/assets/xian2.316f0e4c.png | Bin 145 -> 0 bytes
.../mp-alipay/assets/xuanchuan.f0fc207c.png | Bin 56519 -> 0 bytes
.../dev/mp-alipay/assets/yiwen.9096364a.png | Bin 692 -> 0 bytes
.../dev/mp-alipay/assets/you.60391a00.png | Bin 608 -> 0 bytes
.../dev/mp-alipay/assets/you.70a370f0.png | Bin 542 -> 0 bytes
.../mp-alipay/assets/you_cheng.a0b56a7d.png | Bin 492 -> 0 bytes
.../dev/mp-alipay/assets/you_hei.f7b3f203.png | Bin 356 -> 0 bytes
unpackage/dist/dev/mp-alipay/common/assets.js | 73 -
unpackage/dist/dev/mp-alipay/common/vendor.js | 8923 -----------------
.../dist/dev/mp-alipay/mini.project.json | 11 -
.../pages/Shopping-cart/Phone/Phone.acss | 478 -
.../pages/Shopping-cart/Phone/Phone.axml | 1 -
.../pages/Shopping-cart/Phone/Phone.js | 14 -
.../pages/Shopping-cart/Phone/Phone.json | 5 -
.../Shopping-cart/component/addProduct.acss | 517 -
.../Shopping-cart/component/addProduct.axml | 1 -
.../Shopping-cart/component/addProduct.js | 3 -
.../Shopping-cart/component/addProduct.json | 4 -
.../Shopping-cart/component/addProduct2.js | 3 -
.../newaddress_Info/newaddress_Info.acss | 527 -
.../newaddress_Info/newaddress_Info.axml | 1 -
.../newaddress_Info/newaddress_Info.js | 76 -
.../newaddress_Info/newaddress_Info.json | 4 -
.../productmain/productmain.acss | 683 --
.../productmain/productmain.axml | 1 -
.../Shopping-cart/productmain/productmain.js | 167 -
.../productmain/productmain.json | 4 -
.../pages/booking/AppointmentHome.acss | 719 --
.../pages/booking/AppointmentHome.axml | 1 -
.../pages/booking/AppointmentHome.js | 19 -
.../pages/booking/AppointmentHome.json | 4 -
.../booking/BillingOfFees/BillingOfFees.acss | 496 -
.../booking/BillingOfFees/BillingOfFees.axml | 1 -
.../booking/BillingOfFees/BillingOfFees.js | 19 -
.../booking/BillingOfFees/BillingOfFees.json | 4 -
.../pages/booking/ContactInformation.acss | 464 -
.../pages/booking/ContactInformation.axml | 1 -
.../pages/booking/ContactInformation.js | 8 -
.../pages/booking/ContactInformation.json | 4 -
.../CostumeDetails/CostumeDetails.acss | 0
.../CostumeDetails/CostumeDetails.axml | 1 -
.../booking/CostumeDetails/CostumeDetails.js | 49 -
.../CostumeDetails/CostumeDetails.json | 4 -
.../CostumeDisplay/CostumeDisplay.acss | 526 -
.../CostumeDisplay/CostumeDisplay.axml | 1 -
.../booking/CostumeDisplay/CostumeDisplay.js | 61 -
.../CostumeDisplay/CostumeDisplay.json | 4 -
.../ReservationInstructions.acss | 447 -
.../ReservationInstructions.axml | 1 -
.../ReservationInstructions.js | 8 -
.../ReservationInstructions.json | 4 -
.../pages/booking/Simple/Simple.acss | 576 --
.../pages/booking/Simple/Simple.axml | 1 -
.../mp-alipay/pages/booking/Simple/Simple.js | 14 -
.../pages/booking/Simple/Simple.json | 4 -
.../pages/booking/bookingpay/bookingpay.acss | 693 --
.../pages/booking/bookingpay/bookingpay.axml | 1 -
.../pages/booking/bookingpay/bookingpay.js | 8 -
.../pages/booking/bookingpay/bookingpay.json | 4 -
.../dev/mp-alipay/pages/booking/date.acss | 641 --
.../dev/mp-alipay/pages/booking/date.axml | 1 -
.../dist/dev/mp-alipay/pages/booking/date.js | 8 -
.../dev/mp-alipay/pages/booking/date.json | 4 -
.../booking/respectable/respectable.acss | 804 --
.../booking/respectable/respectable.axml | 1 -
.../pages/booking/respectable/respectable.js | 159 -
.../booking/respectable/respectable.json | 6 -
.../dist/dev/mp-alipay/pages/home/home.acss | 603 --
.../dist/dev/mp-alipay/pages/home/home.axml | 1 -
.../dist/dev/mp-alipay/pages/home/home.js | 80 -
.../dist/dev/mp-alipay/pages/home/home.json | 4 -
.../dist/dev/mp-alipay/pages/login/login.acss | 41 -
.../dist/dev/mp-alipay/pages/login/login.axml | 1 -
.../dist/dev/mp-alipay/pages/login/login.js | 58 -
.../dist/dev/mp-alipay/pages/login/login.json | 4 -
.../mp-alipay/pages/mine/Contact/Contact.acss | 492 -
.../mp-alipay/pages/mine/Contact/Contact.axml | 1 -
.../mp-alipay/pages/mine/Contact/Contact.js | 274 -
.../mp-alipay/pages/mine/Contact/Contact.json | 6 -
.../pages/mine/OrderDetails/OrderDetails.acss | 684 --
.../pages/mine/OrderDetails/OrderDetails.axml | 1 -
.../pages/mine/OrderDetails/OrderDetails.js | 66 -
.../pages/mine/OrderDetails/OrderDetails.json | 4 -
.../dev/mp-alipay/pages/mine/main/main.acss | 569 --
.../dev/mp-alipay/pages/mine/main/main.axml | 1 -
.../dev/mp-alipay/pages/mine/main/main.js | 46 -
.../dev/mp-alipay/pages/mine/main/main.json | 4 -
.../pages/mine/mineorders/mineorders.acss | 647 --
.../pages/mine/mineorders/mineorders.axml | 1 -
.../pages/mine/mineorders/mineorders.js | 126 -
.../pages/mine/mineorders/mineorders.json | 4 -
.../order/component/addressComponent.acss | 502 -
.../order/component/addressComponent.axml | 1 -
.../pages/order/component/addressComponent.js | 80 -
.../order/component/addressComponent.json | 5 -
.../pages/order/paysuccess/paysuccess.acss | 515 -
.../pages/order/paysuccess/paysuccess.axml | 1 -
.../pages/order/paysuccess/paysuccess.js | 59 -
.../pages/order/paysuccess/paysuccess.json | 4 -
.../order/product-unpay/product-unpay.acss | 718 --
.../order/product-unpay/product-unpay.axml | 1 -
.../order/product-unpay/product-unpay.js | 8 -
.../order/product-unpay/product-unpay.json | 4 -
.../product-waitpay/product-waitpay.acss | 743 --
.../product-waitpay/product-waitpay.axml | 1 -
.../order/product-waitpay/product-waitpay.js | 185 -
.../product-waitpay/product-waitpay.json | 7 -
.../productOrderDetail.acss | 738 --
.../productOrderDetail.axml | 1 -
.../productOrderDetail/productOrderDetail.js | 18 -
.../productOrderDetail.json | 4 -
.../service/productDetail/productDetail.acss | 686 --
.../service/productDetail/productDetail.axml | 1 -
.../service/productDetail/productDetail.js | 8 -
.../service/productDetail/productDetail.json | 4 -
.../ProductDetails/ProductDetails.acss | 695 --
.../ProductDetails/ProductDetails.axml | 1 -
.../ProductDetails/ProductDetails.js | 88 -
.../ProductDetails/ProductDetails.json | 7 -
.../mp-alipay/pages/store-home/main/main.acss | 582 --
.../mp-alipay/pages/store-home/main/main.axml | 1 -
.../mp-alipay/pages/store-home/main/main.js | 108 -
.../mp-alipay/pages/store-home/main/main.json | 4 -
.../mp-alipay/pages/workshop/index/index.json | 4 -
unpackage/dist/dev/mp-alipay/static/home.png | Bin 1658 -> 0 bytes
.../dev/mp-alipay/static/homeselected.png | Bin 1635 -> 0 bytes
unpackage/dist/dev/mp-alipay/static/mine.png | Bin 2036 -> 0 bytes
.../dev/mp-alipay/static/mineselected.png | Bin 2286 -> 0 bytes
.../dist/dev/mp-alipay/static/shopcar.png | Bin 1444 -> 0 bytes
.../dev/mp-alipay/static/shopcarselected.png | Bin 1643 -> 0 bytes
unpackage/dist/dev/mp-alipay/static/store.png | Bin 1164 -> 0 bytes
.../dev/mp-alipay/static/storeselected.png | Bin 1354 -> 0 bytes
unpackage/dist/dev/mp-alipay/store/index.js | 4 -
.../dist/dev/mp-alipay/store/userStore.js | 25 -
.../components/uni-popup/uni-popup.acss | 24 -
.../components/uni-popup/uni-popup.axml | 1 -
.../components/uni-popup/uni-popup.js | 393 -
.../components/uni-popup/uni-popup.json | 7 -
.../uni-transition/createAnimation.js | 115 -
.../uni-transition/uni-transition.acss | 0
.../uni-transition/uni-transition.axml | 1 -
.../uni-transition/uni-transition.js | 265 -
.../uni-transition/uni-transition.json | 5 -
unpackage/dist/dev/mp-alipay/utils/emitter.js | 4 -
213 files changed, 713 insertions(+), 28438 deletions(-)
delete mode 100644 unpackage/dist/cache/.vite/deps/_metadata.json
delete mode 100644 unpackage/dist/cache/.vite/deps/package.json
delete mode 100644 unpackage/dist/dev/.vue-devtools/frontServer.js
delete mode 100644 unpackage/dist/dev/.vue-devtools/port.js
delete mode 100644 unpackage/dist/dev/mp-alipay/App.axml
delete mode 100644 unpackage/dist/dev/mp-alipay/addProduct.js
delete mode 100644 unpackage/dist/dev/mp-alipay/api/request.js
delete mode 100644 unpackage/dist/dev/mp-alipay/app.acss
delete mode 100644 unpackage/dist/dev/mp-alipay/app.js
delete mode 100644 unpackage/dist/dev/mp-alipay/app.json
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/add.c73b1e4b.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/add.dace8cf5.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/address.e91cc3a1.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/avator.7ac17437.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/background.27d7292c.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/cailiaobao.52f9097b.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/choose.f501b5d4.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/choosed.ea32c69c.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/daifahuo.8369326b.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/daishouhuo.ff694766.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/dec.1cf16d78.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/denglong.a91d13af.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/dingdan.6b4043d6.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/dingwei.69908177.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/dingwei.a57a6fb6.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/dingzhi.d6614f9f.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/haibao.2883ea9c.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/jifenduihuan.a1c23524.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/kefu.eef0848c.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/left.ddabbcdb.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/lianxiren_s.17e4954c.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/product.72fb10c1.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/product.7900e336.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/product.d45a003d.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/productimg.a8fe2d32.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/pull.902be841.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/qianbao.bbfd6c3d.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/right.99910151.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/rili.7746043b.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/rmb.6e85dd4a.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/rmb.dd886a2c.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/rmb_32.6ba70d59.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/rmb_36px.929d25f5.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/rmb_cheng.03ace464.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/rmb_huang.28b44dfc.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/selected.c24e4f58.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/setting_s.3e5c5149.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/shangpingtupian.ec8c0440.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/shizi.dd0347ec.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/short.2191a0bf.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/short.be252386.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/shouchiwu.37cdee46.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/show1.6119e6ca.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/show2.6ef01c5d.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/show3.4b906849.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/show4.00c949b6.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/sousuokuang.6160c4c7.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/success.3df77989.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/tianjia.187834c9.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/toushi.6558cc23.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/tuikuan.d34aac5f.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/xian.51ee54bc.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/xian2.316f0e4c.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/xuanchuan.f0fc207c.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/yiwen.9096364a.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/you.60391a00.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/you.70a370f0.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/you_cheng.a0b56a7d.png
delete mode 100644 unpackage/dist/dev/mp-alipay/assets/you_hei.f7b3f203.png
delete mode 100644 unpackage/dist/dev/mp-alipay/common/assets.js
delete mode 100644 unpackage/dist/dev/mp-alipay/common/vendor.js
delete mode 100644 unpackage/dist/dev/mp-alipay/mini.project.json
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/Shopping-cart/Phone/Phone.acss
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/Shopping-cart/Phone/Phone.axml
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/Shopping-cart/Phone/Phone.js
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/Shopping-cart/Phone/Phone.json
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/Shopping-cart/component/addProduct.acss
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/Shopping-cart/component/addProduct.axml
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/Shopping-cart/component/addProduct.js
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/Shopping-cart/component/addProduct.json
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/Shopping-cart/component/addProduct2.js
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/Shopping-cart/newaddress_Info/newaddress_Info.acss
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/Shopping-cart/newaddress_Info/newaddress_Info.axml
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/Shopping-cart/newaddress_Info/newaddress_Info.js
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/Shopping-cart/newaddress_Info/newaddress_Info.json
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/Shopping-cart/productmain/productmain.acss
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/Shopping-cart/productmain/productmain.axml
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/Shopping-cart/productmain/productmain.js
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/Shopping-cart/productmain/productmain.json
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/AppointmentHome.acss
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/AppointmentHome.axml
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/AppointmentHome.js
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/AppointmentHome.json
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/BillingOfFees/BillingOfFees.acss
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/BillingOfFees/BillingOfFees.axml
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/BillingOfFees/BillingOfFees.js
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/BillingOfFees/BillingOfFees.json
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/ContactInformation.acss
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/ContactInformation.axml
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/ContactInformation.js
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/ContactInformation.json
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/CostumeDetails/CostumeDetails.acss
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/CostumeDetails/CostumeDetails.axml
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/CostumeDetails/CostumeDetails.js
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/CostumeDetails/CostumeDetails.json
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/CostumeDisplay/CostumeDisplay.acss
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/CostumeDisplay/CostumeDisplay.axml
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/CostumeDisplay/CostumeDisplay.js
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/CostumeDisplay/CostumeDisplay.json
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/ReservationInstructions/ReservationInstructions.acss
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/ReservationInstructions/ReservationInstructions.axml
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/ReservationInstructions/ReservationInstructions.js
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/ReservationInstructions/ReservationInstructions.json
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/Simple/Simple.acss
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/Simple/Simple.axml
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/Simple/Simple.js
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/Simple/Simple.json
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/bookingpay/bookingpay.acss
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/bookingpay/bookingpay.axml
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/bookingpay/bookingpay.js
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/bookingpay/bookingpay.json
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/date.acss
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/date.axml
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/date.js
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/date.json
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/respectable/respectable.acss
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/respectable/respectable.axml
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/respectable/respectable.js
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/booking/respectable/respectable.json
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/home/home.acss
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/home/home.axml
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/home/home.js
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/home/home.json
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/login/login.acss
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/login/login.axml
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/login/login.js
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/login/login.json
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/mine/Contact/Contact.acss
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/mine/Contact/Contact.axml
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/mine/Contact/Contact.js
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/mine/Contact/Contact.json
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/mine/OrderDetails/OrderDetails.acss
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/mine/OrderDetails/OrderDetails.axml
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/mine/OrderDetails/OrderDetails.js
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/mine/OrderDetails/OrderDetails.json
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/mine/main/main.acss
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/mine/main/main.axml
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/mine/main/main.js
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/mine/main/main.json
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/mine/mineorders/mineorders.acss
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/mine/mineorders/mineorders.axml
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/mine/mineorders/mineorders.js
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/mine/mineorders/mineorders.json
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/order/component/addressComponent.acss
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/order/component/addressComponent.axml
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/order/component/addressComponent.js
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/order/component/addressComponent.json
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/order/paysuccess/paysuccess.acss
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/order/paysuccess/paysuccess.axml
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/order/paysuccess/paysuccess.js
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/order/paysuccess/paysuccess.json
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/order/product-unpay/product-unpay.acss
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/order/product-unpay/product-unpay.axml
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/order/product-unpay/product-unpay.js
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/order/product-unpay/product-unpay.json
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/order/product-waitpay/product-waitpay.acss
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/order/product-waitpay/product-waitpay.axml
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/order/product-waitpay/product-waitpay.js
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/order/product-waitpay/product-waitpay.json
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/order/productOrderDetail/productOrderDetail.acss
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/order/productOrderDetail/productOrderDetail.axml
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/order/productOrderDetail/productOrderDetail.js
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/order/productOrderDetail/productOrderDetail.json
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/service/productDetail/productDetail.acss
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/service/productDetail/productDetail.axml
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/service/productDetail/productDetail.js
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/service/productDetail/productDetail.json
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/store-home/ProductDetails/ProductDetails.acss
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/store-home/ProductDetails/ProductDetails.axml
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/store-home/ProductDetails/ProductDetails.js
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/store-home/ProductDetails/ProductDetails.json
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/store-home/main/main.acss
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/store-home/main/main.axml
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/store-home/main/main.js
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/store-home/main/main.json
delete mode 100644 unpackage/dist/dev/mp-alipay/pages/workshop/index/index.json
delete mode 100644 unpackage/dist/dev/mp-alipay/static/home.png
delete mode 100644 unpackage/dist/dev/mp-alipay/static/homeselected.png
delete mode 100644 unpackage/dist/dev/mp-alipay/static/mine.png
delete mode 100644 unpackage/dist/dev/mp-alipay/static/mineselected.png
delete mode 100644 unpackage/dist/dev/mp-alipay/static/shopcar.png
delete mode 100644 unpackage/dist/dev/mp-alipay/static/shopcarselected.png
delete mode 100644 unpackage/dist/dev/mp-alipay/static/store.png
delete mode 100644 unpackage/dist/dev/mp-alipay/static/storeselected.png
delete mode 100644 unpackage/dist/dev/mp-alipay/store/index.js
delete mode 100644 unpackage/dist/dev/mp-alipay/store/userStore.js
delete mode 100644 unpackage/dist/dev/mp-alipay/uni_modules/uni-popup/components/uni-popup/uni-popup.acss
delete mode 100644 unpackage/dist/dev/mp-alipay/uni_modules/uni-popup/components/uni-popup/uni-popup.axml
delete mode 100644 unpackage/dist/dev/mp-alipay/uni_modules/uni-popup/components/uni-popup/uni-popup.js
delete mode 100644 unpackage/dist/dev/mp-alipay/uni_modules/uni-popup/components/uni-popup/uni-popup.json
delete mode 100644 unpackage/dist/dev/mp-alipay/uni_modules/uni-transition/components/uni-transition/createAnimation.js
delete mode 100644 unpackage/dist/dev/mp-alipay/uni_modules/uni-transition/components/uni-transition/uni-transition.acss
delete mode 100644 unpackage/dist/dev/mp-alipay/uni_modules/uni-transition/components/uni-transition/uni-transition.axml
delete mode 100644 unpackage/dist/dev/mp-alipay/uni_modules/uni-transition/components/uni-transition/uni-transition.js
delete mode 100644 unpackage/dist/dev/mp-alipay/uni_modules/uni-transition/components/uni-transition/uni-transition.json
delete mode 100644 unpackage/dist/dev/mp-alipay/utils/emitter.js
diff --git a/api/request.ts b/api/request.ts
index e4616ea..07f68f1 100644
--- a/api/request.ts
+++ b/api/request.ts
@@ -6,4 +6,4 @@ export const domain = 'https://www.carboner.cn:8888/api'
export const myIp = 'http://8.130.119.119:9092/api'
export const nwct = 'https://winning-mouse-internally.ngrok-free.app/api'
export const suiUrl = ''
-export const baseUrl = domain
+export const baseUrl = Url
diff --git a/common/global.js b/common/global.js
index 9939914..fa2ff05 100644
--- a/common/global.js
+++ b/common/global.js
@@ -1,4 +1,4 @@
-//订单状态数组
+//实体类订单状态数组
export const stateList = [
{
state: '待支付',
@@ -15,7 +15,7 @@ export const stateList = [
{
state: '已退款',
img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FlPnvgqCp-yituikuan.png',
- msg: '订单已经退款',
+ msg: '订单已退款',
tips: '希望下次能让君满意'
},
{
@@ -41,6 +41,8 @@ export const stateMap = new Map()
stateList.forEach((item)=>{
stateMap.set(item.state,item)
})
+
+//服务类订单状态
export const serviceStateList = [
{
state: '待支付',
@@ -57,7 +59,7 @@ export const serviceStateList = [
{
state: '已退款',
img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FlPnvgqCp-yituikuan.png',
- msg: '订单已经退款',
+ msg: '订单已退款',
tips: '希望下次能让君满意'
},
{
@@ -73,6 +75,7 @@ export const serviceStateList = [
tips: '下次看好了之后再买哦'
}
]
+
export const serviceStateMap = new Map()
serviceStateList.forEach((item)=>{
serviceStateMap.set(item.state,item)
@@ -82,3 +85,48 @@ export const weekDay = function(time) {
let datelist = ['周日','周一','周二','周三','周四','周五','周六',]
return datelist[new Date(time).getDay()];
}
+
+//服装租赁订单
+export const clothesRentOrder = [
+ {
+ state: '待支付',
+ img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FFybMDtHR-dengdaifukuan.png',
+ msg: '等待买家付款',
+ tips: '请于15分钟内付款,超时订单将自动关闭'
+ },
+ {
+ state: '待发货',
+ img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FEOzVqolp-fahuo.png',
+ msg: '等待您来取货',
+ tips: '等待您的光临体验~'
+ },
+ {
+ state: '已退款',
+ img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FlPnvgqCp-yituikuan.png',
+ msg: '订单已退款',
+ tips: '希望下次能让君满意'
+ },
+ {
+ state: '交易完成',
+ img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FaHDhacaI-dengdaifukuan.png',
+ msg: '租赁完成,感谢您的支持',
+ tips: '感谢您的支持'
+ },
+ {
+ state: '交易关闭',
+ img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Fuser_avatar%2F0%2FLPwbfbRj-cancel.png',
+ msg: '您的订单已关闭',
+ tips: '下次看好了之后再买哦'
+ },
+ {
+ state: '待收货',
+ img: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Fuser_avatar%2F0%2FLPwbfbRj-cancel.png',
+ msg: '服装已被您取走',
+ tips: '请好好爱护服装'
+ }
+]
+
+export const clothesRentOrderMap = new Map()
+clothesRentOrder.forEach((item)=>{
+ clothesRentOrderMap.set(item.state,item)
+})
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 3355ed9..65f7b8d 100644
--- a/pages.json
+++ b/pages.json
@@ -1,314 +1,272 @@
{
"pages": [
- {
- "path" : "pages/home/home",
- "style" :
{
- "navigationBarTitleText" : "首页",
- // "enablePullDownRefresh":true, //开启下拉刷新
- "navigationBarBackgroundColor": "#ede8e7"
- }
- },
- {
- "path" : "pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail",
- "style" :
+ "path": "pages/clothesRent/clotherRentOrderList/clotherRentOrderList",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
- "navigationBarTitleText" : "",
- "enablePullDownRefresh":true //开启下拉刷新
- }
- },
- {
- "path" : "pages/my-order/myServiceOrderDetail/myServiceOrderDetail",
- "style" :
+ "path": "pages/home/home",
+ "style": {
+ "navigationBarTitleText": "首页",
+ // "enablePullDownRefresh":true, //开启下拉刷新
+ "navigationBarBackgroundColor": "#ede8e7"
+ }
+ },
{
- "navigationBarTitleText" : "",
- "enablePullDownRefresh":true //开启下拉刷新
- }
- },
- {
- "path" : "pages/my-order/myOrderList/myOrderList",
- "style" :
+ "path": "pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": true //开启下拉刷新
+ }
+ },
{
- "navigationBarTitleText" : "",
- "enablePullDownRefresh":true //开启下拉刷新
- }
- },
- {
- "path" : "pages/my-order/researchOrder/researchOrder",
- "style" :
+ "path": "pages/my-order/myServiceOrderDetail/myServiceOrderDetail",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": true //开启下拉刷新
+ }
+ },
{
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/workshop/searchResult/searchResult",
- "style" :
+ "path": "pages/my-order/myOrderList/myOrderList",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": true //开启下拉刷新
+ }
+ },
{
- "navigationBarTitleText" : ""
- }
- },
-
- {
- "path" : "pages/workshop/searchGood/searchGood",
- "style" :
+ "path": "pages/my-order/researchOrder/researchOrder",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/book/photoProductsOrderDetail/photoProductsOrderDetail",
- "style" :
+ "path": "pages/workshop/searchResult/searchResult",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
+
{
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/book/photoProductsOrder/photoProductsOrder",
- "style" :
+ "path": "pages/workshop/searchGood/searchGood",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/book/photoProductDetail/photoProductDetail",
- "style" :
+ "path": "pages/book/photoProductsOrderDetail/photoProductsOrderDetail",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/book/photoProducts/photoProducts",
- "style" :
+ "path": "pages/book/photoProductsOrder/photoProductsOrder",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/order/component/contactsComponent",
- "style" :
+ "path": "pages/book/photoProductDetail/photoProductDetail",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/coupon/CouponMall/CouponMall",
- "style" :
+ "path": "pages/book/photoProducts/photoProducts",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/testPage/testPage",
- "style" :
+ "path": "pages/order/component/contactsComponent",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/test/test",
- "style" :
+ "path": "pages/coupon/CouponMall/CouponMall",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
- "navigationBarTitleText" : ""
- }
- },
-
- {
- "path" : "pages/mine/main/main",
- "style" :
+ "path": "pages/testPage/testPage",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
- "navigationBarTitleText" : "",
- "enablePullDownRefresh":true //开启下拉刷新
- }
- },
- {
- "path" : "pages/store-home/ProductDetails/ProductDetails",
- "style" :
+ "path": "pages/test/test",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
+
{
- "navigationBarTitleText" : "泠珑水月阁工作室"
- }
- },
- {
- "path" : "pages/Shopping-cart/newaddress_Info/newaddress_Info",
- "style" :
+ "path": "pages/mine/main/main",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": true //开启下拉刷新
+ }
+ },
{
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/order/product-waitpay/product-waitpay",
- "style" :
+ "path": "pages/store-home/ProductDetails/ProductDetails",
+ "style": {
+ "navigationBarTitleText": "泠珑水月阁工作室"
+ }
+ },
{
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/login/login",
- "style" :
+ "path": "pages/Shopping-cart/newaddress_Info/newaddress_Info",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/Shopping-cart/component/addProduct",
- "style" :
+ "path": "pages/order/product-waitpay/product-waitpay",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/workshop/index/index",
- "style" :
+ "path": "pages/login/login",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
- "navigationBarTitleText" : "",
- "enablePullDownRefresh":true //开启下拉刷新
- }
- },
- {
- "path" : "pages/workshop/productmain/productmain",
- "style" :
+ "path": "pages/Shopping-cart/component/addProduct",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/store-home/main/testMain",
- "style" :
+ "path": "pages/workshop/index/index",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": true //开启下拉刷新
+ }
+ },
{
- "navigationBarTitleText" : "",
- "enablePullDownRefresh":true //开启下拉刷新
- }
- },
- {
- "path" : "pages/order/singleGoodOrder/singleGoodOrder",
- "style" :
+ "path": "pages/workshop/productmain/productmain",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/Shopping-cart/productmain/testproductmain",
- "style" :
+ "path": "pages/store-home/main/testMain",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": true //开启下拉刷新
+ }
+ },
{
- "navigationBarTitleText" : "",
- "enablePullDownRefresh":true //开启下拉刷新
- }
- },
- {
- "path" : "pages/mine/addressList/addressList",
- "style" :
+ "path": "pages/order/singleGoodOrder/singleGoodOrder",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/coupon/CouponTips/CouponTips",
- "style" :
+ "path": "pages/Shopping-cart/productmain/testproductmain",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": true //开启下拉刷新
+ }
+ },
{
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/coupon/MyCoupon/MyCoupon",
- "style" :
+ "path": "pages/mine/addressList/addressList",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/order/serviceWaitPay/serviceWaitPay",
- "style" :
+ "path": "pages/coupon/CouponTips/CouponTips",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/mine/Contact/testContact",
- "style" :
+ "path": "pages/coupon/MyCoupon/MyCoupon",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/mine/component/contactPop",
- "style" :
+ "path": "pages/order/serviceWaitPay/serviceWaitPay",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/coupon/OverDueCoupon/OverDueCoupon",
- "style" :
+ "path": "pages/mine/Contact/testContact",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/order/singleServiceWait/singleServiceWait",
- "style" :
+ "path": "pages/mine/component/contactPop",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/activity/activityHome/activityHome",
- "style" :
+ "path": "pages/coupon/OverDueCoupon/OverDueCoupon",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/activity/activityMain/activityMain",
- "style" :
+ "path": "pages/order/singleServiceWait/singleServiceWait",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/clothesRent/clotherRentOrderList/clotherRentOrderList",
- "style" :
+ "path": "pages/activity/activityHome/activityHome",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/clothesRent/clothesRentSubmitOrder/clothesRentSubmitOrder",
- "style" :
+ "path": "pages/activity/activityMain/activityMain",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/book/myPhotoProductsOrderDetail/myPhotoProductsOrderDetail",
- "style" :
+ "path": "pages/clothesRent/clothesRentSubmitOrder/clothesRentSubmitOrder",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
- "navigationBarTitleText" : "",
- "enablePullDownRefresh":true //开启下拉刷新
- }
- },
- {
- "path" : "pages/book/myPhotoProductDetail/myPhotoProductDetail",
- "style" :
+ "path": "pages/book/myPhotoProductsOrderDetail/myPhotoProductsOrderDetail",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": true //开启下拉刷新
+ }
+ },
{
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/book/myPhotoProducts/myPhotoProducts",
- "style" :
+ "path": "pages/book/myPhotoProductDetail/myPhotoProductDetail",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail",
- "style" :
+ "path": "pages/book/myPhotoProducts/myPhotoProducts",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
- "navigationBarTitleText" : ""
+ "path": "pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail",
+ "style": {
+ "navigationBarTitleText": ""
+ }
}
- }
],
- "plugins" : {
- "logisticsPlugin" : {
+ "plugins": {
+ "logisticsPlugin": {
"version": "2.3.0",
"provider": "wx9ad912bf20548d92"
}
@@ -328,27 +286,26 @@
},
"tabBar": {
"backgroundColor": "#FFFFFF",
- "list": [
- {
+ "list": [{
"pagePath": "pages/home/home",
"iconPath": "./static/home.png",
- "text":"首页"
+ "text": "首页"
},
{
"pagePath": "pages/store-home/main/testMain",
"iconPath": "./static/store.png",
- "text":"商城"
+ "text": "商城"
},
{
"pagePath": "pages/Shopping-cart/productmain/testproductmain",
"iconPath": "./static/shopcar.png",
- "text":"购物车"
+ "text": "购物车"
},
{
"pagePath": "pages/mine/main/main",
"iconPath": "./static/mine.png",
- "text":"我的"
+ "text": "我的"
}
]
}
-}
+}
\ No newline at end of file
diff --git a/pages/clothesRent/clotherRentOrderList/clotherRentOrderList.vue b/pages/clothesRent/clotherRentOrderList/clotherRentOrderList.vue
index 33ac745..0d11008 100644
--- a/pages/clothesRent/clotherRentOrderList/clotherRentOrderList.vue
+++ b/pages/clothesRent/clotherRentOrderList/clotherRentOrderList.vue
@@ -1,105 +1,123 @@
-
-
-
- 全部
-
-
-
-
- 待支付
-
-
-
-
- 待提货
-
+
+
+
+ 全部
+
+
+
+
+ 待支付
+
+
+
+
+ 待提货
+
+
+
+
+ 租赁中
+
+
+
+
+ 已完成
+
+
+
-
- 租赁中
-
+
+
+
+
+ 泠珑水月阁
+
+ 00:45
+ 等待买家付款
+
+
+
+ 订单编号:
+ E20241005095840091406189
+
+
+
+
+
+
+ 汉服—曲裾系列
+ ¥138.00
+
+
+
+
+ 提货地址
+
+
+
+ 租赁天数
+ X3
+
+
+ 实付款:
+ ¥138.00
+
+
+
+ 联系客服
+
+
+ 取消订单
+
+
+ 去付款
+
+
+
-
-
- 已完成
-
-
-
-
-
-
-
-
-
- 泠珑水月阁
-
- 00:45
- 等待买家付款
-
-
-
- 订单编号:
- E20241005095840091406189
-
-
-
-
-
-
- 汉服—曲裾系列
- ¥138.00
-
-
-
-
- 提货地址
-
-
-
- 租赁天数
- X3
-
-
- 实付款:
- ¥138.00
-
-
-
- 联系客服
-
-
- 取消订单
-
-
- 去付款
-
-
-
-
+ .mt-15 {
+ margin-top: 28.13rpx;
+ }
+
+ .ml-13 {
+ margin-left: 24.38rpx;
+ }
+
+ .mt-59 {
+ margin-top: 110.63rpx;
+ }
+
+ .mt-11 {
+ margin-top: 20.63rpx;
+ }
+
+ .page {
+ background-color: #ffffff;
+ overflow: hidden;
+ background-size: 100% 100%;
+ background-repeat: no-repeat;
+ width: 100%;
+ overflow-y: auto;
+ overflow-x: hidden;
+ height: 100vh;
+ }
+
+ .section_2 {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 20rpx 41.25rpx 0;
+ background-color: #ebe7e4;
+ }
+
+ .pos {
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ z-index: 9;
+ }
+
+ .font {
+ font-size: 30rpx;
+ font-family: FZSongKeBenXiuKaiS-R-GB;
+ line-height: 28.24rpx;
+ color: #323232;
+ }
+
+ .font_2 {
+ font-size: 30rpx;
+ font-family: FZSongKeBenXiuKaiS-R-GB;
+ line-height: 28.84rpx;
+ color: #323232;
+ }
+
+ .text {
+ line-height: 27.43rpx;
+ }
+
+ .pos_2 {
+ position: absolute;
+ left: 22.5rpx;
+ right: 24.38rpx;
+ top: 108.75rpx;
+ padding-bottom: 40rpx;
+ }
+
+ .list-item {
+ padding: 18.75rpx 15rpx 0;
+ background-color: #ffffff;
+ border-radius: 18.75rpx;
+ }
+
+ .list-item:first-child {
+ margin-top: 0;
+ }
+
+ .group {
+ padding: 0 11.25rpx;
+ }
+
+ .font_3 {
+ font-size: 30rpx;
+ font-family: FZSongKeBenXiuKaiS-R-GB;
+ line-height: 28.01rpx;
+ color: #323232;
+ }
+
+ .font_4 {
+ font-size: 26.25rpx;
+ font-family: FZSongKeBenXiuKaiS-R-GB;
+ line-height: 18.79rpx;
+ color: #ffaaa5;
+ }
+
+ .text_2 {
+ font-size: 28.13rpx;
+ }
+
+ .font_5 {
+ font-size: 26.25rpx;
+ font-family: FZSongKeBenXiuKaiS-R-GB;
+ line-height: 25.84rpx;
+ color: #ffaaa5;
+ }
+
+ .text_3 {
+ line-height: 25.74rpx;
+ }
+
+ .view {
+ margin-top: 18.75rpx;
+ }
+
+ .font_6 {
+ font-size: 26.25rpx;
+ font-family: FZSongKeBenXiuKaiS-R-GB;
+ line-height: 25.84rpx;
+ color: #818181;
+ }
+
+ .font_7 {
+ font-size: 26.25rpx;
+ font-family: FZSongKeBenXiuKaiS-R-GB;
+ line-height: 18.79rpx;
+ color: #818181;
+ }
+
+ .text_4 {
+ line-height: 17.53rpx;
+ }
+
+ .divider {
+ margin-top: 18.75rpx;
+ background-color: #dbdbdb;
+ height: 1.88rpx;
+ }
+
+ .group_2 {
+ margin-top: 26.25rpx;
+ padding: 0 9.38rpx;
+ position: relative;
+ }
+
+ .image {
+ border-radius: 9.38rpx;
+ width: 148.13rpx;
+ height: 165rpx;
+ }
+
+ .group_3 {
+ margin-bottom: 3.75rpx;
+ }
+
+ .font_8 {
+ font-size: 30rpx;
+ font-family: FZSongKeBenXiuKaiS-R-GB;
+ line-height: 29.18rpx;
+ color: #323232;
+ }
+
+ .font_10 {
+ font-size: 30rpx;
+ font-family: FZSongKeBenXiuKaiS-R-GB;
+ line-height: 18.79rpx;
+ color: #323232;
+ }
+
+ .text_6 {
+ margin-left: 7.5rpx;
+ line-height: 20.04rpx;
+ }
+
+ .group_4 {
+ position: absolute;
+ top: 0;
+ right: 0rpx;
+ }
+
+ .image_2 {
+ width: 46.88rpx;
+ height: 46.88rpx;
+ }
+
+ .font_9 {
+ font-size: 26.25rpx;
+ font-family: FZSongKeBenXiuKaiS-R-GB;
+ line-height: 25.84rpx;
+ color: #323232;
+ }
+
+ .text_5 {
+ line-height: 25.22rpx;
+ }
+
+ .view_2 {
+ margin-top: 22.5rpx;
+ }
+
+ .text_7 {
+ font-size: 28.13rpx;
+ line-height: 27.02rpx;
+ }
+
+ .font_11 {
+ font-size: 26.25rpx;
+ font-family: FZSongKeBenXiuKaiS-R-GB;
+ line-height: 18.79rpx;
+ color: #323232;
+ }
+
+ .text_8 {
+ font-size: 28.13rpx;
+ }
+
+ .group_5 {
+ margin-top: 30rpx;
+ }
+
+ .text_9 {
+ font-size: 28.13rpx;
+ line-height: 26.7rpx;
+ }
+
+ .font_12 {
+ font-size: 33.75rpx;
+ font-family: FZSongKeBenXiuKaiS-R-GB;
+ line-height: 22.54rpx;
+ color: #c35c5d;
+ }
+
+ .group_6 {
+ margin-top: 30rpx;
+ padding: 26.25rpx 0rpx 26.25rpx 180rpx;
+ border-top: solid 1.88rpx #dbdbdb;
+ }
+
+ .font_13 {
+ font-size: 26.25rpx;
+ font-family: FZSongKeBenXiuKaiS-R-GB;
+ line-height: 25.84rpx;
+ color: #e79ea1;
+ }
+
+ .text_10 {
+ line-height: 25.54rpx;
+ }
+
+ .text-wrapper {
+ padding: 15rpx 0;
+ background-color: #ffffff;
+ border-radius: 75rpx;
+ width: 153.75rpx;
+ height: 56.25rpx;
+ border-left: solid 1.88rpx #e79ea1;
+ border-right: solid 1.88rpx #e79ea1;
+ border-top: solid 1.88rpx #e79ea1;
+ border-bottom: solid 1.88rpx #e79ea1;
+ }
+
+ .text-wrapper_2 {
+ padding: 15rpx 0;
+ background-color: #e79ea1;
+ border-radius: 75rpx;
+ width: 153.75rpx;
+ height: 56.25rpx;
+ }
+
+ .font_14 {
+ font-size: 26.25rpx;
+ font-family: FZSongKeBenXiuKaiS-R-GB;
+ line-height: 25.84rpx;
+ color: #ffffff;
+ }
+
+ .text_11 {
+ line-height: 24rpx;
+ }
+
+ @import url(../../../common/css/global.css);
+
\ No newline at end of file
diff --git a/pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail.vue b/pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail.vue
index d5f2992..bd33756 100644
--- a/pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail.vue
+++ b/pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail.vue
@@ -88,6 +88,8 @@
import {ref} from 'vue'
import { clothesRentUrl } from '../../../common/globalImagesUrl';
const bkgUrl = ref(clothesRentUrl + '/clothesRentOrderDetail/bkg.png')
+
+