From 34570c49962d266a71261272960bd4e282730482 Mon Sep 17 00:00:00 2001 From: yuanteng0011 <1876787513@qq.com> Date: Wed, 4 Dec 2024 11:16:42 +0800 Subject: [PATCH 1/2] 123 --- pages.json | 16 +------------- pages/home/home.vue | 2 +- unpackage/dist/dev/mp-weixin/addProduct.js | 2 +- unpackage/dist/dev/mp-weixin/app.js | 6 ++--- unpackage/dist/dev/mp-weixin/app.json | 4 +--- 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 +- .../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 | 4 ++-- .../dist/dev/mp-weixin/pages/login/login.js | 2 +- .../pages/mine/OrderDetails/OrderDetails.js | 2 +- .../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 +- .../components/uni-popup/uni-popup.js | 2 +- .../components/uni-popup/uni-popup.wxml | 2 +- .../uni-transition/uni-transition.js | 2 +- 33 files changed, 49 insertions(+), 69 deletions(-) diff --git a/pages.json b/pages.json index 9714fa8..d56fab3 100644 --- a/pages.json +++ b/pages.json @@ -170,21 +170,7 @@ } }, { - "path" : "pages/mine/bookings/booking", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/mine/bookings/bookings", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/mine/Contact/Contact", + "path" : "pages/workshop/index/index", "style" : { "navigationBarTitleText" : "" diff --git a/pages/home/home.vue b/pages/home/home.vue index ade3db6..d985c44 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -155,7 +155,7 @@ onShow(() => { }) const jump_feiyi =()=>{ uni.navigateTo({ - url: '/pages/service/productDetail/productDetail' + url: '/pages/workshop/index/index' }) } const getMyUser = async () =>{ 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/app.js b/unpackage/dist/dev/mp-weixin/app.js index 69cf76a..90cbc97 100644 --- a/unpackage/dist/dev/mp-weixin/app.js +++ b/unpackage/dist/dev/mp-weixin/app.js @@ -27,15 +27,13 @@ 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"; } 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 9b0b2df..cf2af56 100644 --- a/unpackage/dist/dev/mp-weixin/app.json +++ b/unpackage/dist/dev/mp-weixin/app.json @@ -24,9 +24,7 @@ "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" ], "window": { "navigationBarTextStyle": "black", diff --git a/unpackage/dist/dev/mp-weixin/common/vendor.js b/unpackage/dist/dev/mp-weixin/common/vendor.js index 1c6c9f1..7e52713 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,5 +8371,4 @@ 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/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 631393a..fe5ac62 100644 --- a/unpackage/dist/dev/mp-weixin/pages/booking/respectable/respectable.js +++ b/unpackage/dist/dev/mp-weixin/pages/booking/respectable/respectable.js @@ -145,5 +145,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 89fb6a0..48c1b6f 100644 --- a/unpackage/dist/dev/mp-weixin/pages/home/home.js +++ b/unpackage/dist/dev/mp-weixin/pages/home/home.js @@ -13,7 +13,7 @@ const _sfc_main = { }); const jump_feiyi = () => { common_vendor.index.navigateTo({ - url: "/pages/service/productDetail/productDetail" + url: "/pages/workshop/index/index" }); }; const getMyUser = async () => { @@ -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/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/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 a4a8bc2..f6d3a89 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 @@ -105,5 +105,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/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-popup/components/uni-popup/uni-popup.wxml b/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxml index cd9441d..4e06aa2 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 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 cbb91c63dcc5f10cd5f64fdd06868cbb02501ff5 Mon Sep 17 00:00:00 2001 From: yuanteng0011 <1876787513@qq.com> Date: Wed, 4 Dec 2024 13:44:32 +0800 Subject: [PATCH 2/2] 123 --- pages/store-home/main/main.vue | 1 - unpackage/dist/dev/mp-weixin/pages/store-home/main/main.js | 1 - unpackage/dist/dev/mp-weixin/project.config.json | 2 +- .../uni_modules/uni-popup/components/uni-popup/uni-popup.wxml | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pages/store-home/main/main.vue b/pages/store-home/main/main.vue index 4b0e16c..76e0a5d 100644 --- a/pages/store-home/main/main.vue +++ b/pages/store-home/main/main.vue @@ -142,7 +142,6 @@ const getBoxStyle = (index) => ({ const goToProduct = (item) => { - console.log(item,123); uni.navigateTo({ url: '../../../pages/store-home/ProductDetails/ProductDetails?info=' + JSON.stringify(item) }) 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 f6d3a89..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 @@ -73,7 +73,6 @@ const _sfc_main = { 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) }); diff --git a/unpackage/dist/dev/mp-weixin/project.config.json b/unpackage/dist/dev/mp-weixin/project.config.json index 4d0ffb8..4c89ec2 100644 --- a/unpackage/dist/dev/mp-weixin/project.config.json +++ b/unpackage/dist/dev/mp-weixin/project.config.json @@ -18,7 +18,7 @@ } }, "compileType": "miniprogram", - "libVersion": "3.6.5", + "libVersion": "3.7.0", "appid": "wx3f968a09e31d6bed", "projectname": "FeiYi", "condition": { 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