diff --git a/pages.json b/pages.json
index 51c7a62..12757b3 100644
--- a/pages.json
+++ b/pages.json
@@ -1,5 +1,6 @@
{
"pages": [
+
{
"path" : "pages/home/home",
"style" :
@@ -64,13 +65,7 @@
"navigationBarTitleText" : ""
}
},
- {
- "path" : "pages/Shopping-cart/ReceivingInformation/ReceivingInformation",
- "style" :
- {
- "navigationBarTitleText" : ""
- }
- },
+
{
"path" : "pages/Shopping-cart/Contact/Contact",
"style" :
@@ -130,6 +125,13 @@
{
"navigationBarTitleText" : ""
}
+ },
+ {
+ "path" : "pages/Shopping-cart/ReceivingInformation/ReceivingInformation",
+ "style" :
+ {
+ "navigationBarTitleText" : ""
+ }
}
],
"globalStyle": {
diff --git a/pages/Shopping-cart/ReceivingInformation/ReceivingInformation.vue b/pages/Shopping-cart/ReceivingInformation/ReceivingInformation.vue
index b934a16..a2e073c 100644
--- a/pages/Shopping-cart/ReceivingInformation/ReceivingInformation.vue
+++ b/pages/Shopping-cart/ReceivingInformation/ReceivingInformation.vue
@@ -1,203 +1,173 @@
-
-
- 收货信息
-
-
- 收货人
-
- 请输入姓名
-
-
-
- 手机号码
-
- 15888610253
-
-
-
- 所在地区
-
-
- 黑龙江/哈尔滨/呼兰区
-
-
-
-
-
- 详细地址
-
- 利民开发区学院路288号哈尔滨华德
- 学院
-
-
-
- 设为默认收货地址
-
-
-
-
-
- 保存并使用
-
-
+
+
+ 收货信息
+
+
+ 收货人
+
+
+
+ 手机号码
+
+
+
+ 所在地区
+
+
+
+
+
+
+ 详细地址
+
+
+
+ 设为默认收货地址
+
+
+
+
+
+ 保存并使用
+
+
\ No newline at end of file
diff --git a/pages/Shopping-cart/productmain/productmain.vue b/pages/Shopping-cart/productmain/productmain.vue
index cc07817..eace0a9 100644
--- a/pages/Shopping-cart/productmain/productmain.vue
+++ b/pages/Shopping-cart/productmain/productmain.vue
@@ -10,50 +10,50 @@
-
+
-
- 非遗绒花
- 【材料包】
+
+ {{ item.product_name }}
+ 【{{ item.product_type }}】
- 已选种类:紫色
+ 已选种类:{{ item.selected_style }}
- 138.
+ {{ item.product_price }}
- 00
+ .00
- 1
+ {{ item.product_num }}
@@ -64,7 +64,7 @@
全选
@@ -77,24 +77,99 @@
import {
ref
} from 'vue'
-
+ import product_img from '@/pages/Shopping-cart/productmain/img/productimg.png';
+ import add from '@/pages/Shopping-cart/productmain/img/add.png';
+ import choose from '@/pages/Shopping-cart/productmain/img/choose.png';
+ import choosed from '@/pages/Shopping-cart/productmain/img/choosed.png';
+ import pull from '@/pages/Shopping-cart/productmain/img/pull.png';
+ import rmb from '@/pages/Shopping-cart/productmain/img/rmb.png';
+ import short from '@/pages/Shopping-cart/productmain/img/short.png';
const items = ref([null, null, null, null, null, null, null])
-
- // const products = ref([
- // {
- // "product_name" : "非遗绒花",
- // "product_type" : "材料包",
- // "selected_style" : "紫色",
- // "product_num" : 1,
- // "product_price" : 138,
- // "product_img" : product_img,
- // "pull_img" : pull_img,
- // "select_img" : select_img,
- // "rmb_img" : rmb_img,
- // "min_img" : min_img,
- // "add_img" : add_img
- // }
- // ])
+ const products = ref([
+ {
+ "product_name" : "非遗绒花",
+ "product_type" : "材料包",
+ "selected_style" : "紫色",
+ "product_num" : 1,
+ "product_price" : 138,
+ "product_img" : product_img,
+ "pull_img" : pull,
+ "select_img" : choose,
+ "rmb_img" : rmb,
+ "min_img" : short,
+ "add_img" : add
+ },
+ {
+ "product_name" : "非遗绒花",
+ "product_type" : "材料包",
+ "selected_style" : "紫色",
+ "product_num" : 1,
+ "product_price" : 138,
+ "product_img" : product_img,
+ "pull_img" : pull,
+ "select_img" : choose,
+ "rmb_img" : rmb,
+ "min_img" : short,
+ "add_img" : add
+ },
+ {
+ "product_name" : "非遗绒花",
+ "product_type" : "材料包",
+ "selected_style" : "紫色",
+ "product_num" : 1,
+ "product_price" : 138,
+ "product_img" : product_img,
+ "pull_img" : pull,
+ "select_img" : choose,
+ "rmb_img" : rmb,
+ "min_img" : short,
+ "add_img" : add
+ },
+ {
+ "product_name" : "非遗绒花",
+ "product_type" : "材料包",
+ "selected_style" : "紫色",
+ "product_num" : 1,
+ "product_price" : 138,
+ "product_img" : product_img,
+ "pull_img" : pull,
+ "select_img" : choose,
+ "rmb_img" : rmb,
+ "min_img" : short,
+ "add_img" : add
+ },
+ {
+ "product_name" : "非遗绒花",
+ "product_type" : "材料包",
+ "selected_style" : "紫色",
+ "product_num" : 1,
+ "product_price" : 138,
+ "product_img" : product_img,
+ "pull_img" : pull,
+ "select_img" : choose,
+ "rmb_img" : rmb,
+ "min_img" : short,
+ "add_img" : add
+ },
+ {
+ "product_name" : "非遗绒花",
+ "product_type" : "材料包",
+ "selected_style" : "紫色",
+ "product_num" : 1,
+ "product_price" : 138,
+ "product_img" : product_img,
+ "pull_img" : pull,
+ "select_img" : choose,
+ "rmb_img" : rmb,
+ "min_img" : short,
+ "add_img" : add
+ }
+ ])
+ const jump_product =()=>{
+ uni.navigateTo({
+ url:'../../../pages/store-home/ProductDetails/ProductDetails'
+ })
+ }
\ No newline at end of file
diff --git a/pages/store-home/ProductDetails/img/denglong.png b/pages/store-home/ProductDetails/img/denglong.png
new file mode 100644
index 0000000..bcd82ea
Binary files /dev/null and b/pages/store-home/ProductDetails/img/denglong.png differ
diff --git a/pages/store-home/ProductDetails/img/haibao.png b/pages/store-home/ProductDetails/img/haibao.png
new file mode 100644
index 0000000..1a9c5df
Binary files /dev/null and b/pages/store-home/ProductDetails/img/haibao.png differ
diff --git a/pages/store-home/ProductDetails/img/kefu.png b/pages/store-home/ProductDetails/img/kefu.png
new file mode 100644
index 0000000..796f5d4
Binary files /dev/null and b/pages/store-home/ProductDetails/img/kefu.png differ
diff --git a/pages/store-home/ProductDetails/img/show1.png b/pages/store-home/ProductDetails/img/show1.png
new file mode 100644
index 0000000..ba0c2c1
Binary files /dev/null and b/pages/store-home/ProductDetails/img/show1.png differ
diff --git a/pages/store-home/ProductDetails/img/show2.png b/pages/store-home/ProductDetails/img/show2.png
new file mode 100644
index 0000000..57a61e7
Binary files /dev/null and b/pages/store-home/ProductDetails/img/show2.png differ
diff --git a/pages/store-home/ProductDetails/img/show3.png b/pages/store-home/ProductDetails/img/show3.png
new file mode 100644
index 0000000..7b6de73
Binary files /dev/null and b/pages/store-home/ProductDetails/img/show3.png differ
diff --git a/pages/store-home/ProductDetails/img/show4.png b/pages/store-home/ProductDetails/img/show4.png
new file mode 100644
index 0000000..b5b420d
Binary files /dev/null and b/pages/store-home/ProductDetails/img/show4.png differ
diff --git a/pages/store-home/ProductDetails/img/zhuye.png b/pages/store-home/ProductDetails/img/zhuye.png
new file mode 100644
index 0000000..343c6d1
Binary files /dev/null and b/pages/store-home/ProductDetails/img/zhuye.png differ
diff --git a/pages/store-home/main/img/sousuokuang.png b/pages/store-home/main/img/sousuokuang.png
index fa0b05e..6f9b05c 100644
Binary files a/pages/store-home/main/img/sousuokuang.png and b/pages/store-home/main/img/sousuokuang.png differ
diff --git a/pages/store-home/main/main.vue b/pages/store-home/main/main.vue
index 46cac24..ce89c98 100644
--- a/pages/store-home/main/main.vue
+++ b/pages/store-home/main/main.vue
@@ -4,7 +4,7 @@
商品
+ :src="sousuokuang" />
@@ -56,6 +56,7 @@
import img5 from '@/pages/store-home/main/img/jifenduihuan.png';
import product_img from '@/pages/store-home/main/img/shangpingtupian.png';
import add_img from '@/pages/store-home/main/img/tianjia.png';
+ import sousuokuang from '@/pages/store-home/main/img/sousuokuang.png';
const sort = ref([{
name: "材料包",
imgurl: img1
@@ -132,7 +133,7 @@
}]
const tap =()=> {
uni.navigateTo({
- url: '../../../pages/Shopping-cart/ProductDetails/ProductDetails'
+ url: '../../../pages/store-home/ProductDetails/ProductDetails'
})
}
diff --git a/unpackage/dist/dev/mp-weixin/app.js b/unpackage/dist/dev/mp-weixin/app.js
index 4f84a52..addf32e 100644
--- a/unpackage/dist/dev/mp-weixin/app.js
+++ b/unpackage/dist/dev/mp-weixin/app.js
@@ -11,7 +11,6 @@ if (!Math) {
"./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";
@@ -20,6 +19,7 @@ if (!Math) {
"./pages/booking/BillingOfFees/BillingOfFees.js";
"./pages/booking/ReservationInstructions/ReservationInstructions.js";
"./pages/booking/respectable/respectable.js";
+ "./pages/Shopping-cart/ReceivingInformation/ReceivingInformation.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 93c5a57..fcd9bb4 100644
--- a/unpackage/dist/dev/mp-weixin/app.json
+++ b/unpackage/dist/dev/mp-weixin/app.json
@@ -9,7 +9,6 @@
"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",
@@ -17,7 +16,8 @@
"pages/order/product-unpay/product-unpay",
"pages/booking/BillingOfFees/BillingOfFees",
"pages/booking/ReservationInstructions/ReservationInstructions",
- "pages/booking/respectable/respectable"
+ "pages/booking/respectable/respectable",
+ "pages/Shopping-cart/ReceivingInformation/ReceivingInformation"
],
"window": {
"navigationBarTextStyle": "black",
diff --git a/unpackage/dist/dev/mp-weixin/assets/add.c73b1e4b.png b/unpackage/dist/dev/mp-weixin/assets/add.c73b1e4b.png
new file mode 100644
index 0000000..7f1530a
Binary files /dev/null and b/unpackage/dist/dev/mp-weixin/assets/add.c73b1e4b.png differ
diff --git a/unpackage/dist/dev/mp-weixin/assets/choose.f501b5d4.png b/unpackage/dist/dev/mp-weixin/assets/choose.f501b5d4.png
new file mode 100644
index 0000000..5b700ad
Binary files /dev/null and b/unpackage/dist/dev/mp-weixin/assets/choose.f501b5d4.png differ
diff --git a/unpackage/dist/dev/mp-weixin/assets/choosed.ea32c69c.png b/unpackage/dist/dev/mp-weixin/assets/choosed.ea32c69c.png
new file mode 100644
index 0000000..8d36d1f
Binary files /dev/null and b/unpackage/dist/dev/mp-weixin/assets/choosed.ea32c69c.png differ
diff --git a/unpackage/dist/dev/mp-weixin/assets/denglong.a91d13af.png b/unpackage/dist/dev/mp-weixin/assets/denglong.a91d13af.png
new file mode 100644
index 0000000..bcd82ea
Binary files /dev/null and b/unpackage/dist/dev/mp-weixin/assets/denglong.a91d13af.png differ
diff --git a/unpackage/dist/dev/mp-weixin/assets/haibao.2883ea9c.png b/unpackage/dist/dev/mp-weixin/assets/haibao.2883ea9c.png
new file mode 100644
index 0000000..1a9c5df
Binary files /dev/null and b/unpackage/dist/dev/mp-weixin/assets/haibao.2883ea9c.png differ
diff --git a/unpackage/dist/dev/mp-weixin/assets/kefu.eef0848c.png b/unpackage/dist/dev/mp-weixin/assets/kefu.eef0848c.png
new file mode 100644
index 0000000..796f5d4
Binary files /dev/null and b/unpackage/dist/dev/mp-weixin/assets/kefu.eef0848c.png differ
diff --git a/unpackage/dist/dev/mp-weixin/assets/productimg.a8fe2d32.png b/unpackage/dist/dev/mp-weixin/assets/productimg.a8fe2d32.png
new file mode 100644
index 0000000..1ddfcae
Binary files /dev/null and b/unpackage/dist/dev/mp-weixin/assets/productimg.a8fe2d32.png differ
diff --git a/unpackage/dist/dev/mp-weixin/assets/pull.902be841.png b/unpackage/dist/dev/mp-weixin/assets/pull.902be841.png
new file mode 100644
index 0000000..b4410ee
Binary files /dev/null and b/unpackage/dist/dev/mp-weixin/assets/pull.902be841.png differ
diff --git a/unpackage/dist/dev/mp-weixin/assets/rmb.6e85dd4a.png b/unpackage/dist/dev/mp-weixin/assets/rmb.6e85dd4a.png
new file mode 100644
index 0000000..cc3c40f
Binary files /dev/null and b/unpackage/dist/dev/mp-weixin/assets/rmb.6e85dd4a.png differ
diff --git a/unpackage/dist/dev/mp-weixin/assets/short.2191a0bf.png b/unpackage/dist/dev/mp-weixin/assets/short.2191a0bf.png
new file mode 100644
index 0000000..4db3f01
Binary files /dev/null and b/unpackage/dist/dev/mp-weixin/assets/short.2191a0bf.png differ
diff --git a/unpackage/dist/dev/mp-weixin/assets/show1.6119e6ca.png b/unpackage/dist/dev/mp-weixin/assets/show1.6119e6ca.png
new file mode 100644
index 0000000..ba0c2c1
Binary files /dev/null and b/unpackage/dist/dev/mp-weixin/assets/show1.6119e6ca.png differ
diff --git a/unpackage/dist/dev/mp-weixin/assets/show2.6ef01c5d.png b/unpackage/dist/dev/mp-weixin/assets/show2.6ef01c5d.png
new file mode 100644
index 0000000..57a61e7
Binary files /dev/null and b/unpackage/dist/dev/mp-weixin/assets/show2.6ef01c5d.png differ
diff --git a/unpackage/dist/dev/mp-weixin/assets/show3.4b906849.png b/unpackage/dist/dev/mp-weixin/assets/show3.4b906849.png
new file mode 100644
index 0000000..7b6de73
Binary files /dev/null and b/unpackage/dist/dev/mp-weixin/assets/show3.4b906849.png differ
diff --git a/unpackage/dist/dev/mp-weixin/assets/show4.00c949b6.png b/unpackage/dist/dev/mp-weixin/assets/show4.00c949b6.png
new file mode 100644
index 0000000..b5b420d
Binary files /dev/null and b/unpackage/dist/dev/mp-weixin/assets/show4.00c949b6.png differ
diff --git a/unpackage/dist/dev/mp-weixin/assets/sousuokuang.6160c4c7.png b/unpackage/dist/dev/mp-weixin/assets/sousuokuang.6160c4c7.png
new file mode 100644
index 0000000..6f9b05c
Binary files /dev/null and b/unpackage/dist/dev/mp-weixin/assets/sousuokuang.6160c4c7.png differ
diff --git a/unpackage/dist/dev/mp-weixin/assets/zhuye.8d1ff27e.png b/unpackage/dist/dev/mp-weixin/assets/zhuye.8d1ff27e.png
new file mode 100644
index 0000000..343c6d1
Binary files /dev/null and b/unpackage/dist/dev/mp-weixin/assets/zhuye.8d1ff27e.png differ
diff --git a/unpackage/dist/dev/mp-weixin/common/assets.js b/unpackage/dist/dev/mp-weixin/common/assets.js
index 1698f81..a6bdfd7 100644
--- a/unpackage/dist/dev/mp-weixin/common/assets.js
+++ b/unpackage/dist/dev/mp-weixin/common/assets.js
@@ -3,23 +3,71 @@ 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 you$1 = "/assets/you.60391a00.png";
const img1 = "/assets/cailiaobao.52f9097b.png";
const img2 = "/assets/shouchiwu.37cdee46.png";
const img3 = "/assets/toushi.6558cc23.png";
const img4 = "/assets/dingzhi.d6614f9f.png";
const img5 = "/assets/jifenduihuan.a1c23524.png";
-const product_img = "/assets/shangpingtupian.ec8c0440.png";
+const product_img$1 = "/assets/shangpingtupian.ec8c0440.png";
const add_img = "/assets/tianjia.187834c9.png";
+const sousuokuang = "/assets/sousuokuang.6160c4c7.png";
+const address = "/assets/address.e91cc3a1.png";
+const avator = "/assets/avator.7ac17437.png";
+const daifahuo = "/assets/daifahuo.8369326b.png";
+const daishouhuo = "/assets/daishouhuo.ff694766.png";
+const dingdan = "/assets/dingdan.6b4043d6.png";
+const lianxiren_s = "/assets/lianxiren_s.17e4954c.png";
+const qianbao = "/assets/qianbao.bbfd6c3d.png";
+const setting_s = "/assets/setting_s.3e5c5149.png";
+const tuikuan = "/assets/tuikuan.d34aac5f.png";
+const you = "/assets/you.70a370f0.png";
+const product_img = "/assets/productimg.a8fe2d32.png";
+const add = "/assets/add.c73b1e4b.png";
+const choose = "/assets/choose.f501b5d4.png";
+const pull = "/assets/pull.902be841.png";
+const rmb = "/assets/rmb.6e85dd4a.png";
+const short = "/assets/short.2191a0bf.png";
+const denglong = "/assets/denglong.a91d13af.png";
+const kefu = "/assets/kefu.eef0848c.png";
+const show1 = "/assets/show1.6119e6ca.png";
+const show2 = "/assets/show2.6ef01c5d.png";
+const show3 = "/assets/show3.4b906849.png";
+const show4 = "/assets/show4.00c949b6.png";
+const zhuye = "/assets/zhuye.8d1ff27e.png";
+exports.add = add;
exports.add_img = add_img;
+exports.address = address;
+exports.avator = avator;
+exports.choose = choose;
+exports.daifahuo = daifahuo;
+exports.daishouhuo = daishouhuo;
+exports.denglong = denglong;
+exports.dingdan = dingdan;
exports.img1 = img1;
exports.img2 = img2;
exports.img3 = img3;
exports.img4 = img4;
exports.img5 = img5;
+exports.kefu = kefu;
+exports.lianxiren_s = lianxiren_s;
exports.product = product;
-exports.product_img = product_img;
+exports.product_img = product_img$1;
+exports.product_img$1 = product_img;
+exports.pull = pull;
+exports.qianbao = qianbao;
exports.rili = rili;
+exports.rmb = rmb;
+exports.setting_s = setting_s;
exports.shizi = shizi;
+exports.short = short;
+exports.show1 = show1;
+exports.show2 = show2;
+exports.show3 = show3;
+exports.show4 = show4;
+exports.sousuokuang = sousuokuang;
+exports.tuikuan = tuikuan;
exports.xuanchuan = xuanchuan;
-exports.you = you;
+exports.you = you$1;
+exports.you$1 = you;
+exports.zhuye = zhuye;
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/ReceivingInformation/ReceivingInformation.wxml b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/ReceivingInformation/ReceivingInformation.wxml
index cffaf28..64a6a41 100644
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/ReceivingInformation/ReceivingInformation.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/ReceivingInformation/ReceivingInformation.wxml
@@ -1 +1 @@
-收货信息收货人请输入姓名手机号码15888610253所在地区黑龙江/哈尔滨/呼兰区详细地址利民开发区学院路288号哈尔滨华德学院设为默认收货地址保存并使用
\ No newline at end of file
+收货信息收货人手机号码所在地区详细地址设为默认收货地址保存并使用
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/ReceivingInformation/ReceivingInformation.wxss b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/ReceivingInformation/ReceivingInformation.wxss
index b574737..a61b091 100644
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/ReceivingInformation/ReceivingInformation.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/ReceivingInformation/ReceivingInformation.wxss
@@ -402,102 +402,82 @@ text.data-v-d09999e9 {
margin-top: 187.5rpx;
}
.mt-15.data-v-d09999e9 {
- margin-top: 28.63rpx;
+ margin-top: 28.13rpx;
}
.ml-27.data-v-d09999e9 {
- margin-left: 51.53rpx;
+ margin-left: 50.63rpx;
}
.ml-13.data-v-d09999e9 {
- margin-left: 24.81rpx;
+ margin-left: 24.38rpx;
}
.mt-462.data-v-d09999e9 {
- margin-top: 881.68rpx;
+ margin-top: 866.25rpx;
}
.page.data-v-d09999e9 {
- padding-top: 26.72rpx;
+ padding-top: 26.44rpx;
background-color: #fffaf0;
width: 100%;
overflow-y: auto;
overflow-x: hidden;
- height: 100%;
+ height: 100vh;
+ overflow: hidden;
}
.group.data-v-d09999e9 {
- padding: 0 20.99rpx;
+ padding: 0 23.4rpx;
}
-.font.data-v-d09999e9 {
- font-size: 26.72rpx;
+.font_2.data-v-d09999e9 {
+ font-size: 26.25rpx;
font-family: Open Sans;
- line-height: 24.77rpx;
+ line-height: 24.34rpx;
color: #323232;
}
.text.data-v-d09999e9 {
- line-height: 24.92rpx;
+ line-height: 24.49rpx;
}
.section.data-v-d09999e9 {
- margin-right: 9.54rpx;
- padding-left: 26.72rpx;
- padding-right: 11.45rpx;
+ margin-left: 2.85rpx;
+ margin-right: 14.1rpx;
+ padding-left: 20.49rpx;
+ padding-right: 15.13rpx;
background-color: #fffef8;
- border-radius: 9.54rpx;
- border-left: solid 1.91rpx #818181;
- border-right: solid 1.91rpx #818181;
- border-top: solid 1.91rpx #818181;
- border-bottom: solid 1.91rpx #818181;
+ border-radius: 9.38rpx;
+ border: solid 1.88rpx #818181;
}
.group_2.data-v-d09999e9 {
- padding: 22.9rpx 3.82rpx 11.45rpx;
- border-bottom: solid 1.91rpx #efefef;
+ padding: 24.24rpx 4.65rpx 12.19rpx;
+ border-bottom: solid 1.88rpx #efefef;
}
.text-wrapper.data-v-d09999e9 {
- margin-right: 30.53rpx;
- padding: 11.45rpx 0;
- background-color: #fffef8;
- height: 45.8rpx;
-}
-.text_2.data-v-d09999e9 {
- margin-left: 15.27rpx;
- color: #acacac;
- line-height: 24.71rpx;
+ flex: 1 1 0;
+ margin-right: 29.1rpx;
}
.group_3.data-v-d09999e9 {
- padding: 15.27rpx 3.82rpx;
- border-bottom: solid 1.91rpx #efefef;
+ padding: 14.06rpx 5.04rpx 12.19rpx;
+ border-bottom: solid 1.88rpx #efefef;
}
.text_3.data-v-d09999e9 {
- line-height: 24.6rpx;
+ line-height: 24.17rpx;
}
.text-wrapper_2.data-v-d09999e9 {
- margin-right: 30.53rpx;
- padding: 15.27rpx 0;
- background-color: #fffef8;
- height: 45.8rpx;
-}
-.text_4.data-v-d09999e9 {
- margin-left: 19.08rpx;
- line-height: 19.64rpx;
+ flex: 1 1 0;
+ margin-right: 28.71rpx;
}
.group_4.data-v-d09999e9 {
- padding: 11.45rpx 3.82rpx;
- border-bottom: solid 1.91rpx #efefef;
+ padding: 12.19rpx 4.29rpx 10.31rpx;
+ border-bottom: solid 1.88rpx #efefef;
}
.text_5.data-v-d09999e9 {
- line-height: 24.64rpx;
+ line-height: 24.21rpx;
}
.group_5.data-v-d09999e9 {
- margin-right: 11.45rpx;
+ margin-right: 12.58rpx;
}
.text-wrapper_3.data-v-d09999e9 {
- margin-right: 17.18rpx;
- padding: 11.45rpx 0;
- background-color: #fffef8;
-}
-.text_6.data-v-d09999e9 {
- margin-left: 15.27rpx;
- line-height: 24.83rpx;
+ margin-right: 16.88rpx;
}
.image.data-v-d09999e9 {
- width: 49.62rpx;
- height: 49.62rpx;
+ width: 48.75rpx;
+ height: 48.75rpx;
}
.pos.data-v-d09999e9 {
position: absolute;
@@ -505,45 +485,44 @@ text.data-v-d09999e9 {
bottom: 0;
}
.group_6.data-v-d09999e9 {
- padding: 15.27rpx 3.82rpx 7.63rpx;
- border-bottom: solid 1.91rpx #efefef;
+ padding: 14.06rpx 4.8rpx 8.44rpx;
+ border-bottom: solid 1.88rpx #efefef;
}
.text_7.data-v-d09999e9 {
- line-height: 24.69rpx;
+ line-height: 24.26rpx;
}
.section_2.data-v-d09999e9 {
- margin-right: 19.08rpx;
- padding: 7.63rpx 15.27rpx;
- background-color: #fffef8;
- height: 83.97rpx;
-}
-.font_2.data-v-d09999e9 {
- font-size: 26.72rpx;
- font-family: Open Sans;
- line-height: 32.44rpx;
- color: #323232;
+ width: 300rpx;
+ height: 150rpx;
+ flex: 1 1 0;
+ margin-right: 19.57rpx;
}
.group_7.data-v-d09999e9 {
- padding: 26.72rpx 3.82rpx 34.35rpx;
+ padding: 25.31rpx 4.88rpx 32.01rpx;
}
.image_2.data-v-d09999e9 {
- margin-right: 19.08rpx;
- width: 34.35rpx;
- height: 34.35rpx;
+ margin-right: 19.5rpx;
+ width: 33.75rpx;
+ height: 33.75rpx;
}
.section_3.data-v-d09999e9 {
- padding: 17.18rpx 0;
+ position: fixed;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ margin-right: 13.13rpx;
+ padding: 16.88rpx 0;
background-color: #fffef8;
}
.text-wrapper_4.data-v-d09999e9 {
- padding: 26.72rpx 0;
+ padding: 27.24rpx 0 23.61rpx;
background-color: #ffa948;
- border-radius: 47.71rpx;
- width: 629.77rpx;
+ border-radius: 46.88rpx;
+ width: 618.75rpx;
}
.text_8.data-v-d09999e9 {
color: #ffffff;
- font-size: 30.53rpx;
+ font-size: 30rpx;
font-family: Open Sans;
- line-height: 28.4rpx;
+ line-height: 27.9rpx;
}
\ 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 de32406..5c5bd4a 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
@@ -1,16 +1,116 @@
"use strict";
const common_vendor = require("../../../common/vendor.js");
+const common_assets = require("../../../common/assets.js");
const _sfc_main = {
__name: "productmain",
setup(__props) {
- const items = common_vendor.ref([null, null, null, null, null, null, null]);
+ common_vendor.ref([null, null, null, null, null, null, null]);
+ const products = common_vendor.ref([
+ {
+ "product_name": "非遗绒花",
+ "product_type": "材料包",
+ "selected_style": "紫色",
+ "product_num": 1,
+ "product_price": 138,
+ "product_img": common_assets.product_img$1,
+ "pull_img": common_assets.pull,
+ "select_img": common_assets.choose,
+ "rmb_img": common_assets.rmb,
+ "min_img": common_assets.short,
+ "add_img": common_assets.add
+ },
+ {
+ "product_name": "非遗绒花",
+ "product_type": "材料包",
+ "selected_style": "紫色",
+ "product_num": 1,
+ "product_price": 138,
+ "product_img": common_assets.product_img$1,
+ "pull_img": common_assets.pull,
+ "select_img": common_assets.choose,
+ "rmb_img": common_assets.rmb,
+ "min_img": common_assets.short,
+ "add_img": common_assets.add
+ },
+ {
+ "product_name": "非遗绒花",
+ "product_type": "材料包",
+ "selected_style": "紫色",
+ "product_num": 1,
+ "product_price": 138,
+ "product_img": common_assets.product_img$1,
+ "pull_img": common_assets.pull,
+ "select_img": common_assets.choose,
+ "rmb_img": common_assets.rmb,
+ "min_img": common_assets.short,
+ "add_img": common_assets.add
+ },
+ {
+ "product_name": "非遗绒花",
+ "product_type": "材料包",
+ "selected_style": "紫色",
+ "product_num": 1,
+ "product_price": 138,
+ "product_img": common_assets.product_img$1,
+ "pull_img": common_assets.pull,
+ "select_img": common_assets.choose,
+ "rmb_img": common_assets.rmb,
+ "min_img": common_assets.short,
+ "add_img": common_assets.add
+ },
+ {
+ "product_name": "非遗绒花",
+ "product_type": "材料包",
+ "selected_style": "紫色",
+ "product_num": 1,
+ "product_price": 138,
+ "product_img": common_assets.product_img$1,
+ "pull_img": common_assets.pull,
+ "select_img": common_assets.choose,
+ "rmb_img": common_assets.rmb,
+ "min_img": common_assets.short,
+ "add_img": common_assets.add
+ },
+ {
+ "product_name": "非遗绒花",
+ "product_type": "材料包",
+ "selected_style": "紫色",
+ "product_num": 1,
+ "product_price": 138,
+ "product_img": common_assets.product_img$1,
+ "pull_img": common_assets.pull,
+ "select_img": common_assets.choose,
+ "rmb_img": common_assets.rmb,
+ "min_img": common_assets.short,
+ "add_img": common_assets.add
+ }
+ ]);
+ const jump_product = () => {
+ common_vendor.index.navigateTo({
+ url: "../../../pages/store-home/ProductDetails/ProductDetails"
+ });
+ };
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
+ a: item.select_img,
+ b: common_vendor.o(jump_product, index),
+ c: item.product_img,
+ d: common_vendor.t(item.product_name),
+ e: common_vendor.t(item.product_type),
+ f: common_vendor.o(jump_product, index),
+ g: common_vendor.t(item.selected_style),
+ h: item.pull_img,
+ i: common_vendor.t(item.product_price),
+ j: common_vendor.t(item.product_num),
+ k: index
};
- })
+ }),
+ b: common_vendor.unref(common_assets.rmb),
+ c: common_vendor.unref(common_assets.short),
+ d: common_vendor.unref(common_assets.add),
+ e: common_vendor.unref(common_assets.choose)
};
};
}
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.wxml b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.wxml
index 5ab5866..0999642 100644
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.wxml
@@ -1 +1 @@
-编辑商品类服务类非遗绒花【材料包】已选种类:紫色138.001全选删除
\ No newline at end of file
+编辑商品类服务类{{item.d}}【{{item.e}}】已选种类:{{item.g}}{{item.i}}.00{{item.j}}全选删除
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/home/home.js b/unpackage/dist/dev/mp-weixin/pages/home/home.js
index b2ec52b..363b288 100644
--- a/unpackage/dist/dev/mp-weixin/pages/home/home.js
+++ b/unpackage/dist/dev/mp-weixin/pages/home/home.js
@@ -6,7 +6,11 @@ const _sfc_main = {
setup(__props) {
const items = common_vendor.ref([null, null, null]);
const items_1 = common_vendor.ref([null, null, null]);
- common_vendor.ref([null, null, null]);
+ const jump_product = () => {
+ common_vendor.index.navigateTo({
+ url: "../../pages/store-home/ProductDetails/ProductDetails"
+ });
+ };
return (_ctx, _cache) => {
return {
a: common_vendor.f(items.value, (item, index, i0) => {
@@ -18,19 +22,20 @@ const _sfc_main = {
c: common_vendor.unref(common_assets.rili),
d: common_vendor.unref(common_assets.you),
e: common_vendor.unref(common_assets.product),
- f: common_vendor.unref(common_assets.product),
+ f: common_vendor.o(jump_product),
g: common_vendor.unref(common_assets.product),
- h: common_vendor.unref(common_assets.you),
- i: common_vendor.unref(common_assets.product),
+ h: common_vendor.unref(common_assets.product),
+ i: common_vendor.unref(common_assets.you),
j: common_vendor.unref(common_assets.product),
k: common_vendor.unref(common_assets.product),
- l: common_vendor.unref(common_assets.you),
- m: common_vendor.f(items_1.value, (item, index, i0) => {
+ l: common_vendor.unref(common_assets.product),
+ m: common_vendor.unref(common_assets.you),
+ n: common_vendor.f(items_1.value, (item, index, i0) => {
return {
a: index
};
}),
- n: common_vendor.unref(common_assets.xuanchuan)
+ o: common_vendor.unref(common_assets.xuanchuan)
};
};
}
diff --git a/unpackage/dist/dev/mp-weixin/pages/home/home.wxml b/unpackage/dist/dev/mp-weixin/pages/home/home.wxml
index 052c97c..0766ca2 100644
--- a/unpackage/dist/dev/mp-weixin/pages/home/home.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/home/home.wxml
@@ -1 +1 @@
-热门精品非遗工坊写真预约推荐商品更多琉璃发体验包¥750琉璃发体验包¥750琉璃发体验包¥750推荐服务更多琉璃发体验包¥750琉璃发体验包¥750琉璃发体验包¥750活动资讯更多“五色五育”研学——端午香囊篇为进一步深入贯彻落实习近平总书记...2024-08-04
\ No newline at end of file
+热门精品非遗工坊写真预约推荐商品更多琉璃发体验包¥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.wxss b/unpackage/dist/dev/mp-weixin/pages/home/home.wxss
index 96df1b6..664f283 100644
--- a/unpackage/dist/dev/mp-weixin/pages/home/home.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/home/home.wxss
@@ -436,7 +436,7 @@ text.data-v-07e72d3c {
}
.section_3.data-v-07e72d3c {
padding: 15rpx 30rpx 13.13rpx;
- background-image: url("https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=d2d686bc17d9d76e7b320e5a4ea70952.png");
+ background-image: url("https://s21.ax1x.com/2024/10/18/pAUf6aT.png");
background-size: 100% 100%;
background-repeat: no-repeat;
}
@@ -457,7 +457,7 @@ text.data-v-07e72d3c {
}
.section_2.data-v-07e72d3c {
padding: 15rpx 26.25rpx 13.13rpx;
- background-image: url("https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=aa376a23521cc37d71891264189a3902.png");
+ background-image: url("https://s21.ax1x.com/2024/10/18/pAUfrq0.png");
background-size: 100% 100%;
background-repeat: no-repeat;
width: 371.25rpx;
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 659be89..55a4122 100644
--- a/unpackage/dist/dev/mp-weixin/pages/mine/main/main.js
+++ b/unpackage/dist/dev/mp-weixin/pages/mine/main/main.js
@@ -1,10 +1,24 @@
"use strict";
const common_vendor = require("../../../common/vendor.js");
+const common_assets = require("../../../common/assets.js");
const _sfc_main = {
__name: "main",
setup(__props) {
return (_ctx, _cache) => {
- return {};
+ return {
+ a: common_vendor.unref(common_assets.avator),
+ b: common_vendor.unref(common_assets.dingdan),
+ c: common_vendor.unref(common_assets.qianbao),
+ d: common_vendor.unref(common_assets.daifahuo),
+ e: common_vendor.unref(common_assets.daishouhuo),
+ f: common_vendor.unref(common_assets.tuikuan),
+ g: common_vendor.unref(common_assets.address),
+ h: common_vendor.unref(common_assets.you$1),
+ i: common_vendor.unref(common_assets.lianxiren_s),
+ j: common_vendor.unref(common_assets.you$1),
+ k: common_vendor.unref(common_assets.setting_s),
+ l: common_vendor.unref(common_assets.you$1)
+ };
};
}
};
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 089a3c6..9b8b9e6 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/store-home/ProductDetails/ProductDetails.js b/unpackage/dist/dev/mp-weixin/pages/store-home/ProductDetails/ProductDetails.js
index 3f45375..7f918f6 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
@@ -1,8 +1,31 @@
"use strict";
const common_vendor = require("../../../common/vendor.js");
-const _sfc_main = {};
-function _sfc_render(_ctx, _cache) {
- return {};
-}
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-3361b524"]]);
+const common_assets = require("../../../common/assets.js");
+const _sfc_main = {
+ __name: "ProductDetails",
+ setup(__props) {
+ common_vendor.ref(750);
+ common_vendor.ref("琉璃发簪新手体验包");
+ const detail = common_vendor.ref("琉璃发簪便是汉代美人常常佩戴的发饰之一。琉璃发簪不仅美观大方,还有 着深厚的文化底蕴。购买体验包,即可体验古代文化。");
+ const arr_tag = common_vendor.ref(["发簪", "送亲友", "体验包", "友情"]);
+ return (_ctx, _cache) => {
+ return {
+ a: common_vendor.unref(common_assets.zhuye),
+ b: common_vendor.unref(common_assets.show1),
+ c: common_vendor.unref(common_assets.show2),
+ d: common_vendor.unref(common_assets.show3),
+ e: common_vendor.unref(common_assets.show4),
+ f: common_vendor.unref(common_assets.show3),
+ g: common_vendor.unref(common_assets.denglong),
+ h: common_vendor.t(detail.value),
+ i: common_vendor.t(arr_tag.value[0]),
+ j: common_vendor.t(arr_tag.value[1]),
+ k: common_vendor.t(arr_tag.value[2]),
+ l: common_vendor.t(arr_tag.value[3]),
+ m: common_vendor.unref(common_assets.kefu)
+ };
+ };
+ }
+};
+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/ProductDetails/ProductDetails.wxml b/unpackage/dist/dev/mp-weixin/pages/store-home/ProductDetails/ProductDetails.wxml
index d9a97a5..92e019f 100644
--- a/unpackage/dist/dev/mp-weixin/pages/store-home/ProductDetails/ProductDetails.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/store-home/ProductDetails/ProductDetails.wxml
@@ -1 +1 @@
-商品详情推荐图片展示琉璃发簪新手体验包中秋节限定 商品简介:琉璃发簪便是汉代美人常常佩戴的发饰之一。琉璃 发簪不仅美观大方,还有 着深厚的文化底蕴。购买体验包,即可体验古代文化。商品标签:#发簪#送亲友#体验包#友情商品详情客服加入购物车立即购买
\ No newline at end of file
+商品详情推荐图片展示¥750琉璃发簪新手体验包中秋节限定 商品简介:{{h}} 商品标签:#{{i}}#{{j}}#{{k}}#{{l}}用户须知1.发货后不接受退货、不接受7天无理由退货2.商品购买后无法自主退款,需联系客服进行退款处理 3.定制款商品购买后不接受退货退款,包售后需要录制开箱视频,并且开箱视频需要从拆包装开始 4.商品售罄后的款式也可以重新预定,需等待并联系客服5.定制商品的具体发货日期根据制作团队制作情况而定6.只售后邮寄破损商品详情客服加入购物车立即购买
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/store-home/ProductDetails/ProductDetails.wxss b/unpackage/dist/dev/mp-weixin/pages/store-home/ProductDetails/ProductDetails.wxss
index 5f6ded1..3eba6c4 100644
--- a/unpackage/dist/dev/mp-weixin/pages/store-home/ProductDetails/ProductDetails.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/store-home/ProductDetails/ProductDetails.wxss
@@ -401,15 +401,9 @@ text.data-v-3361b524 {
.mt-100.data-v-3361b524 {
margin-top: 187.5rpx;
}
-.mt-5.data-v-3361b524 {
- margin-top: 9.38rpx;
-}
.ml-7.data-v-3361b524 {
margin-left: 13.13rpx;
}
-.mt-268.data-v-3361b524 {
- margin-top: 502.5rpx;
-}
.mt-15.data-v-3361b524 {
margin-top: 28.13rpx;
}
@@ -428,11 +422,12 @@ text.data-v-3361b524 {
height: 100%;
}
.section.data-v-3361b524 {
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
padding: 0 82.5rpx 15rpx;
background-color: #a0522d;
- position: fixed;
- width: 100%;
- top: 0;
}
.group.data-v-3361b524 {
padding: 30rpx 0 11.25rpx 3.75rpx;
@@ -455,10 +450,12 @@ text.data-v-3361b524 {
height: 5.63rpx;
}
.image.data-v-3361b524 {
+ margin-top: 85rpx;
width: 100vw;
height: 48vw;
}
.group_2.data-v-3361b524 {
+ margin-top: 11.25rpx;
padding: 0 22.5rpx;
}
.font_2.data-v-3361b524 {
@@ -476,8 +473,12 @@ text.data-v-3361b524 {
width: 105rpx;
height: 91.88rpx;
}
+.group_3.data-v-3361b524 {
+ margin-top: 22.5rpx;
+}
.section_3.data-v-3361b524 {
- padding-left: 20.63rpx;
+ padding-left: 18.75rpx;
+ padding-top: 22.5rpx;
background-color: #fffaf0;
border-radius: 18.75rpx;
border-left: solid 1.88rpx #00000033;
@@ -485,35 +486,35 @@ text.data-v-3361b524 {
border-top: solid 1.88rpx #00000033;
border-bottom: solid 1.88rpx #00000033;
}
-.group_3.data-v-3361b524 {
- padding: 15rpx 0;
- width: 731.38rpx;
+.group_4.data-v-3361b524 {
+ margin-left: 11.25rpx;
+ line-height: 30.77rpx;
+}
+.group_5.data-v-3361b524 {
+ margin-top: 18.75rpx;
+}
+.group_6.data-v-3361b524 {
+ margin-right: 22.5rpx;
}
.image_2.data-v-3361b524 {
- margin-left: 7.5rpx;
- width: 93.75rpx;
- height: 58.13rpx;
-}
-.group_4.data-v-3361b524 {
- margin-right: 22.5rpx;
- margin-top: 60rpx;
-}
-.image_3.data-v-3361b524 {
width: 33.75rpx;
height: 33.75rpx;
}
.font_3.data-v-3361b524 {
- font-size: 30rpx;
+ font-size: 26.25rpx;
font-family: Open Sans;
- line-height: 27.66rpx;
+ line-height: 24.88rpx;
color: #323232;
}
.divider.data-v-3361b524 {
- margin-right: 35.63rpx;
background-color: #00000033;
height: 1.88rpx;
}
-.group_5.data-v-3361b524 {
+.view.data-v-3361b524 {
+ margin-right: 37.5rpx;
+ margin-top: 18.75rpx;
+}
+.group_7.data-v-3361b524 {
padding: 15rpx 0 11.25rpx;
width: 734.01rpx;
}
@@ -526,20 +527,35 @@ text.data-v-3361b524 {
.text_3.data-v-3361b524 {
text-shadow: 0 1.88rpx #fffaf0, 0 -1.88rpx #fffaf0, 1.88rpx 0 #fffaf0, -1.88rpx 0 #fffaf0;
}
-.text_4.data-v-3361b524 {
+.text_6.data-v-3361b524 {
font-size: 28.13rpx;
line-height: 26.03rpx;
}
-.text_5.data-v-3361b524 {
+.text_7.data-v-3361b524 {
color: #323232;
font-size: 33.75rpx;
font-family: Open Sans;
line-height: 31.46rpx;
}
-.group_6.data-v-3361b524 {
+.text_4.data-v-3361b524 {
+ color: #ff0000;
+ font-size: 45rpx;
+ font-family: FangSong;
+ line-height: 30.77rpx;
+}
+.text_5.data-v-3361b524 {
+ color: #ff0000;
+ font-size: 26.25rpx;
+ font-family: FangSong;
+ line-height: 18.36rpx;
+}
+.view_2.data-v-3361b524 {
+ margin-right: 37.5rpx;
+}
+.group_8.data-v-3361b524 {
padding: 16.88rpx 0 22.5rpx;
}
-.text_6.data-v-3361b524 {
+.text_8.data-v-3361b524 {
color: #000000;
line-height: 24.28rpx;
}
@@ -560,7 +576,7 @@ text.data-v-3361b524 {
line-height: 20.72rpx;
color: #323232;
}
-.text_7.data-v-3361b524 {
+.text_9.data-v-3361b524 {
line-height: 20.85rpx;
}
.text-wrapper_2.data-v-3361b524 {
@@ -573,10 +589,10 @@ text.data-v-3361b524 {
border-top: solid 1.88rpx #00000033;
border-bottom: solid 1.88rpx #00000033;
}
-.text_8.data-v-3361b524 {
+.text_10.data-v-3361b524 {
margin: 0 7.5rpx;
}
-.text_9.data-v-3361b524 {
+.text_11.data-v-3361b524 {
line-height: 20.83rpx;
}
.text-wrapper_3.data-v-3361b524 {
@@ -590,24 +606,67 @@ text.data-v-3361b524 {
border-top: solid 1.88rpx #00000033;
border-bottom: solid 1.88rpx #00000033;
}
-.text_10.data-v-3361b524 {
+.section_4.data-v-3361b524 {
+ padding: 22.5rpx 11.25rpx 37.5rpx;
+ background-color: #fffaf0;
+ border-radius: 18.75rpx;
+ border-left: solid 1.88rpx #818181;
+ border-right: solid 1.88rpx #818181;
+ border-top: solid 1.88rpx #818181;
+ border-bottom: solid 1.88rpx #818181;
+}
+.text_12.data-v-3361b524 {
+ color: #000000;
+ line-height: 27.94rpx;
+ text-decoration: underline;
+}
+.text_13.data-v-3361b524 {
+ margin-left: 11.25rpx;
+ margin-top: 22.5rpx;
+ line-height: 24.34rpx;
+}
+.text_14.data-v-3361b524 {
+ margin-left: 11.25rpx;
+ margin-top: 22.5rpx;
+}
+.text_15.data-v-3361b524 {
+ margin: 18.75rpx 7.5rpx 0;
+}
+.text_16.data-v-3361b524 {
+ margin-left: 7.5rpx;
+ margin-top: 15rpx;
+ line-height: 24.96rpx;
+}
+.text_17.data-v-3361b524 {
+ margin-left: 11.25rpx;
+ margin-top: 26.25rpx;
+ line-height: 24.39rpx;
+}
+.text_18.data-v-3361b524 {
+ margin-left: 11.25rpx;
+ margin-top: 26.25rpx;
+ line-height: 24.3rpx;
+}
+.text_19.data-v-3361b524 {
margin-left: 15rpx;
+ color: #323232;
line-height: 27.69rpx;
}
-.section_4.data-v-3361b524 {
+.section_5.data-v-3361b524 {
padding: 45rpx 0 3838.13rpx;
- background-image: url("https://ide.code.fun/api/image?token=6710a29d1511d900114ac910&name=23b7db846e029260305e0604be9e8e8a.png");
+ background-image: url("https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=d47bc18dff7946c7b9090b5677af68d6.png");
background-size: 100% 100%;
background-repeat: no-repeat;
}
-.section_5.data-v-3361b524 {
- padding: 15rpx 26.25rpx;
- background-color: #f8e8c1;
+.section_6.data-v-3361b524 {
position: fixed;
bottom: 0;
- width: 100%;
+ left: 0;
+ right: 0;
+ padding: 15rpx 26.25rpx;
+ background-color: #f8e8c1;
}
-.image_4.data-v-3361b524 {
+.image_3.data-v-3361b524 {
width: 46.88rpx;
height: 46.88rpx;
}
@@ -624,7 +683,7 @@ text.data-v-3361b524 {
line-height: 27.66rpx;
color: #ffffff;
}
-.text_11.data-v-3361b524 {
+.text_20.data-v-3361b524 {
line-height: 27.79rpx;
}
.text-wrapper_5.data-v-3361b524 {
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 227aa2d..6a16dc0 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,19 +78,20 @@ const _sfc_main = {
]);
const tap = () => {
common_vendor.index.navigateTo({
- url: "../../../pages/Shopping-cart/ProductDetails/ProductDetails"
+ url: "../../../pages/store-home/ProductDetails/ProductDetails"
});
};
return (_ctx, _cache) => {
return {
- a: common_vendor.f(sort.value, (item, index, i0) => {
+ a: common_vendor.unref(common_assets.sousuokuang),
+ b: common_vendor.f(sort.value, (item, index, i0) => {
return {
a: item.imgurl,
b: common_vendor.t(item.name),
c: index
};
}),
- b: common_vendor.f(product_list.value, (item, index, i0) => {
+ c: common_vendor.f(product_list.value, (item, index, i0) => {
return {
a: item.imgurl,
b: common_vendor.t(item.product_name),
@@ -100,7 +101,7 @@ const _sfc_main = {
f: common_vendor.o(tap, index)
};
}),
- c: common_vendor.unref(common_assets.add_img)
+ d: common_vendor.unref(common_assets.add_img)
};
};
}
diff --git a/unpackage/dist/dev/mp-weixin/pages/store-home/main/main.wxml b/unpackage/dist/dev/mp-weixin/pages/store-home/main/main.wxml
index 55facf3..bc7f41f 100644
--- a/unpackage/dist/dev/mp-weixin/pages/store-home/main/main.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/store-home/main/main.wxml
@@ -1 +1 @@
-商品{{item.b}}材料包提供材料自行DIY{{item.b}}{{item.c}}¥{{item.d}}
\ No newline at end of file
+商品{{item.b}}材料包提供材料自行DIY{{item.b}}{{item.c}}¥{{item.d}}
\ No newline at end of file