验证

src/components/AppBar.vue

@@ -38,13 +38,13 @@ export default {
             show: false,
             showPopover: false,
             actions: [
-                { text: '首页', icon: require('@assets/tabbar_icon_01bai.png'), value: '/home' },
-                { text: '探索', icon: require('@assets/tabbar_icon_02bai.png'), value: '/discover' },
-                { text: '库房', icon: require('@assets/tabbar_icon_03bai.png'), value: '/store' },
-                { text: '我的', icon: require('@assets/tabbar_icon_04bai.png'), value: '/mine' }
+                { text: '首页', icon: require('@assets/tabbar_icon_01_pre.png'), value: '/home' },
+                { text: '发现', icon: require('@assets/tabbar_icon_02_pre.png'), value: '/discover' },
+                { text: '展览室', icon: require('@assets/tabbar_icon_03_pre.png'), value: '/store' },
+                { text: '我的', icon: require('@assets/tabbar_icon_04_pre.png'), value: '/mine' }
             ],
             tabColor: '#191D27',
-            title: '拉索宇宙'
+            title: ''
         };
     },
     computed: {
@@ -107,8 +107,7 @@ export default {
         getTitle(title) {
             if (this.$route.meta.title) {
                 this.title = this.$route.meta.title;
-            }
-            if (title) {
+            } else {
                 this.title = title;
             }
         },

src/components/phoneCode.vue

@@ -0,0 +1,138 @@
+<template>
+    <van-popup class="popup-content" v-model:show="show" teleport="body" position="bottom">
+        <div class="popup">
+            <div class="cancel" @click="show = false">取消</div>
+            <div class="title">输入验证码</div>
+            <div class="phone">已发送到您{{ phoneText }}手机</div>
+            <div class="send" @click="onSubmit">未收到验证码?</div>
+            <van-password-input :value="code" :length="6" />
+            <!-- 数字键盘 -->
+            <van-number-keyboard
+                maxlength="6"
+                theme="custom"
+                v-model="code"
+                :show="show"
+                close-button-text="完成"
+                @close="bind"
+            />
+        </div>
+    </van-popup>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            show: false,
+            code: ''
+        };
+    },
+    watch: {
+        code() {
+            if (this.code && this.code.length === 6) {
+                this.$emit('bind', this.code);
+            }
+        }
+    },
+    methods: {
+        onSubmit(e) {
+            this.$emit('onSubmit', e);
+        },
+        bind() {
+            if (!this.code || this.code.length < 4) {
+                this.$toast('请输入验证码');
+            }
+            this.$emit('bind', this.code);
+        },
+        init() {
+            this.code = '';
+            this.show = true;
+        }
+    }
+};
+</script>
+
+<style lang="less" scoped>
+@bottom: 280px;
+@gray3: #c8c9cc;
+.popup {
+    color: #000;
+    position: relative;
+    padding-bottom: calc(@bottom+ constant(safe-area-inset-bottom));
+    padding-bottom: calc(@bottom + env(safe-area-inset-bottom));
+    .title {
+        text-align: center;
+        font-size: @font3;
+        padding: 20px 0;
+        border-bottom: 1px solid #f5f7fa;
+    }
+
+    .cancel {
+        position: absolute;
+        font-size: @font1;
+        font-family: PingFangSC-Regular, PingFang SC;
+        font-weight: 400;
+        color: @text3;
+        line-height: 22px;
+        padding: 21px 20px;
+        left: 0;
+        top: 0;
+    }
+
+    .send {
+        position: absolute;
+        font-size: @font1;
+        font-family: PingFangSC-Regular, PingFang SC;
+        font-weight: 400;
+        color: @text3;
+        line-height: 22px;
+        padding: 21px 20px;
+        right: 0;
+        top: 0;
+        text-decoration: underline;
+    }
+
+    .phone {
+        padding: 12px 0 20px;
+        text-align: center;
+        font-size: 12px;
+        color: #aaabad;
+        line-height: 24px;
+    }
+
+    /deep/.van-password-input {
+        margin: 0 80px;
+    }
+
+    /deep/.van-key {
+        &:hover {
+            background-color: @gray3;
+        }
+        &:focus {
+            background-color: @gray3;
+        }
+        &:active {
+            background-color: @gray3;
+        }
+        &:link {
+            background-color: @gray3;
+        }
+        &:visited {
+            background-color: @gray3;
+        }
+
+        &.van-key--active {
+            background-color: @gray3;
+        }
+    }
+
+    /deep/[class*='van-hairline']::after {
+        border-color: @gray3;
+    }
+
+    /deep/.van-key--blue {
+        background: linear-gradient(135deg, @prim 0%, @warn 100%);
+        color: @btnText;
+    }
+}
+</style>

src/router/index.js

@@ -232,7 +232,10 @@ const routes = [
     {
         path: '/waiting',
         name: 'userWaiting',
-        component: () => import('../views/account/Waiting.vue')
+        component: () => import('../views/account/Waiting.vue'),
+        meta: {
+            title: ' '
+        }
     },
     {
         path: '/security',
@@ -286,7 +289,6 @@ const routes = [
         component: () => import('../views/product/Detail.vue'),
         meta: {
             pageType: Page.Every,
-            title: '拉索宇宙',
             tabColor: '#181818'
         }
     },

src/styles/app.less

@@ -1,8 +1,10 @@
 :root {
+    --van-font-size-md: 18px;
     --van-primary-color: @prim;
     --van-tabbar-item-active-background-color: transparent;
     --van-tabbar-background-color: @bg;
     --van-nav-bar-background-color: #191d27;
+    --van-popover-dark-background-color: #191d27;
     --van-cell-background-color: @bg;
     --van-text-color: #fff;
     --van-gray-6: @text3;
@@ -24,7 +26,7 @@
     --van-divider-border-color: #939599;
     --van-divider-text-color: @tabBorder;
     --van-divider-margin: 0;
-    --van-field-error-message-color: #FC2F55;
+    --van-field-error-message-color: #fc2f55;
     --van-action-sheet-item-text-color: #000;
     --van-uploader-upload-active-color: transparent;
     --van-uploader-upload-background-color: transparent;
@@ -34,15 +36,17 @@
     --van-search-background-color: @bg;
     --van-search-content-background-color: @bg3;
     // --van-picker-background-color: @bg;
-    --van-button-default-height: 38px;
+    --van-button-default-height: 50px;
     --van-dialog-has-title-message-text-color: #000;
     --van-field-label-color: #aaabad;
     --van-search-action-padding: 0 16px;
-    --van-popover-dark-background-color: #15152d;
     --van-dialog-background-color: #1e222c;
     --van-button-default-background-color: transparent;
     --van-dialog-message-font-size: 17px;
     --van-dialog-has-title-message-text-color: #fff;
+    --van-button-border-radius: 8px;
+    --van-popover-action-font-size: 14px;
+    --van-cell-font-size: 12px;
 }
 
 [contenteditable='true'],

src/views/Index.vue

@@ -72,13 +72,13 @@ export default {
     .container {
         box-sizing: border-box;
         flex-grow: 1;
-        background-color: #15152D;
+        background-color: @bg;
     }
     .index {
         padding-top: 0 !important;
     }
     .van-tabbar{
-        background: #15152D;
+        background: @bg;
     }
     /deep/ [class*=van-hairline]:after{
         border: none;

src/views/account/Verified.vue

@@ -39,6 +39,7 @@
                 </van-field>
             </van-cell-group>
 
+            <!-- 
             <van-field
                 label="身份证照片（正面照）"
                 name="正面照"
@@ -80,17 +81,11 @@
                         <van-uploader name="idBack" result-type="file" :after-read="afterRead" />
                     </div>
                 </template>
-            </van-field>
+            </van-field> -->
 
             <div class="button" ref="btn">
-                <van-button
-                    round
-                    block
-                    @click="submit"
-                    :color="`linear-gradient(to right, ${$colors.prim}, ${$colors.warn})`"
-                    class="sure"
-                >
-                    提交审核
+                <van-button color="#2BA1F560" block @click="submit" class="sure" type="primary">
+                    申请认证
                 </van-button>
             </div>
         </van-form>
@@ -211,7 +206,7 @@ export default {
             margin-right: 8px;
         }
 
-        &::after{
+        &::after {
             left: 16px;
         }
     }
@@ -242,6 +237,7 @@ export default {
 
     .van-button {
         font-weight: bold;
+        color: #fff !important;
     }
 }
 
@@ -279,15 +275,11 @@ export default {
 }
 
 .button {
-    position: fixed;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background-color: @bg2;
-    padding: 6px 42px;
-    z-index: 20;
-    .bottom(6px);
-    border-top: 1px solid @tabBorder;
+    background-color: #fff;
+    // padding: 6px 42px;
+    // z-index: 20;
+    // .bottom(6px);
+    // border-top: 1px solid @tabBorder;
 }
 
 /deep/.img {

src/views/account/Waiting.vue

@@ -2,21 +2,18 @@
     <!-- <TopNavigation/> -->
     <div class="content">
         <!-- 实名认证审核中 -->
-        <div class="under_review" v-if="this.userInfo && this.userInfo.authStatus">
-            <img :src="require('@assets/shenqing_shenhezhong.png')" alt="" class="under_review_img">
-            <div class="under_review_title">资料审核中</div>
+        <div class="under_review" v-if="this.userInfo && !this.userInfo.authStatus">
+            <img :src="require('@assets/shenqing_shenhezhong.png')" alt="" class="under_review_img" />
+            <div class="under_review_title">提交成功，请等待审核</div>
             <div class="under_review_tip">平台将于3日内完成资料审核，请耐心等待</div>
-            <div class="under_review_return">
-                <div class="under_review_return_con" @click="$router.go(-1)">返回</div>
-            </div>
         </div>
         <!-- 实名认证失败 -->
         <div class="under_review" v-else>
-            <img :src="require('@assets/shenqing_weitongguo.png')" alt="" class="under_review_img">
+            <img :src="require('@assets/shenqing_weitongguo.png')" alt="" class="under_review_img" />
             <div class="under_review_title">资料审核失败</div>
-            <div class="audit_failed_tip">很遗憾，您的资料审核失败，请检查您填写的资料是否正确以及上传照片是否清晰</div>
+            <div class="audit_failed_tip">很遗憾，您的资料审核失败！请检查您填写的资料是否正确以及上传照片是否清晰</div>
             <div class="under_review_return">
-                <div class="under_review_return_con" @click="$router.replace('/verified')">重新填写</div>
+                <div class="under_review_return_con" @click="$router.replace('/verified')">申请认证</div>
             </div>
         </div>
     </div>
@@ -40,16 +37,16 @@ import { mapState } from 'vuex';
 // import TopNavigation from "../../components/TopNavigation.vue"
 export default {
     computed: {
-        ...mapState(['userInfo']),
+        ...mapState(['userInfo'])
         // statusInfo() {
-            // if (this.userInfo && this.userInfo.authStatus) {
-            //     return { ...this.info }[this.userInfo.authStatus];
-            // } else {
-            //     return this.info.PENDING;
-            // }
+        // if (this.userInfo && this.userInfo.authStatus) {
+        //     return { ...this.info }[this.userInfo.authStatus];
+        // } else {
+        //     return this.info.PENDING;
+        // }
         // }
     },
-    components:{
+    components: {
         // TopNavigation
     },
     data() {
@@ -79,60 +76,60 @@ export default {
 </script>
 
 <style lang="less" scoped>
-    .content{
-        width: 100%;
-        height: 100%;
-        position: absolute;
-        background: @bg;
-        // margin-top: 44px;
-        .under_review{
-            .under_review_img{
-                margin: 50px 0px 30px 133px;
-                width: 110px;
-                height: 86px;
-            }
-            .under_review_title{
-                text-align: center;
-                font-size: 20px;
-                font-family: PingFangSC-Regular, PingFang SC;
-                font-weight: 400;
-                color: #FFFFFF;
-                margin-bottom: 16px;
-            }
-            .under_review_tip{
-                text-align: center;
-                font-size: 14px;
-                font-family: PingFangSC-Regular, PingFang SC;
-                font-weight: 400;
-                color: #939599;
-            }
-            .audit_failed_tip{
-                padding: 0 37px;
-                box-sizing: border-box;
-                font-size: 14px;
-                font-family: PingFangSC-Regular, PingFang SC;
-                font-weight: 400;
-                color: #939599;
-                line-height: 24px;
+.content {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    background: #fff;
+    // margin-top: 44px;
+    .under_review {
+        .under_review_img {
+            // margin: 50px 0px 30px 133px;
+            display: block;
+            width: 100%;
+            // height: 86px;
+            height: auto;
+        }
+        .under_review_title {
+            text-align: center;
+            font-size: 16px;
+            color: #202020;
+            line-height: 22px;
+            margin-top: 18px;
+        }
+        .under_review_tip {
+            text-align: center;
+            font-size: 13px;
+            color: #909090;
+            line-height: 20px;
+            margin-top: 11px;
+        }
+        .audit_failed_tip {
+            text-align: center;
+            padding: 0 37px;
+            box-sizing: border-box;
+            font-size: 13px;
+            color: #909090;
+            line-height: 20px;
+            margin-top: 11px;
+        }
+        .under_review_return {
+            margin-top: 100px;
+            padding: 0 67px;
+            box-sizing: border-box;
+            .under_review_return_con {
+                width: 100%;
+                height: 40px;
+                background: #2ba1f5;
+                border-radius: 8px;
+                font-size: 16px;
+                font-family: PingFangSC-Medium, PingFang SC;
+                font-weight: 500;
+                color: #fff;
+                line-height: 40px;
                 text-align: center;
             }
-            .under_review_return{
-                margin-top: 100px;
-                padding: 0 67px;
-                box-sizing: border-box;
-                .under_review_return_con{
-                    width: 100%;
-                    height: 40px;
-                    background: #29293F;
-                    border-radius: 8px;
-                    font-size: 16px;
-                    font-family: PingFangSC-Medium, PingFang SC;
-                    font-weight: 500;
-                    color: #939599;
-                    line-height: 40px;
-                    text-align: center;
-                }
-            }
         }
     }
+}
 </style>

src/views/user/BanksAdd.vue

@@ -1,8 +1,6 @@
 <template>
     <!-- <TopNavigation/> -->
     <div class="content">
-        <div class="content_title">我的银行卡</div>
-        <div class="content_tip">成功绑定后不能修改</div>
         <van-form @submit="onSubmit" class="form">
             <van-field
                 type="digit"
@@ -29,8 +27,12 @@
                     }
                 ]"
             />
+            <div class="tips">
+                <span>同意</span>
+                <span>《拉索宇宙支付用户协议》</span>
+            </div>
             <div class="next_step">
-                <van-button type="primary" :disabled="!canNext" round block native-type="submit">下一步</van-button>
+                <van-button type="primary" :disabled="!canNext" block native-type="submit">同意协议并继续</van-button>
             </div>
         </van-form>
         <van-popup class="popup-content" v-model:show="show" teleport="body" position="bottom">
@@ -104,7 +106,9 @@ export default {
     },
     data() {
         return {
-            form: {},
+            form: {
+                code: ''
+            },
             show: false
         };
     },
@@ -191,7 +195,7 @@ export default {
     position: absolute;
     // margin-top: 44px;
     background: @bg;
-    padding: 16px 16px 16px 16px;
+    padding: 16px 30px 16px 16px;
     box-sizing: border-box;
     .content_title {
         font-size: 20px;
@@ -226,28 +230,7 @@ export default {
     }
 }
 .next_step {
-    width: 100%;
-    height: 56px;
-    background: #15152d;
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    padding-bottom: calc(@bottom+ constant(safe-area-inset-bottom));
-    padding-bottom: calc(@bottom + env(safe-area-inset-bottom));
-    padding: 8px 16px;
-    box-sizing: border-box;
-    .next_step_con {
-        width: 100%;
-        height: 40px;
-        background: #28b6ff;
-        border-radius: 8px;
-        line-height: 40px;
-        text-align: center;
-        font-size: 16px;
-        font-family: PingFangSC-Medium, PingFang SC;
-        font-weight: 500;
-        color: #ffffff;
-    }
+    padding: 30px 16px;
 }
 /deep/ .van-cell:after {
     border-bottom: none;
@@ -264,10 +247,10 @@ export default {
         .van-field__body {
             line-height: 48px;
             border-radius: 8px;
-            // border: 1px solid #939599;
+            border: 1px solid #97979720;
             padding: 0 16px;
             margin-top: 6px;
-            background: #29293f;
+            // background: #29293f;
             .van-field__control {
                 font-size: @font1;
                 color: @gray3;
@@ -276,6 +259,7 @@ export default {
 
         .van-field__error-message {
             margin-top: 6px;
+            margin-left: 16px;
         }
     }
 }
@@ -287,10 +271,7 @@ export default {
 /deep/ .van-password-input__security li:nth-of-type(2n) {
     border-left: none;
 }
-/deep/ .van-button {
-    background: #28b6ff;
-    border-radius: 8px;
-}
+
 .sub {
     margin: 60px 48px;
 }
@@ -359,8 +340,21 @@ export default {
     }
 
     /deep/.van-key--blue {
-        background: linear-gradient(135deg, @prim 0%, @warn 100%);
-        color: @btnText;
+        // background: linear-gradient(135deg, @prim 0%, @warn 100%);
+        color: #503a1e;
+    }
+}
+
+.tips {
+    padding-top: 12px;
+    span {
+        color: #5e6168;
+        font-size: 12px;
+        line-height: 18px;
+
+        &:nth-child(2) {
+            color: #fff;
+        }
     }
 }
 </style>