Commit d97962983a1a581c59977f8f6248e89af8bd7cbf
Merge branch 'qa' of http://git.vipzhuang.cn/wxd/MShopWeApp
Showing
1 changed file
with
7 additions
and
6 deletions
pages/user/plus/plus.js
| @@ -442,12 +442,6 @@ Page({ | @@ -442,12 +442,6 @@ Page({ | ||
| 442 | return false; | 442 | return false; |
| 443 | } | 443 | } |
| 444 | 444 | ||
| 445 | - //有显示弹出框，才要求要显示用户协议 | ||
| 446 | - if(!this.data.check_py_val && (th.data.isyaoqingma || th.data.is_salesman) ){ | ||
| 447 | - ut.m_toast('请先同意PLUS会员用户协议') | ||
| 448 | - return false; | ||
| 449 | - } | ||
| 450 | - | ||
| 451 | var item = th.data.is_plusCard[th.data.by_index]; | 445 | var item = th.data.is_plusCard[th.data.by_index]; |
| 452 | var req = {}; | 446 | var req = {}; |
| 453 | req.cardId = item.CardId; | 447 | req.cardId = item.CardId; |
| @@ -457,6 +451,13 @@ Page({ | @@ -457,6 +451,13 @@ Page({ | ||
| 457 | if (th.data.def_recommon) req.recommon = th.data.def_recommon | 451 | if (th.data.def_recommon) req.recommon = th.data.def_recommon |
| 458 | if (th.data.def_serviceman) req.serviceman = th.data.def_serviceman | 452 | if (th.data.def_serviceman) req.serviceman = th.data.def_serviceman |
| 459 | } else { | 453 | } else { |
| 454 | + | ||
| 455 | + //有显示弹出框，才要求要显示用户协议 | ||
| 456 | + if(!this.data.check_py_val && (th.data.isyaoqingma || th.data.is_salesman) ){ | ||
| 457 | + ut.m_toast('请先同意PLUS会员用户协议') | ||
| 458 | + return false; | ||
| 459 | + } | ||
| 460 | + | ||
| 460 | //---后台要求要输入邀请码--- | 461 | //---后台要求要输入邀请码--- |
| 461 | if (th.data.isyaoqingma) { | 462 | if (th.data.isyaoqingma) { |
| 462 | if (!th.data.inp_recommon && th.data.is_must_staff_yqma) { | 463 | if (!th.data.inp_recommon && th.data.is_must_staff_yqma) { |