HandOver-liuwu
/
mobileclient
mirror of https://codeup.aliyun.com/lsxd/marketing/mobileclient.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into through-card

This commit is contained in:
wangsongsole 2023-11-23 18:12:05 +08:00
parent e5af3fea25 b5ab3f8148
commit 78d3c71705
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
coupon/details.html
View File

@ -305,6 +305,9 @@
case 14: case 14:
this.placeholder = "请输入邮箱/QQ号/微信号"; this.placeholder = "请输入邮箱/QQ号/微信号";
break; break;
case 99:
this.placeholder = "请输入昵称";
break;
default: default:
this.placeholder = "请输入手机号/邮箱/QQ号/微信号"; this.placeholder = "请输入手机号/邮箱/QQ号/微信号";
break; break;
@ -364,6 +367,12 @@
} else { } else {
this.productType = data.entity.account_type; this.productType = data.entity.account_type;
} }
/* 微博 */
if (goodsDetail.entity.account_type == 0 && this.goodInfo.product_name.indexOf('微博') !== -1) {
this.productType = 99;
}
this.receive_time = data.entity.time_limit; this.receive_time = data.entity.time_limit;
this.$nextTick(function () { this.$nextTick(function () {
var swiper = new Swiper('.swiper-container', { var swiper = new Swiper('.swiper-container', {
@ -453,9 +462,6 @@
let weiXinReg = /^[a-zA-Z][a-zA-Z\d_-]{5,19}$/.test(this.account); let weiXinReg = /^[a-zA-Z][a-zA-Z\d_-]{5,19}$/.test(this.account);
let regFlag = true; let regFlag = true;
switch (Number(this.productType)) { switch (Number(this.productType)) {
case 0:
this.placeholder = "请输入昵称";
break;
case 1: case 1:
regFlag = phoneReg; regFlag = phoneReg;
break; break;

14
exchange.html
View File

@ -192,6 +192,12 @@
} else { } else {
this.productType = goodsInform.account_type; this.productType = goodsInform.account_type;
} }
/* 微博 */
if (goodsDetail.entity.account_type == 0 && goodsInform.product_name.indexOf('微博') !== -1) {
this.productType = 99;
}
this.$nextTick(function () { this.$nextTick(function () {
var swiper = new Swiper('.swiper-container', { var swiper = new Swiper('.swiper-container', {
loop: true, // 循环模式选项 loop: true, // 循环模式选项
@ -269,9 +275,7 @@
let emailsreg = /^[A-Za-z0-9\u4e00-\u9fa5\.]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/.test(this.account); let emailsreg = /^[A-Za-z0-9\u4e00-\u9fa5\.]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/.test(this.account);
let weixinreg = /^[a-zA-Z][a-zA-Z\d_-]{5,19}$/.test(this.account); let weixinreg = /^[a-zA-Z][a-zA-Z\d_-]{5,19}$/.test(this.account);
let regflag = true; let regflag = true;
if (this.productType == 0) { if (this.productType == 1) {
this.placeholder = "请输入昵称";
} else if (this.productType == 1) {
regflag = phonereg; regflag = phonereg;
} else if (this.productType == 2) { } else if (this.productType == 2) {
regflag = emailsreg; regflag = emailsreg;
@ -420,7 +424,7 @@
this.maxlen = 50; this.maxlen = 50;
this.acctype = "text"; this.acctype = "text";
if (newVal == 0) { if (newVal == 0) {
this.placeholder = "请输入昵称"; this.placeholder = "请输入账号";
} else if (newVal == 1) { } else if (newVal == 1) {
this.acctype = "tel"; this.acctype = "tel";
this.placeholder = "请输入手机号"; this.placeholder = "请输入手机号";
@ -459,6 +463,8 @@
this.maxlen = 20; this.maxlen = 20;
} else if (newVal == 14) { } else if (newVal == 14) {
this.placeholder = "请输入邮箱/QQ号/微信号"; this.placeholder = "请输入邮箱/QQ号/微信号";
} else if (newVal == 99) {
this.placeholder = "请输入昵称";
} else { } else {
this.placeholder = "请输入手机号/邮箱/QQ号/微信号"; this.placeholder = "请输入手机号/邮箱/QQ号/微信号";
} }