Skip to content

Y
year-end-activitiy
提交 f7fb17c4 编写于 作者: Yuanzhao.dai's avatar Yuanzhao.dai
浏览文件
操作

Merge branch 'dev-stage2-20191125' of... 

Merge branch 'dev-stage2-20191125' of http://192.168.110.53/com.pica.cloud.foundation.frontend/year-end-activitiy into dev-stage2-20191125
上级 e40615ec bc01e849
显示空白字符变更
内嵌 并排
正在显示 包含 43 行增加 和 52 行删除
package-lock.json
浏览文件 @ f7fb17c4
...@@ -4953,9 +4953,9 @@ ...@@ -4953,9 +4953,9 @@
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
}, },
"fsevents": { "fsevents": {
"version": "2.0.7", "version": "2.1.2",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.0.7.tgz", "resolved": "http://192.168.110.93:4873/fsevents/-/fsevents-2.1.2.tgz",
"integrity": "sha512-a7YT0SV3RB+DjYcppwVDLtn13UQnmg0SWZS7ezZD0UjnLwXmy8Zm21GMVGLaFGimIqcvyMQaOJBrop8MyOp1kQ==", "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==",
"optional": true "optional": true
}, },
"fstream": { "fstream": {
...@@ -6265,8 +6265,8 @@ ...@@ -6265,8 +6265,8 @@
}, },
"fsevents": { "fsevents": {
"version": "1.2.9", "version": "1.2.9",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz", "resolved": "http://192.168.110.93:4873/fsevents/-/fsevents-1.2.9.tgz",
"integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==", "integrity": "sha1-P17WZYPM1vQAtaANtvfoYTY+OI8=",
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
...@@ -8463,8 +8463,8 @@ ...@@ -8463,8 +8463,8 @@
}, },
"fsevents": { "fsevents": {
"version": "1.2.9", "version": "1.2.9",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz", "resolved": "http://192.168.110.93:4873/fsevents/-/fsevents-1.2.9.tgz",
"integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==", "integrity": "sha1-P17WZYPM1vQAtaANtvfoYTY+OI8=",
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
...@@ -8481,8 +8481,7 @@ ...@@ -8481,8 +8481,7 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
...@@ -8503,14 +8502,12 @@ ...@@ -8503,14 +8502,12 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
...@@ -8525,20 +8522,17 @@ ...@@ -8525,20 +8522,17 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -8655,8 +8649,7 @@ ...@@ -8655,8 +8649,7 @@
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
...@@ -8668,7 +8661,6 @@ ...@@ -8668,7 +8661,6 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -8683,7 +8675,6 @@ ...@@ -8683,7 +8675,6 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
...@@ -8691,14 +8682,12 @@ ...@@ -8691,14 +8682,12 @@
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.3.5", "version": "2.3.5",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -8717,7 +8706,6 @@ ...@@ -8717,7 +8706,6 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -8798,8 +8786,7 @@ ...@@ -8798,8 +8786,7 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
...@@ -8811,7 +8798,6 @@ ...@@ -8811,7 +8798,6 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -8897,8 +8883,7 @@ ...@@ -8897,8 +8883,7 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
...@@ -8934,7 +8919,6 @@ ...@@ -8934,7 +8919,6 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
...@@ -8954,7 +8938,6 @@ ...@@ -8954,7 +8938,6 @@
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
...@@ -8998,14 +8981,12 @@ ...@@ -8998,14 +8981,12 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.0.3", "version": "3.0.3",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
} }
} }
}, },
...@@ -13541,8 +13522,8 @@ ...@@ -13541,8 +13522,8 @@
}, },
"fsevents": { "fsevents": {
"version": "1.2.9", "version": "1.2.9",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz", "resolved": "http://192.168.110.93:4873/fsevents/-/fsevents-1.2.9.tgz",
"integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==", "integrity": "sha1-P17WZYPM1vQAtaANtvfoYTY+OI8=",
"optional": true, "optional": true,
"requires": { "requires": {
"nan": "^2.12.1", "nan": "^2.12.1",
...@@ -13574,8 +13555,7 @@ ...@@ -13574,8 +13555,7 @@
}, },
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
...@@ -13596,8 +13576,7 @@ ...@@ -13596,8 +13576,7 @@
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
...@@ -14090,9 +14069,9 @@ ...@@ -14090,9 +14069,9 @@
} }
}, },
"web-buried-point": { "web-buried-point": {
"version": "2.0.0", "version": "2.1.0",
"resolved": "http://192.168.110.93:4873/web-buried-point/-/web-buried-point-2.0.0.tgz", "resolved": "http://192.168.110.93:4873/web-buried-point/-/web-buried-point-2.1.0.tgz",
"integrity": "sha512-aaeKQ3RaS5sXbKBHLG3T9TK4ldzWsO7TMQ3d/FYeA6G5504f1OdNMkeIzktX9+q6Fegeo6GV8GnvZiukxmJKhg==", "integrity": "sha512-+jk1muRNQsj4tzbOHZ+yHRPSV+HHNoxcIvqCWkL3laxtq8bShsr5GYTiWLdpIfeJ348ndWLPlhG9lWIm4ksTEQ==",
"requires": { "requires": {
"axios": "^0.18.0" "axios": "^0.18.0"
}, },
......
package.json
浏览文件 @ f7fb17c4
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
"vant": "^2.0.9", "vant": "^2.0.9",
"vconsole": "^3.3.4", "vconsole": "^3.3.4",
"vue-infinite-scroll": "^2.0.2", "vue-infinite-scroll": "^2.0.2",
"web-buried-point": "^2.0.0" "web-buried-point": "^2.1.0"
}, },
"devDependencies": { "devDependencies": {
"@nuxtjs/axios": "^5.5.4", "@nuxtjs/axios": "^5.5.4",
......
pages/shareActive.vue
浏览文件 @ f7fb17c4
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
data(){ data(){
return { return {
notSend: true, notSend: true,
regMobile: /^1[3456789]\d{9}$/,
mobilePhone: '', mobilePhone: '',
authCode: '', // 短信验证码 authCode: '', // 短信验证码
flag: 0, flag: 0,
...@@ -66,7 +67,8 @@ ...@@ -66,7 +67,8 @@
captchaToken: '', // captchaToken captchaToken: '', // captchaToken
captchaAnswer: '', // 输入的图形验证码 captchaAnswer: '', // 输入的图形验证码
time: TIMEALL, time: TIMEALL,
btnMsg: '点击获取' btnMsg: '点击获取',
isReq: false
} }
}, },
async asyncData({ query }){ async asyncData({ query }){
...@@ -122,7 +124,14 @@ ...@@ -122,7 +124,14 @@
}, },
// 领取课程事件 // 领取课程事件
getCourse(){ getCourse(){
if(this.mobilePhone=='' || this.mobilePhone.length!=11){ if(this.isReq){
this.$toast('您的登录操作过于频繁，请稍后再试');
return;
}
const { regMobile, mobilePhone, authCode, id, taskId, activityId } = this;
const mobileTrue = regMobile.test(mobilePhone);
if(!mobileTrue){
this.$toast('请输入正确的手机号'); this.$toast('请输入正确的手机号');
return; return;
} }
...@@ -135,7 +144,8 @@ ...@@ -135,7 +144,8 @@
this.$toast('请输入短信验证码'); this.$toast('请输入短信验证码');
return; return;
} }
const { mobilePhone, authCode, id, taskId, activityId } = this;
this.isReq = true;
// 调用领取课程接口 // 调用领取课程接口
getCourseById({ getCourseById({
mobile: mobilePhone, mobile: mobilePhone,
...@@ -144,6 +154,7 @@ ...@@ -144,6 +154,7 @@
taskId, taskId,
activityId activityId
}).then(res=>{ }).then(res=>{
this.isReq = false;
// res.data true 登记成功 、 false 登记失败 // res.data true 登记成功 、 false 登记失败
if(res.code=='000000'){ if(res.code=='000000'){
// 将手机号和状态存入浏览器缓存，用户再次进来就能直接进入领取结果页面 // 将手机号和状态存入浏览器缓存，用户再次进来就能直接进入领取结果页面
...@@ -163,7 +174,9 @@ ...@@ -163,7 +174,9 @@
}, },
// 发送获取短信验证码 // 发送获取短信验证码
sendSms(){ sendSms(){
if(this.mobilePhone=='' || this.mobilePhone.length!=11){ const { regMobile, mobilePhone, flag, captchaToken, captchaAnswer } = this;
const mobileTrue = regMobile.test(mobilePhone);
if(!mobileTrue){
this.$toast('请输入正确的手机号'); this.$toast('请输入正确的手机号');
return; return;
} }
...@@ -173,7 +186,6 @@ ...@@ -173,7 +186,6 @@
return; return;
} }
const { mobilePhone, flag, captchaToken, captchaAnswer } = this;
getAuthCode({mobilePhone, flag, captchaToken, captchaAnswer}).then(res=>{ getAuthCode({mobilePhone, flag, captchaToken, captchaAnswer}).then(res=>{
// 发送成功 // 发送成功
if(res.code=='000000'){ if(res.code=='000000'){
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或