diff --git a/app.json b/app.json
index 7b545a5..6396a49 100644
--- a/app.json
+++ b/app.json
@@ -37,7 +37,7 @@
         "pages/user/grow_value/grow_value",
         "pages/payment/pay_success/pay_success",
         "pages/user/plus/plus",
-        "pages/user/cardinfo/cardinfo",
+
         "pages/user/my_service/appment_main",
         "pages/user/my_service/i_service",
         "pages/user/my_service/cosmetology_list",
@@ -209,7 +209,8 @@
             "pages": [
                "pages/togoin/togoin",
                "pages/user/Detailed/Detailed",
-               "pages/user/user_fw/user_fw"
+               "pages/user/user_fw/user_fw",
+               "pages/user/cardinfo/cardinfo"
             ]
         }
         
diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js
index b22f7d4..5334302 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.js
+++ b/components/diy_goodsGroup/diy_goodsGroup.js
@@ -320,50 +320,10 @@ Component({
 					getApp().getConfig2(function (e) {
 						var swithc_list = e.switch_list;
 						var sw_arr = JSON.parse(swithc_list);
-
 						if(sw_arr.is_retail_price){
 							th.setData({is_retail_price:1});
 						}
-
-
-						//---如果后台又开等级卡的开关---
-						if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {
-							th.setData({
-								rank_switch: true
-							});
-							//---回调卡的列表---
-							th.getPlusCardType(function (ob) {
-								th.setData({
-									card_list: ob.card_list
-								});
-								var ti = setInterval(function () {
-									var user = getApp().globalData.userInfo;
-									if (!user) return false;
-									clearInterval(ti);
-
-									if (user.card_field && user['card_expiredate']) {
-										var str = user['card_expiredate'].replace(/-/g, '/');
-										var end = new Date(str);
-										end = Date.parse(end) / 1000;
-										var now = ut.gettimestamp();
-
-										//--- 判断是等级会员，且在有效期范围内 ---
-										if (user.card_field && now < end) {
-											var card_name = ob.name_map.get(user.card_field);
-											if (card_name && card_name.length > 4) card_name = card_name.substring(0, 4);
-											th.setData({
-												card_field: user.card_field,
-												card_name: card_name,
-												card_list: ob.card_list
-											});
-										}
-
-									}
-
-								}, 500)
-							})
-
-						}
+                        ut.get_plus_name_price(sw_arr,th);
 					})
 				}
 			})
diff --git a/components/goods_list/goods_list.js b/components/goods_list/goods_list.js
index 52027ee..24d651f 100644
--- a/components/goods_list/goods_list.js
+++ b/components/goods_list/goods_list.js
@@ -63,40 +63,7 @@ Component({
             getApp().getConfig2(function (e) {
               var swithc_list = e.switch_list;
               var sw_arr = JSON.parse(swithc_list);
-              //---如果后台有开等级卡的开关---
-              if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {
-                th.setData({
-                  rank_switch: true
-                });
-                //---回调卡的列表---
-                th.getPlusCardType(function (ob) {
-                  th.setData({
-                    card_list: ob.card_list
-                  });
-                  var ti = setInterval(function () {
-                    var user = getApp().globalData.userInfo;
-                    if (!user) return false;
-                    clearInterval(ti);
-                    if (user.card_field && user['card_expiredate']) {
-                      var str = user['card_expiredate'].replace(/-/g, '/');
-                      var end = new Date(str);
-                      end = Date.parse(end) / 1000;
-                      var now = ut.gettimestamp();
-                      //--- 判断是等级会员，且在有效期范围内 ---
-                      if (user.card_field && now < end) {
-                        var card_name = ob.name_map.get(user.card_field);
-                        if (card_name && card_name.length > 4) card_name = card_name.substring(0, 8);
-                        th.setData({
-                          card_field: user.card_field,
-                          card_name: card_name,
-                          card_list: ob.card_list
-                        });
-                      }
-                    }
-                  }, 500)
-                })
-              }
-
+              ut.get_plus_name_price(sw_arr,th);
             })
 
           }
diff --git a/components/serviceCard_list/serviceCard_list.js b/components/serviceCard_list/serviceCard_list.js
index 4098e2f..b4b3ff4 100644
--- a/components/serviceCard_list/serviceCard_list.js
+++ b/components/serviceCard_list/serviceCard_list.js
@@ -45,48 +45,7 @@ Component({
         success: function (e) {
           if (e.data.code == 0 && e.data && e.data.data) {
             getApp().globalData.userInfo = e.data.data;
-            getApp().getConfig2(function (e) {
-              var swithc_list = e.switch_list;
-              var sw_arr = JSON.parse(swithc_list);
-              //---如果后台有开等级卡的开关---
-              if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {
-                th.setData({
-                  rank_switch: true
-                });
-                //---回调卡的列表---
-                th.getPlusCardType(function (ob) {
-                  th.setData({
-                    card_list: ob.card_list
-                  });
-                  var ti = setInterval(function () {
-                    var user = getApp().globalData.userInfo;
-                    if (!user) return false;
-                    clearInterval(ti);
-                    if (user.card_field && user['card_expiredate']) {
-                      var str = user['card_expiredate'].replace(/-/g, '/');
-                      var end = new Date(str);
-                      end = Date.parse(end) / 1000;
-                      var now = ut.gettimestamp();
-                      //--- 判断是等级会员，且在有效期范围内 ---
-                      if (user.card_field && now < end) {
-                        var card_name = ob.name_map.get(user.card_field);
-                        if (card_name && card_name.length > 4) card_name = card_name.substring(0, 8);
-                        th.setData({
-                          card_field: user.card_field,
-                          card_name: card_name,
-                          card_list: ob.card_list
-                        });
-                      }
-                    }
-                  }, 500)
-                })
-              }
-            })
-
           }
-
-
-
         }
       })
     },
diff --git a/components/serviceCard_list/serviceCard_list.wxml b/components/serviceCard_list/serviceCard_list.wxml
index 86919ed..ee7b346 100644
--- a/components/serviceCard_list/serviceCard_list.wxml
+++ b/components/serviceCard_list/serviceCard_list.wxml
@@ -37,95 +37,8 @@
             
           </block>
           <block wx:else>
-            <!-- 商品价格,先判断下是后⼜等级价-->
-            <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
-              <!-- 当会员是等级卡的时候 -->
-              <block wx:if="{{card_field}}">
-                <!-- 等级价>0 -->
-                <block wx:if="{{item[card_field]>0}}">
-                  <view class="money flex">
-                    <!-- 办卡价 -->
-                    <view class="flex xc-wc ai_and">
-                      <view class="fs24">￥</view>
-                      <view class="fs35">{{filter.toFix(item[card_field],2)}}</view>
-                      <view class="card_bg ellipsis-1">
-                        <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
-                        <text class="card_name">{{card_name}}</text>
-                      </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>
-                </block>
-                <blocK wx:else>
-                  <view class="money flex">
-                    <!-- 办卡价 -->
-                    <view class="flex xc-wc">
-                      <view class="fs24">￥</view>
-                      <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>
-                </blocK>
-              </block>
-              <block wx:else>
-                <!-- 如果商品有设置等级价⼤于0的 -->
-                <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
-                  <view class="money flex">
-                    <!-- 办卡价 -->
-                    <view class="flex xc-wc">
-                      <view class="fs24">￥</view>
-                      <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>
-                  <view class="flexr" style="">
-                    <!-- 等级价 -->
-										<view class="price flex ai-center">
-										  <view class="fs22">￥</view>
-										  <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
-										  <view class="card_bg ellipsis-1">
-										    <image src="{{url}}/miniapp/images/plus/dj_icon.png"></ image>
-												<text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text>
-											</view>
-										</view>
-                  </view>
-                </block>
-                <block wx:else>
-                  <view class="money flex">
-                    <!-- 办卡价 -->
-                    <view class="flex xc-wc">
-                      <view class="fs24">￥</view>
-                      <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>
-                </block>
-              </block>
-            </block>
             <!-- 商品压根就没有等级价 -->
-            <view class="pdt10" wx:else>
+            <view class="pdt10">
               <view class="money flex">
                 <!-- 办卡价 -->
                 <view class="flex xc-wc">
diff --git a/packageA/pages/distribution/goods/goods.wxml b/packageA/pages/distribution/goods/goods.wxml
index ab59e8f..49b2c1a 100644
--- a/packageA/pages/distribution/goods/goods.wxml
+++ b/packageA/pages/distribution/goods/goods.wxml
@@ -83,7 +83,7 @@
 						<view class="ellipsis-2">{{item.goods_name}}</view>
 						<view>
 							<!-- 判断是否有活动价 -->
-							<block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2 && item.prom_id>0}}">
+							<block wx:if="{{(item.prom_price>0 || item.prom_integral>0) &&  item.prom_id>0 && item.prom_type!=7 && item.prom_type!=10 }}">
 								<view class="flex xc-wc ai-center">
 									<text wx:if="{{item.prom_integral}}"><text class="fs30">{{item.prom_integral}}</text>积分</text>
 									<text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
diff --git a/packageA/pages/distribution/shop/shop.wxml b/packageA/pages/distribution/shop/shop.wxml
index 9ce235d..993b486 100644
--- a/packageA/pages/distribution/shop/shop.wxml
+++ b/packageA/pages/distribution/shop/shop.wxml
@@ -76,7 +76,7 @@
 					<view class="flex fdc jc_sb">
 						<view class="ellipsis-2 h68 mgb20">{{item.goods_name}}</view>
 						<!-- 判断是否有活动价 -->
-						<block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2 && item.prom_id>0}}">
+						<block wx:if="{{(item.prom_price>0 || item.prom_integral>0)  && item.prom_id>0 && item.prom_type!=7 && item.prom_type!=10 }}">
 							<view class="flex xc-wc pdt20">
 								<text wx:if="{{item.prom_integral}}">
 									<text class="fs30">{{item.prom_integral}}</text>
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
index 65d3955..a80fb7a 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -6018,7 +6018,7 @@ Page({
   },
 
   go_card_info: function () {
-    getApp().goto("/pages/user/cardinfo/cardinfo");
+    getApp().goto("/packageE/pages/user/cardinfo/cardinfo");
   },
 
   //-- 根据ID拿出门店 --
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js
index 4b2e251..0b018ba 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.js
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.js
@@ -4531,7 +4531,7 @@ Page({
     getApp().goto("/pages/user/plus/plus");
   },
   go_card_info: function () {
-    getApp().goto("/pages/user/cardinfo/cardinfo");
+    getApp().goto("/packageE/pages/user/cardinfo/cardinfo");
   },
   //-- 根据ID拿出门店 --
   get_pick_from_list(pid) {
diff --git a/packageC/pages/presell/pregoodsInfo/goodsInfo.js b/packageC/pages/presell/pregoodsInfo/goodsInfo.js
index 243429b..0ba4d9d 100644
--- a/packageC/pages/presell/pregoodsInfo/goodsInfo.js
+++ b/packageC/pages/presell/pregoodsInfo/goodsInfo.js
@@ -3694,7 +3694,7 @@ Page({
     getApp().goto("/pages/user/plus/plus");
   },
   go_card_info: function () {
-    getApp().goto("/pages/user/cardinfo/cardinfo");
+    getApp().goto("/packageE/pages/user/cardinfo/cardinfo");
   },
   //-- 根据ID拿出门店 --
   get_pick_from_list(pid) {
diff --git a/pages/user/cardinfo/cardinfo.js b/packageE/pages/user/cardinfo/cardinfo.js
index 2492876..202e3a1 100644
--- a/pages/user/cardinfo/cardinfo.js
+++ b/packageE/pages/user/cardinfo/cardinfo.js
@@ -2,11 +2,11 @@ var t = getApp(),
   a = t.request,
   o = t.globalData.setting,
   os = o, 
-  i = require("../../../utils/util.js"),
+  i = require("../../../../utils/util.js"),
   ut = i,
-  s = require("../../../utils/common.js"),t_pay = require("../../../utils/pay2.js"),
-  w = require("../../../utils/wxParse/wxParse.js");
-var regeneratorRuntime = require('../../../utils/runtime.js');
+  s = require("../../../../utils/common.js"),t_pay = require("../../../../utils/pay2.js"),
+  w = require("../../../../utils/wxParse/wxParse.js");
+var regeneratorRuntime = require('../../../../utils/runtime.js');
 //wx.downloadFile把线上地址设为本地地址
 Page({
 
diff --git a/pages/user/cardinfo/cardinfo.json b/packageE/pages/user/cardinfo/cardinfo.json
index 393a432..393a432 100644
--- a/pages/user/cardinfo/cardinfo.json
+++ b/packageE/pages/user/cardinfo/cardinfo.json
diff --git a/pages/user/cardinfo/cardinfo.wxml b/packageE/pages/user/cardinfo/cardinfo.wxml
index e54425a..e54425a 100644
--- a/pages/user/cardinfo/cardinfo.wxml
+++ b/packageE/pages/user/cardinfo/cardinfo.wxml
diff --git a/pages/user/cardinfo/cardinfo.wxss b/packageE/pages/user/cardinfo/cardinfo.wxss
index e4f3bac..64ee734 100644
--- a/pages/user/cardinfo/cardinfo.wxss
+++ b/packageE/pages/user/cardinfo/cardinfo.wxss
@@ -1,4 +1,4 @@
- @import "../../../utils/wxParse/wxParse.wxss";
+ @import "../../../../utils/wxParse/wxParse.wxss";
  .Member_bk {
   position:relative;
   z-index: 0;
diff --git a/pages/distribution/distribution.wxml b/pages/distribution/distribution.wxml
index 7a53c29..40918ad 100644
--- a/pages/distribution/distribution.wxml
+++ b/pages/distribution/distribution.wxml
@@ -95,7 +95,7 @@
 						<view class="left f1">
 							<view class="icon-container"><text class="iconfont icon-huiyuan1"></text></view>
 							<view>仅限PLUS卡({{item.conditonRemark}})的会员, 
-							   <text wx:if="{{item.pass}}" class="c-red" bindtap="goto" data-url="/pages/user/cardinfo/cardinfo">PLUS详情</text>
+							   <text wx:if="{{item.pass}}" class="c-red" bindtap="goto" data-url="/packageE/pages/user/cardinfo/cardinfo">PLUS详情</text>
 							   <text wx:else class="c-red" bindtap="goto" data-url="/pages/user/plus/plus">立即升级</text>
 							</view>
 						</view>
diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js
index ef03f5a..43e3a73 100644
--- a/pages/goods/categoryList/categoryList.js
+++ b/pages/goods/categoryList/categoryList.js
@@ -168,32 +168,6 @@ Page({
       //计算等级价相关
       var swithc_list = rs.switch_list;
       var sw_arr = JSON.parse(swithc_list);
-      //---如果后台又开等级卡的开关---
-      if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {
-        th.setData({ rank_switch: true });
-        var user = getApp().globalData.userInfo;
-        var ti = setInterval(function () {
-          if (!user) return false;
-          clearInterval(ti);
-          //---回调卡的列表---
-          th.getPlusCardType(function (ob) {
-            th.setData({ card_list: ob.card_list });
-            if (user.card_field && user['card_expiredate']) {
-              var str = user['card_expiredate'].replace(/-/g, '/');
-              var end = new Date(str);
-              end = Date.parse(end) / 1000;
-              var now = ut.gettimestamp();
-
-              //--- 判断是等级会员，且在有效期范围内 ---
-              if (user.card_field && now < end) {
-                var card_name = ob.name_map.get(user.card_field);
-                //if (card_name.length > 4) card_name = card_name.substring(0, 4);
-                th.setData({ card_field: user.card_field, card_name: card_name, card_list: ob.card_list });
-              }
-            }
-          })
-        }, 500)
-      }
 
       if(sw_arr.is_retail_price){
         th.setData({is_retail_price:1});
@@ -228,6 +202,11 @@ Page({
       var data = e;
       var switch_list_data = data.switch_list;
       var switch_list = JSON.parse(switch_list_data);
+
+      //---如果后台又开等级卡的开关---
+      ut.get_plus_name_price(switch_list,that);
+
+
       var is_newsgoodstype = switch_list.is_newsgoodstype;
       if (is_newsgoodstype == undefined) {
         is_newsgoodstype = 0;
diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml
index 393a75d..26132a3 100644
--- a/pages/goods/categoryList/categoryList.wxml
+++ b/pages/goods/categoryList/categoryList.wxml
@@ -584,7 +584,8 @@
                     <view class="item-cont">
                       <view class="title">{{item.goods_name}}</view>
                       <!-- 判断是否有活动价 -->
-                      <block wx:if="{{item.prom_price>0 || item.prom_integral}}">
+                      <block wx:if="{{(item.prom_price>0 || item.prom_integral)  && item.prom_id>0 && item.prom_type!=7 && item.prom_type!=10}}">
+
                         <view class="flex ai-center">
                           <!-- 活动价 -->
                           <view class="price">
@@ -605,12 +606,14 @@
                       </block>
                       <block wx:else>
 
+
                         <!-- 商品价格,先判断下是后又等级价-->
                         <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
 
 
                           <!-- 当会员是等级卡的时候 -->
                           <block wx:if="{{card_field}}">
+
                             <!-- 等级价>0 -->
                             <block wx:if="{{item[card_field]>0}}">
                               <view class="flex ai_and">
@@ -683,6 +686,7 @@
                           </block>
                         </block>
                         <block wx:else>
+
                           <view class="flex ai-center">
                             <view class="price rmb">{{item.shop_price}}</view>
                             <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>
diff --git a/pages/goods/goodsInfo/buy_com_pop.wxml b/pages/goods/goodsInfo/buy_com_pop.wxml
new file mode 100644
index 0000000..656509d
--- /dev/null
+++ b/pages/goods/goodsInfo/buy_com_pop.wxml
@@ -0,0 +1,158 @@
+<view class="spec-goods">
+    <image class="wh100 spec-img xc-distance-bottom" bindtap="previewImage" src="{{sele_g.original_img}}"
+           binderror="pop_err_img" data-errorimg="data.original_img"></image>
+    <view class="spec-goods-info">
+        <view class="spec-goods-name ellipsis-2">{{sele_g.goods_name}}</view>
+        <view class="flex ai_end xc-val-money">
+            <text class="fs20">￥</text>
+            <!-- 如果是等级会员，且有等级价 -->
+            <block wx:if="{{card_field && sele_g[card_field]>0}}">{{sele_g[card_field]}}</block>
+            <block wx:else>{{sele_g.shop_price}}</block>
+        </view>
+
+        <view class="flex">
+            <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>
+            <block wx:if="{{sales_rules==2}}">
+                <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}">
+                    可售：{{def_pick_store.CanOutQty}}
+                </view>
+                <view class="spec-goods-stock" wx:else>可售:0</view>
+            </block>
+            <block wx:else>
+                <view class="spec-goods-stock">可售：{{sele_g.store_count}}</view>
+            </block>
+        </view>
+
+
+    </view>
+
+    <!-- 选择门店模块 -->
+    <view class="flex-space-between address ai_end xc-width ">
+
+        <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
+            <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
+            <view class="distance fs24 xc-ash" wx:if="{{def_pick_store.distance!=null}}">
+                距离:{{def_pick_store.distance > 1000 ? filters.toFix(def_pick_store.distance / 1000, 2) + "km" : filters.toFix(def_pick_store.distance, 0) + "m"}}
+
+            </view>
+        </view>
+
+        <!-- 没有门店的时候 -->
+        <view class="flex" bindtap="choice_store" wx:else>
+            <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
+            <view class="fs30" style="color:black;">选择门店</view>
+        </view>
+
+        <view hidden="{{has_def && sys_switch.is_pricing_open_store}}" class="red-co fs28"
+              bindtap="choice_store">更多门店<text class="right-arrow"></text>
+        </view>
+    </view>
+    <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
+    <block wx:else>
+        <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
+        <block wx:else>
+            <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
+            <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">
+                (库存不足)
+            </view>
+        </block>
+    </block>
+    <view class="fs24 xc-ash-9f xc-distance-top " wx:if="{{def_pick_store && def_pick_store.fulladdress}}">
+        地址:{{def_pick_store.fulladdress}}
+    </view>
+
+
+    <!--商品的属性项目-->
+    <view class="xc-goods-attribute">
+        <view hidden="{{ismend==1}}" class="spec-name">商品规格</view>
+        <view hidden="{{ismend==1}}" style="max-height: 120rpx;overflow-y: auto;">
+            <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-nor="1"
+                  data-gid='{{item.goods_id}}' wx:for="{{sku_g_pt}}" wx:key="sku_g">
+                {{item.gg}}
+            </view>
+        </view>
+    </view>
+
+    <view class="b_num">
+        <view>购买数量</view>
+        <view class="count">
+            <view bindtap="{{goodsInputNum <= 1 ? '':'subCartNum'}}"
+                  class="sub {{goodsInputNum <= 1 ? 'active':''}}">-
+            </view>
+            <input bindblur="inputCartNum" type="number" value="{{goodsInputNum}}"></input>
+            <view bindtap="addCartNum" class="add">+</view>
+        </view>
+    </view>
+</view>
+<!-- 提示再买多少优惠 -->
+<view style="margin-top: 35rpx;color:#333;font-size:28rpx;" wx:if="{{hui_condition}}">
+    再买{{hui_condition.need}}
+    <text wx:if="{{hui_condition.money}}">，免{{hui_condition.money}}元</text>
+    <text wx:if="{{hui_condition.sale}}">，打{{hui_condition.sale}}折</text>
+    <text wx:if="{{hui_condition.past==1}}">，包邮</text>
+    <text wx:if="{{hui_condition.intValue>0}}">，送{{hui_condition.intValue}}积分</text>
+    <text wx:if="{{hui_condition.couponId>0}}">，送优惠券</text>
+    <text wx:if="{{hui_condition.gift_id>0}}">，送赠品</text>
+    <text wx:if="{{hui_condition.lb_id>0}}">，送礼包</text>
+    <text wx:if="{{hui_condition.zxlb_id>0}}">，送专享礼包</text>
+</view>
+<!-- 按钮部分 -->
+<view class="spec-cart-btns">
+
+    <!-- 根本就找不到门店 -->
+    <block wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">
+        <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">
+            配送不匹配
+        </view>
+    </block>
+    <block wx:else>
+        <!-- 根本就找不到门店 -->
+        <block wx:if="{{!only_pk && !def_pickpu_list}}">
+            <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">
+                库存不足
+            </view>
+        </block>
+        <block wx:else>
+
+
+            <block wx:if="{{only_pk.length && !only_pk.length}}">
+                <view class="spec-cart-btn fs32" data-action="add"
+                      style="background-color: #dcdcdc;color: #999;">库存不足
+                </view>
+            </block>
+            <block wx:else>
+                <block wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">
+                    <view class="spec-cart-btn fs32" data-action="add"
+                          style="background-color: #dcdcdc;color: #999">库存不足
+                    </view>
+                </block>
+                <block wx:else>
+                    <block wx:if="{{!def_pick_store}}">
+                        <view class="spec-cart-btn fs32" data-action="add"
+                              style="background-color: #dcdcdc;color: #999">请先选择门店
+                        </view>
+                    </block>
+                    <block wx:else>
+                        <block wx:if="{{data.store_count<=0}}">
+                            <view class="spec-cart-btn fs32" data-action="add"
+                                  style="background-color: #dcdcdc;color: #999">库存不足
+                            </view>
+                        </block>
+                        <block wx:else>
+                            <view class="flex jc_sb">
+                                <view class="spec-cart-btn spec-buy w40" bindtap="addCart"
+                                      data-action="add" style="background-color: #ffb03f;">加入购物车
+                                </view>
+                                <view class="spec-cart-btn spec-buy w40" bindtap="addCart"
+                                      data-action="buy">立即购买
+                                </view>
+                            </view>
+                        </block>
+
+                    </block>
+                </block>
+            </block>
+        </block>
+    </block>
+</view>
+
diff --git a/pages/goods/goodsInfo/buy_flash_normal.wxml b/pages/goods/goodsInfo/buy_flash_normal.wxml
index 86ddc6f..7a9229b 100644
--- a/pages/goods/goodsInfo/buy_flash_normal.wxml
+++ b/pages/goods/goodsInfo/buy_flash_normal.wxml
@@ -1,141 +1,8 @@
 <view bindtap="closeSpecModal_flash_normal" class="cover-layer"></view>
-	 <view class="spec-model">
-		  <view class="pding"> 
-		            <icon bindtap="closeSpecModal_flash_normal" class="modal-close" color="black" size="22" type="cancel"></icon>
-		            <view class="spec-goods">
-		              <image class="wh100 spec-img xc-distance-bottom" bindtap="previewImage" src="{{sele_g.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>
-		              <view class="spec-goods-info">
-		                <view class="spec-goods-name ellipsis-2">{{sele_g.goods_name}}</view>
-		                <view class="flex ai_end xc-val-money">            		                    
-		                        <text class="fs20">￥</text>
-		                        <!-- 如果是等级会员，且有等级价 -->
-		                     	<block wx:if="{{card_field && sele_g[card_field]>0}}">{{sele_g[card_field]}} </block> 		 
-		                     	<block wx:else>{{sele_g.shop_price}}</block>		                    
-		                </view>
-		             		                  						 
-						<view class="flex">
-							<view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>
-							<block wx:if="{{sales_rules==2}}">		
-								 <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}">可售：{{def_pick_store.CanOutQty}}</view>
-								 <view class="spec-goods-stock" wx:else>可售:0</view>
-							</block>
-							<block wx:else><view class="spec-goods-stock">可售：{{sele_g.store_count}}</view></block>       
-						</view>
-						
-											     
-		              </view>
-		      
-		              <!-- 选择门店模块 -->
-		               <view  class="flex-space-between address ai_end xc-width ">
-		      
-		                           <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
-		                             <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
-		                               <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}">
-		                                距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
-		                               
-		                                </view>
-		                           </view>
-		      
-		                           <!-- 没有门店的时候 -->
-		                           <view  class="flex" bindtap="choice_store" wx:else>
-		                                 <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
-		                                 <view class="fs30" style="color:black;">选择门店</view>						  
-		                            </view>
-		      
-		                            <view hidden="{{has_def && sys_switch.is_pricing_open_store}}" class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></view>
-		                         </view>
-		      				   <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
-		      				   <block wx:else>
-		      				         <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
-		      						 <block wx:else>
-										  <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
-		      					     	  <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">(库存不足)</view>
-		      						 </block>				       
-		      				   </block>		      				   	   
-		                       <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store && def_pick_store.fulladdress}}">地址:{{def_pick_store.fulladdress}}</view>
-		               
-		      
-		              <!--商品的属性项目-->
-		              <view  class="xc-goods-attribute">
-		                  <view hidden="{{ismend==1}}" class="spec-name">商品规格</view>
-		                  <view hidden="{{ismend==1}}" style="max-height: 120rpx;overflow-y: auto;">
-		                   <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-nor="1" data-gid='{{item.goods_id}}' wx:for="{{sku_g_pt}}" wx:key="sku_g">
-		                      {{item.gg}}
-		                    </view>
-		                 </view>
-		              </view>
-		        
-		              <view class="b_num">
-		                <view>购买数量</view>
-		                <view class="count">
-		                  <view bindtap="{{goodsInputNum <= 1 ? '':'subCartNum'}}" class="sub {{goodsInputNum <= 1 ? 'active':''}}">-</view>
-		                  <input bindblur="inputCartNum" type="number" value="{{goodsInputNum}}"></input>
-		                  <view bindtap="addCartNum" class="add">+</view>
-		                </view>
-		              </view>		      	
-		          </view>
-				  
-				  
-				  <!-- 提示再买多少优惠 -->
-				  <view style="margin-top: 35rpx;color:#333;font-size:28rpx;" wx:if="{{hui_condition}}">
-				  	再买{{hui_condition.need}}
-				  	<text wx:if="{{hui_condition.money}}">，免{{hui_condition.money}}元</text>
-				  	<text wx:if="{{hui_condition.sale}}">，打{{hui_condition.sale}}折</text>
-				  	<text wx:if="{{hui_condition.past==1}}">，包邮</text>
-				  	<text wx:if="{{hui_condition.intValue>0}}">，送{{hui_condition.intValue}}积分</text>
-				  	<text wx:if="{{hui_condition.couponId>0}}">，送优惠券</text>
-				  	<text wx:if="{{hui_condition.gift_id>0}}">，送赠品</text>
-				  	<text wx:if="{{hui_condition.lb_id>0}}">，送礼包</text>
-				  	<text wx:if="{{hui_condition.zxlb_id>0}}">，送专享礼包</text>
-				  </view>
-				  
-				  
-				  <!-- 按钮部分 -->
-				  <view class="spec-cart-btns">	
-
-				     <!-- 根本就找不到门店 -->
-				     <block wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">
-				     	   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">配送不匹配</view>		   
-				     </block>
-					 <block wx:else> 				  
-				  	       <!-- 根本就找不到门店 -->
-				  	       <block wx:if="{{!only_pk && !def_pickpu_list}}">
-				  			   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>		   
-				  		   </block>		 
-				  		   <block wx:else>
-				  		   
-				  		 			  
-				  			  <block wx:if="{{only_pk.length && !only_pk.length}}">
-				  				   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>
-				  			  </block>  	  
-				  			  <block wx:else>
-				  			      <block wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">
-				  		  			   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>
-				  				 </block>
-				  				 <block wx:else>
-				  					 <block wx:if="{{!def_pick_store}}">
-				  						 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view>
-				  					 </block>					 
-				  					 <block wx:else>	 						 						  																	
-				  							 <block wx:if="{{data.store_count<=0}}">
-				  								  <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>	
-				  							 </block>
-				  							 <block wx:else>	
-												<view class="flex jc_sb">				  
-				  								  <view class="spec-cart-btn spec-buy w40"  bindtap="addCart"
-												        data-action="add" style="background-color: #ffb03f;">加入购物车</view>
-												  <view class="spec-cart-btn spec-buy w40"  bindtap="addCart"
-												        data-action="buy">立即购买</view> 
-												</view>		  
-				  							 </block>
-				  						 					 
-				  					 </block>									 
-				  				 </block>
-				  		  </block>  			
-				  		</block>		
-					</block>				   
-				   </view>
-
-		  </view>
-	 </view>	
-	 <view class="clear"></view> 
\ No newline at end of file
+<view class="spec-model">
+    <view class="pding">
+        <icon bindtap="closeSpecModal_flash_normal" class="modal-close" color="black" size="22" type="cancel"></icon>
+        <include src="buy_com_pop.wxml"></include>
+    </view>
+</view>
+<view class="clear"></view>
\ No newline at end of file
diff --git a/pages/goods/goodsInfo/buy_integral_normal.wxml b/pages/goods/goodsInfo/buy_integral_normal.wxml
index 6d0df3a..4b8ae7e 100644
--- a/pages/goods/goodsInfo/buy_integral_normal.wxml
+++ b/pages/goods/goodsInfo/buy_integral_normal.wxml
@@ -1,163 +1,8 @@
-<view bindtap="closeSpecModal_inte_normal" class="cover-layer"></view> 
-	 <view class="spec-model">
-		  <view class="pding"> 
-		            <icon bindtap="closeSpecModal_inte_normal" class="modal-close" color="black" size="22" type="cancel"></icon>
-		            <view class="spec-goods">
-		              <image class="wh100 spec-img xc-distance-bottom" bindtap="previewImage" src="{{sele_g.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>
-		              <view class="spec-goods-info">
-		                <view class="spec-goods-name ellipsis-2">{{sele_g.goods_name}}</view>
-		                <view class="flex ai_end xc-val-money">            		                    
-		                        <text class="fs20">￥</text>
-		                        <!-- 如果是等级会员，且有等级价 -->
-		                     	<block wx:if="{{card_field && sele_g[card_field]>0}}">{{sele_g[card_field]}} </block> 		 
-		                     	<block wx:else>{{sele_g.shop_price}}</block>		                    
-		                </view>
-		             		                  						 
-						<view class="flex">
-							<view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>
-							<block wx:if="{{sales_rules==2}}">		
-								 <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}">可售：{{def_pick_store.CanOutQty}}</view>
-								 <view class="spec-goods-stock" wx:else>可售:0</view>
-							</block>
-							<block wx:else><view class="spec-goods-stock">可售：{{sele_g.store_count}}</view></block>       
-						</view>
-						
-											     
-		              </view>
-		      
-		              <!-- 选择门店模块 -->
-		               <view  class="flex-space-between address ai_end xc-width ">
-		      
-		                           <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
-		                             <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
-		                               <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}">
-		                                距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
-		                               
-		                                </view>
-		                           </view>
-		      
-		                           <!-- 没有门店的时候 -->
-		                           <view  class="flex" bindtap="choice_store" wx:else>
-		                                 <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
-		                                 <view class="fs30" style="color:black;">选择门店</view>
-		                            </view>
-		      
-		                            <view hidden="{{has_def && sys_switch.is_pricing_open_store}}" class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></view>
-		                         </view>
-		      				   <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
-		      				   <block wx:else>
-		      				         <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
-		      						 <block wx:else>
-										  <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
-		      					     	  <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2}}">(库存不足)</view>
-		      						 </block>				       
-		      				   </block>		      				   	   
-		                       <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store && def_pick_store.fulladdress}}">地址:{{def_pick_store.fulladdress}}</view>
-		               
-		      
-		              <!--商品的属性项目-->
-		              <view  class="xc-goods-attribute">
-		                  <view hidden="{{ismend==1}}" class="spec-name">商品规格</view>
-		                  <view hidden="{{ismend==1}}" style="max-height: 120rpx;overflow-y: auto;">
-		                   <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-nor="1" data-gid='{{item.goods_id}}' wx:for="{{sku_g_pt}}" wx:key="sku_g">
-		                      {{item.gg}}
-		                    </view>
-		                 </view>
-		              </view>
-		        
-		              <view class="b_num">
-		                <view>购买数量</view>
-		                <view class="count">
-		                  <view bindtap="{{goodsInputNum <= 1 ? '':'subCartNum'}}" class="sub {{goodsInputNum <= 1 ? 'active':''}}">-</view>
-		                  <input bindblur="inputCartNum" type="number" value="{{goodsInputNum}}"></input>
-		                  <view bindtap="addCartNum" class="add">+</view>
-		                </view>
-		              </view>		      	
-		          </view>
-				  
-				  
-				  <!-- 提示再买多少优惠 -->
-				  <view style="margin-top: 35rpx;color:#333;font-size:28rpx;" wx:if="{{hui_condition}}">
-				  	再买{{hui_condition.need}}
-				  	<text wx:if="{{hui_condition.money}}">，免{{hui_condition.money}}元</text>
-				  	<text wx:if="{{hui_condition.sale}}">，打{{hui_condition.sale}}折</text>
-				  	<text wx:if="{{hui_condition.past==1}}">，包邮</text>
-				  	<text wx:if="{{hui_condition.intValue>0}}">，送{{hui_condition.intValue}}积分</text>
-				  	<text wx:if="{{hui_condition.couponId>0}}">，送优惠券</text>
-				  	<text wx:if="{{hui_condition.gift_id>0}}">，送赠品</text>
-				  	<text wx:if="{{hui_condition.lb_id>0}}">，送礼包</text>
-				  	<text wx:if="{{hui_condition.zxlb_id>0}}">，送专享礼包</text>
-				  </view>
-				  
-				  
-				  <!-- 按钮部分 -->
-				  <view class="spec-cart-btns">	
-				  
-				     
-				     <!-- 根本就找不到门店 -->
-				     <block wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">
-				     	   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">配送不匹配</view>		   
-				     </block>
-					 <block wx:else> 				  
-				  	       <!-- 根本就找不到门店 -->
-				  	       <block wx:if="{{!only_pk && !def_pickpu_list}}">
-				  			   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>
-				  		   </block>		 
-				  		   <block wx:else>
-				  		   
-				  		 			  
-				  			  <block wx:if="{{only_pk.length && !only_pk.length}}">
-				  				   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>
-				  			  </block>  	  
-				  			  <block wx:else>
-				  			      <block wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">
-				  		  			   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>
-				  				 </block>
-				  				 <block wx:else>
-				  					 <block wx:if="{{!def_pick_store}}">
-				  						 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view>
-				  					 </block>					 
-				  					 <block wx:else>
-										 <!-- 线下库存 -->
-										 <block wx:if="{{sales_rules==2 && prom_type==0 && !sele_g.whsle_id}}">
-				  							 <block wx:if="{{def_pick_store && !def_pick_store.CanOutQty}}">
-				  								  <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>
-				  							 </block>
-				  							 <block wx:else>	
-												<view class="flex jc_sb">				  
-				  								  <view class="spec-cart-btn spec-buy w40"  bindtap="addCart"
-												        data-action="add" style="background-color: #ffb03f;">加入购物车</view>
-												  <view class="spec-cart-btn spec-buy w40"  bindtap="addCart"
-												        data-action="buy">立即购买</view> 
-												</view>		  
-				  							 </block>
-										 </block>
-                                         <!-- 线上库存 -->
-										 <block wx:else>
-											 <block wx:if="{{sele_g.store_count<=0}}">
-												 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">
-													 库存不足5
-												 </view>
-											 </block>
-											 <block wx:else>
-												 <view class="flex jc_sb">
-													 <view class="spec-cart-btn spec-buy w40"  bindtap="addCart"
-														   data-action="add" style="background-color: #ffb03f;">加入购物车</view>
-													 <view class="spec-cart-btn spec-buy w40"  bindtap="addCart"
-														   data-action="buy">立即购买</view>
-												 </view>
-											 </block>
-
-										 </block>
-				  						 					 
-				  					 </block>									 
-				  				 </block>
-				  		  </block>  			
-				  		</block>		
-					</block>				   
-				   </view>
-		  
-		  
-		  </view>
-	 </view>	
-	 <view class="clear"></view> 
\ No newline at end of file
+<view bindtap="closeSpecModal_inte_normal" class="cover-layer"></view>
+<view class="spec-model">
+    <view class="pding">
+        <icon bindtap="closeSpecModal_inte_normal" class="modal-close" color="black" size="22" type="cancel"></icon>
+        <include src="buy_com_pop.wxml"></include>
+    </view>
+</view>
+<view class="clear"></view>
\ No newline at end of file
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 1d72595..520bc55 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -441,38 +441,7 @@ Page({
             var swithc_list = e.switch_list;
             var sw_arr = JSON.parse(swithc_list);
             //---如果后台又开等级卡的开关---
-            if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {
-                th.setData({rank_switch: true});
-                //---回调卡的列表---
-                th.getPlusCardType(function (ob) {
-                    th.setData({card_list: ob.card_list});
-                    var ti = setInterval(function () {
-                        var user = getApp().globalData.userInfo;
-                        if (!user) return false;
-                        clearInterval(ti);
-                        if (user.card_field && user['card_expiredate']) {
-                            var str = user['card_expiredate'].replace(/-/g, '/');
-                            var end = new Date(str);
-                            end = Date.parse(end) / 1000;
-                            var now = ut.gettimestamp();
-                            //--- 判断是等级会员，且在有效期范围内 ---
-                            if (user.card_field && now < end) {
-                                var card_name = ob.name_map.get(user.card_field);
-                                //if(card_name.length>6) card_name=card_name.substring(0,6);
-
-                                var is_near_date = 0;
-                                if (end - now < 60 * 60 * 30 * 24) is_near_date = 1; //如果小于30天
-                                th.setData({
-                                    card_field: user.card_field,
-                                    card_name: card_name,
-                                    card_list: ob.card_list,
-                                    is_near_date: is_near_date
-                                });
-                            }
-                        }
-                    }, 500)
-                })
-            }
+            ut.get_plus_name_price(sw_arr,th);
 
         }, 1);
 
@@ -1427,6 +1396,8 @@ Page({
             };
 
 
+
+
             //-- 代发商品不参加优惠 --
             if(th.data.sele_g.whsle_id && newd.prom_type==3){
                 newd.prom_type=0;
@@ -1474,6 +1445,7 @@ Page({
 
                     newd.prom_type = 0;
                     newd.prom_id = 0;
+                    newd.is_pd_normal=1;
 
                     //---如果是线下门店销售的时候---
                     if (th.data.sales_rules == 2) {
@@ -2016,7 +1988,7 @@ Page({
             getApp().goto(url);
         } else {
             //要判断积分购的普通购买有没有参加优惠活动
-            if (e.is_integral_normal == 1) {
+            if (e.is_integral_normal == 1 || e.is_pd_normal == 1 ) {
                 this.check_nor_promgood(e.goods_id, function (res) {
                     if (res && res.cat_id) {
                         e.prom_type = 3;
@@ -6372,7 +6344,7 @@ Page({
         getApp().goto("/pages/user/plus/plus");
     },
     go_card_info: function () {
-        getApp().goto("/pages/user/cardinfo/cardinfo");
+        getApp().goto("/packageE/pages/user/cardinfo/cardinfo");
     },
     //-- 根据ID拿出门店 --
     get_pick_from_list(pid) {
diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml
index 986321c..01b2fc9 100644
--- a/pages/goods/goodsList/goodsList.wxml
+++ b/pages/goods/goodsList/goodsList.wxml
@@ -82,7 +82,7 @@
       <view class="item-cont">
         <view class="title ellipsis-2">{{item.goods_name}}</view>
         <!-- 判断是否有活动价 -->
-        <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_id>0 && item.prom_type!=7 }}">
+        <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_id>0 && item.prom_type!=7 && item.prom_type!=10 }}">
 				<view class="flex on">
 					<!-- 活动价 -->
 					<view class="price">
diff --git a/pages/goods/search/search.js b/pages/goods/search/search.js
index 5436701..7102c02 100644
--- a/pages/goods/search/search.js
+++ b/pages/goods/search/search.js
@@ -99,38 +99,11 @@ Page({
             var swithc_list = rs.switch_list;
             var sw_arr = JSON.parse(swithc_list);
             //---如果后台又开等级卡的开关---
-            if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {
-                th.setData({ rank_switch: true });
-                var user = getApp().globalData.userInfo;
-                var ti = setInterval(function () {
-                    if (!user) return false;
-                    clearInterval(ti);
-                    //---回调卡的列表---
-                    th.getPlusCardType(function (ob) {
-                        th.setData({ card_list: ob.card_list });
-                        if (user.card_field) {
-                            var str = user['card_expiredate'].replace(/-/g, '/');
-                            var end = new Date(str);
-                            end = Date.parse(end) / 1000;
-                            var now = ut.gettimestamp();
-
-                            //--- 判断是等级会员，且在有效期范围内 ---
-                            if (user.card_field && now < end) {
-                                var card_name = ob.name_map.get(user.card_field);
-                                if (card_name && card_name.length > 7) card_name = card_name.substring(0, 8);
-                                th.setData({ card_field: user.card_field, card_name: card_name, card_list: ob.card_list });
-                            }
-                        }
-                    })
-                }, 500)
-            }
-
+            ut.get_plus_name_price(sw_arr,th);
             if(sw_arr.is_retail_price){
                 th.setData({is_retail_price:1});
             }
 
-
-
         })
         //e.init(this, "", "requestData");
         var url = this.data.baseUrl;
diff --git a/pages/goods/search/search.wxml b/pages/goods/search/search.wxml
index c13292a..d70c051 100644
--- a/pages/goods/search/search.wxml
+++ b/pages/goods/search/search.wxml
@@ -87,7 +87,7 @@
       <view class="item-cont">
         <view class="title ellipsis-2">{{item.goods_name}}</view>
         <!-- 判断是否有活动价，小程序没有有团购和拼单 -->
-        <block wx:if="{{(item.prom_price>0 || item.prom_integral) && item.prom_id>0 && item.prom_type!=7}}">
+        <block wx:if="{{(item.prom_price>0 || item.prom_integral) && item.prom_id>0 && item.prom_type!=7 && item.prom_type!=10}}">
           <!-- 活动价 -->
           <view class="price">
 			  <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text>
diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml
index 700dfda..48d58c9 100644
--- a/pages/user/index/index.wxml
+++ b/pages/user/index/index.wxml
@@ -90,7 +90,7 @@
           <image class="xc-icon" src="{{iurl}}/miniapp/images/user/user_vip.png"></image>
           <view class="member fs28 "> 加入plus会员预计可省3031元</view>
         </view>
-        <view class="xc-opening-button t-c" data-url="/pages/user/cardinfo/cardinfo" bindtap="goto">
+        <view class="xc-opening-button t-c" data-url="/packageE/pages/user/cardinfo/cardinfo" bindtap="goto">
           <view class="xc-opening fs28">立即续费</view>
         </view>
       </view>
diff --git a/pages/user/plus/plus.js b/pages/user/plus/plus.js
index 373c8d2..715a9d3 100644
--- a/pages/user/plus/plus.js
+++ b/pages/user/plus/plus.js
@@ -174,7 +174,7 @@ Page({
       success: function (e) {
         var userInfo = e.data.data;
         if (userInfo['card_field'] && !getApp().globalData.is_card_back) {
-          var u_url = "/pages/user/cardinfo/cardinfo";
+          var u_url = "/packageE/pages/user/cardinfo/cardinfo";
           wx.reLaunch({
             url: u_url
           })
@@ -501,7 +501,7 @@ Page({
       });
       return false;
     } else {
-      var u_url = "/pages/user/cardinfo/cardinfo";
+      var u_url = "/packageE/pages/user/cardinfo/cardinfo";
       wx.reLaunch({
         url: u_url
       })
diff --git a/utils/util.js b/utils/util.js
index 10a0c82..ac6b76f 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -697,7 +697,52 @@ module.exports = {
             }
         })
     },
+    //检验等级价格
+    get_plus_name_price:function(sw_arr,th){
+        var that=this;
+        //---如果后台又开等级卡的开关---
+        if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {
+            th.setData({
+                rank_switch: true
+            });
+            //---回调卡的列表---
+            th.getPlusCardType(function (ob) {
+                th.setData({
+                    card_list: ob.card_list
+                });
+                var ti = setInterval(function () {
+                    var user = getApp().globalData.userInfo;
+                    if (!user) return false;
+                    clearInterval(ti);
+
+                    if (user.card_field && user['card_expiredate']) {
+                        var str = user['card_expiredate'].replace(/-/g, '/');
+                        var end = new Date(str);
+                        end = Date.parse(end) / 1000;
+                        var now = that.gettimestamp();
+
+                        //--- 判断是等级会员，且在有效期范围内 ---
+                        if (user.card_field && now < end) {
+                            var card_name = ob.name_map.get(user.card_field);
+                            if (card_name && card_name.length > 6) card_name = card_name.substring(0, 6);
+                            var is_near_date = 0;
+                            if (end - now < 60 * 60 * 30 * 24) is_near_date = 1; //如果小于30天
+
+                            th.setData({
+                                card_field: user.card_field,
+                                card_name: card_name,
+                                card_list: ob.card_list,
+                                is_near_date:is_near_date
+                            });
+                        }
+
+                    }
+
+                }, 500)
+            })
 
+        }
+    },
 
     unserialize: unserialize,
     _throttle:_throttle,