Commit 8c6d0b2c8c8208fbde40a386083800b88a3ba2d8

Authored by 前端研发-钱巧玲
1 parent 36711876

新人有礼数据填充

pages/giftpack/newvipgift/newvipgift.js
@@ -5,197 +5,218 @@ var e = getApp(), @@ -5,197 +5,218 @@ var e = getApp(),
5 t = e.request, 5 t = e.request,
6 d = e.globalData; 6 d = e.globalData;
7 Page({ 7 Page({
  8 + data: {
  9 + url: a.url, //接口网址
  10 + iurl: a.imghost, //图片前缀网址
  11 + itemShow: false, //项目栏目是否显示
  12 + cardShow: false, //代金券栏目是否显示
  13 + packShow: false, //福利栏目是否显示
  14 + textShow: false, //规则是否显示
  15 + integralShow: true, //积分领取是否显示
  16 + growUpShow: true, //成长值领取是否显示
  17 + itemButton: '',
  18 + cardButton: '',
  19 + getActId: '',
  20 + getActType: '',
  21 + giftID: '',
  22 + receiveState: '一键全部领取',
  23 + textTitle: '',
  24 + getUrl: '',
  25 + noShow: false,
  26 + cards: [], //礼包内容--礼券
  27 + itemWare: [], //礼包内容--服务项目
  28 + integralTitle: "",
  29 + growUpTitle: "",
  30 + is_sub: 0, //是否重复领取
  31 + },
  32 + GetList: function() {
  33 + var th = this;
  34 + var url = "/api/weshop/marketing/giftbag/bound/get";
  35 + getApp().request.promiseGet(url, {
8 data: { 36 data: {
9 - iurl: a.imghost, //图片前缀网址  
10 - itemShow: false, //项目栏目是否显示  
11 - cardShow: false, //代金券栏目是否显示  
12 - packShow: false, //福利栏目是否显示  
13 - textShow: false, //规则是否显示  
14 - integralShow: true, //积分领取是否显示  
15 - growUpShow: true, //成长值领取是否显示  
16 - itemButton: '',  
17 - cardButton: '',  
18 - getActId: '',  
19 - getActType: '',  
20 - giftID: '',  
21 - getUserID: '',  
22 - getStorageID: '',  
23 - receiveState: '已领取',  
24 - integralTitle: '已领取',  
25 - growUpTitle: '已领取',  
26 - textTitle: '',  
27 - getUrl: '',  
28 - noShow: false,  
29 - cards: [],  
30 - itemWare: []  
31 - },  
32 - //判断中间的连接线是否显示  
33 - itemShows: function itemShows() {  
34 - if (this.itemShow) {  
35 - if (this.cardShow) {  
36 - return true; 37 + "actId": th.data.getActId, //活动id
  38 + "actType": th.data.getActType, //活动类型 1新人礼 2评价有礼 3节日营销 4生日营销
  39 + "giftBagId": th.data.giftID, //礼包ID
  40 + "storeId": a.stoid, //商家ID
  41 + "userId": d.user_id //用户ID
  42 + }
  43 + }).then(res => {
  44 + if (res.data.code == 0) {
  45 + if (res.data.data.lbCoupons != null) {
  46 + //礼包内容--礼券
  47 + th.setData({
  48 + cardShow: true,
  49 + cards: res.data.data.lbCoupons
  50 + })
  51 + }
  52 + if (res.data.data.lbSM != null) {
  53 + //礼包内容--服务项目
  54 + th.setData({
  55 + itemShow: true,
  56 + itemWare: res.data.data.lbSM
  57 + })
  58 + }
  59 + //礼包积分
  60 + if (res.data.data.lbIntegral <= 0) {
  61 + if (res.data.data.lbGrowthValue <= 0) {
  62 + th.setData({
  63 + packShow: false
  64 + })
37 } else { 65 } else {
38 - return false; 66 + th.setData({
  67 + packShow: false,
  68 + integralShow: false,
  69 + growUpShow: true
  70 + })
39 } 71 }
  72 +
40 } else { 73 } else {
41 - if (this.cardShow) {  
42 - return false; 74 + if (res.data.data.lbGrowthValue > 0) {
  75 + th.setData({
  76 + packShow: true
  77 + })
43 } else { 78 } else {
44 - return false; 79 + th.setData({
  80 + packShow: true,
  81 + integralShow: true,
  82 + growUpShow: false
  83 + })
45 } 84 }
46 -  
47 } 85 }
48 - },  
49 - //判断中间的连接线是否显示  
50 - cardShows: function cardShows() {  
51 - if (this.cardShow) {  
52 - if (this.packShow) {  
53 - return true;  
54 - } else {  
55 - return false;  
56 - } 86 + th.setData({
  87 + integralTitle: '领取' + res.data.data.lbIntegral + '积分',
  88 + growUpTitle: '领取' + res.data.data.lbGrowthValue + '成长值'
  89 + })
  90 + if (res.data.data.receiveState == 0) {
  91 + th.setData({
  92 + receiveState: '一键全部领取'
  93 + })
57 } else { 94 } else {
58 - if (this.packShow) {  
59 - return false;  
60 - } else {  
61 - return false;  
62 - } 95 + th.setData({
  96 + receiveState: '已领取'
  97 + })
  98 + }
63 99
  100 + if (res.data.data.actIntro != '') {
  101 + th.setData({
  102 + textShow: true,
  103 + textTitle: res.data.data.actIntro
  104 + })
64 } 105 }
65 - }, 106 + } else {
  107 + getApp().my_warnning(res.data.msg, 0, th);
  108 + return false;
  109 + }
  110 + })
  111 + },
  112 + //判断中间的连接线是否显示
  113 + itemShows: function() {
  114 + if (this.itemShow) {
  115 + if (this.cardShow) {
  116 + return true;
  117 + } else {
  118 + return false;
  119 + }
  120 + } else {
  121 + if (this.cardShow) {
  122 + return false;
  123 + } else {
  124 + return false;
  125 + }
66 126
67 - onLoad: function onLoad(options) { 127 + }
  128 + },
  129 + //判断中间的连接线是否显示
  130 + cardShows: function() {
  131 + if (this.cardShow) {
  132 + if (this.packShow) {
  133 + return true;
  134 + } else {
  135 + return false;
  136 + }
  137 + } else {
  138 + if (this.packShow) {
  139 + return false;
  140 + } else {
  141 + return false;
  142 + }
68 143
69 - this.getActId = options.actId; //活动id  
70 - this.getActType = options.actType; //活动类型 1新人礼 2评价有礼 3节日营销 4生日营销  
71 - this.giftID = options.giftBagId; //礼包ID  
72 - this.getStorageID = options.storeId; //商家ID  
73 - this.getUserID = options.userId; //用户ID  
74 - this.GetList(); 144 + }
  145 + },
75 146
  147 + onLoad: function onLoad(options) {
  148 + var th = this;
  149 + th.setData({
  150 + getActId: options.actId,
  151 + getActType: options.actType,
  152 + giftID: options.giftBagId
  153 + })
  154 + th.GetList();
76 }, 155 },
77 onShow: function onShow() { 156 onShow: function onShow() {
78 - this.textTitle = this.textTitle.replace(/<p><img/gi, "<p class='img'><img"); 157 + var th = this;
  158 + var textTitle = th.data.textTitle.replace(/<p><img/gi, "<p class='img'><img");
  159 + th.setData({
  160 + textTitle: textTitle
  161 + })
79 }, 162 },
80 -  
81 - getQueryString: function getQueryString(name) {  
82 - var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');  
83 - var r = window.location.search.substr(1).match(reg);  
84 - if (r != null) {  
85 - return unescape(r[2]);  
86 - }  
87 - return null;  
88 - },  
89 -  
90 - GetList: function GetList() {  
91 - var _this = this;  
92 - uni.request({  
93 - url: this.$GetInfo.ApiHttp + '/api/weshop/marketing/giftbag/bound/get',  
94 - data: {  
95 - "actId": this.getActId, //活动id  
96 - "actType": this.getActType, //活动类型 1新人礼 2评价有礼 3节日营销 4生日营销  
97 - "giftBagId": this.giftID, //礼包ID  
98 - "storeId": this.getStorageID, //商家ID  
99 - "userId": this.getUserID //用户ID  
100 - },  
101 - method: 'GET',  
102 - header: {  
103 - 'Content-Type': 'application/x-www-form-urlencoded' //自定义请求头信息  
104 - },  
105 - success: function success(res) {  
106 - console.log(res.data);  
107 - if (res.data.code == 0) {  
108 - if (res.data.data.lbCoupons != null) {  
109 - _this.cardShow = true;  
110 - _this.cards = res.data.data.lbCoupons;  
111 - }  
112 - if (res.data.data.lbSM != null) {  
113 - _this.itemShow = true;  
114 - _this.itemWare = res.data.data.lbSM;  
115 - }  
116 - if (res.data.data.lbIntegral <= 0) {  
117 - if (res.data.data.lbGrowthValue <= 0) {  
118 - _this.packShow = false;  
119 - } else {  
120 - _this.packShow = true;  
121 - _this.integralShow = false;  
122 - _this.growUpShow = true;  
123 - }  
124 -  
125 - } else {  
126 - if (res.data.data.lbGrowthValue > 0) {  
127 - _this.packShow = true;  
128 - } else {  
129 - _this.packShow = true;  
130 - _this.integralShow = true;  
131 - _this.growUpShow = false;  
132 - }  
133 - }  
134 -  
135 - _this.integralTitle = '领取' + res.data.data.lbIntegral + '积分';  
136 - _this.growUpTitle = '领取' + res.data.data.lbGrowthValue + '积分';  
137 - if (res.data.data.receiveState == 0) {  
138 - _this.receiveState = '一键全部领取';  
139 - } else {  
140 - _this.receiveState = '已领取';  
141 - }  
142 -  
143 -  
144 - if (res.data.data.actIntro != '') {  
145 - _this.textShow = true;  
146 - console.log(res.data.data.actIntro);  
147 - _this.textTitle = res.data.data.actIntro;  
148 - }  
149 -  
150 - } else {  
151 - console.log(res.data.msg);  
152 - }  
153 - }  
154 - });  
155 -  
156 - },  
157 - GetWebHttp: function GetWebHttp() {  
158 - this.getUrl = this.$GetInfo.HtmlHttp + '/mobile/index/index/stoid/' + this.getStorageID + '.html';  
159 - window.location.href = this.getUrl;  
160 - },  
161 - GetReceive: function GetReceive() {  
162 - var that = this;  
163 - if (that.receiveState == '已领取') {  
164 - return false;  
165 - }  
166 - uni.request({  
167 - url: that.$GetInfo.ApiHttp + '/api/weshop/marketing/free/receive/gift/record/insert',  
168 - data: {  
169 - "actId": that.getActId, //活动Id  
170 - "actType": '1', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销  
171 - "lbId": that.giftID, //礼包Id  
172 - "storeId": that.getStorageID, //商家Id  
173 - "userId": that.getUserID //用户ID  
174 - },  
175 - method: 'POST', 163 + GetReceive: function() {
  164 + var th = this;
  165 + if (th.data.receiveState == '已领取') {
  166 + return false;
  167 + }
  168 + var is_sub = th.data.is_sub; //判断是否重复提交
  169 + if (is_sub == 0) {
  170 + th.setData({
  171 + is_sub: 1
  172 + })
  173 +
  174 + var json = {
  175 + "actId": th.data.getActId, //活动Id
  176 + "actType": 1, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
  177 + "lbId": th.data.giftID, //礼包Id
  178 + "storeId": a.stoid, //商家Id
  179 + "userId": d.user_id //用户ID
  180 + };
  181 + var data = JSON.stringify(json);
  182 + var url = th.data.url + "/api/weshop/marketing/free/receive/gift/record/insert";
  183 + wx.request({
  184 + url: url,
  185 + data: data,
  186 + method: 'post',
176 header: { 187 header: {
177 - 'Content-Type': 'application/json' //自定义请求头信息  
178 - },  
179 - success: function success(res) {  
180 - console.log(res.data); 188 + 'content-type': 'application/json'
  189 + }, // 设置请求的 header
  190 + success: function(res) {
  191 + th.setData({
  192 + is_sub: 0
  193 + })
181 if (res.data.code == 0) { 194 if (res.data.code == 0) {
182 - console.log(res.data.msg);  
183 - that.receiveState = '已领取';  
184 - uni.showToast({  
185 - icon: 'none',  
186 - title: '领取成功!'  
187 - });  
188 - 195 + th.setData({
  196 + receiveState: '已领取'
  197 + })
  198 + getApp().my_warnning("领取成功", 1, th);
189 } else { 199 } else {
190 - console.log(res.data.msg);  
191 - uni.showToast({  
192 - icon: 'none',  
193 - title: res.data.msg  
194 - });  
195 - 200 + getApp().my_warnning("系统繁忙,请稍后再试", 0, th);
196 } 201 }
197 } 202 }
198 - });  
199 - 203 + })
  204 + }
  205 + },
  206 + //界面跳转
  207 + goto:function(e){
  208 + var url = e.currentTarget.dataset.url;
  209 + getApp().goto(url);
  210 + },
  211 + //图片失败,默认图片
  212 + bind_bnerr1: function (e) {
  213 + var th = this;
  214 + var _errImg = e.target.dataset.errorimg;
  215 + var _Img = e.target.dataset.img;
  216 + if (_Img != undefined) {
  217 + var _errObj = {};
  218 + _errObj[_errImg] = "/miniapp/images/giftbag/gift02.png";
  219 + th.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
200 } 220 }
  221 + },
201 }); 222 });
202 \ No newline at end of file 223 \ No newline at end of file
pages/giftpack/newvipgift/newvipgift.json
1 { 1 {
2 "navigationBarTitleText": "新人礼", 2 "navigationBarTitleText": "新人礼",
3 "navigationStyle": "custom", 3 "navigationStyle": "custom",
4 - "usingComponents": {} 4 + "usingComponents": {
  5 + "warn": "/components/long_warn/long_warn",
  6 + "my_confirm": "/components/my_confirm/my_confirm"
  7 + }
5 } 8 }
6 \ No newline at end of file 9 \ No newline at end of file
pages/giftpack/newvipgift/newvipgift.wxml
1 <view> 1 <view>
2 <view class="image_box"> 2 <view class="image_box">
3 - <image src="{{iurl+'/miniapp/images/giftbag/vip00.png'}}" ></image> 3 + <image src="{{iurl+'/miniapp/images/giftbag/vip00.png'}}" lazy-load="true"></image>
4 </view> 4 </view>
5 - <block wx:if="{{this.itemShow}}"> 5 + <block wx:if="{{itemShow}}">
6 <view class="top"> 6 <view class="top">
7 <view class="top_box"> 7 <view class="top_box">
8 <view class="top_box_text"> 8 <view class="top_box_text">
9 <text>______</text> 9 <text>______</text>
10 </view> 10 </view>
11 <view class="top_box_text"> 11 <view class="top_box_text">
12 - <text >新人专享\n你的美丽我来缔造</text> 12 + <text>新人专享\n你的美丽我来缔造</text>
13 </view> 13 </view>
14 <view class="top_box_text"> 14 <view class="top_box_text">
15 <text >______</text> 15 <text >______</text>
@@ -18,27 +18,27 @@ @@ -18,27 +18,27 @@
18 <block wx:for="{{itemWare}}" wx:for-item="item" wx:for-index="index" wx:key="index"> 18 <block wx:for="{{itemWare}}" wx:for-item="item" wx:for-index="index" wx:key="index">
19 <view class="top_item "> 19 <view class="top_item ">
20 <block wx:if="{{item.lbType==3}}"> 20 <block wx:if="{{item.lbType==3}}">
21 - <view class="top_item_img ">  
22 - <image src="{{$GetInfo.imgHttp+'/miniapp/images/giftbag/gift02.png'}}" ></image> 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> 23 </view>
24 </block> 24 </block>
25 <block wx:if="{{item.lbType==1}}"> 25 <block wx:if="{{item.lbType==1}}">
26 <view class="top_item_img "> 26 <view class="top_item_img ">
27 - <image src="{{item.fromImage==''?$GetInfo.imgHttp+'/miniapp/images/giftbag/empty.jpg':$GetInfo.imgHttp+item.fromImage}}" ></image> 27 + <image src="{{item.fromImage==''?iurl+'/miniapp/images/giftbag/empty.jpg':iurl+item.fromImage}}" lazy-load="true"></image>
28 </view> 28 </view>
29 </block> 29 </block>
30 <view class="top_item_center "> 30 <view class="top_item_center ">
31 - <view class="top_item_center_title "> 31 + <view class="top_item_center_title">
32 <block wx:if="{{item.lbType==1}}"> 32 <block wx:if="{{item.lbType==1}}">
33 - <text >免费领取</text> 33 + <text>免费领取</text>
34 </block> 34 </block>
35 <block wx:if="{{item.lbType==3}}"> 35 <block wx:if="{{item.lbType==3}}">
36 - <text >{{item.fromName}}</text> 36 + <text>{{item.fromName}}</text>
37 </block> 37 </block>
38 </view> 38 </view>
39 <view class="top_item_center_ramke "> 39 <view class="top_item_center_ramke ">
40 <block wx:if="{{item.lbType==1}}"> 40 <block wx:if="{{item.lbType==1}}">
41 - <text >{{item.fromName}}</text> 41 + <text>{{item.fromName}}</text>
42 </block> 42 </block>
43 <block wx:if="{{item.lbType==3}}"> 43 <block wx:if="{{item.lbType==3}}">
44 <text >{{"新人可免费享受专业"+item.fromName+",可以享受"+item.num+"次。"}}</text> 44 <text >{{"新人可免费享受专业"+item.fromName+",可以享受"+item.num+"次。"}}</text>
@@ -49,13 +49,13 @@ @@ -49,13 +49,13 @@
49 </block> 49 </block>
50 </view> 50 </view>
51 </block> 51 </block>
52 - <block wx:if="{{$root.g0}}"> 52 + <block wx:if="{{true}}">
53 <view > 53 <view >
54 - <image style="width:10px;height:47px;float:left;top:-38px;left:55px;" src="{{this.$GetInfo.imgHttp+'/miniapp/images/giftbag/vip05.png'}}" ></image>  
55 - <image style="width:10px;height:47px;float:right;top:-38px;right:55px;" src="{{this.$GetInfo.imgHttp+'/miniapp/images/giftbag/vip05.png'}}" ></image> 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>
56 </view> 56 </view>
57 </block> 57 </block>
58 - <block wx:if="{{this.cardShow}}"> 58 + <block wx:if="{{cardShow}}">
59 <view > 59 <view >
60 <view class="top "> 60 <view class="top ">
61 <view class="top_box "> 61 <view class="top_box ">
@@ -71,22 +71,23 @@ @@ -71,22 +71,23 @@
71 </view> 71 </view>
72 <block wx:for="{{cards}}" wx:for-item="item" wx:for-index="index" wx:key="index"> 72 <block wx:for="{{cards}}" wx:for-item="item" wx:for-index="index" wx:key="index">
73 <view class="top_card "> 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']}}"> 74 + <view class="{{item.useObjectType==1?'top_card_box img1':item.useObjectType==2?'top_card_box img2':'top_card_box img3'}}">
  75 + <!-- 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 <view class="top_card_tite_box ">
76 <block wx:if="{{item.useObjectType==0}}"> 77 <block wx:if="{{item.useObjectType==0}}">
77 - <view class="top_card_tite_a ">全场通用</view> 78 + <view class="top_card_tite_a">全场通用</view>
78 </block> 79 </block>
79 <block wx:if="{{item.useObjectType==1}}"> 80 <block wx:if="{{item.useObjectType==1}}">
80 - <view class="top_card_tite_b ">品牌限定</view> 81 + <view class="top_card_tite_b">品牌限定</view>
81 </block> 82 </block>
82 <block wx:if="{{item.useObjectType==2}}"> 83 <block wx:if="{{item.useObjectType==2}}">
83 - <view class="top_card_tite_c ">品类限定</view> 84 + <view class="top_card_tite_c">品类限定</view>
84 </block> 85 </block>
85 <block wx:if="{{item.useObjectType==11}}"> 86 <block wx:if="{{item.useObjectType==11}}">
86 - <view class="top_card_tite_a ">用途限定</view> 87 + <view class="top_card_tite_a">用途限定</view>
87 </block> 88 </block>
88 <block wx:if="{{item.useObjectType==12}}"> 89 <block wx:if="{{item.useObjectType==12}}">
89 - <view class="top_card_tite_a ">分类1限定</view> 90 + <view class="top_card_tite_a">分类限定</view>
90 </block> 91 </block>
91 </view> 92 </view>
92 <view class="top_card_counte ">{{item.sum+"元券"}}</view> 93 <view class="top_card_counte ">{{item.sum+"元券"}}</view>
@@ -97,15 +98,15 @@ @@ -97,15 +98,15 @@
97 </view> 98 </view>
98 </view> 99 </view>
99 </block> 100 </block>
100 - <block wx:if="{{$root.g1}}">  
101 - <view >  
102 - <view >  
103 - <image style="width:10px;height:47px;float:left;top:-38px;left:55px;" src="{{this.$GetInfo.imgHttp+'/miniapp/images/giftbag/vip05.png'}}" ></image>  
104 - <image style="width:10px;height:47px;float:right;top:-38px;right:55px;" src="{{this.$GetInfo.imgHttp+'/miniapp/images/giftbag/vip05.png'}}" ></image> 101 + <block wx:if="{{true}}">
  102 + <view>
  103 + <view>
  104 + <image style="width:10px;height:47px;float:left;top:-38px;left:55px;" src="{{iurl+'/miniapp/images/giftbag/vip05.png'}}" lazy-load="true"></image>
  105 + <image style="width:10px;height:47px;float:right;top:-38px;right:55px;" src="{{iurl+'/miniapp/images/giftbag/vip05.png'}}" lazy-load="true"></image>
105 </view> 106 </view>
106 </view> 107 </view>
107 </block> 108 </block>
108 - <block wx:if="{{this.packShow}}"> 109 + <block wx:if="{{packShow}}">
109 <view > 110 <view >
110 <view class="top "> 111 <view class="top ">
111 <view class="top_box "> 112 <view class="top_box ">
@@ -119,47 +120,50 @@ @@ -119,47 +120,50 @@
119 <text >———</text> 120 <text >———</text>
120 </view> 121 </view>
121 </view> 122 </view>
122 - <block wx:if="{{this.integralShow}}">  
123 - <view > 123 + <block wx:if="{{integralShow}}">
  124 + <view>
124 <view class="top_box_image "> 125 <view class="top_box_image ">
125 - <image src="{{this.$GetInfo.imgHttp+'/miniapp/images/giftbag/vip06.jpg'}}" ></image>  
126 - <button >{{this.integralTitle}}</button> 126 + <image src="{{iurl+'/miniapp/images/giftbag/vip06.jpg'}}" lazy-load="true"></image>
  127 + <button>{{integralTitle}}</button>
127 </view> 128 </view>
128 </view> 129 </view>
129 </block> 130 </block>
130 - <block wx:if="{{this.growUpShow}}"> 131 + <block wx:if="{{growUpShow}}">
131 <view > 132 <view >
132 - <view class="top_box_image ">  
133 - <image src="{{this.$GetInfo.imgHttp+'/miniapp/images/giftbag/vip07.jpg'}}" ></image>  
134 - <button >{{this.growUpTitle}}</button> 133 + <view class="top_box_image fs36">
  134 + <image src="{{iurl+'/miniapp/images/giftbag/vip07.jpg'}}" lazy-load="true"></image>
  135 + <button>{{growUpTitle}}</button>
135 </view> 136 </view>
136 </view> 137 </view>
137 </block> 138 </block>
138 </view> 139 </view>
139 </view> 140 </view>
140 </block> 141 </block>
141 - <block wx:if="{{this.textShow}}">  
142 - <view class="foot_box ">  
143 - <view class="foot_box_title ">  
144 - <text >活动规则:</text> 142 + <block wx:if="{{textShow}}">
  143 + <view class="foot_box">
  144 + <view class="foot_box_title fs36">
  145 + <text>活动规则:</text>
145 </view> 146 </view>
146 - <view class="foot_box_text ">  
147 - <rich-text nodes="{{this.textTitle}}"></rich-text> 147 + <view class="foot_box_text">
  148 + <rich-text nodes="{{textTitle}}"></rich-text>
148 </view> 149 </view>
149 </view> 150 </view>
150 </block> 151 </block>
151 - <view class="button_box "> 152 + <view class="button_box">
152 <view > 153 <view >
153 - <button data-event-opts="{{[['tap',[['GetWebHttp',['$event']]]]]}}" class="button " bindtap="__e">进入商城购物</button> 154 + <button class="button" bindtap="goto" data-url="/pages/index/index/index">进入商城购物</button>
154 </view> 155 </view>
155 <view class="button_text "> 156 <view class="button_text ">
156 <text >本活动最终解释权归公司所有,如果有问题请联系客服</text> 157 <text >本活动最终解释权归公司所有,如果有问题请联系客服</text>
157 </view> 158 </view>
158 </view> 159 </view>
159 <view class="foot_empty "></view> 160 <view class="foot_empty "></view>
160 - <view class="foot_button ">  
161 - <view class="{{['',this.receiveState=='已领取'?'foot_button_notbuy':'foot_button_buy']}}">  
162 - <text data-event-opts="{{[['tap',[['GetReceive',['$event']]]]]}}" bindtap="__e" >{{this.receiveState}}</text> 161 + <view class="foot_button">
  162 + <view class="{{receiveState=='已领取'?'foot_button_notbuy':'foot_button_buy'}}" bindtap="GetReceive">
  163 + <text>{{receiveState}}</text>
163 </view> 164 </view>
164 </view> 165 </view>
165 -</view>  
166 \ No newline at end of file 166 \ No newline at end of file
  167 +</view>
  168 +<!-- 引入提示组件 -->
  169 +<warn id="warn"></warn>
  170 +<my_confirm id="my_confirm"></my_confirm>
167 \ No newline at end of file 171 \ No newline at end of file
pages/giftpack/newvipgift/newvipgift.wxss
@@ -258,7 +258,6 @@ @@ -258,7 +258,6 @@
258 border-radius: 20rpx; 258 border-radius: 20rpx;
259 } 259 }
260 .foot_box_title { 260 .foot_box_title {
261 - font-size: 43rpx;  
262 color: #000000; 261 color: #000000;
263 padding: 20rpx 30rpx 20rpx 30rpx; 262 padding: 20rpx 30rpx 20rpx 30rpx;
264 } 263 }
@@ -313,7 +312,7 @@ @@ -313,7 +312,7 @@
313 height: 70rpx; 312 height: 70rpx;
314 font-size: 28rpx; 313 font-size: 28rpx;
315 line-height: 70rpx; 314 line-height: 70rpx;
316 - border-radius: 30rpx 30rpx 30rpx 30rpx; 315 + border-radius: 30rpx;
317 } 316 }
318 .foot_button_notbuy{ 317 .foot_button_notbuy{
319 background: #999999; 318 background: #999999;