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);