From 3f2a000aae8ac225d6524a41c6ac61f6774e7d1b Mon Sep 17 00:00:00 2001 From: sa_10_0 <2492740167@qq.com> Date: Tue, 5 Nov 2024 20:08:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 7 + pages/mine/main/main.vue | 9 +- pages/mine/mineorders/mineorders.vue | 585 +++++++++-------- unpackage/dist/dev/mp-weixin/app.js | 3 +- unpackage/dist/dev/mp-weixin/app.json | 1 + unpackage/dist/dev/mp-weixin/common/vendor.js | 21 +- .../pages/Shopping-cart/Contact/Contact.js | 2 +- .../pages/Shopping-cart/Phone/Phone.js | 2 +- .../pages/Shopping-cart/address/address.js | 2 +- .../newaddress_Info/newaddress_Info.js | 2 +- .../Shopping-cart/productmain/productmain.js | 2 +- .../Shopping-cart/servicemain/servicemain.js | 2 +- .../pages/booking/AppointmentHome.js | 2 +- .../booking/BillingOfFees/BillingOfFees.js | 2 +- .../pages/booking/ContactInformation.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 +- .../dev/mp-weixin/pages/mine/main/main.js | 28 +- .../dev/mp-weixin/pages/mine/main/main.wxml | 2 +- .../pages/mine/mineorders/mineorders.js | 99 +++ .../mineorders/mineorders.json} | 0 .../pages/mine/mineorders/mineorders.wxml | 1 + .../pages/mine/mineorders/mineorders.wxss | 594 ++++++++++++++++++ .../pages/order/component/addressComponent.js | 2 +- .../pages/order/paysuccess/paysuccess.js | 2 +- .../order/product-close/product-close.js | 2 +- .../order/product-unpay/product-unpay.js | 2 +- .../order/product-waitpay/product-waitpay.js | 2 +- .../productOrderDetail/productOrderDetail.js | 2 +- .../productOrderDetail.wxml | 1 - .../productOrderDetail.wxss | 337 ---------- .../ProductDetails/ProductDetails.js | 2 +- .../mp-weixin/pages/store-home/main/main.js | 2 +- .../dist/dev/mp-weixin/project.config.json | 4 +- .../dev/mp-weixin/project.private.config.json | 7 + .../components/uni-popup/uni-popup.js | 2 +- .../components/uni-popup/uni-popup.wxml | 2 +- .../uni-transition/uni-transition.js | 2 +- 42 files changed, 1057 insertions(+), 694 deletions(-) create mode 100644 unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.js rename unpackage/dist/dev/mp-weixin/pages/{order/productOrderDetail/productOrderDetail/productOrderDetail.json => mine/mineorders/mineorders.json} (100%) create mode 100644 unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.wxml create mode 100644 unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.wxss delete mode 100644 unpackage/dist/dev/mp-weixin/pages/order/productOrderDetail/productOrderDetail/productOrderDetail.wxml delete mode 100644 unpackage/dist/dev/mp-weixin/pages/order/productOrderDetail/productOrderDetail/productOrderDetail.wxss diff --git a/pages.json b/pages.json index c01a108..af7ea8f 100644 --- a/pages.json +++ b/pages.json @@ -22,6 +22,13 @@ "navigationBarTitleText" : "" } }, + { + "path" : "pages/mine/mineorders/mineorders", + "style" : + { + "navigationBarTitleText" : "" + } + }, { "path": "pages/Shopping-cart/productmain/productmain", "style" : diff --git a/pages/mine/main/main.vue b/pages/mine/main/main.vue index 431f8c7..66c5993 100644 --- a/pages/mine/main/main.vue +++ b/pages/mine/main/main.vue @@ -17,12 +17,12 @@ - + - 总订单 + 总订单 { + uni.navigateTo({ + url:"/pages/mine/mineorders/mineorders" + }) +} const store = userStore() const login = () => { diff --git a/pages/mine/mineorders/mineorders.vue b/pages/mine/mineorders/mineorders.vue index 3870660..23a8b27 100644 --- a/pages/mine/mineorders/mineorders.vue +++ b/pages/mine/mineorders/mineorders.vue @@ -1,331 +1,310 @@ + \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/app.js b/unpackage/dist/dev/mp-weixin/app.js index ce10613..e5ac6bd 100644 --- a/unpackage/dist/dev/mp-weixin/app.js +++ b/unpackage/dist/dev/mp-weixin/app.js @@ -6,6 +6,7 @@ if (!Math) { "./pages/home/home.js"; "./pages/store-home/main/main.js"; "./pages/mine/main/main.js"; + "./pages/mine/mineorders/mineorders.js"; "./pages/Shopping-cart/productmain/productmain.js"; "./pages/Shopping-cart/servicemain/servicemain.js"; "./pages/booking/AppointmentHome.js"; @@ -31,7 +32,7 @@ const _sfc_main = {}; function _sfc_render(_ctx, _cache) { return {}; } -const App = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]); +const App = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/jiangchengfeiyi-xiaochengxu/App.vue"]]); 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 539b107..58f91d6 100644 --- a/unpackage/dist/dev/mp-weixin/app.json +++ b/unpackage/dist/dev/mp-weixin/app.json @@ -3,6 +3,7 @@ "pages/home/home", "pages/store-home/main/main", "pages/mine/main/main", + "pages/mine/mineorders/mineorders", "pages/Shopping-cart/productmain/productmain", "pages/Shopping-cart/servicemain/servicemain", "pages/booking/AppointmentHome", diff --git a/unpackage/dist/dev/mp-weixin/common/vendor.js b/unpackage/dist/dev/mp-weixin/common/vendor.js index 002aa28..047da94 100644 --- a/unpackage/dist/dev/mp-weixin/common/vendor.js +++ b/unpackage/dist/dev/mp-weixin/common/vendor.js @@ -180,6 +180,7 @@ 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"; @@ -620,7 +621,7 @@ function getApiCallbacks(args) { } return apiCallbacks; } -function normalizeErrMsg(errMsg, name) { +function normalizeErrMsg$1(errMsg, name) { if (!errMsg || errMsg.indexOf(":fail") === -1) { return name + ":ok"; } @@ -637,7 +638,7 @@ function createAsyncApiCallback(name, args = {}, { beforeAll, beforeSuccess } = const callbackId = invokeCallbackId++; addInvokeCallback(callbackId, name, (res) => { res = res || {}; - res.errMsg = normalizeErrMsg(res.errMsg, name); + res.errMsg = normalizeErrMsg$1(res.errMsg, name); isFunction(beforeAll) && beforeAll(res); if (res.errMsg === name + ":ok") { isFunction(beforeSuccess) && beforeSuccess(res, args); @@ -769,7 +770,7 @@ function promisify$1(name, fn) { } function formatApiArgs(args, options) { const params = args[0]; - if (!options || !options.formatArgs || !isPlainObject$1(options.formatArgs) && isPlainObject$1(params)) { + if (!options || !isPlainObject$1(options.formatArgs) && isPlainObject$1(params)) { return; } const formatArgs = options.formatArgs; @@ -816,12 +817,12 @@ function beforeInvokeApi(name, args, protocol, options) { return errMsg; } } -function parseErrMsg(errMsg) { +function normalizeErrMsg(errMsg) { if (!errMsg || isString(errMsg)) { return errMsg; } if (errMsg.stack) { - console.error(errMsg.message + "\n" + errMsg.stack); + console.error(errMsg.message + LINEFEED + errMsg.stack); return errMsg.message; } return errMsg; @@ -835,7 +836,7 @@ function wrapperTaskApi(name, fn, protocol, options) { } return fn(args, { resolve: (res) => invokeSuccess(id, name, res), - reject: (errMsg2, errRes) => invokeFail(id, name, parseErrMsg(errMsg2), errRes) + reject: (errMsg2, errRes) => invokeFail(id, name, normalizeErrMsg(errMsg2), errRes) }); }; } @@ -1297,8 +1298,8 @@ function populateParameters(fromRes, toRes) { appVersion: "1.0.0", appVersionCode: "100", appLanguage: getAppLanguage(hostLanguage), - uniCompileVersion: "4.23", - uniRuntimeVersion: "4.23", + uniCompileVersion: "4.15", + uniRuntimeVersion: "4.15", uniPlatform: "mp-weixin", deviceBrand, deviceModel: model, @@ -7303,7 +7304,7 @@ function initDefaultProps(options, isBehavior = false) { }; } if (options.behaviors) { - if (options.behaviors.includes("wx://form-field")) { + if (options.behaviors.includes("__GLOBAL__://form-field")) { if (!options.properties || !options.properties.name) { properties.name = { type: null, @@ -7474,7 +7475,7 @@ function initBehaviors(vueOptions) { const behaviors = []; if (isArray(vueBehaviors)) { vueBehaviors.forEach((behavior) => { - behaviors.push(behavior.replace("uni://", "wx://")); + behaviors.push(behavior.replace("uni://", "__GLOBAL__://")); if (behavior === "uni://form-field") { if (isArray(vueProps)) { vueProps.push("name"); diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Contact/Contact.js b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Contact/Contact.js index b710aed..3dd6605 100644 --- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Contact/Contact.js +++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Contact/Contact.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]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/Shopping-cart/Contact/Contact.vue"]]); wx.createPage(MiniProgramPage); 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 af0173b..5b34f16 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"]]); +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"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/address/address.js b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/address/address.js index 1637d9a..902d404 100644 --- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/address/address.js +++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/address/address.js @@ -68,5 +68,5 @@ const _sfc_main = { }; } }; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-fdeeb5e5"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-fdeeb5e5"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/Shopping-cart/address/address.vue"]]); 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 ee8dc87..2bb033c 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 @@ -18,5 +18,5 @@ const _sfc_main = { }; } }; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-fb57d854"]]); +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"]]); 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 2b3d8d4..1e781db 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 @@ -115,5 +115,5 @@ const _sfc_main = { }; } }; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-641af6de"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-641af6de"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/Shopping-cart/productmain/productmain.vue"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/servicemain/servicemain.js b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/servicemain/servicemain.js index d25b171..b2f5957 100644 --- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/servicemain/servicemain.js +++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/servicemain/servicemain.js @@ -15,5 +15,5 @@ const _sfc_main = { }; } }; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-b7001184"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-b7001184"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/Shopping-cart/servicemain/servicemain.vue"]]); 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 078f7f6..99abf27 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"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-60893f73"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/booking/AppointmentHome.vue"]]); 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 038beec..59012db 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"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-cab9a6c6"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/booking/BillingOfFees/BillingOfFees.vue"]]); 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 bb23879..e4ea835 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"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-43413e24"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/booking/ContactInformation.vue"]]); 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 ccd57ba..9720bc7 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"]]); +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"]]); 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 803cefc..a7bf5f5 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"]]); +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"]]); 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 f314148..aa1bc8b 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"]]); +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"]]); 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 dd67dc4..995a8f4 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"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-f815bf4c"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/booking/date.vue"]]); 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 be62484..61de849 100644 --- a/unpackage/dist/dev/mp-weixin/pages/booking/respectable/respectable.js +++ b/unpackage/dist/dev/mp-weixin/pages/booking/respectable/respectable.js @@ -21,5 +21,5 @@ const _sfc_main = { }; } }; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-cad4fb76"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-cad4fb76"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/booking/respectable/respectable.vue"]]); 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 610e6a6..2aa56a9 100644 --- a/unpackage/dist/dev/mp-weixin/pages/home/home.js +++ b/unpackage/dist/dev/mp-weixin/pages/home/home.js @@ -46,5 +46,5 @@ const _sfc_main = { }; } }; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-07e72d3c"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-07e72d3c"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/home/home.vue"]]); wx.createPage(MiniProgramPage); 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 b3bc411..c0084cb 100644 --- a/unpackage/dist/dev/mp-weixin/pages/mine/main/main.js +++ b/unpackage/dist/dev/mp-weixin/pages/mine/main/main.js @@ -5,24 +5,30 @@ const common_assets = require("../../../common/assets.js"); const _sfc_main = { __name: "main", setup(__props) { + const goto = () => { + common_vendor.index.navigateTo({ + url: "/pages/mine/mineorders/mineorders" + }); + }; store_userStore.userStore(); return (_ctx, _cache) => { return { a: common_vendor.unref(common_assets.avator), b: common_vendor.unref(common_assets.dingdan), - c: common_vendor.unref(common_assets.qianbao), - d: common_vendor.unref(common_assets.daifahuo), - e: common_vendor.unref(common_assets.daishouhuo), - f: common_vendor.unref(common_assets.tuikuan), - g: common_vendor.unref(common_assets.address), - h: common_vendor.unref(common_assets.you$1), - i: common_vendor.unref(common_assets.lianxiren_s), - j: common_vendor.unref(common_assets.you$1), - k: common_vendor.unref(common_assets.setting_s), - l: common_vendor.unref(common_assets.you$1) + c: common_vendor.o(($event) => goto()), + d: common_vendor.unref(common_assets.qianbao), + e: common_vendor.unref(common_assets.daifahuo), + f: common_vendor.unref(common_assets.daishouhuo), + g: common_vendor.unref(common_assets.tuikuan), + h: common_vendor.unref(common_assets.address), + i: common_vendor.unref(common_assets.you$1), + j: common_vendor.unref(common_assets.lianxiren_s), + k: common_vendor.unref(common_assets.you$1), + l: common_vendor.unref(common_assets.setting_s), + m: common_vendor.unref(common_assets.you$1) }; }; } }; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-8172b2ba"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-8172b2ba"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/mine/main/main.vue"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/mine/main/main.wxml b/unpackage/dist/dev/mp-weixin/pages/mine/main/main.wxml index 9b8b9e6..7796e94 100644 --- a/unpackage/dist/dev/mp-weixin/pages/mine/main/main.wxml +++ b/unpackage/dist/dev/mp-weixin/pages/mine/main/main.wxml @@ -1 +1 @@ -默认用户剩余积分：0优惠卷：0 张总订单待付款待发货待收货退款/售后地址列表联系人列表设置 \ No newline at end of file +默认用户剩余积分：0优惠卷：0 张总订单待付款待发货待收货退款/售后地址列表联系人列表设置 \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.js b/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.js new file mode 100644 index 0000000..ac87990 --- /dev/null +++ b/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.js @@ -0,0 +1,99 @@ +"use strict"; +const common_vendor = require("../../../common/vendor.js"); +const api_request = require("../../../api/request.js"); +const common_assets = require("../../../common/assets.js"); +const _sfc_main = { + __name: "mineorders", + setup(__props) { + const currentColor = common_vendor.ref(0); + const sort = common_vendor.ref([{}]); + const headerList = common_vendor.ref([{}]); + const productList = common_vendor.ref([{}]); + common_vendor.onMounted(async () => { + await Getsort(); + await changeTypes(sort.value[0], 0); + }); + const Getsort = async () => { + const res = await common_vendor.index.request({ + url: api_request.testUrl + "/category/list", + method: "POST" + }); + if (res.data.code === 1) { + for (let key in res.data.data) { + sort.value[key] = { + //类别列表 + name: res.data.data[key].typeName, + imgurl: res.data.data[key].typeUrl, + id: res.data.data[key].id + }; + headerList.value[key] = { + name: res.data.data[key].typeName, + typeIntro: res.data.data[key].typeIntro + }; + } + } else { + common_vendor.index.showToast({ + //提示请求错误 + title: "请求商品分类错误", + icon: "none", + duration: 2e3 + }); + } + }; + const changeTypes = async (item, index) => { + currentColor.value = index; + const res = await common_vendor.index.request({ + url: api_request.testUrl + "/category/list/type", + method: "POST", + data: { + id: item.id + } + }); + if (res.data.code === 1) { + productList.value = res.data.data[item.id]; + } else { + common_vendor.index.showToast({ + //商品请求错误 + title: "更改类别错误", + icon: "none", + duration: 2e3 + }); + } + }; + const getBoxStyle = (index) => ({ + backgroundColor: currentColor.value === index ? "brown" : "#fffef8" + }); + const goToProduct = (item) => { + console.log(item, 123); + common_vendor.index.navigateTo({ + url: "../../../pages/store-home/ProductDetails/ProductDetails?info=" + JSON.stringify(item) + }); + }; + return (_ctx, _cache) => { + return { + a: common_vendor.f(sort.value, (item, index, i0) => { + return { + a: item.imgurl, + b: common_vendor.t(item.name), + c: index, + d: common_vendor.s(getBoxStyle(index)), + e: common_vendor.o(($event) => changeTypes(item, index), index) + }; + }), + b: common_vendor.f(productList.value, (item, index, i0) => { + return { + a: item.goodImg, + b: common_vendor.t(item.name), + c: common_vendor.t(item.intro), + d: common_vendor.t(item.price), + e: index, + f: common_vendor.o(($event) => goToProduct(item), index) + }; + }), + c: common_vendor.unref(common_assets.add_img) + }; + }; + } +}; +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-7d0f2622"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/mine/mineorders/mineorders.vue"]]); +wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/order/productOrderDetail/productOrderDetail/productOrderDetail.json b/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.json similarity index 100% rename from unpackage/dist/dev/mp-weixin/pages/order/productOrderDetail/productOrderDetail/productOrderDetail.json rename to unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.json diff --git a/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.wxml b/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.wxml new file mode 100644 index 0000000..9c0a219 --- /dev/null +++ b/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.wxml @@ -0,0 +1 @@ +{{item.b}}{{item.b}}{{item.c}}￥{{item.d}} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.wxss b/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.wxss new file mode 100644 index 0000000..ea71be2 --- /dev/null +++ b/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.wxss @@ -0,0 +1,594 @@ +/* 水平间距 */ +/* 水平间距 */ +/************************************************************ +** 请将全局样式拷贝到项目的全局 CSS 文件或者当前页面的顶部 ** +** 否则页面将无法正常显示 ** +************************************************************/ +html.data-v-7d0f2622 { + font-size: 16px; +} +body.data-v-7d0f2622 { + 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-7d0f2622, +image.data-v-7d0f2622, +text.data-v-7d0f2622 { + box-sizing: border-box; + flex-shrink: 0; +} +#app.data-v-7d0f2622 { + width: 100vw; + height: 100vh; +} +.flex-row.data-v-7d0f2622 { + display: flex; + flex-direction: row; +} +.flex-col.data-v-7d0f2622 { + display: flex; + flex-direction: column; +} +.justify-start.data-v-7d0f2622 { + justify-content: flex-start; +} +.justify-end.data-v-7d0f2622 { + justify-content: flex-end; +} +.justify-center.data-v-7d0f2622 { + justify-content: center; +} +.justify-between.data-v-7d0f2622 { + justify-content: space-between; +} +.justify-around.data-v-7d0f2622 { + justify-content: space-around; +} +.justify-evenly.data-v-7d0f2622 { + justify-content: space-evenly; +} +.items-start.data-v-7d0f2622 { + align-items: flex-start; +} +.items-end.data-v-7d0f2622 { + align-items: flex-end; +} +.items-center.data-v-7d0f2622 { + align-items: center; +} +.items-baseline.data-v-7d0f2622 { + align-items: baseline; +} +.items-stretch.data-v-7d0f2622 { + align-items: stretch; +} +.self-start.data-v-7d0f2622 { + align-self: flex-start; +} +.self-end.data-v-7d0f2622 { + align-self: flex-end; +} +.self-center.data-v-7d0f2622 { + align-self: center; +} +.self-baseline.data-v-7d0f2622 { + align-self: baseline; +} +.self-stretch.data-v-7d0f2622 { + align-self: stretch; +} +.flex-1.data-v-7d0f2622 { + flex: 1 1 0%; +} +.flex-auto.data-v-7d0f2622 { + flex: 1 1 auto; +} +.grow.data-v-7d0f2622 { + flex-grow: 1; +} +.grow-0.data-v-7d0f2622 { + flex-grow: 0; +} +.shrink.data-v-7d0f2622 { + flex-shrink: 1; +} +.shrink-0.data-v-7d0f2622 { + flex-shrink: 0; +} +.relative.data-v-7d0f2622 { + position: relative; +} +.ml-2.data-v-7d0f2622 { + margin-left: 3.75rpx; +} +.mt-2.data-v-7d0f2622 { + margin-top: 3.75rpx; +} +.ml-4.data-v-7d0f2622 { + margin-left: 7.5rpx; +} +.mt-4.data-v-7d0f2622 { + margin-top: 7.5rpx; +} +.ml-6.data-v-7d0f2622 { + margin-left: 11.25rpx; +} +.mt-6.data-v-7d0f2622 { + margin-top: 11.25rpx; +} +.ml-8.data-v-7d0f2622 { + margin-left: 15rpx; +} +.mt-8.data-v-7d0f2622 { + margin-top: 15rpx; +} +.ml-10.data-v-7d0f2622 { + margin-left: 18.75rpx; +} +.mt-10.data-v-7d0f2622 { + margin-top: 18.75rpx; +} +.ml-12.data-v-7d0f2622 { + margin-left: 22.5rpx; +} +.mt-12.data-v-7d0f2622 { + margin-top: 22.5rpx; +} +.ml-14.data-v-7d0f2622 { + margin-left: 26.25rpx; +} +.mt-14.data-v-7d0f2622 { + margin-top: 26.25rpx; +} +.ml-16.data-v-7d0f2622 { + margin-left: 30rpx; +} +.mt-16.data-v-7d0f2622 { + margin-top: 30rpx; +} +.ml-18.data-v-7d0f2622 { + margin-left: 33.75rpx; +} +.mt-18.data-v-7d0f2622 { + margin-top: 33.75rpx; +} +.ml-20.data-v-7d0f2622 { + margin-left: 37.5rpx; +} +.mt-20.data-v-7d0f2622 { + margin-top: 37.5rpx; +} +.ml-22.data-v-7d0f2622 { + margin-left: 41.25rpx; +} +.mt-22.data-v-7d0f2622 { + margin-top: 41.25rpx; +} +.ml-24.data-v-7d0f2622 { + margin-left: 45rpx; +} +.mt-24.data-v-7d0f2622 { + margin-top: 45rpx; +} +.ml-26.data-v-7d0f2622 { + margin-left: 48.75rpx; +} +.mt-26.data-v-7d0f2622 { + margin-top: 48.75rpx; +} +.ml-28.data-v-7d0f2622 { + margin-left: 52.5rpx; +} +.mt-28.data-v-7d0f2622 { + margin-top: 52.5rpx; +} +.ml-30.data-v-7d0f2622 { + margin-left: 56.25rpx; +} +.mt-30.data-v-7d0f2622 { + margin-top: 56.25rpx; +} +.ml-32.data-v-7d0f2622 { + margin-left: 60rpx; +} +.mt-32.data-v-7d0f2622 { + margin-top: 60rpx; +} +.ml-34.data-v-7d0f2622 { + margin-left: 63.75rpx; +} +.mt-34.data-v-7d0f2622 { + margin-top: 63.75rpx; +} +.ml-36.data-v-7d0f2622 { + margin-left: 67.5rpx; +} +.mt-36.data-v-7d0f2622 { + margin-top: 67.5rpx; +} +.ml-38.data-v-7d0f2622 { + margin-left: 71.25rpx; +} +.mt-38.data-v-7d0f2622 { + margin-top: 71.25rpx; +} +.ml-40.data-v-7d0f2622 { + margin-left: 75rpx; +} +.mt-40.data-v-7d0f2622 { + margin-top: 75rpx; +} +.ml-42.data-v-7d0f2622 { + margin-left: 78.75rpx; +} +.mt-42.data-v-7d0f2622 { + margin-top: 78.75rpx; +} +.ml-44.data-v-7d0f2622 { + margin-left: 82.5rpx; +} +.mt-44.data-v-7d0f2622 { + margin-top: 82.5rpx; +} +.ml-46.data-v-7d0f2622 { + margin-left: 86.25rpx; +} +.mt-46.data-v-7d0f2622 { + margin-top: 86.25rpx; +} +.ml-48.data-v-7d0f2622 { + margin-left: 90rpx; +} +.mt-48.data-v-7d0f2622 { + margin-top: 90rpx; +} +.ml-50.data-v-7d0f2622 { + margin-left: 93.75rpx; +} +.mt-50.data-v-7d0f2622 { + margin-top: 93.75rpx; +} +.ml-52.data-v-7d0f2622 { + margin-left: 97.5rpx; +} +.mt-52.data-v-7d0f2622 { + margin-top: 97.5rpx; +} +.ml-54.data-v-7d0f2622 { + margin-left: 101.25rpx; +} +.mt-54.data-v-7d0f2622 { + margin-top: 101.25rpx; +} +.ml-56.data-v-7d0f2622 { + margin-left: 105rpx; +} +.mt-56.data-v-7d0f2622 { + margin-top: 105rpx; +} +.ml-58.data-v-7d0f2622 { + margin-left: 108.75rpx; +} +.mt-58.data-v-7d0f2622 { + margin-top: 108.75rpx; +} +.ml-60.data-v-7d0f2622 { + margin-left: 112.5rpx; +} +.mt-60.data-v-7d0f2622 { + margin-top: 112.5rpx; +} +.ml-62.data-v-7d0f2622 { + margin-left: 116.25rpx; +} +.mt-62.data-v-7d0f2622 { + margin-top: 116.25rpx; +} +.ml-64.data-v-7d0f2622 { + margin-left: 120rpx; +} +.mt-64.data-v-7d0f2622 { + margin-top: 120rpx; +} +.ml-66.data-v-7d0f2622 { + margin-left: 123.75rpx; +} +.mt-66.data-v-7d0f2622 { + margin-top: 123.75rpx; +} +.ml-68.data-v-7d0f2622 { + margin-left: 127.5rpx; +} +.mt-68.data-v-7d0f2622 { + margin-top: 127.5rpx; +} +.ml-70.data-v-7d0f2622 { + margin-left: 131.25rpx; +} +.mt-70.data-v-7d0f2622 { + margin-top: 131.25rpx; +} +.ml-72.data-v-7d0f2622 { + margin-left: 135rpx; +} +.mt-72.data-v-7d0f2622 { + margin-top: 135rpx; +} +.ml-74.data-v-7d0f2622 { + margin-left: 138.75rpx; +} +.mt-74.data-v-7d0f2622 { + margin-top: 138.75rpx; +} +.ml-76.data-v-7d0f2622 { + margin-left: 142.5rpx; +} +.mt-76.data-v-7d0f2622 { + margin-top: 142.5rpx; +} +.ml-78.data-v-7d0f2622 { + margin-left: 146.25rpx; +} +.mt-78.data-v-7d0f2622 { + margin-top: 146.25rpx; +} +.ml-80.data-v-7d0f2622 { + margin-left: 150rpx; +} +.mt-80.data-v-7d0f2622 { + margin-top: 150rpx; +} +.ml-82.data-v-7d0f2622 { + margin-left: 153.75rpx; +} +.mt-82.data-v-7d0f2622 { + margin-top: 153.75rpx; +} +.ml-84.data-v-7d0f2622 { + margin-left: 157.5rpx; +} +.mt-84.data-v-7d0f2622 { + margin-top: 157.5rpx; +} +.ml-86.data-v-7d0f2622 { + margin-left: 161.25rpx; +} +.mt-86.data-v-7d0f2622 { + margin-top: 161.25rpx; +} +.ml-88.data-v-7d0f2622 { + margin-left: 165rpx; +} +.mt-88.data-v-7d0f2622 { + margin-top: 165rpx; +} +.ml-90.data-v-7d0f2622 { + margin-left: 168.75rpx; +} +.mt-90.data-v-7d0f2622 { + margin-top: 168.75rpx; +} +.ml-92.data-v-7d0f2622 { + margin-left: 172.5rpx; +} +.mt-92.data-v-7d0f2622 { + margin-top: 172.5rpx; +} +.ml-94.data-v-7d0f2622 { + margin-left: 176.25rpx; +} +.mt-94.data-v-7d0f2622 { + margin-top: 176.25rpx; +} +.ml-96.data-v-7d0f2622 { + margin-left: 180rpx; +} +.mt-96.data-v-7d0f2622 { + margin-top: 180rpx; +} +.ml-98.data-v-7d0f2622 { + margin-left: 183.75rpx; +} +.mt-98.data-v-7d0f2622 { + margin-top: 183.75rpx; +} +.ml-100.data-v-7d0f2622 { + margin-left: 187.5rpx; +} +.mt-100.data-v-7d0f2622 { + margin-top: 187.5rpx; +} +.navbar.data-v-7d0f2622 { + background-color: #333; + color: #fff; + padding: 10px; +} +.bbb.data-v-7d0f2622 { + display: flex; + align-items: center; +} +.ccc.data-v-7d0f2622 { + display: flex; + flex-direction: column; + align-items: center; + margin: 20rpx; +} +.eee.data-v-7d0f2622 { + width: 30px; + height: 30px; +} +.ddd.data-v-7d0f2622 { + font-size: 14px; +} +.flex-row.data-v-7d0f2622 { + display: flex; +} +.flex-item.data-v-7d0f2622 { + flex: 1; +} +.ml-15.data-v-7d0f2622 { + margin-left: 28.13rpx; +} +.ml-3.data-v-7d0f2622 { + margin-left: 5.63rpx; +} +.mt-3.data-v-7d0f2622 { + margin-top: 5.63rpx; + text-align: center; +} +.mt-13.data-v-7d0f2622 { + margin-top: 17.38rpx; +} +.mt-5.data-v-7d0f2622 { + margin-top: 9.38rpx; +} +.page.data-v-7d0f2622 { + background-color: #f5f5dc; + width: 100%; + overflow-y: auto; + overflow-x: hidden; + height: 100vh; + overflow: hidden; +} +.section.data-v-7d0f2622 { + padding: 22.5rpx 39.28rpx 16.88rpx; + background-color: #f7de98; +} +.pos_8.data-v-7d0f2622 { + position: absolute; + left: 0; + right: 0; + top: 0; +} +.text.data-v-7d0f2622 { + color: #c1651a; + font-size: 37.5rpx; + font-family: STFangsong; + line-height: 36.19rpx; +} +.section_2.data-v-7d0f2622 { + padding: 5.63rpx 15rpx 8.44rpx; + background-color: #ffffff; + border-radius: 28.13rpx; + height: 63.75rpx; + width: 500.69rpx; +} +.image.data-v-7d0f2622 { + width: 50.63rpx; + height: 50.63rpx; +} +.text-wrapper.data-v-7d0f2622 { + margin-right: 17.42rpx; +} +.font.data-v-7d0f2622 { + font-size: 26.25rpx; + font-family: STFangsong; + line-height: 18rpx; + color: #ff0000; +} +.image-wrapper.data-v-7d0f2622 { + background-color: #ffffff; + border-radius: 28.13rpx; + overflow: hidden; + border: solid 9.38rpx #ffffff; +} +.pos_1.data-v-7d0f2622 { + position: absolute; + left: 22.5rpx; + right: 24.38rpx; + top: 118.13rpx; +} +.image_2.data-v-7d0f2622 { + width: 91.25vw; + height: 37.5vw; +} +.group.data-v-7d0f2622 { + margin: auto; + width: 137.81rpx; +} +.list-item.data-v-7d0f2622 { + padding: 11.25rpx 0 9.94rpx; + background-color: #fffef8; + border-radius: 9.38rpx; +} +.list-item.data-v-7d0f2622:first-child { + margin-top: 0; +} +.image_3.data-v-7d0f2622 { + border-radius: 0rpx 9.38rpx 9.38rpx 0rpx; + width: 60rpx; + height: 60rpx; +} +.font_4.data-v-7d0f2622 { + font-size: 25rpx; + font-family: STFangsong; + line-height: 28.26rpx; + color: #c1651a; +} +.section_4.data-v-7d0f2622 { + padding-bottom: 879.38rpx; + background-color: #f8e8c1; + border-radius: 0rpx 18.75rpx 0rpx 0rpx; + width: 600.13rpx; +} +.pos_4.data-v-7d0f2622 { + position: absolute; + right: 0; + top: 440.63rpx; +} +.section_5.data-v-7d0f2622 { + padding: 18.06rpx 16.24rpx 14.94rpx; + background-color: #fffef8; + border-radius: 0rpx 18.75rpx 0rpx 0rpx; + width: 598.13rpx; +} +.font_2.data-v-7d0f2622 { + font-size: 30rpx; + font-family: STFangsong; + line-height: 28.26rpx; + color: #000000; +} +.font_3.data-v-7d0f2622 { + font-size: 22.5rpx; + font-family: STFangsong; + line-height: 21.56rpx; + color: #727272; +} +.text_3.data-v-7d0f2622 { + line-height: 21.15rpx; +} +.pos_5.data-v-7d0f2622 { + position: absolute; + top: 120rpx; + width: 95%; + margin: 2.5%; +} +.section_9.data-v-7d0f2622 { + padding: 20.63rpx 22.88rpx 22.5rpx; + background-color: #fffef8; + border-radius: 9.38rpx; + right: 13.13rpx; +} +.list-item_2.data-v-7d0f2622:first-child { + margin-top: 0; +} +.image_4.data-v-7d0f2622 { + border-radius: 9.38rpx; + width: 131.25rpx; + height: 131.25rpx; +} +.group_3.data-v-7d0f2622 { + margin-left: 24.84rpx; +} +.text_5.data-v-7d0f2622 { + line-height: 28.65rpx; +} +.image_5.data-v-7d0f2622 { + margin: 75rpx 5.63rpx 0 107.96rpx; + border-radius: 9.38rpx; + width: 56.25rpx; + height: 56.25rpx; +} \ No newline at end of file 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 84a7d08..f99351b 100644 --- a/unpackage/dist/dev/mp-weixin/pages/order/component/addressComponent.js +++ b/unpackage/dist/dev/mp-weixin/pages/order/component/addressComponent.js @@ -49,5 +49,5 @@ const _sfc_main = { }; } }; -const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-c20b9e4d"]]); +const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-c20b9e4d"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/order/component/addressComponent.vue"]]); 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 26a8a7f..c5109cc 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"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-0b647166"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/order/paysuccess/paysuccess.vue"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/order/product-close/product-close.js b/unpackage/dist/dev/mp-weixin/pages/order/product-close/product-close.js index 4cb96cd..faae301 100644 --- a/unpackage/dist/dev/mp-weixin/pages/order/product-close/product-close.js +++ b/unpackage/dist/dev/mp-weixin/pages/order/product-close/product-close.js @@ -15,5 +15,5 @@ const _sfc_main = { }; } }; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-41495ba5"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-41495ba5"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/order/product-close/product-close.vue"]]); 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 ea440be..03f035d 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"]]); +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"]]); 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 25cdee4..0b8de7a 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 @@ -113,5 +113,5 @@ const _sfc_main = { }; } }; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-eda1e8f0"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-eda1e8f0"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/order/product-waitpay/product-waitpay.vue"]]); 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 4e8dfa8..380a521 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"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-f0df60ad"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/order/productOrderDetail/productOrderDetail.vue"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/order/productOrderDetail/productOrderDetail/productOrderDetail.wxml b/unpackage/dist/dev/mp-weixin/pages/order/productOrderDetail/productOrderDetail/productOrderDetail.wxml deleted file mode 100644 index eaeacde..0000000 --- a/unpackage/dist/dev/mp-weixin/pages/order/productOrderDetail/productOrderDetail/productOrderDetail.wxml +++ /dev/null @@ -1 +0,0 @@ -等待商家发货张三 15888610253黑龙江省哈尔滨市呼兰区学院路街道288号哈尔滨华德学院非遗绒花【材料包】已选种类：紫色138.00×1商品总价138.00优惠券50.00应付款：88.00买家留言 希望所使用的材料是可持续来源的，并且制作工艺要精细，以确保每一朵花瓣都能生动地展现出绒花的质感和美感。 订单编号：E20241005095840091406189复制创建时间：2024-10-05 09:58:41在线客服更多精选商品【非遗手工艺体验】玉雕-古法制玉体验99.00 \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/order/productOrderDetail/productOrderDetail/productOrderDetail.wxss b/unpackage/dist/dev/mp-weixin/pages/order/productOrderDetail/productOrderDetail/productOrderDetail.wxss deleted file mode 100644 index 1aed011..0000000 --- a/unpackage/dist/dev/mp-weixin/pages/order/productOrderDetail/productOrderDetail/productOrderDetail.wxss +++ /dev/null @@ -1,337 +0,0 @@ -/* 水平间距 */ -/* 水平间距 */ -.ml-7.data-v-a18a39cb { - margin-left: 13.13rpx; -} -.mt-9.data-v-a18a39cb { - margin-top: 16.88rpx; -} -.ml-17.data-v-a18a39cb { - margin-left: 31.88rpx; -} -.mt-11.data-v-a18a39cb { - margin-top: 20.63rpx; -} -.mt-39.data-v-a18a39cb { - margin-top: 73.13rpx; -} -.ml-11.data-v-a18a39cb { - margin-left: 20.63rpx; -} -.mt-19.data-v-a18a39cb { - margin-top: 35.63rpx; -} -.page.data-v-a18a39cb { - background-color: #fffaf0; - width: 100%; - overflow-y: auto; - overflow-x: hidden; - height: 100%; -} -.image-wrapper.data-v-a18a39cb { - padding: 15rpx 0; - background-color: #a0522d; -} -.image.data-v-a18a39cb { - margin-left: 16.88rpx; - width: 37.5rpx; - height: 37.5rpx; -} -.group.data-v-a18a39cb { - padding-left: 16.41rpx; - padding-right: 13.59rpx; -} -.group_2.data-v-a18a39cb { - padding: 15rpx 0; -} -.section.data-v-a18a39cb { - padding: 20.49rpx 26.12rpx 22.63rpx; - background-color: #ffffff; - border-radius: 18.75rpx; - border: solid 1.88rpx #818181; -} -.image_2.data-v-a18a39cb { - width: 61.88rpx; - height: 61.88rpx; -} -.font.data-v-a18a39cb { - font-size: 26.25rpx; - font-family: Open Sans; - line-height: 24.43rpx; - color: #323232; -} -.text.data-v-a18a39cb { - color: #323233; - font-size: 28.13rpx; - line-height: 26.08rpx; -} -.section_2.data-v-a18a39cb { - padding: 32.72rpx 14.94rpx 31.99rpx 18.68rpx; - background-color: #ffffff; - border-radius: 18.75rpx; - border: solid 1.88rpx #818181; -} -.image_3.data-v-a18a39cb { - width: 43.13rpx; - height: 43.13rpx; -} -.text_2.data-v-a18a39cb { - line-height: 23.77rpx; -} -.font_2.data-v-a18a39cb { - font-size: 22.5rpx; - font-family: Open Sans; - line-height: 20.68rpx; - color: #818181; -} -.text_3.data-v-a18a39cb { - line-height: 20.91rpx; -} -.section_3.data-v-a18a39cb { - padding: 0 14.89rpx 18.88rpx 18.62rpx; - background-color: #ffffff; - border-radius: 18.75rpx; - border: solid 1.88rpx #818181; -} -.group_3.data-v-a18a39cb { - padding: 20.49rpx 3.75rpx 18.75rpx; - border-bottom: solid 1.88rpx #dfdfdf; -} -.image_4.data-v-a18a39cb { - margin-bottom: 5.63rpx; - border-radius: 9.38rpx; - width: 146.25rpx; - height: 165rpx; -} -.group_4.data-v-a18a39cb { - margin-top: 4.07rpx; -} -.text_4.data-v-a18a39cb { - margin-left: 2.1rpx; - line-height: 20.79rpx; -} -.group_5.data-v-a18a39cb { - width: 90.66rpx; -} -.text_5.data-v-a18a39cb { - margin-left: 25.03rpx; - color: #323232; - font-size: 33.75rpx; - font-family: Open Sans; - font-weight: 600; - line-height: 24.88rpx; -} -.image_5.data-v-a18a39cb { - width: 30rpx; - height: 30rpx; -} -.image_6.data-v-a18a39cb { - margin-left: -90.66rpx; -} -.font_3.data-v-a18a39cb { - font-size: 26.25rpx; - font-family: Open Sans; - line-height: 20.68rpx; - color: #323232; -} -.text_6.data-v-a18a39cb { - font-weight: 600; - line-height: 19.29rpx; -} -.text_7.data-v-a18a39cb { - margin-right: 9.83rpx; - margin-bottom: 7.5rpx; - line-height: 18.73rpx; -} -.view.data-v-a18a39cb { - margin-top: 26.25rpx; - padding: 0 5.53rpx; -} -.font_4.data-v-a18a39cb { - font-size: 26.25rpx; - font-family: Open Sans; - line-height: 24.43rpx; - color: #818181; -} -.text_8.data-v-a18a39cb { - line-height: 24.36rpx; -} -.text_9.data-v-a18a39cb { - line-height: 19.39rpx; -} -.view_2.data-v-a18a39cb { - margin-top: 13.13rpx; - padding: 0 4.69rpx; -} -.text_10.data-v-a18a39cb { - line-height: 24.26rpx; -} -.group_1.data-v-a18a39cb { - margin-right: 2.72rpx; -} -.image_7.data-v-a18a39cb { - width: 41.25rpx; - height: 30rpx; -} -.text_11.data-v-a18a39cb { - line-height: 19.39rpx; -} -.group_7.data-v-a18a39cb { - margin-top: 16.88rpx; - padding: 0 5.91rpx; -} -.group_8.data-v-a18a39cb { - width: 128.44rpx; -} -.image_8.data-v-a18a39cb { - margin-left: 98.44rpx; -} -.text_12.data-v-a18a39cb { - margin-left: -128.44rpx; - line-height: 24.54rpx; -} -.text_13.data-v-a18a39cb { - color: #fb8b05; - line-height: 19.39rpx; -} -.divider.data-v-a18a39cb { - background-color: #dfdfdf; - height: 1.88rpx; -} -.view_3.data-v-a18a39cb { - margin: 16.88rpx 9.62rpx 0 3.75rpx; -} -.text_14.data-v-a18a39cb { - margin-left: 5.16rpx; - margin-top: 24.86rpx; - line-height: 24.21rpx; -} -.text-wrapper.data-v-a18a39cb { - margin-right: 13.37rpx; - margin-top: 16.56rpx; - padding: 14.64rpx 0 9.77rpx; - background-color: #ffffff; - border-radius: 9.38rpx; - border: solid 1.88rpx #f1f1b5; -} -.text_15.data-v-a18a39cb { - margin-left: 15.37rpx; - margin-right: 20.27rpx; - line-height: 26.25rpx; -} -.view_4.data-v-a18a39cb { - margin: 18.75rpx 9.62rpx 0 3.75rpx; -} -.view_5.data-v-a18a39cb { - margin-top: 24.09rpx; - padding: 0 4.88rpx; -} -.text_16.data-v-a18a39cb { - line-height: 20.85rpx; -} -.group_9.data-v-a18a39cb { - margin-right: 4.74rpx; -} -.font_5.data-v-a18a39cb { - font-size: 22.5rpx; - font-family: Open Sans; - color: #323232; -} -.text_17.data-v-a18a39cb { - line-height: 16.54rpx; -} -.text-wrapper_2.data-v-a18a39cb { - padding-bottom: 2.29rpx; - background-color: #fffef8; - width: 50.63rpx; - height: 22.5rpx; - border: solid 0.94rpx #d1d1d1; -} -.text_18.data-v-a18a39cb { - color: #323232; - font-size: 18.75rpx; - font-family: Open Sans; - line-height: 17.38rpx; -} -.view_6.data-v-a18a39cb { - margin-top: 11.16rpx; - padding: 0 4.35rpx; -} -.text_19.data-v-a18a39cb { - line-height: 20.7rpx; -} -.text_20.data-v-a18a39cb { - margin-right: 157.91rpx; - line-height: 16.63rpx; -} -.group_10.data-v-a18a39cb { - margin-top: 27.81rpx; -} -.image_9.data-v-a18a39cb { - width: 45rpx; - height: 45rpx; -} -.font_6.data-v-a18a39cb { - font-size: 30rpx; - font-family: Open Sans; - color: #323232; -} -.text_21.data-v-a18a39cb { - line-height: 27.69rpx; -} -.image_10.data-v-a18a39cb { - width: 251.25rpx; - height: 1.88rpx; -} -.text_22.data-v-a18a39cb { - line-height: 27.71rpx; -} -.grid.data-v-a18a39cb { - margin-left: 11.72rpx; - margin-right: 14.53rpx; - height: 965.63rpx; - display: grid; - grid-template-rows: repeat(2, minmax(0, 1fr)); - grid-template-columns: repeat(2, minmax(0, 1fr)); - row-gap: 30.13rpx; - column-gap: 28.26rpx; -} -.grid-item.data-v-a18a39cb { - padding-bottom: 28.26rpx; - background-color: #ffffff; - border-radius: 18.75rpx; - border: solid 1.88rpx #818181; -} -.image_11.data-v-a18a39cb { - border-radius: 18.75rpx 18.75rpx 0rpx 0rpx; - width: 333.75rpx; - height: 322.5rpx; -} -.font_7.data-v-a18a39cb { - font-size: 26.25rpx; - font-family: Open Sans; - line-height: 30rpx; - color: #000000; -} -.text_23.data-v-a18a39cb { - margin: 8.42rpx 6.69rpx 0 12.06rpx; - font-size: 24.38rpx; -} -.group_11.data-v-a18a39cb { - margin-top: 17.83rpx; - padding: 0 22.37rpx; -} -.image_12.data-v-a18a39cb { - width: 26.25rpx; - height: 26.25rpx; -} -.font_8.data-v-a18a39cb { - font-size: 30rpx; - font-family: Times New Roman; - line-height: 20.68rpx; - color: #fbb612; -} -.section_4.data-v-a18a39cb { - background-color: #ffffff; - height: 103.13rpx; -} \ No newline at end of file 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 c5cd4fe..72f1d6e 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 @@ -43,5 +43,5 @@ const _sfc_main = { }; } }; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-3361b524"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-3361b524"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/store-home/ProductDetails/ProductDetails.vue"]]); 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 3a1e464..65e36f4 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 @@ -96,5 +96,5 @@ const _sfc_main = { }; } }; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-7e3c386d"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-7e3c386d"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/store-home/main/main.vue"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/project.config.json b/unpackage/dist/dev/mp-weixin/project.config.json index bc80aed..dcf3b39 100644 --- a/unpackage/dist/dev/mp-weixin/project.config.json +++ b/unpackage/dist/dev/mp-weixin/project.config.json @@ -18,8 +18,8 @@ } }, "compileType": "miniprogram", - "libVersion": "3.6.0", - "appid": "wx3f968a09e31d6bed", + "libVersion": "3.6.2", + "appid": "wxbcb1cf9951fa17c8", "projectname": "FeiYi", "condition": { "search": { diff --git a/unpackage/dist/dev/mp-weixin/project.private.config.json b/unpackage/dist/dev/mp-weixin/project.private.config.json index 44a4b7f..67e4fac 100644 --- a/unpackage/dist/dev/mp-weixin/project.private.config.json +++ b/unpackage/dist/dev/mp-weixin/project.private.config.json @@ -7,6 +7,13 @@ "condition": { "miniprogram": { "list": [ + { + "name": "pages/mine/mineorders/mineorders", + "pathName": "pages/mine/mineorders/mineorders", + "query": "", + "launchMode": "default", + "scene": null + }, { "name": "pages/store-home/main/main", "pathName": "pages/store-home/main/main", 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 291ab4e..2167945 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]]); +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"]]); wx.createComponent(Component); diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxml b/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxml index 4e06aa2..cd9441d 100644 --- a/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxml +++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file 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 cc27c04..b35c215 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]]); +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"]]); wx.createComponent(Component);