diff --git a/pages.json b/pages.json
index 444bebe..51c7a62 100644
--- a/pages.json
+++ b/pages.json
@@ -1,7 +1,7 @@
{
"pages": [
{
- "path" : "pages/home/home/home",
+ "path" : "pages/home/home",
"style" :
{
"navigationBarTitleText" : ""
@@ -29,13 +29,6 @@
"navigationBarTitleText" : ""
}
},
- {
- "path" : "pages/store-home/products/product-detail",
- "style" :
- {
- "navigationBarTitleText" : ""
- }
- },
{
"path" : "pages/Shopping-cart/servicemain/servicemain",
"style" :
@@ -44,6 +37,56 @@
}
},
{
+ "path" : "pages/booking/AppointmentHome",
+ "style" :
+ {
+ "navigationBarTitleText" : ""
+ }
+ },
+ {
+ "path" : "pages/booking/ContactInformation",
+ "style" :
+ {
+ "navigationBarTitleText" : "联系人信息"
+ }
+ },
+ {
+ "path" : "pages/booking/date",
+ "style" :
+ {
+ "navigationBarTitleText" : ""
+ }
+ },
+ {
+ "path" : "pages/store-home/ProductDetails/ProductDetails",
+ "style" :
+ {
+ "navigationBarTitleText" : ""
+ }
+ },
+ {
+ "path" : "pages/Shopping-cart/ReceivingInformation/ReceivingInformation",
+ "style" :
+ {
+ "navigationBarTitleText" : ""
+ }
+ },
+ {
+ "path" : "pages/Shopping-cart/Contact/Contact",
+ "style" :
+ {
+ "navigationBarTitleText" : ""
+ }
+ },
+ {
+ "path" : "pages/Shopping-cart/address/address",
+ "style" :
+ {
+ "navigationBarTitleText" : ""
+ }
+ },
+ {
+
"path" : "pages/order/product-close/product-close",
"style" :
{
@@ -51,12 +94,42 @@
"navigationBarBackgroundColor": "#a0522d"
}
},
+ {
+ "path" : "pages/Shopping-cart/Phone/Phone",
+
+ "style" :
+ {
+ "navigationBarTitleText" : "",
+ "navigationBarBackgroundColor": "#a0522d"
+ }
+ },
{
"path" : "pages/order/product-unpay/product-unpay",
"style" :
{
"navigationBarTitleText" : ""
}
+ },
+ {
+ "path" : "pages/booking/BillingOfFees/BillingOfFees",
+ "style" :
+ {
+ "navigationBarTitleText" : ""
+ }
+ },
+ {
+ "path" : "pages/booking/ReservationInstructions/ReservationInstructions",
+ "style" :
+ {
+ "navigationBarTitleText" : ""
+ }
+ },
+ {
+ "path" : "pages/booking/respectable/respectable",
+ "style" :
+ {
+ "navigationBarTitleText" : ""
+ }
}
],
"globalStyle": {
@@ -71,7 +144,7 @@
"tabBar": {
"list": [
{
- "pagePath": "pages/home/home/home",
+ "pagePath": "pages/home/home",
"iconPath": "./static/home.png",
"selectedIconPath": "./static/homeselected.png",
"text":"首页"
diff --git a/pages/Shopping-cart/productmain/productmain.vue b/pages/Shopping-cart/productmain/productmain.vue
index 837f2d8..cc07817 100644
--- a/pages/Shopping-cart/productmain/productmain.vue
+++ b/pages/Shopping-cart/productmain/productmain.vue
@@ -98,6 +98,236 @@
\ No newline at end of file
diff --git a/pages/home/home/home.vue b/pages/home/home/home.vue
deleted file mode 100644
index 51dfc18..0000000
--- a/pages/home/home/home.vue
+++ /dev/null
@@ -1,380 +0,0 @@
-
-
-
- 脸谱泥人
-
-
-
-
- 热门精品
-
-
- 非遗工坊
-
-
-
-
- 写真预约
-
-
-
-
-
- 推荐商品
-
- 更多
-
-
-
-
-
-
-
- 琉璃发体验包
-
- ￥750
-
-
-
-
- 琉璃发体验包
-
- ￥750
-
-
-
-
- 琉璃发体验包
-
- ￥750
-
-
-
- 推荐服务
-
- 更多
-
-
-
-
-
-
-
- 琉璃发体验包
-
- ￥750
-
-
-
-
- 琉璃发体验包
-
- ￥750
-
-
-
-
- 琉璃发体验包
-
- ￥750
-
-
-
- 活动资讯
-
- 更多
-
-
-
-
-
-
-
- “五色五育”研学——端午香囊篇
- 为进一步深入贯彻落实习近平总书记...
- 2024-08-04
-
-
-
-
-
-
-
-
-
-
-
diff --git a/pages/mine/main/main.vue b/pages/mine/main/main.vue
index a7531f0..214f650 100644
--- a/pages/mine/main/main.vue
+++ b/pages/mine/main/main.vue
@@ -1,96 +1,96 @@
-
+
-
+
默认用户
剩余积分：0
-
+
优惠卷：0 张
-
+
-
+
总订单
-
+
- 待付款
+ 待付款
-
+
待发货
-
+
待收货
-
+
- 退款/售后
+ 退款/售后
-
-
+
+
- 地址列表
+ 地址列表
-
+
+
联系人列表
-
-
-
- 设置
-
+
+
+ 设置
+
@@ -104,39 +104,37 @@
diff --git a/pages/store-home/main/main.vue b/pages/store-home/main/main.vue
index 9231406..46cac24 100644
--- a/pages/store-home/main/main.vue
+++ b/pages/store-home/main/main.vue
@@ -132,7 +132,7 @@
}]
const tap =()=> {
uni.navigateTo({
- url: '../../../pages/order/product-close/product-close'
+ url: '../../../pages/Shopping-cart/ProductDetails/ProductDetails'
})
}
diff --git a/pages/store-home/products/product-detail.vue b/pages/store-home/products/product-detail.vue
deleted file mode 100644
index 9e1a63f..0000000
--- a/pages/store-home/products/product-detail.vue
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/unpackage/dist/dev/mp-weixin/app.js b/unpackage/dist/dev/mp-weixin/app.js
index 2a33ea1..4f84a52 100644
--- a/unpackage/dist/dev/mp-weixin/app.js
+++ b/unpackage/dist/dev/mp-weixin/app.js
@@ -2,14 +2,24 @@
Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
const common_vendor = require("./common/vendor.js");
if (!Math) {
- "./pages/home/home/home.js";
+ "./pages/home/home.js";
"./pages/store-home/main/main.js";
"./pages/mine/main/main.js";
"./pages/Shopping-cart/productmain/productmain.js";
- "./pages/store-home/products/product-detail.js";
"./pages/Shopping-cart/servicemain/servicemain.js";
+ "./pages/booking/AppointmentHome.js";
+ "./pages/booking/ContactInformation.js";
+ "./pages/booking/date.js";
+ "./pages/store-home/ProductDetails/ProductDetails.js";
+ "./pages/Shopping-cart/ReceivingInformation/ReceivingInformation.js";
+ "./pages/Shopping-cart/Contact/Contact.js";
+ "./pages/Shopping-cart/address/address.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";
+ "./pages/booking/ReservationInstructions/ReservationInstructions.js";
+ "./pages/booking/respectable/respectable.js";
}
const _sfc_main = {};
function _sfc_render(_ctx, _cache) {
diff --git a/unpackage/dist/dev/mp-weixin/app.json b/unpackage/dist/dev/mp-weixin/app.json
index ee6979a..93c5a57 100644
--- a/unpackage/dist/dev/mp-weixin/app.json
+++ b/unpackage/dist/dev/mp-weixin/app.json
@@ -1,13 +1,23 @@
{
"pages": [
- "pages/home/home/home",
+ "pages/home/home",
"pages/store-home/main/main",
"pages/mine/main/main",
"pages/Shopping-cart/productmain/productmain",
- "pages/store-home/products/product-detail",
"pages/Shopping-cart/servicemain/servicemain",
+ "pages/booking/AppointmentHome",
+ "pages/booking/ContactInformation",
+ "pages/booking/date",
+ "pages/store-home/ProductDetails/ProductDetails",
+ "pages/Shopping-cart/ReceivingInformation/ReceivingInformation",
+ "pages/Shopping-cart/Contact/Contact",
+ "pages/Shopping-cart/address/address",
"pages/order/product-close/product-close",
- "pages/order/product-unpay/product-unpay"
+ "pages/Shopping-cart/Phone/Phone",
+ "pages/order/product-unpay/product-unpay",
+ "pages/booking/BillingOfFees/BillingOfFees",
+ "pages/booking/ReservationInstructions/ReservationInstructions",
+ "pages/booking/respectable/respectable"
],
"window": {
"navigationBarTextStyle": "black",
@@ -18,7 +28,7 @@
"tabBar": {
"list": [
{
- "pagePath": "pages/home/home/home",
+ "pagePath": "pages/home/home",
"iconPath": "./static/home.png",
"selectedIconPath": "./static/homeselected.png",
"text": "首页"
diff --git a/unpackage/dist/dev/mp-weixin/common/assets.js b/unpackage/dist/dev/mp-weixin/common/assets.js
index fd2bcca..1698f81 100644
--- a/unpackage/dist/dev/mp-weixin/common/assets.js
+++ b/unpackage/dist/dev/mp-weixin/common/assets.js
@@ -1,4 +1,9 @@
"use strict";
+const product = "/assets/product.7900e336.png";
+const rili = "/assets/rili.7746043b.png";
+const xuanchuan = "/assets/xuanchuan.f0fc207c.png";
+const shizi = "/assets/shizi.dd0347ec.png";
+const you = "/assets/you.60391a00.png";
const img1 = "/assets/cailiaobao.52f9097b.png";
const img2 = "/assets/shouchiwu.37cdee46.png";
const img3 = "/assets/toushi.6558cc23.png";
@@ -12,4 +17,9 @@ exports.img2 = img2;
exports.img3 = img3;
exports.img4 = img4;
exports.img5 = img5;
+exports.product = product;
exports.product_img = product_img;
+exports.rili = rili;
+exports.shizi = shizi;
+exports.xuanchuan = xuanchuan;
+exports.you = you;
diff --git a/unpackage/dist/dev/mp-weixin/common/vendor.js b/unpackage/dist/dev/mp-weixin/common/vendor.js
index 5678125..255636f 100644
--- a/unpackage/dist/dev/mp-weixin/common/vendor.js
+++ b/unpackage/dist/dev/mp-weixin/common/vendor.js
@@ -4140,6 +4140,15 @@ function inject(key, defaultValue, treatDefaultAsFactory = false) {
warn$1(`inject() can only be used inside setup() or functional components.`);
}
}
+/*! #__NO_SIDE_EFFECTS__ */
+// @__NO_SIDE_EFFECTS__
+function defineComponent(options, extraOptions) {
+ return isFunction(options) ? (
+ // #8326: extend call and options.name access are considered side-effects
+ // by Rollup, so we have to wrap it in a pure-annotated IIFE.
+ /* @__PURE__ */ (() => extend({ name: options.name }, extraOptions, { setup: options }))()
+ ) : options;
+}
const isKeepAlive = (vnode) => vnode.type.__isKeepAlive;
function onActivated(hook, target) {
registerKeepAliveHook(hook, "a", target);
@@ -7525,6 +7534,7 @@ const createSubpackageApp = initCreateSubpackageApp();
}
exports._export_sfc = _export_sfc;
exports.createSSRApp = createSSRApp;
+exports.defineComponent = defineComponent;
exports.f = f;
exports.index = index;
exports.o = o;
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.wxss b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.wxss
index a0d30f9..3c6d014 100644
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.wxss
@@ -404,6 +404,195 @@ text.data-v-641af6de {
.ml-79.data-v-641af6de {
margin-left: 148.13rpx;
}
+.mt-243.data-v-641af6de {
+ position: fixed;
+ bottom: 0;
+ width: 100%;
+}
+.page.data-v-641af6de {
+ background-color: #f8e8c1;
+ width: 100%;
+ overflow-y: auto;
+ overflow-x: hidden;
+ height: 100%;
+}
+.text-wrapper.data-v-641af6de {
+ padding: 26.25rpx 0;
+ background-color: #f5f5dc;
+ position: fixed;
+ top: 0;
+ width: 100%;
+}
+.section.data-v-641af6de {
+ padding: 0 121.88rpx;
+ background-color: #fffef8;
+ position: fixed;
+ top: 70rpx;
+ width: 100%;
+}
+.group.data-v-641af6de {
+ padding: 18.75rpx 3.75rpx 18.75rpx 11.25rpx;
+}
+.section_2.data-v-641af6de {
+ background-color: #fb8b05;
+ width: 112.5rpx;
+ height: 5.63rpx;
+}
+.list.data-v-641af6de {
+ padding: 9.35rpx 18.75rpx 9.35rpx 18.75rpx;
+ padding-bottom: 200rpx;
+}
+.list-item.data-v-641af6de {
+ padding: 33.75rpx 18.75rpx;
+ background-color: #fffef8;
+ border-radius: 18.75rpx;
+}
+.list-item.data-v-641af6de:first-child {
+ margin-top: 0;
+}
+.section_3.data-v-641af6de {
+ margin-right: 5.63rpx;
+}
+.image_4.data-v-641af6de {
+ margin-top: 86.25rpx;
+ width: 31.88rpx;
+ height: 31.88rpx;
+}
+.image.data-v-641af6de {
+ border-radius: 9.38rpx;
+ width: 146.25rpx;
+ height: 144.38rpx;
+}
+.image_2.data-v-641af6de {
+ margin-left: 48.75rpx;
+}
+.group_2.data-v-641af6de {
+ margin-left: 30rpx;
+}
+.group_3.data-v-641af6de {
+ padding-bottom: 15rpx;
+}
+.font_2.data-v-641af6de {
+ font-size: 26.25rpx;
+ font-family: Open Sans;
+ line-height: 24.43rpx;
+ color: #323232;
+}
+.section_4.data-v-641af6de {
+ padding: 11.25rpx 15rpx 24.38rpx;
+ background-color: #f5f5dc;
+ border-radius: 9.38rpx;
+}
+.font_3.data-v-641af6de {
+ font-size: 22.5rpx;
+ font-family: Open Sans;
+ line-height: 19.29rpx;
+ color: #818181;
+}
+.text_3.data-v-641af6de {
+ line-height: 20.79rpx;
+}
+.image_3.data-v-641af6de {
+ margin-right: 7.5rpx;
+ margin-top: -7.5rpx;
+ width: 22.5rpx;
+ height: 22.5rpx;
+}
+.group_4.data-v-641af6de {
+ padding: 0 5.63rpx;
+}
+.font_4.data-v-641af6de {
+ font-size: 33.75rpx;
+ font-family: Open Sans;
+ line-height: 24.43rpx;
+ font-weight: 600;
+ color: #fb8b05;
+}
+.text_4.data-v-641af6de {
+ margin-left: 26.25rpx;
+ line-height: 24.88rpx;
+}
+.image_7.data-v-641af6de {
+ margin-left: -90rpx;
+ width: 30rpx;
+ height: 26.25rpx;
+}
+.font_5.data-v-641af6de {
+ font-size: 26.25rpx;
+ font-family: Open Sans;
+ line-height: 19.29rpx;
+ font-weight: 600;
+ color: #fb8b05;
+}
+.text_5.data-v-641af6de {
+ margin-left: 60rpx;
+}
+.image_5.data-v-641af6de {
+ border-radius: 9.38rpx 0rpx 0rpx 9.38rpx;
+ width: 45rpx;
+ height: 45rpx;
+}
+.text-wrapper_2.data-v-641af6de {
+ padding: 15rpx 0;
+ background-color: #f5f5dc;
+ width: 58.13rpx;
+ height: 45rpx;
+}
+.font_6.data-v-641af6de {
+ font-size: 26.25rpx;
+ font-family: Open Sans;
+ line-height: 19.29rpx;
+ color: #323232;
+}
+.text_6.data-v-641af6de {
+ line-height: 18.73rpx;
+}
+.image_6.data-v-641af6de {
+ border-radius: 0rpx 9.38rpx 9.38rpx 0rpx;
+ width: 45rpx;
+ height: 45rpx;
+}
+.image_9.data-v-641af6de {
+ width: 37.5rpx;
+ height: 37.5rpx;
+}
+.section_6.data-v-641af6de {
+ padding: 18.75rpx;
+ background-color: #fffef8;
+}
+.font.data-v-641af6de {
+ font-size: 30rpx;
+ font-family: Open Sans;
+ line-height: 27.69rpx;
+ color: #323232;
+}
+.text_2.data-v-641af6de {
+ line-height: 27.6rpx;
+}
+.text.data-v-641af6de {
+ margin-right: 30rpx;
+ line-height: 27.79rpx;
+}
+.text_7.data-v-641af6de {
+ line-height: 27.64rpx;
+}
+.text-wrapper_3.data-v-641af6de {
+ margin-right: 3.75rpx;
+ padding: 22.5rpx 0;
+ background-color: #ffd45a;
+ border-radius: 75rpx;
+ width: 219.38rpx;
+ height: 76.88rpx;
+}
+.text_8.data-v-641af6de {
+ color: #ffffff;
+ font-size: 33.75rpx;
+ font-family: Open Sans;
+ line-height: 30.97rpx;
+}
+.ml-79.data-v-641af6de {
+ margin-left: 148.13rpx;
+}
.mt-243.data-v-641af6de {
margin-top: 455.63rpx;
}
diff --git a/unpackage/dist/dev/mp-weixin/pages/home/home/home.js b/unpackage/dist/dev/mp-weixin/pages/home/home/home.js
deleted file mode 100644
index 126f956..0000000
--- a/unpackage/dist/dev/mp-weixin/pages/home/home/home.js
+++ /dev/null
@@ -1,19 +0,0 @@
-"use strict";
-const common_vendor = require("../../../common/vendor.js");
-const _sfc_main = {
- __name: "home",
- 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-41854f8b"]]);
-wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/home/home/home.json b/unpackage/dist/dev/mp-weixin/pages/home/home/home.json
deleted file mode 100644
index a0812ee..0000000
--- a/unpackage/dist/dev/mp-weixin/pages/home/home/home.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "navigationBarTitleText": "",
- "usingComponents": {}
-}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/home/home/home.wxml b/unpackage/dist/dev/mp-weixin/pages/home/home/home.wxml
deleted file mode 100644
index 8a3d558..0000000
--- a/unpackage/dist/dev/mp-weixin/pages/home/home/home.wxml
+++ /dev/null
@@ -1 +0,0 @@
-脸谱泥人热门精品非遗工坊写真预约推荐商品更多琉璃发体验包￥750琉璃发体验包￥750琉璃发体验包￥750推荐服务更多琉璃发体验包￥750琉璃发体验包￥750琉璃发体验包￥750活动资讯更多“五色五育”研学——端午香囊篇为进一步深入贯彻落实习近平总书记...2024-08-04
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/home/home/home.wxss b/unpackage/dist/dev/mp-weixin/pages/home/home/home.wxss
deleted file mode 100644
index a174320..0000000
--- a/unpackage/dist/dev/mp-weixin/pages/home/home/home.wxss
+++ /dev/null
@@ -1,630 +0,0 @@
-/* 水平间距 */
-/* 水平间距 */
-/************************************************************
-** 请将全局样式拷贝到项目的全局 CSS 文件或者当前页面的顶部 **
-** 否则页面将无法正常显示 **
-************************************************************/
-html.data-v-41854f8b {
- font-size: 16px;
-}
-body.data-v-41854f8b {
- 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-41854f8b,
-image.data-v-41854f8b,
-text.data-v-41854f8b {
- box-sizing: border-box;
- flex-shrink: 0;
-}
-#app.data-v-41854f8b {
- width: 100vw;
- height: 100vh;
-}
-.flex-row.data-v-41854f8b {
- display: flex;
- flex-direction: row;
-}
-.flex-col.data-v-41854f8b {
- display: flex;
- flex-direction: column;
-}
-.justify-start.data-v-41854f8b {
- justify-content: flex-start;
-}
-.justify-end.data-v-41854f8b {
- justify-content: flex-end;
-}
-.justify-center.data-v-41854f8b {
- justify-content: center;
-}
-.justify-between.data-v-41854f8b {
- justify-content: space-between;
-}
-.justify-around.data-v-41854f8b {
- justify-content: space-around;
-}
-.justify-evenly.data-v-41854f8b {
- justify-content: space-evenly;
-}
-.items-start.data-v-41854f8b {
- align-items: flex-start;
-}
-.items-end.data-v-41854f8b {
- align-items: flex-end;
-}
-.items-center.data-v-41854f8b {
- align-items: center;
-}
-.items-baseline.data-v-41854f8b {
- align-items: baseline;
-}
-.items-stretch.data-v-41854f8b {
- align-items: stretch;
-}
-.self-start.data-v-41854f8b {
- align-self: flex-start;
-}
-.self-end.data-v-41854f8b {
- align-self: flex-end;
-}
-.self-center.data-v-41854f8b {
- align-self: center;
-}
-.self-baseline.data-v-41854f8b {
- align-self: baseline;
-}
-.self-stretch.data-v-41854f8b {
- align-self: stretch;
-}
-.flex-1.data-v-41854f8b {
- flex: 1 1 0%;
-}
-.flex-auto.data-v-41854f8b {
- flex: 1 1 auto;
-}
-.grow.data-v-41854f8b {
- flex-grow: 1;
-}
-.grow-0.data-v-41854f8b {
- flex-grow: 0;
-}
-.shrink.data-v-41854f8b {
- flex-shrink: 1;
-}
-.shrink-0.data-v-41854f8b {
- flex-shrink: 0;
-}
-.relative.data-v-41854f8b {
- position: relative;
-}
-.ml-2.data-v-41854f8b {
- margin-left: 3.75rpx;
-}
-.mt-2.data-v-41854f8b {
- margin-top: 3.75rpx;
-}
-.ml-4.data-v-41854f8b {
- margin-left: 7.5rpx;
-}
-.mt-4.data-v-41854f8b {
- margin-top: 7.5rpx;
-}
-.ml-6.data-v-41854f8b {
- margin-left: 11.25rpx;
-}
-.mt-6.data-v-41854f8b {
- margin-top: 11.25rpx;
-}
-.ml-8.data-v-41854f8b {
- margin-left: 15rpx;
-}
-.mt-8.data-v-41854f8b {
- margin-top: 15rpx;
-}
-.ml-10.data-v-41854f8b {
- margin-left: 18.75rpx;
-}
-.mt-10.data-v-41854f8b {
- margin-top: 18.75rpx;
-}
-.ml-12.data-v-41854f8b {
- margin-left: 22.5rpx;
-}
-.mt-12.data-v-41854f8b {
- margin-top: 22.5rpx;
-}
-.ml-14.data-v-41854f8b {
- margin-left: 26.25rpx;
-}
-.mt-14.data-v-41854f8b {
- margin-top: 26.25rpx;
-}
-.ml-16.data-v-41854f8b {
- margin-left: 30rpx;
-}
-.mt-16.data-v-41854f8b {
- margin-top: 30rpx;
-}
-.ml-18.data-v-41854f8b {
- margin-left: 33.75rpx;
-}
-.mt-18.data-v-41854f8b {
- margin-top: 33.75rpx;
-}
-.ml-20.data-v-41854f8b {
- margin-left: 37.5rpx;
-}
-.mt-20.data-v-41854f8b {
- margin-top: 37.5rpx;
-}
-.ml-22.data-v-41854f8b {
- margin-left: 41.25rpx;
-}
-.mt-22.data-v-41854f8b {
- margin-top: 41.25rpx;
-}
-.ml-24.data-v-41854f8b {
- margin-left: 45rpx;
-}
-.mt-24.data-v-41854f8b {
- margin-top: 45rpx;
-}
-.ml-26.data-v-41854f8b {
- margin-left: 48.75rpx;
-}
-.mt-26.data-v-41854f8b {
- margin-top: 48.75rpx;
-}
-.ml-28.data-v-41854f8b {
- margin-left: 52.5rpx;
-}
-.mt-28.data-v-41854f8b {
- margin-top: 52.5rpx;
-}
-.ml-30.data-v-41854f8b {
- margin-left: 56.25rpx;
-}
-.mt-30.data-v-41854f8b {
- margin-top: 56.25rpx;
-}
-.ml-32.data-v-41854f8b {
- margin-left: 60rpx;
-}
-.mt-32.data-v-41854f8b {
- margin-top: 60rpx;
-}
-.ml-34.data-v-41854f8b {
- margin-left: 63.75rpx;
-}
-.mt-34.data-v-41854f8b {
- margin-top: 63.75rpx;
-}
-.ml-36.data-v-41854f8b {
- margin-left: 67.5rpx;
-}
-.mt-36.data-v-41854f8b {
- margin-top: 67.5rpx;
-}
-.ml-38.data-v-41854f8b {
- margin-left: 71.25rpx;
-}
-.mt-38.data-v-41854f8b {
- margin-top: 71.25rpx;
-}
-.ml-40.data-v-41854f8b {
- margin-left: 75rpx;
-}
-.mt-40.data-v-41854f8b {
- margin-top: 75rpx;
-}
-.ml-42.data-v-41854f8b {
- margin-left: 78.75rpx;
-}
-.mt-42.data-v-41854f8b {
- margin-top: 78.75rpx;
-}
-.ml-44.data-v-41854f8b {
- margin-left: 82.5rpx;
-}
-.mt-44.data-v-41854f8b {
- margin-top: 82.5rpx;
-}
-.ml-46.data-v-41854f8b {
- margin-left: 86.25rpx;
-}
-.mt-46.data-v-41854f8b {
- margin-top: 86.25rpx;
-}
-.ml-48.data-v-41854f8b {
- margin-left: 90rpx;
-}
-.mt-48.data-v-41854f8b {
- margin-top: 90rpx;
-}
-.ml-50.data-v-41854f8b {
- margin-left: 93.75rpx;
-}
-.mt-50.data-v-41854f8b {
- margin-top: 93.75rpx;
-}
-.ml-52.data-v-41854f8b {
- margin-left: 97.5rpx;
-}
-.mt-52.data-v-41854f8b {
- margin-top: 97.5rpx;
-}
-.ml-54.data-v-41854f8b {
- margin-left: 101.25rpx;
-}
-.mt-54.data-v-41854f8b {
- margin-top: 101.25rpx;
-}
-.ml-56.data-v-41854f8b {
- margin-left: 105rpx;
-}
-.mt-56.data-v-41854f8b {
- margin-top: 105rpx;
-}
-.ml-58.data-v-41854f8b {
- margin-left: 108.75rpx;
-}
-.mt-58.data-v-41854f8b {
- margin-top: 108.75rpx;
-}
-.ml-60.data-v-41854f8b {
- margin-left: 112.5rpx;
-}
-.mt-60.data-v-41854f8b {
- margin-top: 112.5rpx;
-}
-.ml-62.data-v-41854f8b {
- margin-left: 116.25rpx;
-}
-.mt-62.data-v-41854f8b {
- margin-top: 116.25rpx;
-}
-.ml-64.data-v-41854f8b {
- margin-left: 120rpx;
-}
-.mt-64.data-v-41854f8b {
- margin-top: 120rpx;
-}
-.ml-66.data-v-41854f8b {
- margin-left: 123.75rpx;
-}
-.mt-66.data-v-41854f8b {
- margin-top: 123.75rpx;
-}
-.ml-68.data-v-41854f8b {
- margin-left: 127.5rpx;
-}
-.mt-68.data-v-41854f8b {
- margin-top: 127.5rpx;
-}
-.ml-70.data-v-41854f8b {
- margin-left: 131.25rpx;
-}
-.mt-70.data-v-41854f8b {
- margin-top: 131.25rpx;
-}
-.ml-72.data-v-41854f8b {
- margin-left: 135rpx;
-}
-.mt-72.data-v-41854f8b {
- margin-top: 135rpx;
-}
-.ml-74.data-v-41854f8b {
- margin-left: 138.75rpx;
-}
-.mt-74.data-v-41854f8b {
- margin-top: 138.75rpx;
-}
-.ml-76.data-v-41854f8b {
- margin-left: 142.5rpx;
-}
-.mt-76.data-v-41854f8b {
- margin-top: 142.5rpx;
-}
-.ml-78.data-v-41854f8b {
- margin-left: 146.25rpx;
-}
-.mt-78.data-v-41854f8b {
- margin-top: 146.25rpx;
-}
-.ml-80.data-v-41854f8b {
- margin-left: 150rpx;
-}
-.mt-80.data-v-41854f8b {
- margin-top: 150rpx;
-}
-.ml-82.data-v-41854f8b {
- margin-left: 153.75rpx;
-}
-.mt-82.data-v-41854f8b {
- margin-top: 153.75rpx;
-}
-.ml-84.data-v-41854f8b {
- margin-left: 157.5rpx;
-}
-.mt-84.data-v-41854f8b {
- margin-top: 157.5rpx;
-}
-.ml-86.data-v-41854f8b {
- margin-left: 161.25rpx;
-}
-.mt-86.data-v-41854f8b {
- margin-top: 161.25rpx;
-}
-.ml-88.data-v-41854f8b {
- margin-left: 165rpx;
-}
-.mt-88.data-v-41854f8b {
- margin-top: 165rpx;
-}
-.ml-90.data-v-41854f8b {
- margin-left: 168.75rpx;
-}
-.mt-90.data-v-41854f8b {
- margin-top: 168.75rpx;
-}
-.ml-92.data-v-41854f8b {
- margin-left: 172.5rpx;
-}
-.mt-92.data-v-41854f8b {
- margin-top: 172.5rpx;
-}
-.ml-94.data-v-41854f8b {
- margin-left: 176.25rpx;
-}
-.mt-94.data-v-41854f8b {
- margin-top: 176.25rpx;
-}
-.ml-96.data-v-41854f8b {
- margin-left: 180rpx;
-}
-.mt-96.data-v-41854f8b {
- margin-top: 180rpx;
-}
-.ml-98.data-v-41854f8b {
- margin-left: 183.75rpx;
-}
-.mt-98.data-v-41854f8b {
- margin-top: 183.75rpx;
-}
-.ml-100.data-v-41854f8b {
- margin-left: 187.5rpx;
-}
-.mt-100.data-v-41854f8b {
- margin-top: 187.5rpx;
-}
-.ml-13.data-v-41854f8b {
- margin-left: 24.38rpx;
-}
-.ml-9.data-v-41854f8b {
- margin-left: 16.88rpx;
-}
-.mt-7.data-v-41854f8b {
- margin-top: 13.13rpx;
-}
-.mt-13.data-v-41854f8b {
- margin-top: 24.38rpx;
-}
-.ml-21.data-v-41854f8b {
- margin-left: 39.38rpx;
-}
-.page.data-v-41854f8b {
- background-color: #fbf2e3;
- height: 100%;
- border-left: solid 1.88rpx #000000;
- border-right: solid 1.88rpx #000000;
- border-top: solid 1.88rpx #000000;
- border-bottom: solid 1.88rpx #000000;
- width: 100%;
- overflow-y: auto;
- overflow-x: hidden;
-}
-.section.data-v-41854f8b {
- padding: 105rpx 0 307.5rpx;
- background-image: url("https://ide.code.fun/api/image?token=6708b7af1511d900114a2edd&name=474410b7e0698835f71f490efeafcfeb.png");
- background-size: 100% 100%;
- background-repeat: no-repeat;
-}
-.text.data-v-41854f8b {
- margin-right: 48.75rpx;
- color: transparent;
- font-size: 60rpx;
- font-family: STZhongsong;
- line-height: 57.36rpx;
- background-image: linear-gradient(90deg, #ffe3a5 0%, #fff4dc 50%, #ffe3a5 100%);
- -webkit-background-clip: text;
-}
-.image.data-v-41854f8b {
- width: 286.88rpx;
- height: 234.38rpx;
-}
-.pos.data-v-41854f8b {
- position: absolute;
- right: 37.5rpx;
- bottom: 105rpx;
-}
-.section_2.data-v-41854f8b {
- margin-top: -65.63rpx;
- padding: 18.75rpx 7.5rpx 48.75rpx 13.13rpx;
- background-color: #fff9ed;
- border-radius: 37.5rpx 37.5rpx 0 0;
-}
-.font.data-v-41854f8b {
- font-size: 45rpx;
- font-family: STZhongsong;
- line-height: 41.98rpx;
- color: transparent;
-}
-.section_4.data-v-41854f8b {
- padding: 15rpx 30rpx;
- background-image: url("https://ide.code.fun/api/image?token=6708b7af1511d900114a2edd&name=d2d686bc17d9d76e7b320e5a4ea70952.png");
- background-size: 100% 100%;
- background-repeat: no-repeat;
-}
-.font_2.data-v-41854f8b {
- font-size: 30rpx;
- font-family: Inter;
- line-height: 28.29rpx;
- font-weight: 700;
- color: #5c1416;
-}
-.text_5.data-v-41854f8b {
- margin-left: 78.75rpx;
- line-height: 28.56rpx;
-}
-.image_2.data-v-41854f8b {
- width: 86.25rpx;
- height: 86.25rpx;
-}
-.section_3.data-v-41854f8b {
- padding: 15rpx 26.25rpx;
- background-image: url("https://ide.code.fun/api/image?token=6708b7af1511d900114a2edd&name=aa376a23521cc37d71891264189a3902.png");
- background-size: 100% 100%;
- background-repeat: no-repeat;
- width: 371.25rpx;
-}
-.pos_2.data-v-41854f8b {
- position: absolute;
- left: 0;
- top: 0;
-}
-.text_4.data-v-41854f8b {
- line-height: 28.31rpx;
-}
-.group.data-v-41854f8b {
- padding: 0 30rpx;
-}
-.group_2.data-v-41854f8b {
- padding: 0 7.5rpx;
-}
-.font_3.data-v-41854f8b {
- font-size: 45rpx;
- font-family: Open Sans;
- line-height: 41.98rpx;
- color: transparent;
-}
-.text_2.data-v-41854f8b {
- background-image: linear-gradient(270deg, #7e0d11 0%, #a54747 50%, #7e0d11 100%);
- -webkit-background-clip: text;
- text-shadow: 3.75rpx 3.75rpx 3.75rpx #00000040;
-}
-.text_3.data-v-41854f8b {
- margin-left: 26.25rpx;
-}
-.text_6.data-v-41854f8b {
- line-height: 41.49rpx;
-}
-.group_3.data-v-41854f8b {
- margin-top: 18.75rpx;
-}
-.font_4.data-v-41854f8b {
- font-size: 30rpx;
- font-family: Open Sans;
- line-height: 28.29rpx;
- font-weight: 700;
- color: #9a714d;
-}
-.image_3.data-v-41854f8b {
- width: 30rpx;
- height: 30rpx;
-}
-.equal-division.data-v-41854f8b {
- margin: 28.13rpx 30rpx 0 7.5rpx;
-}
-.section_5.data-v-41854f8b {
- flex: 1 1 200.63rpx;
-}
-.equal-division-item.data-v-41854f8b {
- padding: 11.25rpx 7.5rpx 33.75rpx 15rpx;
- background-color: #fffef8;
- border-radius: 9.38rpx;
- height: 268.13rpx;
- border-left: solid 1.88rpx #ac8d5d;
- border-right: solid 1.88rpx #ac8d5d;
- border-top: solid 1.88rpx #ac8d5d;
- border-bottom: solid 1.88rpx #ac8d5d;
-}
-.image_4.data-v-41854f8b {
- border-radius: 9.38rpx;
- width: 159.99rpx;
- height: 159.99rpx;
-}
-.font_5.data-v-41854f8b {
- font-size: 26.25rpx;
- font-family: Open Sans;
- line-height: 26.16rpx;
- color: #000000;
-}
-.text_7.data-v-41854f8b {
- font-size: 28.13rpx;
-}
-.font_6.data-v-41854f8b {
- font-size: 26.25rpx;
- font-family: STFangsong;
- line-height: 18rpx;
- color: #ff0000;
-}
-.text_8.data-v-41854f8b {
- -webkit-text-stroke: 1.88rpx #ff000040;
-}
-.view.data-v-41854f8b {
- margin-top: 41.25rpx;
-}
-.text_9.data-v-41854f8b {
- line-height: 41.53rpx;
-}
-.equal-division_2.data-v-41854f8b {
- margin: 24.38rpx 30rpx 0 7.5rpx;
-}
-.group_4.data-v-41854f8b {
- margin-top: 30rpx;
-}
-.text_10.data-v-41854f8b {
- line-height: 42.75rpx;
-}
-.group_5.data-v-41854f8b {
- margin-right: 11.25rpx;
-}
-.list.data-v-41854f8b {
- margin: 0 30rpx;
- padding: 5.63rpx 0 39.38rpx;
- background-color: #f7e7c6;
- border-radius: 18.75rpx;
-}
-.list-item.data-v-41854f8b {
- padding: 31.88rpx 30rpx 16.88rpx;
-}
-.text_11.data-v-41854f8b {
- line-height: 24.39rpx;
-}
-.font_7.data-v-41854f8b {
- font-size: 22.5rpx;
- font-family: Open Sans;
- line-height: 20.89rpx;
- color: #6c6c6c;
-}
-.text_12.data-v-41854f8b {
- margin-left: 7.5rpx;
-}
-.font_8.data-v-41854f8b {
- font-size: 22.5rpx;
- font-family: Open Sans;
- line-height: 18rpx;
- color: #6c6c6c;
-}
-.text_13.data-v-41854f8b {
- margin-left: 7.5rpx;
- line-height: 16.54rpx;
-}
-.image_5.data-v-41854f8b {
- width: 178.13rpx;
- height: 127.5rpx;
-}
\ No newline at end of file
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 962eb4e..8e6322d 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/main/main.wxss b/unpackage/dist/dev/mp-weixin/pages/mine/main/main.wxss
index 81dcea0..9b022bb 100644
--- a/unpackage/dist/dev/mp-weixin/pages/mine/main/main.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/mine/main/main.wxss
@@ -401,39 +401,37 @@ text.data-v-8172b2ba {
.mt-100.data-v-8172b2ba {
margin-top: 187.5rpx;
}
-.mt-45.data-v-8172b2ba {
- margin-top: 84.38rpx;
-}
-.ml-17.data-v-8172b2ba {
- margin-left: 31.88rpx;
+.mt-37.data-v-8172b2ba {
+ margin-top: 69.38rpx;
}
.ml-5.data-v-8172b2ba {
margin-left: 9.38rpx;
}
-.mt-27.data-v-8172b2ba {
- margin-top: 50.63rpx;
-}
-.ml-7.data-v-8172b2ba {
- margin-left: 13.13rpx;
+.mt-5.data-v-8172b2ba {
+ margin-top: 9.38rpx;
}
.page.data-v-8172b2ba {
- padding: 78.75rpx 9.38rpx 675rpx;
- background-color: #fff9ed;
+ padding-bottom: 564.38rpx;
+ background-color: #ffffff;
+ height: 100%;
width: 100%;
overflow-y: auto;
overflow-x: hidden;
- height: 100%;
}
-.group.data-v-8172b2ba {
- padding: 0 20.63rpx;
+.section.data-v-8172b2ba {
+ padding: 213.75rpx 0 105rpx;
+ background-image: url("https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=608ce961205c6b6c4a5f231d50bcfd3e.png");
+ background-size: 100% 100%;
+ background-repeat: no-repeat;
}
.image.data-v-8172b2ba {
border-radius: 50%;
width: 150rpx;
height: 151.88rpx;
}
-.group_2.data-v-8172b2ba {
- margin-left: 33.75rpx;
+.group.data-v-8172b2ba {
+ margin-left: 34.67rpx;
+ margin-top: 32.06rpx;
}
.text.data-v-8172b2ba {
color: #000000;
@@ -443,9 +441,9 @@ text.data-v-8172b2ba {
}
.text-wrapper.data-v-8172b2ba {
padding: 23.34rpx 0 23.85rpx;
- background-color: #ffbe74;
+ background-color: #fbdab4;
border-radius: 18.75rpx;
- width: 221.25rpx;
+ width: 222.34rpx;
}
.font.data-v-8172b2ba {
font-size: 26.25rpx;
@@ -458,68 +456,62 @@ text.data-v-8172b2ba {
line-height: 25.93rpx;
}
.text-wrapper_2.data-v-8172b2ba {
- margin-left: 24.38rpx;
+ margin-left: 24.49rpx;
+ margin-top: 78.75rpx;
padding: 23.27rpx 0 23.85rpx;
- background-color: #ffbe74;
+ background-color: #ffdab1;
border-radius: 18.75rpx;
- width: 221.25rpx;
+ width: 222.34rpx;
height: 73.13rpx;
}
.text_3.data-v-8172b2ba {
font-size: 28.13rpx;
line-height: 26.03rpx;
}
+.group_2.data-v-8172b2ba {
+ margin-top: -48.75rpx;
+ padding-left: 26.25rpx;
+ padding-right: 26.23rpx;
+}
.equal-division.data-v-8172b2ba {
- margin-right: 3.77rpx;
+ padding: 14.38rpx 18.92rpx 31.05rpx;
+ background-color: #fff1e2;
+ border-radius: 9.38rpx;
}
-.section.data-v-8172b2ba {
- flex: 1 1 120rpx;
+.group_3.data-v-8172b2ba {
+ flex: 1 1 131.93rpx;
}
-.section_1.data-v-8172b2ba {
- padding: 5.44rpx 0 20.42rpx;
- background-color: #fffef8;
- border-radius: 18.75rpx;
- height: 146.25rpx;
+.group_1.data-v-8172b2ba {
+ padding: 9.99rpx 0 9.99rpx;
}
.image_2.data-v-8172b2ba {
- width: 96rpx;
- height: 96rpx;
+ width: 95.63rpx;
+ height: 95.63rpx;
}
.text_4.data-v-8172b2ba {
line-height: 24.07rpx;
}
-.section_6.data-v-8172b2ba {
- padding: 5.44rpx 0 20.34rpx;
- background-color: #fffef8;
- border-radius: 18.75rpx;
- height: 146.25rpx;
-}
-.text_1.data-v-8172b2ba {
- line-height: 24.23rpx;
-}
-.equal-division-item_2.data-v-8172b2ba {
- padding: 5.44rpx 0 20.32rpx;
- background-color: #fffef8;
- border-radius: 18.75rpx;
- height: 146.25rpx;
-}
-.section_3.data-v-8172b2ba {
- padding: 5.44rpx 0 20.51rpx 10.22rpx;
- background-color: #fffef8;
- border-radius: 18.75rpx;
- height: 146.25rpx;
+.group_4.data-v-8172b2ba {
+ padding: 9.99rpx 0 11.79rpx;
}
.text_9.data-v-8172b2ba {
+ line-height: 24.23rpx;
+}
+.group_5.data-v-8172b2ba {
+ padding: 9.99rpx 0 11.76rpx;
+}
+.group_6.data-v-8172b2ba {
+ padding: 9.99rpx 6.64rpx 11.76rpx 29.66rpx;
+}
+.group_7.data-v-8172b2ba {
+ padding: 10.01rpx 0 11.94rpx;
+}
+.text_1.data-v-8172b2ba {
font-size: 24.38rpx;
line-height: 22.52rpx;
}
-.list.data-v-8172b2ba {
- padding-left: 22.5rpx;
- padding-right: 16.88rpx;
-}
-.section_4.data-v-8172b2ba {
- margin-right: 5.63rpx;
- padding: 22.5rpx 26.27rpx;
+.section_2.data-v-8172b2ba {
+ padding: 22.5rpx 26.61rpx;
background-color: #fffef8;
border-radius: 18.75rpx;
}
@@ -534,22 +526,44 @@ text.data-v-8172b2ba {
color: #000000;
}
.image_4.data-v-8172b2ba {
- margin-right: 5.61rpx;
width: 48.75rpx;
height: 48.75rpx;
}
+.image_5.data-v-8172b2ba {
+ margin-right: 6.38rpx;
+}
+.list-divider.data-v-8172b2ba {
+ background-color: #0000002e;
+ height: 1.89rpx;
+}
+.section_4.data-v-8172b2ba {
+ padding: 22.95rpx 26.61rpx 22.05rpx;
+ background-color: #fffef8;
+ border-radius: 18.75rpx;
+}
.text_5.data-v-8172b2ba {
line-height: 27.86rpx;
}
-.section_2.data-v-8172b2ba {
- margin-left: 5.63rpx;
- padding: 22.5rpx 20.63rpx;
+.image_6.data-v-8172b2ba {
+ margin-right: 6.38rpx;
+ width: 48.75rpx;
+ height: 50.63rpx;
+}
+.list-item_2.data-v-8172b2ba {
+ padding: 22.5rpx 32.98rpx 22.5rpx 79.22rpx;
background-color: #fffef8;
border-radius: 18.75rpx;
}
.text_6.data-v-8172b2ba {
line-height: 27.11rpx;
}
-.image_5.data-v-8172b2ba {
- margin-right: 11.27rpx;
+.image_7.data-v-8172b2ba {
+ filter: drop-shadow(0rpx 7.5rpx 3.75rpx #00000040);
+ width: 43.13rpx;
+ height: 43.13rpx;
+}
+.pos.data-v-8172b2ba {
+ position: absolute;
+ left: 39.38rpx;
+ top: 5.63rpx;
}
\ No newline at end of file
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 b891cf0..227aa2d 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
@@ -78,7 +78,7 @@ const _sfc_main = {
]);
const tap = () => {
common_vendor.index.navigateTo({
- url: "../../../pages/order/product-close/product-close"
+ url: "../../../pages/Shopping-cart/ProductDetails/ProductDetails"
});
};
return (_ctx, _cache) => {