diff --git a/pages.json b/pages.json
index 57960f7..d6d7d86 100644
--- a/pages.json
+++ b/pages.json
@@ -79,15 +79,6 @@
"navigationBarTitleText" : ""
}
},
- {
-
- "path" : "pages/order/product-close/product-close",
- "style" :
- {
- "navigationBarTitleText" : "",
- "navigationBarBackgroundColor": "#a0522d"
- }
- },
{
"path" : "pages/Shopping-cart/Phone/Phone",
"style" :
diff --git a/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue b/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue
index 9cb4eb2..0c89a71 100644
--- a/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue
+++ b/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue
@@ -5,16 +5,16 @@
收货人
-
+
手机号码
-
+
所在地区
-
+
详细地址
-
-
-
- 设为默认收货地址
-
+
+
+
+
+ 设为默认收货地址
+
+
+
+
- 保存并使用
+ 保存并使用
diff --git a/pages/order/component/addressComponent.vue b/pages/order/component/addressComponent.vue
index 7b69df3..c8c5d1c 100644
--- a/pages/order/component/addressComponent.vue
+++ b/pages/order/component/addressComponent.vue
@@ -30,7 +30,7 @@
-
+
添加新地址
@@ -40,25 +40,26 @@
diff --git a/pages/order/product-waitpay/product-waitpay.vue b/pages/order/product-waitpay/product-waitpay.vue
index 6556041..b10a829 100644
--- a/pages/order/product-waitpay/product-waitpay.vue
+++ b/pages/order/product-waitpay/product-waitpay.vue
@@ -261,12 +261,6 @@ const createOrder = async () => {
totalAmount: totalAmount.value, //总价
orderStatus: "待支付" ,//订单状态
orderItemList: orderItemList.value
- // orderItemList: orderItemList.value.map(item =>({
- // goodSnapshot : item.goodSnapshot,
- // priceSnapshot : item.priceSnapshot,
- // quantity : item.quantity,
- // itemTotalAmount: item.itemTotalAmount
- // }))
}
})
console.log('后台返回订单响应==>',resOrder);
diff --git a/unpackage/dist/dev/mp-weixin/app.js b/unpackage/dist/dev/mp-weixin/app.js
index 6b71191..7775fc8 100644
--- a/unpackage/dist/dev/mp-weixin/app.js
+++ b/unpackage/dist/dev/mp-weixin/app.js
@@ -14,7 +14,6 @@ if (!Math) {
"./pages/booking/date.js";
"./pages/store-home/ProductDetails/ProductDetails.js";
"./pages/Shopping-cart/Contact/Contact.js";
- "./pages/order/product-close/product-close.js";
"./pages/Shopping-cart/Phone/Phone.js";
"./pages/order/product-unpay/product-unpay.js";
"./pages/booking/BillingOfFees/BillingOfFees.js";
@@ -33,7 +32,7 @@ const _sfc_main = {};
function _sfc_render(_ctx, _cache) {
return {};
}
-const App = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/jiangchengfeiyi-xiaochengxu/App.vue"]]);
+const App = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
function createApp() {
const app = common_vendor.createSSRApp(App);
app.use(store_index.pinia);
diff --git a/unpackage/dist/dev/mp-weixin/app.json b/unpackage/dist/dev/mp-weixin/app.json
index 978c4e3..0f9ded3 100644
--- a/unpackage/dist/dev/mp-weixin/app.json
+++ b/unpackage/dist/dev/mp-weixin/app.json
@@ -11,7 +11,6 @@
"pages/booking/date",
"pages/store-home/ProductDetails/ProductDetails",
"pages/Shopping-cart/Contact/Contact",
- "pages/order/product-close/product-close",
"pages/Shopping-cart/Phone/Phone",
"pages/order/product-unpay/product-unpay",
"pages/booking/BillingOfFees/BillingOfFees",
diff --git a/unpackage/dist/dev/mp-weixin/common/assets.js b/unpackage/dist/dev/mp-weixin/common/assets.js
index 87264fb..6ac1936 100644
--- a/unpackage/dist/dev/mp-weixin/common/assets.js
+++ b/unpackage/dist/dev/mp-weixin/common/assets.js
@@ -29,7 +29,6 @@ const show2 = "/assets/show2.6ef01c5d.png";
const show3 = "/assets/show3.4b906849.png";
const show4 = "/assets/show4.00c949b6.png";
const dingwei$1 = "/assets/dingwei.69908177.png";
-const selected = "/assets/selected.c24e4f58.png";
const detele = "/assets/delete.377ec392.png";
const update = "/assets/update.5da500fc.png";
const add = "/assets/add.dace8cf5.png";
@@ -74,7 +73,6 @@ exports.rmb_32 = rmb_32;
exports.rmb_36px = rmb_36px;
exports.rmb_cheng = rmb_cheng;
exports.rmb_huang = rmb_huang;
-exports.selected = selected;
exports.setting_s = setting_s;
exports.shizi = shizi;
exports.short = short$1;
diff --git a/unpackage/dist/dev/mp-weixin/common/vendor.js b/unpackage/dist/dev/mp-weixin/common/vendor.js
index 8cbc8b2..7574a05 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");
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Contact/Contact.js b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Contact/Contact.js
index 3dd6605..b710aed 100644
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Contact/Contact.js
+++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Contact/Contact.js
@@ -4,5 +4,5 @@ const _sfc_main = {};
function _sfc_render(_ctx, _cache) {
return {};
}
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/Shopping-cart/Contact/Contact.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Phone/Phone.js b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Phone/Phone.js
index 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/address/address.js b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/address/address.js
index 902d404..1637d9a 100644
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/address/address.js
+++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/address/address.js
@@ -68,5 +68,5 @@ const _sfc_main = {
};
}
};
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-fdeeb5e5"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/Shopping-cart/address/address.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-fdeeb5e5"]]);
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 2bb033c..863b136 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
@@ -1,22 +1,70 @@
"use strict";
const common_vendor = require("../../../common/vendor.js");
+const api_request = require("../../../api/request.js");
const common_assets = require("../../../common/assets.js");
const _sfc_main = {
__name: "newaddress_Info",
setup(__props) {
- const jump = () => {
- common_vendor.index.navigateTo({
- url: "../../../pages/Shopping-cart/address/address"
+ const userInfo = common_vendor.ref({});
+ const addressParam = common_vendor.ref({
+ userId: 0,
+ name: "",
+ phone: "",
+ region: "",
+ detailAddress: "",
+ isDefault: 0
+ });
+ common_vendor.onMounted(() => {
+ userInfo.value = common_vendor.index.getStorageSync("userInfo");
+ });
+ const defaultAddress = (event) => {
+ event.detail.value[0] ? addressParam.value.isDefault = 1 : addressParam.value.isDefault = 0;
+ };
+ const newAddress = async () => {
+ console.log(addressParam.value);
+ addressParam.value.userId = userInfo.value.id;
+ const values = Object.values(addressParam.value);
+ if (values.some((value) => value === null || value === void 0 || value === "")) {
+ await common_vendor.index.showToast({
+ icon: "error",
+ title: "字段不能为空"
+ });
+ return;
+ }
+ const res = await common_vendor.index.request({
+ url: api_request.baseUrl + "/address/add",
+ method: "POST",
+ data: { ...addressParam.value }
});
+ console.log("res==>", res.data);
+ if (res.data.code === 1) {
+ common_vendor.index.navigateBack({
+ //返回上一页
+ });
+ } else {
+ common_vendor.index.showToast({
+ icon: "error",
+ title: "新增地址失败"
+ });
+ return;
+ }
};
return (_ctx, _cache) => {
return {
- a: common_vendor.unref(common_assets.dingwei),
- b: common_vendor.unref(common_assets.selected),
- c: common_vendor.o(jump)
+ a: addressParam.value.name,
+ b: common_vendor.o(($event) => addressParam.value.name = $event.detail.value),
+ c: addressParam.value.phone,
+ d: common_vendor.o(($event) => addressParam.value.phone = $event.detail.value),
+ e: addressParam.value.region,
+ f: common_vendor.o(($event) => addressParam.value.region = $event.detail.value),
+ g: common_vendor.unref(common_assets.dingwei),
+ h: addressParam.value.detailAddress,
+ i: common_vendor.o(($event) => addressParam.value.detailAddress = $event.detail.value),
+ j: common_vendor.o(defaultAddress),
+ k: common_vendor.o(newAddress)
};
};
}
};
-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/newaddress_Info/newaddress_Info.wxml b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/newaddress_Info/newaddress_Info.wxml
index 2e344bf..1f6b12b 100644
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/newaddress_Info/newaddress_Info.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/newaddress_Info/newaddress_Info.wxml
@@ -1 +1 @@
-收货信息收货人手机号码所在地区详细地址设为默认收货地址保存并使用
\ No newline at end of file
+收货信息收货人手机号码所在地区详细地址设为默认收货地址保存并使用
\ No newline at end of file
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 1e781db..2b3d8d4 100644
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.js
+++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.js
@@ -115,5 +115,5 @@ const _sfc_main = {
};
}
};
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-641af6de"], ["__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/Shopping-cart/servicemain/servicemain.js b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/servicemain/servicemain.js
index b2f5957..d25b171 100644
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/servicemain/servicemain.js
+++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/servicemain/servicemain.js
@@ -15,5 +15,5 @@ const _sfc_main = {
};
}
};
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-b7001184"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/Shopping-cart/servicemain/servicemain.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-b7001184"]]);
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 61de849..be62484 100644
--- a/unpackage/dist/dev/mp-weixin/pages/booking/respectable/respectable.js
+++ b/unpackage/dist/dev/mp-weixin/pages/booking/respectable/respectable.js
@@ -21,5 +21,5 @@ const _sfc_main = {
};
}
};
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-cad4fb76"], ["__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 0fb05e2..26f15ad 100644
--- a/unpackage/dist/dev/mp-weixin/pages/home/home.js
+++ b/unpackage/dist/dev/mp-weixin/pages/home/home.js
@@ -70,5 +70,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/mine/main/main.js b/unpackage/dist/dev/mp-weixin/pages/mine/main/main.js
index c0084cb..d1745d2 100644
--- a/unpackage/dist/dev/mp-weixin/pages/mine/main/main.js
+++ b/unpackage/dist/dev/mp-weixin/pages/mine/main/main.js
@@ -30,5 +30,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/main/main.wxml b/unpackage/dist/dev/mp-weixin/pages/mine/main/main.wxml
index 9b8b9e6..7796e94 100644
--- a/unpackage/dist/dev/mp-weixin/pages/mine/main/main.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/mine/main/main.wxml
@@ -1 +1 @@
-默认用户剩余积分：0优惠卷：0 张总订单待付款待发货待收货退款/售后地址列表联系人列表设置
\ No newline at end of file
+默认用户剩余积分：0优惠卷：0 张总订单待付款待发货待收货退款/售后地址列表联系人列表设置
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.js b/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.js
index ac87990..2c31764 100644
--- a/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.js
+++ b/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.js
@@ -95,5 +95,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/product-close/product-close.json b/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.json
similarity index 56%
rename from unpackage/dist/dev/mp-weixin/pages/order/product-close/product-close.json
rename to unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.json
index 54c168d..a0812ee 100644
--- a/unpackage/dist/dev/mp-weixin/pages/order/product-close/product-close.json
+++ b/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.json
@@ -1,5 +1,4 @@
{
"navigationBarTitleText": "",
- "navigationBarBackgroundColor": "#a0522d",
"usingComponents": {}
}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/order/component/addressComponent.js b/unpackage/dist/dev/mp-weixin/pages/order/component/addressComponent.js
index f99351b..1cfecd3 100644
--- a/unpackage/dist/dev/mp-weixin/pages/order/component/addressComponent.js
+++ b/unpackage/dist/dev/mp-weixin/pages/order/component/addressComponent.js
@@ -2,22 +2,22 @@
const common_vendor = require("../../../common/vendor.js");
const pages_utils_emitter = require("../../utils/emitter.js");
const api_request = require("../../../api/request.js");
-const store_userStore = require("../../../store/userStore.js");
+require("../../../store/userStore.js");
const _sfc_main = {
__name: "addressComponent",
setup(__props) {
common_vendor.ref([null, null]);
const addressList = common_vendor.ref([]);
- const store = store_userStore.userStore();
- common_vendor.onMounted(() => {
+ const userInfo = common_vendor.wx$1.getStorageSync("userInfo");
+ common_vendor.onShow(() => {
getAddressList();
});
const getAddressList = async () => {
const res = await common_vendor.index.request({
- url: api_request.testUrl + "/address/list",
+ url: api_request.baseUrl + "/address/list",
method: "POST",
data: {
- id: store.userInfo.id
+ id: userInfo.id
}
});
addressList.value = res.data.data;
@@ -31,6 +31,11 @@ const _sfc_main = {
pages_utils_emitter.emitter.emit("addressInfo", temp);
pages_utils_emitter.emitter.emit("close");
};
+ const toNewAddress = () => {
+ common_vendor.index.navigateTo({
+ url: "/pages/Shopping-cart/newaddress_Info/newaddress_Info"
+ });
+ };
return (_ctx, _cache) => {
return {
a: common_vendor.o(close),
@@ -44,10 +49,11 @@ const _sfc_main = {
f: index
};
}),
- c: common_vendor.o(radioChange)
+ c: common_vendor.o(radioChange),
+ d: common_vendor.o(toNewAddress)
};
};
}
};
-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/component/addressComponent.wxml b/unpackage/dist/dev/mp-weixin/pages/order/component/addressComponent.wxml
index 2d20294..2764a1e 100644
--- a/unpackage/dist/dev/mp-weixin/pages/order/component/addressComponent.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/order/component/addressComponent.wxml
@@ -1 +1 @@
-收货地址{{item.c}}{{item.d}}{{item.e}}添加新地址
\ No newline at end of file
+收货地址{{item.c}}{{item.d}}{{item.e}}添加新地址
\ No newline at end of file
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 d90283d..8c7487f 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-close/product-close.js b/unpackage/dist/dev/mp-weixin/pages/order/product-close/product-close.js
deleted file mode 100644
index faae301..0000000
--- a/unpackage/dist/dev/mp-weixin/pages/order/product-close/product-close.js
+++ /dev/null
@@ -1,19 +0,0 @@
-"use strict";
-const common_vendor = require("../../../common/vendor.js");
-const _sfc_main = {
- __name: "product-close",
- setup(__props) {
- const items = common_vendor.ref([null, null, null, null]);
- return (_ctx, _cache) => {
- return {
- a: common_vendor.f(items.value, (item, index, i0) => {
- return {
- a: index
- };
- })
- };
- };
- }
-};
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-41495ba5"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/order/product-close/product-close.vue"]]);
-wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/order/product-close/product-close.wxml b/unpackage/dist/dev/mp-weixin/pages/order/product-close/product-close.wxml
deleted file mode 100644
index b670af7..0000000
--- a/unpackage/dist/dev/mp-weixin/pages/order/product-close/product-close.wxml
+++ /dev/null
@@ -1 +0,0 @@
-交易关闭超时未付款，订单自动关闭张三 15888610253黑龙江省哈尔滨市呼兰区学院路街道288号哈尔滨华德学院非遗绒花【材料包】已选种类：紫色138.00×1商品总价138.00优惠券50.00应付款：88.00买家留言 希望所使用的材料是可持续来源的，并且制作工艺要精细，以确保每一朵花瓣都能生动地展现出绒花的质感和美感。 订单编号：E20241005095840091406189复制创建时间：2024-10-05 09:58:41成交时间：2024-10-05 11:47:08在线客服更多精选商品【非遗手工艺体验】玉雕-古法制玉体验99.00删除订单
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/order/product-close/product-close.wxss b/unpackage/dist/dev/mp-weixin/pages/order/product-close/product-close.wxss
deleted file mode 100644
index fb44865..0000000
--- a/unpackage/dist/dev/mp-weixin/pages/order/product-close/product-close.wxss
+++ /dev/null
@@ -1,766 +0,0 @@
-/* 水平间距 */
-/* 水平间距 */
-/************************************************************
-** 请将全局样式拷贝到项目的全局 CSS 文件或者当前页面的顶部 **
-** 否则页面将无法正常显示 **
-************************************************************/
-html.data-v-41495ba5 {
- font-size: 16px;
-}
-body.data-v-41495ba5 {
- 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-41495ba5,
-image.data-v-41495ba5,
-text.data-v-41495ba5 {
- box-sizing: border-box;
- flex-shrink: 0;
-}
-#app.data-v-41495ba5 {
- width: 100vw;
- height: 100vh;
-}
-.flex-row.data-v-41495ba5 {
- display: flex;
- flex-direction: row;
-}
-.flex-col.data-v-41495ba5 {
- display: flex;
- flex-direction: column;
-}
-.justify-start.data-v-41495ba5 {
- justify-content: flex-start;
-}
-.justify-end.data-v-41495ba5 {
- justify-content: flex-end;
-}
-.justify-center.data-v-41495ba5 {
- justify-content: center;
-}
-.justify-between.data-v-41495ba5 {
- justify-content: space-between;
-}
-.justify-around.data-v-41495ba5 {
- justify-content: space-around;
-}
-.justify-evenly.data-v-41495ba5 {
- justify-content: space-evenly;
-}
-.items-start.data-v-41495ba5 {
- align-items: flex-start;
-}
-.items-end.data-v-41495ba5 {
- align-items: flex-end;
-}
-.items-center.data-v-41495ba5 {
- align-items: center;
-}
-.items-baseline.data-v-41495ba5 {
- align-items: baseline;
-}
-.items-stretch.data-v-41495ba5 {
- align-items: stretch;
-}
-.self-start.data-v-41495ba5 {
- align-self: flex-start;
-}
-.self-end.data-v-41495ba5 {
- align-self: flex-end;
-}
-.self-center.data-v-41495ba5 {
- align-self: center;
-}
-.self-baseline.data-v-41495ba5 {
- align-self: baseline;
-}
-.self-stretch.data-v-41495ba5 {
- align-self: stretch;
-}
-.flex-1.data-v-41495ba5 {
- flex: 1 1 0%;
-}
-.flex-auto.data-v-41495ba5 {
- flex: 1 1 auto;
-}
-.grow.data-v-41495ba5 {
- flex-grow: 1;
-}
-.grow-0.data-v-41495ba5 {
- flex-grow: 0;
-}
-.shrink.data-v-41495ba5 {
- flex-shrink: 1;
-}
-.shrink-0.data-v-41495ba5 {
- flex-shrink: 0;
-}
-.relative.data-v-41495ba5 {
- position: relative;
-}
-.ml-2.data-v-41495ba5 {
- margin-left: 3.75rpx;
-}
-.mt-2.data-v-41495ba5 {
- margin-top: 3.75rpx;
-}
-.ml-4.data-v-41495ba5 {
- margin-left: 7.5rpx;
-}
-.mt-4.data-v-41495ba5 {
- margin-top: 7.5rpx;
-}
-.ml-6.data-v-41495ba5 {
- margin-left: 11.25rpx;
-}
-.mt-6.data-v-41495ba5 {
- margin-top: 11.25rpx;
-}
-.ml-8.data-v-41495ba5 {
- margin-left: 15rpx;
-}
-.mt-8.data-v-41495ba5 {
- margin-top: 15rpx;
-}
-.ml-10.data-v-41495ba5 {
- margin-left: 18.75rpx;
-}
-.mt-10.data-v-41495ba5 {
- margin-top: 18.75rpx;
-}
-.ml-12.data-v-41495ba5 {
- margin-left: 22.5rpx;
-}
-.mt-12.data-v-41495ba5 {
- margin-top: 22.5rpx;
-}
-.ml-14.data-v-41495ba5 {
- margin-left: 26.25rpx;
-}
-.mt-14.data-v-41495ba5 {
- margin-top: 26.25rpx;
-}
-.ml-16.data-v-41495ba5 {
- margin-left: 30rpx;
-}
-.mt-16.data-v-41495ba5 {
- margin-top: 30rpx;
-}
-.ml-18.data-v-41495ba5 {
- margin-left: 33.75rpx;
-}
-.mt-18.data-v-41495ba5 {
- margin-top: 33.75rpx;
-}
-.ml-20.data-v-41495ba5 {
- margin-left: 37.5rpx;
-}
-.mt-20.data-v-41495ba5 {
- margin-top: 37.5rpx;
-}
-.ml-22.data-v-41495ba5 {
- margin-left: 41.25rpx;
-}
-.mt-22.data-v-41495ba5 {
- margin-top: 41.25rpx;
-}
-.ml-24.data-v-41495ba5 {
- margin-left: 45rpx;
-}
-.mt-24.data-v-41495ba5 {
- margin-top: 45rpx;
-}
-.ml-26.data-v-41495ba5 {
- margin-left: 48.75rpx;
-}
-.mt-26.data-v-41495ba5 {
- margin-top: 48.75rpx;
-}
-.ml-28.data-v-41495ba5 {
- margin-left: 52.5rpx;
-}
-.mt-28.data-v-41495ba5 {
- margin-top: 52.5rpx;
-}
-.ml-30.data-v-41495ba5 {
- margin-left: 56.25rpx;
-}
-.mt-30.data-v-41495ba5 {
- margin-top: 56.25rpx;
-}
-.ml-32.data-v-41495ba5 {
- margin-left: 60rpx;
-}
-.mt-32.data-v-41495ba5 {
- margin-top: 60rpx;
-}
-.ml-34.data-v-41495ba5 {
- margin-left: 63.75rpx;
-}
-.mt-34.data-v-41495ba5 {
- margin-top: 63.75rpx;
-}
-.ml-36.data-v-41495ba5 {
- margin-left: 67.5rpx;
-}
-.mt-36.data-v-41495ba5 {
- margin-top: 67.5rpx;
-}
-.ml-38.data-v-41495ba5 {
- margin-left: 71.25rpx;
-}
-.mt-38.data-v-41495ba5 {
- margin-top: 71.25rpx;
-}
-.ml-40.data-v-41495ba5 {
- margin-left: 75rpx;
-}
-.mt-40.data-v-41495ba5 {
- margin-top: 75rpx;
-}
-.ml-42.data-v-41495ba5 {
- margin-left: 78.75rpx;
-}
-.mt-42.data-v-41495ba5 {
- margin-top: 78.75rpx;
-}
-.ml-44.data-v-41495ba5 {
- margin-left: 82.5rpx;
-}
-.mt-44.data-v-41495ba5 {
- margin-top: 82.5rpx;
-}
-.ml-46.data-v-41495ba5 {
- margin-left: 86.25rpx;
-}
-.mt-46.data-v-41495ba5 {
- margin-top: 86.25rpx;
-}
-.ml-48.data-v-41495ba5 {
- margin-left: 90rpx;
-}
-.mt-48.data-v-41495ba5 {
- margin-top: 90rpx;
-}
-.ml-50.data-v-41495ba5 {
- margin-left: 93.75rpx;
-}
-.mt-50.data-v-41495ba5 {
- margin-top: 93.75rpx;
-}
-.ml-52.data-v-41495ba5 {
- margin-left: 97.5rpx;
-}
-.mt-52.data-v-41495ba5 {
- margin-top: 97.5rpx;
-}
-.ml-54.data-v-41495ba5 {
- margin-left: 101.25rpx;
-}
-.mt-54.data-v-41495ba5 {
- margin-top: 101.25rpx;
-}
-.ml-56.data-v-41495ba5 {
- margin-left: 105rpx;
-}
-.mt-56.data-v-41495ba5 {
- margin-top: 105rpx;
-}
-.ml-58.data-v-41495ba5 {
- margin-left: 108.75rpx;
-}
-.mt-58.data-v-41495ba5 {
- margin-top: 108.75rpx;
-}
-.ml-60.data-v-41495ba5 {
- margin-left: 112.5rpx;
-}
-.mt-60.data-v-41495ba5 {
- margin-top: 112.5rpx;
-}
-.ml-62.data-v-41495ba5 {
- margin-left: 116.25rpx;
-}
-.mt-62.data-v-41495ba5 {
- margin-top: 116.25rpx;
-}
-.ml-64.data-v-41495ba5 {
- margin-left: 120rpx;
-}
-.mt-64.data-v-41495ba5 {
- margin-top: 120rpx;
-}
-.ml-66.data-v-41495ba5 {
- margin-left: 123.75rpx;
-}
-.mt-66.data-v-41495ba5 {
- margin-top: 123.75rpx;
-}
-.ml-68.data-v-41495ba5 {
- margin-left: 127.5rpx;
-}
-.mt-68.data-v-41495ba5 {
- margin-top: 127.5rpx;
-}
-.ml-70.data-v-41495ba5 {
- margin-left: 131.25rpx;
-}
-.mt-70.data-v-41495ba5 {
- margin-top: 131.25rpx;
-}
-.ml-72.data-v-41495ba5 {
- margin-left: 135rpx;
-}
-.mt-72.data-v-41495ba5 {
- margin-top: 135rpx;
-}
-.ml-74.data-v-41495ba5 {
- margin-left: 138.75rpx;
-}
-.mt-74.data-v-41495ba5 {
- margin-top: 138.75rpx;
-}
-.ml-76.data-v-41495ba5 {
- margin-left: 142.5rpx;
-}
-.mt-76.data-v-41495ba5 {
- margin-top: 142.5rpx;
-}
-.ml-78.data-v-41495ba5 {
- margin-left: 146.25rpx;
-}
-.mt-78.data-v-41495ba5 {
- margin-top: 146.25rpx;
-}
-.ml-80.data-v-41495ba5 {
- margin-left: 150rpx;
-}
-.mt-80.data-v-41495ba5 {
- margin-top: 150rpx;
-}
-.ml-82.data-v-41495ba5 {
- margin-left: 153.75rpx;
-}
-.mt-82.data-v-41495ba5 {
- margin-top: 153.75rpx;
-}
-.ml-84.data-v-41495ba5 {
- margin-left: 157.5rpx;
-}
-.mt-84.data-v-41495ba5 {
- margin-top: 157.5rpx;
-}
-.ml-86.data-v-41495ba5 {
- margin-left: 161.25rpx;
-}
-.mt-86.data-v-41495ba5 {
- margin-top: 161.25rpx;
-}
-.ml-88.data-v-41495ba5 {
- margin-left: 165rpx;
-}
-.mt-88.data-v-41495ba5 {
- margin-top: 165rpx;
-}
-.ml-90.data-v-41495ba5 {
- margin-left: 168.75rpx;
-}
-.mt-90.data-v-41495ba5 {
- margin-top: 168.75rpx;
-}
-.ml-92.data-v-41495ba5 {
- margin-left: 172.5rpx;
-}
-.mt-92.data-v-41495ba5 {
- margin-top: 172.5rpx;
-}
-.ml-94.data-v-41495ba5 {
- margin-left: 176.25rpx;
-}
-.mt-94.data-v-41495ba5 {
- margin-top: 176.25rpx;
-}
-.ml-96.data-v-41495ba5 {
- margin-left: 180rpx;
-}
-.mt-96.data-v-41495ba5 {
- margin-top: 180rpx;
-}
-.ml-98.data-v-41495ba5 {
- margin-left: 183.75rpx;
-}
-.mt-98.data-v-41495ba5 {
- margin-top: 183.75rpx;
-}
-.ml-100.data-v-41495ba5 {
- margin-left: 187.5rpx;
-}
-.mt-100.data-v-41495ba5 {
- margin-top: 187.5rpx;
-}
-.mt-5.data-v-41495ba5 {
- margin-top: 9.38rpx;
-}
-.mt-9.data-v-41495ba5 {
- margin-top: 16.88rpx;
-}
-.ml-17.data-v-41495ba5 {
- margin-left: 31.88rpx;
-}
-.mt-11.data-v-41495ba5 {
- margin-top: 20.63rpx;
-}
-.ml-11.data-v-41495ba5 {
- margin-left: 20.63rpx;
-}
-.mt-19.data-v-41495ba5 {
- margin-top: 35.63rpx;
-}
-.page.data-v-41495ba5 {
- background-color: #fffaf0;
- width: 100%;
- overflow-y: auto;
- overflow-x: hidden;
- height: 100%;
-}
-.image-wrapper.data-v-41495ba5 {
- padding: 15rpx 0;
- background-color: #a0522d;
-}
-.image.data-v-41495ba5 {
- margin-left: 16.88rpx;
- width: 37.5rpx;
- height: 37.5rpx;
-}
-.group.data-v-41495ba5 {
- padding-left: 16.41rpx;
- padding-right: 13.59rpx;
-}
-.group_2.data-v-41495ba5 {
- padding: 15rpx 0 38.51rpx;
-}
-.section.data-v-41495ba5 {
- padding: 20.49rpx 22.37rpx 9.51rpx 26.12rpx;
- background-color: #fffef8;
- border-radius: 18.75rpx;
- border: solid 1.88rpx #818181;
-}
-.image_2.data-v-41495ba5 {
- width: 75rpx;
- height: 75rpx;
-}
-.font.data-v-41495ba5 {
- font-size: 26.25rpx;
- font-family: Open Sans;
- line-height: 24.43rpx;
- color: #323232;
-}
-.text.data-v-41495ba5 {
- color: #323233;
- font-size: 28.13rpx;
- line-height: 26.08rpx;
-}
-.font_2.data-v-41495ba5 {
- font-size: 22.5rpx;
- font-family: Open Sans;
- line-height: 20.68rpx;
- color: #818181;
-}
-.text_2.data-v-41495ba5 {
- color: #6b6e72;
- line-height: 21.34rpx;
-}
-.section_2.data-v-41495ba5 {
- padding: 32.72rpx 14.94rpx 31.99rpx 18.68rpx;
- background-color: #fffef8;
- border-radius: 18.75rpx;
- border: solid 1.88rpx #818181;
-}
-.image_3.data-v-41495ba5 {
- width: 43.13rpx;
- height: 43.13rpx;
-}
-.text_3.data-v-41495ba5 {
- line-height: 23.77rpx;
-}
-.text_4.data-v-41495ba5 {
- line-height: 20.91rpx;
-}
-.section_3.data-v-41495ba5 {
- padding: 0 14.89rpx 26.38rpx 18.62rpx;
- background-color: #fffef8;
- border-radius: 18.75rpx;
- border: solid 1.88rpx #818181;
-}
-.group_3.data-v-41495ba5 {
- padding: 20.49rpx 3.75rpx 18.75rpx;
- border-bottom: solid 1.88rpx #dfdfdf;
-}
-.image_4.data-v-41495ba5 {
- margin-bottom: 5.63rpx;
- border-radius: 9.38rpx;
- width: 146.25rpx;
- height: 165rpx;
-}
-.group_4.data-v-41495ba5 {
- margin-top: 4.07rpx;
-}
-.text_5.data-v-41495ba5 {
- margin-left: 2.1rpx;
- line-height: 20.79rpx;
-}
-.group_5.data-v-41495ba5 {
- width: 90.66rpx;
-}
-.text_6.data-v-41495ba5 {
- margin-left: 25.03rpx;
- color: #323232;
- font-size: 33.75rpx;
- font-family: Open Sans;
- font-weight: 600;
- line-height: 24.88rpx;
-}
-.image_5.data-v-41495ba5 {
- width: 30rpx;
- height: 30rpx;
-}
-.image_6.data-v-41495ba5 {
- margin-left: -90.66rpx;
-}
-.font_3.data-v-41495ba5 {
- font-size: 26.25rpx;
- font-family: Open Sans;
- line-height: 20.68rpx;
- color: #323232;
-}
-.text_7.data-v-41495ba5 {
- font-weight: 600;
- line-height: 19.29rpx;
-}
-.text_8.data-v-41495ba5 {
- margin-right: 9.83rpx;
- margin-bottom: 7.5rpx;
- line-height: 18.73rpx;
-}
-.view.data-v-41495ba5 {
- margin-top: 26.25rpx;
- padding: 0 5.53rpx;
-}
-.font_4.data-v-41495ba5 {
- font-size: 26.25rpx;
- font-family: Open Sans;
- line-height: 24.43rpx;
- color: #818181;
-}
-.text_9.data-v-41495ba5 {
- line-height: 24.36rpx;
-}
-.text_10.data-v-41495ba5 {
- line-height: 19.39rpx;
-}
-.view_2.data-v-41495ba5 {
- margin-top: 13.13rpx;
- padding: 0 4.69rpx;
-}
-.text_11.data-v-41495ba5 {
- line-height: 24.26rpx;
-}
-.group_1.data-v-41495ba5 {
- margin-right: 2.72rpx;
-}
-.image_7.data-v-41495ba5 {
- width: 41.25rpx;
- height: 30rpx;
-}
-.text_12.data-v-41495ba5 {
- line-height: 19.39rpx;
-}
-.group_7.data-v-41495ba5 {
- margin-top: 16.88rpx;
- padding: 0 5.91rpx;
-}
-.group_8.data-v-41495ba5 {
- width: 128.44rpx;
-}
-.image_8.data-v-41495ba5 {
- margin-left: 98.44rpx;
-}
-.text_13.data-v-41495ba5 {
- margin-left: -128.44rpx;
- line-height: 24.54rpx;
-}
-.text_14.data-v-41495ba5 {
- color: #fb8b05;
- line-height: 19.39rpx;
-}
-.divider.data-v-41495ba5 {
- background-color: #dfdfdf;
- height: 1.88rpx;
-}
-.view_3.data-v-41495ba5 {
- margin: 16.88rpx 9.62rpx 0 3.75rpx;
-}
-.text_15.data-v-41495ba5 {
- margin-left: 5.16rpx;
- margin-top: 24.86rpx;
- line-height: 24.21rpx;
-}
-.text-wrapper.data-v-41495ba5 {
- margin-right: 13.37rpx;
- margin-top: 16.56rpx;
- padding: 14.64rpx 0 9.77rpx;
- background-color: #fffef8;
- border-radius: 9.38rpx;
- border: solid 1.88rpx #f1f1b5;
-}
-.text_16.data-v-41495ba5 {
- margin-left: 15.37rpx;
- margin-right: 20.27rpx;
- line-height: 26.25rpx;
-}
-.view_4.data-v-41495ba5 {
- margin: 18.75rpx 9.62rpx 0 3.75rpx;
-}
-.view_5.data-v-41495ba5 {
- margin-top: 24.09rpx;
- padding: 0 4.88rpx;
-}
-.text_17.data-v-41495ba5 {
- line-height: 20.85rpx;
-}
-.group_9.data-v-41495ba5 {
- margin-right: 4.74rpx;
-}
-.font_5.data-v-41495ba5 {
- font-size: 22.5rpx;
- font-family: Open Sans;
- line-height: 16.63rpx;
- color: #323232;
-}
-.text_18.data-v-41495ba5 {
- line-height: 16.54rpx;
-}
-.text-wrapper_2.data-v-41495ba5 {
- padding-bottom: 2.29rpx;
- background-color: #fffef8;
- width: 50.63rpx;
- height: 22.5rpx;
- border: solid 0.94rpx #d1d1d1;
-}
-.text_19.data-v-41495ba5 {
- color: #323232;
- font-size: 18.75rpx;
- font-family: Open Sans;
- line-height: 17.38rpx;
-}
-.view_6.data-v-41495ba5 {
- margin-top: 11.16rpx;
- padding: 0 4.35rpx;
-}
-.text_20.data-v-41495ba5 {
- line-height: 20.7rpx;
-}
-.text_21.data-v-41495ba5 {
- margin-right: 157.91rpx;
-}
-.view_7.data-v-41495ba5 {
- margin-top: 14.51rpx;
- padding: 0 4.56rpx;
-}
-.text_22.data-v-41495ba5 {
- line-height: 20.89rpx;
-}
-.text_23.data-v-41495ba5 {
- margin-right: 157.71rpx;
-}
-.group_10.data-v-41495ba5 {
- margin-top: 33.43rpx;
-}
-.image_9.data-v-41495ba5 {
- width: 45rpx;
- height: 45rpx;
-}
-.font_6.data-v-41495ba5 {
- font-size: 30rpx;
- font-family: Open Sans;
- color: #323232;
-}
-.text_24.data-v-41495ba5 {
- line-height: 27.69rpx;
-}
-.image_10.data-v-41495ba5 {
- width: 251.25rpx;
- height: 1.88rpx;
-}
-.text_25.data-v-41495ba5 {
- line-height: 27.71rpx;
-}
-.grid.data-v-41495ba5 {
- margin-left: 11.72rpx;
- margin-right: 14.53rpx;
- margin-bottom: 136rpx;
- height: 965.63rpx;
- display: grid;
- grid-template-rows: repeat(2, minmax(0, 1fr));
- grid-template-columns: repeat(2, minmax(0, 1fr));
- row-gap: 32.01rpx;
- column-gap: 30rpx;
-}
-.section_5.data-v-41495ba5 {
- padding-bottom: 28.26rpx;
- background-color: #ffffff;
- border-radius: 18.75rpx;
- border: solid 1.88rpx #818181;
-}
-.image_11.data-v-41495ba5 {
- border-radius: 18.75rpx 18.75rpx 0rpx 0rpx;
- width: 333.75rpx;
- height: 322.5rpx;
-}
-.font_7.data-v-41495ba5 {
- font-size: 26.25rpx;
- font-family: Open Sans;
- line-height: 30rpx;
- color: #000000;
-}
-.text_26.data-v-41495ba5 {
- margin: 8.42rpx 6.69rpx 0 12.06rpx;
- font-size: 24.38rpx;
-}
-.group_11.data-v-41495ba5 {
- margin-top: 17.83rpx;
- padding: 0 22.37rpx;
-}
-.image_12.data-v-41495ba5 {
- width: 26.25rpx;
- height: 26.25rpx;
-}
-.font_8.data-v-41495ba5 {
- font-size: 30rpx;
- font-family: Times New Roman;
- line-height: 20.68rpx;
- color: #fbb612;
-}
-.section_4.data-v-41495ba5 {
- position: fixed;
- left: 0;
- right: 0;
- margin: auto;
- bottom: 0;
- padding: 16.88rpx 0 15rpx;
- background-color: #fffef8;
-}
-.text-wrapper_3.data-v-41495ba5 {
- margin-right: 26.27rpx;
- padding: 19.76rpx 0 20.19rpx;
- background-color: #fffef8;
- border-radius: 75rpx;
- width: 204.38rpx;
- border: solid 1.88rpx #cbcbcb;
-}
-.text_27.data-v-41495ba5 {
- line-height: 27.54rpx;
-}
\ No newline at end of file
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 c955f64..517d1a9 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
@@ -97,12 +97,6 @@ const _sfc_main = {
orderStatus: "待支付",
//订单状态
orderItemList: orderItemList.value
- // orderItemList: orderItemList.value.map(item =>({
- // goodSnapshot : item.goodSnapshot,
- // priceSnapshot : item.priceSnapshot,
- // quantity : item.quantity,
- // itemTotalAmount: item.itemTotalAmount
- // }))
}
});
console.log("后台返回订单响应==>", resOrder);
@@ -166,5 +160,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/store-home/ProductDetails/ProductDetails.js b/unpackage/dist/dev/mp-weixin/pages/store-home/ProductDetails/ProductDetails.js
index 72f1d6e..c5cd4fe 100644
--- a/unpackage/dist/dev/mp-weixin/pages/store-home/ProductDetails/ProductDetails.js
+++ b/unpackage/dist/dev/mp-weixin/pages/store-home/ProductDetails/ProductDetails.js
@@ -43,5 +43,5 @@ const _sfc_main = {
};
}
};
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-3361b524"], ["__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 5a5f47b..dae8a3f 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
@@ -97,5 +97,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/project.config.json b/unpackage/dist/dev/mp-weixin/project.config.json
index dcf3b39..bc80aed 100644
--- a/unpackage/dist/dev/mp-weixin/project.config.json
+++ b/unpackage/dist/dev/mp-weixin/project.config.json
@@ -18,8 +18,8 @@
}
},
"compileType": "miniprogram",
- "libVersion": "3.6.2",
- "appid": "wxbcb1cf9951fa17c8",
+ "libVersion": "3.6.0",
+ "appid": "wx3f968a09e31d6bed",
"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-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);