Merge branch 'dev' into 'test'

Dev See merge request !421

Merge branch 'dev' into 'test'
Dev See merge request !421
后端研发-苏明海
2 parents 9b3a4709 878718aa
Showing 17 changed files with 198 additions and 66 deletions
app.js
app.json
packageA/pages/prom_list/prom_list.wxml
pages/cart/cart/cart.js
pages/cart/cart/cart.wxml
pages/cart/cart2/cart2.js
pages/goods/categoryList/categoryList.js
pages/goods/categoryList/categoryList.wxml
pages/index/index/index.js
pages/index/index/index.wxml
pages/tabbar/tabbar.js
pages/tabbar/tabbar.json
pages/tabbar/tabbar.wxml
pages/tabbar/tabbar.wxss
pages/user/index/index.wxml
pages/user/order_detail/order_detail.js
pages/user/order_list/order_list.js
@@ -35,30 +35,32 @@ App({
       "selectedColor": "#f23030",//文字被选择后color
       "borderStyle": "white",//
       "backgroundColor": "#ffffff",//背景color
+      "iscustom":'',
+      "url":"",
       "list": [
         {
           "weappurl": "/pages/index/index/index",
           "nav_name": "首页",
-          "src": "/images/bar/index.png",
-          "src_sele": "/images/bar/index_on.png"
+          "src": "/miniapp/images/bar/index.png",
+          "src_sele": "/miniapp/images/bar/index_on.png"
         },
         {
           "weappurl": "/pages/goods/categoryList/categoryList",
           "nav_name": "分类",
-          "src": "/images/bar/fl.png",
-          "src_sele": "/images/bar/fl_on.png"
+          "src": "/miniapp/images/bar/fl.png",
+          "src_sele": "/miniapp/images/bar/fl_on.png"
         },
         {
           "weappurl": "/pages/cart/cart/cart",
           "nav_name": "购物车",
-          "src": "/images/bar/car.png",
-          "src_sele": "/images/bar/car_on.png"
+          "src": "/miniapp/images/bar/car.png",
+          "src_sele": "/miniapp/images/bar/car_on.png"
         },
         {
           "weappurl": "/pages/user/index/index",
           "nav_name": "我的",
-          "src": "/images/bar/user.png",
-          "src_sele": "/images/bar/user_on.png"
+          "src": "/miniapp/images/bar/user.png",
+          "src_sele": "/miniapp/images/bar/user_on.png"
         }
       ]
     },
@@ -83,15 +83,15 @@
     "pages/user/assistance/assistance_success",
     "pages/user/assistance/assistance",
     "pages/video/index",
-    "pages/template/index"   
+    "pages/template/index",
+    "pages/store/index"
   ],
   "subPackages": [{
       "root": "packageA/",
       "name":"pack1",
-      "pages": [
-        "pages/store/index",
+      "pages": [     
          "pages/prom_list/prom_list",
          "pages/quan_list/quan_list",
          "pages/quan_pro/quan_pro"
@@ -111,7 +111,38 @@
     "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
@@ -46,7 +46,7 @@
      <!-- 左边 -->
      <view style="text-align: left; padding-left: 20rpx">
          <view  class="co-red"><text class="f_hei">搭配价</text>￥{{filters.toFix(data.shop_price+dp_price,2)}}</view>
-         <view  class="co-red"><text class="f_hei">已省</text>￥{{cut_price}}</view>
+         <view  class="co-red"><text class="f_hei">已省</text>￥{{filters.toFix(cut_price,2)}}</view>
      </view>
      <!-- 右边 -->
       <view  bindtap="openSpecModel"  class="buy_btn ">立即购买</view>
@@ -55,9 +55,9 @@ Page({
   },
   onShow: function() {
     var th = this;
-    th.setData({
-      isTabBar:  getApp().globalData.isTabBar,
-    });
+    //th.setData({
+    //  isTabBar:  getApp().globalData.isTabBar,
+    //});
     t.editTabBar();    //显示自定义的底部导航
     this.getCardList();
@@ -78,7 +78,6 @@ Page({
         })
       }
     });
-    isTabBar
   },
@@ -1191,8 +1190,9 @@ Page({
             }).then(res=>{
                if(res.data.code==0) discount=res.data.data;
             })
-            //---如果有打折的信息，赠送的信息---
-            if(discount && discount['goods_id']){
+
+            //---如果有打折的信息，赠送的信息,赠送的时候要判断是不是限购数量---
+            if(discount && discount['goods_id'] && discount.limit_num>=discount.bs  && discount.gift_storecount>=discount.bs){
               var o=discount.goodsinfo;
               var newd = {
                 goods_id: o.goods_id,
@@ -183,7 +183,7 @@
 <warn id="warn"></warn>
-<view wx:if="{{isTabBar == true}}">
+<!-- <view wx:if="{{isTabBar == true}}">
   <import src="../../tabbar/tabbar.wxml" />
   <template is="tabBar" data="{{tabBar}}" />
-</view>
 \ No newline at end of file
+</view> -->
 \ No newline at end of file
@@ -695,9 +695,9 @@ Page({
                //--看有没有减价--
                if(item_map.prom_price && item_map.price-item_map.prom_price){
                    if(cart_item.prom_pt_json){
-                       cart_item.prom_pt_json.push({"prom_id":item_map.prom_id,"dis":item_map.price-item_map.prom_price,"ispt":0})
+                       cart_item.prom_pt_json.push({"prom_id":item_map.prom_id,"dis":(item_map.price-item_map.prom_price).toFixed(2),"ispt":0})
                    }else{
-                       cart_item.prom_pt_json=[{"prom_id":item_map.prom_id,"dis":item_map.price-item_map.prom_price,"ispt":0}];
+                       cart_item.prom_pt_json=[{"prom_id":item_map.prom_id,"dis":(item_map.price-item_map.prom_price).toFixed(2),"ispt":0}];
                    }
                    o_price-=(item_map.price-item_map.prom_price);
@@ -840,12 +840,12 @@ Page({
               if(o_price>=freight_free && freight_free>0 && !is_good_no_by  &&  th.data.is_no_by[pickid]!=1){
                  continue;
               }
-
               //--如果是包邮券使用的情况下，如果商品是包邮的，那么就不进行计算--
               if(th.data.using_quan[pickid] && th.data.using_quan[pickid].isby==1 && !is_good_no_by){
                   continue;
               }
+
 			  //----------------如果是选择了物流---------------------
 			  if(cart_item.exp_type == 0 && item[j].is_free_shipping==0){
 			     //如果地址不为空
@@ -1365,8 +1365,8 @@ Page({
       //--判断优惠活动的提交--
       if(th.data.formData.cut_price>0){
-        order_prom_list.discount_amount=th.data.formData.cut_price;
-        var ob=[{"prom_id":th.data.bn_goods.prom_id,"dis":th.data.formData.cut_price,"ispt":0}]
+        order_prom_list.discount_amount=th.data.formData.cut_price.toFixed(2);
+        var ob=[{"prom_id":th.data.bn_goods.prom_id,"dis":th.data.formData.cut_price.toFixed(2),"ispt":0}]
         order_prom_list.prom_pt_json=JSON.stringify(ob);
       }
       if(th.data.formData.give_integral>0){
@@ -1512,7 +1512,7 @@ Page({
           }
           //--判断优惠活动的提交--
           if(t_item.cut_price>0){
-              order_prom_list.discount_amount=t_item.cut_price;
+              order_prom_list.discount_amount=t_item.cut_price.toFixed(2);
               order_prom_list.prom_pt_json=JSON.stringify(t_item.prom_pt_json);
           }
           if(t_item.s_intValue>0){
@@ -2364,6 +2364,7 @@ Page({
   //-----获取购物车进来的劵-------
   get_cart_quan:function () {
       var th=this;
+      var is_xz_yh=1;
       //等待值的出现
       getApp().waitfor2(this,"g_cart_q_time","order_prom_list_cart",async function () {
           var arr=th.data.order_prom_list_cart;
@@ -2387,6 +2388,7 @@ Page({
                   //如果有限制使用优惠券，就要返回
                   if(gd.prom_type==3){
                       if(th.data.prom_goods_map[pickup_id][gd.prom_id].is_xz_yh) continue;
+                      is_xz_yh=0;
                       th.data.prom_goods_map[pickup_id][gd.prom_id].coupon_sele=1;
                   }
                   var item_price=gd.goods_price*gd.goods_num;
@@ -2418,7 +2420,7 @@ Page({
               arr[ind].check_quan_price_list=check_quan_price_list;
               //是否关闭使用优惠券
-              if (th.data.is_close_quan != 1) {
+              if (th.data.is_close_quan != 1 && !is_xz_yh) {
                   //--调用接口，获取优惠券的列表，3秒钟内控制接口请求--
                   var url="/api/weshop/couponList/getUseCouponList";
                   await app.request.promiseGet(url,{ data:{storeId:oo.stoid,userId:app.globalData.user_id,BuySum:ckeck_quan_price,WareIds:check_quan_ware_list,pageSize:100}}).then(res=>{
@@ -535,6 +535,15 @@ Page({
       this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; 
   },
+
+
+   //---图片失败，默认图片---
+     bind_Goodsbnerr: function (e) {
+      var _errImg = e.target.dataset.errorimg;
+      var _errObj = {};
+      _errObj[_errImg] ="/miniapp/images/default_g_img.gif";
+      this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;       
+    },
   // 新的版本分类点击一级分类
  click_classify:function(e){
    clearInterval(this.data.timer);
@@ -382,7 +382,7 @@
                     <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="{{url+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_Goodsbnerr" 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>
@@ -487,7 +487,7 @@
     </block>
 </block>
-<view wx:if="{{isTabBar == true}}">
+<!-- <view wx:if="{{isTabBar == true}}">
   <import src="../../tabbar/tabbar.wxml" />
   <template is="tabBar" data="{{tabBar}}" />
-</view>
 \ No newline at end of file
+</view> -->
 \ No newline at end of file
@@ -102,38 +102,43 @@ Page({
       is_disgraceful: 0
     })
   },
+
   async onShow() {
     var th = this;
     //获取底部导航
-    await getApp().request.promiseGet("/api/weshop/storeFooter/get/"+o.stoid, {
+    // 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;
+    // }).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
-        wx.hideTabBar({})
-      }else{
-        getApp().globalData.isTabBar = true
-      }
-      th.setData({
-        isTabBar:  getApp().globalData.isTabBar,
-      }); 
-    })
-    console.log("isTabBar:="+getApp().globalData.isTabBar)
-    t.editTabBar();    //显示自定义的底部导航
+    //     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'
+    //     getApp().globalData.tabBar.url = "";
+    //     wx.hideTabBar({})
+    //   }else{
+    //     getApp().globalData.isTabBar = true
+    //     getApp().globalData.tabBar.iscustom = '2'
+    //     getApp().globalData.tabBar.url = th.data.url;
+    //   }
+    //   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();
@@ -360,8 +360,8 @@
   </view>
 </block>
 <!-- <view wx:if="{{isTabBar == true}}"> -->
-  <import src="../../tabbar/tabbar.wxml" />
-  <template is="tabBar" data="{{tabBar}}" />
+  <!-- <import src="../../tabbar/tabbar.wxml" />
+  <template is="tabBar" data="{{tabBar}}" /> -->
 <!-- </view> -->
+// 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
+{
+  "usingComponents": {}
+}
 \ No newline at end of file
+<!--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="{{tabBar.url}}{{item.src_sele}}" wx:if="{{item.active&&item.src_sele}}" class="img" style="width:100%;height:100%"></image>
+          <image src="{{tabBar.url}}{{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>
+/* pages/tabbar.wxss */
 \ No newline at end of file
@@ -297,7 +297,7 @@
 </view>
 <pop_txt id="pop_txt"></pop_txt>
-<view wx:if="{{isTabBar == true}}">
+<!-- <view wx:if="{{isTabBar == true}}">
   <import src="../../tabbar/tabbar.wxml" />
   <template is="tabBar" data="{{tabBar}}" />
-</view>
 \ No newline at end of file
+</view> -->
 \ No newline at end of file
@@ -235,15 +235,13 @@ Page({
               if(!e.confirm) return false;
               //如果是秒杀和拼单的商品，取消订单要返回redis,并取消订单
               //if(is_skill==1 || is_zsorder>=2){
-
-             getApp().request.delete("/api/weshop/order/cancelTeamOrder/"+os.stoid+"/"+o,{
+             getApp().request.post("/api/weshop/order/cancelOrder/"+os.stoid+"/"+o+"/"+getApp().globalData.user_id,{
                data:{},
                success: function(t) {
                  if(t.data.code==0)
                    th.requestOrderDetail(o), wx.setStorageSync("order:order_list:update", !0);
                },
              })
-
               /*----
               }else{
                   getApp().request.put("/api/weshop/order/updatebyId", {
@@ -261,7 +261,7 @@ Page({
         //如果是秒杀和拼单的商品，取消订单要返回redis,并取消订单
         if (t.confirm) {
           //if(is_skill==1 || is_zsorder>=2){
-          getApp().request.delete("/api/weshop/order/cancelTeamOrder/" + os.stoid + "/" + a, {
+          getApp().request.post("/api/weshop/order/cancelOrder/"+os.stoid+"/"+a+"/"+getApp().globalData.user_id, {
             data: {},
             success: function(t) {
               if (t.data.code == 0) {
@@ -600,6 +600,7 @@ Page({
   pay_next(e){
+      var th=this;
 	  if (e.order_amount == 0) {
 	    var dd = {
 	      parent_sn: e.order_sn,