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

前端研发-钱巧玲
2 parents e3c090e0 b5bc85d7
Showing 5 changed files with 105 additions and 58 deletions
pages/user/assistance/assistance_success.js
pages/user/assistance/assistance_success.wxml
pages/user/assistance/friend_assistance.js
pages/user/assistance/friend_assistance.wxml
utils/request.js
@@ -8,6 +8,8 @@ Page({
    */
   data: {
     iurl: s.imghost,
+	user:app_d.userInfo,
+	zl_act:null, //助力活动
   },
   /**
@@ -28,22 +30,22 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+     this.init();
   },
-
-  // 初始化判断微信余额
-  async weixin() {
+  // ----初始化----
+  init:function() {
+  	
     var user_id = getApp().globalData.user_id;
     var store_id = os.stoid;
-    await getApp().request.promiseGet("/api/weshop/marketing/help/act/judge", {
+	var th=this;
+    getApp().request.promiseGet("http://172.20.3.102:8022/api/weshop/zl_act", {
       data: {
         user_id: user_id,
         store_id: store_id
       }
     }).then(res => {
-      console.log("是什么东西", res.data.code);
-      
+        if(res.data.code==0) th.setData({zl_act:res.data.data}) 
     })
   },
@@ -55,19 +57,6 @@ Page({
   },
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
   /**
    * 页面上拉触底事件的处理函数
 <view class="top-back" style="background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)">
   <view class="flex-vertical user_assis">
-    <image class="circle user_img" src="https://mshopimg.yolipai.net/public/upload/qyimg/temp/2019/08-14/0697f7277936a3b116a6ebc4f8f5e39a.png"></image>
-   <view class="user_name white fs28 ellipsis-1">你好</view>
-  </view>
-  <view  class="caption_title white fs32 t-c">
- 助力成功，自己也差拆一个吧~
+    <image class="circle user_img" src="{{user.head_pic}}"></image>
+   <view class="user_name white fs28 ellipsis-1">{{user.nickname}}</view>
   </view>
+  <view  class="caption_title white fs32 t-c">助力成功，自己也差拆一个吧~</view>
   <!-- 礼包图片 -->
 <view class="t-c">
 <image class="assis_liba" src="{{iurl}}/miniapp/images/friendhelp/libao_asiss.png">
 </image>
 </view>
     <view class="flex jc-center">
-          <view class="activity_time fs24 white">
-          活动时间：5月23日-6月15日
-          </view>
+        <view class="activity_time fs24 white">
+            活动时间：{{filter.fm_time(zl_act.beginDate)}}-{{filter.fm_time(zl_act.endDate)}}
+        </view>
     </view>
 </view>
 <view class="cklie_button t-c flex-center" bindtap="cklie_button">我也要参加</view>
-<view class="fs26 white t-c">已有126人领取礼盒</view>
-<!-- 礼盒弹框 -->
-<!-- <view class="cover-layer" wx:if='{{is_show!=0}}' bindtap="clike_none"></view>
-<view class="libao_frame t-c" wx:if='{{is_show!=0}}'>
-    <view class="layer-img" style="background-image: url({{iurl}}/miniapp/images/friendhelp/success.png)">
-    <view class="button-img t-c fs28 flex-center" style="background-image: url({{iurl}}/miniapp/images/friendhelp/participate.png)">
-    我也要参加
-    </view>
-    <view class=" fs24 success white t-c">已成功帮你的小伙伴助力!</view>
-    </view>
- <view class="link_div">
-</view>
-<image class="close-none"bindtap="clike_none" src="{{iurl}}/miniapp/images/plus/Close.png"></image>
-</view> -->
+<view class="fs26 white t-c">已有{{zl_act.qiang_num}}人领取礼盒</view>
+
 <!-- 引入提示组件 -->
 <warn id="warn"></warn>
 <!--  制作一个圆球导航 -->
@@ -9,13 +9,34 @@ Page({
   data: {
     iurl: s.imghost,
     is_show:0,//显示弹框
+	user:app_d.userInfo,
+	zl_act:null, //助力活动
+	task_id:0,   //助力任务ID
+	userId:0,    //任务用户的ID
   },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+	 var th=this; 
+     this.data.task_id=options.options;	 
+	 this.data.userId=options.userId;	 
+	 //任务是不是为空
+	 if(this.data.task_id==0 || this.data.task_id==undefined){  
+		 this.data.task_id= decodeURIComponent(options.scene);
+		 if(this.data.task_id){
+			   getApp().request.get("http://172.20.3.102:8022/api/weshop/zl_act_user",{
+				   data:{},
+				   success:function(res){
+					   if(res.data.code==0){
+						   th.data.userId=res.data.data.user_id;
+					   }
+				   }
+			   })
+			 
+		 }
+	 }
   },
@@ -25,22 +46,34 @@ Page({
       url: '/pages/user/assistance/assistance_success',
     })
   },
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
+  
   /**
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+     this.init();
   },
   //点击开启礼盒
   cklie_button:function(){
-    this.setData({ is_show:1});
+	   var th=this;
+	   var t_user_id=app_d.user_id;
+	   var data={id:this.data.task_id,storeId:os.store_id,userId:this.data.user_id, zlUserId:t_user_id};	   
+	   getApp().request.json_post("/api/weshop/marketing/help/help/task/involve/insert", 
+	       data,          //入参
+		   function(res){    //成功
+		      if(res.data.code==0)
+			      this.setData({ is_show:1});
+			  else{
+				  getApp().my_warnning(res.data.msg,0,th)
+			  }	  
+		   },
+		   function(){//失败
+			   
+		   }
+		  )
+	  
+	
+         
   },
   //点击关闭礼盒
   clike_none:function(){
@@ -86,5 +119,22 @@ Page({
    */
   onShareAppMessage: function () {
-  }
+  },
+  
+  // ----初始化----
+  init:function() {
+  	
+    var user_id = getApp().globalData.user_id;
+    var store_id = os.stoid;
+  	var th=this;
+    getApp().request.promiseGet("http://172.20.3.102:8022/api/weshop/zl_act", {
+      data: {
+        user_id: user_id,
+        store_id: store_id
+      }
+    }).then(res => {
+        if(res.data.code==0) th.setData({zl_act:res.data.data}) 
+    })
+  
+  },
 })
 \ No newline at end of file
+<wxs module="filter" src="c_filter.wxs"></wxs>
 <view class="top-back" style="background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)">
   <view class="flex-vertical user_assis">
-    <image class="circle user_img" src="https://mshopimg.yolipai.net/public/upload/qyimg/temp/2019/08-14/0697f7277936a3b116a6ebc4f8f5e39a.png"></image>
-   <view class="user_name white fs28 ellipsis-1">你好</view>
+    <image class="circle user_img" src="{{user.head_pic}}"></image>
+   <view class="user_name white fs28 ellipsis-1">{{user.nickname}}</view>
   </view>
   <view  class="caption_title white fs32 t-c">
   拜托拜托，帮我拆礼盒得好礼~
   </view>
   <!-- 礼包图片 -->
 <view class="t-c">
-<image class="assis_liba" src="../../../images/frinedhelp/libao_asiss.png">
+<image class="assis_liba" src="{{iurl}}/miniapp/images/friendhelp/libao_asiss.png">
 </image>
 </view>
     <view class="flex jc-center">
           <view class="activity_time fs24 white">
-          活动时间：5月23日-6月15日
+             活动时间：{{filter.fm_time(zl_act.begindate)}}-{{filter.fm_time(zl_act.begindate)}}
           </view>
     </view>
 </view>
 <view class="cklie_button t-c flex-center" bindtap="cklie_button">帮他拆礼盒</view>
-<view class="fs26 white t-c">已有126人领取礼盒</view>
+<view class="fs26 white t-c">已有{{zl_act.qiang_num}}人领取礼盒</view>
 <!-- 礼盒弹框 -->
 <view class="cover-layer" wx:if='{{is_show!=0}}' bindtap="clike_none"></view>
 <view class="libao_frame t-c" wx:if='{{is_show!=0}}'>
@@ -212,5 +212,26 @@ module.exports = {
            if(req) req.abort();
         },time*1000)
     }
+	
+	/**
+	 * @param {Object} url    //url地址
+	 * @param {Object} data   //data入参
+	 * @param {Object} succ   //成功的回调
+	 * @param {Object} fail   //失败的回调
+	 */
+	json_post:function(url,data,succ,fail){
+		 if(url.indexOf("http")==-1) url=getApp().globalData.setting.url +url;
+		 var str = JSON.stringify(pdata);
+		 wx.request({
+		   url: url,
+		   data: str,
+		   method: 'POST',
+		   header: {
+		     'content-type': 'application/json'
+		   },// 设置请求的 header
+		   success: function (res) { succ(res); },
+		   fail:function(res){fail(res);}
+		 })		
+	}
 };
 \ No newline at end of file