Commit 891080d874f250669d9c1b8de59143b67fc56fff
Merge branch 'qa' of http://git.vipzhuang.cn/wxd/MShopWeApp
Showing
7 changed files
with
151 additions
and
77 deletions
packageD/pages/user/member/bring/bring.js
@@ -7,6 +7,8 @@ var t = getApp(), | @@ -7,6 +7,8 @@ var t = getApp(), | ||
7 | s = require("../../../../../utils/common.js"); | 7 | s = require("../../../../../utils/common.js"); |
8 | var regeneratorRuntime = require('../../../../../utils/runtime.js'); | 8 | var regeneratorRuntime = require('../../../../../utils/runtime.js'); |
9 | var oo = t.globalData.setting; | 9 | var oo = t.globalData.setting; |
10 | + | ||
11 | + | ||
10 | Page({ | 12 | Page({ |
11 | /** | 13 | /** |
12 | * 页面的初始数据 | 14 | * 页面的初始数据 |
@@ -25,7 +27,7 @@ Page({ | @@ -25,7 +27,7 @@ Page({ | ||
25 | cardInfo: '', | 27 | cardInfo: '', |
26 | user_infor: {}, //获取初始对象 | 28 | user_infor: {}, //获取初始对象 |
27 | needmon:0, | 29 | needmon:0, |
28 | - distribut_min:0 | 30 | + distribut_min:0, |
29 | }, | 31 | }, |
30 | // 银行卡失去焦点事件 | 32 | // 银行卡失去焦点事件 |
31 | blurInputEvent: function(e) { | 33 | blurInputEvent: function(e) { |
@@ -55,6 +57,16 @@ Page({ | @@ -55,6 +57,16 @@ Page({ | ||
55 | }, | 57 | }, |
56 | /*点击确定提现后表现的形式*/ | 58 | /*点击确定提现后表现的形式*/ |
57 | Gettime: function(e) { | 59 | Gettime: function(e) { |
60 | + var th=this; | ||
61 | + var user_info=getApp().globalData.userInfo; | ||
62 | + //提现是零钱的时候,同时是发红包的时候 | ||
63 | + if(this.data.current==2 && parseInt(this.data.tx_wx_type)==2){ | ||
64 | + if(!user_info.openid){ | ||
65 | + ut.m_toast("未绑定公众号微会员,无法提现!"); | ||
66 | + return false | ||
67 | + } | ||
68 | + } | ||
69 | + | ||
58 | var user_money = this.data.user_money; | 70 | var user_money = this.data.user_money; |
59 | var money = e.detail.value.moneys; //typeof判断数据类型 | 71 | var money = e.detail.value.moneys; //typeof判断数据类型 |
60 | var current = this.data.current; | 72 | var current = this.data.current; |
@@ -186,6 +198,13 @@ Page({ | @@ -186,6 +198,13 @@ Page({ | ||
186 | 198 | ||
187 | // 提现 | 199 | // 提现 |
188 | Cashwithdrawal: function(user_infor) { | 200 | Cashwithdrawal: function(user_infor) { |
201 | + | ||
202 | + | ||
203 | + if(this.data.tx_ing) return false; | ||
204 | + this.data.tx_ing=1; | ||
205 | + | ||
206 | + var th=this; | ||
207 | + | ||
189 | delete user_infor.rmon; | 208 | delete user_infor.rmon; |
190 | delete user_infor.isck; | 209 | delete user_infor.isck; |
191 | delete user_infor.needmon; | 210 | delete user_infor.needmon; |
@@ -204,6 +223,8 @@ Page({ | @@ -204,6 +223,8 @@ Page({ | ||
204 | 'content-type': 'application/json' | 223 | 'content-type': 'application/json' |
205 | }, // 设置请求的 header | 224 | }, // 设置请求的 header |
206 | success: function(res) { | 225 | success: function(res) { |
226 | + | ||
227 | + th.data.tx_ing=0; | ||
207 | if (res.data.code != -1) { | 228 | if (res.data.code != -1) { |
208 | wx.navigateTo({ | 229 | wx.navigateTo({ |
209 | url: 'msg/msg', | 230 | url: 'msg/msg', |
@@ -353,8 +374,9 @@ Page({ | @@ -353,8 +374,9 @@ Page({ | ||
353 | var json_d = JSON.parse(e.switch_list); | 374 | var json_d = JSON.parse(e.switch_list); |
354 | var is_closetxbank=json_d.is_closetxbank; | 375 | var is_closetxbank=json_d.is_closetxbank; |
355 | var is_tx_wx=json_d.is_tx_wx; | 376 | var is_tx_wx=json_d.is_tx_wx; |
377 | + var tx_wx_type=json_d.tx_wx_type; | ||
356 | var data={ | 378 | var data={ |
357 | - is_closetxbank:is_closetxbank,is_tx_wx:is_tx_wx | 379 | + is_closetxbank:is_closetxbank,is_tx_wx:is_tx_wx,tx_wx_type:tx_wx_type |
358 | }; | 380 | }; |
359 | if(is_closetxbank) data.current=2; | 381 | if(is_closetxbank) data.current=2; |
360 | th.setData(data); | 382 | th.setData(data); |
@@ -402,12 +424,11 @@ Page({ | @@ -402,12 +424,11 @@ Page({ | ||
402 | 424 | ||
403 | }, | 425 | }, |
404 | 426 | ||
405 | - | ||
406 | - | ||
407 | /** | 427 | /** |
408 | * 用户点击右上角分享 | 428 | * 用户点击右上角分享 |
409 | */ | 429 | */ |
410 | onShareAppMessage: function() { | 430 | onShareAppMessage: function() { |
411 | getApp().globalData.no_clear=1; | 431 | getApp().globalData.no_clear=1; |
412 | } | 432 | } |
433 | + | ||
413 | }) | 434 | }) |
414 | \ No newline at end of file | 435 | \ No newline at end of file |
packageE/pages/qy/contactMe/contactMe.js
@@ -171,7 +171,7 @@ Page({ | @@ -171,7 +171,7 @@ Page({ | ||
171 | // }) | 171 | // }) |
172 | let openuserid = this.data.openuserid | 172 | let openuserid = this.data.openuserid |
173 | let skip_verify = this.data.skip_verify ? true : false | 173 | let skip_verify = this.data.skip_verify ? true : false |
174 | - let res = await getApp().request.promisePost(`/apib/weshop/admin/qyWeChat/qyWeChatCorpInfo/postAdminQyApi?accdb=${this.data.store.erpid}&url=externalcontact/add_contact_way`, { | 174 | + let res = await getApp().request.promisePost(`/apib/weshop/admin/qyWeChat/qyWeChatCorpInfo/postAdminQyApi?accdb=${this.data.store.erpid}&url=externalcontact/add_contact_way&qyid=4`, { |
175 | data: { | 175 | data: { |
176 | // accdb: getApp().globalData.config.erpid, | 176 | // accdb: getApp().globalData.config.erpid, |
177 | // ApiName: 'api.pos.shop.advancesum.seek', | 177 | // ApiName: 'api.pos.shop.advancesum.seek', |
@@ -232,66 +232,77 @@ Page({ | @@ -232,66 +232,77 @@ Page({ | ||
232 | return app.my_warnning("登录需要授权手机号码!", 0, this); | 232 | return app.my_warnning("登录需要授权手机号码!", 0, this); |
233 | return false; | 233 | return false; |
234 | } | 234 | } |
235 | + let that =this; | ||
236 | + let req_data = { | ||
237 | + js_code:e.code, | ||
238 | + store_id:getApp().globalData.setting.stoid, | ||
239 | + } | ||
240 | + getApp().request.promiseGet('/api/weshop/users/getCodeMobile',{data:req_data}).then(res=>{ | ||
235 | 241 | ||
236 | - var that =this; | ||
237 | - app.request.get("/api/weshop/manager/managerConfig/get", { | ||
238 | - data: { | ||
239 | - storeId: getApp().globalData.setting.stoid | ||
240 | - }, | ||
241 | - success: function (res2) { | ||
242 | - if (res2.data.code == 0) { | ||
243 | - var sessionKey = getApp().globalData.sessionKey; | ||
244 | - if (res2.data.data.is_newphone == 1) { | ||
245 | - | ||
246 | - var req_data = { | ||
247 | - sessionKey: sessionKey, | ||
248 | - code: e.code, | ||
249 | - isNewPhone: 1, | ||
250 | - store_id: getApp().globalData.setting.stoid, | ||
251 | - } | ||
252 | - }else{ | ||
253 | - var req_data = { | ||
254 | - sessionKey: sessionKey, | ||
255 | - encryptedData: e.encryptedData, | ||
256 | - iv: e.iv, | ||
257 | - store_id: getApp().globalData.setting.stoid, | ||
258 | - } | ||
259 | - } | ||
260 | - | ||
261 | - | ||
262 | - //-- 获取一下手机 --/api/weshop/users/getCodeMobile?store_id=1&js_code=b8451556dd98b2eebec5aa6775625bce192a68fc1a4b15b0c6bf3ed046f90da4 | ||
263 | - getApp().request.promiseGet("/api/weshop/users/getmobile", { data: req_data }).then(res => { | ||
264 | - // console.log('手机号码'); | ||
265 | - // console.log(res); | ||
266 | - if (res.data.code == 0) { | ||
267 | - let resdata = res.data.data; | ||
268 | - that.setData({ | ||
269 | - phone: resdata | ||
270 | - }) | ||
271 | - that.befgetqy() | ||
272 | - // getApp().globalData.zc_dd = dd; | ||
273 | - // wx.redirectTo({ | ||
274 | - // url: "/packageA/pages/profile/profile?is_back=1" | ||
275 | - // }) | ||
276 | - } | 242 | + if (res.data.code==0) { |
243 | + this.setData({ | ||
244 | + phone:res.data.data | ||
277 | }) | 245 | }) |
278 | - // var sessionKey = getApp().globalData.sessionKey; | ||
279 | - // var openid = getApp().globalData.openid; | ||
280 | - // var r = getApp().globalData.getu; | ||
281 | - // this.save_the_data(r, e, sessionKey, openid) | ||
282 | - | ||
283 | - | ||
284 | - } else { | 246 | + this.befgetqy() |
247 | + }else { | ||
285 | return app.my_warnning("授权登入失败,请稍后再试!", 0, that); | 248 | return app.my_warnning("授权登入失败,请稍后再试!", 0, that); |
286 | } | 249 | } |
287 | }, | 250 | }, |
288 | - failStatus: function (t) { | ||
289 | - return app.my_warnning("授权登入失败,请稍后再试!", 0, that); | ||
290 | - }, | ||
291 | - fail: function (t) { | ||
292 | - return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1; | ||
293 | - } | ||
294 | - }); | 251 | + ); |
252 | + | ||
253 | + // app.request.get("/api/weshop/manager/managerConfig/get", { | ||
254 | + // data: { | ||
255 | + // storeId: getApp().globalData.setting.stoid | ||
256 | + // }, | ||
257 | + // success: function (res2) { | ||
258 | + // if (res2.data.code == 0) { | ||
259 | + // var sessionKey = getApp().globalData.sessionKey; | ||
260 | + // if (res2.data.data.is_newphone == 1) { | ||
261 | + | ||
262 | + // var req_data = { | ||
263 | + // sessionKey: sessionKey, | ||
264 | + // code: e.code, | ||
265 | + // isNewPhone: 1, | ||
266 | + // store_id: getApp().globalData.setting.stoid, | ||
267 | + // } | ||
268 | + // }else{ | ||
269 | + // var req_data = { | ||
270 | + // sessionKey: sessionKey, | ||
271 | + // encryptedData: e.encryptedData, | ||
272 | + // iv: e.iv, | ||
273 | + // store_id: getApp().globalData.setting.stoid, | ||
274 | + // } | ||
275 | + // } | ||
276 | + | ||
277 | + // debugger | ||
278 | + // //-- 获取一下手机 --/api/weshop/users/getCodeMobile?store_id=1&js_code=b8451556dd98b2eebec5aa6775625bce192a68fc1a4b15b0c6bf3ed046f90da4 | ||
279 | + // getApp().request.promiseGet("/api/weshop/users/getmobile", { data: req_data }).then(res => { | ||
280 | + // debugger | ||
281 | + // if (res.data.code == 0) { | ||
282 | + // let resdata = res.data.data; | ||
283 | + // that.setData({ | ||
284 | + // phone: resdata | ||
285 | + // }) | ||
286 | + // that.befgetqy() | ||
287 | + // } | ||
288 | + // }) | ||
289 | + // // var sessionKey = getApp().globalData.sessionKey; | ||
290 | + // // var openid = getApp().globalData.openid; | ||
291 | + // // var r = getApp().globalData.getu; | ||
292 | + // // this.save_the_data(r, e, sessionKey, openid) | ||
293 | + | ||
294 | + | ||
295 | + // } else { | ||
296 | + // return app.my_warnning("授权登入失败,请稍后再试!", 0, that); | ||
297 | + // } | ||
298 | + // }, | ||
299 | + // failStatus: function (t) { | ||
300 | + // return app.my_warnning("授权登入失败,请稍后再试!", 0, that); | ||
301 | + // }, | ||
302 | + // fail: function (t) { | ||
303 | + // return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1; | ||
304 | + // } | ||
305 | + // }); | ||
295 | 306 | ||
296 | }, | 307 | }, |
297 | async befgetqy() { | 308 | async befgetqy() { |
packageE/pages/togoin/togoin.js
@@ -312,12 +312,12 @@ Page({ | @@ -312,12 +312,12 @@ Page({ | ||
312 | } | 312 | } |
313 | }) | 313 | }) |
314 | } else { | 314 | } else { |
315 | - this.setData({ sub: 1 }); | 315 | + th.setData({ sub: 1 }); |
316 | wx.showLoading({ | 316 | wx.showLoading({ |
317 | title: '处理中.', | 317 | title: '处理中.', |
318 | mask: true | 318 | mask: true |
319 | }) | 319 | }) |
320 | - this.zu_ce(dd); //调用注册的函数 | 320 | + th.zu_ce(dd); //调用注册的函数 |
321 | } | 321 | } |
322 | } | 322 | } |
323 | 323 |
pages/user/index/index.js
@@ -50,7 +50,8 @@ Page({ | @@ -50,7 +50,8 @@ Page({ | ||
50 | 50 | ||
51 | is_show_recommend:false, | 51 | is_show_recommend:false, |
52 | 52 | ||
53 | - has_rj:0 | 53 | + has_rj:0, |
54 | + rfmName:'成长值' | ||
54 | 55 | ||
55 | }, | 56 | }, |
56 | goto_nav: function (e) { | 57 | goto_nav: function (e) { |
@@ -234,7 +235,10 @@ Page({ | @@ -234,7 +235,10 @@ Page({ | ||
234 | 235 | ||
235 | s.setData({ | 236 | s.setData({ |
236 | userInfo: e | 237 | userInfo: e |
237 | - }); | 238 | + }); |
239 | + | ||
240 | + //--查询会员权益是否成绩 | ||
241 | + s.getVison() | ||
238 | 242 | ||
239 | //-- 要调用接口,获取卡的钱 -- | 243 | //-- 要调用接口,获取卡的钱 -- |
240 | var url = "/api/weshop/wxuser/getWxCardInfo?storeId=" + os.stoid + "&userId=" + e.user_id; | 244 | var url = "/api/weshop/wxuser/getWxCardInfo?storeId=" + os.stoid + "&userId=" + e.user_id; |
@@ -510,7 +514,29 @@ Page({ | @@ -510,7 +514,29 @@ Page({ | ||
510 | 514 | ||
511 | 515 | ||
512 | 516 | ||
513 | - }, | 517 | + }, |
518 | + //获取会员权益等级是否升级 | ||
519 | + getVison(){ | ||
520 | + let isRfm = wx.getStorageSync('isRfm') | ||
521 | + if (isRfm) { | ||
522 | + this.setData({ | ||
523 | + rfmName:'综合分' | ||
524 | + }) | ||
525 | + }else{ | ||
526 | + rq.get(`/api/weshop/users/grade/vip/getSysPara?storeId=${os.stoid}&classInfo=IsUpRMF`, { | ||
527 | + success: (res)=>{ | ||
528 | + console.log('会员权益等级升级查询-------'); | ||
529 | + console.log(res); | ||
530 | + if (res.data.code == 0 && res.data.data && res.data.data.IsBool){ | ||
531 | + this.setData({ | ||
532 | + rfmName:'综合分' | ||
533 | + }) | ||
534 | + wx.setStorageSync('isRfm', true) | ||
535 | + } | ||
536 | + } | ||
537 | + }) | ||
538 | + } | ||
539 | + }, | ||
514 | 540 | ||
515 | //判断会员是后有改服务项目 | 541 | //判断会员是后有改服务项目 |
516 | check_is_has_qy: function (item, g_qy_list) { | 542 | check_is_has_qy: function (item, g_qy_list) { |
@@ -865,7 +891,12 @@ Page({ | @@ -865,7 +891,12 @@ Page({ | ||
865 | }, | 891 | }, |
866 | 892 | ||
867 | jump: function () { | 893 | jump: function () { |
868 | - getApp().goto("/packageE/pages/user/grow_value/grow_value") | 894 | + let isRfm = wx.getStorageSync('isRfm') |
895 | + //升级为RFM就不跳转成长值详情 | ||
896 | + if (!isRfm) { | ||
897 | + getApp().goto("/packageE/pages/user/grow_value/grow_value") | ||
898 | + } | ||
899 | + | ||
869 | }, | 900 | }, |
870 | // 判断生日营销的页面是不是存在 | 901 | // 判断生日营销的页面是不是存在 |
871 | birthday: function () { | 902 | birthday: function () { |
pages/user/index/index.wxml
@@ -19,12 +19,12 @@ | @@ -19,12 +19,12 @@ | ||
19 | <view class="flex fs24 xc-grow-ups" style="margin-left:8rpx;margin-top:6rpx" wx:if="{{is_init && gradeId}}" bindtap='jump'> | 19 | <view class="flex fs24 xc-grow-ups" style="margin-left:8rpx;margin-top:6rpx" wx:if="{{is_init && gradeId}}" bindtap='jump'> |
20 | <block wx:if="{{cz_val<full_cz_val}}"> | 20 | <block wx:if="{{cz_val<full_cz_val}}"> |
21 | {{" "}} | 21 | {{" "}} |
22 | - <text class="grow-up-val" style="background:{{usertop_ad.bgcolor?usertop_ad.bgcolor:'#fe9db5'}};">成长值</text> | 22 | + <text class="grow-up-val" style="background:{{usertop_ad.bgcolor?usertop_ad.bgcolor:'#fe9db5'}};">{{rfmName}}</text> |
23 | <view style='margin-left:5rpx; '>{{cz_val}} / {{need_money}}</view> | 23 | <view style='margin-left:5rpx; '>{{cz_val}} / {{need_money}}</view> |
24 | </block> | 24 | </block> |
25 | <block wx:else> | 25 | <block wx:else> |
26 | {{" "}} | 26 | {{" "}} |
27 | - <text class="grow-up-val" style="background:{{usertop_ad.bgcolor?usertop_ad.bgcolor:'#fe9db5'}};">成长值</text> {{cz_val}} | 27 | + <text class="grow-up-val" style="background:{{usertop_ad.bgcolor?usertop_ad.bgcolor:'#fe9db5'}};">{{rfmName}}</text> {{cz_val}} |
28 | </block> | 28 | </block> |
29 | </view> | 29 | </view> |
30 | </view> | 30 | </view> |
@@ -44,7 +44,7 @@ | @@ -44,7 +44,7 @@ | ||
44 | <view style="font-size:12px;color: #fff;">会员卡</view> | 44 | <view style="font-size:12px;color: #fff;">会员卡</view> |
45 | </view> | 45 | </view> |
46 | <view class="flex-vertical abs xc-grow-frame rel" style="display: none"> | 46 | <view class="flex-vertical abs xc-grow-frame rel" style="display: none"> |
47 | - <view class="xc-grow-up">成长值</view> | 47 | + <view class="xc-grow-up">{{rfmName}}</view> |
48 | 48 | ||
49 | <view class="xc-line-not rel"> | 49 | <view class="xc-line-not rel"> |
50 | <image class="xc-bj-img abs" src="{{iurl}}/miniapp/images/baijing.png"></image> | 50 | <image class="xc-bj-img abs" src="{{iurl}}/miniapp/images/baijing.png"></image> |
pages/user/userqy/userqy.js
@@ -26,7 +26,7 @@ Page({ | @@ -26,7 +26,7 @@ Page({ | ||
26 | this_curr_id:0, | 26 | this_curr_id:0, |
27 | GradeName:'', | 27 | GradeName:'', |
28 | is_full:0, //是否满级 | 28 | is_full:0, //是否满级 |
29 | - | 29 | + rfmName:'成长值', |
30 | cur_g_num:0,//当前级需要多少钱 | 30 | cur_g_num:0,//当前级需要多少钱 |
31 | userqy_color:null,//颜色值 | 31 | userqy_color:null,//颜色值 |
32 | }, | 32 | }, |
@@ -79,6 +79,13 @@ Page({ | @@ -79,6 +79,13 @@ Page({ | ||
79 | GradeName=data.GradeName; | 79 | GradeName=data.GradeName; |
80 | }) | 80 | }) |
81 | 81 | ||
82 | + let isRfm = wx.getStorageSync('isRfm') | ||
83 | + if (isRfm) { | ||
84 | + this.setData({ | ||
85 | + rfmName:'综合分' | ||
86 | + }) | ||
87 | + } | ||
88 | + | ||
82 | //获取卡类列表 | 89 | //获取卡类列表 |
83 | await getApp().request.promiseGet("/api/weshop/users/grade/vipgradeinfo/page",{ | 90 | await getApp().request.promiseGet("/api/weshop/users/grade/vipgradeinfo/page",{ |
84 | data:{ storeId:os.stoid} | 91 | data:{ storeId:os.stoid} |
@@ -219,7 +226,11 @@ Page({ | @@ -219,7 +226,11 @@ Page({ | ||
219 | }, | 226 | }, |
220 | 227 | ||
221 | go_cz:function(){ | 228 | go_cz:function(){ |
222 | - getApp().goto("/packageE/pages/user/grow_value/grow_value") | 229 | + let isRfm = wx.getStorageSync('isRfm') |
230 | + //升级为RFM就不跳转成长值详情 | ||
231 | + if (!isRfm) { | ||
232 | + getApp().goto("/packageE/pages/user/grow_value/grow_value") | ||
233 | + } | ||
223 | }, | 234 | }, |
224 | 235 | ||
225 | //获取卡类的gr_id | 236 | //获取卡类的gr_id |
pages/user/userqy/userqy.wxml
@@ -10,7 +10,7 @@ | @@ -10,7 +10,7 @@ | ||
10 | <!-- 当前是什么等级卡 --> | 10 | <!-- 当前是什么等级卡 --> |
11 | 11 | ||
12 | <view class='flex abs xc-grow-frame' bindtap='go_cz'> | 12 | <view class='flex abs xc-grow-frame' bindtap='go_cz'> |
13 | - <view class="four-level-word new xc-grow-val" style="color:{{userqy_color.font_color}}; background:{{userqy_color.secord_bgcolor}}">成长值</view> | 13 | + <view class="four-level-word new xc-grow-val" style="color:{{userqy_color.font_color}}; background:{{userqy_color.secord_bgcolor}}">{{rfmName}}</view> |
14 | <view class="progress-bar-not"> | 14 | <view class="progress-bar-not"> |
15 | <view class="progress-bar-yes" wx:if="{{cz_val>full_cz_val}}" style='width:100%;background:{{userqy_color.secord_bgcolor}}'></view> | 15 | <view class="progress-bar-yes" wx:if="{{cz_val>full_cz_val}}" style='width:100%;background:{{userqy_color.secord_bgcolor}}'></view> |
16 | <view class="progress-bar-yes" wx:else style='width:{{cz_val/need_money*100}}%;background:{{userqy_color.secord_bgcolor}}'></view> | 16 | <view class="progress-bar-yes" wx:else style='width:{{cz_val/need_money*100}}%;background:{{userqy_color.secord_bgcolor}}'></view> |
@@ -34,16 +34,16 @@ | @@ -34,16 +34,16 @@ | ||
34 | <!-- 上部分的文字判断 --> | 34 | <!-- 上部分的文字判断 --> |
35 | <view class=" abs white discounts four-level-word" wx:if="{{cz_val<item.BuyGradeSum && gradeId!=item.Id}}" style="color:#{{item.FontColor}};"> | 35 | <view class=" abs white discounts four-level-word" wx:if="{{cz_val<item.BuyGradeSum && gradeId!=item.Id}}" style="color:#{{item.FontColor}};"> |
36 | <block wx:if="{{index!=backClass.length-1}}"> | 36 | <block wx:if="{{index!=backClass.length-1}}"> |
37 | - [{{item.GradeName}}]365天累计成长值≥{{backClass[index+1].BuyGradeSum }}可升级[{{ backClass[index+1].GradeName}}] | 37 | + [{{item.GradeName}}]365天累计{{rfmName}}≥{{backClass[index+1].BuyGradeSum }}可升级[{{ backClass[index+1].GradeName}}] |
38 | </block> | 38 | </block> |
39 | <block wx:else> | 39 | <block wx:else> |
40 | - [{{item.GradeName}}]365天累计成长值≥{{item.BuyGradeSum }}可保级 | 40 | + [{{item.GradeName}}]365天累计{{rfmName}}≥{{item.BuyGradeSum }}可保级 |
41 | </block> | 41 | </block> |
42 | </view> | 42 | </view> |
43 | - <view class=" abs white discounts four-level-word" wx:if="{{gradeId==item.Id}}" style="color:#{{item.FontColor}};">会员将在{{filter.replace_time2(gradeEndDate)}}到期,<text wx:if="{{need_money>0}}">365天累计成长值≥{{need_money}}可升级[{{ backClass[index+1].GradeName}}]</text><text wx:else >[{{item.GradeName}}]365天累计成长值≥{{item.BuyGradeSum}}可保级</text> | 43 | + <view class=" abs white discounts four-level-word" wx:if="{{gradeId==item.Id}}" style="color:#{{item.FontColor}};">会员将在{{filter.replace_time2(gradeEndDate)}}到期,<text wx:if="{{need_money>0}}">365天累计{{rfmName}}≥{{need_money}}可升级[{{ backClass[index+1].GradeName}}]</text><text wx:else >[{{item.GradeName}}]365天累计{{rfmName}}≥{{item.BuyGradeSum}}可保级</text> |
44 | </view> | 44 | </view> |
45 | <view class=" abs white discounts four-level-word" wx:if="{{gradeId!=item.Id && cz_val>item.BuyGradeSum }}" style="color:#{{item.FontColor}};"> | 45 | <view class=" abs white discounts four-level-word" wx:if="{{gradeId!=item.Id && cz_val>item.BuyGradeSum }}" style="color:#{{item.FontColor}};"> |
46 | - [{{item.GradeName}}]365天累计成长值≥{{backClass[index+1].BuyGradeSum }}可升级[{{ backClass[index+1].GradeName}}] | 46 | + [{{item.GradeName}}]365天累计{{rfmName}}≥{{backClass[index+1].BuyGradeSum }}可升级[{{ backClass[index+1].GradeName}}] |
47 | </view> | 47 | </view> |
48 | 48 | ||
49 | <!-- 下部分的文字判断 --> | 49 | <!-- 下部分的文字判断 --> |
@@ -52,7 +52,7 @@ | @@ -52,7 +52,7 @@ | ||
52 | </view> | 52 | </view> |
53 | 53 | ||
54 | <view wx:if="{{cz_val<item.BuyGradeSum && gradeId!=item.Id }}" class=" abs white money four-level-word" style="color:#{{item.FontColor}};"> | 54 | <view wx:if="{{cz_val<item.BuyGradeSum && gradeId!=item.Id }}" class=" abs white money four-level-word" style="color:#{{item.FontColor}};"> |
55 | - 距离{{item.GradeName}}还需{{ filter.pInt(item.BuyGradeSum-cz_val)}}成长值 | 55 | + 距离{{item.GradeName}}还需{{ filter.pInt(item.BuyGradeSum-cz_val)}}{{rfmName}} |
56 | </view> | 56 | </view> |
57 | <view wx:if="{{gradeId==item.Id}}" class=" abs white money four-level-word new curword" style="color:#{{item.FontColor}};"> | 57 | <view wx:if="{{gradeId==item.Id}}" class=" abs white money four-level-word new curword" style="color:#{{item.FontColor}};"> |
58 | <view class="rel"> | 58 | <view class="rel"> |