From 7d2f662690f3ad50a6c1ba2c3d9879fe663f6c71 Mon Sep 17 00:00:00 2001 From: yuanteng0011 <1876787513@qq.com> Date: Wed, 4 Dec 2024 13:49:24 +0800 Subject: [PATCH 1/5] 12 --- pages/workshop/index/index.vue | 113 +++++ .../mp-weixin/pages/workshop/index/index.js | 26 + .../mp-weixin/pages/workshop/index/index.json | 4 + .../mp-weixin/pages/workshop/index/index.wxml | 1 + .../mp-weixin/pages/workshop/index/index.wxss | 475 ++++++++++++++++++ 5 files changed, 619 insertions(+) create mode 100644 pages/workshop/index/index.vue create mode 100644 unpackage/dist/dev/mp-weixin/pages/workshop/index/index.js create mode 100644 unpackage/dist/dev/mp-weixin/pages/workshop/index/index.json create mode 100644 unpackage/dist/dev/mp-weixin/pages/workshop/index/index.wxml create mode 100644 unpackage/dist/dev/mp-weixin/pages/workshop/index/index.wxss diff --git a/pages/workshop/index/index.vue b/pages/workshop/index/index.vue new file mode 100644 index 0000000..157b9be --- /dev/null +++ b/pages/workshop/index/index.vue @@ -0,0 +1,113 @@ + + + + + diff --git a/unpackage/dist/dev/mp-weixin/pages/workshop/index/index.js b/unpackage/dist/dev/mp-weixin/pages/workshop/index/index.js new file mode 100644 index 0000000..2901b58 --- /dev/null +++ b/unpackage/dist/dev/mp-weixin/pages/workshop/index/index.js @@ -0,0 +1,26 @@ +"use strict"; +const common_vendor = require("../../../common/vendor.js"); +const _sfc_main = { + __name: "index", + setup(__props) { + const items = common_vendor.ref([null, null]); + const jump_detail = (index, item) => { + console.log(index); + common_vendor.index.navigateTo({ + url: "../../store-home/ProductDetails/ProductDetails?info=" + JSON.stringify(item) + }); + }; + return (_ctx, _cache) => { + return { + a: common_vendor.f(items.value, (item, index, i0) => { + return { + a: index, + b: common_vendor.o(($event) => jump_detail(index, item), index) + }; + }) + }; + }; + } +}; +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-6d033fba"]]); +wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/workshop/index/index.json b/unpackage/dist/dev/mp-weixin/pages/workshop/index/index.json new file mode 100644 index 0000000..a0812ee --- /dev/null +++ b/unpackage/dist/dev/mp-weixin/pages/workshop/index/index.json @@ -0,0 +1,4 @@ +{ + "navigationBarTitleText": "", + "usingComponents": {} +} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/workshop/index/index.wxml b/unpackage/dist/dev/mp-weixin/pages/workshop/index/index.wxml new file mode 100644 index 0000000..507c4c6 --- /dev/null +++ b/unpackage/dist/dev/mp-weixin/pages/workshop/index/index.wxml @@ -0,0 +1 @@ +最新活动【非遗手工艺体验】玉雕-古法制玉体验99.00 \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/workshop/index/index.wxss b/unpackage/dist/dev/mp-weixin/pages/workshop/index/index.wxss new file mode 100644 index 0000000..a5aaac3 --- /dev/null +++ b/unpackage/dist/dev/mp-weixin/pages/workshop/index/index.wxss @@ -0,0 +1,475 @@ +/* 水平间距 */ +/* 水平间距 */ +/************************************************************ +** 请将全局样式拷贝到项目的全局 CSS 文件或者当前页面的顶部 ** +** 否则页面将无法正常显示 ** +************************************************************/ +html.data-v-6d033fba { + font-size: 16px; +} +body.data-v-6d033fba { + margin: 0; + font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', + 'Droid Sans', 'Helvetica Neue', 'Microsoft Yahei', sans-serif; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} +view.data-v-6d033fba, +image.data-v-6d033fba, +text.data-v-6d033fba { + box-sizing: border-box; + flex-shrink: 0; +} +#app.data-v-6d033fba { + width: 100vw; + height: 100vh; +} +.flex-row.data-v-6d033fba { + display: flex; + flex-direction: row; +} +.flex-col.data-v-6d033fba { + display: flex; + flex-direction: column; +} +.justify-start.data-v-6d033fba { + justify-content: flex-start; +} +.justify-end.data-v-6d033fba { + justify-content: flex-end; +} +.justify-center.data-v-6d033fba { + justify-content: center; +} +.justify-between.data-v-6d033fba { + justify-content: space-between; +} +.justify-around.data-v-6d033fba { + justify-content: space-around; +} +.justify-evenly.data-v-6d033fba { + justify-content: space-evenly; +} +.items-start.data-v-6d033fba { + align-items: flex-start; +} +.items-end.data-v-6d033fba { + align-items: flex-end; +} +.items-center.data-v-6d033fba { + align-items: center; +} +.items-baseline.data-v-6d033fba { + align-items: baseline; +} +.items-stretch.data-v-6d033fba { + align-items: stretch; +} +.self-start.data-v-6d033fba { + align-self: flex-start; +} +.self-end.data-v-6d033fba { + align-self: flex-end; +} +.self-center.data-v-6d033fba { + align-self: center; +} +.self-baseline.data-v-6d033fba { + align-self: baseline; +} +.self-stretch.data-v-6d033fba { + align-self: stretch; +} +.flex-1.data-v-6d033fba { + flex: 1 1 0%; +} +.flex-auto.data-v-6d033fba { + flex: 1 1 auto; +} +.grow.data-v-6d033fba { + flex-grow: 1; +} +.grow-0.data-v-6d033fba { + flex-grow: 0; +} +.shrink.data-v-6d033fba { + flex-shrink: 1; +} +.shrink-0.data-v-6d033fba { + flex-shrink: 0; +} +.relative.data-v-6d033fba { + position: relative; +} +.ml-2.data-v-6d033fba { + margin-left: 3.75rpx; +} +.mt-2.data-v-6d033fba { + margin-top: 3.75rpx; +} +.ml-4.data-v-6d033fba { + margin-left: 7.5rpx; +} +.mt-4.data-v-6d033fba { + margin-top: 7.5rpx; +} +.ml-6.data-v-6d033fba { + margin-left: 11.25rpx; +} +.mt-6.data-v-6d033fba { + margin-top: 11.25rpx; +} +.ml-8.data-v-6d033fba { + margin-left: 15rpx; +} +.mt-8.data-v-6d033fba { + margin-top: 15rpx; +} +.ml-10.data-v-6d033fba { + margin-left: 18.75rpx; +} +.mt-10.data-v-6d033fba { + margin-top: 18.75rpx; +} +.ml-12.data-v-6d033fba { + margin-left: 22.5rpx; +} +.mt-12.data-v-6d033fba { + margin-top: 22.5rpx; +} +.ml-14.data-v-6d033fba { + margin-left: 26.25rpx; +} +.mt-14.data-v-6d033fba { + margin-top: 26.25rpx; +} +.ml-16.data-v-6d033fba { + margin-left: 30rpx; +} +.mt-16.data-v-6d033fba { + margin-top: 30rpx; +} +.ml-18.data-v-6d033fba { + margin-left: 33.75rpx; +} +.mt-18.data-v-6d033fba { + margin-top: 33.75rpx; +} +.ml-20.data-v-6d033fba { + margin-left: 37.5rpx; +} +.mt-20.data-v-6d033fba { + margin-top: 37.5rpx; +} +.ml-22.data-v-6d033fba { + margin-left: 41.25rpx; +} +.mt-22.data-v-6d033fba { + margin-top: 41.25rpx; +} +.ml-24.data-v-6d033fba { + margin-left: 45rpx; +} +.mt-24.data-v-6d033fba { + margin-top: 45rpx; +} +.ml-26.data-v-6d033fba { + margin-left: 48.75rpx; +} +.mt-26.data-v-6d033fba { + margin-top: 48.75rpx; +} +.ml-28.data-v-6d033fba { + margin-left: 52.5rpx; +} +.mt-28.data-v-6d033fba { + margin-top: 52.5rpx; +} +.ml-30.data-v-6d033fba { + margin-left: 56.25rpx; +} +.mt-30.data-v-6d033fba { + margin-top: 56.25rpx; +} +.ml-32.data-v-6d033fba { + margin-left: 60rpx; +} +.mt-32.data-v-6d033fba { + margin-top: 60rpx; +} +.ml-34.data-v-6d033fba { + margin-left: 63.75rpx; +} +.mt-34.data-v-6d033fba { + margin-top: 63.75rpx; +} +.ml-36.data-v-6d033fba { + margin-left: 67.5rpx; +} +.mt-36.data-v-6d033fba { + margin-top: 67.5rpx; +} +.ml-38.data-v-6d033fba { + margin-left: 71.25rpx; +} +.mt-38.data-v-6d033fba { + margin-top: 71.25rpx; +} +.ml-40.data-v-6d033fba { + margin-left: 75rpx; +} +.mt-40.data-v-6d033fba { + margin-top: 75rpx; +} +.ml-42.data-v-6d033fba { + margin-left: 78.75rpx; +} +.mt-42.data-v-6d033fba { + margin-top: 78.75rpx; +} +.ml-44.data-v-6d033fba { + margin-left: 82.5rpx; +} +.mt-44.data-v-6d033fba { + margin-top: 82.5rpx; +} +.ml-46.data-v-6d033fba { + margin-left: 86.25rpx; +} +.mt-46.data-v-6d033fba { + margin-top: 86.25rpx; +} +.ml-48.data-v-6d033fba { + margin-left: 90rpx; +} +.mt-48.data-v-6d033fba { + margin-top: 90rpx; +} +.ml-50.data-v-6d033fba { + margin-left: 93.75rpx; +} +.mt-50.data-v-6d033fba { + margin-top: 93.75rpx; +} +.ml-52.data-v-6d033fba { + margin-left: 97.5rpx; +} +.mt-52.data-v-6d033fba { + margin-top: 97.5rpx; +} +.ml-54.data-v-6d033fba { + margin-left: 101.25rpx; +} +.mt-54.data-v-6d033fba { + margin-top: 101.25rpx; +} +.ml-56.data-v-6d033fba { + margin-left: 105rpx; +} +.mt-56.data-v-6d033fba { + margin-top: 105rpx; +} +.ml-58.data-v-6d033fba { + margin-left: 108.75rpx; +} +.mt-58.data-v-6d033fba { + margin-top: 108.75rpx; +} +.ml-60.data-v-6d033fba { + margin-left: 112.5rpx; +} +.mt-60.data-v-6d033fba { + margin-top: 112.5rpx; +} +.ml-62.data-v-6d033fba { + margin-left: 116.25rpx; +} +.mt-62.data-v-6d033fba { + margin-top: 116.25rpx; +} +.ml-64.data-v-6d033fba { + margin-left: 120rpx; +} +.mt-64.data-v-6d033fba { + margin-top: 120rpx; +} +.ml-66.data-v-6d033fba { + margin-left: 123.75rpx; +} +.mt-66.data-v-6d033fba { + margin-top: 123.75rpx; +} +.ml-68.data-v-6d033fba { + margin-left: 127.5rpx; +} +.mt-68.data-v-6d033fba { + margin-top: 127.5rpx; +} +.ml-70.data-v-6d033fba { + margin-left: 131.25rpx; +} +.mt-70.data-v-6d033fba { + margin-top: 131.25rpx; +} +.ml-72.data-v-6d033fba { + margin-left: 135rpx; +} +.mt-72.data-v-6d033fba { + margin-top: 135rpx; +} +.ml-74.data-v-6d033fba { + margin-left: 138.75rpx; +} +.mt-74.data-v-6d033fba { + margin-top: 138.75rpx; +} +.ml-76.data-v-6d033fba { + margin-left: 142.5rpx; +} +.mt-76.data-v-6d033fba { + margin-top: 142.5rpx; +} +.ml-78.data-v-6d033fba { + margin-left: 146.25rpx; +} +.mt-78.data-v-6d033fba { + margin-top: 146.25rpx; +} +.ml-80.data-v-6d033fba { + margin-left: 150rpx; +} +.mt-80.data-v-6d033fba { + margin-top: 150rpx; +} +.ml-82.data-v-6d033fba { + margin-left: 153.75rpx; +} +.mt-82.data-v-6d033fba { + margin-top: 153.75rpx; +} +.ml-84.data-v-6d033fba { + margin-left: 157.5rpx; +} +.mt-84.data-v-6d033fba { + margin-top: 157.5rpx; +} +.ml-86.data-v-6d033fba { + margin-left: 161.25rpx; +} +.mt-86.data-v-6d033fba { + margin-top: 161.25rpx; +} +.ml-88.data-v-6d033fba { + margin-left: 165rpx; +} +.mt-88.data-v-6d033fba { + margin-top: 165rpx; +} +.ml-90.data-v-6d033fba { + margin-left: 168.75rpx; +} +.mt-90.data-v-6d033fba { + margin-top: 168.75rpx; +} +.ml-92.data-v-6d033fba { + margin-left: 172.5rpx; +} +.mt-92.data-v-6d033fba { + margin-top: 172.5rpx; +} +.ml-94.data-v-6d033fba { + margin-left: 176.25rpx; +} +.mt-94.data-v-6d033fba { + margin-top: 176.25rpx; +} +.ml-96.data-v-6d033fba { + margin-left: 180rpx; +} +.mt-96.data-v-6d033fba { + margin-top: 180rpx; +} +.ml-98.data-v-6d033fba { + margin-left: 183.75rpx; +} +.mt-98.data-v-6d033fba { + margin-top: 183.75rpx; +} +.ml-100.data-v-6d033fba { + margin-left: 187.5rpx; +} +.mt-100.data-v-6d033fba { + margin-top: 187.5rpx; +} +.page.data-v-6d033fba { + padding-top: 37.5rpx; + background-color: #f5f5dc; + width: 100%; + overflow-y: auto; + overflow-x: hidden; + height: 100vh; +} +.image.data-v-6d033fba { + margin: 0 30rpx; + border-radius: 18.75rpx; + width: 92vw; + height: 61.25vw; +} +.text-wrapper.data-v-6d033fba { + margin-top: 26.25rpx; + padding: 27.41rpx 0 23.7rpx; + background-color: #f7de98; +} +.text.data-v-6d033fba { + color: #323232; + font-size: 30rpx; + font-family: Open Sans; + line-height: 27.64rpx; +} +.section.data-v-6d033fba { + padding: 54.38rpx 0 223.13rpx; + background-color: #fff8dc; +} +.grid.data-v-6d033fba { + margin-left: 28.13rpx; + margin-right: 28.13rpx; + height: 976.88rpx; + display: grid; + grid-template-rows: repeat(2, minmax(0, 1fr)); + grid-template-columns: repeat(2, minmax(0, 1fr)); + row-gap: 39.51rpx; + column-gap: 28.26rpx; +} +.grid-item_1.data-v-6d033fba { + padding-bottom: 30.23rpx; + background-color: #ffffff; + border-radius: 18.75rpx; +} +.image_1.data-v-6d033fba { + border-radius: 18.75rpx 18.75rpx 0rpx 0rpx; + width: 333.75rpx; + height: 324.38rpx; +} +.font.data-v-6d033fba { + font-size: 24.38rpx; + font-family: Open Sans; + line-height: 30rpx; + color: #000000; +} +.text_2.data-v-6d033fba { + margin-left: 14.04rpx; + margin-right: 8.46rpx; +} +.group.data-v-6d033fba { + padding: 0 24.38rpx; +} +.image_3.data-v-6d033fba { + width: 26.25rpx; + height: 26.25rpx; +} +.font_2.data-v-6d033fba { + font-size: 30rpx; + font-family: Times New Roman; + line-height: 20.68rpx; + color: #fbb612; +} \ No newline at end of file From a5becf53ac7468abe2caa7d653409fa25581d815 Mon Sep 17 00:00:00 2001 From: yuanteng0011 <1876787513@qq.com> Date: Tue, 10 Dec 2024 15:04:13 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=9D=9E=E9=81=97=E5=B7=A5=E5=9D=8A?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E3=80=81=E6=9C=8D=E5=8A=A1=E7=B1=BB=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/request.ts | 6 +- manifest.json | 5 +- pages.json | 14 + pages/workshop/index/index.vue | 197 ++++-- unpackage/dist/dev/mp-weixin/addProduct.js | 2 +- unpackage/dist/dev/mp-weixin/api/request.js | 3 +- unpackage/dist/dev/mp-weixin/app.js | 8 +- unpackage/dist/dev/mp-weixin/app.json | 8 +- unpackage/dist/dev/mp-weixin/common/vendor.js | 22 +- .../pages/Shopping-cart/Phone/Phone.js | 2 +- .../newaddress_Info/newaddress_Info.js | 2 +- .../Shopping-cart/productmain/productmain.js | 2 +- .../pages/booking/AppointmentHome.js | 2 +- .../booking/BillingOfFees/BillingOfFees.js | 2 +- .../pages/booking/ContactInformation.js | 2 +- .../booking/CostumeDetails/CostumeDetails.js | 3 +- .../booking/CostumeDisplay/CostumeDisplay.js | 2 +- .../ReservationInstructions.js | 2 +- .../mp-weixin/pages/booking/Simple/Simple.js | 2 +- .../pages/booking/bookingpay/bookingpay.js | 2 +- .../dist/dev/mp-weixin/pages/booking/date.js | 2 +- .../pages/booking/respectable/respectable.js | 2 +- .../dist/dev/mp-weixin/pages/home/home.js | 2 +- .../dist/dev/mp-weixin/pages/login/login.js | 2 +- .../mp-weixin/pages/mine/Contact/Contact.js | 2 +- .../pages/mine/OrderDetails/OrderDetails.js | 2 +- .../mp-weixin/pages/mine/bookings/booking.js | 23 - .../pages/mine/bookings/booking.json | 4 - .../pages/mine/bookings/booking.wxml | 1 - .../pages/mine/bookings/booking.wxss | 567 ----------------- .../mp-weixin/pages/mine/bookings/bookings.js | 23 - .../pages/mine/bookings/bookings.json | 4 - .../pages/mine/bookings/bookings.wxml | 1 - .../pages/mine/bookings/bookings.wxss | 577 ------------------ .../dev/mp-weixin/pages/mine/main/main.js | 2 +- .../pages/mine/mineorders/mineorders.js | 12 +- .../pages/order/component/addressComponent.js | 2 +- .../pages/order/paysuccess/paysuccess.js | 2 +- .../order/product-unpay/product-unpay.js | 2 +- .../order/product-waitpay/product-waitpay.js | 2 +- .../productOrderDetail/productOrderDetail.js | 2 +- .../service/productDetail/productDetail.js | 2 +- .../ProductDetails/ProductDetails.js | 2 +- .../mp-weixin/pages/store-home/main/main.js | 2 +- .../mp-weixin/pages/workshop/index/index.js | 32 +- .../mp-weixin/pages/workshop/index/index.wxml | 2 +- .../mp-weixin/pages/workshop/index/index.wxss | 121 ++-- .../dist/dev/mp-weixin/project.config.json | 4 +- .../components/uni-popup/uni-popup.js | 2 +- .../uni-transition/uni-transition.js | 2 +- 50 files changed, 315 insertions(+), 1378 deletions(-) delete mode 100644 unpackage/dist/dev/mp-weixin/pages/mine/bookings/booking.js delete mode 100644 unpackage/dist/dev/mp-weixin/pages/mine/bookings/booking.json delete mode 100644 unpackage/dist/dev/mp-weixin/pages/mine/bookings/booking.wxml delete mode 100644 unpackage/dist/dev/mp-weixin/pages/mine/bookings/booking.wxss delete mode 100644 unpackage/dist/dev/mp-weixin/pages/mine/bookings/bookings.js delete mode 100644 unpackage/dist/dev/mp-weixin/pages/mine/bookings/bookings.json delete mode 100644 unpackage/dist/dev/mp-weixin/pages/mine/bookings/bookings.wxml delete mode 100644 unpackage/dist/dev/mp-weixin/pages/mine/bookings/bookings.wxss diff --git a/api/request.ts b/api/request.ts index a4c63e5..219aee6 100644 --- a/api/request.ts +++ b/api/request.ts @@ -1,3 +1,5 @@ -export const baseUrl = 'http://localhost:9092/api' //后端接口文档 +export const Url = 'http://localhost:9092/api' //后端接口文档 export const testUrl = 'http://123.249.108.160:8888/api' //自己组的服务器接口地址 -export const suiUrl = 'http://154.8.193.216:9092/api' //隋宇霏的接口地址 \ No newline at end of file +export const suiUrl = 'http://154.8.193.216:9092/api' //隋宇霏的接口地址 + +export const baseUrl = testUrl \ No newline at end of file diff --git a/manifest.json b/manifest.json index 49dc1a3..83dab4b 100644 --- a/manifest.json +++ b/manifest.json @@ -50,9 +50,10 @@ /* 快应用特有相关 */ "mp-weixin" : { /* 小程序特有相关 */ - "appid" : "wx3f968a09e31d6bed", + "appid" : "wx61b63e27bddf4ea2", "setting" : { - "urlCheck" : false + "urlCheck" : false, + "minified" : true }, "usingComponents" : true }, diff --git a/pages.json b/pages.json index de96588..3c5ce3c 100644 --- a/pages.json +++ b/pages.json @@ -189,6 +189,20 @@ { "navigationBarTitleText" : "" } + }, + { + "path" : "pages/mine/Contact/Contact", + "style" : + { + "navigationBarTitleText" : "" + } + }, + { + "path" : "pages/workshop/productmain/productmain", + "style" : + { + "navigationBarTitleText" : "" + } } ], "globalStyle": { diff --git a/pages/workshop/index/index.vue b/pages/workshop/index/index.vue index 157b9be..68115d2 100644 --- a/pages/workshop/index/index.vue +++ b/pages/workshop/index/index.vue @@ -1,113 +1,178 @@ diff --git a/unpackage/dist/dev/mp-weixin/addProduct.js b/unpackage/dist/dev/mp-weixin/addProduct.js index 5083a7f..2da82fb 100644 --- a/unpackage/dist/dev/mp-weixin/addProduct.js +++ b/unpackage/dist/dev/mp-weixin/addProduct.js @@ -75,5 +75,5 @@ const _sfc_main = { }; } }; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-ac6f555c"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/Shopping-cart/component/addProduct.vue"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-ac6f555c"]]); exports.MiniProgramPage = MiniProgramPage; diff --git a/unpackage/dist/dev/mp-weixin/api/request.js b/unpackage/dist/dev/mp-weixin/api/request.js index 64a1e34..de58d7a 100644 --- a/unpackage/dist/dev/mp-weixin/api/request.js +++ b/unpackage/dist/dev/mp-weixin/api/request.js @@ -1,3 +1,4 @@ "use strict"; -const baseUrl = "http://localhost:9092/api"; +const testUrl = "http://123.249.108.160:8888/api"; +const baseUrl = testUrl; exports.baseUrl = baseUrl; diff --git a/unpackage/dist/dev/mp-weixin/app.js b/unpackage/dist/dev/mp-weixin/app.js index 3b3f0c6..a0f22d1 100644 --- a/unpackage/dist/dev/mp-weixin/app.js +++ b/unpackage/dist/dev/mp-weixin/app.js @@ -27,17 +27,17 @@ if (!Math) { "./pages/Shopping-cart/component/addProduct.js"; "./pages/mine/OrderDetails/OrderDetails.js"; "./pages/service/productDetail/productDetail.js"; - "./pages/mine/bookings/booking.js"; - "./pages/mine/bookings/bookings.js"; - "./pages/mine/Contact/Contact.js"; + "./pages/workshop/index/index.js"; "./pages/booking/CostumeDisplay/CostumeDisplay.js"; "./pages/booking/CostumeDetails/CostumeDetails.js"; + "./pages/mine/Contact/Contact.js"; + "./pages/workshop/productmain/productmain.js"; } const _sfc_main = {}; function _sfc_render(_ctx, _cache) { return {}; } -const App = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/jiangchengfeiyi-xiaochengxu/App.vue"]]); +const App = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]); function createApp() { const app = common_vendor.createSSRApp(App); app.use(store_index.pinia); diff --git a/unpackage/dist/dev/mp-weixin/app.json b/unpackage/dist/dev/mp-weixin/app.json index 50d265a..80117c9 100644 --- a/unpackage/dist/dev/mp-weixin/app.json +++ b/unpackage/dist/dev/mp-weixin/app.json @@ -24,11 +24,11 @@ "pages/Shopping-cart/component/addProduct", "pages/mine/OrderDetails/OrderDetails", "pages/service/productDetail/productDetail", - "pages/mine/bookings/booking", - "pages/mine/bookings/bookings", - "pages/mine/Contact/Contact", + "pages/workshop/index/index", "pages/booking/CostumeDisplay/CostumeDisplay", - "pages/booking/CostumeDetails/CostumeDetails" + "pages/booking/CostumeDetails/CostumeDetails", + "pages/mine/Contact/Contact", + "pages/workshop/productmain/productmain" ], "window": { "navigationBarTextStyle": "black", diff --git a/unpackage/dist/dev/mp-weixin/common/vendor.js b/unpackage/dist/dev/mp-weixin/common/vendor.js index baa4fb1..ee3f3eb 100644 --- a/unpackage/dist/dev/mp-weixin/common/vendor.js +++ b/unpackage/dist/dev/mp-weixin/common/vendor.js @@ -180,7 +180,6 @@ const stringifySymbol = (v, i = "") => { var _a; return isSymbol(v) ? `Symbol(${(_a = v.description) != null ? _a : i})` : v; }; -const LINEFEED = "\n"; const SLOT_DEFAULT_NAME = "d"; const ON_SHOW = "onShow"; const ON_HIDE = "onHide"; @@ -621,7 +620,7 @@ function getApiCallbacks(args) { } return apiCallbacks; } -function normalizeErrMsg$1(errMsg, name) { +function normalizeErrMsg(errMsg, name) { if (!errMsg || errMsg.indexOf(":fail") === -1) { return name + ":ok"; } @@ -638,7 +637,7 @@ function createAsyncApiCallback(name, args = {}, { beforeAll, beforeSuccess } = const callbackId = invokeCallbackId++; addInvokeCallback(callbackId, name, (res) => { res = res || {}; - res.errMsg = normalizeErrMsg$1(res.errMsg, name); + res.errMsg = normalizeErrMsg(res.errMsg, name); isFunction(beforeAll) && beforeAll(res); if (res.errMsg === name + ":ok") { isFunction(beforeSuccess) && beforeSuccess(res, args); @@ -770,7 +769,7 @@ function promisify$1(name, fn) { } function formatApiArgs(args, options) { const params = args[0]; - if (!options || !isPlainObject$1(options.formatArgs) && isPlainObject$1(params)) { + if (!options || !options.formatArgs || !isPlainObject$1(options.formatArgs) && isPlainObject$1(params)) { return; } const formatArgs = options.formatArgs; @@ -817,12 +816,12 @@ function beforeInvokeApi(name, args, protocol, options) { return errMsg; } } -function normalizeErrMsg(errMsg) { +function parseErrMsg(errMsg) { if (!errMsg || isString(errMsg)) { return errMsg; } if (errMsg.stack) { - console.error(errMsg.message + LINEFEED + errMsg.stack); + console.error(errMsg.message + "\n" + errMsg.stack); return errMsg.message; } return errMsg; @@ -836,7 +835,7 @@ function wrapperTaskApi(name, fn, protocol, options) { } return fn(args, { resolve: (res) => invokeSuccess(id, name, res), - reject: (errMsg2, errRes) => invokeFail(id, name, normalizeErrMsg(errMsg2), errRes) + reject: (errMsg2, errRes) => invokeFail(id, name, parseErrMsg(errMsg2), errRes) }); }; } @@ -1298,8 +1297,8 @@ function populateParameters(fromRes, toRes) { appVersion: "1.0.0", appVersionCode: "100", appLanguage: getAppLanguage(hostLanguage), - uniCompileVersion: "4.15", - uniRuntimeVersion: "4.15", + uniCompileVersion: "4.23", + uniRuntimeVersion: "4.23", uniPlatform: "mp-weixin", deviceBrand, deviceModel: model, @@ -7304,7 +7303,7 @@ function initDefaultProps(options, isBehavior = false) { }; } if (options.behaviors) { - if (options.behaviors.includes("__GLOBAL__://form-field")) { + if (options.behaviors.includes("wx://form-field")) { if (!options.properties || !options.properties.name) { properties.name = { type: null, @@ -7475,7 +7474,7 @@ function initBehaviors(vueOptions) { const behaviors = []; if (isArray(vueBehaviors)) { vueBehaviors.forEach((behavior) => { - behaviors.push(behavior.replace("uni://", "__GLOBAL__://")); + behaviors.push(behavior.replace("uni://", "wx://")); if (behavior === "uni://form-field") { if (isArray(vueProps)) { vueProps.push("name"); @@ -8372,4 +8371,5 @@ exports.sr = sr; exports.t = t; exports.toRaw = toRaw; exports.unref = unref; +exports.watch = watch; exports.wx$1 = wx$1; diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Phone/Phone.js b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Phone/Phone.js index 5b34f16..af0173b 100644 --- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Phone/Phone.js +++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Phone/Phone.js @@ -10,5 +10,5 @@ function _sfc_render(_ctx, _cache) { }) }; } -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-6d058dc0"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/Shopping-cart/Phone/Phone.vue"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-6d058dc0"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/newaddress_Info/newaddress_Info.js b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/newaddress_Info/newaddress_Info.js index b4c633b..8c69c2a 100644 --- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/newaddress_Info/newaddress_Info.js +++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/newaddress_Info/newaddress_Info.js @@ -72,5 +72,5 @@ const _sfc_main = { }; } }; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-fb57d854"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-fb57d854"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.js b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.js index 07fc86c..becd12c 100644 --- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.js +++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.js @@ -163,5 +163,5 @@ const _sfc_main = { }; } }; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-641af6de"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/Shopping-cart/productmain/productmain.vue"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-641af6de"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/booking/AppointmentHome.js b/unpackage/dist/dev/mp-weixin/pages/booking/AppointmentHome.js index 99abf27..078f7f6 100644 --- a/unpackage/dist/dev/mp-weixin/pages/booking/AppointmentHome.js +++ b/unpackage/dist/dev/mp-weixin/pages/booking/AppointmentHome.js @@ -15,5 +15,5 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ }; } }); -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-60893f73"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/booking/AppointmentHome.vue"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-60893f73"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/booking/BillingOfFees/BillingOfFees.js b/unpackage/dist/dev/mp-weixin/pages/booking/BillingOfFees/BillingOfFees.js index 59012db..038beec 100644 --- a/unpackage/dist/dev/mp-weixin/pages/booking/BillingOfFees/BillingOfFees.js +++ b/unpackage/dist/dev/mp-weixin/pages/booking/BillingOfFees/BillingOfFees.js @@ -15,5 +15,5 @@ const _sfc_main = { }; } }; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-cab9a6c6"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/booking/BillingOfFees/BillingOfFees.vue"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-cab9a6c6"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/booking/ContactInformation.js b/unpackage/dist/dev/mp-weixin/pages/booking/ContactInformation.js index e4ea835..bb23879 100644 --- a/unpackage/dist/dev/mp-weixin/pages/booking/ContactInformation.js +++ b/unpackage/dist/dev/mp-weixin/pages/booking/ContactInformation.js @@ -4,5 +4,5 @@ const _sfc_main = {}; function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) { return {}; } -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-43413e24"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/booking/ContactInformation.vue"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-43413e24"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/booking/CostumeDetails/CostumeDetails.js b/unpackage/dist/dev/mp-weixin/pages/booking/CostumeDetails/CostumeDetails.js index bff4794..051e208 100644 --- a/unpackage/dist/dev/mp-weixin/pages/booking/CostumeDetails/CostumeDetails.js +++ b/unpackage/dist/dev/mp-weixin/pages/booking/CostumeDetails/CostumeDetails.js @@ -45,5 +45,4 @@ const _sfc_main = { }; } }; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/booking/CostumeDetails/CostumeDetails.vue"]]); -wx.createPage(MiniProgramPage); +wx.createPage(_sfc_main); diff --git a/unpackage/dist/dev/mp-weixin/pages/booking/CostumeDisplay/CostumeDisplay.js b/unpackage/dist/dev/mp-weixin/pages/booking/CostumeDisplay/CostumeDisplay.js index 97c0039..4c76fe5 100644 --- a/unpackage/dist/dev/mp-weixin/pages/booking/CostumeDisplay/CostumeDisplay.js +++ b/unpackage/dist/dev/mp-weixin/pages/booking/CostumeDisplay/CostumeDisplay.js @@ -57,5 +57,5 @@ const _sfc_main = { }; } }; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-d97852c0"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/booking/CostumeDisplay/CostumeDisplay.vue"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-d97852c0"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/booking/ReservationInstructions/ReservationInstructions.js b/unpackage/dist/dev/mp-weixin/pages/booking/ReservationInstructions/ReservationInstructions.js index 9720bc7..ccd57ba 100644 --- a/unpackage/dist/dev/mp-weixin/pages/booking/ReservationInstructions/ReservationInstructions.js +++ b/unpackage/dist/dev/mp-weixin/pages/booking/ReservationInstructions/ReservationInstructions.js @@ -4,5 +4,5 @@ const _sfc_main = {}; function _sfc_render(_ctx, _cache) { return {}; } -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-a9d91b4b"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/booking/ReservationInstructions/ReservationInstructions.vue"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-a9d91b4b"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/booking/Simple/Simple.js b/unpackage/dist/dev/mp-weixin/pages/booking/Simple/Simple.js index a7bf5f5..803cefc 100644 --- a/unpackage/dist/dev/mp-weixin/pages/booking/Simple/Simple.js +++ b/unpackage/dist/dev/mp-weixin/pages/booking/Simple/Simple.js @@ -10,5 +10,5 @@ function _sfc_render(_ctx, _cache) { }) }; } -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-d54bd2fc"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/booking/Simple/Simple.vue"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-d54bd2fc"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/booking/bookingpay/bookingpay.js b/unpackage/dist/dev/mp-weixin/pages/booking/bookingpay/bookingpay.js index aa1bc8b..f314148 100644 --- a/unpackage/dist/dev/mp-weixin/pages/booking/bookingpay/bookingpay.js +++ b/unpackage/dist/dev/mp-weixin/pages/booking/bookingpay/bookingpay.js @@ -4,5 +4,5 @@ const _sfc_main = {}; function _sfc_render(_ctx, _cache) { return {}; } -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-1d20d48c"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/booking/bookingpay/bookingpay.vue"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-1d20d48c"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/booking/date.js b/unpackage/dist/dev/mp-weixin/pages/booking/date.js index 995a8f4..dd67dc4 100644 --- a/unpackage/dist/dev/mp-weixin/pages/booking/date.js +++ b/unpackage/dist/dev/mp-weixin/pages/booking/date.js @@ -4,5 +4,5 @@ const _sfc_main = {}; function _sfc_render(_ctx, _cache) { return {}; } -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-f815bf4c"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/booking/date.vue"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-f815bf4c"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/booking/respectable/respectable.js b/unpackage/dist/dev/mp-weixin/pages/booking/respectable/respectable.js index 96006fe..6845546 100644 --- a/unpackage/dist/dev/mp-weixin/pages/booking/respectable/respectable.js +++ b/unpackage/dist/dev/mp-weixin/pages/booking/respectable/respectable.js @@ -153,5 +153,5 @@ const _sfc_main = { }; } }; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-cad4fb76"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/booking/respectable/respectable.vue"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-cad4fb76"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/home/home.js b/unpackage/dist/dev/mp-weixin/pages/home/home.js index 1e78aa0..48c1b6f 100644 --- a/unpackage/dist/dev/mp-weixin/pages/home/home.js +++ b/unpackage/dist/dev/mp-weixin/pages/home/home.js @@ -76,5 +76,5 @@ const _sfc_main = { }; } }; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-07e72d3c"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/home/home.vue"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-07e72d3c"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/login/login.js b/unpackage/dist/dev/mp-weixin/pages/login/login.js index f06fc4c..a3ebc4b 100644 --- a/unpackage/dist/dev/mp-weixin/pages/login/login.js +++ b/unpackage/dist/dev/mp-weixin/pages/login/login.js @@ -54,5 +54,5 @@ const _sfc_main = { }; } }; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-e4e4508d"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/login/login.vue"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-e4e4508d"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/mine/Contact/Contact.js b/unpackage/dist/dev/mp-weixin/pages/mine/Contact/Contact.js index d72551e..7d52668 100644 --- a/unpackage/dist/dev/mp-weixin/pages/mine/Contact/Contact.js +++ b/unpackage/dist/dev/mp-weixin/pages/mine/Contact/Contact.js @@ -181,5 +181,5 @@ const _sfc_main = { }; } }; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-0aa6b83b"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/mine/Contact/Contact.vue"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-0aa6b83b"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/mine/OrderDetails/OrderDetails.js b/unpackage/dist/dev/mp-weixin/pages/mine/OrderDetails/OrderDetails.js index 9808391..cb44566 100644 --- a/unpackage/dist/dev/mp-weixin/pages/mine/OrderDetails/OrderDetails.js +++ b/unpackage/dist/dev/mp-weixin/pages/mine/OrderDetails/OrderDetails.js @@ -62,5 +62,5 @@ const _sfc_main = { }; } }; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-add9df0c"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/mine/OrderDetails/OrderDetails.vue"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-add9df0c"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/mine/bookings/booking.js b/unpackage/dist/dev/mp-weixin/pages/mine/bookings/booking.js deleted file mode 100644 index a24b60e..0000000 --- a/unpackage/dist/dev/mp-weixin/pages/mine/bookings/booking.js +++ /dev/null @@ -1,23 +0,0 @@ -"use strict"; -const common_vendor = require("../../../common/vendor.js"); -const _sfc_main = { - __name: "booking", - setup(__props) { - const item = common_vendor.ref([null, null, null]); - const goto = () => { - common_vendor.index.navigateTo({ - url: "/pages/mine/bookings/bookings" - }); - }; - return (_ctx, _cache) => { - return { - a: common_vendor.o(($event) => goto()), - b: common_vendor.f(item.value, (i, k0, i0) => { - return {}; - }) - }; - }; - } -}; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-8f30db34"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/mine/bookings/booking.vue"]]); -wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/mine/bookings/booking.json b/unpackage/dist/dev/mp-weixin/pages/mine/bookings/booking.json deleted file mode 100644 index a0812ee..0000000 --- a/unpackage/dist/dev/mp-weixin/pages/mine/bookings/booking.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "navigationBarTitleText": "", - "usingComponents": {} -} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/mine/bookings/booking.wxml b/unpackage/dist/dev/mp-weixin/pages/mine/bookings/booking.wxml deleted file mode 100644 index 43f717e..0000000 --- a/unpackage/dist/dev/mp-weixin/pages/mine/bookings/booking.wxml +++ /dev/null @@ -1 +0,0 @@ -待消费已消费待消费订单编号：E20241005095840091406189整套约拍【时尚精选】到店日期：2024-10-15具体场次：上午场（09:30-12:00）已选服务：妆发服务；摄影服务;室内；138.00去支付：88.00 \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/mine/bookings/booking.wxss b/unpackage/dist/dev/mp-weixin/pages/mine/bookings/booking.wxss deleted file mode 100644 index 5f3483c..0000000 --- a/unpackage/dist/dev/mp-weixin/pages/mine/bookings/booking.wxss +++ /dev/null @@ -1,567 +0,0 @@ -/* 水平间距 */ -/* 水平间距 */ -/************************************************************ -** 请将全局样式拷贝到项目的全局 CSS 文件或者当前页面的顶部 ** -** 否则页面将无法正常显示 ** -************************************************************/ -html.data-v-8f30db34 { - font-size: 16px; -} -body.data-v-8f30db34 { - margin: 0; - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', - 'Droid Sans', 'Helvetica Neue', 'Microsoft Yahei', sans-serif; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} -view.data-v-8f30db34, -image.data-v-8f30db34, -text.data-v-8f30db34 { - box-sizing: border-box; - flex-shrink: 0; -} -#app.data-v-8f30db34 { - width: 100vw; - height: 100vh; -} -.flex-row.data-v-8f30db34 { - display: flex; - flex-direction: row; -} -.flex-col.data-v-8f30db34 { - display: flex; - flex-direction: column; -} -.justify-start.data-v-8f30db34 { - justify-content: flex-start; -} -.justify-end.data-v-8f30db34 { - justify-content: flex-end; -} -.justify-center.data-v-8f30db34 { - justify-content: center; -} -.justify-between.data-v-8f30db34 { - justify-content: space-between; -} -.justify-around.data-v-8f30db34 { - justify-content: space-around; -} -.justify-evenly.data-v-8f30db34 { - justify-content: space-evenly; -} -.items-start.data-v-8f30db34 { - align-items: flex-start; -} -.items-end.data-v-8f30db34 { - align-items: flex-end; -} -.items-center.data-v-8f30db34 { - align-items: center; -} -.items-baseline.data-v-8f30db34 { - align-items: baseline; -} -.items-stretch.data-v-8f30db34 { - align-items: stretch; -} -.self-start.data-v-8f30db34 { - align-self: flex-start; -} -.self-end.data-v-8f30db34 { - align-self: flex-end; -} -.self-center.data-v-8f30db34 { - align-self: center; -} -.self-baseline.data-v-8f30db34 { - align-self: baseline; -} -.self-stretch.data-v-8f30db34 { - align-self: stretch; -} -.flex-1.data-v-8f30db34 { - flex: 1 1 0%; -} -.flex-auto.data-v-8f30db34 { - flex: 1 1 auto; -} -.grow.data-v-8f30db34 { - flex-grow: 1; -} -.grow-0.data-v-8f30db34 { - flex-grow: 0; -} -.shrink.data-v-8f30db34 { - flex-shrink: 1; -} -.shrink-0.data-v-8f30db34 { - flex-shrink: 0; -} -.relative.data-v-8f30db34 { - position: relative; -} -.ml-2.data-v-8f30db34 { - margin-left: 3.75rpx; -} -.mt-2.data-v-8f30db34 { - margin-top: 3.75rpx; -} -.ml-4.data-v-8f30db34 { - margin-left: 7.5rpx; -} -.mt-4.data-v-8f30db34 { - margin-top: 7.5rpx; -} -.ml-6.data-v-8f30db34 { - margin-left: 11.25rpx; -} -.mt-6.data-v-8f30db34 { - margin-top: 11.25rpx; -} -.ml-8.data-v-8f30db34 { - margin-left: 15rpx; -} -.mt-8.data-v-8f30db34 { - margin-top: 15rpx; -} -.ml-10.data-v-8f30db34 { - margin-left: 18.75rpx; -} -.mt-10.data-v-8f30db34 { - margin-top: 18.75rpx; -} -.ml-12.data-v-8f30db34 { - margin-left: 22.5rpx; -} -.mt-12.data-v-8f30db34 { - margin-top: 22.5rpx; -} -.ml-14.data-v-8f30db34 { - margin-left: 26.25rpx; -} -.mt-14.data-v-8f30db34 { - margin-top: 26.25rpx; -} -.ml-16.data-v-8f30db34 { - margin-left: 30rpx; -} -.mt-16.data-v-8f30db34 { - margin-top: 30rpx; -} -.ml-18.data-v-8f30db34 { - margin-left: 33.75rpx; -} -.mt-18.data-v-8f30db34 { - margin-top: 33.75rpx; -} -.ml-20.data-v-8f30db34 { - margin-left: 37.5rpx; -} -.mt-20.data-v-8f30db34 { - margin-top: 37.5rpx; -} -.ml-22.data-v-8f30db34 { - margin-left: 41.25rpx; -} -.mt-22.data-v-8f30db34 { - margin-top: 41.25rpx; -} -.ml-24.data-v-8f30db34 { - margin-left: 45rpx; -} -.mt-24.data-v-8f30db34 { - margin-top: 45rpx; -} -.ml-26.data-v-8f30db34 { - margin-left: 48.75rpx; -} -.mt-26.data-v-8f30db34 { - margin-top: 48.75rpx; -} -.ml-28.data-v-8f30db34 { - margin-left: 52.5rpx; -} -.mt-28.data-v-8f30db34 { - margin-top: 52.5rpx; -} -.ml-30.data-v-8f30db34 { - margin-left: 56.25rpx; -} -.mt-30.data-v-8f30db34 { - margin-top: 56.25rpx; -} -.ml-32.data-v-8f30db34 { - margin-left: 60rpx; -} -.mt-32.data-v-8f30db34 { - margin-top: 60rpx; -} -.ml-34.data-v-8f30db34 { - margin-left: 63.75rpx; -} -.mt-34.data-v-8f30db34 { - margin-top: 63.75rpx; -} -.ml-36.data-v-8f30db34 { - margin-left: 67.5rpx; -} -.mt-36.data-v-8f30db34 { - margin-top: 67.5rpx; -} -.ml-38.data-v-8f30db34 { - margin-left: 71.25rpx; -} -.mt-38.data-v-8f30db34 { - margin-top: 71.25rpx; -} -.ml-40.data-v-8f30db34 { - margin-left: 75rpx; -} -.mt-40.data-v-8f30db34 { - margin-top: 75rpx; -} -.ml-42.data-v-8f30db34 { - margin-left: 78.75rpx; -} -.mt-42.data-v-8f30db34 { - margin-top: 78.75rpx; -} -.ml-44.data-v-8f30db34 { - margin-left: 82.5rpx; -} -.mt-44.data-v-8f30db34 { - margin-top: 82.5rpx; -} -.ml-46.data-v-8f30db34 { - margin-left: 86.25rpx; -} -.mt-46.data-v-8f30db34 { - margin-top: 86.25rpx; -} -.ml-48.data-v-8f30db34 { - margin-left: 90rpx; -} -.mt-48.data-v-8f30db34 { - margin-top: 90rpx; -} -.ml-50.data-v-8f30db34 { - margin-left: 93.75rpx; -} -.mt-50.data-v-8f30db34 { - margin-top: 93.75rpx; -} -.ml-52.data-v-8f30db34 { - margin-left: 97.5rpx; -} -.mt-52.data-v-8f30db34 { - margin-top: 97.5rpx; -} -.ml-54.data-v-8f30db34 { - margin-left: 101.25rpx; -} -.mt-54.data-v-8f30db34 { - margin-top: 101.25rpx; -} -.ml-56.data-v-8f30db34 { - margin-left: 105rpx; -} -.mt-56.data-v-8f30db34 { - margin-top: 105rpx; -} -.ml-58.data-v-8f30db34 { - margin-left: 108.75rpx; -} -.mt-58.data-v-8f30db34 { - margin-top: 108.75rpx; -} -.ml-60.data-v-8f30db34 { - margin-left: 112.5rpx; -} -.mt-60.data-v-8f30db34 { - margin-top: 112.5rpx; -} -.ml-62.data-v-8f30db34 { - margin-left: 116.25rpx; -} -.mt-62.data-v-8f30db34 { - margin-top: 116.25rpx; -} -.ml-64.data-v-8f30db34 { - margin-left: 120rpx; -} -.mt-64.data-v-8f30db34 { - margin-top: 120rpx; -} -.ml-66.data-v-8f30db34 { - margin-left: 123.75rpx; -} -.mt-66.data-v-8f30db34 { - margin-top: 123.75rpx; -} -.ml-68.data-v-8f30db34 { - margin-left: 127.5rpx; -} -.mt-68.data-v-8f30db34 { - margin-top: 127.5rpx; -} -.ml-70.data-v-8f30db34 { - margin-left: 131.25rpx; -} -.mt-70.data-v-8f30db34 { - margin-top: 131.25rpx; -} -.ml-72.data-v-8f30db34 { - margin-left: 135rpx; -} -.mt-72.data-v-8f30db34 { - margin-top: 135rpx; -} -.ml-74.data-v-8f30db34 { - margin-left: 138.75rpx; -} -.mt-74.data-v-8f30db34 { - margin-top: 138.75rpx; -} -.ml-76.data-v-8f30db34 { - margin-left: 142.5rpx; -} -.mt-76.data-v-8f30db34 { - margin-top: 142.5rpx; -} -.ml-78.data-v-8f30db34 { - margin-left: 146.25rpx; -} -.mt-78.data-v-8f30db34 { - margin-top: 146.25rpx; -} -.ml-80.data-v-8f30db34 { - margin-left: 150rpx; -} -.mt-80.data-v-8f30db34 { - margin-top: 150rpx; -} -.ml-82.data-v-8f30db34 { - margin-left: 153.75rpx; -} -.mt-82.data-v-8f30db34 { - margin-top: 153.75rpx; -} -.ml-84.data-v-8f30db34 { - margin-left: 157.5rpx; -} -.mt-84.data-v-8f30db34 { - margin-top: 157.5rpx; -} -.ml-86.data-v-8f30db34 { - margin-left: 161.25rpx; -} -.mt-86.data-v-8f30db34 { - margin-top: 161.25rpx; -} -.ml-88.data-v-8f30db34 { - margin-left: 165rpx; -} -.mt-88.data-v-8f30db34 { - margin-top: 165rpx; -} -.ml-90.data-v-8f30db34 { - margin-left: 168.75rpx; -} -.mt-90.data-v-8f30db34 { - margin-top: 168.75rpx; -} -.ml-92.data-v-8f30db34 { - margin-left: 172.5rpx; -} -.mt-92.data-v-8f30db34 { - margin-top: 172.5rpx; -} -.ml-94.data-v-8f30db34 { - margin-left: 176.25rpx; -} -.mt-94.data-v-8f30db34 { - margin-top: 176.25rpx; -} -.ml-96.data-v-8f30db34 { - margin-left: 180rpx; -} -.mt-96.data-v-8f30db34 { - margin-top: 180rpx; -} -.ml-98.data-v-8f30db34 { - margin-left: 183.75rpx; -} -.mt-98.data-v-8f30db34 { - margin-top: 183.75rpx; -} -.ml-100.data-v-8f30db34 { - margin-left: 187.5rpx; -} -.mt-100.data-v-8f30db34 { - margin-top: 187.5rpx; -} -.mt-13.data-v-8f30db34 { - margin-top: 24.38rpx; -} -.ml-5.data-v-8f30db34 { - margin-left: 9.38rpx; -} -.page.data-v-8f30db34 { - padding-bottom: 1185rpx; - background-color: #f8e8c1; - width: 100%; - overflow-y: auto; - overflow-x: hidden; - height: 100%; -} -.section.data-v-8f30db34 { - padding: 0 121.88rpx; - background-color: #fffef8; -} -.group.data-v-8f30db34 { - padding: 21.68rpx 4.71rpx 18.23rpx 10.22rpx; -} -.font.data-v-8f30db34 { - font-size: 30rpx; - font-family: Open Sans; - line-height: 26.25rpx; - color: #323232; -} -.text.data-v-8f30db34 { - line-height: 27.6rpx; -} -.text_2.data-v-8f30db34 { - line-height: 27.6rpx; -} -.section_2.data-v-8f30db34 { - background-color: #fb8b05; - width: 112.5rpx; - height: 5.63rpx; -} -.section_3.data-v-8f30db34 { - margin-left: 16.88rpx; - margin-right: 15rpx; - padding: 35.4rpx 19.89rpx 35.4rpx 24.38rpx; - background-color: #fffef8; - border-radius: 18.75rpx; -} -.font_2.data-v-8f30db34 { - font-size: 26.25rpx; - font-family: Open Sans; - line-height: 26.25rpx; - color: #323232; -} -.text_3.data-v-8f30db34 { - color: #fb8b05; - line-height: 24.15rpx; -} -.group_2.data-v-8f30db34 { - margin-top: 18.49rpx; -} -.font_3.data-v-8f30db34 { - font-size: 22.5rpx; - font-family: Open Sans; - color: #818181; -} -.text_4.data-v-8f30db34 { - line-height: 20.85rpx; -} -.text_5.data-v-8f30db34 { - line-height: 16.54rpx; -} -.group_3.data-v-8f30db34 { - margin-top: 29.81rpx; -} -.image.data-v-8f30db34 { - border-radius: 9.38rpx; - width: 118.13rpx; - height: 151.88rpx; -} -.group_4.data-v-8f30db34 { - margin-left: 23.38rpx; - margin-top: 2.19rpx; -} -.text_6.data-v-8f30db34 { - line-height: 24.49rpx; -} -.pos.data-v-8f30db34 { - position: absolute; - left: 0.15rpx; - top: 50%; - transform: translateY(-50%); -} -.text_7.data-v-8f30db34 { - line-height: 24.43rpx; -} -.font_5.data-v-8f30db34 { - font-size: 22.5rpx; - font-family: Open Sans; - line-height: 26.25rpx; - color: #323232; -} -.text_10.data-v-8f30db34 { - margin-top: 22.91rpx; -} -.text_1.data-v-8f30db34 { - margin-top: 3.39rpx; -} -.text_11.data-v-8f30db34 { - margin-top: 20.89rpx; - color: #939393; - font-size: 22.5rpx; - font-family: Inter; - line-height: 22.97rpx; -} -.group_5.data-v-8f30db34 { - margin-left: 3.52rpx; - margin-right: 14.59rpx; -} -.text_8.data-v-8f30db34 { - margin-left: 25.03rpx; - color: #323232; - font-size: 33.75rpx; - font-family: Open Sans; - font-weight: 600; - line-height: 24.88rpx; -} -.image_2.data-v-8f30db34 { - width: 30rpx; - height: 26.25rpx; -} -.image_3.data-v-8f30db34 { - margin-left: -90.66rpx; -} -.font_4.data-v-8f30db34 { - font-size: 26.25rpx; - font-family: Open Sans; - line-height: 19.29rpx; - font-weight: 600; -} -.text_9.data-v-8f30db34 { - margin-left: 61.14rpx; - color: #323232; -} -.group_6.data-v-8f30db34 { - margin-top: 26.68rpx; - padding: 0 9.54rpx; -} -.text_12.data-v-8f30db34 { - margin-right: -8.06rpx; - line-height: 24.23rpx; -} -.group_7.data-v-8f30db34 { - line-height: 21.99rpx; - height: 22.05rpx; -} -.text_13.data-v-8f30db34 { - color: #fb8b05; - font-size: 30rpx; - font-family: Open Sans; - font-weight: 600; - line-height: 21.99rpx; -} -.text_14.data-v-8f30db34 { - color: #fb8b05; - line-height: 19.39rpx; -} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/mine/bookings/bookings.js b/unpackage/dist/dev/mp-weixin/pages/mine/bookings/bookings.js deleted file mode 100644 index 4e5ef07..0000000 --- a/unpackage/dist/dev/mp-weixin/pages/mine/bookings/bookings.js +++ /dev/null @@ -1,23 +0,0 @@ -"use strict"; -const common_vendor = require("../../../common/vendor.js"); -const _sfc_main = { - __name: "bookings", - setup(__props) { - const goto = () => { - common_vendor.index.navigateTo({ - url: "/pages/mine/bookings/booking" - }); - }; - const item = common_vendor.ref([null, null, null]); - return (_ctx, _cache) => { - return { - a: common_vendor.o(($event) => goto()), - b: common_vendor.f(item.value, (i, k0, i0) => { - return {}; - }) - }; - }; - } -}; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-ba0a1264"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/mine/bookings/bookings.vue"]]); -wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/mine/bookings/bookings.json b/unpackage/dist/dev/mp-weixin/pages/mine/bookings/bookings.json deleted file mode 100644 index a0812ee..0000000 --- a/unpackage/dist/dev/mp-weixin/pages/mine/bookings/bookings.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "navigationBarTitleText": "", - "usingComponents": {} -} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/mine/bookings/bookings.wxml b/unpackage/dist/dev/mp-weixin/pages/mine/bookings/bookings.wxml deleted file mode 100644 index e89072e..0000000 --- a/unpackage/dist/dev/mp-weixin/pages/mine/bookings/bookings.wxml +++ /dev/null @@ -1 +0,0 @@ -待消费已消费已消费订单编号：E20241005095840091406189整套约拍【时尚精选】到店日期：2024-10-15具体场次：上午场（09:30-12:00）已选服务：妆发服务；摄影服务;室内；138.00已付款：88.00删除记录 \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/mine/bookings/bookings.wxss b/unpackage/dist/dev/mp-weixin/pages/mine/bookings/bookings.wxss deleted file mode 100644 index 7b1438e..0000000 --- a/unpackage/dist/dev/mp-weixin/pages/mine/bookings/bookings.wxss +++ /dev/null @@ -1,577 +0,0 @@ -/* 水平间距 */ -/* 水平间距 */ -/************************************************************ -** 请将全局样式拷贝到项目的全局 CSS 文件或者当前页面的顶部 ** -** 否则页面将无法正常显示 ** -************************************************************/ -html.data-v-ba0a1264 { - font-size: 16px; -} -body.data-v-ba0a1264 { - margin: 0; - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', - 'Droid Sans', 'Helvetica Neue', 'Microsoft Yahei', sans-serif; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} -view.data-v-ba0a1264, -image.data-v-ba0a1264, -text.data-v-ba0a1264 { - box-sizing: border-box; - flex-shrink: 0; -} -#app.data-v-ba0a1264 { - width: 100vw; - height: 100vh; -} -.flex-row.data-v-ba0a1264 { - display: flex; - flex-direction: row; -} -.flex-col.data-v-ba0a1264 { - display: flex; - flex-direction: column; -} -.justify-start.data-v-ba0a1264 { - justify-content: flex-start; -} -.justify-end.data-v-ba0a1264 { - justify-content: flex-end; -} -.justify-center.data-v-ba0a1264 { - justify-content: center; -} -.justify-between.data-v-ba0a1264 { - justify-content: space-between; -} -.justify-around.data-v-ba0a1264 { - justify-content: space-around; -} -.justify-evenly.data-v-ba0a1264 { - justify-content: space-evenly; -} -.items-start.data-v-ba0a1264 { - align-items: flex-start; -} -.items-end.data-v-ba0a1264 { - align-items: flex-end; -} -.items-center.data-v-ba0a1264 { - align-items: center; -} -.items-baseline.data-v-ba0a1264 { - align-items: baseline; -} -.items-stretch.data-v-ba0a1264 { - align-items: stretch; -} -.self-start.data-v-ba0a1264 { - align-self: flex-start; -} -.self-end.data-v-ba0a1264 { - align-self: flex-end; -} -.self-center.data-v-ba0a1264 { - align-self: center; -} -.self-baseline.data-v-ba0a1264 { - align-self: baseline; -} -.self-stretch.data-v-ba0a1264 { - align-self: stretch; -} -.flex-1.data-v-ba0a1264 { - flex: 1 1 0%; -} -.flex-auto.data-v-ba0a1264 { - flex: 1 1 auto; -} -.grow.data-v-ba0a1264 { - flex-grow: 1; -} -.grow-0.data-v-ba0a1264 { - flex-grow: 0; -} -.shrink.data-v-ba0a1264 { - flex-shrink: 1; -} -.shrink-0.data-v-ba0a1264 { - flex-shrink: 0; -} -.relative.data-v-ba0a1264 { - position: relative; -} -.ml-2.data-v-ba0a1264 { - margin-left: 3.75rpx; -} -.mt-2.data-v-ba0a1264 { - margin-top: 3.75rpx; -} -.ml-4.data-v-ba0a1264 { - margin-left: 7.5rpx; -} -.mt-4.data-v-ba0a1264 { - margin-top: 7.5rpx; -} -.ml-6.data-v-ba0a1264 { - margin-left: 11.25rpx; -} -.mt-6.data-v-ba0a1264 { - margin-top: 11.25rpx; -} -.ml-8.data-v-ba0a1264 { - margin-left: 15rpx; -} -.mt-8.data-v-ba0a1264 { - margin-top: 15rpx; -} -.ml-10.data-v-ba0a1264 { - margin-left: 18.75rpx; -} -.mt-10.data-v-ba0a1264 { - margin-top: 18.75rpx; -} -.ml-12.data-v-ba0a1264 { - margin-left: 22.5rpx; -} -.mt-12.data-v-ba0a1264 { - margin-top: 22.5rpx; -} -.ml-14.data-v-ba0a1264 { - margin-left: 26.25rpx; -} -.mt-14.data-v-ba0a1264 { - margin-top: 26.25rpx; -} -.ml-16.data-v-ba0a1264 { - margin-left: 30rpx; -} -.mt-16.data-v-ba0a1264 { - margin-top: 30rpx; -} -.ml-18.data-v-ba0a1264 { - margin-left: 33.75rpx; -} -.mt-18.data-v-ba0a1264 { - margin-top: 33.75rpx; -} -.ml-20.data-v-ba0a1264 { - margin-left: 37.5rpx; -} -.mt-20.data-v-ba0a1264 { - margin-top: 37.5rpx; -} -.ml-22.data-v-ba0a1264 { - margin-left: 41.25rpx; -} -.mt-22.data-v-ba0a1264 { - margin-top: 41.25rpx; -} -.ml-24.data-v-ba0a1264 { - margin-left: 45rpx; -} -.mt-24.data-v-ba0a1264 { - margin-top: 45rpx; -} -.ml-26.data-v-ba0a1264 { - margin-left: 48.75rpx; -} -.mt-26.data-v-ba0a1264 { - margin-top: 48.75rpx; -} -.ml-28.data-v-ba0a1264 { - margin-left: 52.5rpx; -} -.mt-28.data-v-ba0a1264 { - margin-top: 52.5rpx; -} -.ml-30.data-v-ba0a1264 { - margin-left: 56.25rpx; -} -.mt-30.data-v-ba0a1264 { - margin-top: 56.25rpx; -} -.ml-32.data-v-ba0a1264 { - margin-left: 60rpx; -} -.mt-32.data-v-ba0a1264 { - margin-top: 60rpx; -} -.ml-34.data-v-ba0a1264 { - margin-left: 63.75rpx; -} -.mt-34.data-v-ba0a1264 { - margin-top: 63.75rpx; -} -.ml-36.data-v-ba0a1264 { - margin-left: 67.5rpx; -} -.mt-36.data-v-ba0a1264 { - margin-top: 67.5rpx; -} -.ml-38.data-v-ba0a1264 { - margin-left: 71.25rpx; -} -.mt-38.data-v-ba0a1264 { - margin-top: 71.25rpx; -} -.ml-40.data-v-ba0a1264 { - margin-left: 75rpx; -} -.mt-40.data-v-ba0a1264 { - margin-top: 75rpx; -} -.ml-42.data-v-ba0a1264 { - margin-left: 78.75rpx; -} -.mt-42.data-v-ba0a1264 { - margin-top: 78.75rpx; -} -.ml-44.data-v-ba0a1264 { - margin-left: 82.5rpx; -} -.mt-44.data-v-ba0a1264 { - margin-top: 82.5rpx; -} -.ml-46.data-v-ba0a1264 { - margin-left: 86.25rpx; -} -.mt-46.data-v-ba0a1264 { - margin-top: 86.25rpx; -} -.ml-48.data-v-ba0a1264 { - margin-left: 90rpx; -} -.mt-48.data-v-ba0a1264 { - margin-top: 90rpx; -} -.ml-50.data-v-ba0a1264 { - margin-left: 93.75rpx; -} -.mt-50.data-v-ba0a1264 { - margin-top: 93.75rpx; -} -.ml-52.data-v-ba0a1264 { - margin-left: 97.5rpx; -} -.mt-52.data-v-ba0a1264 { - margin-top: 97.5rpx; -} -.ml-54.data-v-ba0a1264 { - margin-left: 101.25rpx; -} -.mt-54.data-v-ba0a1264 { - margin-top: 101.25rpx; -} -.ml-56.data-v-ba0a1264 { - margin-left: 105rpx; -} -.mt-56.data-v-ba0a1264 { - margin-top: 105rpx; -} -.ml-58.data-v-ba0a1264 { - margin-left: 108.75rpx; -} -.mt-58.data-v-ba0a1264 { - margin-top: 108.75rpx; -} -.ml-60.data-v-ba0a1264 { - margin-left: 112.5rpx; -} -.mt-60.data-v-ba0a1264 { - margin-top: 112.5rpx; -} -.ml-62.data-v-ba0a1264 { - margin-left: 116.25rpx; -} -.mt-62.data-v-ba0a1264 { - margin-top: 116.25rpx; -} -.ml-64.data-v-ba0a1264 { - margin-left: 120rpx; -} -.mt-64.data-v-ba0a1264 { - margin-top: 120rpx; -} -.ml-66.data-v-ba0a1264 { - margin-left: 123.75rpx; -} -.mt-66.data-v-ba0a1264 { - margin-top: 123.75rpx; -} -.ml-68.data-v-ba0a1264 { - margin-left: 127.5rpx; -} -.mt-68.data-v-ba0a1264 { - margin-top: 127.5rpx; -} -.ml-70.data-v-ba0a1264 { - margin-left: 131.25rpx; -} -.mt-70.data-v-ba0a1264 { - margin-top: 131.25rpx; -} -.ml-72.data-v-ba0a1264 { - margin-left: 135rpx; -} -.mt-72.data-v-ba0a1264 { - margin-top: 135rpx; -} -.ml-74.data-v-ba0a1264 { - margin-left: 138.75rpx; -} -.mt-74.data-v-ba0a1264 { - margin-top: 138.75rpx; -} -.ml-76.data-v-ba0a1264 { - margin-left: 142.5rpx; -} -.mt-76.data-v-ba0a1264 { - margin-top: 142.5rpx; -} -.ml-78.data-v-ba0a1264 { - margin-left: 146.25rpx; -} -.mt-78.data-v-ba0a1264 { - margin-top: 146.25rpx; -} -.ml-80.data-v-ba0a1264 { - margin-left: 150rpx; -} -.mt-80.data-v-ba0a1264 { - margin-top: 150rpx; -} -.ml-82.data-v-ba0a1264 { - margin-left: 153.75rpx; -} -.mt-82.data-v-ba0a1264 { - margin-top: 153.75rpx; -} -.ml-84.data-v-ba0a1264 { - margin-left: 157.5rpx; -} -.mt-84.data-v-ba0a1264 { - margin-top: 157.5rpx; -} -.ml-86.data-v-ba0a1264 { - margin-left: 161.25rpx; -} -.mt-86.data-v-ba0a1264 { - margin-top: 161.25rpx; -} -.ml-88.data-v-ba0a1264 { - margin-left: 165rpx; -} -.mt-88.data-v-ba0a1264 { - margin-top: 165rpx; -} -.ml-90.data-v-ba0a1264 { - margin-left: 168.75rpx; -} -.mt-90.data-v-ba0a1264 { - margin-top: 168.75rpx; -} -.ml-92.data-v-ba0a1264 { - margin-left: 172.5rpx; -} -.mt-92.data-v-ba0a1264 { - margin-top: 172.5rpx; -} -.ml-94.data-v-ba0a1264 { - margin-left: 176.25rpx; -} -.mt-94.data-v-ba0a1264 { - margin-top: 176.25rpx; -} -.ml-96.data-v-ba0a1264 { - margin-left: 180rpx; -} -.mt-96.data-v-ba0a1264 { - margin-top: 180rpx; -} -.ml-98.data-v-ba0a1264 { - margin-left: 183.75rpx; -} -.mt-98.data-v-ba0a1264 { - margin-top: 183.75rpx; -} -.ml-100.data-v-ba0a1264 { - margin-left: 187.5rpx; -} -.mt-100.data-v-ba0a1264 { - margin-top: 187.5rpx; -} -.ml-5.data-v-ba0a1264 { - margin-left: 9.38rpx; -} -.page.data-v-ba0a1264 { - padding-bottom: 1085.63rpx; - background-color: #f8e8c1; - width: 100%; - overflow-y: auto; - overflow-x: hidden; - height: 100%; -} -.section.data-v-ba0a1264 { - padding-left: 132.09rpx; - padding-right: 116.25rpx; - background-color: #fffef8; -} -.group.data-v-ba0a1264 { - padding: 21.68rpx 0 19.16rpx; -} -.font.data-v-ba0a1264 { - font-size: 30rpx; - font-family: Open Sans; - line-height: 26.25rpx; - color: #323232; -} -.text.data-v-ba0a1264 { - line-height: 27.6rpx; -} -.text_2.data-v-ba0a1264 { - margin-right: 10.33rpx; - line-height: 27.6rpx; -} -.section_2.data-v-ba0a1264 { - background-color: #fb8b05; - width: 112.5rpx; - height: 5.63rpx; -} -.section_3.data-v-ba0a1264 { - margin-left: 16.88rpx; - margin-right: 15rpx; - padding: 30rpx 20.06rpx 30rpx 24.38rpx; - background-color: #fffef8; - border-radius: 18.75rpx; -} -.font_2.data-v-ba0a1264 { - font-size: 26.25rpx; - font-family: Open Sans; - line-height: 26.25rpx; - color: #323232; -} -.text_3.data-v-ba0a1264 { - color: #fb8b05; - line-height: 24.15rpx; -} -.group_2.data-v-ba0a1264 { - margin-top: 18.49rpx; -} -.font_3.data-v-ba0a1264 { - font-size: 22.5rpx; - font-family: Open Sans; - color: #818181; -} -.text_4.data-v-ba0a1264 { - line-height: 20.85rpx; -} -.text_5.data-v-ba0a1264 { - line-height: 16.54rpx; -} -.group_3.data-v-ba0a1264 { - margin-top: 29.81rpx; -} -.image.data-v-ba0a1264 { - border-radius: 9.38rpx; - width: 118.13rpx; - height: 151.88rpx; -} -.group_4.data-v-ba0a1264 { - margin: 2.19rpx 0 5.38rpx 23.38rpx; -} -.text_6.data-v-ba0a1264 { - line-height: 24.49rpx; -} -.pos.data-v-ba0a1264 { - position: absolute; - left: 0.15rpx; - top: 50%; - transform: translateY(-50%); -} -.text_7.data-v-ba0a1264 { - line-height: 24.43rpx; -} -.font_5.data-v-ba0a1264 { - font-size: 22.5rpx; - font-family: Open Sans; - line-height: 26.25rpx; - color: #323232; -} -.text_10.data-v-ba0a1264 { - margin-top: 21.04rpx; -} -.text_1.data-v-ba0a1264 { - margin-top: 3.39rpx; -} -.text_11.data-v-ba0a1264 { - margin-top: 19.01rpx; - color: #939393; - font-size: 22.5rpx; - font-family: Inter; - line-height: 22.97rpx; -} -.group_5.data-v-ba0a1264 { - margin-left: 3.52rpx; - margin-right: 14.42rpx; -} -.text_8.data-v-ba0a1264 { - margin-left: 25.03rpx; - color: #323232; - font-size: 33.75rpx; - font-family: Open Sans; - font-weight: 600; - line-height: 24.88rpx; -} -.image_2.data-v-ba0a1264 { - width: 30rpx; - height: 26.25rpx; -} -.image_3.data-v-ba0a1264 { - margin-left: -90.66rpx; -} -.font_4.data-v-ba0a1264 { - font-size: 26.25rpx; - font-family: Open Sans; - line-height: 19.29rpx; - font-weight: 600; -} -.text_9.data-v-ba0a1264 { - margin-left: 61.14rpx; - color: #323232; -} -.group_6.data-v-ba0a1264 { - margin-top: 37.93rpx; - padding: 0 9.38rpx; -} -.text_12.data-v-ba0a1264 { - margin-right: -8.06rpx; - line-height: 24.23rpx; -} -.group_7.data-v-ba0a1264 { - line-height: 21.99rpx; - height: 22.05rpx; -} -.text_13.data-v-ba0a1264 { - color: #fb8b05; - font-size: 30rpx; - font-family: Open Sans; - font-weight: 600; - line-height: 21.99rpx; -} -.text_14.data-v-ba0a1264 { - color: #fb8b05; - line-height: 19.39rpx; -} -.text-wrapper.data-v-ba0a1264 { - margin-right: 2.44rpx; - margin-top: 35.4rpx; - padding: 13.54rpx 0 14.83rpx; - background-color: #fffef8; - border-radius: 75rpx; - width: 155.63rpx; - border: solid 1.88rpx #cbcbcb; -} -.text_15.data-v-ba0a1264 { - line-height: 24.13rpx; -} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/mine/main/main.js b/unpackage/dist/dev/mp-weixin/pages/mine/main/main.js index 0b085b0..8852303 100644 --- a/unpackage/dist/dev/mp-weixin/pages/mine/main/main.js +++ b/unpackage/dist/dev/mp-weixin/pages/mine/main/main.js @@ -42,5 +42,5 @@ const _sfc_main = { }; } }; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-8172b2ba"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/mine/main/main.vue"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-8172b2ba"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.js b/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.js index bd48b34..784cfe1 100644 --- a/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.js +++ b/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.js @@ -65,19 +65,19 @@ const _sfc_main = { }; return (_ctx, _cache) => { return { - a: _ctx.orderStatus === "全部" ? 1 : "", + a: "", b: isSelected("全") ? 1 : "", c: common_vendor.o(($event) => changeTab("全部")), - d: _ctx.orderStatus === "待支付" ? 1 : "", + d: "", e: isSelected("待支付") ? 1 : "", f: common_vendor.o(($event) => changeTab("待支付")), - g: _ctx.orderStatus === "待发货" ? 1 : "", + g: "", h: isSelected("待发货") ? 1 : "", i: common_vendor.o(($event) => changeTab("待发货")), - j: _ctx.orderStatus === "已发货" ? 1 : "", + j: "", k: isSelected("已发货") ? 1 : "", l: common_vendor.o(($event) => changeTab("已发货")), - m: _ctx.orderStatus === "售后" ? 1 : "", + m: "", n: isSelected("售后") ? 1 : "", o: common_vendor.o(($event) => changeTab("售后")), p: common_vendor.f(Status.value.displayedOrders, (order, index, i0) => { @@ -122,5 +122,5 @@ const _sfc_main = { }; } }; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-7d0f2622"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/mine/mineorders/mineorders.vue"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-7d0f2622"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/order/component/addressComponent.js b/unpackage/dist/dev/mp-weixin/pages/order/component/addressComponent.js index 12fd0ff..7bf7b83 100644 --- a/unpackage/dist/dev/mp-weixin/pages/order/component/addressComponent.js +++ b/unpackage/dist/dev/mp-weixin/pages/order/component/addressComponent.js @@ -76,5 +76,5 @@ const _sfc_main = { }; } }; -const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-c20b9e4d"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/order/component/addressComponent.vue"]]); +const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-c20b9e4d"]]); wx.createComponent(Component); diff --git a/unpackage/dist/dev/mp-weixin/pages/order/paysuccess/paysuccess.js b/unpackage/dist/dev/mp-weixin/pages/order/paysuccess/paysuccess.js index 47f4d51..52b6768 100644 --- a/unpackage/dist/dev/mp-weixin/pages/order/paysuccess/paysuccess.js +++ b/unpackage/dist/dev/mp-weixin/pages/order/paysuccess/paysuccess.js @@ -55,5 +55,5 @@ const _sfc_main = { }; } }; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-0b647166"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/order/paysuccess/paysuccess.vue"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-0b647166"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/order/product-unpay/product-unpay.js b/unpackage/dist/dev/mp-weixin/pages/order/product-unpay/product-unpay.js index 03f035d..ea440be 100644 --- a/unpackage/dist/dev/mp-weixin/pages/order/product-unpay/product-unpay.js +++ b/unpackage/dist/dev/mp-weixin/pages/order/product-unpay/product-unpay.js @@ -4,5 +4,5 @@ const _sfc_main = {}; function _sfc_render(_ctx, _cache) { return {}; } -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-8a444854"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/order/product-unpay/product-unpay.vue"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-8a444854"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/order/product-waitpay/product-waitpay.js b/unpackage/dist/dev/mp-weixin/pages/order/product-waitpay/product-waitpay.js index 7280c61..8803671 100644 --- a/unpackage/dist/dev/mp-weixin/pages/order/product-waitpay/product-waitpay.js +++ b/unpackage/dist/dev/mp-weixin/pages/order/product-waitpay/product-waitpay.js @@ -180,5 +180,5 @@ const _sfc_main = { }; } }; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-eda1e8f0"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/order/product-waitpay/product-waitpay.vue"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-eda1e8f0"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/order/productOrderDetail/productOrderDetail.js b/unpackage/dist/dev/mp-weixin/pages/order/productOrderDetail/productOrderDetail.js index 380a521..4e8dfa8 100644 --- a/unpackage/dist/dev/mp-weixin/pages/order/productOrderDetail/productOrderDetail.js +++ b/unpackage/dist/dev/mp-weixin/pages/order/productOrderDetail/productOrderDetail.js @@ -14,5 +14,5 @@ const _sfc_main = { }; } }; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-f0df60ad"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/order/productOrderDetail/productOrderDetail.vue"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-f0df60ad"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/service/productDetail/productDetail.js b/unpackage/dist/dev/mp-weixin/pages/service/productDetail/productDetail.js index bb69c16..6867f54 100644 --- a/unpackage/dist/dev/mp-weixin/pages/service/productDetail/productDetail.js +++ b/unpackage/dist/dev/mp-weixin/pages/service/productDetail/productDetail.js @@ -4,5 +4,5 @@ const _sfc_main = {}; function _sfc_render(_ctx, _cache) { return {}; } -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-4d02f7b2"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/service/productDetail/productDetail.vue"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-4d02f7b2"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/store-home/ProductDetails/ProductDetails.js b/unpackage/dist/dev/mp-weixin/pages/store-home/ProductDetails/ProductDetails.js index 423d4cb..c4622d0 100644 --- a/unpackage/dist/dev/mp-weixin/pages/store-home/ProductDetails/ProductDetails.js +++ b/unpackage/dist/dev/mp-weixin/pages/store-home/ProductDetails/ProductDetails.js @@ -83,5 +83,5 @@ const _sfc_main = { }; } }; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-3361b524"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/store-home/ProductDetails/ProductDetails.vue"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-3361b524"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/store-home/main/main.js b/unpackage/dist/dev/mp-weixin/pages/store-home/main/main.js index 5ecc3c7..33cbb61 100644 --- a/unpackage/dist/dev/mp-weixin/pages/store-home/main/main.js +++ b/unpackage/dist/dev/mp-weixin/pages/store-home/main/main.js @@ -104,5 +104,5 @@ const _sfc_main = { }; } }; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-7e3c386d"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/store-home/main/main.vue"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-7e3c386d"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/workshop/index/index.js b/unpackage/dist/dev/mp-weixin/pages/workshop/index/index.js index 2901b58..6b6e4ed 100644 --- a/unpackage/dist/dev/mp-weixin/pages/workshop/index/index.js +++ b/unpackage/dist/dev/mp-weixin/pages/workshop/index/index.js @@ -1,21 +1,43 @@ "use strict"; const common_vendor = require("../../../common/vendor.js"); +const api_request = require("../../../api/request.js"); const _sfc_main = { __name: "index", setup(__props) { - const items = common_vendor.ref([null, null]); + const products = common_vendor.ref(); + const cookie = common_vendor.wx$1.getStorageSync("cookie"); + common_vendor.ref([null, null]); + common_vendor.onMounted(() => { + getProducts(); + }); + const getProducts = async () => { + const res = await common_vendor.index.request({ + url: api_request.baseUrl + "/goods/service/list/card", + method: "GET", + header: { + cookie + } + }); + console.log(res.data.data); + if (res.data.code === 1) { + products.value = res.data.data; + } + }; const jump_detail = (index, item) => { console.log(index); common_vendor.index.navigateTo({ - url: "../../store-home/ProductDetails/ProductDetails?info=" + JSON.stringify(item) + url: "../productmain/productmain?info=" + +JSON.stringify(item) }); }; return (_ctx, _cache) => { return { - a: common_vendor.f(items.value, (item, index, i0) => { + a: common_vendor.f(products.value, (item, index, i0) => { return { - a: index, - b: common_vendor.o(($event) => jump_detail(index, item), index) + a: item.goodImg, + b: common_vendor.t(item.name), + c: common_vendor.t(item.price), + d: index, + e: common_vendor.o(($event) => jump_detail(item, index), index) }; }) }; diff --git a/unpackage/dist/dev/mp-weixin/pages/workshop/index/index.wxml b/unpackage/dist/dev/mp-weixin/pages/workshop/index/index.wxml index 507c4c6..cdc3b00 100644 --- a/unpackage/dist/dev/mp-weixin/pages/workshop/index/index.wxml +++ b/unpackage/dist/dev/mp-weixin/pages/workshop/index/index.wxml @@ -1 +1 @@ -最新活动【非遗手工艺体验】玉雕-古法制玉体验99.00 \ No newline at end of file +{{item.b}}{{item.c}} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/workshop/index/index.wxss b/unpackage/dist/dev/mp-weixin/pages/workshop/index/index.wxss index a5aaac3..39c90bb 100644 --- a/unpackage/dist/dev/mp-weixin/pages/workshop/index/index.wxss +++ b/unpackage/dist/dev/mp-weixin/pages/workshop/index/index.wxss @@ -401,75 +401,108 @@ text.data-v-6d033fba { .mt-100.data-v-6d033fba { margin-top: 187.5rpx; } +.mt-1.data-v-6d033fba { + margin-top: 1.88rpx; +} +.mt-17.data-v-6d033fba { + margin-top: 31.88rpx; +} .page.data-v-6d033fba { - padding-top: 37.5rpx; - background-color: #f5f5dc; + background-color: #ffffff; + background-image: url("https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJULGLADX-feiyigongfang.png"); + background-size: 100% 100%; + background-repeat: no-repeat; width: 100%; overflow-y: auto; overflow-x: hidden; - height: 100vh; -} -.image.data-v-6d033fba { - margin: 0 30rpx; - border-radius: 18.75rpx; - width: 92vw; - height: 61.25vw; -} -.text-wrapper.data-v-6d033fba { - margin-top: 26.25rpx; - padding: 27.41rpx 0 23.7rpx; - background-color: #f7de98; -} -.text.data-v-6d033fba { - color: #323232; - font-size: 30rpx; - font-family: Open Sans; - line-height: 27.64rpx; + height: 100%; } .section.data-v-6d033fba { - padding: 54.38rpx 0 223.13rpx; - background-color: #fff8dc; + background-image: url("https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJULGLADX-feiyigongfang.png"); + background-size: 100% 100%; + background-repeat: no-repeat; + width: 750rpx; + height: 2096.25rpx; } -.grid.data-v-6d033fba { - margin-left: 28.13rpx; - margin-right: 28.13rpx; - height: 976.88rpx; - display: grid; - grid-template-rows: repeat(2, minmax(0, 1fr)); - grid-template-columns: repeat(2, minmax(0, 1fr)); - row-gap: 39.51rpx; - column-gap: 28.26rpx; +.section_2.data-v-6d033fba { + padding: 15rpx 0; + background-color: #ffffff; } -.grid-item_1.data-v-6d033fba { +.pos.data-v-6d033fba { + position: fixed; + left: 0; + right: 0; + top: 0; + z-index: 1; +} +.section_3.data-v-6d033fba { + padding: 0 15rpx; + background-color: #f1e8e9; + border-radius: 18.75rpx; + width: 506.25rpx; +} +.image.data-v-6d033fba { + width: 43.13rpx; + height: 46.88rpx; +} +.font.data-v-6d033fba { + font-size: 24.38rpx; + font-family: FZSongKeBenXiuKaiS-R-GB; + color: #000000; +} +.text.data-v-6d033fba { + line-height: 23.04rpx; + letter-spacing: 9.75rpx; +} +.image_2.data-v-6d033fba { + width: 100vw; + height: 62.5vw; +} +.pos_2.data-v-6d033fba { + position: absolute; + left: 0; + right: 0; + top: 80.63rpx; +} +.pos_3.data-v-6d033fba { + position: absolute; + left: 30.75rpx; + top: 577.5rpx; +} +.grid-item.data-v-6d033fba { padding-bottom: 30.23rpx; background-color: #ffffff; border-radius: 18.75rpx; + width: 332.85rpx; + margin: 0 26rpx 20rpx 0; } .image_1.data-v-6d033fba { border-radius: 18.75rpx 18.75rpx 0rpx 0rpx; width: 333.75rpx; height: 324.38rpx; } -.font.data-v-6d033fba { - font-size: 24.38rpx; - font-family: Open Sans; - line-height: 30rpx; - color: #000000; -} .text_2.data-v-6d033fba { - margin-left: 14.04rpx; - margin-right: 8.46rpx; + margin-left: 15.56rpx; + margin-right: 3.19rpx; + line-height: 30rpx; } -.group.data-v-6d033fba { - padding: 0 24.38rpx; +.group_2.data-v-6d033fba { + padding: 0 24.3rpx; } -.image_3.data-v-6d033fba { +.image_4.data-v-6d033fba { width: 26.25rpx; height: 26.25rpx; } .font_2.data-v-6d033fba { + color: #c35c5d; font-size: 30rpx; font-family: Times New Roman; line-height: 20.68rpx; - color: #fbb612; +} +.flexbox.data-v-6d033fba { + display: flex; + flex-wrap: wrap; +} +.placeholderStyle.data-v-6d033fba { + color: #c35c5d; } \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/project.config.json b/unpackage/dist/dev/mp-weixin/project.config.json index 4c89ec2..62d6889 100644 --- a/unpackage/dist/dev/mp-weixin/project.config.json +++ b/unpackage/dist/dev/mp-weixin/project.config.json @@ -8,7 +8,7 @@ "urlCheck": false, "es6": true, "postcss": false, - "minified": false, + "minified": true, "newFeature": true, "bigPackageSizeSupport": true, "babelSetting": { @@ -19,7 +19,7 @@ }, "compileType": "miniprogram", "libVersion": "3.7.0", - "appid": "wx3f968a09e31d6bed", + "appid": "wx61b63e27bddf4ea2", "projectname": "FeiYi", "condition": { "search": { diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js b/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js index 2167945..291ab4e 100644 --- a/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js +++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js @@ -389,5 +389,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) { l: common_vendor.n($options.isDesktop ? "fixforpc-z-index" : "") }) : {}); } -const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/jiangchengfeiyi-xiaochengxu/uni_modules/uni-popup/components/uni-popup/uni-popup.vue"]]); +const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]); wx.createComponent(Component); diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js b/unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js index b35c215..cc27c04 100644 --- a/unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js +++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js @@ -261,5 +261,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) { e: common_vendor.o((...args) => $options.onClick && $options.onClick(...args)) }; } -const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/jiangchengfeiyi-xiaochengxu/uni_modules/uni-transition/components/uni-transition/uni-transition.vue"]]); +const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]); wx.createComponent(Component); From 4df55ee87ae5c27c49175b282de88c5d7b413578 Mon Sep 17 00:00:00 2001 From: yuanteng0011 <1876787513@qq.com> Date: Tue, 10 Dec 2024 15:05:57 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=9D=9E=E9=81=97=E5=B7=A5=E5=9D=8A?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E3=80=81=E6=9C=8D=E5=8A=A1=E7=B1=BB=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/workshop/productmain/productmain.vue | 271 ++++++++ unpackage/dist/dev/mp-weixin/app.js | 3 +- .../pages/mine/mineorders/mineorders.js | 12 +- .../pages/workshop/productmain/productmain.js | 8 + .../workshop/productmain/productmain.json | 4 + .../workshop/productmain/productmain.wxml | 1 + .../workshop/productmain/productmain.wxss | 588 ++++++++++++++++++ 7 files changed, 880 insertions(+), 7 deletions(-) create mode 100644 pages/workshop/productmain/productmain.vue create mode 100644 unpackage/dist/dev/mp-weixin/pages/workshop/productmain/productmain.js create mode 100644 unpackage/dist/dev/mp-weixin/pages/workshop/productmain/productmain.json create mode 100644 unpackage/dist/dev/mp-weixin/pages/workshop/productmain/productmain.wxml create mode 100644 unpackage/dist/dev/mp-weixin/pages/workshop/productmain/productmain.wxss diff --git a/pages/workshop/productmain/productmain.vue b/pages/workshop/productmain/productmain.vue new file mode 100644 index 0000000..a7f08fb --- /dev/null +++ b/pages/workshop/productmain/productmain.vue @@ -0,0 +1,271 @@ + + + + + diff --git a/unpackage/dist/dev/mp-weixin/app.js b/unpackage/dist/dev/mp-weixin/app.js index 015e5eb..f902777 100644 --- a/unpackage/dist/dev/mp-weixin/app.js +++ b/unpackage/dist/dev/mp-weixin/app.js @@ -27,6 +27,7 @@ if (!Math) { "./pages/Shopping-cart/component/addProduct.js"; "./pages/mine/OrderDetails/OrderDetails.js"; "./pages/service/productDetail/productDetail.js"; + "./pages/workshop/index/index.js"; "./pages/booking/CostumeDisplay/CostumeDisplay.js"; "./pages/booking/CostumeDetails/CostumeDetails.js"; "./pages/mine/Contact/Contact.js"; @@ -35,7 +36,7 @@ const _sfc_main = {}; function _sfc_render(_ctx, _cache) { return {}; } -const App = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/jiangchengfeiyi-xiaochengxu/App.vue"]]); +const App = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]); function createApp() { const app = common_vendor.createSSRApp(App); app.use(store_index.pinia); diff --git a/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.js b/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.js index ed0360a..0e00cb4 100644 --- a/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.js +++ b/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.js @@ -65,19 +65,19 @@ const _sfc_main = { }; return (_ctx, _cache) => { return { - a: _ctx.orderStatus === "全部" ? 1 : "", + a: "", b: isSelected("全部") ? 1 : "", c: common_vendor.o(($event) => changeTab("全部")), - d: _ctx.orderStatus === "待支付" ? 1 : "", + d: "", e: isSelected("待支付") ? 1 : "", f: common_vendor.o(($event) => changeTab("待支付")), - g: _ctx.orderStatus === "待发货" ? 1 : "", + g: "", h: isSelected("待发货") ? 1 : "", i: common_vendor.o(($event) => changeTab("待发货")), - j: _ctx.orderStatus === "已发货" ? 1 : "", + j: "", k: isSelected("已发货") ? 1 : "", l: common_vendor.o(($event) => changeTab("已发货")), - m: _ctx.orderStatus === "售后" ? 1 : "", + m: "", n: isSelected("售后") ? 1 : "", o: common_vendor.o(($event) => changeTab("售后")), p: common_vendor.f(Status.value.displayedOrders, (order, index, i0) => { @@ -122,5 +122,5 @@ const _sfc_main = { }; } }; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-7d0f2622"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/mine/mineorders/mineorders.vue"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-7d0f2622"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/workshop/productmain/productmain.js b/unpackage/dist/dev/mp-weixin/pages/workshop/productmain/productmain.js new file mode 100644 index 0000000..597099d --- /dev/null +++ b/unpackage/dist/dev/mp-weixin/pages/workshop/productmain/productmain.js @@ -0,0 +1,8 @@ +"use strict"; +const common_vendor = require("../../../common/vendor.js"); +const _sfc_main = {}; +function _sfc_render(_ctx, _cache) { + return {}; +} +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-521289db"]]); +wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/workshop/productmain/productmain.json b/unpackage/dist/dev/mp-weixin/pages/workshop/productmain/productmain.json new file mode 100644 index 0000000..a0812ee --- /dev/null +++ b/unpackage/dist/dev/mp-weixin/pages/workshop/productmain/productmain.json @@ -0,0 +1,4 @@ +{ + "navigationBarTitleText": "", + "usingComponents": {} +} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/workshop/productmain/productmain.wxml b/unpackage/dist/dev/mp-weixin/pages/workshop/productmain/productmain.wxml new file mode 100644 index 0000000..2fe3b1b --- /dev/null +++ b/unpackage/dist/dev/mp-weixin/pages/workshop/productmain/productmain.wxml @@ -0,0 +1 @@ +玲泷水月阁￥299【非遗手工艺体验】纸笺加工技艺-流沙笺团扇制作体验 产品简介：纸笺加工技艺-流沙笺团扇制作体验，带您领略国家级非物质文化遗产的魅力。本活动让您亲手体验传统纸笺加工技艺，感受流沙笺团扇的制作过程，传承千年匠心精神。 最近可预约时间：2024.11.119：30 - 10：30用户须知 1.请根据预约时间，提前10-15分钟到达活动地点，以便顺利参与体验。 2.穿着轻便、易清洗的衣物，以防止材料染色。 3.如您在购买服务后，因个人原因需要取消服务或者变更服务的预约时间，请您务必联系我们的客服。 4.只要您在体验活动开始前取消购买，我们将为您提供全额退款服务。 5.如遇特殊情况，如突发疾病或其他不可抗力因素，请及时与客服沟通，我们将根据实际情况处理退款事宜。 客服加入购物车立即预约服务详情 \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/workshop/productmain/productmain.wxss b/unpackage/dist/dev/mp-weixin/pages/workshop/productmain/productmain.wxss new file mode 100644 index 0000000..a4fa9b0 --- /dev/null +++ b/unpackage/dist/dev/mp-weixin/pages/workshop/productmain/productmain.wxss @@ -0,0 +1,588 @@ +/* 水平间距 */ +/* 水平间距 */ +/************************************************************ +** 请将全局样式拷贝到项目的全局 CSS 文件或者当前页面的顶部 ** +** 否则页面将无法正常显示 ** +************************************************************/ +html.data-v-521289db { + font-size: 16px; +} +body.data-v-521289db { + margin: 0; + font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', + 'Droid Sans', 'Helvetica Neue', 'Microsoft Yahei', sans-serif; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} +view.data-v-521289db, +image.data-v-521289db, +text.data-v-521289db { + box-sizing: border-box; + flex-shrink: 0; +} +#app.data-v-521289db { + width: 100vw; + height: 100vh; +} +.flex-row.data-v-521289db { + display: flex; + flex-direction: row; +} +.flex-col.data-v-521289db { + display: flex; + flex-direction: column; +} +.justify-start.data-v-521289db { + justify-content: flex-start; +} +.justify-end.data-v-521289db { + justify-content: flex-end; +} +.justify-center.data-v-521289db { + justify-content: center; +} +.justify-between.data-v-521289db { + justify-content: space-between; +} +.justify-around.data-v-521289db { + justify-content: space-around; +} +.justify-evenly.data-v-521289db { + justify-content: space-evenly; +} +.items-start.data-v-521289db { + align-items: flex-start; +} +.items-end.data-v-521289db { + align-items: flex-end; +} +.items-center.data-v-521289db { + align-items: center; +} +.items-baseline.data-v-521289db { + align-items: baseline; +} +.items-stretch.data-v-521289db { + align-items: stretch; +} +.self-start.data-v-521289db { + align-self: flex-start; +} +.self-end.data-v-521289db { + align-self: flex-end; +} +.self-center.data-v-521289db { + align-self: center; +} +.self-baseline.data-v-521289db { + align-self: baseline; +} +.self-stretch.data-v-521289db { + align-self: stretch; +} +.flex-1.data-v-521289db { + flex: 1 1 0%; +} +.flex-auto.data-v-521289db { + flex: 1 1 auto; +} +.grow.data-v-521289db { + flex-grow: 1; +} +.grow-0.data-v-521289db { + flex-grow: 0; +} +.shrink.data-v-521289db { + flex-shrink: 1; +} +.shrink-0.data-v-521289db { + flex-shrink: 0; +} +.relative.data-v-521289db { + position: relative; +} +.ml-2.data-v-521289db { + margin-left: 3.75rpx; +} +.mt-2.data-v-521289db { + margin-top: 3.75rpx; +} +.ml-4.data-v-521289db { + margin-left: 7.5rpx; +} +.mt-4.data-v-521289db { + margin-top: 7.5rpx; +} +.ml-6.data-v-521289db { + margin-left: 11.25rpx; +} +.mt-6.data-v-521289db { + margin-top: 11.25rpx; +} +.ml-8.data-v-521289db { + margin-left: 15rpx; +} +.mt-8.data-v-521289db { + margin-top: 15rpx; +} +.ml-10.data-v-521289db { + margin-left: 18.75rpx; +} +.mt-10.data-v-521289db { + margin-top: 18.75rpx; +} +.ml-12.data-v-521289db { + margin-left: 22.5rpx; +} +.mt-12.data-v-521289db { + margin-top: 22.5rpx; +} +.ml-14.data-v-521289db { + margin-left: 26.25rpx; +} +.mt-14.data-v-521289db { + margin-top: 26.25rpx; +} +.ml-16.data-v-521289db { + margin-left: 30rpx; +} +.mt-16.data-v-521289db { + margin-top: 30rpx; +} +.ml-18.data-v-521289db { + margin-left: 33.75rpx; +} +.mt-18.data-v-521289db { + margin-top: 33.75rpx; +} +.ml-20.data-v-521289db { + margin-left: 37.5rpx; +} +.mt-20.data-v-521289db { + margin-top: 37.5rpx; +} +.ml-22.data-v-521289db { + margin-left: 41.25rpx; +} +.mt-22.data-v-521289db { + margin-top: 41.25rpx; +} +.ml-24.data-v-521289db { + margin-left: 45rpx; +} +.mt-24.data-v-521289db { + margin-top: 45rpx; +} +.ml-26.data-v-521289db { + margin-left: 48.75rpx; +} +.mt-26.data-v-521289db { + margin-top: 48.75rpx; +} +.ml-28.data-v-521289db { + margin-left: 52.5rpx; +} +.mt-28.data-v-521289db { + margin-top: 52.5rpx; +} +.ml-30.data-v-521289db { + margin-left: 56.25rpx; +} +.mt-30.data-v-521289db { + margin-top: 56.25rpx; +} +.ml-32.data-v-521289db { + margin-left: 60rpx; +} +.mt-32.data-v-521289db { + margin-top: 60rpx; +} +.ml-34.data-v-521289db { + margin-left: 63.75rpx; +} +.mt-34.data-v-521289db { + margin-top: 63.75rpx; +} +.ml-36.data-v-521289db { + margin-left: 67.5rpx; +} +.mt-36.data-v-521289db { + margin-top: 67.5rpx; +} +.ml-38.data-v-521289db { + margin-left: 71.25rpx; +} +.mt-38.data-v-521289db { + margin-top: 71.25rpx; +} +.ml-40.data-v-521289db { + margin-left: 75rpx; +} +.mt-40.data-v-521289db { + margin-top: 75rpx; +} +.ml-42.data-v-521289db { + margin-left: 78.75rpx; +} +.mt-42.data-v-521289db { + margin-top: 78.75rpx; +} +.ml-44.data-v-521289db { + margin-left: 82.5rpx; +} +.mt-44.data-v-521289db { + margin-top: 82.5rpx; +} +.ml-46.data-v-521289db { + margin-left: 86.25rpx; +} +.mt-46.data-v-521289db { + margin-top: 86.25rpx; +} +.ml-48.data-v-521289db { + margin-left: 90rpx; +} +.mt-48.data-v-521289db { + margin-top: 90rpx; +} +.ml-50.data-v-521289db { + margin-left: 93.75rpx; +} +.mt-50.data-v-521289db { + margin-top: 93.75rpx; +} +.ml-52.data-v-521289db { + margin-left: 97.5rpx; +} +.mt-52.data-v-521289db { + margin-top: 97.5rpx; +} +.ml-54.data-v-521289db { + margin-left: 101.25rpx; +} +.mt-54.data-v-521289db { + margin-top: 101.25rpx; +} +.ml-56.data-v-521289db { + margin-left: 105rpx; +} +.mt-56.data-v-521289db { + margin-top: 105rpx; +} +.ml-58.data-v-521289db { + margin-left: 108.75rpx; +} +.mt-58.data-v-521289db { + margin-top: 108.75rpx; +} +.ml-60.data-v-521289db { + margin-left: 112.5rpx; +} +.mt-60.data-v-521289db { + margin-top: 112.5rpx; +} +.ml-62.data-v-521289db { + margin-left: 116.25rpx; +} +.mt-62.data-v-521289db { + margin-top: 116.25rpx; +} +.ml-64.data-v-521289db { + margin-left: 120rpx; +} +.mt-64.data-v-521289db { + margin-top: 120rpx; +} +.ml-66.data-v-521289db { + margin-left: 123.75rpx; +} +.mt-66.data-v-521289db { + margin-top: 123.75rpx; +} +.ml-68.data-v-521289db { + margin-left: 127.5rpx; +} +.mt-68.data-v-521289db { + margin-top: 127.5rpx; +} +.ml-70.data-v-521289db { + margin-left: 131.25rpx; +} +.mt-70.data-v-521289db { + margin-top: 131.25rpx; +} +.ml-72.data-v-521289db { + margin-left: 135rpx; +} +.mt-72.data-v-521289db { + margin-top: 135rpx; +} +.ml-74.data-v-521289db { + margin-left: 138.75rpx; +} +.mt-74.data-v-521289db { + margin-top: 138.75rpx; +} +.ml-76.data-v-521289db { + margin-left: 142.5rpx; +} +.mt-76.data-v-521289db { + margin-top: 142.5rpx; +} +.ml-78.data-v-521289db { + margin-left: 146.25rpx; +} +.mt-78.data-v-521289db { + margin-top: 146.25rpx; +} +.ml-80.data-v-521289db { + margin-left: 150rpx; +} +.mt-80.data-v-521289db { + margin-top: 150rpx; +} +.ml-82.data-v-521289db { + margin-left: 153.75rpx; +} +.mt-82.data-v-521289db { + margin-top: 153.75rpx; +} +.ml-84.data-v-521289db { + margin-left: 157.5rpx; +} +.mt-84.data-v-521289db { + margin-top: 157.5rpx; +} +.ml-86.data-v-521289db { + margin-left: 161.25rpx; +} +.mt-86.data-v-521289db { + margin-top: 161.25rpx; +} +.ml-88.data-v-521289db { + margin-left: 165rpx; +} +.mt-88.data-v-521289db { + margin-top: 165rpx; +} +.ml-90.data-v-521289db { + margin-left: 168.75rpx; +} +.mt-90.data-v-521289db { + margin-top: 168.75rpx; +} +.ml-92.data-v-521289db { + margin-left: 172.5rpx; +} +.mt-92.data-v-521289db { + margin-top: 172.5rpx; +} +.ml-94.data-v-521289db { + margin-left: 176.25rpx; +} +.mt-94.data-v-521289db { + margin-top: 176.25rpx; +} +.ml-96.data-v-521289db { + margin-left: 180rpx; +} +.mt-96.data-v-521289db { + margin-top: 180rpx; +} +.ml-98.data-v-521289db { + margin-left: 183.75rpx; +} +.mt-98.data-v-521289db { + margin-top: 183.75rpx; +} +.ml-100.data-v-521289db { + margin-left: 187.5rpx; +} +.mt-100.data-v-521289db { + margin-top: 187.5rpx; +} +.ml-13.data-v-521289db { + margin-left: 24.38rpx; +} +.mt-11.data-v-521289db { + margin-top: 20.63rpx; +} +.mt-15.data-v-521289db { + margin-top: 28.13rpx; +} +.ml-1.data-v-521289db { + margin-left: 1.88rpx; +} +.mt-3.data-v-521289db { + margin-top: 5.63rpx; +} +.ml-31.data-v-521289db { + margin-left: 58.13rpx; +} +.page.data-v-521289db { + background-color: #ffffff; + width: 100%; + overflow-y: auto; + overflow-x: hidden; + height: 100%; +} +.section.data-v-521289db { + padding-bottom: 41.25rpx; + background-image: url("https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJULGLADX-feiyigongfang.png"); + background-size: 100% 100%; + background-repeat: no-repeat; +} +.section_2.data-v-521289db { + padding: 22.5rpx 22.5rpx 20.63rpx; + background-color: #ffffff; +} +.image_2.data-v-521289db { + width: 33.75rpx; + height: 35.63rpx; +} +.font.data-v-521289db { + font-size: 30rpx; + font-family: FZSongKeBenXiuKaiS-R-GB; + line-height: 29.7rpx; +} +.text.data-v-521289db { + color: #000000; + line-height: 28.37rpx; +} +.image.data-v-521289db { + border-radius: 50%; + width: 46.88rpx; + height: 46.88rpx; +} +.image_3.data-v-521289db { + margin-top: 15rpx; + width: 100vw; + height: 70vw; +} +.list.data-v-521289db { + margin-top: 18.75rpx; +} +.section_3.data-v-521289db { + padding: 36.73rpx 17.1rpx 39.64rpx 17.12rpx; + background-color: #ffffffcc; + border-radius: 37.5rpx; +} +.group.data-v-521289db { + margin-left: 12.04rpx; + line-height: 29.7rpx; +} +.font_2.data-v-521289db { + font-size: 26.25rpx; + font-family: FZSongKeBenXiuKaiS-R-GB; + line-height: 31.88rpx; + color: #323232; +} +.text_3.data-v-521289db { + color: #ff0000; + line-height: 16.91rpx; +} +.text_2.data-v-521289db { + color: #ff0000; + font-size: 45rpx; + font-family: FZSongKeBenXiuKaiS-R-GB; + line-height: 29.7rpx; +} +.text_4.data-v-521289db { + color: #323233; + line-height: 35.63rpx; +} +.text_5.data-v-521289db { + margin-left: 5.79rpx; + margin-right: 3.58rpx; +} +.group_2.data-v-521289db { + padding: 0 14.94rpx; +} +.font_3.data-v-521289db { + font-size: 26.25rpx; + font-family: FZSongKeBenXiuKaiS-R-GB; + line-height: 24.92rpx; + color: #000000; +} +.section_4.data-v-521289db { + padding: 31.63rpx 18.04rpx 56.83rpx 26.76rpx; + background-color: #ffffffcc; + border-radius: 37.5rpx; +} +.text_6.data-v-521289db { + margin-left: 3.71rpx; + color: #323232; + line-height: 28.01rpx; + text-decoration: underline; +} +.text_7.data-v-521289db { + width: 648.75rpx; +} +.text_1.data-v-521289db { + margin-left: 3.66rpx; +} +.text_8.data-v-521289db { + margin-left: 3.86rpx; + line-height: 25.63rpx; +} +.text_9.data-v-521289db { + margin-left: 3.96rpx; +} +.text_10.data-v-521289db { + margin-left: 3.96rpx; + margin-right: 3.77rpx; +} +.section_5.data-v-521289db { + position: fixed; + left: 0; + right: 0; + bottom: 0; + margin-top: 31.88rpx; + padding: 22.5rpx 33.75rpx 30.13rpx 39.38rpx; + background-color: #ffffff; +} +.image_4.data-v-521289db { + width: 46.88rpx; + height: 46.88rpx; +} +.text_13.data-v-521289db { + color: #9d2624; + font-size: 22.5rpx; + font-family: Open Sans; + line-height: 20.72rpx; +} +.text-wrapper.data-v-521289db { + padding: 29.1rpx 0 28.69rpx; + flex: 1 1 260.63rpx; + background-color: #e79ea14d; + border-radius: 93.75rpx; + height: 82.5rpx; +} +.text_11.data-v-521289db { + color: #ffffff; + line-height: 24.71rpx; +} +.text-wrapper_2.data-v-521289db { + padding: 26.49rpx 0 28.57rpx; + flex: 1 1 260.63rpx; + background-color: #e79ea1; + border-radius: 93.75rpx; + height: 82.5rpx; +} +.text_12.data-v-521289db { + color: #ffffff; + line-height: 27.43rpx; +} +.text_14.data-v-521289db { + margin-left: 4.74rpx; + margin-top: 32.87rpx; + color: #000000; + font-size: 30rpx; + font-family: Open Sans; + line-height: 27.71rpx; +} +.image_5.data-v-521289db { + margin-top: 18.17rpx; + width: 100vw; + height: 531.5vw; +} \ No newline at end of file From f8fb16c4dd405ab002c09713f09c9aaac75b4edb Mon Sep 17 00:00:00 2001 From: yuanteng0011 <1876787513@qq.com> Date: Thu, 12 Dec 2024 10:14:25 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=8E=8B=E7=BC=A9=E6=95=B4=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/vcs.xml | 1 + pages.json | 36 +- .../newaddress_Info/img/dingwei.png | Bin 1141 -> 0 bytes .../newaddress_Info/img/selected.png | Bin 895 -> 0 bytes .../newaddress_Info/newaddress_Info.vue | 2 - pages/Shopping-cart/productmain/img/add.png | Bin 688 -> 0 bytes .../Shopping-cart/productmain/img/choose.png | Bin 911 -> 0 bytes .../Shopping-cart/productmain/img/choosed.png | Bin 1025 -> 0 bytes .../productmain/img/productimg.png | Bin 32627 -> 0 bytes pages/Shopping-cart/productmain/img/pull.png | Bin 308 -> 0 bytes pages/Shopping-cart/productmain/img/rmb.png | Bin 545 -> 0 bytes pages/Shopping-cart/productmain/img/short.png | Bin 494 -> 0 bytes .../Shopping-cart/productmain/productmain.vue | 8 - pages/home/home.vue | 497 ++++++----------- pages/home/img/dec.png | Bin 20108 -> 0 bytes pages/home/img/left.png | Bin 1034 -> 0 bytes pages/home/img/lunbo.png | Bin 169022 -> 0 bytes pages/home/img/product.png | Bin 103783 -> 0 bytes pages/home/img/right.png | Bin 946 -> 0 bytes pages/home/img/rili.png | Bin 3481 -> 0 bytes pages/home/img/shizi.png | Bin 12084 -> 0 bytes pages/home/img/xuanchuan.png | Bin 56519 -> 0 bytes pages/home/img/you.png | Bin 608 -> 0 bytes pages/mine/main/img/address.png | Bin 1579 -> 0 bytes pages/mine/main/img/avator.png | Bin 41943 -> 0 bytes pages/mine/main/img/background.png | Bin 77681 -> 0 bytes pages/mine/main/img/daifahuo.png | Bin 1148 -> 0 bytes pages/mine/main/img/daishouhuo.png | Bin 1639 -> 0 bytes pages/mine/main/img/dingdan.png | Bin 2434 -> 0 bytes pages/mine/main/img/lianxiren_s.png | Bin 1202 -> 0 bytes pages/mine/main/img/qianbao.png | Bin 1256 -> 0 bytes pages/mine/main/img/setting_s.png | Bin 1806 -> 0 bytes pages/mine/main/img/tuikuan.png | Bin 5174 -> 0 bytes pages/mine/main/img/you.png | Bin 542 -> 0 bytes pages/mine/main/main.vue | 15 - pages/order/paysuccess/img/product.png | Bin 105973 -> 0 bytes pages/order/paysuccess/img/rmb.png | Bin 551 -> 0 bytes pages/order/paysuccess/img/success.png | Bin 1330 -> 0 bytes pages/order/paysuccess/img/xian.png | Bin 145 -> 0 bytes pages/order/paysuccess/img/xian2.png | Bin 145 -> 0 bytes pages/order/paysuccess/paysuccess.vue | 207 ------- pages/order/product-waitpay/img/add.png | Bin 657 -> 0 bytes pages/order/product-waitpay/img/dingwei.png | Bin 1482 -> 0 bytes pages/order/product-waitpay/img/product.png | Bin 35022 -> 0 bytes pages/order/product-waitpay/img/rmb_32.png | Bin 555 -> 0 bytes pages/order/product-waitpay/img/rmb_36px.png | Bin 624 -> 0 bytes pages/order/product-waitpay/img/rmb_cheng.png | Bin 663 -> 0 bytes pages/order/product-waitpay/img/rmb_huang.png | Bin 679 -> 0 bytes pages/order/product-waitpay/img/short.png | Bin 482 -> 0 bytes pages/order/product-waitpay/img/yiwen.png | Bin 692 -> 0 bytes pages/order/product-waitpay/img/you_cheng.png | Bin 492 -> 0 bytes pages/order/product-waitpay/img/you_hei.png | Bin 356 -> 0 bytes .../order/product-waitpay/product-waitpay.vue | 27 +- .../productOrderDetail/productOrderDetail.vue | 489 ----------------- .../ProductDetails/ProductDetails.vue | 516 +++++++----------- .../ProductDetails/img/denglong.png | Bin 1613 -> 0 bytes .../store-home/ProductDetails/img/haibao.png | Bin 1011459 -> 0 bytes pages/store-home/ProductDetails/img/kefu.png | Bin 1447 -> 0 bytes pages/store-home/ProductDetails/img/show1.png | Bin 18500 -> 0 bytes pages/store-home/ProductDetails/img/show2.png | Bin 26739 -> 0 bytes pages/store-home/ProductDetails/img/show3.png | Bin 13819 -> 0 bytes pages/store-home/ProductDetails/img/show4.png | Bin 16102 -> 0 bytes pages/store-home/ProductDetails/img/zhuye.png | Bin 148082 -> 0 bytes pages/store-home/main/img/cailiaobao.png | Bin 2799 -> 0 bytes pages/store-home/main/img/dingzhi.png | Bin 1410 -> 0 bytes pages/store-home/main/img/jifenduihuan.png | Bin 2565 -> 0 bytes pages/store-home/main/img/lunbotu1.png | Bin 63772 -> 0 bytes pages/store-home/main/img/shangpingtupian.png | Bin 46892 -> 0 bytes pages/store-home/main/img/shouchiwu.png | Bin 2729 -> 0 bytes pages/store-home/main/img/sousuokuang.png | Bin 1599 -> 0 bytes pages/store-home/main/img/tianjia.png | Bin 1220 -> 0 bytes pages/store-home/main/img/toushi.png | Bin 3025 -> 0 bytes pages/store-home/main/main.vue | 9 - pages/workshop/index/index.vue | 6 +- pages/workshop/productmain/productmain.vue | 88 ++- static/home.png | Bin 1658 -> 13182 bytes static/homeselected.png | Bin 1635 -> 0 bytes static/mine.png | Bin 2036 -> 23222 bytes static/mineselected.png | Bin 2286 -> 0 bytes static/shopcar.png | Bin 1444 -> 19618 bytes static/shopcarselected.png | Bin 1643 -> 0 bytes static/store.png | Bin 1164 -> 35009 bytes static/storeselected.png | Bin 1354 -> 0 bytes store/userStore.ts | 25 - 84 files changed, 473 insertions(+), 1453 deletions(-) delete mode 100644 pages/Shopping-cart/newaddress_Info/img/dingwei.png delete mode 100644 pages/Shopping-cart/newaddress_Info/img/selected.png delete mode 100644 pages/Shopping-cart/productmain/img/add.png delete mode 100644 pages/Shopping-cart/productmain/img/choose.png delete mode 100644 pages/Shopping-cart/productmain/img/choosed.png delete mode 100644 pages/Shopping-cart/productmain/img/productimg.png delete mode 100644 pages/Shopping-cart/productmain/img/pull.png delete mode 100644 pages/Shopping-cart/productmain/img/rmb.png delete mode 100644 pages/Shopping-cart/productmain/img/short.png delete mode 100644 pages/home/img/dec.png delete mode 100644 pages/home/img/left.png delete mode 100644 pages/home/img/lunbo.png delete mode 100644 pages/home/img/product.png delete mode 100644 pages/home/img/right.png delete mode 100644 pages/home/img/rili.png delete mode 100644 pages/home/img/shizi.png delete mode 100644 pages/home/img/xuanchuan.png delete mode 100644 pages/home/img/you.png delete mode 100644 pages/mine/main/img/address.png delete mode 100644 pages/mine/main/img/avator.png delete mode 100644 pages/mine/main/img/background.png delete mode 100644 pages/mine/main/img/daifahuo.png delete mode 100644 pages/mine/main/img/daishouhuo.png delete mode 100644 pages/mine/main/img/dingdan.png delete mode 100644 pages/mine/main/img/lianxiren_s.png delete mode 100644 pages/mine/main/img/qianbao.png delete mode 100644 pages/mine/main/img/setting_s.png delete mode 100644 pages/mine/main/img/tuikuan.png delete mode 100644 pages/mine/main/img/you.png delete mode 100644 pages/order/paysuccess/img/product.png delete mode 100644 pages/order/paysuccess/img/rmb.png delete mode 100644 pages/order/paysuccess/img/success.png delete mode 100644 pages/order/paysuccess/img/xian.png delete mode 100644 pages/order/paysuccess/img/xian2.png delete mode 100644 pages/order/paysuccess/paysuccess.vue delete mode 100644 pages/order/product-waitpay/img/add.png delete mode 100644 pages/order/product-waitpay/img/dingwei.png delete mode 100644 pages/order/product-waitpay/img/product.png delete mode 100644 pages/order/product-waitpay/img/rmb_32.png delete mode 100644 pages/order/product-waitpay/img/rmb_36px.png delete mode 100644 pages/order/product-waitpay/img/rmb_cheng.png delete mode 100644 pages/order/product-waitpay/img/rmb_huang.png delete mode 100644 pages/order/product-waitpay/img/short.png delete mode 100644 pages/order/product-waitpay/img/yiwen.png delete mode 100644 pages/order/product-waitpay/img/you_cheng.png delete mode 100644 pages/order/product-waitpay/img/you_hei.png delete mode 100644 pages/order/productOrderDetail/productOrderDetail.vue delete mode 100644 pages/store-home/ProductDetails/img/denglong.png delete mode 100644 pages/store-home/ProductDetails/img/haibao.png delete mode 100644 pages/store-home/ProductDetails/img/kefu.png delete mode 100644 pages/store-home/ProductDetails/img/show1.png delete mode 100644 pages/store-home/ProductDetails/img/show2.png delete mode 100644 pages/store-home/ProductDetails/img/show3.png delete mode 100644 pages/store-home/ProductDetails/img/show4.png delete mode 100644 pages/store-home/ProductDetails/img/zhuye.png delete mode 100644 pages/store-home/main/img/cailiaobao.png delete mode 100644 pages/store-home/main/img/dingzhi.png delete mode 100644 pages/store-home/main/img/jifenduihuan.png delete mode 100644 pages/store-home/main/img/lunbotu1.png delete mode 100644 pages/store-home/main/img/shangpingtupian.png delete mode 100644 pages/store-home/main/img/shouchiwu.png delete mode 100644 pages/store-home/main/img/sousuokuang.png delete mode 100644 pages/store-home/main/img/tianjia.png delete mode 100644 pages/store-home/main/img/toushi.png delete mode 100644 static/homeselected.png delete mode 100644 static/mineselected.png delete mode 100644 static/shopcarselected.png delete mode 100644 static/storeselected.png delete mode 100644 store/userStore.ts diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 35eb1dd..43da0a2 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,5 +2,6 @@ + \ No newline at end of file diff --git a/pages.json b/pages.json index 485844f..722f957 100644 --- a/pages.json +++ b/pages.json @@ -61,7 +61,7 @@ "path" : "pages/store-home/ProductDetails/ProductDetails", "style" : { - "navigationBarTitleText" : "" + "navigationBarTitleText" : "泠泷水月阁工作室" } }, { @@ -114,13 +114,6 @@ "navigationBarTitleText" : "" } }, - { - "path" : "pages/order/paysuccess/paysuccess", - "style" : - { - "navigationBarTitleText" : "" - } - }, { "path": "pages/booking/Simple/Simple", "style": { @@ -134,13 +127,6 @@ "navigationBarTitleText" : "" } }, - { - "path" : "pages/order/productOrderDetail/productOrderDetail", - "style" : - { - "navigationBarTitleText" : "" - } - }, { "path" : "pages/login/login", "style" : @@ -196,6 +182,20 @@ { "navigationBarTitleText" : "" } + }, + { + "path" : "pages/workshop/productmain/productmain", + "style" : + { + "navigationBarTitleText" : "" + } + }, + { + "path" : "pages/workshop/component/timePopUp", + "style" : + { + "navigationBarTitleText" : "" + } } ], "globalStyle": { @@ -208,30 +208,26 @@ } }, "tabBar": { - "backgroundColor": "#F7E7C6", + "backgroundColor": "#FFFFFF", "list": [ { "pagePath": "pages/home/home", "iconPath": "./static/home.png", - "selectedIconPath": "./static/homeselected.png", "text":"首页" }, { "pagePath": "pages/store-home/main/main", "iconPath": "./static/store.png", - "selectedIconPath": "./static/storeselected.png", "text":"商城" }, { "pagePath": "pages/Shopping-cart/productmain/productmain", "iconPath": "./static/shopcar.png", - "selectedIconPath": "./static/shopcarselected.png", "text":"购物车" }, { "pagePath": "pages/mine/main/main", "iconPath": "./static/mine.png", - "selectedIconPath": "./static/mineselected.png", "text":"我的" } ] diff --git a/pages/Shopping-cart/newaddress_Info/img/dingwei.png b/pages/Shopping-cart/newaddress_Info/img/dingwei.png deleted file mode 100644 index 42904d6c518cba2bdb4db886c279cfabd9789059..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1141 zcmV-*1d98KP)K^i zC3^aLj$X#*VYNXnZEji26+$56@pxizDK6*Z1DZ*>nj|-=<@&)|SECcKSSp*%HoHN} zLxL!f;RzW`CO;`9Flh2p4OZ&AcUKMd-8(>f*qf6UE{15yue?V;^{uO148T1Wt*7K(D| zwex+r-RxW@@vwh}n+0XP-~$TPzwYwM5%nHsz+x50%!a5@# z7BRL#4zY!tBfpBg;@H`Xq}$3ITA6U?h0|*E_z_>^$Uz?+4){tAXbk_r1^tG|A%wDR zUUg&&k_)lwl)y8CDg-)G zq=~5&6Z;eiK!_0B%9=p5V(PC@$v|f!^r(L}pT~)wiG();oXjjtOKp4tRl9ljD@b7rXd@Tk3Lz_7gL3kF1Y~L@()a?K#JWjUKCSaWla>|W|!JOxlRUfHK8hy!Wk%^5!jqQaXh%( z{u!i@O`LH1`&`vNG_r-FOsa#cy->o(clK*cCf4_A4szecL|loPji?$SfJx!Z)WZe0 zDlEs>NIV{QoC#DyRS6XUYgyIq;*Tj35)u*;5)u*;62I{a9yuUhF4M>V00000NkvXX Hu0mjfp?C+p diff --git a/pages/Shopping-cart/newaddress_Info/img/selected.png b/pages/Shopping-cart/newaddress_Info/img/selected.png deleted file mode 100644 index 52a1349bc9697ba4d5dc4a0d150144b536e3242b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 895 zcmV-_1AzRAP)7404VAlV)4UHQ1W;RL+i`>u?N7ux_sW?Uf^-PrA49>$DiY-Z8$Eh#nrCL^JyhfN z0hE8WGK}d=Z1(j-jdurmW~m+u*NHzQNC$OD;S|<2z2(gcfeefaTwb+MtJDPY%Sl3| zOc^~>JB$`LN3c0e-i-mN@!p`eX-Z{6$E?%XtvQU_Y3fCXbx8bI;(VRx%ZP{kA=V{j z9nUWfkO_JZv9*_$*kRyZcu4k9s~8mZR?js--;jjc-2aKXBx=C4ab(6Ew})J{-3-ea z1Qen-&1Aluyu80m_0 zb`paT=zyEwEoLw$}jHGdhbxCe|^UDPg zPn28_!Q(@jsvwMG=4?xP6-@chOpza%KuE;Q!yB)7D9z{sVV! VR${46RR{n8002ovPDHLkV1kH&pY8wv diff --git a/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue b/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue index 96f47c4..1029029 100644 --- a/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue +++ b/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue @@ -48,8 +48,6 @@ import {ref , onMounted} from 'vue' import { testUrl , baseUrl , suiUrl } from '../../../api/request'; import { onLoad } from '@dcloudio/uni-app'; -import dingwei from '@/pages/Shopping-cart/newaddress_Info/img/dingwei.png' -import selected from '@/pages/Shopping-cart/newaddress_Info/img/selected.png' const userInfo = ref({}) const addressParam = ref({ userId: 0, diff --git a/pages/Shopping-cart/productmain/img/add.png b/pages/Shopping-cart/productmain/img/add.png deleted file mode 100644 index 7f1530a837dac1c9a02c3608d9942752e6faa446..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 688 zcmV;h0#E&kP)Px#1am@3R0s$N2z&@+hyVZrT1iAfR9J=Wna@rdK^VY)GrNk5Hnx@)l#saAgv3i} zdi2msFP@}t(7u6>&{yaiG`>Lf9n_lvV`9>ztfaId5h#Cx3#`cWV6di3+Cl-Dgx_uV zo1OXXmoMLLX2j*?7sW)O(jd}8h_n!L-?HrN?<2(IN&iAADpHE~!QitGckfTM^d0ts zLF1heb_Kw^Z<~K4>AKedZvf=|y7WcTbu&AlPk8`0HEtNj3!O5J5Ij_>lhjHYKq-~b zP8!s64W)&Snbxc2-7=LP7bE$MH=8Za&%beTQDSW^#>&c548s`O{3FS9qtW8%=$PHz zPn@29rro|C>ii=r4@JG+pja$Zue&HU+&={^YkDd@F0_;$xaD14UE#V-I-QO$R;||Y zJP){Of0as&Kw#E4P6)yLyv5ASOkZmcES=4M=iuO&TCMJjd7eim^A&(p>WosUjFkR9 z9SS{SbMqyutI@vJ9#}e`FK~ExOrh}OkK-IChvVdW#%w#r#>V>iq+_vVwzpr?Xf%DX zX0t^qb%x{QNF+9h$8Aj0pXsHgMWWGg-)sMebcE&QCp}}8N{wQ%jN{~p$8EN@USU}Q z-#95{&zJcd152BxiD~wJJP??@{ns!}1Ir39H|Lig6fIlcRC-)YrMno0K{)&v+m5lg z_+aSsk7Qe{-ENc57bq6XL?R)=;Sf>|FF#uC<#n0X^tjMaTAgSpEz;Ua3!#~`QdEVI zds;~YJC500009a7bBm000&x z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP z<1iGx4)9M2-U8Mhvyx`f_TCEl>>;EkowZsF8KT~eUqL#p*F^Kv~w38SI@Ev znRdHf9goK?nRf#TJmcjdUfj)k_U-NM1Qw~IU$F3eI2;b|vaIA~ysVCyKFQ1_ocY7W z#l;^f0J;~0-=f$sZM4#8G&)Tq=>T_?VigB=@&^Y8*A?A; zi5RiclM;dWv|9?co+>TlYrRw=#QFKT9g~6VlGzm^{Xeveo^JCyg(ahUWEZevjbtJg zU>RRZ2GiLg6O&95M6`_FEDhAtPPJ#rq}(h6N2WmaNHSfg;abW?-4w9kekJ1S{r&x) zOnnza)BIRR)#Zh1YznzVvOw$HnQStuou`3&DFGnhj??5%LI&1&k*V@09uUaBY!TGi zW~b)*W=pkwH&P^(q!qEE76ES?g8IU(mQ z>HMmPuC)U?<=s6fzGJsf#jQ~Az(q7$q)j(aWS{HC5Cxnbfqd2(C#at;_DelcrpzKq zKMM6C`WQ<_Ak%Yt;574yTT8Qc=2@GBDAY~VyDy`d#`Wdu5yE^j(ZNq-o&+cKjLdn= z8guC<5k2m5c78^eSTA?eTSN#Vjqg4dR?002ovPDHLkV1k!%pVt5Y diff --git a/pages/Shopping-cart/productmain/img/choosed.png b/pages/Shopping-cart/productmain/img/choosed.png deleted file mode 100644 index 8d36d1f6cb6b5fa85ed09cb46b40a5db599fbaa5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1025 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 Bb*=ya diff --git a/pages/Shopping-cart/productmain/img/rmb.png b/pages/Shopping-cart/productmain/img/rmb.png deleted file mode 100644 index cc3c40fdeb2b14219148097488dc3955f9a869b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 545 zcmV++0^a?JP)s;fH%M!z!5k?y+Pk-*xio1EsX@*Zt>^A z*e@ZOW#_Lm(dezgz2<|Fw4HLxaN;3HwGut^Vy7x5z>9NwG0 zJBZ^{CJ3dJmr#>h2^g3ZJw1@2k@Y-`w>oHkm-XG0o+710_v}8?`_TkYJ52z3`(uYm zwKRg5w*9>Ch%`7QcxnSDvYYaOHVTYPsHdEupWTpOx9_zR*iKxJv+SKd#Jpk!j>6;r zTG%?roA?bXU|^vr*mv}fIk^QnV#+C(8MZvzla^6?2!D&p3Ye`Y1P=-gF&{poNUsF= zY2|V*hPG8)IRkO*b{JEAu%VYz;gcxW*IvG!fa}JQq>>Mi!u3b|q)!fp$0~SjpNnP) jt$U!1qQ%qD@F#f(j>D_&2Aj#500000NkvXXu0mjfE(-2a diff --git a/pages/Shopping-cart/productmain/img/short.png b/pages/Shopping-cart/productmain/img/short.png deleted file mode 100644 index 4db3f0166bba62ea0029c94114011ffa269d97d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 494 zcmVPx#1am@3R0s$N2z&@+hyVZqm`OxIR9J=W*|BQEKpe;M-~BxYbhFN9d!Cy5*}hK3DLmQu8o%Z3o~1Au`=Pp0VmLs7uM0WHL0 zh=PCtfQ8}Gi{tny&%fd0NXleTBrpKb*RfWt2$0vd5voz%{y4Hke_xWn9NJV4Z7PR0 zl|!4#p-shg2lx9ugxDcT677dG#!#zOP%f91=CskP)hi~G8MfOG-CN-N{0#m64Lq-< zG^dSTuQ!-ZXV`4sbZ>!9r;Tp+${f1gzJ%}JA`ExBw?MO5N2_(AJja4yE_EIlMG>MX z))`GBB5+;;k=l8n{iZqR;9PtBUlsDmb7)gJw5c50R1R$_0_2NrglYt^XWIzXh_OPV zX)Gn)Z9`O|N~N - - - - - 热门精品 - - - 非遗工坊 - - - - - 写真预约 - + + + + 限定手制|非量售卖 + 匠 + 承 + 非 + 遗 + + + + + 写真预约 + 伊人摸样，丹青绘画 - - - 推荐商品 - - 更多 - - - - - - - - 琉璃发体验包 - - ￥750 - - - - - 琉璃发体验包 - - ￥750 - - - - - 琉璃发体验包 - - ￥750 - - - - 推荐服务 - - 更多 - - - - - - - - 琉璃发体验包 - - ￥750 - - - - - 琉璃发体验包 - - ￥750 - - - - - 琉璃发体验包 - - ￥750 - - - - 活动资讯 - - 更多 - - + + + + 手作材包 + 朴物良社，匠心手作 - - - - “五色五育”研学——端午香囊篇 - 为进一步深入贯彻落实习近平总书记... - 2024-08-04 - - + + + + 推荐商品 + 伊人摸样，丹青绘画 + + + 活动咨询 + 朴物良社，匠心手作 + @@ -138,14 +54,6 @@ import {ref} from 'vue' import { baseUrl, testUrl , suiUrl} from '@/api/request'; import { onShow } from "@dcloudio/uni-app"; -import dec from '@/pages/home/img/dec.png' -import product from '@/pages/home/img/product.png' -import right from '@/pages/home/img/right.png' -import left from '@/pages/home/img/left.png' -import rili from '@/pages/home/img/rili.png' -import xuanchuan from '@/pages/home/img/xuanchuan.png' -import shizi from '@/pages/home/img/shizi.png' -import you from '@/pages/home/img/you.png' //变量 const items = ref( [null, null, null]) const items_1 = ref( [null, null, null]) @@ -153,11 +61,6 @@ onShow(() => { uni.removeStorageSync('businessId') getMyUser() }) -const jump_feiyi =()=>{ - uni.navigateTo({ - url: '/pages/workshop/index/index' - }) -} const getMyUser = async () =>{ const res = await uni.request({ url: baseUrl + '/user/get/login', @@ -178,219 +81,181 @@ const getMyUser = async () =>{ }) } } -//跳转商品详情页面 -const jump_product =()=>{ - uni.navigateTo({ - url:'../../pages/store-home/ProductDetails/ProductDetails' - }) -} const jump_xiezhen =()=>{ uni.navigateTo({ url: '../../pages/booking/respectable/respectable' }) } +const jump_feiyi =()=>{ //跳转非遗工坊 + uni.navigateTo({ + url: '/pages/workshop/index/index' + }) +} +const jump_store =()=>{ + uni.switchTab({ + url: '/pages/store-home/main/main' + }) +} \ No newline at end of file diff --git a/pages/order/product-waitpay/img/add.png b/pages/order/product-waitpay/img/add.png deleted file mode 100644 index 0b3310fffd63c3a29ddf9cfbbe689ca536edb87a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 657 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 diff --git a/pages/order/product-waitpay/img/rmb_36px.png b/pages/order/product-waitpay/img/rmb_36px.png deleted file mode 100644 index 60e9dafedabf449ec15030c0b0c505158a0fa735..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 624 zcmV-$0+0QPP)l}g1mnSVy{ILqbI z=avJ@vH~hIa>X={S>&<2}Q*&bl*>N|g)9Eai%Y8z~l@gRM6bkdnWb#G{AiFNc zcfuHg?vb6BqlXQZ{vASYI7aL4vo6A_J7njTgorZ4V9`FBrq&f{oo*E})5N?s z86Xy<9?*!hZr3U_Vyi+d!|`m1hb;J-$V<*1XG`@vs{b7QV=_dvhjg%?rYHq-trS!d zw;|>MVMU3lL(DTBfN_RGip64&#VApIShT%H8~DC2E}q7M`14`gc4xOA4|YlImmLBK z{85dE!{H?fNcwazPWbjhJdCG9kqF|qZAIPSEQPkIxEqxn6As=(Ou1aHVgvUyK~?M@ zaS@Eds1E%G63e!ki0VgnF7z07c^Dg+^}%4!CjpXE#s%+#j$||%iMGe-S;plbMbM49 z2aCA2e1Fei;kEi#c`)fIOX4(-{XSN!)fgwRrF9)urBhN;{v}^+H0*pnriNbt0000< KMNUMnLSTZjMh`0h diff --git a/pages/order/product-waitpay/img/rmb_cheng.png b/pages/order/product-waitpay/img/rmb_cheng.png deleted file mode 100644 index b176eeac6721681b4e8a812697ec9d65350c7d51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 663 zcmV;I0%-k-P)1PkvGa9@~>I^Vv=ST3VhNSk-CfQ6z+jvUV7T2@aA3Jh;0FyFT-Ss!k9| z#F*aL>nB}G{aJwra@Lt-a~V?`Ve{3^sT73QurmPDLZ~M`@(FIzxGDvwhFn7Xgg#<_8Jm-@S$4UpWCcmW?j)L8qcouSMb1D5W$$7 zR#|s!75nXORR(&FhrgeA4-qzbK$$+jR%^0KX}tjh|F^bM@{NyG8D144>~7iGqhOG= z4GR`#4w2S+oQbi~$$i8S-WAG_GfrzI-Z$6ze*;@SlJDT2)C!`fSBiZ*i9^uE{dzfK zYkN;#4|Y@Z!2wn`K!}iDAMtVAiYc4YYf$)lL18EoDf#kTA0kx<<2+zbbOY%1@;%83 z4UjVy+Z3yUpqP);4`_h*E_-NdEhFR&RpJzb_!bLG$pqN5W6xHd&MI)A)-w9QqVE}K z2p>wPH<$Lk^aLe0Fpt1wCOJZG(4HX44RV9f6VQhOkEJIFH;DV*N%R(jZEYo} zY!4V)hGr%o{>^wmYe`<|zpE8MP0b4fi(b;mb%Q3jy4?(b<0n#y#(ou zP3%TKx9W)+_!BA+j$0RctePi)ba8t*ggx$)5SOU|JHe0E7chX-&LEs8Z4wu6Pq|+< z4#9wM@@^!%o~&mE9xcUD+2qlrbxQ#4wKFhm4DQar0A|w3UeFl=`Kty>8Q> z;*1;@FEhLRKO9nlNU@b!A$q%{+mwm{8A+A)H^e#qGm}48x^2miK8(@~(!|8lz!z|3 z_xU%dfU!dgdm%21q}!Cr4$Y;~7zK5f<=E{YvYW&Zi>`CbXG*GwR`ykDM+@<(id33P zJEUj~_*@eUa*o5(B2zg?vN^oVFQMF?+~f2 z&ZN{r-{sC#D!yBD!U2TS51tI*Ou-eN)91h704itMV^b=bBAmKjo}Ey9M#{7aI zt~)(G0|QDWQx`0CpMe8$`gca*@#G{k@|wo($2@z;tS%BI^$eLfv0`}+<$Y+te}e%= zF|=zknPt8zqZ$(O&TRPMT|7C-o@d(c9vt~0v0-Ac;Gk2wrl#gq@)y`;>B+m3bdCT3 N002ovPDHLkV1iWUD}Dd~ diff --git a/pages/order/product-waitpay/img/short.png b/pages/order/product-waitpay/img/short.png deleted file mode 100644 index 51481c5d6f854a440beac1eafd8c25b9f77726d2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 482 zcmV<80UiE{P)Px#1am@3R0s$N2z&@+hyVZqj7da6R9J=W*-c8rKp24G_ZuUkf<}r9Mf}0Fm>cNM zc4Y+*;0^Q$y@>~?P~Exp1nL14S1w!#iil|I=fcuTEt(l+CV_cZAxx5okW2_83`twn zWjeYIlA)3zWW&aVN(Oi6(bhhg29Wya)HdC|@N1n{@LyA{K`zoS+716$mXkSIN zuM*b--`dLa8+6{?FKz@T$Ar-lyW^bE*Z0cVmGbbSuBTvjQrK8EtW>`JU;mgh`t}jd zuHLzOayGge$5CZ4pV_MIvEiX z%NOXsD&>?H(Y}gkUq!U9BHC95^fENUHUnIQM%ZRhDIq%1V^kkPLu@j#b9w{P2o15R zza-bJ9wV|H5|g+7l$X5hp?VU~lDqFKw$0iBXakYy5THB_{a?~nb(yx*yNgH}6l-1P Y1Hh6|jt<9qy#N3J07*qoM6N<$g2h?V4gdfE diff --git a/pages/order/product-waitpay/img/yiwen.png b/pages/order/product-waitpay/img/yiwen.png deleted file mode 100644 index 654306a41c9fa21d3b38044084df654a69b6649b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 692 zcmV;l0!#ggP)nY)~d>H%QtAfC(rQ029zmK$rk?RnuN+0|?RNW)W<8(J*FJWfgdoZXgTWLeIl4)& zp(uLZY&Q2GUePgxJR=a@f@nekfcz2~*C4H(gqrM)4B><4 zD-Io+yj}`VhJMx;1(1%qA&v}WeKVV3{NC{2rpKG=LWVb%qgb;dl#Ia!Vfe-{l)#Y( z`6KFh`O(!txazVjFPi>hv6$iCln!BifnF(yc`3544H??FGrK>)8ZCuW6Oi4~Aqs4` zfT5{$&SV1G?scuZy}lcLZ|$&FkWjsqblH}xd7PI#8#8KqrkFy5{$qLEV%;OtdP zNS1tqkr~3a)2Sj+>$Oqb!MC*8X(AD8qo)*xm4U2q=%oBQp>Q-+WUa~W@R|B5?`MeV ze)=l#PHf0{*9MTOmJq1PA8FGFSqjMRIZgySd!2YFW;)pw+7t4GJ~w|V4XVjQh=CAr z(TDvJw`Jl#dg?1YTqJT5MZpGHt$v*rsFP2YiqoJiP1Cfl0cms;}X2 z_yW@X)sO(T5jsL&;Gwp2*exW5n#NAT zFGX_fv%mcE**OG@C_9OiEc0^vLg&MYc!Q1#Y@I@g5dlSL9)x^z&(GjLK%A>*Bv^gD zh6X0*gE90C!Yf!0l!*6X6a-88$STL8JyeCxob)fN;sK#S?fcI5vn=SQ%%! zStSDzEZR6jmmta@l#=JVStW(9v%n?D>=|Q+&cvLh;3y|Y)#4UsP|}Rw$h2v$lcVaZ zYG*~g0^Yhf^K!JW%>!TP$#qgRIBN~^g>?d1VUl7#mBsHkuRU@RGCH;OcLE)_0ZLh- zUTm@bC4+|WM9%(-_XbfG>a+B|)XkAA#E5}6Y!FKrm*Be1(>>f=s!E7)0L?A{h@S(5bew ims?5|y9%fuh|wq3*VeJEd9Q*10000Jt6uE#h(#o1Y%foZ)~*pzux4bFe&yxnnirRoZ?7KU5w7JAidIN#pTyyeJ!Ws--` z3dM;!3#OeA3h+wdUZK*(A|iB@X{nG1vz`lb)IFnn6Wc>j}lCF7kXhtEx^Vc7%>1O`u6KbLh*2~7a+qJlI4 diff --git a/pages/order/product-waitpay/product-waitpay.vue b/pages/order/product-waitpay/product-waitpay.vue index 2e32add..e923396 100644 --- a/pages/order/product-waitpay/product-waitpay.vue +++ b/pages/order/product-waitpay/product-waitpay.vue @@ -10,7 +10,7 @@ {{ addressRealInfo.detailAddress }} @@ -18,7 +18,7 @@ 更换地址 @@ -58,7 +58,7 @@ @@ -66,7 +66,7 @@ @@ -78,7 +78,7 @@ @@ -126,7 +126,7 @@ {{ sumprice }}.00 @@ -144,7 +144,7 @@ 应付： {{ sumprice }}. @@ -166,19 +166,6 @@ import {onMounted, ref, toRaw} from 'vue' import emitter from '../../../utils/emitter' import { onLoad , onShow } from "@dcloudio/uni-app"; import { baseUrl } from '../../../api/request'; -//图片暂时存在本地 -import addressComponentVue from '../component/addressComponent.vue'; //带入组件 -import add from '@/pages/order/product-waitpay/img/add.png'; -import dingwei from '@/pages/order/product-waitpay/img/dingwei.png'; -import product from '@/pages/order/product-waitpay/img/product.png'; -import rmb_32 from '@/pages/order/product-waitpay/img/rmb_32.png'; -import rmb_36px from '@/pages/order/product-waitpay/img/rmb_36px.png'; -import rmb_cheng from '@/pages/order/product-waitpay/img/rmb_cheng.png'; -import rmb_huang from '@/pages/order/product-waitpay/img/rmb_huang.png'; -import short from '@/pages/order/product-waitpay/img/short.png'; -import yiwen from '@/pages/order/product-waitpay/img/yiwen.png'; -import you_cheng from '@/pages/order/product-waitpay/img/you_cheng.png'; -import you_hei from '@/pages/order/product-waitpay/img/you_hei.png'; //一些暂时变量 const num = ref(1) const price = ref(138) diff --git a/pages/order/productOrderDetail/productOrderDetail.vue b/pages/order/productOrderDetail/productOrderDetail.vue deleted file mode 100644 index bb643a0..0000000 --- a/pages/order/productOrderDetail/productOrderDetail.vue +++ /dev/null @@ -1,489 +0,0 @@ - - - - - diff --git a/pages/store-home/ProductDetails/ProductDetails.vue b/pages/store-home/ProductDetails/ProductDetails.vue index 2032032..4ab7bc8 100644 --- a/pages/store-home/ProductDetails/ProductDetails.vue +++ b/pages/store-home/ProductDetails/ProductDetails.vue @@ -1,113 +1,69 @@