Merge branch 'dev' into 'test'

Dev See merge request !256

Merge branch 'dev' into 'test'
Dev See merge request !256
后端研发-苏明海
2 parents 72dc693d 9b40aa94
Showing 8 changed files with 24 additions and 17 deletions
pages/user/assistance/assistance.js
pages/user/assistance/assistance.wxml
pages/user/assistance/assistance.wxss
pages/user/assistance/task_assistance.wxml
pages/user/assistance/task_assistance.wxss
pages/user/coupons/coupons.js
pages/user/coupons/coupons.wxml
pages/user/index/index.js
@@ -133,7 +133,7 @@ Page({
             })
           }
         } else {
-          getApp().my_confirm(res.data.msg, 0, th);
+          getApp().my_warnning(res.data.msg, 0, th);
           th.setData({
             is_show_more: 1,
             page: page
@@ -43,6 +43,7 @@
       <!-- 我的任务 -->
       <view wx:if="{{switch_head==0}}" class="white">
         <view class="items">
+        <view class="tesk_list">
           <view class="item fs26 flex-vertical-between padding" wx:for="{{zl_user_list}}">
             <view class="flex-center width">
               <view class="ellipsis-1">{{item.helpTaskName}}</view>
@@ -59,7 +60,7 @@
               <view class="ellipsis-1" bindtap="select_libao" data-orderSn="{{item.orderSn}}">查看礼包</view>
             </view>
  
-
+          </view>
           </view>
           <!-- 加载更多 -->
           <block wx:if="{{is_show_more==0}}">
@@ -78,9 +79,7 @@
           </view>
           <view class="flex-center receive" wx:if="{{is_load && s_num}}">
             <view class="flex-center">
-              <view>已有</view>
-              <view>{{s_num}}</view>
-              <view>人领取了任务</view>
+              <view>已有 {{s_num}}人领取了任务</view>
             </view>
  
           </view>
@@ -105,5 +104,7 @@
  
   </view>
 </view>
+<!-- 引入提示组件 -->
+<warn id="warn"></warn>
 <!--  制作一个圆球导航  -->
 <nav_b id="nav_b"></nav_b>
 \ No newline at end of file
@@ -131,3 +131,9 @@ page {
 .receive {
   padding-bottom: 50rpx;
 }
+.tesk_list{
+  width: 100%;
+  max-height: 335rpx;
+  overflow: hidden;
+  overflow-y:auto;
+}
 \ No newline at end of file
@@ -58,7 +58,7 @@
  
 </view>
 <!-- 底部列表 -->
-<view style="margin-top:{{is_user_task!=null?100:50}}rpx">
+<view style="margin-top:{{is_user_task!=null?130:35}}rpx">
   <!-- 标题 -->
  
   <view class="flex-vertical-between fs28 padding head">
@@ -142,9 +142,7 @@
     <view class="line"></view>
   </view>
   <view class="flex-center white" style="margin-top: 20rpx;" wx:if="{{usercount>0}}">
-    <view>已有</view>
-    <view>{{usercount}}</view>
-    <view>人领取了任务</view>
+    <view>已有{{usercount}}人领取了任务</view>
   </view>
 </view>
  
@@ -8,7 +8,7 @@ page {
  
 .top-back {
   width: 100%;
-  height: 60%;
+  height:70%;
   background-repead: no-repead;
   background-size: 100% 100%;
 }
@@ -36,7 +36,7 @@ page {
 }
  
 .task-number {
-  margin-top: 50rpx;
+  margin-top: 35rpx;
 }
  
 .task_clike {
@@ -57,6 +57,7 @@ Page({
 	b_isuse_arr:null,//包邮券的已使用的内容
  
 	isloading:0, //正在加载中的代码
+	isset:0,
   },
   // 点击选中二维码
   click: function(e) {
@@ -194,7 +195,7 @@ Page({
 							b_isuse_arr.push(b_arr[i]);
 						 }
 					 }				 					 
-					 data.cashcount= data.cashcount+b_arr.length;  //加上包邮券的数量
+					 data.cashcount= data.cashcount+b_can_arr.length;  //加上包邮券的数量
 					 th.data.b_can_arr=b_can_arr;      //可使用
 					 th.data.b_out_arr=b_out_arr;      //过期
 					 th.data.b_isuse_arr=b_isuse_arr;  //已使用
@@ -235,7 +236,7 @@ Page({
 		if(big_arr.length==0 && this.data.b_can_arr){
 			big_arr=this.data.b_can_arr;			
 		}
-		init_num=this.data.b_can_arr.length;
+		if(this.data.b_can_arr) init_num=this.data.b_can_arr.length;
  
         wx.showLoading(); th.data.isloading=1;
 	    getApp().request.promiseGet("/api/weshop/users/listQuan", {
@@ -246,6 +247,8 @@ Page({
 		   var a = res.data;
 		   val = a.data.total; 
 		   var details = a.data.pageData;
+		   
+		   th.setData({isset:1});
  
 		    //没有找到优惠券的时候
 		    if (details.length == 0 && th.data.current_page==1) {
@@ -289,6 +292,7 @@ Page({
   },
  
  overdue:function(){
+	
 	if(this.data.isloading) return;	
  
     var len = this.data.details.length;
@@ -348,7 +352,6 @@ Page({
         });
  
  
-		
         setTimeout(function () {
 		  if(th.data.current_page==1) details=big_arr;	
           for (var i = 0; i < details.length; i++) {
@@ -20,7 +20,7 @@
   (<text class='y_sz'>{{number}}</text>）</view>
 </view>
  
-<view class='noCoupons' wx:if='{{details.length==0}}'>
+<view class='noCoupons' wx:if='{{details.length==0 && isset}}'>
   <image src='{{iurl}}miniapp/images/user/wqnone.png'></image>
   <view class='no_wz1'>没有微券？</view>
   <view class='no_wz2'>快去兑换吧</view>
@@ -102,7 +102,7 @@ Page({
  
         /*-----获取会员包邮券的数量-----*/
         rq.get("/api/weshop/userfeemail/page", {
-          data: { user_id: e.user_id, store_id: os.stoid, pageSize:1},
+          data: { user_id: e.user_id, store_id: os.stoid, pageSize:1,isuse:0},
           success: function (su) {
             if (su.data.code == 0) {
               th.setData({ byquan: parseInt(su.data.data.total)});
@@ -505,7 +505,6 @@ Page({
  
     //   }
     // })
-
   }