Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

taiyuan
2 parents e2c0db78 185c2c98
Showing 5 changed files with 55 additions and 27 deletions
app.js
app.json
packageA/pages/quan_list/quan_list.js
packageA/pages/quan_list/quan_list.wxml
pages/index/index/index.js
@@ -40,7 +40,7 @@ App({
 		],		
  
   globalData: {
-     cartGoodsNum:0,       //购物车总数量
+      cartGoodsNum:0,       //购物车总数量
       isTabBar :false,
       isIpx: false,   //适配IPhoneX
       url:"",
@@ -523,6 +523,7 @@ App({
     //-------获取购物车数量----------
     requestCardNum: function(th) {
         if(!this.globalData.user_id) return false;
+        var that=this;
         this.request.get("/api/weshop/cart/page", {
 			isShoeLoading:false,
             data: {
@@ -538,14 +539,30 @@ App({
                         num += e.data.data.pageData[i].goods_num;
                     }
                 }
-                getApp().globalData.cartGoodsNum=num;
+
                 /*---
                 wx.setTabBarBadge({ //tabbar右上角添加文本
                     index: 2, ////tabbar下标
                     text: '' + num //显示的内容
                 });--*/
-                th.getTabBar().setData({cartGoodsNum:num});
-				th.data.up_dating = 0
+
+                //-- 读取服务卡的数量 --
+                that.promiseGet("/api/weshop/cartService/page",{
+                    data:{
+                        store_id: that.globalData.setting.stoid,
+                        user_id: that.globalData.user_id,
+                    }
+                }).then(res=>{
+
+                    for (var i = 0; i < res.data.data.pageData.length; i++) {
+                        num += res.data.data.pageData[i].goods_num;
+                    }
+
+                    that.globalData.cartGoodsNum=num;
+                    th.data.up_dating = 0
+                    th.getTabBar().setData({cartGoodsNum:num});
+                })
+
             }
         });
     },
@@ -139,7 +139,7 @@
 		 "pages/profile/profile",
 		 "pages/parseHtml/parseHtml",
 		 "pages/myGift/myGift",
-		 "pages/myGiftDetails/myGiftDetails"，
+		 "pages/myGiftDetails/myGiftDetails",
 		 "pages/cart2_ser/cart2_ser"
       ]
  
@@ -25,19 +25,21 @@ Page({
   onLoad: function(t) {
      var th=this;
      getApp().getConfig2(function (conf) {
-        conf.couponset=conf.couponset.replace(/\<img/g,'<img style="width:100%;height:auto;display:block"');
+        if(conf.couponset) conf.couponset=conf.couponset.replace(/\<img/g,'<img style="width:100%;height:auto;display:block"');
         th.setData({config2:conf});
      })
   },
   //---展示---
   onShow: function() {
+
+    console.log("onShow:1");
     this.data.curpage=1;
     this.setData({dataList:null});
+    console.log("onShow:2");
     this.get_quan_list();
     //券的模拟数据
     //var data = [{ is_get:0,money:50,condition:500,id:1,name: "券名字", endtype: 0, use_start_time: 1579596090, use_end_time: 1611218490, everyone_num: 2,interval_time:1,color:"red"}];
     //th.setData({dataList: data});
-
     this.setData({getcurday:ut.gettimestamp()});
   },
  
@@ -47,20 +49,31 @@ Page({
  
   //--券的列表页面的函数--
   get_quan_list:function(){
+    console.log("onShow:3");
     var th=this;
     if(th.data.loading) return false;
     th.data.loading=1;
     var user_id=getApp().globalData.user_id;
-    getApp().request.promiseGet("/api/weshop/prom/coupon/pageCouponList", {
-       data:{store_id:os.stoid,type:1,pageSize:10,page:th.data.curpage,user_id:user_id,is_share:0}
-    }).then(res => {
-          th.data.loading=0;
-          if(res.data.code==0){
-               if(!th.data.dataList) th.data.dataList=new Array();
-               th.data.dataList=th.data.dataList.concat(res.data.data.pageData);
-               th.data.curpage++;
-               th.setData({dataList:th.data.dataList});
-          }
+    console.log("onShow:4");
+    var data={store_id:os.stoid,type:1,pageSize:10,page:th.data.curpage,user_id:user_id,is_share:0};
+    console.log(data);
+    getApp().request.get("/api/weshop/prom/coupon/pageCouponList", {
+       data:data,
+       success:function (res){
+           console.log("onShow:5");
+           console.log(res);
+           th.data.loading=0;
+           if(res.data.code==0){
+             if(!th.data.dataList) th.data.dataList=new Array();
+             th.data.dataList=th.data.dataList.concat(res.data.data.pageData);
+             th.data.curpage++;
+             th.setData({dataList:th.data.dataList});
+           }
+       },
+       fail:function (e){
+         console.log("onShow:6");
+         console.log(e);
+       }
     });
   },
  
@@ -2,9 +2,11 @@
 <wxs module="g_filters" src="g_filter.wxs"></wxs>
 <wxs module="tool" src="filter.wxs"></wxs>
  
-<view class="header">
-   <rich-text  nodes="{{config2.couponset}}" class="r_txt fs26"></rich-text>
-</view>
+<block wx:if="{{config2.couponset}}">
+    <view class="header">
+       <rich-text  nodes="{{config2.couponset}}" class="r_txt fs26"></rich-text>
+    </view>
+</block>
 <view class="content">
    <view bindtap="go_detail" data-ind="{{index}}" class="quan_item flex fs30" wx:for="{{dataList}}">
         <!-- 左边 -->
@@ -351,14 +351,10 @@ Page({
   //当隐藏的时候就关闭计时器
   onHide: function() {
     this.data.is_timer = 0;
-    clearInterval(this.data.pt_timer);
-	clearInterval(this.data.w_holiday_pop);
-	clearInterval(this.data.full_screen);
-	
+    if(this.data.pt_timer) clearInterval(this.data.pt_timer);
+    if(this.data.w_holiday_pop) clearInterval(this.data.w_holiday_pop);
+    if(this.data.full_screen) clearInterval(this.data.full_screen);
 	this.data.w_holiday_pop=0;
-    for(var i = 1; i < 100; i++) {
-      clearInterval(i);
-    }
  
   },