diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxml b/components/diy_goodsGroup/diy_goodsGroup.wxml
index 1e88e02..fe8db0e 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.wxml
+++ b/components/diy_goodsGroup/diy_goodsGroup.wxml
@@ -89,10 +89,10 @@
-
- ￥
- {{item.market_price}}
-
+
+
+
+
@@ -105,10 +105,10 @@
-
- ￥
- {{item.market_price}}
-
+
+
+
+
@@ -122,10 +122,10 @@
{{filter.toFix(item.shop_price,2)}}
-
- ￥
- {{item.market_price}}
-
+
+
+
+
@@ -150,10 +150,10 @@
-
- ￥
- {{item.market_price}}
-
+
+
+
+
@@ -258,10 +258,10 @@
-
- ￥
- {{item.market_price}}
-
+
+
+
+
@@ -274,10 +274,10 @@
-
- ￥
- {{item.market_price}}
-
+
+
+
+
@@ -291,10 +291,10 @@
{{filter.toFix(item.shop_price,2)}}
-
- ￥
- {{item.market_price}}
-
+
+
+
+
@@ -319,10 +319,10 @@
-
- ￥
- {{item.market_price}}
-
+
+
+
+
@@ -427,10 +427,10 @@
-
- ￥
- {{item.market_price}}
-
+
+
+
+
@@ -443,10 +443,10 @@
-
- ￥
- {{item.market_price}}
-
+
+
+
+
@@ -460,10 +460,10 @@
{{filter.toFix(item.shop_price,2)}}
-
- ￥
- {{item.market_price}}
-
+
+
+
+
@@ -488,10 +488,10 @@
-
- ￥
- {{item.market_price}}
-
+
+
+
+
@@ -600,10 +600,10 @@
-
- ￥
- {{item.market_price}}
-
+
+
+
+
@@ -616,10 +616,10 @@
-
- ￥
- {{item.market_price}}
-
+
+
+
+
@@ -633,10 +633,10 @@
{{filter.toFix(item.shop_price,2)}}
-
- ￥
- {{item.market_price}}
-
+
+
+
+
@@ -660,10 +660,10 @@
-
- ￥
- {{item.market_price}}
-
+
+
+
+
@@ -793,10 +793,10 @@
-
- ￥
- {{aitem.market_price}}
-
+
+
+
+
@@ -809,10 +809,10 @@
-
- ￥
- {{aitem.market_price}}
-
+
+
+
+
@@ -826,10 +826,10 @@
{{filter.toFix(aitem.shop_price,2)}}
-
- ￥
- {{aitem.market_price}}
-
+
+
+
+
@@ -854,10 +854,10 @@
-
- ￥
- {{aitem.market_price}}
-
+
+
+
+
diff --git a/pages/index/index/index.wxss b/pages/index/index/index.wxss
index 8824018..dedb960 100644
--- a/pages/index/index/index.wxss
+++ b/pages/index/index/index.wxss
@@ -1,16 +1,16 @@
/* 基本样式 */
page {
width: 100%;
- height: 100%;
- overflow: hidden;
+ /*height: 100%;*/
+ /*overflow: hidden;*/
box-sizing: border-box;
position: relative;
}
/* 超出滚动 */
.container {
width: 100%;
- height: 100%;
- overflow-y: auto;
+ height: auto;
+ /*overflow-y: auto;*/
overflow-x: hidden;
}
diff --git a/pages/team/team_ping/team_ping.wxml b/pages/team/team_ping/team_ping.wxml
index 8700061..a2df4ec 100644
--- a/pages/team/team_ping/team_ping.wxml
+++ b/pages/team/team_ping/team_ping.wxml
@@ -33,7 +33,7 @@
￥
{{item.order_goods[0].goods_price}}
- 零售价:￥{{item.order_goods[0].market_price}}
+ ￥{{item.order_goods[0].shop_price}}
diff --git a/pages/team/team_show/team_show.wxml b/pages/team/team_show/team_show.wxml
index c6ef77c..2adbc63 100644
--- a/pages/team/team_show/team_show.wxml
+++ b/pages/team/team_show/team_show.wxml
@@ -19,7 +19,7 @@
￥{{teamlist.price}}
- 零售价￥{{goods.market_price}}
+ ￥{{goods.shop_price}}
diff --git a/pages/team/team_success/team_success.wxml b/pages/team/team_success/team_success.wxml
index 14ae682..ca21c62 100644
--- a/pages/team/team_success/team_success.wxml
+++ b/pages/team/team_success/team_success.wxml
@@ -18,7 +18,7 @@
￥{{teamlist.price}}
- 零售价￥{{goods.market_price}}
+ ￥{{goods.shop_price}}