wxd / MShopWeApp

Commit 7f1c261af1b485948b60517a0d840c099f565b64

Authored by iceling
1 parent 082f2d33

各种有礼的代码修改

Inline Side-by-side
Showing 10 changed files with 873 additions and 58 deletions
pages/giftpack/birthdaygift/birthdaygift.js
  View file @7f1c261
... ... @@ -19,7 +19,7 @@ Page({
19 19 getActId: '',
20 20 getActType: '',
21 21 giftID: '',
22   - receiveState: '一键全部领取',
  22 + receiveState: 0,
23 23 textTitle: '',
24 24 getUrl: '',
25 25 noShow: false,
... ... @@ -29,13 +29,11 @@ Page({
29 29 growUpTitle: "",
30 30 is_sub: 0, //是否重复领取
31 31 },
32   - GetList: function () {
  32 + GetList: function() {
33 33 var th = this;
34 34 var url = "/api/weshop/marketing/giftbag/bound/get";
35   - wx.showLoading({
36   - title: '加载中',
37   - })
38 35 getApp().request.promiseGet(url, {
  36 + isShowLoading: true,
39 37 data: {
40 38 "actId": th.data.getActId, //活动id
41 39 "actType": 4, //活动类型 1新人礼 2评价有礼 3节日营销 4生日营销
... ... @@ -44,7 +42,6 @@ Page({
44 42 "userId": d.user_id //用户ID
45 43 }
46 44 }).then(res => {
47   - wx.hideLoading();
48 45 if (res.data.code == 0) {
49 46 if (res.data.data.lbCoupons.length > 0 && res.data.data.lbCoupons != null) {
50 47 //礼包内容--礼券
... ... @@ -93,19 +90,18 @@ Page({
93 90 })
94 91 if (res.data.data.receiveState == 0) {
95 92 th.setData({
96   - receiveState: '一键全部领取'
  93 + receiveState: 0
97 94 })
98 95 } else {
99 96 th.setData({
100   - receiveState: '已领取'
  97 + receiveState: 1
101 98 })
102 99 }
103 100  
104 101 if (res.data.data.actIntro != '') {
105 102 th.setData({
106 103 textShow: true,
107   - textTitle: res.data.data.actIntro.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"').replace(/<section/g, '<div')
108   - .replace(/\/section>/g, '\div>')
  104 + textTitle: res.data.data.actIntro.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
109 105 })
110 106 }
111 107 } else {
... ... @@ -126,9 +122,9 @@ Page({
126 122 onShow: function onShow() {
127 123  
128 124 },
129   - GetReceive: function () {
  125 + GetReceive: function() {
130 126 var th = this;
131   - if (th.data.receiveState == '已领取') {
  127 + if (th.data.receiveState) {
132 128 return false;
133 129 }
134 130 var is_sub = th.data.is_sub; //判断是否重复提交
... ... @@ -136,9 +132,6 @@ Page({
136 132 th.setData({
137 133 is_sub: 1
138 134 })
139   - wx.showLoading({
140   - title: '加载中',
141   - })
142 135 var json = {
143 136 "actId": th.data.getActId, //活动Id
144 137 "actType": 4, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
... ... @@ -148,37 +141,35 @@ Page({
148 141 };
149 142 var data = JSON.stringify(json);
150 143 var url = th.data.url + "/api/weshop/marketing/free/receive/gift/record/insert";
151   - wx.request({
152   - url: url,
153   - data: data,
154   - method: 'post',
155   - header: {
156   - 'content-type': 'application/json'
157   - }, // 设置请求的 header
158   - success: function (res) {
159   - wx.hideLoading();
  144 + getApp().request.json_post(url, json,
  145 + function(res) {
160 146 th.setData({
161 147 is_sub: 0
162 148 })
163 149 if (res.data.code == 0) {
164 150 th.setData({
165   - receiveState: '已领取'
  151 + receiveState: 1
166 152 })
167 153 getApp().my_warnning("领取成功", 1, th);
168 154 } else {
169   - getApp().my_warnning("系统繁忙,请稍后再试", 0, th);
  155 + getApp().my_warnning(res.data.msg, 0, th);
170 156 }
  157 + },
  158 + function(res) {
  159 +
171 160 }
172   - })
  161 +
  162 + )
  163 +
173 164 }
174 165 },
175 166 //界面跳转
176   - goto: function (e) {
  167 + goto: function(e) {
177 168 var url = e.currentTarget.dataset.url;
178 169 getApp().goto(url);
179 170 },
180 171 //图片失败，默认图片
181   - bind_bnerr1: function (e) {
  172 + bind_bnerr1: function(e) {
182 173 var th = this;
183 174 var _errImg = e.target.dataset.errorimg;
184 175 var _Img = e.target.dataset.img;
... ...
pages/giftpack/birthdaygift/birthdaygift.wxml
  View file @7f1c261
... ... @@ -166,9 +166,16 @@
166 166 </view>
167 167 <view class="foot_empty "></view>
168 168 <view class="foot_button">
169   - <view class="{{receiveState=='已领取'?'foot_button_notbuy':'foot_button_buy'}}" bindtap="GetReceive">
170   - <text>{{receiveState}}</text>
171   - </view>
  169 + <block wx:if="{{receiveState}}">
  170 + <view class="foot_button_notbuy">
  171 + <text>已领取</text>
  172 + </view>
  173 + </block>
  174 + <block wx:else>
  175 + <view class="foot_button_buy'}}" bindtap="GetReceive">
  176 + <text>一键领取</text>
  177 + </view>
  178 + </block>
172 179 </view>
173 180 </view>
174 181 <!-- 引入提示组件 -->
... ...
pages/giftpack/evaluategift/evaluategift.js
  View file @7f1c261
... ... @@ -19,7 +19,7 @@ Page({
19 19 getActId: '',
20 20 getActType: '',
21 21 giftBagId: '',
22   - receiveState: '一键全部领取',
  22 + receiveState: 0,
23 23 textTitle: '',
24 24 getUrl: '',
25 25 noShow: false,
... ... @@ -39,6 +39,7 @@ Page({
39 39 })
40 40 var url = "/api/weshop/marketing/giftbag/bound/get";
41 41 getApp().request.promiseGet(url, {
  42 + isShowLoading: true,
42 43 data: {
43 44 "actId": th.data.getActId, //活动Id
44 45 "actType": 2, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
... ... @@ -50,7 +51,6 @@ Page({
50 51 "gifbagid": th.data.giftBagId
51 52 }
52 53 }).then(res => {
53   - wx.hideLoading();
54 54 if (res.data.code == 0) {
55 55 if (res.data.data.lbCoupons.length > 0 && res.data.data.lbCoupons != null) {
56 56 //礼包内容--礼券
... ... @@ -99,11 +99,11 @@ Page({
99 99 })
100 100 if (res.data.data.receiveState == 0) {
101 101 th.setData({
102   - receiveState: '一键全部领取'
  102 + receiveState:0
103 103 })
104 104 } else {
105 105 th.setData({
106   - receiveState: '已领取'
  106 + receiveState: 1
107 107 })
108 108 }
109 109  
... ... @@ -132,8 +132,7 @@ Page({
132 132 if (orderType) {
133 133 th.setData({ orderType: orderType})
134 134 }
135   -
136   -
  135 +
137 136 th.GetList();
138 137 },
139 138 onShow: function() {
... ... @@ -145,7 +144,7 @@ Page({
145 144 },
146 145 GetReceive: function() {
147 146 var th = this;
148   - if (th.data.receiveState == '已领取') {
  147 + if (th.data.receiveState) {
149 148 return false;
150 149 }
151 150 var is_sub = th.data.is_sub; //判断是否重复提交
... ... @@ -166,27 +165,26 @@ Page({
166 165 };
167 166 var data = JSON.stringify(json);
168 167 var url = th.data.url + "/api/weshop/marketing/free/receive/gift/record/insert";
169   - wx.request({
170   - url: url,
171   - data: data,
172   - method: 'post',
173   - header: {
174   - 'content-type': 'application/json'
175   - }, // 设置请求的 header
176   - success: function(res) {
  168 + getApp().request.json_post(url, json,
  169 + function (res) {
177 170 th.setData({
178 171 is_sub: 0
179 172 })
180 173 if (res.data.code == 0) {
181 174 th.setData({
182   - receiveState: '已领取'
  175 + receiveState: 1
183 176 })
184 177 getApp().my_warnning("领取成功", 1, th);
185 178 } else {
186 179 getApp().my_warnning(res.data.msg, 0, th);
187 180 }
  181 + },
  182 + function (res) {
  183 +
188 184 }
189   - })
  185 +
  186 + )
  187 +
190 188 }
191 189 },
192 190 //界面跳转
... ...
pages/giftpack/evaluategift/evaluategift.wxml
  View file @7f1c261
1 1 <view>
2   - <view class="image_box">
3   - <image src="{{iurl+'miniapp/images/giftbag/eval00.png'}}" lazy-load="true"></image>
4   - </view>
5   - <block wx:if="{{itemShow}}">
  2 + <view class="image_box">
  3 + <image src="{{iurl+'miniapp/images/giftbag/eval00.png'}}" lazy-load="true"></image>
  4 + </view>
  5 + <block wx:if="{{itemShow}}">
6 6 <view class="top rel">
7 7 <view class="top_box">
8 8 <view class="top_box_text">
... ... @@ -94,8 +94,13 @@
94 94 <view class="top_card_tite_a">分类限定</view>
95 95 </block>
96 96 </view>
  97 + <block wx:if="{{item.isPack!=null}}">
  98 + <view class="top_card_counte">包邮券</view>
  99 + </block>
  100 + <block>
97 101 <view class="top_card_counte ">{{item.sum+"元券"}}</view>
98 102 <view class="top_card_remak ">{{"满"+item.buySum+"元可以用"}}</view>
  103 + </block>
99 104 </view>
100 105 </view>
101 106 </block>
... ... @@ -161,9 +166,16 @@
161 166 </view>
162 167 <view class="foot_empty "></view>
163 168 <view class="foot_button">
164   - <view class="{{receiveState=='已领取'?'foot_button_notbuy':'foot_button_buy'}}" bindtap="GetReceive">
165   - <text>{{receiveState}}</text>
166   - </view>
  169 + <block wx:if="{{receiveState}}">
  170 + <view class="foot_button_notbuy">
  171 + <text>已领取</text>
  172 + </view>
  173 + </block>
  174 + <block wx:else>
  175 + <view class="foot_button_buy'}}" bindtap="GetReceive">
  176 + <text>一键领取</text>
  177 + </view>
  178 + </block>
167 179 </view>
168 180 </view>
169 181 <!-- 引入提示组件 -->
... ...
pages/giftpack/festival/festival.js 0 → 100644
  View file @7f1c261
  1 +var i = require("../../../utils/util.js")
  2 +var e = getApp(),
  3 + a = e.globalData.setting,
  4 + os = a,
  5 + t = e.request,
  6 + d = e.globalData;
  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 + bimg: "", //评价有礼背景图片
  32 + actFontColor: "", //字体颜色
  33 + actBgColor: "", //背景颜色
  34 + },
  35 + GetList: function() {
  36 + var th = this;
  37 + wx.showLoading({
  38 + title: '加载中',
  39 + })
  40 + var url = "/api/weshop/marketing/giftbag/bound/get";
  41 + getApp().request.promiseGet(url, {
  42 + data: {
  43 + "actId": th.data.getActId, //活动id
  44 + "actType": 3, //活动类型 1新人礼 2评价有礼 3节日营销 4生日营销
  45 + "giftBagId": th.data.giftID, //礼包ID
  46 + "storeId": a.stoid, //商家ID
  47 + "userId": d.user_id //用户ID
  48 + }
  49 + }).then(res => {
  50 + wx.hideLoading();
  51 + if (res.data.code == 0) {
  52 + if (res.data.data.lbCoupons != null && res.data.data.lbCoupons.length > 0) {
  53 + //礼包内容--礼券
  54 + th.setData({
  55 + cardShow: true,
  56 + cards: res.data.data.lbCoupons
  57 + })
  58 + }
  59 + if (res.data.data.lbSM != null && res.data.data.lbSM.length > 0) {
  60 + //礼包内容--服务项目
  61 + th.setData({
  62 + itemShow: true,
  63 + itemWare: res.data.data.lbSM
  64 + })
  65 + }
  66 + //礼包积分
  67 + if (res.data.data.lbIntegral <= 0) {
  68 + if (res.data.data.lbGrowthValue <= 0) {
  69 + th.setData({
  70 + packShow: false
  71 + })
  72 + } else {
  73 + th.setData({
  74 + packShow: false,
  75 + integralShow: false,
  76 + growUpShow: true
  77 + })
  78 + }
  79 +
  80 + } else {
  81 + if (res.data.data.lbGrowthValue > 0) {
  82 + th.setData({
  83 + packShow: true
  84 + })
  85 + } else {
  86 + th.setData({
  87 + packShow: true,
  88 + integralShow: true,
  89 + growUpShow: false
  90 + })
  91 + }
  92 + }
  93 + th.setData({
  94 + integralTitle: '价值' + res.data.data.lbIntegral + '积分',
  95 + growUpTitle: '价值' + res.data.data.lbGrowthValue + '成长值'
  96 + })
  97 + if (res.data.data.receiveState == 0) {
  98 + th.setData({
  99 + receiveState: '一键全部领取'
  100 + })
  101 + } else {
  102 + th.setData({
  103 + receiveState: '已领取'
  104 + })
  105 + }
  106 +
  107 + if (res.data.data.actIntro != '') {
  108 + th.setData({
  109 + textShow: true,
  110 + textTitle: res.data.data.actIntro
  111 + })
  112 + }
  113 + } else {
  114 + getApp().my_warnning(res.data.msg, 0, th);
  115 + return false;
  116 + }
  117 + })
  118 + },
  119 +
  120 + onLoad: function(options) {
  121 + var th = this;
  122 + th.setData({
  123 + getActId: options.actId,
  124 + giftID: options.giftBagId
  125 + })
  126 + th.is_festival();
  127 + th.GetList();
  128 + },
  129 + onShow: function() {
  130 + var th = this;
  131 + var textTitle = th.data.textTitle.replace(/<img/gi, '<img style="max-width:100%;height:auto;float:left;display:block" ');
  132 + th.setData({
  133 + textTitle: textTitle
  134 + })
  135 + },
  136 + GetReceive: function() {
  137 + var th = this;
  138 + wx.showLoading({
  139 + title: '加载中',
  140 + })
  141 + if (th.data.receiveState == '已领取') {
  142 + return false;
  143 + }
  144 + var is_sub = th.data.is_sub; //判断是否重复提交
  145 + if (is_sub == 0) {
  146 + th.setData({
  147 + is_sub: 1
  148 + })
  149 + var json = {
  150 + "actId": th.data.getActId, //活动Id
  151 + "actType": 3, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
  152 + "giftBagId": th.data.giftID, //礼包Id
  153 + "storeId": a.stoid, //商家Id
  154 + "userId": d.user_id //用户ID
  155 + }
  156 + var data = JSON.stringify(json);
  157 + var url = th.data.url + "/api/weshop/marketing/free/receive/gift/record/insert";
  158 + wx.request({
  159 + url: url,
  160 + data: data,
  161 + method: 'post',
  162 + header: {
  163 + 'content-type': 'application/json'
  164 + }, // 设置请求的 header
  165 + success: function(res) {
  166 + wx.hideLoading();
  167 + th.setData({
  168 + is_sub: 0
  169 + })
  170 + if (res.data.code == 0) {
  171 + th.setData({
  172 + receiveState: '已领取'
  173 + })
  174 + getApp().my_warnning("领取成功", 1, th);
  175 + } else {
  176 + getApp().my_warnning("系统繁忙,请稍后再试", 0, th);
  177 + }
  178 + }
  179 + })
  180 + }
  181 + },
  182 + //获取节日有礼信息
  183 + is_festival: function(e) {
  184 + var th = this;
  185 + var url = "/api/weshop/marketing/holiday/act/judge";
  186 + getApp().request.promiseGet(url, {
  187 + data: {
  188 + storeId: a.stoid, //商家ID
  189 + userId: d.user_id //用户ID
  190 + }
  191 + }).then(res => {
  192 + if (res.data.code == 0) {
  193 + th.setData({
  194 + bimg: res.data.data.actBoundImg,
  195 + actFontColor: res.data.data.actFontColor, //字体颜色
  196 + actBgColor: res.data.data.actBgColor, //背景颜色
  197 +
  198 + })
  199 + }
  200 + })
  201 + },
  202 + //界面跳转
  203 + goto: function(e) {
  204 + var url = e.currentTarget.dataset.url;
  205 + getApp().goto(url);
  206 + },
  207 + //图片失败，默认图片
  208 + bind_bnerr1: function(e) {
  209 + var th = this;
  210 + var _errImg = e.target.dataset.errorimg;
  211 + var _Img = e.target.dataset.img;
  212 + if (_Img != undefined) {
  213 + var _errObj = {};
  214 + _errObj[_errImg] = "/miniapp/images/giftbag/gift02.png";
  215 + th.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
  216 + }
  217 + },
  218 +});
0 219 \ No newline at end of file
... ...
pages/giftpack/festival/festival.json 0 → 100644
  View file @7f1c261
  1 +{
  2 + "navigationBarTitleText": "节日有礼",
  3 + "usingComponents": {
  4 + "warn": "/components/long_warn/long_warn",
  5 + "my_confirm": "/components/my_confirm/my_confirm"
  6 + }
  7 +}
0 8 \ No newline at end of file
... ...
pages/giftpack/festival/festival.wxml 0 → 100644
  View file @7f1c261
  1 +<view style="background-color:{{actBgColor==undefined?'#FFB72D':actBgColor}}">
  2 + <view class="image_box">
  3 + <image src="{{iurl+bimg}}" lazy-load="true"></image>
  4 + </view>
  5 + <block wx:if="{{itemShow}}">
  6 + <view class="top rel">
  7 + <view class="top_box">
  8 + <view class="top_box_text">
  9 + <text style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">______</text>
  10 + </view>
  11 + <view class="top_box_text">
  12 + <text style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">新人专享\n你的美丽我来缔造</text>
  13 + </view>
  14 + <view class="top_box_text">
  15 + <text style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">______</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" style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">
  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 class="num flex-level-right fs26" style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">
  47 + <view>数量：</view>
  48 + <view>{{item.num}}</view>
  49 + </view>
  50 + </view>
  51 + </view>
  52 + </view>
  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>
  58 + </view>
  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 style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">———</text>
  68 + </view>
  69 + <view class="top_box_text ">
  70 + <text style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">新人专享优惠券</text>
  71 + </view>
  72 + <view class="top_box_text ">
  73 + <text style="color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">———</text>
  74 + </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>
  109 + </view>
  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>
  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 style="background-color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">{{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 style="background-color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">{{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" style="background-color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">进入商城购物</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" style="background-color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">
  165 + <text>{{receiveState}}</text>
  166 + </view>
  167 + </view>
  168 +</view>
  169 +<!-- 引入提示组件 -->
  170 +<warn id="warn"></warn>
  171 +<my_confirm id="my_confirm"></my_confirm>
0 172 \ No newline at end of file
... ...
pages/giftpack/festival/festival.wxss 0 → 100644
  View file @7f1c261
  1 +@charset "UTF-8";
  2 +
  3 +/* Author XGQ
  4 + * 2019-10-27
  5 + */
  6 +
  7 +.image_box {
  8 + -webkit-box-pack: center;
  9 + -webkit-justify-content: center;
  10 + justify-content: center;
  11 +}
  12 +
  13 +.image_box image {
  14 + width: 100%;
  15 + height: 690rpx;
  16 +}
  17 +
  18 +.top {
  19 + margin: -20rpx 28rpx 45rpx 28rpx;
  20 + padding: 10rpx 10rpx 70rpx 10rpx;
  21 + background-color: #fff;
  22 + border-radius: 0rpx 0rpx 15rpx 15rpx;
  23 +}
  24 +
  25 +.top_box {
  26 + display: -webkit-box;
  27 + display: -webkit-flex;
  28 + display: flex;
  29 + text-align: center;
  30 + -webkit-box-pack: center;
  31 + -webkit-justify-content: center;
  32 + justify-content: center;
  33 +}
  34 +
  35 +.top_box_text {
  36 + -webkit-box-pack: center;
  37 + -webkit-justify-content: center;
  38 + justify-content: center;
  39 + margin: 50rpx 15rpx 20rpx 15rpx;
  40 +}
  41 +
  42 +.top_box_text text {
  43 + color: #FFB72D;
  44 + font-size: 40rpx;
  45 +}
  46 +
  47 +.top_item {
  48 + display: -webkit-box;
  49 + display: -webkit-flex;
  50 + display: flex;
  51 + width: 100%;
  52 + margin: 60rpx 0 0 0;
  53 +}
  54 +
  55 +.top_item_img {
  56 + float: left;
  57 + width: 28%;
  58 + margin: 0rpx 10rpx 0rpx 20rpx;
  59 +}
  60 +
  61 +.top_item_img image {
  62 + width: 150rpx;
  63 + height: 150rpx;
  64 + border-radius: 50%;
  65 + border: #f96865 solid 3rpx;
  66 +}
  67 +
  68 +.top_item_center {
  69 + float: left;
  70 + width: 50%;
  71 +}
  72 +
  73 +.top_item_center_title {
  74 + font-size: 35rpx;
  75 + color: #FFB72D;
  76 + -webkit-box-pack: start;
  77 + -webkit-justify-content: flex-start;
  78 + justify-content: flex-start;
  79 + padding: 0 10rpx 15rpx 0rpx;
  80 + word-break: break-all;
  81 + /*属性规定自动换行的处理方法。normal(使用浏览器默认的换行规则。),break-all(允许在单词内换行。),keep-all(只能在半角空格或连字符处换行。)*/
  82 + text-overflow: ellipsis;
  83 + display: -webkit-box;
  84 + /** 对象作为伸缩盒子模型显示 **/
  85 + -webkit-box-orient: vertical;
  86 + /** 设置或检索伸缩盒对象的子元素的排列方式 **/
  87 + -webkit-line-clamp: 2;
  88 + /** 显示的行数 **/
  89 + overflow: hidden;
  90 + /** 隐藏超出的内容 **/
  91 +}
  92 +
  93 +.top_item_center_ramke {
  94 + font-size: 25rpx;
  95 + -webkit-box-pack: start;
  96 + -webkit-justify-content: flex-start;
  97 + justify-content: flex-start;
  98 + line-height: 35rpx;
  99 + letter-spacing: 0.5rpx;
  100 + word-break: break-all;
  101 + /*属性规定自动换行的处理方法。normal(使用浏览器默认的换行规则。),break-all(允许在单词内换行。),keep-all(只能在半角空格或连字符处换行。)*/
  102 + text-overflow: ellipsis;
  103 + display: -webkit-box;
  104 + /** 对象作为伸缩盒子模型显示 **/
  105 + -webkit-box-orient: vertical;
  106 + /** 设置或检索伸缩盒对象的子元素的排列方式 **/
  107 + -webkit-line-clamp: 2;
  108 + /** 显示的行数 **/
  109 + overflow: hidden;
  110 + /** 隐藏超出的内容 **/
  111 +}
  112 +
  113 +.top_item_button {
  114 + float: right;
  115 + width: 22%;
  116 + padding: 65rpx 20rpx 0 1rpx;
  117 +}
  118 +
  119 +.top_item_button button {
  120 + font-size: 25rpx;
  121 + background: #fd6969;
  122 + color: #fff;
  123 + border-radius: 50rpx;
  124 + height: 45rpx;
  125 + line-height: 45rpx;
  126 +}
  127 +
  128 +.top_card {
  129 + width: calc(50% - 30rpx);
  130 + display: inline-block;
  131 + margin: 15rpx;
  132 +}
  133 +
  134 +.top_card_box {
  135 + background-size: cover;
  136 + background-position: center;
  137 + background-repeat: no-repeat;
  138 + border-radius: 20rpx;
  139 + height: 250rpx;
  140 + margin: 5rpx;
  141 +}
  142 +
  143 +.img1 {
  144 + background-image: url(https://mshopimg.yolipai.net/miniapp/images/giftbag/vip01.png);
  145 +}
  146 +
  147 +.img2 {
  148 + background-image: url(https://mshopimg.yolipai.net/miniapp/images/giftbag/vip02.png);
  149 +}
  150 +
  151 +.img3 {
  152 + background-image: url(https://mshopimg.yolipai.net/miniapp/images/giftbag/vip03.png);
  153 +}
  154 +
  155 +.top_card_tite_box {
  156 + width: 100%;
  157 + display: -webkit-box;
  158 + display: -webkit-flex;
  159 + display: flex;
  160 + -webkit-box-pack: end;
  161 + -webkit-justify-content: flex-end;
  162 + justify-content: flex-end;
  163 +}
  164 +
  165 +.top_card_tite_a {
  166 + padding: 5rpx 25rpx 5rpx 25rpx;
  167 + line-height: 29rpx;
  168 + font-size: 25rpx;
  169 + color: #fff;
  170 + background: #ffa7c0;
  171 + border-radius: 0rpx 20rpx 0rpx 6rpx;
  172 +}
  173 +
  174 +.top_card_tite_b {
  175 + padding: 5rpx 25rpx 5rpx 25rpx;
  176 + line-height: 29rpx;
  177 + font-size: 25rpx;
  178 + color: #fff;
  179 + background: #50dfdb;
  180 + border-radius: 0rpx 20rpx 0rpx 6rpx;
  181 +}
  182 +
  183 +.top_card_tite_c {
  184 + padding: 5rpx 25rpx 5rpx 25rpx;
  185 + line-height: 29rpx;
  186 + font-size: 25rpx;
  187 + color: #fff;
  188 + background: #92cbff;
  189 + border-radius: 0rpx 20rpx 0rpx 6rpx;
  190 +}
  191 +
  192 +.top_card_tite_d {
  193 + padding: 5rpx 25rpx 5rpx 25rpx;
  194 + line-height: 29rpx;
  195 + font-size: 25rpx;
  196 + color: #fff;
  197 + border-radius: 0rpx 20rpx 0rpx 6rpx;
  198 +}
  199 +
  200 +.top_card_counte {
  201 + padding: 40rpx 20rpx 0 0;
  202 + text-align: center;
  203 + display: -webkit-box;
  204 + display: -webkit-flex;
  205 + display: flex;
  206 + -webkit-box-pack: center;
  207 + -webkit-justify-content: center;
  208 + justify-content: center;
  209 + -webkit-box-align: center;
  210 + -webkit-align-items: center;
  211 + align-items: center;
  212 + color: #fff;
  213 + font-size: 40rpx;
  214 +}
  215 +
  216 +.top_card_remak {
  217 + padding: 20rpx 0 40rpx 0;
  218 + text-align: center;
  219 + display: -webkit-box;
  220 + display: -webkit-flex;
  221 + display: flex;
  222 + -webkit-box-pack: center;
  223 + -webkit-justify-content: center;
  224 + justify-content: center;
  225 + -webkit-box-align: center;
  226 + -webkit-align-items: center;
  227 + align-items: center;
  228 + font-size: 20rpx;
  229 + color: #fff;
  230 +}
  231 +
  232 +.top_card_button_a button {
  233 + margin: 0 85rpx;
  234 + background: #ffa6bc;
  235 + border-radius: 50rpx;
  236 + line-height: 40rpx;
  237 + height: 40rpx;
  238 + color: white;
  239 + font-size: 25rpx;
  240 +}
  241 +
  242 +.top_card_button_b button {
  243 + margin: 0 85rpx;
  244 + background: #50dfdb;
  245 + border-radius: 50rpx;
  246 + line-height: 40rpx;
  247 + height: 40rpx;
  248 + color: white;
  249 + font-size: 25rpx;
  250 +}
  251 +
  252 +.top_card_button_c button {
  253 + margin: 0 85rpx;
  254 + background: #75bcfc;
  255 + border-radius: 50rpx;
  256 + line-height: 40rpx;
  257 + height: 40rpx;
  258 + color: white;
  259 + font-size: 25rpx;
  260 +}
  261 +
  262 +.top_card_button_d button {
  263 + margin: 0 85rpx;
  264 + border-radius: 50rpx;
  265 + line-height: 40rpx;
  266 + height: 40rpx;
  267 + color: white;
  268 + font-size: 25rpx;
  269 +}
  270 +
  271 +.top_box_image {
  272 + padding: 20rpx 20rpx 20rpx 20rpx;
  273 +}
  274 +
  275 +.top_box_image image {
  276 + height: 216rpx;
  277 + width: 100%;
  278 +}
  279 +
  280 +.top_box_image button {
  281 + margin: 15rpx 95rpx 0rpx 95rpx;
  282 + background: rgb(254,182,44);
  283 + border-radius: 50rpx;
  284 + line-height: 60rpx;
  285 + height: 60rpx;
  286 + color: white;
  287 + font-size: 30rpx;
  288 +}
  289 +
  290 +.foot_box {
  291 + margin: 0 30rpx 40rpx 30rpx;
  292 + background: #fff;
  293 + border-radius: 20rpx;
  294 +}
  295 +
  296 +.foot_box_title {
  297 + color: #000;
  298 + padding: 20rpx 30rpx 20rpx 30rpx;
  299 +}
  300 +
  301 +.foot_box_text {
  302 + font-size: 30rpx;
  303 + color: #000;
  304 + line-height: 48rpx;
  305 + padding: 20rpx 35rpx 50rpx 30rpx;
  306 +}
  307 +
  308 +.button_box {
  309 + margin: 50rpx 50rpx 50rpx 50rpx;
  310 + text-align: center;
  311 +}
  312 +
  313 +.button {
  314 + margin: 0 30rpx;
  315 + background: #FFDB97;
  316 + border-radius: 50rpx;
  317 + line-height: 80rpx;
  318 + height: 80rpx;
  319 + color: white;
  320 + font-size: 35rpx;
  321 +}
  322 +
  323 +.button_text {
  324 + padding-top: 20rpx;
  325 + font-size: 20rpx;
  326 + color: white;
  327 + height: 100rpx;
  328 +}
  329 +
  330 +.foot_empty {
  331 + height: 90rpx;
  332 +}
  333 +
  334 +.foot_button {
  335 + display: -webkit-box;
  336 + display: -webkit-flex;
  337 + display: flex;
  338 + margin: 20rpx 0rpx 0rpx 0rpx;
  339 + padding: 25rpx 0rpx;
  340 + background: #fff;
  341 + text-align: center;
  342 + -webkit-box-pack: center;
  343 + -webkit-justify-content: center;
  344 + justify-content: center;
  345 + position: fixed;
  346 + bottom: 0;
  347 + left: 0;
  348 + width: 100%;
  349 + z-index: 10;
  350 +}
  351 +
  352 +.foot_button_buy {
  353 + background: #FFB72D;
  354 + color: #fff;
  355 + width: 400rpx;
  356 + height: 70rpx;
  357 + font-size: 28rpx;
  358 + line-height: 70rpx;
  359 + border-radius: 40rpx;
  360 +}
  361 +
  362 +.foot_button_notbuy {
  363 + background: #999;
  364 + color: #fff;
  365 + width: 400rpx;
  366 + height: 70rpx;
  367 + font-size: 28rpx;
  368 + line-height: 70rpx;
  369 + border-radius: 40rpx;
  370 +}
  371 +
  372 +/* page {
  373 + background-color: #FFB72D;
  374 +} */
  375 +
  376 +button::after {
  377 + border: none;
  378 +}
  379 +
  380 +.foot_box_text ._img {
  381 + width: 100%;
  382 +}
  383 +
  384 +.foot_box_text .img {
  385 + line-height: 0;
  386 +}
  387 +
  388 +.image {
  389 + width: 400rpx;
  390 + height: 200rpx;
  391 +}
  392 +
  393 +.num {
  394 + color: #FFB72D;
  395 +}
  396 +
  397 +.lvip {
  398 + left: 30rpx;
  399 + bottom: -58rpx;
  400 + width: 20rpx;
  401 + height: 90rpx;
  402 + z-index: 5;
  403 +}
  404 +
  405 +.rvip {
  406 + right: 30rpx;
  407 + bottom: -58rpx;
  408 + width: 20rpx;
  409 + height: 90rpx;
  410 + z-index: 5;
  411 +}
... ...
pages/user/assistance/giftpacklist.js
  View file @7f1c261
... ... @@ -228,7 +228,7 @@ Page({
228 228 },
229 229 function(res) {
230 230  
231   - }, "post"
  231 + }
232 232  
233 233 )
234 234  
... ...
pages/user/assistance/giftpacklist.wxml
  View file @7f1c261
... ... @@ -119,7 +119,7 @@
119 119 <view wx:if="{{c_state==0}}" class="foot_button_buy data-v-3a5b7e36" bindtap="getcode">
120 120 <text class="data-v-3a5b7e36">立即使用</text>
121 121 </view>
122   - <view wx:if="{{c_state==1}}" class="foot_button_buy data-v-3a5b7e36 overdue">
  122 + <view wx:if="{{c_state==1}}" class="foot_button_buy data-v-3a5b7e36 overdue" bindtap="getcode">
123 123 <text class="data-v-3a5b7e36">商品已核销</text>
124 124 </view>
125 125 <view wx:if="{{c_state==2}}" class="foot_button_buy data-v-3a5b7e36 overdue">
... ...