1 participants
-
Status changed to merged
-
mentioned in commit 22c832b2a9e10d2a3d4c70ec5f7da195ebf9465c
Showing
16 changed files
pages/giftpack/buygiftpack/giftpackbuy.js
| @@ -37,13 +37,7 @@ Page({ | @@ -37,13 +37,7 @@ Page({ | ||
| 37 | th.getList(); | 37 | th.getList(); |
| 38 | }, | 38 | }, |
| 39 | onShow: function() { | 39 | onShow: function() { |
| 40 | - // var th = this; | ||
| 41 | - // th.setData({ | ||
| 42 | - // pages: 1, | ||
| 43 | - // pageSize: 10, | ||
| 44 | - // loadingType: 0 | ||
| 45 | - // }) | ||
| 46 | - // th.getList(); | 40 | + |
| 47 | }, | 41 | }, |
| 48 | 42 | ||
| 49 | GetBuyPrice: function(e) { | 43 | GetBuyPrice: function(e) { |
| @@ -155,6 +149,9 @@ Page({ | @@ -155,6 +149,9 @@ Page({ | ||
| 155 | }, | 149 | }, |
| 156 | getList: function(e) { | 150 | getList: function(e) { |
| 157 | var th = this; | 151 | var th = this; |
| 152 | + wx.showLoading({ | ||
| 153 | + title: '加载中', | ||
| 154 | + }); | ||
| 158 | getApp().request.get('/api/weshop/marketing/giftbag/page', { | 155 | getApp().request.get('/api/weshop/marketing/giftbag/page', { |
| 159 | data: { | 156 | data: { |
| 160 | storeId: th.data.getStorageID, //商家ID | 157 | storeId: th.data.getStorageID, //商家ID |
pages/giftpack/buygiftpack/giftpackbuy.wxml
| @@ -39,7 +39,7 @@ | @@ -39,7 +39,7 @@ | ||
| 39 | <text class="ellipsis-1">{{"原价:￥"+items.giftPosPrice}}</text> | 39 | <text class="ellipsis-1">{{"原价:￥"+items.giftPosPrice}}</text> |
| 40 | </view> | 40 | </view> |
| 41 | <view class="content_ware_time"> | 41 | <view class="content_ware_time"> |
| 42 | - <text class="ellipsis-1">{{"活动时间:"+items.endTime}}</text> | 42 | + <text class="ellipsis-1">{{"活动结束时间:"+items.endTime}}</text> |
| 43 | </view> | 43 | </view> |
| 44 | </view> | 44 | </view> |
| 45 | </view> | 45 | </view> |
pages/giftpack/evaluategift/evaluategift.js
| @@ -34,6 +34,9 @@ Page({ | @@ -34,6 +34,9 @@ Page({ | ||
| 34 | }, | 34 | }, |
| 35 | GetList: function() { | 35 | GetList: function() { |
| 36 | var th = this; | 36 | var th = this; |
| 37 | + wx.showLoading({ | ||
| 38 | + title: '加载中', | ||
| 39 | + }) | ||
| 37 | var url = "/api/weshop/marketing/giftbag/bound/get"; | 40 | var url = "/api/weshop/marketing/giftbag/bound/get"; |
| 38 | getApp().request.promiseGet(url, { | 41 | getApp().request.promiseGet(url, { |
| 39 | data: { | 42 | data: { |
| @@ -47,6 +50,7 @@ Page({ | @@ -47,6 +50,7 @@ Page({ | ||
| 47 | "gifbagid": th.data.giftBagId | 50 | "gifbagid": th.data.giftBagId |
| 48 | } | 51 | } |
| 49 | }).then(res => { | 52 | }).then(res => { |
| 53 | + wx.hideLoading(); | ||
| 50 | if (res.data.code == 0) { | 54 | if (res.data.code == 0) { |
| 51 | if (res.data.data.lbCoupons.length > 0 && res.data.data.lbCoupons != null) { | 55 | if (res.data.data.lbCoupons.length > 0 && res.data.data.lbCoupons != null) { |
| 52 | //礼包内容--礼券 | 56 | //礼包内容--礼券 |
pages/giftpack/evaluategift/evaluategift.wxml
| @@ -2,166 +2,169 @@ | @@ -2,166 +2,169 @@ | ||
| 2 | <view class="image_box"> | 2 | <view class="image_box"> |
| 3 | <image src="{{iurl+'miniapp/images/giftbag/eval00.png'}}" lazy-load="true"></image> | 3 | <image src="{{iurl+'miniapp/images/giftbag/eval00.png'}}" lazy-load="true"></image> |
| 4 | </view> | 4 | </view> |
| 5 | - <block wx:if="{{itemShow}}"> | ||
| 6 | - <view class="top"> | ||
| 7 | - <view class="top_box"> | ||
| 8 | - <view class="top_box_text"> | ||
| 9 | - <text>______</text> | ||
| 10 | - </view> | ||
| 11 | - <view class="top_box_text"> | ||
| 12 | - <text>新人专享\n你的美丽我来缔造</text> | ||
| 13 | - </view> | ||
| 14 | - <view class="top_box_text"> | ||
| 15 | - <text >______</text> | ||
| 16 | - </view> | ||
| 17 | - </view> | ||
| 18 | - <block wx:for="{{itemWare}}" wx:for-item="item" wx:for-index="index" wx:key="index"> | ||
| 19 | - <view class="top_item "> | ||
| 20 | - <block wx:if="{{item.lbType==3}}"> | ||
| 21 | - <view class="top_item_img"> | ||
| 22 | - <image src="{{item.fromImage=='' || item.fromImage==null?iurl+'/miniapp/images/giftbag/gift02.png':iurl+item.fromImage}}" lazy-load="true" data-errorimg="itemWare[{{index}}].fromImage" binderror="bind_bnerr1" data-img="{{item.fromImage}}"></image> | ||
| 23 | - </view> | ||
| 24 | - </block> | ||
| 25 | - <block wx:if="{{item.lbType==1}}"> | ||
| 26 | - <view class="top_item_img "> | ||
| 27 | - <image src="{{item.fromImage==''?iurl+'/miniapp/images/giftbag/empty.jpg':iurl+item.fromImage}}" lazy-load="true"></image> | ||
| 28 | - </view> | ||
| 29 | - </block> | ||
| 30 | - <view class="top_item_center "> | ||
| 31 | - <view class="top_item_center_title"> | ||
| 32 | - <block wx:if="{{item.lbType==1}}"> | ||
| 33 | - <text>免费领取</text> | ||
| 34 | - </block> | ||
| 35 | - <block wx:if="{{item.lbType==3}}"> | ||
| 36 | - <text>{{item.fromName}}</text> | ||
| 37 | - </block> | ||
| 38 | - </view> | ||
| 39 | - <view class="top_item_center_ramke "> | ||
| 40 | - <block wx:if="{{item.lbType==1}}"> | ||
| 41 | - <text>{{item.fromName}}</text> | ||
| 42 | - </block> | ||
| 43 | - <block wx:if="{{item.lbType==3}}"> | ||
| 44 | - <text >{{"新人可免费享受专业"+item.fromName+"，可以享受"+item.num+"次。"}}</text> | ||
| 45 | - </block> | ||
| 46 | - </view> | ||
| 47 | - </view> | ||
| 48 | - </view> | ||
| 49 | - </block> | 5 | + <block wx:if="{{itemShow}}"> |
| 6 | + <view class="top rel"> | ||
| 7 | + <view class="top_box"> | ||
| 8 | + <view class="top_box_text"> | ||
| 9 | + <text>______</text> | ||
| 50 | </view> | 10 | </view> |
| 51 | - </block> | ||
| 52 | - <block wx:if="{{itemShow}}"> | ||
| 53 | - <view > | ||
| 54 | - <image style="width:10px;height:47px;float:left;top:-38px;left:55px;" src="{{iurl+'/miniapp/images/giftbag/vip05.png'}}" lazy-load="true"></image> | ||
| 55 | - <image style="width:10px;height:47px;float:right;top:-38px;right:55px;" src="{{iurl+'/miniapp/images/giftbag/vip05.png'}}" lazy-load="true"></image> | 11 | + <view class="top_box_text"> |
| 12 | + <text>新人专享\n你的美丽我来缔造</text> | ||
| 56 | </view> | 13 | </view> |
| 57 | - </block> | ||
| 58 | - <block wx:if="{{cardShow}}"> | ||
| 59 | - <view> | ||
| 60 | - <view class="top"> | ||
| 61 | - <view class="top_box "> | ||
| 62 | - <view class="top_box_text "> | ||
| 63 | - <text >———</text> | ||
| 64 | - </view> | ||
| 65 | - <view class="top_box_text "> | ||
| 66 | - <text >新人专享优惠券</text> | ||
| 67 | - </view> | ||
| 68 | - <view class="top_box_text "> | ||
| 69 | - <text >———</text> | ||
| 70 | - </view> | ||
| 71 | - </view> | ||
| 72 | - <block wx:for="{{cards}}" wx:for-item="item" wx:for-index="index" wx:key="index"> | ||
| 73 | - <view class="top_card "> | ||
| 74 | - <view class="{{item.useObjectType==1?'top_card_box img1':item.useObjectType==2?'top_card_box img2':'top_card_box img3'}}"> | ||
| 75 | - <view class="top_card_tite_box "> | ||
| 76 | - <block wx:if="{{item.useObjectType==0}}"> | ||
| 77 | - <view class="top_card_tite_a">全场通用</view> | ||
| 78 | - </block> | ||
| 79 | - <block wx:if="{{item.useObjectType==1}}"> | ||
| 80 | - <view class="top_card_tite_b">品牌限定</view> | ||
| 81 | - </block> | ||
| 82 | - <block wx:if="{{item.useObjectType==2}}"> | ||
| 83 | - <view class="top_card_tite_c">品类限定</view> | ||
| 84 | - </block> | ||
| 85 | - <block wx:if="{{item.useObjectType==11}}"> | ||
| 86 | - <view class="top_card_tite_a">用途限定</view> | ||
| 87 | - </block> | ||
| 88 | - <block wx:if="{{item.useObjectType==12}}"> | ||
| 89 | - <view class="top_card_tite_a">分类限定</view> | ||
| 90 | - </block> | ||
| 91 | - </view> | ||
| 92 | - <view class="top_card_counte ">{{item.sum+"元券"}}</view> | ||
| 93 | - <view class="top_card_remak ">{{"满"+item.buySum+"元可以用"}}</view> | ||
| 94 | - </view> | ||
| 95 | - </view> | ||
| 96 | - </block> | ||
| 97 | - </view> | 14 | + <view class="top_box_text"> |
| 15 | + <text>______</text> | ||
| 98 | </view> | 16 | </view> |
| 99 | - </block> | ||
| 100 | - <block wx:if="{{cardShow}}"> | ||
| 101 | - <view> | ||
| 102 | - <view> | ||
| 103 | - <image style="width:10px;height:47px;float:left;top:-38px;left:55px;" src="{{iurl+'/miniapp/images/giftbag/vip05.png'}}" lazy-load="true"></image> | ||
| 104 | - <image style="width:10px;height:47px;float:right;top:-38px;right:55px;" src="{{iurl+'/miniapp/images/giftbag/vip05.png'}}" lazy-load="true"></image> | 17 | + </view> |
| 18 | + <block wx:for="{{itemWare}}" wx:for-item="item" wx:for-index="index" wx:key="index"> | ||
| 19 | + <view class="top_item "> | ||
| 20 | + <block wx:if="{{item.lbType==3}}"> | ||
| 21 | + <view class="top_item_img"> | ||
| 22 | + <image src="{{item.fromImage=='' || item.fromImage==null?iurl+'/miniapp/images/giftbag/gift02.png':iurl+item.fromImage}}" lazy-load="true" data-errorimg="itemWare[{{index}}].fromImage" binderror="bind_bnerr1" data-img="{{item.fromImage}}"></image> | ||
| 105 | </view> | 23 | </view> |
| 106 | - </view> | ||
| 107 | - </block> | ||
| 108 | - <block wx:if="{{packShow}}"> | ||
| 109 | - <view > | ||
| 110 | - <view class="top "> | ||
| 111 | - <view class="top_box "> | ||
| 112 | - <view class="top_box_text "> | ||
| 113 | - <text >———</text> | ||
| 114 | - </view> | ||
| 115 | - <view class="top_box_text "> | ||
| 116 | - <text >新人专享福利</text> | ||
| 117 | - </view> | ||
| 118 | - <view class="top_box_text "> | ||
| 119 | - <text >———</text> | ||
| 120 | - </view> | ||
| 121 | - </view> | ||
| 122 | - <block wx:if="{{integralShow}}"> | ||
| 123 | - <view> | ||
| 124 | - <view class="top_box_image "> | ||
| 125 | - <image src="{{iurl+'/miniapp/images/giftbag/vip06.jpg'}}" lazy-load="true"></image> | ||
| 126 | - <button>{{integralTitle}}</button> | ||
| 127 | - </view> | ||
| 128 | - </view> | ||
| 129 | - </block> | ||
| 130 | - <block wx:if="{{growUpShow}}"> | ||
| 131 | - <view > | ||
| 132 | - <view class="top_box_image fs36"> | ||
| 133 | - <image src="{{iurl+'/miniapp/images/giftbag/vip07.jpg'}}" lazy-load="true"></image> | ||
| 134 | - <button>{{growUpTitle}}</button> | ||
| 135 | - </view> | ||
| 136 | - </view> | ||
| 137 | - </block> | 24 | + </block> |
| 25 | + <block wx:if="{{item.lbType==1}}"> | ||
| 26 | + <view class="top_item_img "> | ||
| 27 | + <image src="{{item.fromImage==''?iurl+'/miniapp/images/giftbag/empty.jpg':iurl+item.fromImage}}" lazy-load="true"></image> | ||
| 138 | </view> | 28 | </view> |
| 139 | - </view> | ||
| 140 | - </block> | ||
| 141 | - <block wx:if="{{textShow}}"> | ||
| 142 | - <view class="foot_box"> | ||
| 143 | - <view class="foot_box_title fs36"> | ||
| 144 | - <text>活动规则:</text> | 29 | + </block> |
| 30 | + <view class="top_item_center "> | ||
| 31 | + <view class="top_item_center_title"> | ||
| 32 | + <block wx:if="{{item.lbType==1}}"> | ||
| 33 | + <text>免费领取</text> | ||
| 34 | + </block> | ||
| 35 | + <block wx:if="{{item.lbType==3}}"> | ||
| 36 | + <text>{{item.fromName}}</text> | ||
| 37 | + </block> | ||
| 145 | </view> | 38 | </view> |
| 146 | - <view class="foot_box_text"> | ||
| 147 | - <rich-text nodes="{{textTitle}}"></rich-text> | 39 | + <view class="top_item_center_ramke "> |
| 40 | + <block wx:if="{{item.lbType==1}}"> | ||
| 41 | + <text>{{item.fromName}}</text> | ||
| 42 | + </block> | ||
| 43 | + <block wx:if="{{item.lbType==3}}"> | ||
| 44 | + <text>{{"新人可免费享受专业"+item.fromName+"，可以享受"+item.num+"次。"}}</text> | ||
| 45 | + </block> | ||
| 46 | + <view class="num flex-level-right fs26"> | ||
| 47 | + <view>数量：</view> | ||
| 48 | + <view>{{item.num}}</view> | ||
| 49 | + </view> | ||
| 148 | </view> | 50 | </view> |
| 51 | + </view> | ||
| 149 | </view> | 52 | </view> |
| 150 | - </block> | ||
| 151 | - <view class="button_box"> | ||
| 152 | - <view > | ||
| 153 | - <button class="button" bindtap="goto" data-url="/pages/index/index/index">进入商城购物</button> | 53 | + </block> |
| 54 | + <block wx:if="{{itemShow}}"> | ||
| 55 | + <view class="vips"> | ||
| 56 | + <image class="lvip abs" src="{{iurl+'/miniapp/images/giftbag/vip05.png'}}" lazy-load="true"></image> | ||
| 57 | + <image class="rvip abs" src="{{iurl+'/miniapp/images/giftbag/vip05.png'}}" lazy-load="true"></image> | ||
| 154 | </view> | 58 | </view> |
| 155 | - <view class="button_text "> | ||
| 156 | - <text >本活动最终解释权归公司所有，如果有问题请联系客服</text> | 59 | + </block> |
| 60 | + </view> | ||
| 61 | + </block> | ||
| 62 | + <block wx:if="{{cardShow}}"> | ||
| 63 | + <view> | ||
| 64 | + <view class="top rel"> | ||
| 65 | + <view class="top_box "> | ||
| 66 | + <view class="top_box_text "> | ||
| 67 | + <text>———</text> | ||
| 68 | + </view> | ||
| 69 | + <view class="top_box_text "> | ||
| 70 | + <text>新人专享优惠券</text> | ||
| 71 | + </view> | ||
| 72 | + <view class="top_box_text "> | ||
| 73 | + <text>———</text> | ||
| 74 | + </view> | ||
| 157 | </view> | 75 | </view> |
| 76 | + <block wx:for="{{cards}}" wx:for-item="item" wx:for-index="index" wx:key="index"> | ||
| 77 | + <view class="top_card "> | ||
| 78 | + <view class="{{item.useObjectType==1?'top_card_box img1':item.useObjectType==2?'top_card_box img2':'top_card_box img3'}}"> | ||
| 79 | + <!-- class="{{['',item.useObjectType==1?'top_card_box img1':item.useObjectType==2?'top_card_box img2':'top_card_box img3']}}" --> | ||
| 80 | + <view class="top_card_tite_box "> | ||
| 81 | + <block wx:if="{{item.useObjectType==0}}"> | ||
| 82 | + <view class="top_card_tite_a">全场通用</view> | ||
| 83 | + </block> | ||
| 84 | + <block wx:if="{{item.useObjectType==1}}"> | ||
| 85 | + <view class="top_card_tite_b">品牌限定</view> | ||
| 86 | + </block> | ||
| 87 | + <block wx:if="{{item.useObjectType==2}}"> | ||
| 88 | + <view class="top_card_tite_c">品类限定</view> | ||
| 89 | + </block> | ||
| 90 | + <block wx:if="{{item.useObjectType==11}}"> | ||
| 91 | + <view class="top_card_tite_a">用途限定</view> | ||
| 92 | + </block> | ||
| 93 | + <block wx:if="{{item.useObjectType==12}}"> | ||
| 94 | + <view class="top_card_tite_a">分类限定</view> | ||
| 95 | + </block> | ||
| 96 | + </view> | ||
| 97 | + <view class="top_card_counte ">{{item.sum+"元券"}}</view> | ||
| 98 | + <view class="top_card_remak ">{{"满"+item.buySum+"元可以用"}}</view> | ||
| 99 | + </view> | ||
| 100 | + </view> | ||
| 101 | + </block> | ||
| 102 | + <block wx:if="{{packShow}}"> | ||
| 103 | + <view class="vips"> | ||
| 104 | + <image class="lvip abs" src="{{iurl+'/miniapp/images/giftbag/vip05.png'}}" lazy-load="true"></image> | ||
| 105 | + <image class="rvip abs" src="{{iurl+'/miniapp/images/giftbag/vip05.png'}}" lazy-load="true"></image> | ||
| 106 | + </view> | ||
| 107 | + </block> | ||
| 108 | + </view> | ||
| 158 | </view> | 109 | </view> |
| 159 | - <view class="foot_empty "></view> | ||
| 160 | - <view class="foot_button"> | ||
| 161 | - <view class="{{receiveState=='已领取'?'foot_button_notbuy':'foot_button_buy'}}" bindtap="GetReceive"> | ||
| 162 | - <text>{{receiveState}}</text> | 110 | + </block> |
| 111 | + <block wx:if="{{packShow}}"> | ||
| 112 | + <view> | ||
| 113 | + <view class="top "> | ||
| 114 | + <view class="top_box "> | ||
| 115 | + <view class="top_box_text "> | ||
| 116 | + <text>———</text> | ||
| 117 | + </view> | ||
| 118 | + <view class="top_box_text "> | ||
| 119 | + <text>新人专享福利</text> | ||
| 120 | + </view> | ||
| 121 | + <view class="top_box_text "> | ||
| 122 | + <text>———</text> | ||
| 123 | + </view> | ||
| 163 | </view> | 124 | </view> |
| 125 | + <block wx:if="{{integralShow}}"> | ||
| 126 | + <view> | ||
| 127 | + <view class="top_box_image "> | ||
| 128 | + <image src="{{iurl+'/miniapp/images/giftbag/vip06.jpg'}}" lazy-load="true"></image> | ||
| 129 | + <button>{{integralTitle}}</button> | ||
| 130 | + </view> | ||
| 131 | + </view> | ||
| 132 | + </block> | ||
| 133 | + <block wx:if="{{growUpShow}}"> | ||
| 134 | + <view> | ||
| 135 | + <view class="top_box_image fs36"> | ||
| 136 | + <image src="{{iurl+'/miniapp/images/giftbag/vip07.jpg'}}" lazy-load="true"></image> | ||
| 137 | + <button>{{growUpTitle}}</button> | ||
| 138 | + </view> | ||
| 139 | + </view> | ||
| 140 | + </block> | ||
| 141 | + </view> | ||
| 142 | + </view> | ||
| 143 | + </block> | ||
| 144 | + <block wx:if="{{textShow}}"> | ||
| 145 | + <view class="foot_box"> | ||
| 146 | + <view class="foot_box_title fs36"> | ||
| 147 | + <text>活动规则:</text> | ||
| 148 | + </view> | ||
| 149 | + <view class="foot_box_text"> | ||
| 150 | + <rich-text nodes="{{textTitle}}"></rich-text> | ||
| 151 | + </view> | ||
| 152 | + </view> | ||
| 153 | + </block> | ||
| 154 | + <view class="button_box"> | ||
| 155 | + <view> | ||
| 156 | + <button class="button" bindtap="goto" data-url="/pages/index/index/index">进入商城购物</button> | ||
| 157 | + </view> | ||
| 158 | + <view class="button_text "> | ||
| 159 | + <text>本活动最终解释权归公司所有，如果有问题请联系客服</text> | ||
| 160 | + </view> | ||
| 161 | + </view> | ||
| 162 | + <view class="foot_empty "></view> | ||
| 163 | + <view class="foot_button"> | ||
| 164 | + <view class="{{receiveState=='已领取'?'foot_button_notbuy':'foot_button_buy'}}" bindtap="GetReceive"> | ||
| 165 | + <text>{{receiveState}}</text> | ||
| 164 | </view> | 166 | </view> |
| 167 | + </view> | ||
| 165 | </view> | 168 | </view> |
| 166 | <!-- 引入提示组件 --> | 169 | <!-- 引入提示组件 --> |
| 167 | <warn id="warn"></warn> | 170 | <warn id="warn"></warn> |
pages/giftpack/evaluategift/evaluategift.wxss
| @@ -286,7 +286,7 @@ | @@ -286,7 +286,7 @@ | ||
| 286 | margin: 0 30rpx 40rpx 30rpx; | 286 | margin: 0 30rpx 40rpx 30rpx; |
| 287 | /* background: #FFFFFF; */ | 287 | /* background: #FFFFFF; */ |
| 288 | border-radius: 20rpx; | 288 | border-radius: 20rpx; |
| 289 | - color: rgb(255, 255, 255); | 289 | + background-color: rgb(255, 255, 255); |
| 290 | } | 290 | } |
| 291 | 291 | ||
| 292 | .foot_box_title { | 292 | .foot_box_title { |
| @@ -345,7 +345,7 @@ | @@ -345,7 +345,7 @@ | ||
| 345 | } | 345 | } |
| 346 | 346 | ||
| 347 | .foot_button_buy { | 347 | .foot_button_buy { |
| 348 | - background: #e4010c; | 348 | + background: rgb(71, 132, 239); |
| 349 | color: #fff; | 349 | color: #fff; |
| 350 | width: 400rpx; | 350 | width: 400rpx; |
| 351 | height: 70rpx; | 351 | height: 70rpx; |
| @@ -379,3 +379,22 @@ button::after { | @@ -379,3 +379,22 @@ button::after { | ||
| 379 | .foot_box_text .img { | 379 | .foot_box_text .img { |
| 380 | line-height: 0; | 380 | line-height: 0; |
| 381 | } | 381 | } |
| 382 | +.num { | ||
| 383 | + color: rgb(71, 132, 239); | ||
| 384 | +} | ||
| 385 | + | ||
| 386 | +.lvip { | ||
| 387 | + left: 30rpx; | ||
| 388 | + bottom: -58rpx; | ||
| 389 | + width: 20rpx; | ||
| 390 | + height: 90rpx; | ||
| 391 | + z-index: 5; | ||
| 392 | +} | ||
| 393 | + | ||
| 394 | +.rvip { | ||
| 395 | + right: 30rpx; | ||
| 396 | + bottom: -58rpx; | ||
| 397 | + width: 20rpx; | ||
| 398 | + height: 90rpx; | ||
| 399 | + z-index: 5; | ||
| 400 | +} |
pages/giftpack/giftpacklist/giftpacklist.js
| @@ -4,7 +4,7 @@ var e = getApp(), | @@ -4,7 +4,7 @@ var e = getApp(), | ||
| 4 | t = e.request, | 4 | t = e.request, |
| 5 | d = e.globalData; | 5 | d = e.globalData; |
| 6 | var ut = require("../../../utils/util.js"); | 6 | var ut = require("../../../utils/util.js"); |
| 7 | - | 7 | + |
| 8 | Page({ | 8 | Page({ |
| 9 | data: { | 9 | data: { |
| 10 | url: a.url, //接口网址 | 10 | url: a.url, //接口网址 |
| @@ -25,8 +25,9 @@ Page({ | @@ -25,8 +25,9 @@ Page({ | ||
| 25 | wareCard: [], | 25 | wareCard: [], |
| 26 | orderSn: "", //订单编号 | 26 | orderSn: "", //订单编号 |
| 27 | lbId: "", | 27 | lbId: "", |
| 28 | - code: "", //核销码 | ||
| 29 | - c_state:"0", //判断是否已经使用, 0正常 1已使用 2已过期 | 28 | + code: "", //核销码 |
| 29 | + c_state: "0", //判断是否已经使用, 0正常 1已使用 2已过期 | ||
| 30 | + is_lb: 0, //是否有礼包 | ||
| 30 | }, | 31 | }, |
| 31 | onLoad: function(options) { | 32 | onLoad: function(options) { |
| 32 | var th = this; | 33 | var th = this; |
| @@ -179,16 +180,20 @@ Page({ | @@ -179,16 +180,20 @@ Page({ | ||
| 179 | giftRemark: res.data.data.giftRemark | 180 | giftRemark: res.data.data.giftRemark |
| 180 | }) | 181 | }) |
| 181 | } | 182 | } |
| 182 | - | ||
| 183 | - //---获取日期的时间戳--- | ||
| 184 | - var t_endtime=res.data.data.endTime; | ||
| 185 | - t_endtime = t_endtime.replace(/-/g,'/'); | ||
| 186 | - var t_date = new Date(t_endtime)/1000; | ||
| 187 | - var t_now=ut.gettimestamp(); | ||
| 188 | - | ||
| 189 | - if(res.data.data.goodsUseState) th.setData({c_state:1}) | ||
| 190 | - else if(t_date<=t_now) | ||
| 191 | - th.setData({c_state:2}) | 183 | + |
| 184 | + //---获取日期的时间戳--- | ||
| 185 | + var t_endtime = res.data.data.endTime; | ||
| 186 | + t_endtime = t_endtime.replace(/-/g, '/'); | ||
| 187 | + var t_date = new Date(t_endtime) / 1000; | ||
| 188 | + var t_now = ut.gettimestamp(); | ||
| 189 | + | ||
| 190 | + if (res.data.data.goodsUseState) th.setData({ | ||
| 191 | + c_state: 1 | ||
| 192 | + }) | ||
| 193 | + else if (t_date <= t_now) | ||
| 194 | + th.setData({ | ||
| 195 | + c_state: 2 | ||
| 196 | + }) | ||
| 192 | 197 | ||
| 193 | th.setData({ | 198 | th.setData({ |
| 194 | giftDate: res.data.data.endTime, | 199 | giftDate: res.data.data.endTime, |
| @@ -201,6 +206,15 @@ Page({ | @@ -201,6 +206,15 @@ Page({ | ||
| 201 | wareCard: res.data.data.wareCard, | 206 | wareCard: res.data.data.wareCard, |
| 202 | lbId: res.data.data.lbId | 207 | lbId: res.data.data.lbId |
| 203 | }) | 208 | }) |
| 209 | + //判断是否有礼包 | ||
| 210 | + for (var i = 0; i < res.data.data.wareCard.length; i++) { | ||
| 211 | + if (res.data.data.wareCard[i].lbType == 1) { | ||
| 212 | + th.setData({ | ||
| 213 | + is_lb: 1 | ||
| 214 | + }) | ||
| 215 | + break; | ||
| 216 | + } | ||
| 217 | + } | ||
| 204 | } else { | 218 | } else { |
| 205 | getApp().my_warnning("系统繁忙,请稍后再试", 0, th); | 219 | getApp().my_warnning("系统繁忙,请稍后再试", 0, th); |
| 206 | return false; | 220 | return false; |
| @@ -301,7 +315,7 @@ Page({ | @@ -301,7 +315,7 @@ Page({ | ||
| 301 | getApp().goto(url); | 315 | getApp().goto(url); |
| 302 | }, | 316 | }, |
| 303 | //图片失败，默认图片 | 317 | //图片失败，默认图片 |
| 304 | - bind_bnerr2: function (e) { | 318 | + bind_bnerr2: function(e) { |
| 305 | var _errImg = e.target.dataset.errorimg; | 319 | var _errImg = e.target.dataset.errorimg; |
| 306 | var _errObj = {}; | 320 | var _errObj = {}; |
| 307 | _errObj[_errImg] = "/public/images/empty.jpg"; | 321 | _errObj[_errImg] = "/public/images/empty.jpg"; |
| @@ -309,7 +323,7 @@ Page({ | @@ -309,7 +323,7 @@ Page({ | ||
| 309 | 323 | ||
| 310 | }, | 324 | }, |
| 311 | //关闭导航 | 325 | //关闭导航 |
| 312 | - close: function () { | 326 | + close: function() { |
| 313 | var th = this; | 327 | var th = this; |
| 314 | var nav_b = th.selectComponent("#nav_b"); //组件的id | 328 | var nav_b = th.selectComponent("#nav_b"); //组件的id |
| 315 | nav_b.close_box(); | 329 | nav_b.close_box(); |
pages/giftpack/giftpacklist/giftpacklist.wxml
| @@ -66,8 +66,15 @@ | @@ -66,8 +66,15 @@ | ||
| 66 | <text class="data-v-3a5b7e36 ellipsis-1">{{"数量:"+item.num}}</text> | 66 | <text class="data-v-3a5b7e36 ellipsis-1">{{"数量:"+item.num}}</text> |
| 67 | </view> | 67 | </view> |
| 68 | <view class="box_ware_code data-v-3a5b7e36"> | 68 | <view class="box_ware_code data-v-3a5b7e36"> |
| 69 | - <block wx:if="{{isBuy==0&item.lbType==1}}"> | ||
| 70 | - <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" lazy-load="true" bindtap="getcode" class="data-v-3a5b7e36"></image> | 69 | + <block wx:if="{{c_state==0}}"> |
| 70 | + <block wx:if="{{isBuy==0&item.lbType==1}}"> | ||
| 71 | + <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" lazy-load="true" bindtap="getcode" class="data-v-3a5b7e36"></image> | ||
| 72 | + </block> | ||
| 73 | + </block> | ||
| 74 | + <block wx:else> | ||
| 75 | + <block wx:if="{{isBuy==0&item.lbType==1}}"> | ||
| 76 | + <image src="{{iurl+'/miniapp/images/giftbag/gift08.png'}}" lazy-load="true" class="data-v-3a5b7e36"></image> | ||
| 77 | + </block> | ||
| 71 | </block> | 78 | </block> |
| 72 | <block wx:if="{{isBuy==0&item.lbType==2}}"> | 79 | <block wx:if="{{isBuy==0&item.lbType==2}}"> |
| 73 | <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/pages/user/coupons/coupons" bindtap="goto"></image> | 80 | <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/pages/user/coupons/coupons" bindtap="goto"></image> |
| @@ -118,17 +125,23 @@ | @@ -118,17 +125,23 @@ | ||
| 118 | </block> | 125 | </block> |
| 119 | <block wx:if="{{isBuy==0}}"> | 126 | <block wx:if="{{isBuy==0}}"> |
| 120 | <view class="foot_button data-v-3a5b7e36"> | 127 | <view class="foot_button data-v-3a5b7e36"> |
| 121 | - <view wx:if="{{c_state==0}}" class="foot_button_buy data-v-3a5b7e36" bindtap="getcode"> | ||
| 122 | - <text class="data-v-3a5b7e36">立即使用</text> | ||
| 123 | - </view> | ||
| 124 | - <view wx:if="{{c_state==1}}" class="foot_button_buy data-v-3a5b7e36 overdue" > | ||
| 125 | - <text class="data-v-3a5b7e36">商品已使用</text> | ||
| 126 | - </view> | ||
| 127 | - <view wx:if="{{c_state==2}}" class="foot_button_buy data-v-3a5b7e36 overdue" > | ||
| 128 | - <text class="data-v-3a5b7e36">商品已过期</text> | ||
| 129 | - </view> | ||
| 130 | - | ||
| 131 | - | 128 | + <block wx:if="{{is_lb!=1}}"> |
| 129 | + <view class="foot_button_buy data-v-3a5b7e36 overdue"> | ||
| 130 | + <text class="data-v-3a5b7e36">无核销商品</text> | ||
| 131 | + </view> | ||
| 132 | + </block> | ||
| 133 | + <block wx:else> | ||
| 134 | + <view wx:if="{{c_state==0}}" class="foot_button_buy data-v-3a5b7e36" bindtap="getcode"> | ||
| 135 | + <text class="data-v-3a5b7e36">立即使用</text> | ||
| 136 | + </view> | ||
| 137 | + <view wx:if="{{c_state==1}}" class="foot_button_buy data-v-3a5b7e36 overdue"> | ||
| 138 | + <text class="data-v-3a5b7e36">商品已核销</text> | ||
| 139 | + </view> | ||
| 140 | + <view wx:if="{{c_state==2}}" class="foot_button_buy data-v-3a5b7e36 overdue"> | ||
| 141 | + <text class="data-v-3a5b7e36">商品兑换时间已过</text> | ||
| 142 | + </view> | ||
| 143 | + | ||
| 144 | + </block> | ||
| 132 | </view> | 145 | </view> |
| 133 | </block> | 146 | </block> |
| 134 | </view> | 147 | </view> |
pages/user/assistance/assistance_success.js
| @@ -8,6 +8,8 @@ Page({ | @@ -8,6 +8,8 @@ Page({ | ||
| 8 | */ | 8 | */ |
| 9 | data: { | 9 | data: { |
| 10 | iurl: s.imghost, | 10 | iurl: s.imghost, |
| 11 | + user:app_d.userInfo, | ||
| 12 | + zl_act:null, //助力活动 | ||
| 11 | }, | 13 | }, |
| 12 | 14 | ||
| 13 | /** | 15 | /** |
| @@ -28,22 +30,22 @@ Page({ | @@ -28,22 +30,22 @@ Page({ | ||
| 28 | * 生命周期函数--监听页面显示 | 30 | * 生命周期函数--监听页面显示 |
| 29 | */ | 31 | */ |
| 30 | onShow: function () { | 32 | onShow: function () { |
| 31 | - | 33 | + this.init(); |
| 32 | }, | 34 | }, |
| 33 | 35 | ||
| 34 | - | ||
| 35 | - // 初始化判断微信余额 | ||
| 36 | - async weixin() { | 36 | + // ----初始化---- |
| 37 | + init:function() { | ||
| 38 | + | ||
| 37 | var user_id = getApp().globalData.user_id; | 39 | var user_id = getApp().globalData.user_id; |
| 38 | var store_id = os.stoid; | 40 | var store_id = os.stoid; |
| 39 | - await getApp().request.promiseGet("/api/weshop/marketing/help/act/judge", { | 41 | + var th=this; |
| 42 | + getApp().request.promiseGet("http://172.20.3.102:8022/api/weshop/zl_act", { | ||
| 40 | data: { | 43 | data: { |
| 41 | user_id: user_id, | 44 | user_id: user_id, |
| 42 | store_id: store_id | 45 | store_id: store_id |
| 43 | } | 46 | } |
| 44 | }).then(res => { | 47 | }).then(res => { |
| 45 | - console.log("是什么东西", res.data.code); | ||
| 46 | - | 48 | + if(res.data.code==0) th.setData({zl_act:res.data.data}) |
| 47 | }) | 49 | }) |
| 48 | 50 | ||
| 49 | }, | 51 | }, |
| @@ -55,19 +57,6 @@ Page({ | @@ -55,19 +57,6 @@ Page({ | ||
| 55 | 57 | ||
| 56 | }, | 58 | }, |
| 57 | 59 | ||
| 58 | - /** | ||
| 59 | - * 生命周期函数--监听页面卸载 | ||
| 60 | - */ | ||
| 61 | - onUnload: function () { | ||
| 62 | - | ||
| 63 | - }, | ||
| 64 | - | ||
| 65 | - /** | ||
| 66 | - * 页面相关事件处理函数--监听用户下拉动作 | ||
| 67 | - */ | ||
| 68 | - onPullDownRefresh: function () { | ||
| 69 | - | ||
| 70 | - }, | ||
| 71 | 60 | ||
| 72 | /** | 61 | /** |
| 73 | * 页面上拉触底事件的处理函数 | 62 | * 页面上拉触底事件的处理函数 |
pages/user/assistance/assistance_success.wxml
| 1 | 1 | ||
| 2 | <view class="top-back" style="background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)"> | 2 | <view class="top-back" style="background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)"> |
| 3 | <view class="flex-vertical user_assis"> | 3 | <view class="flex-vertical user_assis"> |
| 4 | - <image class="circle user_img" src="https://mshopimg.yolipai.net/public/upload/qyimg/temp/2019/08-14/0697f7277936a3b116a6ebc4f8f5e39a.png"></image> | ||
| 5 | - <view class="user_name white fs28 ellipsis-1">你好</view> | ||
| 6 | - </view> | ||
| 7 | - <view class="caption_title white fs32 t-c"> | ||
| 8 | - 助力成功，自己也差拆一个吧~ | 4 | + <image class="circle user_img" src="{{user.head_pic}}"></image> |
| 5 | + <view class="user_name white fs28 ellipsis-1">{{user.nickname}}</view> | ||
| 9 | </view> | 6 | </view> |
| 7 | + <view class="caption_title white fs32 t-c">助力成功，自己也差拆一个吧~</view> | ||
| 10 | <!-- 礼包图片 --> | 8 | <!-- 礼包图片 --> |
| 11 | <view class="t-c"> | 9 | <view class="t-c"> |
| 12 | <image class="assis_liba" src="{{iurl}}/miniapp/images/friendhelp/libao_asiss.png"> | 10 | <image class="assis_liba" src="{{iurl}}/miniapp/images/friendhelp/libao_asiss.png"> |
| 13 | </image> | 11 | </image> |
| 14 | </view> | 12 | </view> |
| 15 | <view class="flex jc-center"> | 13 | <view class="flex jc-center"> |
| 16 | - <view class="activity_time fs24 white"> | ||
| 17 | - 活动时间：5月23日-6月15日 | ||
| 18 | - </view> | 14 | + <view class="activity_time fs24 white"> |
| 15 | + 活动时间：{{filter.fm_time(zl_act.beginDate)}}-{{filter.fm_time(zl_act.endDate)}} | ||
| 16 | + </view> | ||
| 19 | </view> | 17 | </view> |
| 20 | </view> | 18 | </view> |
| 21 | <view class="cklie_button t-c flex-center" bindtap="cklie_button">我也要参加</view> | 19 | <view class="cklie_button t-c flex-center" bindtap="cklie_button">我也要参加</view> |
| 22 | -<view class="fs26 white t-c">已有126人领取礼盒</view> | ||
| 23 | -<!-- 礼盒弹框 --> | ||
| 24 | -<!-- <view class="cover-layer" wx:if='{{is_show!=0}}' bindtap="clike_none"></view> | ||
| 25 | -<view class="libao_frame t-c" wx:if='{{is_show!=0}}'> | ||
| 26 | - <view class="layer-img" style="background-image: url({{iurl}}/miniapp/images/friendhelp/success.png)"> | ||
| 27 | - <view class="button-img t-c fs28 flex-center" style="background-image: url({{iurl}}/miniapp/images/friendhelp/participate.png)"> | ||
| 28 | - 我也要参加 | ||
| 29 | - </view> | ||
| 30 | - <view class=" fs24 success white t-c">已成功帮你的小伙伴助力!</view> | ||
| 31 | - </view> | ||
| 32 | - <view class="link_div"> | ||
| 33 | -</view> | ||
| 34 | -<image class="close-none"bindtap="clike_none" src="{{iurl}}/miniapp/images/plus/Close.png"></image> | ||
| 35 | -</view> --> | 20 | +<view class="fs26 white t-c">已有{{zl_act.qiang_num}}人领取礼盒</view> |
| 21 | + | ||
| 36 | <!-- 引入提示组件 --> | 22 | <!-- 引入提示组件 --> |
| 37 | <warn id="warn"></warn> | 23 | <warn id="warn"></warn> |
| 38 | <!-- 制作一个圆球导航 --> | 24 | <!-- 制作一个圆球导航 --> |
pages/user/assistance/friend_assistance.js
| @@ -9,13 +9,34 @@ Page({ | @@ -9,13 +9,34 @@ Page({ | ||
| 9 | data: { | 9 | data: { |
| 10 | iurl: s.imghost, | 10 | iurl: s.imghost, |
| 11 | is_show:0,//显示弹框 | 11 | is_show:0,//显示弹框 |
| 12 | + user:app_d.userInfo, | ||
| 13 | + zl_act:null, //助力活动 | ||
| 14 | + task_id:0, //助力任务ID | ||
| 15 | + userId:0, //任务用户的ID | ||
| 12 | }, | 16 | }, |
| 13 | 17 | ||
| 14 | /** | 18 | /** |
| 15 | * 生命周期函数--监听页面加载 | 19 | * 生命周期函数--监听页面加载 |
| 16 | */ | 20 | */ |
| 17 | onLoad: function (options) { | 21 | onLoad: function (options) { |
| 18 | - | 22 | + var th=this; |
| 23 | + this.data.task_id=options.options; | ||
| 24 | + this.data.userId=options.userId; | ||
| 25 | + //任务是不是为空 | ||
| 26 | + if(this.data.task_id==0 || this.data.task_id==undefined){ | ||
| 27 | + this.data.task_id= decodeURIComponent(options.scene); | ||
| 28 | + if(this.data.task_id){ | ||
| 29 | + getApp().request.get("http://172.20.3.102:8022/api/weshop/zl_act_user",{ | ||
| 30 | + data:{}, | ||
| 31 | + success:function(res){ | ||
| 32 | + if(res.data.code==0){ | ||
| 33 | + th.data.userId=res.data.data.user_id; | ||
| 34 | + } | ||
| 35 | + } | ||
| 36 | + }) | ||
| 37 | + | ||
| 38 | + } | ||
| 39 | + } | ||
| 19 | }, | 40 | }, |
| 20 | 41 | ||
| 21 | 42 | ||
| @@ -25,22 +46,34 @@ Page({ | @@ -25,22 +46,34 @@ Page({ | ||
| 25 | url: '/pages/user/assistance/assistance_success', | 46 | url: '/pages/user/assistance/assistance_success', |
| 26 | }) | 47 | }) |
| 27 | }, | 48 | }, |
| 28 | - /** | ||
| 29 | - * 生命周期函数--监听页面初次渲染完成 | ||
| 30 | - */ | ||
| 31 | - onReady: function () { | ||
| 32 | - | ||
| 33 | - }, | ||
| 34 | - | 49 | + |
| 35 | /** | 50 | /** |
| 36 | * 生命周期函数--监听页面显示 | 51 | * 生命周期函数--监听页面显示 |
| 37 | */ | 52 | */ |
| 38 | onShow: function () { | 53 | onShow: function () { |
| 39 | - | 54 | + this.init(); |
| 40 | }, | 55 | }, |
| 41 | //点击开启礼盒 | 56 | //点击开启礼盒 |
| 42 | cklie_button:function(){ | 57 | cklie_button:function(){ |
| 43 | - this.setData({ is_show:1}); | 58 | + var th=this; |
| 59 | + var t_user_id=app_d.user_id; | ||
| 60 | + var data={id:this.data.task_id,storeId:os.store_id,userId:this.data.user_id, zlUserId:t_user_id}; | ||
| 61 | + getApp().request.json_post("/api/weshop/marketing/help/help/task/involve/insert", | ||
| 62 | + data, //入参 | ||
| 63 | + function(res){ //成功 | ||
| 64 | + if(res.data.code==0) | ||
| 65 | + this.setData({ is_show:1}); | ||
| 66 | + else{ | ||
| 67 | + getApp().my_warnning(res.data.msg,0,th) | ||
| 68 | + } | ||
| 69 | + }, | ||
| 70 | + function(){//失败 | ||
| 71 | + | ||
| 72 | + } | ||
| 73 | + ) | ||
| 74 | + | ||
| 75 | + | ||
| 76 | + | ||
| 44 | }, | 77 | }, |
| 45 | //点击关闭礼盒 | 78 | //点击关闭礼盒 |
| 46 | clike_none:function(){ | 79 | clike_none:function(){ |
| @@ -86,5 +119,22 @@ Page({ | @@ -86,5 +119,22 @@ Page({ | ||
| 86 | */ | 119 | */ |
| 87 | onShareAppMessage: function () { | 120 | onShareAppMessage: function () { |
| 88 | 121 | ||
| 89 | - } | 122 | + }, |
| 123 | + | ||
| 124 | + // ----初始化---- | ||
| 125 | + init:function() { | ||
| 126 | + | ||
| 127 | + var user_id = getApp().globalData.user_id; | ||
| 128 | + var store_id = os.stoid; | ||
| 129 | + var th=this; | ||
| 130 | + getApp().request.promiseGet("http://172.20.3.102:8022/api/weshop/zl_act", { | ||
| 131 | + data: { | ||
| 132 | + user_id: user_id, | ||
| 133 | + store_id: store_id | ||
| 134 | + } | ||
| 135 | + }).then(res => { | ||
| 136 | + if(res.data.code==0) th.setData({zl_act:res.data.data}) | ||
| 137 | + }) | ||
| 138 | + | ||
| 139 | + }, | ||
| 90 | }) | 140 | }) |
| 91 | \ No newline at end of file | 141 | \ No newline at end of file |
pages/user/assistance/friend_assistance.wxml
| 1 | +<wxs module="filter" src="c_filter.wxs"></wxs> | ||
| 1 | <view class="top-back" style="background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)"> | 2 | <view class="top-back" style="background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)"> |
| 2 | <view class="flex-vertical user_assis"> | 3 | <view class="flex-vertical user_assis"> |
| 3 | - <image class="circle user_img" src="https://mshopimg.yolipai.net/public/upload/qyimg/temp/2019/08-14/0697f7277936a3b116a6ebc4f8f5e39a.png"></image> | ||
| 4 | - <view class="user_name white fs28 ellipsis-1">你好</view> | 4 | + <image class="circle user_img" src="{{user.head_pic}}"></image> |
| 5 | + <view class="user_name white fs28 ellipsis-1">{{user.nickname}}</view> | ||
| 5 | </view> | 6 | </view> |
| 6 | <view class="caption_title white fs32 t-c"> | 7 | <view class="caption_title white fs32 t-c"> |
| 7 | 拜托拜托，帮我拆礼盒得好礼~ | 8 | 拜托拜托，帮我拆礼盒得好礼~ |
| 8 | </view> | 9 | </view> |
| 9 | <!-- 礼包图片 --> | 10 | <!-- 礼包图片 --> |
| 10 | <view class="t-c"> | 11 | <view class="t-c"> |
| 11 | -<image class="assis_liba" src="../../../images/frinedhelp/libao_asiss.png"> | 12 | +<image class="assis_liba" src="{{iurl}}/miniapp/images/friendhelp/libao_asiss.png"> |
| 12 | </image> | 13 | </image> |
| 13 | </view> | 14 | </view> |
| 14 | <view class="flex jc-center"> | 15 | <view class="flex jc-center"> |
| 15 | <view class="activity_time fs24 white"> | 16 | <view class="activity_time fs24 white"> |
| 16 | - 活动时间：5月23日-6月15日 | 17 | + 活动时间：{{filter.fm_time(zl_act.begindate)}}-{{filter.fm_time(zl_act.begindate)}} |
| 17 | </view> | 18 | </view> |
| 18 | </view> | 19 | </view> |
| 19 | </view> | 20 | </view> |
| 20 | <view class="cklie_button t-c flex-center" bindtap="cklie_button">帮他拆礼盒</view> | 21 | <view class="cklie_button t-c flex-center" bindtap="cklie_button">帮他拆礼盒</view> |
| 21 | -<view class="fs26 white t-c">已有126人领取礼盒</view> | 22 | +<view class="fs26 white t-c">已有{{zl_act.qiang_num}}人领取礼盒</view> |
| 22 | <!-- 礼盒弹框 --> | 23 | <!-- 礼盒弹框 --> |
| 23 | <view class="cover-layer" wx:if='{{is_show!=0}}' bindtap="clike_none"></view> | 24 | <view class="cover-layer" wx:if='{{is_show!=0}}' bindtap="clike_none"></view> |
| 24 | <view class="libao_frame t-c" wx:if='{{is_show!=0}}'> | 25 | <view class="libao_frame t-c" wx:if='{{is_show!=0}}'> |
pages/user/assistance/surplus_time.wxs
0 → 100644
pages/user/assistance/task_assistance.js
| 1 | -var auth = require("../../../utils/auth.js"), rq = require("../../../utils/request.js"); | ||
| 2 | -var e = getApp(), app = e, i = require("../../../utils/util.js"), | ||
| 3 | - ut = i,s = e.globalData.setting, os = s, app_d = e.globalData; | 1 | +var auth = require("../../../utils/auth.js"), |
| 2 | + rq = require("../../../utils/request.js"); | ||
| 3 | +var e = getApp(), | ||
| 4 | + app = e, | ||
| 5 | + i = require("../../../utils/util.js"), | ||
| 6 | + ut = i, | ||
| 7 | + s = e.globalData.setting, | ||
| 8 | + os = s, | ||
| 9 | + app_d = e.globalData; | ||
| 4 | var regeneratorRuntime = require('../../../utils/runtime.js'); | 10 | var regeneratorRuntime = require('../../../utils/runtime.js'); |
| 5 | Page({ | 11 | Page({ |
| 6 | 12 | ||
| @@ -8,52 +14,79 @@ Page({ | @@ -8,52 +14,79 @@ Page({ | ||
| 8 | * 页面的初始数据 | 14 | * 页面的初始数据 |
| 9 | */ | 15 | */ |
| 10 | data: { | 16 | data: { |
| 11 | - sw_index: 0,//轮播的下标控制 | 17 | + sw_index: 0, //轮播的下标控制 |
| 18 | + url: s.url, //接口网址 | ||
| 12 | iurl: s.imghost, | 19 | iurl: s.imghost, |
| 13 | - is_task:0,//判断标题名是任务1还是2 | ||
| 14 | - activity_data:"25:20:59",//活动剩余时间 | ||
| 15 | - task_number:12,//任务数 | ||
| 16 | - is_task:0,//历史记录与任务 | ||
| 17 | - aitem:"",//活动的轮播图 | 20 | + is_task: 0, //判断标题名是任务1还是2 |
| 21 | + activity_data: "25:20:59", //活动剩余时间 | ||
| 22 | + task_number: 12, //任务数 | ||
| 23 | + is_task: 0, //历史记录与任务 | ||
| 24 | + aitem: "", //活动的轮播图 | ||
| 18 | switch_head: 0, //0：我的任务，1：记录 | 25 | switch_head: 0, //0：我的任务，1：记录 |
| 26 | + help_id: "", //活动的id canvasHidden: 0, //分享图片是否已经生成 | ||
| 27 | + is_share: 0, //是否显示画布 | ||
| 28 | + shareImgPath: [], //生成的图片 | ||
| 29 | + screenWidth: "", //用户的屏幕宽度 | ||
| 30 | + gid: "", | ||
| 31 | + images: ["miniapp/images/friendhelp/help.png", "miniapp/images/friendhelp/background.png", "miniapp/images/friendhelp/gift.png", "miniapp/images/friendhelp/no_check.png", | ||
| 32 | + "miniapp/images/friendhelp/check.png", "miniapp/images/friendhelp/check.png", "miniapp/images/friendhelp/unfinished.png", "miniapp/images/friendhelp/gift.png" | ||
| 33 | + ] | ||
| 19 | }, | 34 | }, |
| 20 | 35 | ||
| 21 | /** | 36 | /** |
| 22 | * 生命周期函数--监听页面加载 | 37 | * 生命周期函数--监听页面加载 |
| 23 | */ | 38 | */ |
| 24 | - onLoad: function (options) { | ||
| 25 | - var help_id=options.help_id; | ||
| 26 | - console.log("是什么鬼",help_id); | ||
| 27 | - var th=this; | 39 | + onLoad: function(options) { |
| 40 | + var help_id = options.help_id; | ||
| 41 | + console.log("是什么鬼", help_id); | ||
| 42 | + var th = this; | ||
| 43 | + th.setData({ | ||
| 44 | + help_id: help_id | ||
| 45 | + }); | ||
| 46 | + if (options.gid != undefined) { | ||
| 47 | + th.setData({ | ||
| 48 | + gid: options.gid | ||
| 49 | + }) | ||
| 50 | + } | ||
| 28 | th.close(); | 51 | th.close(); |
| 52 | + th.syinfo(); | ||
| 53 | + th.imageinfo(); | ||
| 29 | }, | 54 | }, |
| 30 | // 轮播图点击左边 | 55 | // 轮播图点击左边 |
| 31 | - click_pre:function(){ | 56 | + click_pre: function() { |
| 32 | var index = this.data.sw_index; | 57 | var index = this.data.sw_index; |
| 33 | index--; | 58 | index--; |
| 34 | if (index < 0) return; | 59 | if (index < 0) return; |
| 35 | - this.setData({ sw_index: index }) | ||
| 36 | - | 60 | + this.setData({ |
| 61 | + sw_index: index | ||
| 62 | + }) | ||
| 63 | + | ||
| 37 | }, | 64 | }, |
| 38 | - //轮播图点击右边 | ||
| 39 | - click_next:function(){ | 65 | + //轮播图点击右边 |
| 66 | + click_next: function() { | ||
| 40 | var index = this.data.sw_index; | 67 | var index = this.data.sw_index; |
| 41 | index++; | 68 | index++; |
| 42 | if (index >= this.data.aitem.length) return; | 69 | if (index >= this.data.aitem.length) return; |
| 43 | - this.setData({ sw_index: index }) | 70 | + this.setData({ |
| 71 | + sw_index: index | ||
| 72 | + }) | ||
| 44 | 73 | ||
| 45 | }, | 74 | }, |
| 46 | //任务领取 | 75 | //任务领取 |
| 47 | - onlicke:function(){ | ||
| 48 | - var th=this; | 76 | + onlicke: function() { |
| 77 | + var th = this; | ||
| 78 | + th.shareFrends(); | ||
| 79 | + th.setData({ | ||
| 80 | + is_share:1 | ||
| 81 | + }) | ||
| 49 | getApp().my_warnning("任务领取成功", 1, th); | 82 | getApp().my_warnning("任务领取成功", 1, th); |
| 50 | }, | 83 | }, |
| 51 | 84 | ||
| 52 | -//我的任务和帮拆记录的替换 | ||
| 53 | - switch_head: function (e) { | 85 | + //我的任务和帮拆记录的替换 |
| 86 | + switch_head: function(e) { | ||
| 54 | var th = this; | 87 | var th = this; |
| 55 | - var index = e.currentTarget.dataset.index;//获取当前选择的是任务还是活动说明 | ||
| 56 | - var switch_head = th.data.switch_head;//0任务，1活动说明 | 88 | + var index = e.currentTarget.dataset.index; //获取当前选择的是任务还是活动说明 |
| 89 | + var switch_head = th.data.switch_head; //0任务，1活动说明 | ||
| 57 | if (index != switch_head) { | 90 | if (index != switch_head) { |
| 58 | th.setData({ | 91 | th.setData({ |
| 59 | switch_head: index, | 92 | switch_head: index, |
| @@ -62,15 +95,15 @@ Page({ | @@ -62,15 +95,15 @@ Page({ | ||
| 62 | } | 95 | } |
| 63 | }, | 96 | }, |
| 64 | //划动的时候监听 | 97 | //划动的时候监听 |
| 65 | - onSli:function(e){ | ||
| 66 | - | ||
| 67 | - var ind=e.detail.current ; | 98 | + onSli: function(e) { |
| 99 | + | ||
| 100 | + var ind = e.detail.current; | ||
| 68 | this.setData({ | 101 | this.setData({ |
| 69 | - sw_index:ind | 102 | + sw_index: ind |
| 70 | }) | 103 | }) |
| 71 | }, | 104 | }, |
| 72 | //导航球 | 105 | //导航球 |
| 73 | - close: function () { | 106 | + close: function() { |
| 74 | var th = this; | 107 | var th = this; |
| 75 | var nav_b = th.selectComponent("#nav_b"); //组件的id | 108 | var nav_b = th.selectComponent("#nav_b"); //组件的id |
| 76 | nav_b.close_box(); | 109 | nav_b.close_box(); |
| @@ -80,55 +113,60 @@ Page({ | @@ -80,55 +113,60 @@ Page({ | ||
| 80 | /** | 113 | /** |
| 81 | * 生命周期函数--监听页面初次渲染完成 | 114 | * 生命周期函数--监听页面初次渲染完成 |
| 82 | */ | 115 | */ |
| 83 | - onReady: function () { | 116 | + onReady: function() { |
| 84 | 117 | ||
| 85 | }, | 118 | }, |
| 86 | 119 | ||
| 87 | /** | 120 | /** |
| 88 | * 生命周期函数--监听页面显示 | 121 | * 生命周期函数--监听页面显示 |
| 89 | */ | 122 | */ |
| 90 | - onShow: function () { | ||
| 91 | - var th=this; | 123 | + onShow: function() { |
| 124 | + var th = this; | ||
| 125 | + var help_id = th.data.help_id; | ||
| 92 | /*-----统计-----*/ | 126 | /*-----统计-----*/ |
| 93 | - rq.get("/api/weshop/zl_task", { | ||
| 94 | - data: { user_id: app_d.user_id, | ||
| 95 | - strod_id:os.stoid | ||
| 96 | - }, | ||
| 97 | - success: function (su) { | ||
| 98 | - | ||
| 99 | - var data=su.data; | 127 | + rq.get("/api/weshop/marketing/help/help/task/page", { |
| 128 | + data: { | ||
| 129 | + helpId: help_id, | ||
| 130 | + storeId: os.stoid | ||
| 131 | + }, | ||
| 132 | + success: function(su) { | ||
| 133 | + | ||
| 134 | + var data = su.data; | ||
| 100 | console.log('waitlist5555555555' + data.code); | 135 | console.log('waitlist5555555555' + data.code); |
| 101 | - if (data.code!=0){ | ||
| 102 | - getApp().my_warnning(data.msg,0, th); | 136 | + if (data.code != 0) { |
| 137 | + getApp().my_warnning(data.msg, 0, th); | ||
| 103 | return false; | 138 | return false; |
| 104 | } | 139 | } |
| 105 | - if (data.code==0){ | 140 | + if (data.code == 0) { |
| 106 | //轮播图的数据 | 141 | //轮播图的数据 |
| 107 | - var data_aissa=data.data.pageData; | 142 | + var data_aissa = data.data.pageData; |
| 108 | //当前时间戳 | 143 | //当前时间戳 |
| 109 | var nt = ut.gettimestamp(); | 144 | var nt = ut.gettimestamp(); |
| 110 | 145 | ||
| 111 | - data_aissa.forEach(function (val, ind) { | ||
| 112 | - console.log(nt, "当前时间","结束时间", val.end_time,"开始时间"); | 146 | + data_aissa.forEach(function(val, ind) { |
| 147 | + console.log(nt, "当前时间", "结束时间", val.end_time, "开始时间"); | ||
| 113 | //已开始 | 148 | //已开始 |
| 114 | if (val.start_time < nt && val.end_time > nt) data_aissa[ind].status = 0; | 149 | if (val.start_time < nt && val.end_time > nt) data_aissa[ind].status = 0; |
| 115 | //未开始 | 150 | //未开始 |
| 116 | else if (val.start_time > nt && val.end_time > nt) data_aissa[ind].status = 1; | 151 | else if (val.start_time > nt && val.end_time > nt) data_aissa[ind].status = 1; |
| 117 | - //已结束 | ||
| 118 | - | 152 | + //已结束 |
| 153 | + | ||
| 119 | else if (val.start_time < nt && val.end_time < nt) data_aissa[ind].status = 2; | 154 | else if (val.start_time < nt && val.end_time < nt) data_aissa[ind].status = 2; |
| 120 | - | 155 | + |
| 121 | }); | 156 | }); |
| 122 | 157 | ||
| 123 | - console.log("是什么东西2222222222",data_aissa); | ||
| 124 | - | ||
| 125 | - th.setData({ aitem:data_aissa}); | 158 | + th.setData({ |
| 159 | + aitem: data_aissa | ||
| 160 | + }); | ||
| 126 | 161 | ||
| 127 | 162 | ||
| 128 | } | 163 | } |
| 129 | - | 164 | + |
| 130 | } | 165 | } |
| 131 | }) | 166 | }) |
| 167 | + setTimeout(function() { | ||
| 168 | + th.shareFrends(); | ||
| 169 | + }, 1000) | ||
| 132 | 170 | ||
| 133 | }, | 171 | }, |
| 134 | //----助力任务----- | 172 | //----助力任务----- |
| @@ -178,41 +216,279 @@ Page({ | @@ -178,41 +216,279 @@ Page({ | ||
| 178 | 216 | ||
| 179 | } | 217 | } |
| 180 | setTimeout(th.countDown, 1000); | 218 | setTimeout(th.countDown, 1000); |
| 181 | - | 219 | + |
| 182 | }, | 220 | }, |
| 183 | 221 | ||
| 184 | /** | 222 | /** |
| 185 | * 生命周期函数--监听页面隐藏 | 223 | * 生命周期函数--监听页面隐藏 |
| 186 | */ | 224 | */ |
| 187 | - onHide: function () { | 225 | + onHide: function() { |
| 188 | 226 | ||
| 189 | }, | 227 | }, |
| 190 | 228 | ||
| 191 | /** | 229 | /** |
| 192 | * 生命周期函数--监听页面卸载 | 230 | * 生命周期函数--监听页面卸载 |
| 193 | */ | 231 | */ |
| 194 | - onUnload: function () { | 232 | + onUnload: function() { |
| 195 | 233 | ||
| 196 | }, | 234 | }, |
| 197 | 235 | ||
| 198 | /** | 236 | /** |
| 199 | * 页面相关事件处理函数--监听用户下拉动作 | 237 | * 页面相关事件处理函数--监听用户下拉动作 |
| 200 | */ | 238 | */ |
| 201 | - onPullDownRefresh: function () { | 239 | + onPullDownRefresh: function() { |
| 202 | 240 | ||
| 203 | }, | 241 | }, |
| 204 | 242 | ||
| 205 | /** | 243 | /** |
| 206 | * 页面上拉触底事件的处理函数 | 244 | * 页面上拉触底事件的处理函数 |
| 207 | */ | 245 | */ |
| 208 | - onReachBottom: function () { | 246 | + onReachBottom: function() { |
| 209 | 247 | ||
| 210 | }, | 248 | }, |
| 211 | 249 | ||
| 212 | /** | 250 | /** |
| 213 | * 用户点击右上角分享 | 251 | * 用户点击右上角分享 |
| 214 | */ | 252 | */ |
| 215 | - onShareAppMessage: function () { | 253 | + onShareAppMessage: function() { |
| 254 | + | ||
| 255 | + }, | ||
| 256 | + shareFrends: function(e) { | ||
| 257 | + var th = this; | ||
| 258 | + var scene = th.data.gid; | ||
| 259 | + ///二微码 | ||
| 260 | + // var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + | ||
| 261 | + // a.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo"; | ||
| 262 | + var iurl = th.data.iurl; //图片地址前缀 | ||
| 263 | + const ctx = wx.createCanvasContext('share_id'); //绘图上下文 | ||
| 264 | + var unit = th.data.screenWidth / 750 * 1.35; | ||
| 265 | + var numsize = 20 * unit; //几人助力字体大小 | ||
| 266 | + var size = 15 * unit; | ||
| 267 | + var num = 10; | ||
| 268 | + var q_num = 6; | ||
| 269 | + var already = num.toString().length + 1; //已有几位好友助力 | ||
| 270 | + var lack = q_num.toString().length + 1; //还差几位好友助力 | ||
| 271 | + var imagesize = 40 * unit; //助力人的图片大小 | ||
| 272 | + var left = 74 * unit; //助力人头像跟左边的距离 | ||
| 273 | + var spacing = 12 * unit; //助力人图片间距 | ||
| 274 | + var images = th.data.images; | ||
| 275 | + ctx.drawImage(images[0], 0, 0, 445 * unit, 700 * unit); //分享的背景图片 | ||
| 276 | + ctx.drawImage(images[1], 37 * unit, 185 * unit, 370 * unit, 377 * unit); //分享的背景图片 | ||
| 277 | + ctx.drawImage(images[2], 90 * unit, 231 * unit, 266 * unit, 160 * unit); //分享的背景图片 | ||
| 278 | + ctx.setFillStyle("rgb(221,153,116)"); | ||
| 279 | + ctx.setFontSize(size) | ||
| 280 | + ctx.fillText("已有", 77 * unit, 430 * unit); | ||
| 281 | + ctx.setFillStyle("#FF4746"); | ||
| 282 | + ctx.setFontSize(numsize) | ||
| 283 | + ctx.fillText(num + "位", 108 * unit, 430 * unit); | ||
| 284 | + ctx.setFillStyle("rgb(221,153,116)"); | ||
| 285 | + ctx.setFontSize(size) | ||
| 286 | + ctx.fillText("好友助力，还差", 114 * unit + already * numsize * unit, 430 * unit); | ||
| 287 | + ctx.setFillStyle("#FF4746"); | ||
| 288 | + ctx.setFontSize(numsize); | ||
| 289 | + ctx.fillText(q_num + "位", 220 * unit + already * numsize * unit, 430 * unit); | ||
| 290 | + ctx.setFillStyle("rgb(221,153,116)"); | ||
| 291 | + ctx.setFontSize(size); | ||
| 292 | + ctx.fillText("达成助力", 248 * unit + lack * numsize * unit + already * numsize - numsize * 2, 430 * unit); | ||
| 293 | + var c = q_num / num; | ||
| 294 | + ctx.drawImage(images[3], 65 * unit, 445 * unit, 320 * unit, 12 * unit); | ||
| 295 | + ctx.drawImage(images[4], 65 * unit, 445 * unit, 320 * unit * c, 12 * unit); | ||
| 296 | + for (var i = 0; i < 6; i++) { | ||
| 297 | + if (i == 0) { | ||
| 298 | + ctx.save(); | ||
| 299 | + ctx.beginPath(); //开始绘制 | ||
| 300 | + ctx.arc(left + imagesize / 2, 505 * unit, imagesize/2, 0, 2 * Math.PI); | ||
| 301 | + ctx.setLineWidth(4 * unit); | ||
| 302 | + ctx.setStrokeStyle('red'); | ||
| 303 | + ctx.setFillStyle("white"); | ||
| 304 | + ctx.fill(); | ||
| 305 | + ctx.clip(); | ||
| 306 | + ctx.drawImage(images[6], left, 505 * unit - imagesize/2, imagesize, imagesize); | ||
| 307 | + ctx.restore(); //恢复之前保存的绘图上下文 恢复之前保存的绘图上下午即状态 还可以继续绘制 | ||
| 308 | + } else { | ||
| 309 | + // 助力人的头像 | ||
| 310 | + ctx.drawImage(images[6], left, 505 * unit - imagesize / 2, imagesize, imagesize); //分享的背景图片 | ||
| 311 | + } | ||
| 312 | + left += imagesize + spacing; | ||
| 313 | + } | ||
| 314 | + ctx.setFillStyle("rgb(255,255,255)"); | ||
| 315 | + ctx.setFontSize(size); | ||
| 316 | + ctx.fillText("优惠乐翻天，精彩就在你身边!", 37 * unit, 595 * unit); | ||
| 317 | + ctx.setFillStyle("rgb(255,255,255)"); | ||
| 318 | + ctx.setFontSize(size); | ||
| 319 | + ctx.fillText("2019.06.26 - 2019.07.02!", 37 * unit, 620 * unit); | ||
| 320 | + ctx.setFillStyle("rgb(255,255,255)"); | ||
| 321 | + ctx.setFontSize(size); | ||
| 322 | + ctx.fillText("长按识别二维码，可帮我助力!", 37 * unit, 660 * unit); | ||
| 323 | + ctx.drawImage(images[7], 325 * unit, 595 * unit, 77 * unit, 77 * unit); //分享的背景图片 | ||
| 324 | + ctx.save(); | ||
| 325 | + //读取文件成功则OK-- | ||
| 326 | + // wx.getImageInfo({ | ||
| 327 | + // src: path3, | ||
| 328 | + // success: function (res) { | ||
| 329 | + //把画板内容绘制成图片，并回调 画板图片路径 | ||
| 330 | + ctx.draw(false, function() { | ||
| 331 | + setTimeout(function() { | ||
| 332 | + wx.canvasToTempFilePath({ | ||
| 333 | + x: 0, | ||
| 334 | + y: 0, | ||
| 335 | + width: 300, | ||
| 336 | + height: 500, | ||
| 337 | + destWidth: 400 * 2, | ||
| 338 | + destHeight: 720 * 2, | ||
| 339 | + canvasId: 'share_id', | ||
| 340 | + success: function(res) { | ||
| 341 | + wx.hideLoading(); | ||
| 342 | + var shareImgPath = th.data.shareImgPath; | ||
| 343 | + shareImgPath[0] = res.tempFilePath; | ||
| 344 | + | ||
| 345 | + th.setData({ | ||
| 346 | + shareImgPath: shareImgPath, | ||
| 347 | + canvasHidden: 1, | ||
| 348 | + is_share: 1 | ||
| 349 | + }) | ||
| 350 | + if (!res.tempFilePath) { | ||
| 351 | + wx.showModal({ | ||
| 352 | + title: '提示', | ||
| 353 | + content: '图片绘制中，请稍后重试', | ||
| 354 | + showCancel: false | ||
| 355 | + }) | ||
| 356 | + return false; | ||
| 357 | + } | ||
| 358 | + | ||
| 359 | + }, | ||
| 360 | + fail(r) { | ||
| 361 | + | ||
| 362 | + } | ||
| 363 | + }, 500) | ||
| 364 | + }) | ||
| 365 | + }) | ||
| 366 | + // } | ||
| 367 | + // }) | ||
| 368 | + }, | ||
| 369 | + preview: function() { | ||
| 370 | + var th = this; | ||
| 371 | + var shareImgPath = th.data.shareImgPath; | ||
| 372 | + wx.previewImage({ | ||
| 373 | + url: shareImgPath[0], | ||
| 374 | + urls: shareImgPath | ||
| 375 | + }) | ||
| 376 | + }, | ||
| 377 | + | ||
| 378 | + //关闭分享显示 | ||
| 379 | + close_share: function() { | ||
| 380 | + var th = this; | ||
| 381 | + th.setData({ | ||
| 382 | + is_share: 0 | ||
| 383 | + }) | ||
| 384 | + }, | ||
| 385 | + syinfo: function() { | ||
| 386 | + var th = this; | ||
| 387 | + //获取用户设备信息，屏幕宽度 | ||
| 388 | + wx.getSystemInfo({ | ||
| 389 | + success: res => { | ||
| 390 | + th.setData({ | ||
| 391 | + screenWidth: res.screenWidth | ||
| 392 | + }) | ||
| 393 | + } | ||
| 394 | + }) | ||
| 395 | + }, | ||
| 396 | + imageinfo: function() { | ||
| 397 | + var th = this; | ||
| 398 | + var images = th.data.images; | ||
| 399 | + var iurl = th.data.iurl; | ||
| 400 | + wx.getImageInfo({ | ||
| 401 | + src: iurl + images[0], | ||
| 402 | + success: function(res) { | ||
| 403 | + console.log(res + i); | ||
| 404 | + //res.path是网络图片的本地地址 | ||
| 405 | + images[0] = res.path; | ||
| 406 | + }, | ||
| 407 | + fail: function(res) { | ||
| 408 | + console.log(res.toString() + "" + i); | ||
| 409 | + } | ||
| 410 | + }); | ||
| 411 | + wx.getImageInfo({ | ||
| 412 | + src: iurl + images[1], | ||
| 413 | + success: function(res) { | ||
| 414 | + console.log(res + i); | ||
| 415 | + //res.path是网络图片的本地地址 | ||
| 416 | + images[1] = res.path; | ||
| 417 | + }, | ||
| 418 | + fail: function(res) { | ||
| 419 | + console.log(res.toString() + "" + i); | ||
| 420 | + } | ||
| 421 | + }); | ||
| 422 | + wx.getImageInfo({ | ||
| 423 | + src: iurl + images[2], | ||
| 424 | + success: function(res) { | ||
| 425 | + console.log(res + i); | ||
| 426 | + //res.path是网络图片的本地地址 | ||
| 427 | + images[2] = res.path; | ||
| 428 | + }, | ||
| 429 | + fail: function(res) { | ||
| 430 | + console.log(res.toString() + "" + i); | ||
| 431 | + } | ||
| 432 | + }); | ||
| 433 | + wx.getImageInfo({ | ||
| 434 | + src: iurl + images[3], | ||
| 435 | + success: function(res) { | ||
| 436 | + console.log(res + i); | ||
| 437 | + //res.path是网络图片的本地地址 | ||
| 438 | + images[3] = res.path; | ||
| 439 | + }, | ||
| 440 | + fail: function(res) { | ||
| 441 | + console.log(res.toString() + "" + i); | ||
| 442 | + } | ||
| 443 | + }); | ||
| 444 | + wx.getImageInfo({ | ||
| 445 | + src: iurl + images[4], | ||
| 446 | + success: function(res) { | ||
| 447 | + console.log(res + i); | ||
| 448 | + //res.path是网络图片的本地地址 | ||
| 449 | + images[4] = res.path; | ||
| 450 | + }, | ||
| 451 | + fail: function(res) { | ||
| 452 | + console.log(res.toString() + "" + i); | ||
| 453 | + } | ||
| 454 | + }); | ||
| 455 | + wx.getImageInfo({ | ||
| 456 | + src: iurl + images[5], | ||
| 457 | + success: function(res) { | ||
| 458 | + console.log(res + i); | ||
| 459 | + //res.path是网络图片的本地地址 | ||
| 460 | + images[5] = res.path; | ||
| 461 | + }, | ||
| 462 | + fail: function(res) { | ||
| 463 | + console.log(res.toString() + "" + i); | ||
| 464 | + } | ||
| 465 | + }); | ||
| 466 | + wx.getImageInfo({ | ||
| 467 | + src: iurl + images[6], | ||
| 468 | + success: function(res) { | ||
| 469 | + console.log(res + i); | ||
| 470 | + //res.path是网络图片的本地地址 | ||
| 471 | + images[6] = res.path; | ||
| 472 | + }, | ||
| 473 | + fail: function(res) { | ||
| 474 | + console.log(res.toString() + "" + i); | ||
| 475 | + } | ||
| 476 | + }); | ||
| 477 | + | ||
| 478 | + wx.getImageInfo({ | ||
| 479 | + src: iurl + images[7], | ||
| 480 | + success: function(res) { | ||
| 481 | + console.log(res + i); | ||
| 482 | + //res.path是网络图片的本地地址 | ||
| 483 | + images[7] = res.path; | ||
| 484 | + }, | ||
| 485 | + fail: function(res) { | ||
| 486 | + console.log(res.toString() + "" + i); | ||
| 487 | + } | ||
| 488 | + }) | ||
| 489 | + th.setData({ | ||
| 490 | + images: images | ||
| 491 | + }) | ||
| 216 | 492 | ||
| 217 | } | 493 | } |
| 218 | }) | 494 | }) |
| 219 | \ No newline at end of file | 495 | \ No newline at end of file |
pages/user/assistance/task_assistance.wxml
| 1 | <view class="top-back" style="background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)"> | 1 | <view class="top-back" style="background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)"> |
| 2 | - <!-- 助力活动头部 --> | ||
| 3 | - <view class="top-frame"> | ||
| 4 | - <view class="top-title white fs36 t-c"> | ||
| 5 | - {{aitem[sw_index].tite_name}} | ||
| 6 | - </view> | ||
| 7 | - <view class="activity-data t-c fs28 white"> | ||
| 8 | - 活动剩余时间: {{activity_data}} | ||
| 9 | - </view> | 2 | + <!-- 助力活动头部 --> |
| 3 | + <view class="top-frame"> | ||
| 4 | + <view class="top-title white fs36 t-c"> | ||
| 5 | + {{aitem[sw_index].tite_name}} | ||
| 10 | </view> | 6 | </view> |
| 11 | - <!-- 图片的轮播图 --> | ||
| 12 | - <view class="xc-specific-more-frame flex-center"> | ||
| 13 | - <view bindtap="click_pre"> | ||
| 14 | - <view class="bg_left xc-left bcolor"></view> | ||
| 15 | - </view> | ||
| 16 | - <swiper current="{{sw_index}}" style='width:82.7%; height:100%' | ||
| 17 | - bindchange='onSli' | ||
| 18 | - indicator-dots="{{false}}" autoplay="{{false}}" > | ||
| 19 | - | ||
| 20 | - <swiper-item wx:for="{{aitem}}" wx:for-item="aitem" wx:for-index="pidx"> | ||
| 21 | - | ||
| 22 | - <image class="xc-center-img "src="{{aitem.PrivilegeICOUrl}}"></image> | ||
| 23 | - | ||
| 24 | - </swiper-item> | ||
| 25 | - | ||
| 26 | - </swiper> | ||
| 27 | - | ||
| 28 | - <view bindtap="click_next"> | ||
| 29 | - <view class="bg_right xc-right bcolor mt" ></view> | ||
| 30 | - </view> | ||
| 31 | - </view> | 7 | + <view class="activity-data t-c fs28 white"> |
| 8 | + 活动剩余时间: {{activity_data}} | ||
| 9 | + </view> | ||
| 10 | + </view> | ||
| 11 | + <!-- 图片的轮播图 --> | ||
| 12 | + <view class="xc-specific-more-frame flex-center"> | ||
| 13 | + <view bindtap="click_pre"> | ||
| 14 | + <view class="bg_left xc-left bcolor"></view> | ||
| 15 | + </view> | ||
| 16 | + <swiper current="{{sw_index}}" style='width:82.7%; height:100%' bindchange='onSli' indicator-dots="{{false}}" autoplay="{{false}}"> | ||
| 32 | 17 | ||
| 33 | - <view class="task-number fs28 white t-c "> | ||
| 34 | - 今天剩余可领{{task_number}}个任务 | 18 | + <swiper-item wx:for="{{aitem}}" wx:for-item="aitem" wx:for-index="pidx"> |
| 19 | + | ||
| 20 | + <image class="xc-center-img " src="{{aitem.PrivilegeICOUrl}}"></image> | ||
| 21 | + | ||
| 22 | + </swiper-item> | ||
| 23 | + | ||
| 24 | + </swiper> | ||
| 25 | + | ||
| 26 | + <view bindtap="click_next"> | ||
| 27 | + <view class="bg_right xc-right bcolor mt"></view> | ||
| 35 | </view> | 28 | </view> |
| 36 | - <view class="task_clike fs40 t-c flex-center" bindtap="onlicke"> | 29 | + </view> |
| 30 | + | ||
| 31 | + <view class="task-number fs28 white t-c "> | ||
| 32 | + 今天剩余可领{{task_number}}个任务 | ||
| 33 | + </view> | ||
| 34 | + | ||
| 35 | + <view class="task_clike fs40 t-c flex-center" bindtap="onlicke"> | ||
| 37 | 就选它了 | 36 | 就选它了 |
| 38 | - </view> | 37 | + </view> |
| 39 | </view> | 38 | </view> |
| 40 | <!-- 底部列表 --> | 39 | <!-- 底部列表 --> |
| 41 | - <view> | ||
| 42 | - <!-- 标题 --> | ||
| 43 | - | ||
| 44 | - <view class="flex-vertical-between fs28 padding head"> | ||
| 45 | - <view class="flex-center lhead {{switch_head==0?'rhead':''}}" bindtap="switch_head"data-index="0"> | ||
| 46 | - <image class="unfinished" src="{{iurl}}miniapp/images/friendhelp/task.png" lazy-load="true"></image> | ||
| 47 | - <view >我的任务</view> | 40 | +<view> |
| 41 | + <!-- 标题 --> | ||
| 42 | + | ||
| 43 | + <view class="flex-vertical-between fs28 padding head"> | ||
| 44 | + <view class="flex-center lhead {{switch_head==0?'rhead':''}}" bindtap="switch_head" data-index="0"> | ||
| 45 | + <image class="unfinished" src="{{iurl}}miniapp/images/friendhelp/task.png" lazy-load="true"></image> | ||
| 46 | + <view>我的任务</view> | ||
| 47 | + </view> | ||
| 48 | + <view class="flex-center lhead {{switch_head==1?'rhead':''}}" bindtap="switch_head" data-index='1'> | ||
| 49 | + <image class="unfinished" style="margin-top: 5rpx;" src="{{iurl}}miniapp/images/friendhelp/edit.png" lazy-load="true"></image> | ||
| 50 | + <view>帮拆记录</view> | ||
| 51 | + </view> | ||
| 52 | + </view> | ||
| 53 | + | ||
| 54 | + <view class="white"> | ||
| 55 | + <view class="items" wx:if="{{is_task==0}}"> | ||
| 56 | + <view class="item fs26 flex-vertical-between padding" wx:for="{{5}}"> | ||
| 57 | + <view class="flex-center width"> | ||
| 58 | + <view class="ellipsis-1">豪华任务一 | ||
| 59 | + </view> | ||
| 48 | </view> | 60 | </view> |
| 49 | - <view class="flex-center lhead {{switch_head==1?'rhead':''}}" bindtap="switch_head" data-index='1'> | ||
| 50 | - <image class="unfinished" style="margin-top: 5rpx;" src="{{iurl}}miniapp/images/friendhelp/edit.png" lazy-load="true"></image> | ||
| 51 | - <view>帮拆记录</view> | 61 | + |
| 62 | + <view class="flex-center width state"> | ||
| 63 | + <view class="ellipsis-1">进行中 | ||
| 64 | + </view> | ||
| 52 | </view> | 65 | </view> |
| 66 | + | ||
| 53 | </view> | 67 | </view> |
| 68 | + </view> | ||
| 69 | + </view> | ||
| 54 | 70 | ||
| 55 | - <view class="white"> | ||
| 56 | - <view class="items" wx:if="{{is_task==0}}"> | ||
| 57 | - <view class="item fs26 flex-vertical-between padding" wx:for="{{5}}"> | ||
| 58 | - <view class="flex-center width"> | ||
| 59 | - <view class="ellipsis-1">豪华任务一 | ||
| 60 | - </view> | ||
| 61 | - </view> | ||
| 62 | 71 | ||
| 63 | - <view class="flex-center width state"> | ||
| 64 | - <view class="ellipsis-1">进行中 | ||
| 65 | - </view> | ||
| 66 | - </view> | 72 | + <view class="items" wx:if="{{is_task==1}}"> |
| 67 | 73 | ||
| 68 | - </view> | ||
| 69 | - </view> | ||
| 70 | - </view> | ||
| 71 | - | ||
| 72 | - | ||
| 73 | - <view class="items" wx:if="{{is_task==1}}"> | ||
| 74 | - | ||
| 75 | - | ||
| 76 | - <view class="item fs26 flex flex-vertical-between padding" wx:for="{{5}}"> | ||
| 77 | - <view class="flex white"style="justify-content: space-around; width: 90%;margin:auto"> | ||
| 78 | - <image class="circle user_img" src="https://mshopimg.yolipai.net/public/upload/qyimg/temp/2019/08-14/0697f7277936a3b116a6ebc4f8f5e39a.png"></image> | ||
| 79 | - <view class="ellipsis-1">豪华任务一 | ||
| 80 | - </view> | ||
| 81 | - <view class="ellipsis-1">2019-05-12 | ||
| 82 | - </view> | ||
| 83 | - </view> | ||
| 84 | - | ||
| 85 | - </view> | ||
| 86 | - | ||
| 87 | - </view> | ||
| 88 | - <view class="fs30" wx:if="{{1<0}}"> | ||
| 89 | - <view class="flex-center nothing"> | ||
| 90 | - <view>暂无任务记录</view> | ||
| 91 | - </view> | ||
| 92 | - <view class="flex-center receive"> | ||
| 93 | - <view class="flex-center"> | ||
| 94 | - <view>已有</view> | ||
| 95 | - <view>126</view> | ||
| 96 | - <view>人领取了任务</view> | ||
| 97 | - </view> | ||
| 98 | - </view> | 74 | + |
| 75 | + <view class="item fs26 flex flex-vertical-between padding" wx:for="{{5}}"> | ||
| 76 | + <view class="flex white" style="justify-content: space-around; width: 90%;margin:auto"> | ||
| 77 | + <image class="circle user_img" src="https://mshopimg.yolipai.net/public/upload/qyimg/temp/2019/08-14/0697f7277936a3b116a6ebc4f8f5e39a.png"></image> | ||
| 78 | + <view class="ellipsis-1">豪华任务一 | ||
| 99 | </view> | 79 | </view> |
| 100 | - | ||
| 101 | - </view> | ||
| 102 | - <!-- 加载更多 --> | ||
| 103 | - <view class="fs32 "> | ||
| 104 | - <view class="flex-center"> | ||
| 105 | - <view class="line"></view> | ||
| 106 | - <view class="load white" bindtap="">点击加载更多</view> | ||
| 107 | - <view class="line"></view> | ||
| 108 | - </view> | ||
| 109 | - <view class="flex-center white"style="margin-top: 20rpx;" > | ||
| 110 | - <view>已有</view> | ||
| 111 | - <view>126</view> | ||
| 112 | - <view>人领取了任务</view> | ||
| 113 | - </view> | ||
| 114 | - </view> | ||
| 115 | - | 80 | + <view class="ellipsis-1">2019-05-12 |
| 81 | + </view> | ||
| 82 | + </view> | ||
| 83 | + | ||
| 84 | + </view> | ||
| 85 | + | ||
| 86 | + </view> | ||
| 87 | + <view class="fs30" wx:if="{{1<0}}"> | ||
| 88 | + <view class="flex-center nothing"> | ||
| 89 | + <view>暂无任务记录</view> | ||
| 90 | + </view> | ||
| 91 | + <view class="flex-center receive"> | ||
| 92 | + <view class="flex-center"> | ||
| 93 | + <view>已有</view> | ||
| 94 | + <view>126</view> | ||
| 95 | + <view>人领取了任务</view> | ||
| 96 | + </view> | ||
| 97 | + </view> | ||
| 98 | + </view> | ||
| 99 | + | ||
| 100 | +</view> | ||
| 101 | +<!-- 加载更多 --> | ||
| 102 | +<view class="fs32 "> | ||
| 103 | + <view class="flex-center"> | ||
| 104 | + <view class="line"></view> | ||
| 105 | + <view class="load white" bindtap="">点击加载更多</view> | ||
| 106 | + <view class="line"></view> | ||
| 107 | + </view> | ||
| 108 | + <view class="flex-center white" style="margin-top: 20rpx;"> | ||
| 109 | + <view>已有</view> | ||
| 110 | + <view>126</view> | ||
| 111 | + <view>人领取了任务</view> | ||
| 112 | + </view> | ||
| 113 | +</view> | ||
| 114 | +<view wx:if="{{is_share}}"> | ||
| 115 | + <!-- 蒙尘 --> | ||
| 116 | + <view wx:if="{{is_share}}" class="dust"> | ||
| 117 | + </view> | ||
| 118 | + <!-- 画布 --> | ||
| 119 | + <view class="canvas" style="width:100%;"> | ||
| 120 | + <view class="flex-center"> | ||
| 121 | + <canvas canvas-id="share_id" style="width:600rpx;height:1000rpx;" bindtap="preview"></canvas> | ||
| 122 | + </view> | ||
| 123 | + <view class="closes flex-center"> | ||
| 124 | + <image class="close" src="{{iurl}}/miniapp/images/plus/Close.png" bindtap="close_share"></image> | ||
| 125 | + </view> | ||
| 126 | + </view> | ||
| 127 | +</view> | ||
| 116 | <!-- 引入提示组件 --> | 128 | <!-- 引入提示组件 --> |
| 117 | <warn id="warn"></warn> | 129 | <warn id="warn"></warn> |
| 118 | <!-- 制作一个圆球导航 --> | 130 | <!-- 制作一个圆球导航 --> |
pages/user/assistance/task_assistance.wxss
| @@ -129,6 +129,28 @@ border-color: #fff; | @@ -129,6 +129,28 @@ border-color: #fff; | ||
| 129 | } | 129 | } |
| 130 | .user_img{ | 130 | .user_img{ |
| 131 | width: 50rpx; | 131 | width: 50rpx; |
| 132 | - height: 50rpx; | ||
| 133 | - | ||
| 134 | -} | ||
| 135 | \ No newline at end of file | 132 | \ No newline at end of file |
| 133 | + height: 50rpx; | ||
| 134 | +} | ||
| 135 | +.dust { | ||
| 136 | + position: fixed; | ||
| 137 | + width: 100%; | ||
| 138 | + height: 100%; | ||
| 139 | + background-color: rgba(206, 184, 188, 0.158); | ||
| 140 | + z-index: 10; | ||
| 141 | +} | ||
| 142 | + | ||
| 143 | +.closes { | ||
| 144 | + margin-top: 20rpx; | ||
| 145 | +} | ||
| 146 | + | ||
| 147 | +.canvas { | ||
| 148 | + position: fixed; | ||
| 149 | + z-index: 11; | ||
| 150 | + width: 100%; | ||
| 151 | + top:20rpx; | ||
| 152 | +} | ||
| 153 | + | ||
| 154 | +.close { | ||
| 155 | + width: 70rpx; | ||
| 156 | + height: 70rpx; | ||
| 157 | +} |
utils/request.js
| @@ -212,5 +212,26 @@ module.exports = { | @@ -212,5 +212,26 @@ module.exports = { | ||
| 212 | if(req) req.abort(); | 212 | if(req) req.abort(); |
| 213 | },time*1000) | 213 | },time*1000) |
| 214 | } | 214 | } |
| 215 | + | ||
| 216 | + /** | ||
| 217 | + * @param {Object} url //url地址 | ||
| 218 | + * @param {Object} data //data入参 | ||
| 219 | + * @param {Object} succ //成功的回调 | ||
| 220 | + * @param {Object} fail //失败的回调 | ||
| 221 | + */ | ||
| 222 | + json_post:function(url,data,succ,fail){ | ||
| 223 | + if(url.indexOf("http")==-1) url=getApp().globalData.setting.url +url; | ||
| 224 | + var str = JSON.stringify(pdata); | ||
| 225 | + wx.request({ | ||
| 226 | + url: url, | ||
| 227 | + data: str, | ||
| 228 | + method: 'POST', | ||
| 229 | + header: { | ||
| 230 | + 'content-type': 'application/json' | ||
| 231 | + },// 设置请求的 header | ||
| 232 | + success: function (res) { succ(res); }, | ||
| 233 | + fail:function(res){fail(res);} | ||
| 234 | + }) | ||
| 235 | + } | ||
| 215 | 236 | ||
| 216 | }; | 237 | }; |
| 217 | \ No newline at end of file | 238 | \ No newline at end of file |