Merge branch 'dev' into 'test'

Dev See merge request !269

Merge branch 'dev' into 'test'
Dev See merge request !269
后端研发-苏明海
2 parents 3dfaf9bf 5879e203
Showing 5 changed files with 23 additions and 18 deletions
pages/giftpack/buygiftpack/giftpackbuy.js
pages/giftpack/mygiftpack/mygiftpack.js
pages/user/assistance/friend_assistance.js
pages/user/my_service/tment_eval.js
pages/user/my_service/tment_eval.wxml
@@ -151,7 +151,7 @@ Page({
       data: {
         storeId: th.data.getStorageID, //商家ID
         userId: th.data.getUserID, //用户ID
-        page: th.data.pages,
+        page: th.data.curpage,
         pageSize: th.data.pageSize
       },
       success: function(res) {
@@ -170,7 +170,8 @@ Page({
           }), wx.stopPullDownRefresh(); //停止下拉刷新
         } else {
           th.setData({
-            is_read: 1
+            is_read: 1,
+            ismore:1
           })
         }
       }
@@ -20,8 +20,8 @@ Page({
       contentrefresh: '加载中...',
       contentnomore: '已加载全部'
     },
-    ismore:0,//数据是否全部加载完成
-    is_read:0,//是否查询过我的礼包接口
+    ismore: 0, //数据是否全部加载完成
+    is_read: 0, //是否查询过我的礼包接口
     curpage: 1, //当前分页数
     pageSize: 10, //页大小
     total: 0, //总数量
@@ -42,16 +42,16 @@ Page({
   },
   getList: function() {
     var th = this;
-    
+
     getApp().request.get('/api/weshop/marketing/my/giftbag/page', {
-      isShowLoading:true,
+      isShowLoading: true,
       data: {
         storeId: th.data.getStorageID, //商家ID
         userId: th.data.getUserID, //用户ID
         page: th.data.curpage,
         pageSize: th.data.pageSize
       },
-      success: function success(res) {
+      success: function(res) {
         if (res.data.code == 0) {
           th.data.curpage++;
           var arr1 = th.data.wareCard;
@@ -63,21 +63,22 @@ Page({
             wareCard: arr3,
             total: res.data.data.total,
             ismore: ismore,
-            is_read:1
+            is_read: 1
           }), wx.stopPullDownRefresh(); //停止下拉刷新
         } else {
           th.setData({
-            is_read: 1
+            is_read: 1,
+            ismore:1
           })
         }
-      
+
       }
-      
+
     });
  
   },
   //销毁界面跳转
-  redirectTo: function (e) {
+  redirectTo: function(e) {
     var th = this;
     var url = e.currentTarget.dataset.url;
     //销毁跳转
@@ -86,20 +87,20 @@ Page({
     });
   },
   //不销毁界面跳转
-  navigateTo: function (e) {
+  navigateTo: function(e) {
     var th = this;
     var url = e.currentTarget.dataset.url;
     getApp().goto(url);
   },
   //下拉事件
-  onReachBottom: function () {
+  onReachBottom: function() {
     var th = this;
     if (th.data.total <= th.data.pageSize) return;
     if (th.data.ismore) return;
     th.getList();
   },
   //图片失败，默认图片
-  bind_bnerr2: function (e) {
+  bind_bnerr2: function(e) {
     var _errImg = e.target.dataset.errorimg;
     var _errObj = {};
     _errObj[_errImg] = "/public/images/empty.jpg";
@@ -99,7 +99,6 @@ Page({
 	cklie_button: function() {
 		var th = this;
 		var t_user_id = app_d.user_id;
-    t_user_id = 1433320;
 		var data = {
 			id: this.data.tasking,
 			storeId: os.stoid,
@@ -274,7 +274,11 @@ Page({
           actId: id,
           giftBagId: giftbagid
         })
-      } 
+      } else{
+        th.setData({
+          is_act:0
+        })
+      }
     })
   },
  
@@ -98,7 +98,7 @@
     <view>评价其他</view>
   </view>
  
-  <view wx:if="{{is_act}}" style="margin: auto;margin-bottom: 30rpx;"  class="Submission flex-center yellow-b" bindtap="clike_lb">
+  <view wx:if="{{is_act==1}}" style="margin: auto;margin-bottom: 30rpx;"  class="Submission flex-center yellow-b" bindtap="clike_lb">
     <view>点击领取礼品</view>
   </view>
  </view>