diff --git a/components/diy_advertising/diy_advertising.js b/components/diy_advertising/diy_advertising.js
index 17bda28..91c128d 100644
--- a/components/diy_advertising/diy_advertising.js
+++ b/components/diy_advertising/diy_advertising.js
@@ -16,7 +16,7 @@ Component({
     interval:3000,
     duration:1000,
     someData: {},
-    max_sw_height:260,
+    max_sw_height:100,
   },
 
   ready: function () {
diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxml b/components/diy_goodsGroup/diy_goodsGroup.wxml
index a2a5e5d..1e88e02 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.wxml
+++ b/components/diy_goodsGroup/diy_goodsGroup.wxml
@@ -67,7 +67,7 @@
                                     <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
                                     <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
                                 </view>
-                                <view class='del'>￥{{item.market_price}}</view>
+<!--                                <view class='del'>￥{{item.market_price}}</view>-->
                             </block>
                             <block wx:else>
 
@@ -161,7 +161,7 @@
 
                                 <block wx:else>
                                     <view class='wz_red'>￥{{item.shop_price}}</view>
-                                    <view class='del'>￥{{item.market_price}}</view>
+<!--                                    <view class='del'>￥{{item.market_price}}</view>-->
                                 </block>
 
                             </block>
@@ -237,7 +237,7 @@
                                             <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
                                             <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
                                         </view>
-                                        <view class='del'>￥{{item.market_price}}</view>
+<!--                                        <view class='del'>￥{{item.market_price}}</view>-->
                                     </block>
                                     <block wx:else>
                                         <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
@@ -329,7 +329,7 @@
                                         </block>
                                         <block wx:else>
                                             <view class='wz_red'>￥{{item.shop_price}}</view>
-                                            <view class='del'>￥{{item.market_price}}</view>
+<!--                                            <view class='del'>￥{{item.market_price}}</view>-->
                                         </block>
                                     </block>
                                 </view>
@@ -406,7 +406,7 @@
                                                 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
                                                 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
                                             </view>
-                                            <view class='del'>￥{{item.market_price}}</view>
+<!--                                            <view class='del'>￥{{item.market_price}}</view>-->
                                         </block>
                                         <block wx:else>
                                             <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
@@ -498,7 +498,7 @@
                                             </block>
                                             <block wx:else>
                                                 <view class='wz_red'>￥{{item.shop_price}}</view>
-                                                <view class='del'>￥{{item.market_price}}</view>
+<!--                                                <view class='del'>￥{{item.market_price}}</view>-->
                                             </block>
                                         </block>
                                     </view>
@@ -577,7 +577,7 @@
                                     <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
                                     <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
                                 </view>
-                                <view class='del'>￥{{item.market_price}}</view>
+<!--                                <view class='del'>￥{{item.market_price}}</view>-->
                             </block>
                             <!-- 不是活动的情况 -->
                             <block wx:else>
@@ -671,7 +671,7 @@
 
                                 <block wx:else>
                                     <view class='wz_red'>￥{{item.shop_price}}</view>
-                                    <view class='del'>￥{{item.market_price}}</view>
+<!--                                    <view class='del'>￥{{item.market_price}}</view>-->
                                 </block>
 
                             </block>
@@ -717,7 +717,7 @@
             <view class="button-wrapper" wx:if="{{object.goodscount * page <total }}" style="border: none">
                 <button type="default" size="default" loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none">{{loadText}}</button>
             </view>
-            <view class="fs28" wx:if="{{object.goodscount * page >=total }}" style="color:{{object.nomore_color}};text-align: center; padding: 20rpx 0">-- 没有更多 -- </view>
+<!--            <view class="fs28" wx:if="{{object.goodscount * page >=total }}" style="color:{{object.nomore_color}};text-align: center; padding: 20rpx 0">&#45;&#45; 没有更多 &#45;&#45; </view>-->
 
         </block>
     </block>
@@ -772,7 +772,7 @@
                                             <text wx:if="{{aitem.prom_integral && aitem.prom_price}}">+</text>
                                             <text wx:if="{{aitem.prom_price}}">￥{{aitem.prom_price}}</text>
                                         </view>
-                                        <view class='del'>￥{{aitem.market_price}}</view>
+<!--                                        <view class='del'>￥{{aitem.market_price}}</view>-->
                                     </block>
                                     <block wx:else>
                                         <block wx:if="{{g_filter.is_has_rank(rank_switch,aitem)}}">
@@ -864,7 +864,7 @@
                                         </block>
                                         <block wx:else>
                                             <view class='wz_red'>￥{{aitem.shop_price}}</view>
-                                            <view class='del'>￥{{aitem.market_price}}</view>
+<!--                                            <view class='del'>￥{{aitem.market_price}}</view>-->
                                         </block>
                                     </block>
                                 </view>
diff --git a/components/diy_groupbuy/diy_groupbuy.wxml b/components/diy_groupbuy/diy_groupbuy.wxml
index c370b2b..796d0f7 100644
--- a/components/diy_groupbuy/diy_groupbuy.wxml
+++ b/components/diy_groupbuy/diy_groupbuy.wxml
@@ -39,7 +39,7 @@
 							<view class='sp_wz'>
 								<view class='sp_wzi'>{{aitem.goods_name}}</view>
 								<view class='sp_jg'>￥{{aitem.price}}</view>
-								<view class='sp_jgx'>￥{{aitem.market_price}}</view>
+<!--								<view class='sp_jgx'>￥{{aitem.shop_price}}</view>-->
 							</view>
 							<!-- <view class="progress_box">
 								<text class="on_sale_list">已买:{{aitem.buy_num + aitem.virtual_num}}件</text>
@@ -94,7 +94,7 @@
 							</view>
 							<view>
 								<view class='sp_jg'>￥{{aitem.price}}</view>
-								<view class='sp_jgx'>￥{{aitem.market_price}}</view>
+<!--								<view class='sp_jgx'>￥{{aitem.shop_price}}</view>-->
 							</view>
 						</view>
 					</view>
diff --git a/components/diy_luckyGo/diy_luckyGo.wxml b/components/diy_luckyGo/diy_luckyGo.wxml
index c16f74e..1ed81e2 100644
--- a/components/diy_luckyGo/diy_luckyGo.wxml
+++ b/components/diy_luckyGo/diy_luckyGo.wxml
@@ -29,7 +29,7 @@
 									<view>
 										<view class="flex ai-center">
 											<text class="rmb c-red">{{filters.price(aitem.group_price)}}</text>
-											<view class="del fs22 c-a pdl10"><text class="rmb">{{aitem.market_price}}</text></view>
+<!--											<view class="del fs22 c-a pdl10"><text class="rmb">{{aitem.shop_price}}</text></view>-->
 										</view>
 									</view>
 
@@ -63,7 +63,7 @@
 									<view>
 										<view class="flex ai-center">
 											<text class="rmb c-red">{{filters.price(aitem.group_price)}}</text>
-											<view class="del fs22 c-a pdl10">零售价:<text class="rmb">{{aitem.market_price}}</text></view>
+<!--											<view class="del fs22 c-a pdl10"><text class="rmb">{{aitem.shop_price}}</text></view>-->
 										</view>
 										<view class="flex jc_sb">
 											<progress class="pdr20 f1 progress" percent="{{filters.percent(aitem.num, aitem.group_num)}}" activeColor="#FF6768"
diff --git a/components/diy_pingd_buy/diy_pingd_buy.wxml b/components/diy_pingd_buy/diy_pingd_buy.wxml
index 5488e5a..12a1769 100644
--- a/components/diy_pingd_buy/diy_pingd_buy.wxml
+++ b/components/diy_pingd_buy/diy_pingd_buy.wxml
@@ -91,7 +91,7 @@
               </view>
               <view class="money">
                 <view class='sp_jg_p'>￥{{aitem.price}}</view>
-                <view class='sp_jgx_p'>￥{{aitem.market_price}}</view>
+<!--                <view class='sp_jgx_p'>￥{{aitem.shop_price}}</view>-->
               </view>
               <view class="o1_sj_p" wx:if="{{aitem.end_time>newTime}}">
                 <image class="time_img" src="{{iurl}}/miniapp/images/time.png"></image>
diff --git a/components/diy_pregoods/diy_pregoods.wxml b/components/diy_pregoods/diy_pregoods.wxml
index 8dfdd9d..7fb32e3 100644
--- a/components/diy_pregoods/diy_pregoods.wxml
+++ b/components/diy_pregoods/diy_pregoods.wxml
@@ -57,7 +57,7 @@
               <view class='sp_wz'>
                 <view class='sp_wzi'>{{aitem.act_name}}</view>
                 <view class='sp_jg'>￥{{aitem.presell_price}}</view>
-                <view class='sp_jgx'>￥{{aitem.market_price}}</view>
+<!--                <view class='sp_jgx'>￥{{aitem.shop_price}}</view>-->
               </view>
 
             </view>
diff --git a/components/diy_seckill/diy_seckill.wxml b/components/diy_seckill/diy_seckill.wxml
index 0a14ad8..48c4a72 100644
--- a/components/diy_seckill/diy_seckill.wxml
+++ b/components/diy_seckill/diy_seckill.wxml
@@ -82,7 +82,7 @@
               <view class='sp_wz'>
                 <view class='sp_wzi ellipsis-2'>{{aitem.goods_name}}</view>
                 <view class='sp_jg'>￥{{aitem.price}}</view>
-                <view class='sp_jgx'>￥{{aitem.market_price}}</view>
+<!--                <view class='sp_jgx'>￥{{aitem.shop_price}}</view>-->
               </view>
 
             </view>
@@ -116,7 +116,7 @@
               </view>
               <view class="money">
                 <view class='sp_jg'>￥{{aitem.price}}</view>
-                <view class='sp_jgx'>￥{{aitem.market_price}}</view>
+<!--                <view class='sp_jgx'>￥{{aitem.market_price}}</view>-->
               </view>
               <block wx:if="{{aitem.status == 0}}">
                 <view class="rob">
diff --git a/components/goods_list/goods_list.wxml b/components/goods_list/goods_list.wxml
index a04bef6..27a7ab7 100644
--- a/components/goods_list/goods_list.wxml
+++ b/components/goods_list/goods_list.wxml
@@ -26,13 +26,13 @@
                   <view class="fs35">{{item.prom_price}}</view>
                 </view>
               </view>
-              <view class="flex">
-                <!-- 原价 -->
-                <view class="price flex xc-ash line_th">
-                  <view class="fs22">￥</view>
-                  <view class="fs22">{{item.market_price}}</view>
-                </view>
-              </view>
+<!--              <view class="flex">-->
+<!--                &lt;!&ndash; 原价 &ndash;&gt;-->
+<!--                <view class="price flex xc-ash line_th">-->
+<!--                  <view class="fs22">￥</view>-->
+<!--                  <view class="fs22">{{item.market_price}}</view>-->
+<!--                </view>-->
+<!--              </view>-->
             </view>
 
           </block>
@@ -54,13 +54,13 @@
                       </view>
                     </view>
                   </view>
-                  <view class="flex">
-                    <!-- 原价 -->
-                    <view class="price flex xc-ash line_th">
-                      <view class="fs22">￥</view>
-                      <view class="fs22">{{item.market_price}}</view>
-                    </view>
-                  </view>
+<!--                  <view class="flex">-->
+<!--                    &lt;!&ndash; 原价 &ndash;&gt;-->
+<!--                    <view class="price flex xc-ash line_th">-->
+<!--                      <view class="fs22">￥</view>-->
+<!--                      <view class="fs22">{{item.market_price}}</view>-->
+<!--                    </view>-->
+<!--                  </view>-->
                 </block>
                 <blocK wx:else>
                   <view class="money flex">
@@ -70,13 +70,13 @@
                       <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
                     </view>
                   </view>
-                  <view class="flex">
-                    <!-- 原价 -->
-                    <view class="price flex xc-ash line_th">
-                      <view class="fs22">￥</view>
-                      <view class="fs22">{{item.market_price}}</view>
-                    </view>
-                  </view>
+<!--                  <view class="flex">-->
+<!--                    &lt;!&ndash; 原价 &ndash;&gt;-->
+<!--                    <view class="price flex xc-ash line_th">-->
+<!--                      <view class="fs22">￥</view>-->
+<!--                      <view class="fs22">{{item.market_price}}</view>-->
+<!--                    </view>-->
+<!--                  </view>-->
                 </blocK>
               </block>
               <block wx:else>
@@ -89,10 +89,10 @@
                       <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
                     </view>
                     <!-- 原价 -->
-                    <view class="price flex xc-ash line_th">
-                      <view class="fs22">￥</view>
-                      <view class="fs22">{{item.market_price}}</view>
-                    </view>
+<!--                    <view class="price flex xc-ash line_th">-->
+<!--                      <view class="fs22">￥</view>-->
+<!--                      <view class="fs22">{{item.market_price}}</view>-->
+<!--                    </view>-->
                   </view>
                   <view class="flexr">
                     <!-- 等级价 -->
@@ -114,13 +114,13 @@
                       <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
                     </view>
                   </view>
-                  <view class="flex">
-                    <!-- 原价 -->
-                    <view class="price flex xc-ash line_th">
-                      <view class="fs22">￥</view>
-                      <view class="fs22">{{item.market_price}}</view>
-                    </view>
-                  </view>
+<!--                  <view class="flex">-->
+<!--                    &lt;!&ndash; 原价 &ndash;&gt;-->
+<!--                    <view class="price flex xc-ash line_th">-->
+<!--                      <view class="fs22">￥</view>-->
+<!--                      <view class="fs22">{{item.market_price}}</view>-->
+<!--                    </view>-->
+<!--                  </view>-->
                 </block>
               </block>
             </block>
@@ -133,13 +133,13 @@
                   <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
                 </view>
               </view>
-              <view class="flex" style="">
-                <!-- 原价 -->
-                <view class="price flex xc-ash line_th">
-                  <view class="fs22">￥</view>
-                  <view class="fs22">{{item.market_price}}</view>
-                </view>
-              </view>
+<!--              <view class="flex" style="">-->
+<!--                &lt;!&ndash; 原价 &ndash;&gt;-->
+<!--                <view class="price flex xc-ash line_th">-->
+<!--                  <view class="fs22">￥</view>-->
+<!--                  <view class="fs22">{{item.market_price}}</view>-->
+<!--                </view>-->
+<!--              </view>-->
             </view>
           </block>
         </view>
diff --git a/packageA/pages/distribution/goods/goods.wxml b/packageA/pages/distribution/goods/goods.wxml
index 61c2412..ab59e8f 100644
--- a/packageA/pages/distribution/goods/goods.wxml
+++ b/packageA/pages/distribution/goods/goods.wxml
@@ -93,13 +93,13 @@
 										<view class="fs30 money">{{item.prom_price}}</view>
 									</view>
 								</view>
-								<view class="flex" style="line-height: 28rpx;">
-									<!-- 原价 -->
-									<view class="price flex xc-ash line_th">
-										<!-- <view class="fs22">￥</view> -->
-										<view class="fs22 money">{{item.market_price}}</view>
-									</view>
-								</view>
+<!--								<view class="flex" style="line-height: 28rpx;">-->
+<!--									&lt;!&ndash; 原价 &ndash;&gt;-->
+<!--									<view class="price flex xc-ash line_th">-->
+<!--										&lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
+<!--										<view class="fs22 money">{{item.market_price}}</view>-->
+<!--									</view>-->
+<!--								</view>-->
 							</block>
 							<block wx:else>
 								<!-- 商品价格,先判断下是后⼜等级价-->
@@ -119,13 +119,13 @@
 													</view>
 												</view>
 											</view>
-											<view class="flex" style="line-height: 28rpx;">
-												<!-- 原价 -->
-												<view class="price flex xc-ash line_th">
-													<!-- <view class="fs22">￥</view> -->
-													<view class="fs22 money">{{item.market_price}}</view>
-												</view>
-											</view>
+<!--											<view class="flex" style="line-height: 28rpx;">-->
+<!--												&lt;!&ndash; 原价 &ndash;&gt;-->
+<!--												<view class="price flex xc-ash line_th">-->
+<!--													&lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
+<!--													<view class="fs22 money">{{item.market_price}}</view>-->
+<!--												</view>-->
+<!--											</view>-->
 										</block>
 										<blocK wx:else>
 											<view class="flex">
@@ -135,13 +135,13 @@
 													<view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
 												</view>
 											</view>
-											<view class="flex" style="line-height: 28rpx;">
-												<!-- 原价 -->
-												<view class="price flex xc-ash line_th">
-													<!-- <view class="fs22">￥</view> -->
-													<view class="fs22 money">{{item.market_price}}</view>
-												</view>
-											</view>
+<!--											<view class="flex" style="line-height: 28rpx;">-->
+<!--												&lt;!&ndash; 原价 &ndash;&gt;-->
+<!--												<view class="price flex xc-ash line_th">-->
+<!--													&lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
+<!--													<view class="fs22 money">{{item.market_price}}</view>-->
+<!--												</view>-->
+<!--											</view>-->
 										</blocK>
 									</block>
 									<block wx:else>
@@ -154,10 +154,10 @@
 													<view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
 												</view>
 												<!-- 原价 -->
-												<view class="price flex xc-ash line_th">
-													<!-- <view class="fs22">￥</view> -->
-													<view class="fs22 money">{{item.market_price}}</view>
-												</view>
+<!--												<view class="price flex xc-ash line_th">-->
+<!--													&lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
+<!--													<view class="fs22 money">{{item.market_price}}</view>-->
+<!--												</view>-->
 											</view>
 											<view class="flexr">
 												<!-- 等级价 -->
@@ -180,13 +180,13 @@
 													<view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
 												</view>
 											</view>
-											<view class="flex" style="line-height: 28rpx;">
-												<!-- 原价 -->
-												<view class="price flex xc-ash line_th">
-													<!-- <view class="fs22">￥</view> -->
-													<view class="fs22 money">{{item.market_price}}</view>
-												</view>
-											</view>
+<!--											<view class="flex" style="line-height: 28rpx;">-->
+<!--												&lt;!&ndash; 原价 &ndash;&gt;-->
+<!--												<view class="price flex xc-ash line_th">-->
+<!--													&lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
+<!--													<view class="fs22 money">{{item.market_price}}</view>-->
+<!--												</view>-->
+<!--											</view>-->
 										</block>
 									</block>
 								</block>
@@ -199,13 +199,13 @@
 											<view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
 										</view>
 									</view>
-									<view class="flex" style="line-height: 28rpx;">
-										<!-- 原价 -->
-										<view class="price flex xc-ash line_th">
-											<!-- <view class="fs22">￥</view> -->
-											<view class="fs22 money">{{item.market_price}}</view>
-										</view>
-									</view>
+<!--									<view class="flex" style="line-height: 28rpx;">-->
+<!--										&lt;!&ndash; 原价 &ndash;&gt;-->
+<!--										<view class="price flex xc-ash line_th">-->
+<!--											&lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
+<!--											<view class="fs22 money">{{item.market_price}}</view>-->
+<!--										</view>-->
+<!--									</view>-->
 								</block>
 							</block>
 							<!-- <view class="money fs32 c-red">{{item.market_price}}</view> -->
@@ -235,13 +235,13 @@
 										<view class="fs30 money">{{item.prom_price}}</view>
 									</view>
 								</view>
-								<view class="flex" style="line-height: 28rpx;">
-									<!-- 原价 -->
-									<view class="price flex xc-ash line_th">
-										<!-- <view class="fs22">￥</view> -->
-										<view class="fs22 money">{{item.market_price}}</view>
-									</view>
-								</view>
+<!--								<view class="flex" style="line-height: 28rpx;">-->
+<!--									&lt;!&ndash; 原价 &ndash;&gt;-->
+<!--									<view class="price flex xc-ash line_th">-->
+<!--										&lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
+<!--										<view class="fs22 money">{{item.market_price}}</view>-->
+<!--									</view>-->
+<!--								</view>-->
 							</block>
 							<block wx:else>
 								<!-- 商品价格,先判断下是后⼜等级价-->
@@ -261,13 +261,13 @@
 													</view>
 												</view>
 											</view>
-											<view class="flex" style="line-height: 28rpx;">
-												<!-- 原价 -->
-												<view class="price flex xc-ash line_th">
-													<!-- <view class="fs22">￥</view> -->
-													<view class="fs22 money">{{item.market_price}}</view>
-												</view>
-											</view>
+<!--											<view class="flex" style="line-height: 28rpx;">-->
+<!--												&lt;!&ndash; 原价 &ndash;&gt;-->
+<!--												<view class="price flex xc-ash line_th">-->
+<!--													&lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
+<!--													<view class="fs22 money">{{item.market_price}}</view>-->
+<!--												</view>-->
+<!--											</view>-->
 										</block>
 										<blocK wx:else>
 											<view class="flex">
@@ -277,13 +277,13 @@
 													<view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
 												</view>
 											</view>
-											<view class="flex" style="line-height: 28rpx;">
-												<!-- 原价 -->
-												<view class="price flex xc-ash line_th">
-													<!-- <view class="fs22">￥</view> -->
-													<view class="fs22 money">{{item.market_price}}</view>
-												</view>
-											</view>
+<!--											<view class="flex" style="line-height: 28rpx;">-->
+<!--												&lt;!&ndash; 原价 &ndash;&gt;-->
+<!--												<view class="price flex xc-ash line_th">-->
+<!--													&lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
+<!--													<view class="fs22 money">{{item.market_price}}</view>-->
+<!--												</view>-->
+<!--											</view>-->
 										</blocK>
 									</block>
 									<block wx:else>
@@ -296,10 +296,10 @@
 													<view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
 												</view>
 												<!-- 原价 -->
-												<view class="price flex xc-ash line_th">
-													<!-- <view class="fs22">￥</view> -->
-													<view class="fs22 money">{{item.market_price}}</view>
-												</view>
+<!--												<view class="price flex xc-ash line_th">-->
+<!--													&lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
+<!--													<view class="fs22 money">{{item.market_price}}</view>-->
+<!--												</view>-->
 											</view>
 											<view class="flexr">
 												<!-- 等级价 -->
@@ -322,13 +322,13 @@
 													<view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
 												</view>
 											</view>
-											<view class="flex" style="line-height: 28rpx;">
-												<!-- 原价 -->
-												<view class="price flex xc-ash line_th">
-													<!-- <view class="fs22">￥</view> -->
-													<view class="fs22 money">{{item.market_price}}</view>
-												</view>
-											</view>
+<!--											<view class="flex" style="line-height: 28rpx;">-->
+<!--												&lt;!&ndash; 原价 &ndash;&gt;-->
+<!--												<view class="price flex xc-ash line_th">-->
+<!--													&lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
+<!--													<view class="fs22 money">{{item.market_price}}</view>-->
+<!--												</view>-->
+<!--											</view>-->
 										</block>
 									</block>
 								</block>
@@ -341,13 +341,13 @@
 											<view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
 										</view>
 									</view>
-									<view class="flex" style="line-height: 28rpx;">
-										<!-- 原价 -->
-										<view class="price flex xc-ash line_th">
-											<!-- <view class="fs22">￥</view> -->
-											<view class="fs22 money">{{item.market_price}}</view>
-										</view>
-									</view>
+<!--									<view class="flex" style="line-height: 28rpx;">-->
+<!--										&lt;!&ndash; 原价 &ndash;&gt;-->
+<!--										<view class="price flex xc-ash line_th">-->
+<!--											&lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
+<!--											<view class="fs22 money">{{item.market_price}}</view>-->
+<!--										</view>-->
+<!--									</view>-->
 								</block>
 							</block>
 							<!-- <view class="money c-red fs32">{{item.market_price}}</view> -->
diff --git a/packageA/pages/distribution/shop/shop.wxml b/packageA/pages/distribution/shop/shop.wxml
index e790000..9ce235d 100644
--- a/packageA/pages/distribution/shop/shop.wxml
+++ b/packageA/pages/distribution/shop/shop.wxml
@@ -89,13 +89,13 @@
 									<view class="fs30 money">{{item.prom_price}}</view>
 								</view>
 							</view>
-							<view class="flex" style="line-height: 28rpx;">
-								<!-- 原价 -->
-								<view class="price flex xc-ash line_th">
-									<!-- <view class="fs22">￥</view> -->
-									<view class="fs22 money">{{item.market_price}}</view>
-								</view>
-							</view>
+<!--							<view class="flex" style="line-height: 28rpx;">-->
+<!--								&lt;!&ndash; 原价 &ndash;&gt;-->
+<!--								<view class="price flex xc-ash line_th">-->
+<!--									&lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
+<!--									<view class="fs22 money">{{item.market_price}}</view>-->
+<!--								</view>-->
+<!--							</view>-->
 						</block>
 						<block wx:else>
 							<!-- 商品价格,先判断下是后⼜等级价 -->
@@ -115,13 +115,13 @@
 												</view>
 											</view>
 										</view>
-										<view class="flex" style="line-height: 28rpx;">
-											<!-- 原价 -->
-											<view class="price flex xc-ash line_th">
-												<!-- <view class="fs22">￥</view> -->
-												<view class="fs22 money">{{item.market_price}}</view>
-											</view>
-										</view>
+<!--										<view class="flex" style="line-height: 28rpx;">-->
+<!--											&lt;!&ndash; 原价 &ndash;&gt;-->
+<!--											<view class="price flex xc-ash line_th">-->
+<!--												&lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
+<!--												<view class="fs22 money">{{item.market_price}}</view>-->
+<!--											</view>-->
+<!--										</view>-->
 									</block>
 									<blocK wx:else>
 										<view class="flex">
@@ -131,13 +131,13 @@
 												<view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
 											</view>
 										</view>
-										<view class="flex" style="line-height: 28rpx;">
-											<!-- 原价 -->
-											<view class="price flex xc-ash line_th">
-												<!-- <view class="fs22">￥</view> -->
-												<view class="fs22 money">{{item.market_price}}</view>
-											</view>
-										</view>
+<!--										<view class="flex" style="line-height: 28rpx;">-->
+<!--											&lt;!&ndash; 原价 &ndash;&gt;-->
+<!--											<view class="price flex xc-ash line_th">-->
+<!--												&lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
+<!--												<view class="fs22 money">{{item.market_price}}</view>-->
+<!--											</view>-->
+<!--										</view>-->
 									</blocK>
 								</block>
 								<block wx:else>
@@ -150,10 +150,10 @@
 												<view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
 											</view>
 											<!-- 原价 -->
-											<view class="price flex xc-ash line_th">
-												<!-- <view class="fs22">￥</view> -->
-												<view class="fs22 money">{{item.market_price}}</view>
-											</view>
+<!--											<view class="price flex xc-ash line_th">-->
+<!--												&lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
+<!--												<view class="fs22 money">{{item.market_price}}</view>-->
+<!--											</view>-->
 										</view>
 										<view class="flexr">
 											<!-- 等级价 -->
@@ -175,13 +175,13 @@
 												<view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
 											</view>
 										</view>
-										<view class="flex" style="line-height: 28rpx;">
-											<!-- 原价 -->
-											<view class="price flex xc-ash line_th">
-												<!-- <view class="fs22">￥</view> -->
-												<view class="fs22 money">{{item.market_price}}</view>
-											</view>
-										</view>
+<!--										<view class="flex" style="line-height: 28rpx;">-->
+<!--											&lt;!&ndash; 原价 &ndash;&gt;-->
+<!--											<view class="price flex xc-ash line_th">-->
+<!--												&lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
+<!--												<view class="fs22 money">{{item.market_price}}</view>-->
+<!--											</view>-->
+<!--										</view>-->
 									</block>
 								</block>
 							</block>
@@ -194,13 +194,13 @@
 										<view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
 									</view>
 								</view>
-								<view class="flex" style="line-height: 28rpx;">
-									<!-- 原价 -->
-									<view class="price flex xc-ash line_th">
-										<!-- <view class="fs22">￥</view> -->
-										<view class="fs22 money">{{item.market_price}}</view>
-									</view>
-								</view>
+<!--								<view class="flex" style="line-height: 28rpx;">-->
+<!--									&lt;!&ndash; 原价 &ndash;&gt;-->
+<!--									<view class="price flex xc-ash line_th">-->
+<!--										&lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
+<!--										<view class="fs22 money">{{item.market_price}}</view>-->
+<!--									</view>-->
+<!--								</view>-->
 							</block>
 						</block>
 						<!-- 分层金额 -->
@@ -233,13 +233,13 @@
 								<view class="fs30 money">{{item.prom_price}}</view>
 							</view>
 						</view>
-						<view class="flex" style="line-height: 28rpx;">
-							<!-- 原价 -->
-							<view class="price flex xc-ash line_th">
-								<!-- <view class="fs22">￥</view> -->
-								<view class="fs22 money">{{item.market_price}}</view>
-							</view>
-						</view>
+<!--						<view class="flex" style="line-height: 28rpx;">-->
+<!--							&lt;!&ndash; 原价 &ndash;&gt;-->
+<!--							<view class="price flex xc-ash line_th">-->
+<!--								&lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
+<!--								<view class="fs22 money">{{item.market_price}}</view>-->
+<!--							</view>-->
+<!--						</view>-->
 					</block>
 					<block wx:else>
 						<!-- 商品价格,先判断下是后⼜等级价 -->
@@ -259,13 +259,13 @@
 											</view>
 										</view>
 									</view>
-									<view class="flex" style="line-height: 28rpx;">
-										<!-- 原价 -->
-										<view class="price flex xc-ash line_th">
-											<!-- <view class="fs22">￥</view> -->
-											<view class="fs22 money">{{item.market_price}}</view>
-										</view>
-									</view>
+<!--									<view class="flex" style="line-height: 28rpx;">-->
+<!--										&lt;!&ndash; 原价 &ndash;&gt;-->
+<!--										<view class="price flex xc-ash line_th">-->
+<!--											&lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
+<!--											<view class="fs22 money">{{item.market_price}}</view>-->
+<!--										</view>-->
+<!--									</view>-->
 								</block>
 								<blocK wx:else>
 									<view class="flex">
@@ -275,13 +275,13 @@
 											<view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
 										</view>
 									</view>
-									<view class="flex" style="line-height: 28rpx;">
-										<!-- 原价 -->
-										<view class="price flex xc-ash line_th">
-											<!-- <view class="fs22">￥</view> -->
-											<view class="fs22 money">{{item.market_price}}</view>
-										</view>
-									</view>
+<!--									<view class="flex" style="line-height: 28rpx;">-->
+<!--										&lt;!&ndash; 原价 &ndash;&gt;-->
+<!--										<view class="price flex xc-ash line_th">-->
+<!--											&lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
+<!--											<view class="fs22 money">{{item.market_price}}</view>-->
+<!--										</view>-->
+<!--									</view>-->
 								</blocK>
 							</block>
 							<block wx:else>
@@ -294,10 +294,10 @@
 											<view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
 										</view>
 										<!-- 原价 -->
-										<view class="price flex xc-ash line_th">
-											<!-- <view class="fs22">￥</view> -->
-											<view class="fs22 money">{{item.market_price}}</view>
-										</view>
+<!--										<view class="price flex xc-ash line_th">-->
+<!--											&lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
+<!--											<view class="fs22 money">{{item.market_price}}</view>-->
+<!--										</view>-->
 									</view>
 									<view class="flexr">
 										<!-- 等级价 -->
@@ -321,13 +321,13 @@
 											<view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
 										</view>
 									</view>
-									<view class="flex" style="line-height: 28rpx;">
-										<!-- 原价 -->
-										<view class="price flex xc-ash line_th">
-											<!-- <view class="fs22">￥</view> -->
-											<view class="fs22 money">{{item.market_price}}</view>
-										</view>
-									</view>
+<!--									<view class="flex" style="line-height: 28rpx;">-->
+<!--										&lt;!&ndash; 原价 &ndash;&gt;-->
+<!--										<view class="price flex xc-ash line_th">-->
+<!--											&lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
+<!--											<view class="fs22 money">{{item.market_price}}</view>-->
+<!--										</view>-->
+<!--									</view>-->
 								</block>
 							</block>
 						</block>
@@ -340,13 +340,13 @@
 									<view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
 								</view>
 							</view>
-							<view class="flex" style="line-height: 28rpx;">
-								<!-- 原价 -->
-								<view class="price flex xc-ash line_th">
-									<!-- <view class="fs22">￥</view> -->
-									<view class="fs22 money">{{item.market_price}}</view>
-								</view>
-							</view>
+<!--							<view class="flex" style="line-height: 28rpx;">-->
+<!--								&lt;!&ndash; 原价 &ndash;&gt;-->
+<!--								<view class="price flex xc-ash line_th">-->
+<!--									&lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
+<!--									<view class="fs22 money">{{item.market_price}}</view>-->
+<!--								</view>-->
+<!--							</view>-->
 						</block>
 					</block>
 					<!-- 分层金额 -->
diff --git a/packageA/pages/jfbuy/jfbuy.wxml b/packageA/pages/jfbuy/jfbuy.wxml
index 3c10909..74a3acb 100644
--- a/packageA/pages/jfbuy/jfbuy.wxml
+++ b/packageA/pages/jfbuy/jfbuy.wxml
@@ -51,7 +51,7 @@
 									<text>{{item.integral}}积分 + ￥{{item.addmoney}}</text>						
 								</view>
 								<view class="pdt14 fs22 gray flex jc_sb">
-									<view>零售价：￥{{item.market_price}}</view>
+									<view>￥{{item.shop_price}}</view>
 									<view>销量：{{item.buy_num+item.virtual}}</view>
 								</view>
 							</view>
diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js
index ea36031..7a2ea79 100644
--- a/packageA/pages/prom_list/prom_list.js
+++ b/packageA/pages/prom_list/prom_list.js
@@ -270,7 +270,7 @@ Page({
     				if (!ee.data.collocationList) {
     					/*---获取活动的重表---*/
     					//调用接口判断订单优惠，
-    					getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + ee.data.gid + "/2"+"/"+oo.user_id, {}).then(res => {
+    					getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + ee.data.gid + "/2"+"/"+getApp().globalData.user_id, {}).then(res => {
     						if (res.data.code == 0) {
 									var r_data = res.data.data;
 									
diff --git a/packageB/pages/zuhegou/index/index.wxml b/packageB/pages/zuhegou/index/index.wxml
index 194fcc6..732cedf 100644
--- a/packageB/pages/zuhegou/index/index.wxml
+++ b/packageB/pages/zuhegou/index/index.wxml
@@ -56,7 +56,7 @@
                                 <block wx:else>
                                     <text class="rmb fs30 c-red">{{filters.toFix(item.shop_price,2)}}</text>
                                 </block>
-                                <text class="rmb fs20 line-through cb">{{filters.toFix(item.market_price,2)}}</text>
+<!--                                <text class="rmb fs20 line-through cb">{{filters.toFix(item.market_price,2)}}</text>-->
                             </view>
                             <view class="c-red pdr10 {{item.haveAdded ? 'active':''}}" catchtap="addToCart"
                                   data-index="{{index}}">
diff --git a/packageB/pages/zuhegou/preindex/index.wxml b/packageB/pages/zuhegou/preindex/index.wxml
index 6a7929e..3acc834 100644
--- a/packageB/pages/zuhegou/preindex/index.wxml
+++ b/packageB/pages/zuhegou/preindex/index.wxml
@@ -49,7 +49,7 @@
                                 <block wx:else>
                                     <text class="rmb fs30 c-red">{{filters.toFix(item.shop_price,2)}}</text>
                                 </block>
-                                <text class="rmb fs20 line-through cb">{{filters.toFix(item.market_price,2)}}</text>
+<!--                                <text class="rmb fs20 line-through cb">{{filters.toFix(item.market_price,2)}}</text>-->
                             </view>
                             
                         </view>
diff --git a/packageC/pages/goods/distributionCategoryList/index.wxml b/packageC/pages/goods/distributionCategoryList/index.wxml
index 0e31077..ad0d7cb 100644
--- a/packageC/pages/goods/distributionCategoryList/index.wxml
+++ b/packageC/pages/goods/distributionCategoryList/index.wxml
@@ -113,9 +113,9 @@
                         <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
                         <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
                       </view>
-                      <view class="comment flex jc_sb">
-                        <view class="word-line xc-ash">￥{{item.market_price}}</view>
-                      </view>
+<!--                      <view class="comment flex jc_sb">-->
+<!--                        <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
+<!--                      </view>-->
                       <view class="fs24 c-a flex jc_sb">
                         <text class="money c-red">分成金额：{{filter.toFix(item.commission,2)}}</text>
                         <text>评论{{item.comment_count}}</text>
@@ -135,9 +135,9 @@
                                 <view class="card_name">{{card_name}}</view>
                               </view>
                             </view>
-                            <view class="comment flex jc_sb">
-                              <view class="word-line xc-ash">￥{{item.market_price}}</view>
-                            </view>
+<!--                            <view class="comment flex jc_sb">-->
+<!--                              <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
+<!--                            </view>-->
                             <view class="fs24 c-a flex jc_sb">
                               <text class="c-red">分成金额：{{filter.toFix(item.commission,2)}}</text>
                               <text>评论{{item.comment_count}}</text>
@@ -145,9 +145,9 @@
                           </block>
                           <block wx:else>
                             <view class="price">￥{{item.shop_price}}</view>
-                            <view class="comment flex jc_sb">
-                              <view class="word-line xc-ash">￥{{item.market_price}}</view>
-                            </view>
+<!--                            <view class="comment flex jc_sb">-->
+<!--                              <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
+<!--                            </view>-->
                             <view class="fs24 c-a flex jc_sb">
                               <text class="c-red">分成金额：{{filter.toFix(item.commission,2)}}</text>
                               <text>评论{{item.comment_count}}</text>
@@ -158,7 +158,7 @@
                           <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
                             <view class="flex ai-center">
                               <view class="price">￥{{item.shop_price}}</view>
-                              <view class="word-line xc-ash mk_price">￥{{item.market_price}}</view>
+<!--                              <view class="word-line xc-ash mk_price">￥{{item.market_price}}</view>-->
                             </view>
                             <view class="comment flex jc_sb">
                               <view class="flex ai-center">
@@ -178,9 +178,9 @@
                           </block>
                           <block wx:else>
                             <view class="price">￥{{item.shop_price}}</view>
-                            <view class="comment flex jc_sb">
-                              <view class="word-line xc-ash">￥{{item.market_price}}</view>
-                            </view>
+<!--                            <view class="comment flex jc_sb">-->
+<!--                              <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
+<!--                            </view>-->
                             <view class="fs24 c-a flex jc_sb">
                               <text class="money c-red">
                                 分成金额：{{filter.toFix(item.commission,2)}}
@@ -192,9 +192,9 @@
                       </block>
                       <block wx:else>
                         <view class="price">￥{{item.shop_price}}</view>
-                        <view class="comment flex jc_sb">
-                          <view class="word-line xc-ash">￥{{item.market_price}}</view>
-                        </view>
+<!--                        <view class="comment flex jc_sb">-->
+<!--                          <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
+<!--                        </view>-->
                         <view class="fs24 c-a flex jc_sb">
                           <text class="money c-red">分成金额：{{filter.toFix(item.commission,2)}}</text>
                           <text>评论{{item.comment_count}}</text>
diff --git a/packageC/pages/goods/goodsList/goodsList.wxml b/packageC/pages/goods/goodsList/goodsList.wxml
index 784b74b..821faf5 100644
--- a/packageC/pages/goods/goodsList/goodsList.wxml
+++ b/packageC/pages/goods/goodsList/goodsList.wxml
@@ -71,7 +71,7 @@
 						<text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
 						<text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>			
 					</view>
-					<view class="word-line xc-ash mgl10 rmb fs24">{{item.market_price}}</view>
+<!--					<view class="word-line xc-ash mgl10 rmb fs24">{{item.market_price}}</view>-->
 				</view>
             
 					
@@ -98,7 +98,7 @@
                   </view>
                 </view>
                 <view class="comment">
-                  <view class="word-line xc-ash">￥{{item.market_price}}</view>
+<!--                  <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
                   <view class="fs24 t-r">
 										<span>评论{{item.comment_count}}</span>
 										<span class="pdl30">已售{{item.sales_sum}}</span>
@@ -108,7 +108,7 @@
               <block wx:else>
                 <view class="price">￥{{item.shop_price}}</view>
                 <view class="comment">
-                  <view class="word-line xc-ash">￥{{item.market_price}}</view>
+<!--                  <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
                   <view class="fs24 t-r">
 										<span>评论{{item.comment_count}}</span>
 										<span class="pdl30">已售{{item.sales_sum}}</span>
@@ -120,7 +120,7 @@
               <view wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
                 <view class="flex ai-center">
                   <view class="price rmb">{{item.shop_price}}</view>
-                  <view class="word-line xc-ash mk_price rmb">{{item.market_price}}</view>
+<!--                  <view class="word-line xc-ash mk_price rmb">{{item.market_price}}</view>-->
                 </view>
                 <view class="comment">
                   <view class="flex ai-center">
@@ -139,7 +139,7 @@
               <block wx:else>
 								<view>
 									<view class="price">￥{{item.shop_price}}</view>
-									<view class="word-line xc-ash">￥{{item.market_price}}</view>
+<!--									<view class="word-line xc-ash">￥{{item.market_price}}</view>-->
 								</view>
                 <!-- <view class="price">￥{{item.shop_price}}</view> -->
                 <view class="comment pdt10">
@@ -154,7 +154,7 @@
           <view wx:else>
 						<view class="flex ai-center">
 							<view class="price rmb">{{item.shop_price}}</view>
-							<view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>
+<!--							<view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>-->
 						</view>
             
             <view class="comment pdt10">
@@ -186,7 +186,7 @@
 							<text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
 							<text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>			
 						</view>
-						<view class="word-line xc-ash mgl10 rmb fs24">{{item.market_price}}</view>
+<!--						<view class="word-line xc-ash mgl10 rmb fs24">{{item.market_price}}</view>-->
 					</view>
 		          
 						
@@ -213,7 +213,7 @@
 		                </view>
 		              </view>
 		              <view class="comment">
-		                <view class="word-line xc-ash">￥{{item.market_price}}</view>
+<!--		                <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
 		                <view class="fs24 t-r">
 											<span>评论{{item.comment_count}}</span>
 											<span class="pdl30">已售{{item.sales_sum}}</span>
@@ -223,7 +223,7 @@
 		            <block wx:else>
 		              <view class="price">￥{{item.shop_price}}</view>
 		              <view class="comment">
-		                <view class="word-line xc-ash">￥{{item.market_price}}</view>
+<!--		                <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
 		                <view class="fs24 t-r">
 											<span>评论{{item.comment_count}}</span>
 											<span class="pdl30">已售{{item.sales_sum}}</span>
@@ -235,7 +235,7 @@
 		            <view wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
 		              <view class="flex ai-center">
 		                <view class="price rmb">{{item.shop_price}}</view>
-		                <view class="word-line xc-ash mk_price rmb">{{item.market_price}}</view>
+<!--		                <view class="word-line xc-ash mk_price rmb">{{item.market_price}}</view>-->
 		              </view>
 		              <view class="comment">
 		                <view class="flex ai-center">
@@ -254,7 +254,7 @@
 		            <block wx:else>
 									<view>
 										<view class="price">￥{{item.shop_price}}</view>
-										<view class="word-line xc-ash">￥{{item.market_price}}</view>
+<!--										<view class="word-line xc-ash">￥{{item.market_price}}</view>-->
 									</view>
 		              <!-- <view class="price">￥{{item.shop_price}}</view> -->
 		              <view class="comment pdt10">
@@ -269,7 +269,7 @@
 		        <view wx:else>
 							<view class="">
 								<view class="price rmb">{{item.shop_price}}</view>
-								<view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>
+<!--								<view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>-->
 							</view>
 		          
 		          <view class="comment pdt10">
diff --git a/packageC/pages/group_list/group_list.wxml b/packageC/pages/group_list/group_list.wxml
index 1e04a00..92526d1 100644
--- a/packageC/pages/group_list/group_list.wxml
+++ b/packageC/pages/group_list/group_list.wxml
@@ -16,7 +16,7 @@
 						<view class="rmb c-red fs30" wx:if="{{type == 1}}">{{item.price}}</view>
 						<view class="rmb c-red fs30"  style="color:#059de5;" wx:else>{{item.price}}</view>
 
-						<view class="rmb del fs24 c-7b pdl10">{{item.market_price}}</view>
+<!--						<view class="rmb del fs24 c-7b pdl10">{{item.market_price}}</view>-->
 					</view>
 				</view>
 				<view class="flex jc_sb ai-center c-7b">
diff --git a/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxml b/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxml
index d91b02b..7f5aafa 100644
--- a/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxml
+++ b/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxml
@@ -22,7 +22,7 @@
 						<view>
 							<view class="flex ai-center">
 								<text class="rmb c-red">{{filters.price(item.group_price)}}</text>
-								<view class="del fs22 c-a pdl10">零售价:<text class="rmb">{{item.market_price}}</text></view>
+<!--								<view class="del fs22 c-a pdl10"><text class="rmb">{{item.shop_price}}</text></view>-->
 							</view>
 							<view class="flex jc_sb">
 								<progress class="pdr20 f1 progress" percent="{{filters.percent(item.num, item.group_num)}}" activeColor="#FF6768" backgroundColor="#d0d0d0" border-radius="12" stroke-width="12" data-content="{{item.num}}人已参团"></progress>
diff --git a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
index 9d2e658..532f3d8 100644
--- a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
+++ b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
@@ -751,7 +751,29 @@ Page({
 
                     t.data.data.original_img = oo.imghost + t.data.data.original_img;
                     t.data.data['buynum'] = gg.goods_num;
-                    var distr_t = 0, et = 0
+                    var distr_t = 0, et = 0;
+
+                    if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){
+
+                        if(t.data.data.distr_type==1 || gg.pick_dis==1) {
+                            wx.showToast({
+                                title: "视频号仅支持物流",
+                                icon: 'none',
+                                duration: 2000
+                            })
+
+                            setTimeout(function(){
+                                wx.navigateBack({delta: 1})
+                            },1000)
+
+                            return false
+                        }
+
+                        t.data.data.distr_type=2;
+                        th.setData({show_same_city:0})
+
+                    }
+
                     if (t.data.data.distr_type == 0) {
                         distr_t = gg.pick_dis;
                     } else {
diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
index 4e0986b..6800d59 100644
--- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
+++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
@@ -260,7 +260,27 @@ Page({
 				t.data.data['buynum'] = gg.goods_num;
 				// console.log(t.data.data);
 				var distr_t = 0,
-					et = 0
+					et = 0;
+
+				if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){
+
+					if(t.data.data.distr_type==1 || gg.pick_dis==1) {
+						wx.showToast({
+							title: "视频号仅支持物流",
+							icon: 'none',
+							duration: 2000
+						})
+
+						wx.navigateBack({delta: 1})
+
+						return false
+					}
+
+					t.data.data.distr_type=2;
+					th.setData({show_same_city:0})
+
+				}
+
 				if (t.data.data.distr_type == 0) {
 					distr_t = gg.pick_dis;
 				} else {
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
index c009fa0..ba1fc77 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
@@ -114,7 +114,7 @@
 								<view class="fs50 val">{{filters.toFix(luckGoInfo.group_price/100,2)}}</view>
               </view>
               <view class="word-line fs20 xc-qtunit-price">
-                手店价
+<!--                手店价-->
 								<!-- ￥{{filters.toFix(data.shop_price,2)}} -->
 								<block wx:if="{{card_field && sele_g[card_field]>0}}"><text class="rmb lh1">{{sele_g[card_field]}}</text></block>
 								<block wx:else><text class="rmb lh1">{{sele_g.shop_price}}</text></block>
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss
index c0ea42b..76eb995 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss
@@ -2319,8 +2319,7 @@ left:25rpx;
   color: #fff;
 }
 .xc-qt-price .xc-qtunit-price{
-  margin-left:6rpx;
-margin-top:-4rpx;
+  margin-left:-96rpx;
 }
 .xc-nanber{
   top:-25rpx;
diff --git a/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxml b/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxml
index eacf839..8c557d1 100644
--- a/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxml
+++ b/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxml
@@ -23,7 +23,7 @@
 					<view class="title ellipsis-2">{{item.goods_name}}</view>
 					<view class="flex ai-center">
 						<text class="rmb fs40 c-red">{{filters.price(item.group_price)}}</text>
-						<view class="fs24 del pdl10 c-c7">零售价<text class="rmb">{{item.market_price}}</text></view>
+<!--						<view class="fs24 del pdl10 c-c7">零售价<text class="rmb">{{item.market_price}}</text></view>-->
 					</view>
 					<view class="c-red fs24" wx:if="{{item.team_status != 2}}">未团中可获得帮团奖励</view>
 				</view>
diff --git a/packageC/pages/payForAnother/payForAnother.js b/packageC/pages/payForAnother/payForAnother.js
index f7deb93..ede814a 100644
--- a/packageC/pages/payForAnother/payForAnother.js
+++ b/packageC/pages/payForAnother/payForAnother.js
@@ -719,7 +719,29 @@ Page({
 
                     t.data.data.original_img = oo.imghost + t.data.data.original_img;
                     t.data.data['buynum'] = gg.goods_num;
-                    var distr_t = 0, et = 0
+                    var distr_t = 0, et = 0;
+
+                    if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){
+
+                        if(t.data.data.distr_type==1 || gg.pick_dis==1) {
+                            wx.showToast({
+                                title: "视频号仅支持物流",
+                                icon: 'none',
+                                duration: 2000
+                            })
+
+                            setTimeout(function(){
+                                wx.navigateBack({delta: 1})
+                            },1000)
+
+                            return false
+                        }
+
+                        t.data.data.distr_type=2;
+                        th.setData({show_same_city:0})
+
+                    }
+
                     if (t.data.data.distr_type == 0) {
                         distr_t = gg.pick_dis;
                     } else {
diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js
index 89164c0..8e9a674 100644
--- a/packageC/pages/presell/cart/cart.js
+++ b/packageC/pages/presell/cart/cart.js
@@ -586,6 +586,28 @@ Page({
 
         var price = presell.presell_price;
         if (!goods) return false;
+
+        if(goods.is_minishop==1 && getApp().is_sp_hao()){
+
+            if(goods.distr_type==1 || pickup.distr_type==1) {
+                wx.showToast({
+                    title: "视频号仅支持物流",
+                    icon: 'none',
+                    duration: 2000
+                })
+
+                setTimeout(function(){
+                    wx.navigateBack({delta: 1})
+                },1000)
+
+                return false
+            }
+
+            goods.distr_type=2;
+            th.setData({show_same_city:0})
+
+        }
+
         //--判断物流--
         if (goods.distr_type)
             distr_type = goods.distr_type;
diff --git a/packageC/pages/presell/cart/cart2.js b/packageC/pages/presell/cart/cart2.js
index 20474ca..495095e 100644
--- a/packageC/pages/presell/cart/cart2.js
+++ b/packageC/pages/presell/cart/cart2.js
@@ -401,7 +401,29 @@ Page({
 
                 t.data.data.original_img = oo.imghost + t.data.data.original_img;
                 t.data.data['buynum'] = th.data.gg.goods_num;
-                var distr_t = 0, et = 0
+                var distr_t = 0, et = 0;
+
+                if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){
+
+                    if(t.data.data.distr_type==1 || gg.pick_dis==1) {
+                        wx.showToast({
+                            title: "视频号仅支持物流",
+                            icon: 'none',
+                            duration: 2000
+                        })
+
+                        setTimeout(function(){
+                            wx.navigateBack({delta: 1})
+                        },1000)
+
+                        return false
+                    }
+
+                    t.data.data.distr_type=2;
+                    th.setData({show_same_city:0})
+
+                }
+
                 if (t.data.data.distr_type == 0) {
                     distr_t = th.data.gg.pick_dis;
                 } else {
diff --git a/packageC/pages/presell/cart/cart2_pre.js b/packageC/pages/presell/cart/cart2_pre.js
index 8772484..8c92d21 100644
--- a/packageC/pages/presell/cart/cart2_pre.js
+++ b/packageC/pages/presell/cart/cart2_pre.js
@@ -186,6 +186,29 @@ Page({
                 t.data.data['buynum'] = gg.goods_num;
 
                 var distr_t = 0, et = 0;
+
+                if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){
+
+                    if(t.data.data.distr_type==1 || gg.pick_dis==1) {
+                        wx.showToast({
+                            title: "视频号仅支持物流",
+                            icon: 'none',
+                            duration: 2000
+                        })
+
+                        setTimeout(function(){
+                            wx.navigateBack({delta: 1})
+                        },1000)
+
+                        return false
+                    }
+
+                    t.data.data.distr_type=2;
+                    th.setData({show_same_city:0})
+
+                }
+
+
                 if (t.data.data.distr_type == 0) {
                     distr_t = gg.pick_dis;
                 } else {
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js
index 27c85c1..2d38450 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.js
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.js
@@ -2858,12 +2858,12 @@ Page({
             var wd2 = th.data.screenWidth - ut.measureText(pri0, 22 * unit) - 25;
 			
 			if(th.data.presellForm.presell_type==1){
-			   context.setStrokeStyle('gray');
-			   context.fillText(pri0, wd2, 213 * unit);
-			   context.setLineWidth(1 * unit);
-			   context.moveTo(wd2 - 5, 206 * unit);
-			   context.lineTo(wd2 + ut.measureText(pri0, 22 * unit) + 5, 206 * unit);
-			   context.stroke();
+			   // context.setStrokeStyle('gray');
+			   // context.fillText(pri0, wd2, 213 * unit);
+			   // context.setLineWidth(1 * unit);
+			   // context.moveTo(wd2 - 5, 206 * unit);
+			   // context.lineTo(wd2 + ut.measureText(pri0, 22 * unit) + 5, 206 * unit);
+			   // context.stroke();
 			}else{
 			   context.fillText('定金', wd2, 213 * unit);
 			}
@@ -3198,7 +3198,7 @@ Page({
         data: req_data,
     })
         .then(res => {
-            if (t.ajax_ok(res)) {
+            if (ut.ajax_ok(res)) {
                 _this.setData({
                     historyBuyInfo: res.data.data.pageData,
                 })
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.wxml b/packageC/pages/presell/goodsInfo/goodsInfo.wxml
index 3ba4a2f..c0d7388 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.wxml
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.wxml
@@ -80,9 +80,9 @@
           <view class="abs xc-qt-price fs28 xc-qtsign">预售价</view>
           <view class="abs flex presell_price">
             <view class="fs28 val" style="margin-right:100rpx">￥{{presellList.presell_price}}</view>
-            <view class="word-line fs26 xc-qtunit-price">
-              零售价￥{{filters.toFix(data.market_price,2)}}
-            </view>
+<!--            <view class="word-line fs26 xc-qtunit-price">-->
+<!--              零售价￥{{filters.toFix(data.market_price,2)}}-->
+<!--            </view>-->
           </view>
 
 
diff --git a/packageC/pages/presell/list/list.wxml b/packageC/pages/presell/list/list.wxml
index 30665c7..87c3556 100644
--- a/packageC/pages/presell/list/list.wxml
+++ b/packageC/pages/presell/list/list.wxml
@@ -59,7 +59,8 @@
                     <view class="fs40 flex xc-buttom-money {{type==1?'xc-wc':'blue_c'}}" >
                     <view class="fs28" style="line-height: 16px;">￥{{item.presell_price}}</view>
                     <text>{{item.price}}</text> 
-                    <span class="underline fs20">零售价￥{{item.market_price}}</span></view>
+<!--                    <span class="underline fs20">零售价￥{{item.market_price}}</span>-->
+                    </view>
                 </view>
                 <view class="kill-btn ">
                     <navigator wx:if="{{type==1}}" url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&pre_id={{item.id}}">去抢购</navigator>
diff --git a/pages/activity/pind_list/pind_list.wxml b/pages/activity/pind_list/pind_list.wxml
index 5f7b5ce..2c4e617 100644
--- a/pages/activity/pind_list/pind_list.wxml
+++ b/pages/activity/pind_list/pind_list.wxml
@@ -69,7 +69,7 @@
                     <view class="fs40 flex  xc-top15 {{type==1?'red-co ai-bas':'blue_c xc-lihe42 ai-bas'}}">
                     <text class="fs28 {{type==0?'martop13':''}}">￥</text>
                    <text style="margin-left:-5rpx">{{item.price}}</text>
-                    <span class="underline {{type==0?'martop18':''}}">零售价￥{{item.market_price}}</span>
+<!--                    <span class="underline {{type==0?'martop18':''}}">￥{{item.shop_price}}</span>-->
                     </view>
                   
                 </view>
diff --git a/pages/activity/seckill_list/seckill_list.wxml b/pages/activity/seckill_list/seckill_list.wxml
index 2681e2b..fbf6a19 100644
--- a/pages/activity/seckill_list/seckill_list.wxml
+++ b/pages/activity/seckill_list/seckill_list.wxml
@@ -69,8 +69,9 @@
                     <view class="fs40 flex xc-buttom-money {{type==1?'xc-wc':'blue_c'}}" >
                     <view class="fs28" style="line-height: 16px;">￥</view>
                     <text>{{item.price}}</text> 
-                    <span class="underline fs20">零售价￥{{item.market_price}}</span></view>
-                    
+<!--                    <span class="underline fs20">零售价￥{{item.market_price}}</span>-->
+                    </view>
+
                 </view>
                 <view class="kill-btn ">
                     <!-- <navigator style="background-color: #059de5;"  url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_id={{item.id}}&prom_type=1" wx:if="{{type==0}}" >即将开始</navigator>
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 477b30d..c21e385 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -871,6 +871,30 @@ Page({
                     t.data.data.original_img = oo.imghost + t.data.data.original_img;
                     t.data.data['buynum'] = gg.goods_num;
                     var distr_t = 0, et = 0
+
+                    if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){
+
+                        if(t.data.data.distr_type==1 || gg.pick_dis==1) {
+                            wx.showToast({
+                                title: "视频号仅支持物流",
+                                icon: 'none',
+                                duration: 2000
+                            })
+
+                            setTimeout(function(){
+                                wx.navigateBack({delta: 1})
+                            },1000)
+
+
+                            return false
+                        }
+
+                        t.data.data.distr_type=2;
+                        th.setData({show_same_city:0})
+
+                    }
+
+
                     if (t.data.data.distr_type == 0) {
                         distr_t = gg.pick_dis;
                     } else {
diff --git a/pages/cart/cart2_inte/cart2_inte.js b/pages/cart/cart2_inte/cart2_inte.js
index 17daa97..504dd6e 100644
--- a/pages/cart/cart2_inte/cart2_inte.js
+++ b/pages/cart/cart2_inte/cart2_inte.js
@@ -295,7 +295,7 @@ Page({
             //-- 如果商品有同城配送的参数的时候,一件代发商品不能显示同城配送按钮 --
             if(gd.is_same_city && th.data.is_same_city && gd.whsle_id<=0){
 
-                getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+gg.pick_id, {}).then(res=>{
+                await getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+gg.pick_id, {}).then(res=>{
                     if(res.data.code==0){
                         var pk=res.data.data;
                         if(pk && pk.is_same_city){
@@ -311,6 +311,29 @@ Page({
           t.data.data.original_img = oo.imghost + t.data.data.original_img;
           t.data.data['buynum'] = gg.goods_num;
           var distr_t = 0, et = 0
+
+            if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){
+
+                if(t.data.data.distr_type==1 || gg.pick_dis==1) {
+                    wx.showToast({
+                        title: "视频号仅支持物流",
+                        icon: 'none',
+                        duration: 2000
+                    })
+
+                    setTimeout(function(){
+                        wx.navigateBack({delta: 1})
+                    },1000)
+
+
+                    return false
+                }
+
+                t.data.data.distr_type=2;
+                th.setData({show_same_city:0})
+
+            }
+
           if (t.data.data.distr_type == 0) {
             distr_t = gg.pick_dis;
           } else {
diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js
index 386d868..9e73cac 100644
--- a/pages/cart/cart2_pt/cart2_pt.js
+++ b/pages/cart/cart2_pt/cart2_pt.js
@@ -171,7 +171,7 @@ Page({
     var gg = th.data.postdata;
     //调用商品
     a.get("/api/weshop/goods/get/" + oo.stoid + "/" + gg.goods_id, {
-      success: function (t) {
+      success:async  function (t) {
         var gd = t.data.data;
         if (!gd) return false;
 
@@ -179,7 +179,7 @@ Page({
           //-- 如果商品有同城配送的参数的时候,一件代发商品不能显示同城配送按钮 --
           if(gd.is_same_city && th.data.is_same_city && gd.whsle_id<=0){
 
-              getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+gg.pick_id, {}).then(res=>{
+             await getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+gg.pick_id, {}).then(res=>{
                   if(res.data.code==0){
                       var pk=res.data.data;
                       if(pk && pk.is_same_city){
@@ -194,7 +194,30 @@ Page({
         t.data.data.original_img = oo.imghost + t.data.data.original_img;
         t.data.data['buynum'] = gg.goods_num;
         console.log(t.data.data);
-        var distr_t = 0, et = 0
+        var distr_t = 0, et = 0;
+
+          if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){
+
+              if(t.data.data.distr_type==1 || gg.pick_dis==1) {
+                  wx.showToast({
+                      title: "视频号仅支持物流",
+                      icon: 'none',
+                      duration: 2000
+                  })
+
+                  setTimeout(function(){
+                      wx.navigateBack({delta: 1})
+                  },1000)
+
+
+                  return false
+              }
+
+              t.data.data.distr_type=2;
+              th.setData({show_same_city:0})
+
+          }
+
         if (t.data.data.distr_type == 0) {
           distr_t = gg.pick_dis;
         } else {
diff --git a/pages/cart/cart_wk/cart_wk.js b/pages/cart/cart_wk/cart_wk.js
index 890ad62..68a50c0 100644
--- a/pages/cart/cart_wk/cart_wk.js
+++ b/pages/cart/cart_wk/cart_wk.js
@@ -266,6 +266,29 @@ Page({
     order.tail_money = tail_money;
 
     if (!goods) return false;
+
+      if(goods.is_minishop==1 && getApp().is_sp_hao()){
+
+          if(goods.distr_type==1 || pickup.distr_type==1) {
+              wx.showToast({
+                  title: "视频号仅支持物流",
+                  icon: 'none',
+                  duration: 2000
+              })
+
+              setTimeout(function(){
+                  wx.navigateBack({delta: 1})
+              },1000)
+
+              return false
+          }
+
+          goods.distr_type=2;
+          th.setData({show_same_city:0})
+
+      }
+
+
     //--判断物流--
     if (goods.distr_type)
       distr_type = goods.distr_type;
diff --git a/pages/distribution/distribution.js b/pages/distribution/distribution.js
index a5da9c2..509ace9 100644
--- a/pages/distribution/distribution.js
+++ b/pages/distribution/distribution.js
@@ -102,7 +102,7 @@ Page({
 	  await getApp().promiseGet("/api/weshop/storeDistribut/get/"+os.stoid,{}).then(rs=>{
 	  	  var dis=rs.data.data;	
 	  	  if( dis && dis.switch==0){
-	  		   self.setData({err_word:"商家暂时未开启分享，敬请期待"});
+	  		   self.setData({err_word:"商家暂时未开启分销，敬请期待"});
 			   isok=0;
 	  	  }
 	  				  
diff --git a/pages/giftpack/buygiftpack/giftpackbuy.js b/pages/giftpack/buygiftpack/giftpackbuy.js
index b200948..79b9aa8 100644
--- a/pages/giftpack/buygiftpack/giftpackbuy.js
+++ b/pages/giftpack/buygiftpack/giftpackbuy.js
@@ -108,7 +108,7 @@ Page({
         }
       })
     }
-    getApp().request.promiseGet("/api/weshop/ad/page?pid=901&store_id=" + os.stoid, {
+    getApp().request.promiseGet("/api/weshop/ad/page?pid=902&store_id=" + os.stoid, {
       data: {
         enabled: 1
       }
diff --git a/pages/giftpack/mygiftpack/mygiftpack.js b/pages/giftpack/mygiftpack/mygiftpack.js
index dd13e47..4760e80 100644
--- a/pages/giftpack/mygiftpack/mygiftpack.js
+++ b/pages/giftpack/mygiftpack/mygiftpack.js
@@ -59,7 +59,7 @@ Page({
       })
     }
 
-    getApp().request.promiseGet("/api/weshop/ad/page?pid=901&store_id=" + os.stoid, {
+    getApp().request.promiseGet("/api/weshop/ad/page?pid=902&store_id=" + os.stoid, {
       data: {
         enabled: 1
       }
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 5240d8d..0a13f41 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -5014,6 +5014,7 @@ Page({
 				};
 				
 				//---市场价划掉---
+                /*---
 				context.setFillStyle("gray")
 				context.setFontSize(22 * unit)
 				var pri0 = "￥" + this.data.data.market_price.toFixed(2);
@@ -5024,7 +5025,7 @@ Page({
 				context.setLineWidth(1 * unit);
 				context.moveTo(54 * unit, 763 * unit);
 				context.lineTo(ut.measureText(pri0, 22 * unit) + 50, 763 * unit);
-				context.stroke();
+				context.stroke();--*/
 				
 				// 8.商品标题
 				context.setFontSize(20 * unit);
@@ -5205,6 +5206,7 @@ Page({
                         context.fillText(pri0, wd1, 185 * unit);
 
                         //---市场价划掉---
+                        /*--
                         context.setFillStyle("gray")
                         context.setFontSize(22 * unit)
                         pri0 = "￥" + th.data.data.market_price.toFixed(2);
@@ -5215,7 +5217,7 @@ Page({
                         context.setLineWidth(1 * unit);
                         context.moveTo(wd2 - 5, 206 * unit);
                         context.lineTo(wd2 + ut.measureText(pri0, 22 * unit) + 5, 206 * unit);
-                        context.stroke();
+                        context.stroke();--*/
 
                     } else if (type == 4 && type != 0 && type != 1 && type != 2 && type != 3) {
                         context.setFillStyle("black");
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 49eff38..82e49f0 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -98,7 +98,7 @@
         <view class="prom_show rel" wx:if="{{prom_type==2}}">
 
           <view class="abs flex" style="align-items:flex-end;color: #fff; margin-top: 34rpx; margin-left: 10rpx; height: 60rpx">￥{{prom_price}}
-            <view class="word-line fs24" style="position: relative;top: -6rpx">零售价￥{{filters.toFix(data.market_price,2)}}</view></view>
+            <view class="word-line fs24" style="position: relative;top: -6rpx">￥{{filters.toFix(data.shop_price,2)}}</view></view>
 
           <image class="abs" style="width: 120rpx;top: 32rpx; right: 220rpx;" mode="widthFix" src='{{iurl+"/miniapp/images/activity-time.png"}}'></image>
 
@@ -125,7 +125,7 @@
                 <view class="fs50 val">{{prom_price}}</view>
               </view>
               <view class="word-line fs20 xc-qtunit-price">
-                零售价￥{{filters.toFix(data.market_price,2)}}
+                ￥{{filters.toFix(data.shop_price,2)}}
               </view>
             </view>
 						
@@ -261,7 +261,7 @@
                 <text class="rel_txt" wx:if="{{prom_price}}">{{filters.toFix(prom_price,2)}}元</text>
                 <text class="rel_txt" wx:if="{{!prom_integral && !prom_price}}">0积分</text>
                 <text class="rel_txt fs22" decode="{{true}}" space="{{true}}" style="color: #999; text-decoration: line-through;">
-                  &nbsp;&nbsp;&nbsp;零售价:￥{{filters.toFix(data.market_price,2)}}
+                  &nbsp;&nbsp;&nbsp;￥{{filters.toFix(data.shop_price,2)}}
                 </text>
               </view>
               <!-- 这个是分享按钮 -->
@@ -302,18 +302,18 @@
                     </view>
                     <text class="rel yuan">￥</text>
                     {{filters.toFix(data[card_field],2)}}
-                    <view class='yj' style="top:35rpx">
-                      <text>零售价:￥{{filters.toFix(data.market_price,2)}}</text>
-                    </view>
+<!--                    <view class='yj' style="top:35rpx">-->
+<!--                      <text>零售价:￥{{filters.toFix(data.market_price,2)}}</text>-->
+<!--                    </view>-->
                   </block>
                   <block wx:elif="{{prom_type!=2}}">
 
 
                     <text class="yuan">￥</text>
                     {{filters.toFix(data.shop_price,2)}}
-                    <view class='yj'>
-                      <text>零售价:￥{{filters.toFix(data.market_price,2)}}</text>
-                    </view>
+<!--                    <view class='yj'>-->
+<!--                      <text>零售价:￥{{filters.toFix(data.market_price,2)}}</text>-->
+<!--                    </view>-->
                   </block>
                 </view>
               </view>
@@ -410,7 +410,7 @@
                     <text class="fs30">￥</text>
                     {{prom_price}}
                   </view>
-                  <view class="word-line fs24">零售价￥{{filters.toFix(data.market_price,2)}}</view>
+                  <view class="word-line fs24">￥{{filters.toFix(data.shop_price,2)}}</view>
                 </view>
                 <!-- 这个是分享按钮 -->
                 <view class="xc-share-frame t-c shrink0" bindtap="clickShare">
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index 9220eef..1cb2746 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -185,7 +185,7 @@
 								<!-- <view class="red-co mar-top10 is_seckill_height"> -->
 								<view class="co-red mar-top10">
 									<text class="fs20">￥</text>{{aitem.price}}
-									<text class="un_line">￥{{aitem.market_price}}</text>
+<!--									<text class="un_line">￥{{aitem.shop_price}}</text>-->
 								</view>
 						</navigator>
 				
@@ -227,7 +227,7 @@
 						<view class="co-red mar-top10 flex jc_sb ali-c">
 							<view>
 								<text><text class="fs20">￥</text>{{aitem.presell_price}}</text>
-								<text class="un_line">￥{{aitem.market_price}}</text>
+<!--								<text class="un_line">￥{{aitem.shop_price}}</text>-->
 							</view>
 							<view class="btn-buy">去抢购</view>
 						</view>
@@ -264,7 +264,7 @@
 							<view>
 								<view class="flex ai-center">
 									<text class="rmb c-red">{{filter.price(item.group_price)}}</text>
-									<view class="del fs22 c-a pdl10">零售价:<text class="rmb">{{item.market_price}}</text></view>
+<!--									<view class="del fs22 c-a pdl10"><text class="rmb">{{item.shop_price}}</text></view>-->
 								</view>
 								<view class="flex jc_sb">
 									<progress class="pdr20 f1 progress" percent="{{filter.percent(item.num, item.group_num)}}" activeColor="#FF6768" backgroundColor="#d0d0d0" border-radius="12" stroke-width="12" data-content="{{item.num}}人已参团"></progress>
@@ -350,7 +350,7 @@
                       <view class="fs40 flex  xc-top15 {{aitem.is_team_tepy==0?'blue_c ai-bas':' red-co ai-bas'}}">
                         <text class="fs28 {{aitem.is_team_tepy==0?'martop4':''}}">￥</text>
                         <text style="margin-left:-5rpx">{{aitem.price}}</text>
-                        <span class="underline {{type==0?'martop18':''}}">零售价￥{{aitem.market_price}}</span>
+<!--                        <span class="underline {{type==0?'martop18':''}}">￥{{aitem.shop_price}}</span>-->
                       </view>
 
                     </view>
diff --git a/pages/index/index/index.wxss b/pages/index/index/index.wxss
index f71e927..8824018 100644
--- a/pages/index/index/index.wxss
+++ b/pages/index/index/index.wxss
@@ -11,6 +11,7 @@ page {
 	width: 100%;
 	height: 100%;
 	overflow-y: auto;
+	overflow-x: hidden;
 }
 
 .pink-b {
diff --git a/pages/user/address_list/address_list.wxml b/pages/user/address_list/address_list.wxml
index 5e667d8..619915a 100644
--- a/pages/user/address_list/address_list.wxml
+++ b/pages/user/address_list/address_list.wxml
@@ -1,78 +1,78 @@
-
 <!-- 无收货地址提醒页面 -->
 <view class="topbcolor"></view>
 <view class="nothing" wx:if="{{is_address_read && addresses.length<=0}}">
-  <view class="image flex-level">
-    <image src="{{iurl}}/miniapp/images/nothingaddress.png"></image>
-  </view>
+    <view class="image flex-level">
+        <image src="{{iurl}}/miniapp/images/nothingaddress.png"></image>
+    </view>
+
+    <view class="nothingaddress flex-level">
+        <view>暂无收货地址</view>
+    </view>
+
+    <view class="address flex jc_sb" style="width:76%; margin-left:12%">
 
-  <view class="nothingaddress flex-level">
-    <view>暂无收货地址</view>
-  </view>
+        <navigator bindtap="get_wx" class="ye">
+            <view class="add">+</view>
+            <view class="addAddress">获取微信地址</view>
+        </navigator>
 
-  <view class="address flex jc_sb" style="width:76%; margin-left:12%">
-  
-      <navigator bindtap="get_wx" class="ye">
-        <view class="add">+</view>
-        <view class="addAddress">获取微信地址</view>
-      </navigator>
-  
-      <navigator bindtap="go_url" data-url="/pages/user/add_address/add_address">
-        <view class="add">+</view>
-        <view class="addAddress">新建收货地址</view>
-      </navigator>
+        <navigator bindtap="go_url" data-url="/pages/user/add_address/add_address">
+            <view class="add">+</view>
+            <view class="addAddress">新建收货地址</view>
+        </navigator>
 
 
-  </view>
+    </view>
 </view>
 
-<!-- 收货地址页面集合框架 -->
+        <!-- 收货地址页面集合框架 -->
 <view class="container" wx:if="{{addresses.length>0}}">
-  <!-- 所有的收货地址框架 -->
-  <view class="address-box">
+    <!-- 所有的收货地址框架 -->
+    <view class="address-box">
 
-    <!-- 单个收货地址框架 -->
-    <view class="address-user" wx:for="{{addresses}}" wx:key="index">
-      <!-- 选择icon
-      <view class="icon">
-        <icon type="success" color="red" size="33rpx" wx:if="{{item.is_pickup==1}}"  bindtap="add_is_pickup" data-icon="{{index}}"></icon>
-        <icon class="no_xuanze" color="white" wx:if="{{item.is_pickup==0}}"  bindtap="add_is_pickup" data-icon="{{index}}"></icon>
-      </view>-->
-      
-      <!-- 收货地址全部信息 -->
-      <view class="address" bindtap="add_is_pickup" data-ind="{{index}}" >
-        <!-- 个人直接信息 -->
-        <view class="user">
-          <!-- 名字 -->
-          <view class="userName">{{item.consignee}}</view>
-          <!-- 电话 -->
-          <view class="userPhone">{{item.mobile}}</view>
-          <view class="default" wx:if="{{item.is_default}}">默认地址</view>
-        </view>
+        <!-- 单个收货地址框架 -->
+        <view class="address-user" wx:for="{{addresses}}" wx:key="index">
+            <!-- 选择icon
+            <view class="icon">
+              <icon type="success" color="red" size="33rpx" wx:if="{{item.is_pickup==1}}"  bindtap="add_is_pickup" data-icon="{{index}}"></icon>
+              <icon class="no_xuanze" color="white" wx:if="{{item.is_pickup==0}}"  bindtap="add_is_pickup" data-icon="{{index}}"></icon>
+            </view>-->
 
-        <!-- 收货地址 -->
-        <view class="ShippingAddress ellipsis-2 ">{{item.more_address}} {{item.address}}</view>
-      </view>
+            <!-- 收货地址全部信息 -->
+            <view class="address" bindtap="add_is_pickup" data-ind="{{index}}">
+                <!-- 个人直接信息 -->
+                <view class="user">
+                    <!-- 名字 -->
+                    <view class="userName">{{item.consignee}}</view>
+                    <!-- 电话 -->
+                    <view class="userPhone">{{item.mobile}}</view>
+                    <view class="default" wx:if="{{item.is_default}}">默认地址</view>
+                </view>
 
-      <!-- 编辑地址图片 -->
-      <view class="edit" bindtap="editAddress" data-id="{{item.address_id}}">
-        <image src="{{iurl}}/miniapp/images/dpr.png"></image>
-      </view>
-    </view>
+                <!-- 收货地址 -->
+                <view class="ShippingAddress ellipsis-2 ">{{item.more_address}} {{item.address}}</view>
+            </view>
+
+            <!-- 编辑地址图片 -->
+            <view class="edit" bindtap="editAddress" data-id="{{item.address_id}}">
+                <image src="{{iurl}}/miniapp/images/dpr.png"></image>
+            </view>
+        </view>
 
-  </view>
+    </view>
+    <view style="height:210rpx"></view>
 
-   <!-- 新建收货地址 -->
+    <!-- 新建收货地址 -->
     <view class="new flex jc_sb">
-      <navigator bindtap="get_wx" class="ye">
-        <view class="add">+</view>
-        <view class="addAddress">获取微信地址</view>
-      </navigator>
-  
-      <navigator bindtap="go_url" data-url="/pages/user/add_address/add_address">
-        <view class="add">+</view>
-        <view class="addAddress">新建收货地址</view>
-      </navigator>
+        <navigator bindtap="get_wx" class="ye">
+            <view class="add">+</view>
+            <view class="addAddress">获取微信地址</view>
+        </navigator>
+
+        <navigator bindtap="go_url" data-url="/pages/user/add_address/add_address">
+            <view class="add">+</view>
+            <view class="addAddress">新建收货地址</view>
+        </navigator>
     </view>
 </view>
 <warn id="warn"></warn>
\ No newline at end of file