Commit 1b3b4c9f authored by leiqingsong's avatar leiqingsong

修改注册,注册成功提示用户下载App

parent 808a2c09
VUE_APP_BASE_URL = " http://8.140.108.250"
\ No newline at end of file
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"private": true, "private": true,
"scripts": { "scripts": {
"serve": "vue-cli-service serve", "serve": "vue-cli-service serve",
"build": "vue-cli-service build", "build:prod": "vue-cli-service build",
"lint": "eslint --fix --ext .js,.vue src" "lint": "eslint --fix --ext .js,.vue src"
}, },
"dependencies": { "dependencies": {
......
...@@ -12,7 +12,9 @@ import Vconsole from "vconsole"; ...@@ -12,7 +12,9 @@ import Vconsole from "vconsole";
import bridgeToAppFun from "@/utils/bridgeToAppFun"; import bridgeToAppFun from "@/utils/bridgeToAppFun";
Vue.prototype.$bridgeToAppFun = new bridgeToAppFun(); Vue.prototype.$bridgeToAppFun = new bridgeToAppFun();
/*生产环境请注释掉 */
Vue.prototype.$vConsole = new Vconsole(); Vue.prototype.$vConsole = new Vconsole();
Vue.use(MiniRefreshTools); Vue.use(MiniRefreshTools);
Vue.config.productionTip = false; Vue.config.productionTip = false;
......
...@@ -15,7 +15,11 @@ ...@@ -15,7 +15,11 @@
<img src="@/assets/images/icon-notice.png" alt="" /> <img src="@/assets/images/icon-notice.png" alt="" />
<div class="notice-bar-show" id="scroll-box"> <div class="notice-bar-show" id="scroll-box">
<div class="user-id-list"> <div class="user-id-list">
<p v-for="(item, index) in userPoolVos" :key="index" @click="openUserInfo(item)"> <p
v-for="(item, index) in userPoolVos"
:key="index"
@click="openUserInfo(item)"
>
用户{{ item.userId }}进入空投池 用户{{ item.userId }}进入空投池
</p> </p>
</div> </div>
...@@ -31,9 +35,13 @@ ...@@ -31,9 +35,13 @@
</p> </p>
</div> </div>
</div> </div>
<base-dialog class="user-dialog" :base-dialog-show="userInfoDialog" @onClick="onCloseUser"> <base-dialog
class="user-dialog"
:base-dialog-show="userInfoDialog"
@onClick="onCloseUser"
>
<div slot="content" class="user-dialog-content"> <div slot="content" class="user-dialog-content">
<img :src="currentUser.avatar" alt="头像"> <img :src="currentUser.avatar" alt="头像" />
<span class="normal">账号</span> <span class="normal">账号</span>
<span class="user-id">{{ currentUser.userId }}</span> <span class="user-id">{{ currentUser.userId }}</span>
<span class="normal">进入空投池时间</span> <span class="normal">进入空投池时间</span>
...@@ -44,9 +52,8 @@ ...@@ -44,9 +52,8 @@
</template> </template>
<script> <script>
import { queryAerialDelivery } from "@/api/airDropPool"; import { queryAerialDelivery } from "@/api/airDropPool";
import BaseDialog from '../components/BaseDialog.vue'; import BaseDialog from "../components/BaseDialog.vue";
export default { export default {
components: { BaseDialog }, components: { BaseDialog },
name: "AirDrop", name: "AirDrop",
...@@ -65,12 +72,11 @@ export default { ...@@ -65,12 +72,11 @@ export default {
methods: { methods: {
onCloseUser() { onCloseUser() {
this.userInfoDialog = false; this.userInfoDialog = false;
this.currentUser = {}
}, },
openUserInfo(item) { openUserInfo(item) {
this.userInfoDialog = true; this.userInfoDialog = true;
this.currentUser = item; this.currentUser = item;
this.currentUser.avatar = process.env.VUE_APP_BASE_URL + item.headImage this.currentUser.avatar = process.env.VUE_APP_BASE_URL + item.headImage;
}, },
handlerBack() { handlerBack() {
try { try {
...@@ -87,8 +93,11 @@ export default { ...@@ -87,8 +93,11 @@ export default {
if (res.code === 0) { if (res.code === 0) {
_this.total = res.data.total; _this.total = res.data.total;
_this.userPoolVos = res.data.userPoolVos.map(item => { _this.userPoolVos = res.data.userPoolVos.map(item => {
const temp = item const temp = item;
temp.userId = item.userId.substring(0, 3) + "****" + item.userId.substring(8, 11); temp.userId =
item.userId.substring(0, 3) +
"****" +
item.userId.substring(8, 11);
return temp; return temp;
}); });
_this.$nextTick(() => { _this.$nextTick(() => {
......
...@@ -105,7 +105,11 @@ export default { ...@@ -105,7 +105,11 @@ export default {
this.$toast.fail("请输入身份证号"); this.$toast.fail("请输入身份证号");
return; return;
} }
if (!/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/.test(this.form.idCardNo)) { if (
!/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/.test(
this.form.idCardNo
)
) {
this.$toast.fail("请输入正确的身份证号"); this.$toast.fail("请输入正确的身份证号");
return; return;
} }
......
...@@ -125,7 +125,7 @@ export default { ...@@ -125,7 +125,7 @@ export default {
validCodeDialogShow: false, validCodeDialogShow: false,
validCode: null, validCode: null,
time: 60, time: 60,
maxValue:8, maxValue: 8
}; };
}, },
created() { created() {
...@@ -165,9 +165,9 @@ export default { ...@@ -165,9 +165,9 @@ export default {
inputClick() { inputClick() {
this.rate = this.money * 0.02; this.rate = this.money * 0.02;
this.account = this.money - this.rate; this.account = this.money - this.rate;
let num = this.money let num = this.money;
var re = /([0-9]+\.[0-9]{2})[0-9]*/; var re = /([0-9]+\.[0-9]{2})[0-9]*/;
this.money=num.replace(re,"$1"); this.money = num.replace(re, "$1");
}, },
canCashOut() { canCashOut() {
const params = { const params = {
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
> >
<div class="userAvatar"> <div class="userAvatar">
<div class="avatar-box"> <div class="avatar-box">
<img class="avatar" :src="avatar" alt="头像" /> <img class="avatar" :src="avatar" alt />
<img class="level-img" src="@/assets/images/等级展示框.png" alt /> <img class="level-img" src="@/assets/images/等级展示框.png" alt />
<span class="avatar-level">Lv.{{ userRecommendInfo.userlevel }}</span> <span class="avatar-level">Lv.{{ userRecommendInfo.userlevel }}</span>
</div> </div>
......
...@@ -65,8 +65,14 @@ ...@@ -65,8 +65,14 @@
<van-overlay :show="show" class-name="registerEorr" @click="onClickHide"> <van-overlay :show="show" class-name="registerEorr" @click="onClickHide">
<div class="wrapper" @click.stop> <div class="wrapper" @click.stop>
<div class="title">{{ title }}</div> <div class="title">{{ title }}</div>
<div class="error-tip"></div> <div v-if="title == '注册失败'" class="error-tip"></div>
<div class="tip">{{ tip }}</div> <div v-else class="success-tip">
<img src="@/assets/images/成功.png" alt />
</div>
<div v-if="title == '注册失败'" class="tip">{{ tip }}</div>
<div v-else class="tip">
<a :href="tip">请点击下载App</a>
</div>
<van-button @click="show = false">确定</van-button> <van-button @click="show = false">确定</van-button>
</div> </div>
</van-overlay> </van-overlay>
...@@ -114,9 +120,6 @@ export default { ...@@ -114,9 +120,6 @@ export default {
}, },
sendSms() { sendSms() {
const _this = this; const _this = this;
// if (_this.timer) {
// return false;
// }
// 校验手机号 // 校验手机号
let phoneReg = /^(0|86|17951)?(13[0-9]|15[012356789]|17[0-9]|18[0-9]|14[57])[0-9]{8}$/; let phoneReg = /^(0|86|17951)?(13[0-9]|15[012356789]|17[0-9]|18[0-9]|14[57])[0-9]{8}$/;
//如果手机号码输入为空 //如果手机号码输入为空
...@@ -172,11 +175,13 @@ export default { ...@@ -172,11 +175,13 @@ export default {
_this.registerBtnDisabled = false; _this.registerBtnDisabled = false;
if (res.code === 0) { if (res.code === 0) {
this.$toast.success("注册成功"); this.$toast.success("注册成功");
//_this.$toast.sucess(res.msg); _this.show = true;
_this.title = "注册成功";
_this.tip = "https://www.pgyer.com/WJJS";
} else { } else {
_this.title = "注册失败";
_this.show = true; _this.show = true;
_this.tip = res.msg; _this.tip = res.msg;
// _this.$toast.fail(res.msg);
} }
}); });
} }
...@@ -269,6 +274,13 @@ export default { ...@@ -269,6 +274,13 @@ export default {
letter-spacing: 0px; letter-spacing: 0px;
color: #333333; color: #333333;
} }
.success-tip {
margin: 25px auto;
img {
width: 72px;
height: 72px;
}
}
.error-tip { .error-tip {
width: 72px; width: 72px;
height: 72px; height: 72px;
......
...@@ -5,7 +5,8 @@ module.exports = { ...@@ -5,7 +5,8 @@ module.exports = {
devServer: { devServer: {
proxy: { proxy: {
'/shop-mall': { '/shop-mall': {
target: "http://8.131.244.76:81/", // target: "http://8.131.244.76:81/",
target: "http://8.140.108.250/",
changeOrigin: true changeOrigin: true
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment