diff --git a/app.js b/app.js
index 9592b27..4f54ee8 100644
--- a/app.js
+++ b/app.js
@@ -5,29 +5,87 @@ var api = require("./api/api.js")
 
 //公共方法和变量
 App({
-    globalData: {
-        setting: t,
-        wechatUser: null,
-        userInfo: null,
-        config: null,   //门店参数
-        config2: null,  //门店配置
-        code: null,
-        heigth:0,
-        user_id:null,// 3674923,// 4379287,//  null,// 5682068,
-        buy_now:null,
-        picklist:null,    //门店列表
-        wuliuprice: null, //物流价格表
-        wuliu: null,      //物流公司
-        baddr:null,
-        mobile: null,    //记录手机
-        getu:null,       //记录会员信息
-        sessionKey: null,//记录会员信息
-        openid: null,    //记录会员信息
+  editTabBar: function () {
+    //使用getCurrentPages可以获取当前加载中所有的页面对象的一个数组，数组最后一个就是当前页面。
 
-        to_group:null,      //参团传递的数据
-        wxapp_buy_obj:null, //微信小程序购买的Object
-        pk_store:null,      //选择的门店
+    var curPageArr = getCurrentPages(); //获取加载的页面
+    var curPage = curPageArr[curPageArr.length - 1]; //获取当前页面的对象
+    var pagePath = curPage.route; //当前页面url
+    if (pagePath.indexOf('/') != 0) {
+      pagePath = '/' + pagePath;
+    }
+    console.log("获取加载的页面:="+curPageArr)
+    console.log("获取当前页面的对象:="+curPage)
+    console.log("当前页面url:="+pagePath)
+    var tabBar = this.globalData.tabBar;
+    for (var i = 0; i < tabBar.list.length; i++) {
+      tabBar.list[i].active = false;
+      if (tabBar.list[i].weappurl == pagePath) {
+        tabBar.list[i].active = true; //根据页面地址设置当前页面状态    
+      }
+    }
+    curPage.setData({
+      tabBar: tabBar
+    });
+  },
+
+  globalData: {
+    tabBar: {
+      "color": "#6e6d6b",//文字未选择color
+      "selectedColor": "#f23030",//文字被选择后color
+      "borderStyle": "white",//
+      "backgroundColor": "#ffffff",//背景color
+      "iscustom":'',
+      "list": [
+        {
+          "weappurl": "/pages/index/index/index",
+          "nav_name": "首页",
+          "src": "/images/bar/index.png",
+          "src_sele": "/images/bar/index_on.png"
+        },
+        {
+          "weappurl": "/pages/goods/categoryList/categoryList",
+          "nav_name": "分类",
+          "src": "/images/bar/fl.png",
+          "src_sele": "/images/bar/fl_on.png"
+        },
+        {
+          "weappurl": "/pages/cart/cart/cart",
+          "nav_name": "购物车",
+          "src": "/images/bar/car.png",
+          "src_sele": "/images/bar/car_on.png"
+        },
+        {
+          "weappurl": "/pages/user/index/index",
+          "nav_name": "我的",
+          "src": "/images/bar/user.png",
+          "src_sele": "/images/bar/user_on.png"
+        }
+      ]
     },
+      isTabBar:false,
+      setting: t,
+      wechatUser: null,
+      userInfo: null,
+      config: null,   //门店参数
+      config2: null,  //门店配置
+      code: null,
+      heigth:0,
+      user_id:null,// 3674923,// 4379287,//  null,// 5682068,
+      buy_now:null,
+      picklist:null,    //门店列表
+      wuliuprice: null, //物流价格表
+      wuliu: null,      //物流公司
+      baddr:null,
+      mobile: null,    //记录手机
+      getu:null,       //记录会员信息
+      sessionKey: null,//记录会员信息
+      openid: null,    //记录会员信息
+
+      to_group:null,      //参团传递的数据
+      wxapp_buy_obj:null, //微信小程序购买的Object
+      pk_store:null,      //选择的门店
+  },
     auth: o,
     request: a,
     onLaunch: function() {
diff --git a/app.json b/app.json
index 7b1d17e..c570bab 100644
--- a/app.json
+++ b/app.json
@@ -111,38 +111,7 @@
     "backgroundColor": "#ffffff",
     "enablePullDownRefresh": true
   },
-  "tabBar": {
-    "color": "#6e6d6b",
-    "selectedColor": "#f23030",
-    "borderStyle": "white",
-    "backgroundColor": "#ffffff",
-    "list": [
-      {
-        "pagePath": "pages/index/index/index",
-        "text": "首页",
-        "iconPath": "packageA/images/bar/index.png",
-        "selectedIconPath": "packageA/images/bar/index_on.png"
-      },
-      {
-        "pagePath": "pages/goods/categoryList/categoryList",
-        "text": "分类",
-        "iconPath": "packageA/images/bar/fl.png",
-        "selectedIconPath": "packageA/images/bar/fl_on.png"
-      },
-      {
-        "pagePath": "pages/cart/cart/cart",
-        "text": "购物车",
-        "iconPath": "packageA/images/bar/car.png",
-        "selectedIconPath": "packageA/images/bar/car_on.png"
-      },
-      {
-        "pagePath": "pages/user/index/index",
-        "text": "我的",
-        "iconPath": "packageA/images/bar/user.png",
-        "selectedIconPath": "packageA/images/bar/user_on.png"
-      }
-    ]
-  },
+  
   "debug": false,
   "sitemapLocation": "sitemap.json"
 }
\ No newline at end of file
diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 73a41f7..0e836d6 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -55,6 +55,11 @@ Page({
   },
   onShow: function() {
     var th = this;
+    th.setData({
+      isTabBar:  getApp().globalData.isTabBar,
+    });
+    
+    t.editTabBar();    //显示自定义的底部导航
     this.getCardList();
     if(getApp().globalData.user_id)  getApp().requestCardNum();
     //--获取是否又秒杀活动--
@@ -73,6 +78,7 @@ Page({
         })
       }
     });
+    isTabBar
 
   },
 
diff --git a/pages/cart/cart/cart.wxml b/pages/cart/cart/cart.wxml
index c820f5a..e6e30ec 100644
--- a/pages/cart/cart/cart.wxml
+++ b/pages/cart/cart/cart.wxml
@@ -147,7 +147,7 @@
 </view>
 
 <!-- 好物推荐 -->
-<view class="title" style="margin-top: 60rpx" wx:if="{{(!requestData|| requestData.length==0) && is_load}}">
+<view class="title" style="margin-top: 60rpx; margin-bottom:{{isTabBar == true ? '50px' : '0'}}" wx:if="{{(!requestData|| requestData.length==0) && is_load}}">
   <!-- 标题 -->
   <view>
     <!-- 中文名标题 -->
@@ -182,4 +182,8 @@
 
 
 
-<warn id="warn"></warn>
\ No newline at end of file
+<warn id="warn"></warn>
+<view wx:if="{{isTabBar == true}}">
+  <import src="../../tabbar/tabbar.wxml" />
+  <template is="tabBar" data="{{tabBar}}" />
+</view>
\ No newline at end of file
diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js
index 60ff9f1..7a9c684 100644
--- a/pages/goods/categoryList/categoryList.js
+++ b/pages/goods/categoryList/categoryList.js
@@ -68,6 +68,8 @@ Page({
     },
     onLoad: function(tt) { 
       var that = this;
+      that.get_brand();
+
       clearInterval(that.data.timer);
       that.setData({ countDownNum: 3, stylePage: 1 });
 
@@ -151,6 +153,10 @@ Page({
 
     onShow:function(){
       var that=this;
+      that.setData({
+        isTabBar:  getApp().globalData.isTabBar,
+      });
+      t.editTabBar();    //显示自定义的底部导航
       //this.requestFirstCategoris();
       if(getApp().globalData.user_id)  getApp().requestCardNum();
       getApp().getConfig2(function (e) {
diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml
index 0486107..179e969 100644
--- a/pages/goods/categoryList/categoryList.wxml
+++ b/pages/goods/categoryList/categoryList.wxml
@@ -288,7 +288,7 @@
           <view class="flex project_height" style="margin-left:-10rpx;">
             <!-- 分类项目的类型 -->
             <view class="project_type" style="height:88%;overflow-y:auto;position:fixed;left:0;z-index:999999;top:120rpx;">
-              <view class="project_type-frame">
+              <view class="project_type-frame" style="margin-bottom:50px;">
                 <view wx:if="{{is_show_gb}}">
                   <view  bindtap="click_classify"  class="share_type fs30 flex-space-between xc-letter-spacing {{select_classify_on==223?'select_classify':''}}"data-index="223"data-name="国家" wx:if="{{is_country}}">
                     <text>国</text><text>家</text>
@@ -316,7 +316,7 @@
               </view>
             </view>
             <!-- 分类项目的内容 -->
-            <view class="classify_content" style="margin-left:26%;margin-top:51px">
+            <view class="classify_content" style="margin-left:26%;margin-top:60px">
         <!-- 国家的样式 -->
         <block wx:if="{{select_classify_on==223&&is_show_gb}}">
         <view class="classify_name fs28 flex-space-between">
@@ -365,7 +365,7 @@
         <block  wx:if="{{is_show_pl}}">
           <block wx:if="{{select_classify_on!=220&&select_classify_on!=223&&is_level_three!=1}}">
               <view style="width:100%;height:100%;">
-                <view class="classify_name fs28 flex-space-between" id="header" data-pid="0" data-cid="{{cat_id}}" bindtap='select_more' style="position:fixed;z-index:999999;top:120rpx;width:70%;background-color:#ffffff;left:26%;padding:0 10rpx;">
+                <view class="classify_name fs28 flex-space-between" id="header" data-pid="0" data-cid="{{cat_id}}" bindtap='select_more' style="position:fixed;z-index:999999;top:65px;width:70%;background-color:#ffffff;left:26%;padding:0 10rpx;">
                   <view class="classify_title ellipsis-1">{{classify_name}}</view>
                   <view class="flex select_more" >
                     <view class="red-co fs24" >更多</view>
@@ -376,13 +376,13 @@
                 <!-- <view class="classify_content-frame flex-wrap" style="width:100%;overflow:hidden;heigth:100%;"> -->
               
                <!-- <view class="null" style="width:100%;margin-top:70rpx;"></view> -->
-                <scroll-view scroll-y scroll-top="{{scrollTop}}" bindscrolltolower='scrollLower' style="height:{{windowHeight}};position:absolute;margin-top:70rpx;top:120rpx;bottom:0;rigth:0;left:26%;width:73%;">
+                <scroll-view scroll-y scroll-top="{{scrollTop}}" bindscrolltolower='scrollLower' style="height:{{windowHeight}};position:absolute;margin-top:70rpx;top:120rpx;bottom:0;rigth:0;left:26%;width:73%;margin-bottom:50px;">
                 <view class="null" style="width:100%;height:1px;"></view>
                 <!-- goodslist -->
                     <view class="choice_list" style="height:{{msgStatus != true?'100%':''}}">
                       <navigator class="choice_item" style="margin-bottom:{{dataLength -1 == index?'100px':'0'}}" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:for="{{requestData}}" data-id="{{index}}" wx:key="{{index}}">
                         <view class="img-wrap">
-                          <image src="{{item.original_img}}" binderror="bind_bnerr2" data-url="{{url+item.original_img}}" lazy-load="true" data-errorimg="requestData[{{index}}].original_img"></image>
+                          <image src="{{url+item.original_img}}" binderror="bind_bnerr2" data-url="{{url+item.original_img}}" lazy-load="true" data-errorimg="requestData[{{index}}].original_img"></image>
                         </view>
                         <view class="item-cont">
                           <view class="title">{{item.goods_name}}</view>
@@ -486,4 +486,8 @@
         </view>
     </block>
 
-</block>
\ No newline at end of file
+</block>
+<view wx:if="{{isTabBar == true}}">
+  <import src="../../tabbar/tabbar.wxml" />
+  <template is="tabBar" data="{{tabBar}}" />
+</view>
\ No newline at end of file
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 7a5c8b6..117246e 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -929,11 +929,6 @@ Page({
         sku: o.sku,
       };
 
-      //如果是积分够，is_integral_normal就要有积分购普通购买字段
-      if(o.prom_type==4){
-        newd.is_integral_normal=1;
-      }
-
       //-----如果是秒杀，团购，积分购,拼团-----
       if (th.data.prom_type == 1) {
         newd.goods_price = th.data.prom_price;
diff --git a/pages/index/index/index.js b/pages/index/index/index.js
index a708ce8..97fa8bc 100644
--- a/pages/index/index/index.js
+++ b/pages/index/index/index.js
@@ -77,7 +77,7 @@ Page({
 
   onLoad: function() {
     var th = this;
-
+    
     //看一下商家是否开通了权益
     //--初始化是否有打勾--
     getApp().request.promiseGet("/api/weshop/users/grade/vip/init/get", {
@@ -102,9 +102,42 @@ Page({
       is_disgraceful: 0
     })
   },
+
   async onShow() {
     var th = this;
-  
+    //获取底部导航
+    await getApp().request.promiseGet("/api/weshop/storeFooter/get/"+o.stoid, {
+      
+    }).then(res => {
+      var e = res;
+      console.log(e)
+      if(e.data.code != -1){
+        getApp().globalData.isTabBar = true
+        //console.log(JSON.parse(e))
+        var itemList = e.data.data.data;
+        
+        itemList = JSON.parse(itemList)
+        for(var i=0; i<itemList.length; i++){
+          itemList[i]['active'] = false
+        }
+        console.log(itemList)
+        getApp().globalData.tabBar.backgroundColor = e.data.data.bkcolor
+        getApp().globalData.tabBar.selectedColor = e.data.data.fontcolor_sele
+        getApp().globalData.tabBar.color = e.data.data.fontcolor
+        getApp().globalData.tabBar.list = itemList
+        getApp().globalData.tabBar.iscustom = '1'
+        wx.hideTabBar({})
+      }else{
+        getApp().globalData.isTabBar = true
+        getApp().globalData.tabBar.iscustom = '2'
+      }
+      th.setData({
+        isTabBar:  getApp().globalData.isTabBar,
+      }); 
+    })
+    console.log("isTabBar:="+getApp().globalData.isTabBar)
+    t.editTabBar();    //显示自定义的底部导航
+    
     if (getApp().globalData.user_id) getApp().requestCardNum();
     await this.init_load();
     //显示的时候要开启计时器
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index 34af204..64d91fe 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -246,7 +246,7 @@
   </view>
 
   <!-- 好物推荐 -->
-  <view class="title">
+  <view class="title" style="margin-bottom:{{isTabBar == true ? '50px' : '0'}}">
     <!-- 标题 -->
     <view>
       <!-- 中文名标题 -->
@@ -359,7 +359,9 @@
     </view>
   </view>
 </block>
-
-
+<!-- <view wx:if="{{isTabBar == true}}"> -->
+  <import src="../../tabbar/tabbar.wxml" />
+  <template is="tabBar" data="{{tabBar}}" />
+<!-- </view> -->
 
 
diff --git a/pages/tabbar/tabbar.js b/pages/tabbar/tabbar.js
new file mode 100644
index 0000000..2371de0
--- /dev/null
+++ b/pages/tabbar/tabbar.js
@@ -0,0 +1,67 @@
+// pages/tabbar.js
+var d = getApp().globalData;
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    isTabBar:d.isTabBar
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file
diff --git a/pages/tabbar/tabbar.json b/pages/tabbar/tabbar.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/tabbar/tabbar.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/tabbar/tabbar.wxml b/pages/tabbar/tabbar.wxml
new file mode 100644
index 0000000..01ae311
--- /dev/null
+++ b/pages/tabbar/tabbar.wxml
@@ -0,0 +1,13 @@
+<!--pages/tabbar.wxml-->
+
+  <template name="tabBar">
+    <view class="tab-bar" style="position:fixed;color: {{tabBar.color}}; background: {{tabBar.backgroundColor}}; {{tabBar.position=='top'? 'top: 0' : 'bottom: 0'}};width:100%;height:50px;z-index:9999999">
+      <block wx:for="{{tabBar.list}}" wx:key="weappurl">
+        <navigator url="{{item.weappurl}}" bindtap="goto({{item.weappurl}})"  class="tabbar_item {{item.clas}}" style="{{item.active? 'color: '+(item.selectedColor? item.selectedColor : tabBar.selectedColor) : ''}};position:relative;width:25%;height:100%;float:left;text-align:center;padding:2px 0;">
+          <view style="width:50%;height:50%;margin-left:25%;"><image src="{{item.src_sele}}" wx:if="{{item.active&&item.src_sele}}" class="img" style="width:100%;height:100%"></image>
+          <image src="{{item.src}}" wx:if="{{!item.active&&item.src}}" class="img" style="width:100%;height:100%"></image></view>
+          <view style="width:100%;height:100%;"><text class="tabbar_text" wx:if="{{item.nav_name}}" style="font-size:0.8rem">{{item.nav_name}}</text></view>
+        </navigator>
+      </block>
+    </view>
+  </template>
diff --git a/pages/tabbar/tabbar.wxss b/pages/tabbar/tabbar.wxss
new file mode 100644
index 0000000..979f504
--- /dev/null
+++ b/pages/tabbar/tabbar.wxss
@@ -0,0 +1 @@
+/* pages/tabbar.wxss */
\ No newline at end of file
diff --git a/pages/user/index/index.js b/pages/user/index/index.js
index 8c9a5d0..156e677 100644
--- a/pages/user/index/index.js
+++ b/pages/user/index/index.js
@@ -78,12 +78,18 @@ Page({
   onShow: function() {
 
     this.is_assistance();
+  
 
     var stoid = app_d.setting.stoid;
     var s = this,
       th = s,
       need_money = 0,
       cur_g_num = 0;
+      th.setData({
+        isTabBar:  getApp().globalData.isTabBar,
+      });
+      
+      app.editTabBar();    //显示自定义的底部导航
     getApp().get_isbuy(th.setappdata);
     if (getApp().globalData.user_id) getApp().requestCardNum();
     /*------会员登录------*/
diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml
index ed38417..ae205cd 100644
--- a/pages/user/index/index.wxml
+++ b/pages/user/index/index.wxml
@@ -1,4 +1,4 @@
-<view class="xc-page">
+<view class="xc-page" style="margin-bottom:{{isTabBar == true ? '50px' : '0'}}">
   <view class="xc-user">
     <view class="xc-head rel">
       <image class="xc-background" src="{{iurl}}{{ad_img?ad_img:'/miniapp/images/user_index_powder.jpg'}}">
@@ -297,3 +297,7 @@
 </view>
 
 <pop_txt id="pop_txt"></pop_txt>
+<view wx:if="{{isTabBar == true}}">
+  <import src="../../tabbar/tabbar.wxml" />
+  <template is="tabBar" data="{{tabBar}}" />
+</view>
\ No newline at end of file
diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index 2ddd364..9747020 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -289,7 +289,7 @@ Page({
 		for(var i in order_goods){
 			var good=order_goods[i];
 			//如果不是小程序有的功能，直接提示要去3.0处理
-			if(good.prom_type==2  || good.prom_type==4){
+			if(good.prom_type==2 || good.prom_type==3 || good.prom_type==4 || good.prom_type==5){
 				wx.showModal({
 				  title: '提示',
 				  content: '小程序还未有该活动，请到3.0公众号支付'
@@ -330,8 +330,8 @@ Page({
 			  });
 			  return false;
 			}
-
-            if((good.prom_type==1 || good.prom_type==6  || good.prom_type==5 ) && !good.is_gift && !good.is_collocation){
+			
+			  if(good.prom_type==1 || good.prom_type==6){
 				   if(gg.prom_type!=good.prom_type)	{
 					   wx.showModal({
 					     title: '提示',
@@ -339,32 +339,6 @@ Page({
 					   });
 					   return false;		   
 				   }
-                if(good.prom_type==3  || good.prom_type==5){
-                    await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => {
-                    }).then(res=>{
-                        if(res.data.code==0){
-                            var r_data=res.data.data;
-                            if(!r_data.collocationPromList && good.prom_type==5){
-                                wx.showModal({
-                                    title: '提示',
-                                    content: good.goods_name+'未找到活动'
-                                });
-                            }
-                            if(!r_data.promGoodsLists && good.prom_type==3){
-                                wx.showModal({
-                                    title: '提示',
-                                    content: good.goods_name+'未找到活动'
-                                });
-                            }
-                        }else{
-                            wx.showModal({
-                                title: '提示',
-                                content: good.goods_name+'未找到活动'
-                            });
-                            return false;
-                        }
-                    })
-                }
 					
 			  }else{
 				  
@@ -400,25 +374,24 @@ Page({
 						  }
 					  } 				  
 				  }
-
-                if(!good.is_gift && !good.is_collocation) {
-                    var isok = 1;
-                    var card_field = th.data.card_field;
-                    //如果会员是等级会员,商品有等级价,且不是活动商品
-                    if (card_field && gg[card_field] > 0) {
-                        if (good.goods_price != gg[card_field]) isok = 0;
-                    } else {
-                        if (good.goods_price != gg.shop_price) isok = 0;
-
-                    }
-                    if (!isok) {
-                        wx.showModal({
-                            title: '提示',
-                            content: gg.goods_name + '商品的价格发生了变化'
-                        });
-                        return false;
-                    }
-                }
+				  
+				  			  
+				  var isok=1;
+				  var card_field=th.data.card_field;
+				  //如果会员是等级会员,商品有等级价,且不是活动商品
+				  if(card_field && gg[card_field]>0){
+					 if (good.goods_price != gg[card_field])  isok = 0;
+				  }else{
+					 if (good.goods_price != gg.shop_price)  isok = 0;
+						
+				  }	
+				  if(!isok){
+					  wx.showModal({
+					    title: '提示',
+					    content: gg.goods_name+'商品的价格发生了变化'
+					  });
+					  return false;		
+				  }		
 				
 				  //--如果是线下库存的时候--		
 				  if(th.data.conf.sales_rules==2){
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 7e87bc6..719f095 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -380,7 +380,7 @@ Page({
 	for(var i in order_goods){		
 		var good=order_goods[i];
 		//如果不是小程序有的功能，直接提示要去3.0处理
-		if(good.prom_type==2  || good.prom_type==4 ){
+		if(good.prom_type==2 || good.prom_type==3 || good.prom_type==4 || good.prom_type==5){
 			wx.showModal({
 			  title: '提示',
 			  content: '小程序还未有该活动，请到3.0公众号支付'
@@ -422,7 +422,10 @@ Page({
 		  return false;
 		}
 		
-		  if((good.prom_type==1 || good.prom_type==6  || good.prom_type==5 ) && !good.is_gift && !good.is_collocation){
+		
+		 console.log("-----------------111-------------------");
+		
+		  if(good.prom_type==1 || good.prom_type==6){
 			   if(gg.prom_type!=good.prom_type)	{
 				   wx.showModal({
 				     title: '提示',
@@ -430,34 +433,9 @@ Page({
 				   });
 				   return false;		   
 			   }
-			   if(good.prom_type==3  || good.prom_type==5){
-                   await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => {
-                   }).then(res=>{
-                       if(res.data.code==0){
-                               var r_data=res.data.data;
-                               if(!r_data.collocationPromList && good.prom_type==5){
-                                   wx.showModal({
-                                       title: '提示',
-                                       content: good.goods_name+'未找到活动'
-                                   });
-                               }
-                               if(!r_data.promGoodsLists && good.prom_type==3){
-                                   wx.showModal({
-                                       title: '提示',
-                                       content: good.goods_name+'未找到活动'
-                                   });
-                               }
-                       }else{
-                           wx.showModal({
-                               title: '提示',
-                               content: good.goods_name+'未找到活动'
-                           });
-                           return false;
-                       }
-                   })
-               }
-
+			
 		  }else{
+			  
 			  if(gg.prom_type==1 || gg.prom_type==6){
 				  var prom=null;
 				  //---如果是活动的时候---
@@ -490,25 +468,24 @@ Page({
 					  }
 				  } 				  
 			  }
-			  //赠品和搭配购不判断商品金额
+			  
+			  			  
 			  var isok=1;
 			  var card_field=th.data.card_field;
 			  //如果会员是等级会员,商品有等级价,且不是活动商品
-              if(!good.is_gift && !good.is_collocation) {
-                  if (card_field && gg[card_field] > 0) {
-                      if (good.goods_price != gg[card_field]) isok = 0;
-                  } else {
-                      if (good.goods_price != gg.shop_price) isok = 0;
-
-                  }
-                  if (!isok) {
-                      wx.showModal({
-                          title: '提示',
-                          content: gg.goods_name + '商品的价格发生了变化'
-                      });
-                      return false;
-                  }
-              }
+			  if(card_field && gg[card_field]>0){
+				 if (good.goods_price != gg[card_field])  isok = 0;
+			  }else{
+				 if (good.goods_price != gg.shop_price)  isok = 0;
+					
+			  }	
+			  if(!isok){
+				  wx.showModal({
+				    title: '提示',
+				    content: gg.goods_name+'商品的价格发生了变化'
+				  });
+				  return false;		
+			  }		
 			
 			  //--如果是线下库存的时候--		
 			  if(th.data.conf.sales_rules==2){
diff --git a/utils/filter.wxs b/utils/filter.wxs
index aa3ba54..b71c82d 100644
--- a/utils/filter.wxs
+++ b/utils/filter.wxs
@@ -1,6 +1,5 @@
 var filters = {
         toFix:function(val,count){
-            val=parseFloat(val);
             return val.toFixed(count)
         },
         replace_time:function(val){