diff --git a/pages/user/assistance/task_assistance.js b/pages/user/assistance/task_assistance.js
index a464e0b..6c2ca9c 100644
--- a/pages/user/assistance/task_assistance.js
+++ b/pages/user/assistance/task_assistance.js
@@ -21,6 +21,8 @@ Page({
     endDate: "", //活动结束时间
     activity_data: "25:20:59", //活动剩余时间
     task_number: 0, //任务数
+	giftQty:0,      //库存设置数
+		
     is_task: 0, //历史记录与任务
     aitem: "", //活动的轮播图数据
     switch_head: 0, //0：我的任务，1：记录
@@ -221,6 +223,7 @@ Page({
             th.setData({
               aitem: data_aissa,
               task_number: task_number,
+			  giftQty:giftQty,
             });
             th.go_to_task(th.data.taskid);
 
@@ -228,7 +231,7 @@ Page({
             th.setData({
               aitem: data_aissa,
               task_number: task_number,
-              taskid: taskid
+              taskid: taskid,
             });
             //判断是不是领取的任务
             th.get_user_task();
diff --git a/pages/user/assistance/task_assistance.wxml b/pages/user/assistance/task_assistance.wxml
index 0f6e384..8e86552 100644
--- a/pages/user/assistance/task_assistance.wxml
+++ b/pages/user/assistance/task_assistance.wxml
@@ -46,7 +46,8 @@
 
   </view>
   <view class="task-number fs28 t-c" style="color:{{font_color ? ('#'+font_color):'white'}};">
-    今天剩余可领{{task_number}}个任务
+      <text wx:if="{{giftQty}}">今天剩余可领{{task_number}}个任务</text> 
+      <text wx:else>不限任务数量</text> 
   </view>
 
   <view wx:if="{{is_user_task==null}}" class="task_clike fs40 t-c flex-center" data-taskid="{{taskid}}" bindtap="add_onlicke"
diff --git a/pages/user/index/index.js b/pages/user/index/index.js
index 428b8c0..0176f4d 100644
--- a/pages/user/index/index.js
+++ b/pages/user/index/index.js
@@ -60,7 +60,7 @@ Page({
   onLoad: function(options) {	  
     var th=this;
 	//-- 读取会员中心按钮列表 --
-	getApp().request.promiseGet("/api/weshop/userTool/page", {
+	getApp().request.promiseGet("/api/weshop/userTool/page?pageSize=100", {
 	}).then(res => {
 	    if(res.data.code==0 ){
 	         var d_list=res.data.data.pageData;
diff --git a/pages/user/plus/plus.js b/pages/user/plus/plus.js
index 6fdc278..bea2645 100644
--- a/pages/user/plus/plus.js
+++ b/pages/user/plus/plus.js
@@ -245,7 +245,11 @@ Page({
         {data: {storeId: os.stoid}}).then(res => {
       if (res.data.code == 0) is_card = 1;
     })
-    if (is_card == 0) getApp().my_warnning("请联系商家升级plus功能", 0, th);
+    if (is_card == 0) {
+		 getApp().my_warnning("请联系商家升级plus功能", 0, th);
+		 return false;
+	}
+	 
     var item = th.data.is_plusCard[th.data.by_index];
     var req = {};
     req.cardId = item.CardId;