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

后端开发-许程
2 parents ee052b69 f5bb8dd5
Showing 6 changed files with 55 additions and 53 deletions
pages/giftpack/giftpacklist/giftpacklist.js
pages/giftpack/giftpacklist/giftpacklist.wxml
pages/user/assistance/assistance_success.js
pages/user/assistance/assistance_success.wxml
pages/user/assistance/friend_assistance.js
pages/user/assistance/friend_assistance.wxml
@@ -33,8 +33,6 @@ Page({
     var th = this;
     th.setData({
       isBuy: options.isBuy,
-      getStorageID: a.stoid,
-      getUserID: d.user_id,
       getGiftID: options.lbId,
       orderSn: options.orderSn
     })
@@ -43,9 +41,6 @@ Page({
     } else {
       th.GetBuyGiftList();
     }
-    th.setData({
-      giftRemark: th.data.giftRemark.replace(/<p><img/gi, "<p class='img'><img")
-    })
     th.close();
   },
   onShow: function() {
@@ -55,6 +50,7 @@ Page({
     var that = this.data;
     var th = this;
     // var id = e.currentTarget.dataset.id;//活动id
+    var money = e.currentTarget.dataset.money;
     var my_confirm = th.selectComponent("#my_confirm"); //组件的id
     my_confirm.open(
       "是否确定购买该礼包",
@@ -69,9 +65,9 @@ Page({
           "actId": '', //活动Id
           "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
           "buyType": '2', //1=积分兑换 2=余额购买
-          "lbId": that.getGiftID, //礼包Id
-          "storeId": that.getStorageID, //商家Id
-          "userId": that.getUserID, //用户ID
+          "giftBagId": that.getGiftID, //礼包Id
+          "storeId": a.stoid, //商家Id
+          "userId": d.user_id, //用户ID
           "buyFrom": 2
         };
         var data = JSON.stringify(json);
@@ -85,18 +81,20 @@ Page({
           }, // 设置请求的 header
           success: function(res) {
             if (res.data.code == 0) {
-              res = res.data.data;
+              var res = res.data.data;
+              var order_sn = res.orderSn;
+              var url = "/pages/giftpack/payment/payment?money=" + money + "&order_sn=" + order_sn;
               wx.requestPayment({
-                timeStamp: String(res.timeStamp),
-                nonceStr: res.nonceStr,
-                package: res.packageValue,
-                signType: res.signType,
-                paySign: res.paySign,
+                timeStamp: String(res.result.timeStamp),
+                nonceStr: res.result.nonceStr,
+                package: res.result.packageValue,
+                signType: res.result.signType,
+                paySign: res.result.paySign,
                 success: function(n) {
-
+                  getApp().goto(url);
                 },
                 fail: function(n) {
-
+                  getApp().my_confirm("取消支付", 0, th);
                 }
               });
             } else {
@@ -130,9 +128,9 @@ Page({
           "actId": '', //活动Id
           "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
           "buyType": '1', //1=积分兑换 2=余额购买
-          "lbId": that.getGiftID, //礼包Id
-          "storeId": that.getStorageID, //商家Id
-          "userId": that.getUserID //用户ID
+          "giftBagId": that.getGiftID, //礼包Id
+          "storeId": a.stoid, //商家ID
+          "userId": d.user_id, //用户ID
         };
         var data = JSON.stringify(json);
         var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert";
@@ -161,8 +159,8 @@ Page({
     var th = this;
     getApp().request.get('/api/weshop/marketing/my/giftbag/detail/get', {
       data: {
-        "storeId": th.data.getStorageID, //商家ID
-        "userId": th.data.getUserID, //用户ID
+        "storeId": a.stoid, //商家ID
+        "userId": d.user_id, //用户ID
         "orderSn": th.data.orderSn
       },
       success: function success(res) {
@@ -177,7 +175,7 @@ Page({
             })
           } else {
             th.setData({
-              giftRemark: res.data.data.giftRemark
+              giftRemark: res.data.data.giftRemark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
             })
           }
@@ -228,8 +226,8 @@ Page({
     var th = this.data;
     getApp().request.get('/api/weshop/marketing/giftbag/detail/get', {
       data: {
-        "storeId": th.getStorageID, //商家ID
-        "userId": th.getUserID, //用户ID
+        "storeId": a.stoid, //商家ID
+        "userId": d.user_id, //用户ID
         "giftBagId": th.getGiftID
       },
       success: function success(res) {
@@ -239,13 +237,12 @@ Page({
             giftTitle: res.data.data.giftTitle
           })
           if (res.data.data.giftRemark == '') {
-
             _this2.setData({
               giftRemark: '暂无详情......'
             })
           } else {
             _this2.setData({
-              giftRemark: res.data.data.giftRemark
+              giftRemark: res.data.data.giftRemark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
             })
           }
@@ -95,14 +95,14 @@
       <text class="data-v-3a5b7e36">活动说明</text>
     </view>
     <view class="foot_box_remark data-v-3a5b7e36">
-      <rich-text nodes="{{giftRemark}}"></rich-text>
+      <rich-text nodes="{{giftRemark}}" style="word-break:break-all;word-wrap:break-word"></rich-text>
     </view>
   </view>
   <view class="foot_empty data-v-3a5b7e36"></view>
   <block wx:if="{{isBuy==1}}">
     <view class="foot_button data-v-3a5b7e36">
       <block wx:if="{{giftPrice>0&&giftIntegral>0}}">
-        <view class="foot_button_left data-v-3a5b7e36" data-id="{{lbId}}" bindtap="GetBuyPrice">
+        <view class="foot_button_left data-v-3a5b7e36" data-money="{{giftPrice}}" data-id="{{lbId}}" bindtap="GetBuyPrice">
           <text class="data-v-3a5b7e36">立即购买</text>
         </view>
       </block>
@@ -112,7 +112,7 @@
         </view>
       </block>
       <block wx:if="{{giftPrice>0 && giftIntegral<=0}}">
-        <view class="foot_button_buy data-v-3a5b7e36" bindtap="GetBuyPrice" data-id="{{lbId}}">
+        <view class="foot_button_buy data-v-3a5b7e36" data-money="{{giftPrice}}" bindtap="GetBuyPrice" data-id="{{lbId}}">
           <text class="data-v-3a5b7e36">立即购买</text>
         </view>
       </block>
@@ -18,14 +18,15 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+     //var helpid=options.helpid;
+     var helpid=23;
+     this.init(helpid);
   },
   /**
    * 生命周期函数--监听页面显示
    */
   onShow: function (e) {
-	 var helpid=e.helpid; 
-     this.init(helpid);
+	
   },
   // ----初始化----
@@ -35,10 +36,9 @@ Page({
 	var th=this;
 	//链式调用接口,先获取活动,在获取参与活动的人数
-    getApp().request.promiseGet("/api/weshop/marketing/help/help/user/page", {
+    getApp().request.promiseGet("/api/weshop/marketing/help/help/act/get", {
       data: {
-        userId: app_d.user_id,
-        storeId: os.store_id,
+        storeId: store_id,
 		helpId: helpid
       }
     }).then(res => {
@@ -46,7 +46,7 @@ Page({
 			th.setData({zl_act:res.data.data});
 			return getApp().request.promiseGet("/api/weshop/marketing/help/involve/help/act/people/count", {
 				 data: {
-					storeId: os.store_id,
+					storeId: store_id,
 					helpId: helpid
 				 }
 			})	
@@ -69,4 +69,7 @@ Page({
   },
+  cklie_button:function(){
+	  getApp().goto("/pages/user/assistance/assistance") 
+  }
 })
 \ 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="{{user.head_pic}}"></image>
@@ -17,9 +17,10 @@ Page({
 		is_show: 0, //显示弹框
 		user: app_d.userInfo,
 		zl_act: null, //助力活动
-		task_id: 0, //助力任务ID
+		tasking: 0, //助力任务ID
 		userId: 0, //任务用户的ID
 		s_num: 0, //分享的人数
+		taskId:0, //活动从表ID
 	},
 	/**
@@ -27,25 +28,27 @@ Page({
 	 */
 	onLoad: function(options) {
 		var th = this;
-		if (options.task_id) this.data.task_id = options.task_id;
+		if (options.tasking) this.data.tasking = options.tasking;
 		if (options.userId) 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 != null && this.data.task_id != 'undefined' && this.data.task_id != "" && this.data.task_id !=
+		if (this.data.tasking == 0 || this.data.tasking == undefined) {
+			//this.data.task_id = decodeURIComponent(options.scene);
+			this.data.tasking =1;
+			if (this.data.tasking != null && this.data.tasking != 'undefined' && this.data.tasking != "" && this.data.tasking !=
 				0) {
 				getApp().request.promiseGet("/api/weshop/marketing/help/help/tasking/get", {
 					data: {
-						id: th.data.task_id,
+						id: th.data.tasking,
 						storeId: os.stoid
 					}
 				}).then(res => {
 					if (res.data.code == 0) {
-						th.data.userId = res.data.data.user_id;
+						th.data.userId = res.data.data.userId;
+						th.data.taskId = res.data.data.taskId;
 						//获取活动的时间
 						return getApp().request.promiseGet("/api/weshop/marketing/help/help/act/get", {
 							data: {
-								id: th.data.task_id,
+								helpId: res.data.data.helpFormId,
 								storeId: os.stoid
 							}
 						})
@@ -96,9 +99,9 @@ Page({
 		var th = this;
 		var t_user_id = app_d.user_id;
 		var data = {
-			id: this.data.task_id,
+			id: this.data.tasking,
 			storeId: os.stoid,
-			userId: this.data.user_id,
+			userId: this.data.userId,
 			zlUserId: t_user_id
 		};
 		console.log(data);
@@ -106,7 +109,7 @@ Page({
 			data, //入参
 			function(res) { //成功
 				if (res.data.code == 0)
-					this.setData({
+					th.setData({
 						is_show: 1
 					});
 				else {
@@ -121,9 +124,8 @@ Page({
 	},
 	//点击关闭礼盒
 	clike_none: function() {
-		this.setData({
-			is_show: 0
-		});
+		this.setData({is_show: 0});
+		getApp().goto("/pages/user/assistance/assistance_success");
 	},
 	//导航球
 	close: function() {
@@ -14,12 +14,12 @@
 </view>
     <view class="flex jc-center">
           <view class="activity_time fs24 white">
-             活动时间：{{filter.fm_time(zl_act.begindate)}}-{{filter.fm_time(zl_act.begindate)}}
+             活动时间：{{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">已有{{zl_act.qiang_num}}人领取礼盒</view>
+<view class="fs26 white t-c" wx:if="{{s_num}}">已有{{s_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}}'>