panhui il y a 3 ans
Parent
commit
18a62bac69

BIN
src/assets/._ok.png


BIN
src/assets/ok.png


+ 1 - 1
src/views/Mine.vue

@@ -360,7 +360,7 @@ export default {
         width: 100%;
         padding: 0 16px;
         box-sizing: border-box;
-        // background: #0f0f27;
+        // background: @bg;
         // position: absolute;
         // left: 0;
         // top: 80px;

+ 1 - 1
src/views/Submit.vue

@@ -726,7 +726,7 @@ export default {
     width: 100%;
     height: 100%;
     position: absolute;
-    background: #0f0f27;
+    background: @bg;
     // margin-top: 44px;
     padding: 10px 16px;
     box-sizing: border-box;

+ 4 - 4
src/views/account/ChangePhone.vue

@@ -184,11 +184,11 @@ export default {
 }
 /deep/ .van-field__control {
     color: #ffffff;
-    background: #0f0f27;
+    background: @bg;
 }
 .login {
     padding: 60px 48px 0px;
-    background: #0f0f27;
+    background: @bg;
 }
 .tabs {
     font-size: 28px;
@@ -242,11 +242,11 @@ export default {
     .login_information_con {
         width: 250px;
         // height: 24px;
-        background: #0f0f27;
+        background: @bg;
         overflow: visible;
     }
     .send_verification {
-        background-color: #0f0f27;
+        background-color: @bg;
         border: none;
         font-size: 12px;
         font-family: PingFangSC-Regular, PingFang SC;

+ 4 - 4
src/views/account/Forget.vue

@@ -178,11 +178,11 @@ export default {
 }
 /deep/ .van-field__control {
     color: #ffffff;
-    background: #0f0f27;
+    background: @bg;
 }
 .login {
     padding: 60px 48px 0px;
-    background: #0f0f27;
+    background: @bg;
 }
 .tabs {
     display: flex;
@@ -212,11 +212,11 @@ export default {
     .login_information_con {
         width: 250px;
         // height: 24px;
-        background: #0f0f27;
+        background: @bg;
         overflow: visible;
     }
     .send_verification {
-        background-color: #0f0f27;
+        background-color: @bg;
         border: none;
         font-size: 12px;
         font-family: PingFangSC-Regular, PingFang SC;

+ 1 - 1
src/views/account/Security.vue

@@ -84,7 +84,7 @@ export default {
         width: 100%;
         height: 100%;
         // position: absolute;
-        background: #0F0F27;
+        background: @bg;
         .account_security{
             margin-left: 6px;
             font-size: 20px;

+ 183 - 139
src/views/account/Setting.vue

@@ -1,50 +1,55 @@
 <template>
     <div class="content">
-        <div class="edit_data">编辑资料</div>
         <van-cell-group :border="false">
             <van-cell title="头像" is-link>
                 <template #value>
                     <van-image
                         round
-                        width="36"
-                        height="36"
+                        width="40"
+                        height="40"
                         :src="userInfo.avatar || require('@assets/svgs/img_default_photo.svg')"
                         fit="cover"
                     />
                     <van-uploader class="avatar" :after-read="afterRead" result-type="file" />
                 </template>
             </van-cell>
-            <van-divider class="edit_data_divider"/>
             <van-cell
                 title="昵称"
                 @click="$router.push('/changeText?type=nickname')"
                 is-link
                 :value="userInfo.nickname"
             />
-            <van-divider class="edit_data_divider"/>
             <van-cell
-                title="简介"
+                title="个性签名"
                 :class="[userInfo.intro ? 'intro' : 'not']"
                 @click="$router.push('/changeText?type=intro')"
                 is-link
-                :value="userInfo.intro || '介绍一下自己让大家认识你吧~'"
+                :border="false"
+                :value="userInfo.intro || 'TA还什么都没有留下~'"
             />
-            <van-divider class="edit_data_divider"/>
-            <van-cell title="主页背景" class="not" is-link>
+        </van-cell-group>
+        <van-cell-group :border="false">
+            <van-cell title="手机号码" :value="showPhone" />
+            <van-cell title="实名认证" is-link :value="userInfo.phone">
                 <template #value>
-                    <span> 更换背景</span>
-                    <van-uploader class="avatar" :after-read="afterRead2" result-type="file" />
+                    <div class="value-text">
+                        <img src="@assets/ok.png" alt="" />
+                        <span>已认证</span>
+                    </div>
+                </template>
+            </van-cell>
+            <van-cell title="支付密码" is-link :value="userInfo.phone" @click="$router.push('/tradingPassword')">
+                <template #value>
+                    <div class="value-text" v-if="set">
+                        <img src="@assets/ok.png" alt="" />
+                        <span>已设置</span>
+                    </div>
+                    <div class="value-text" v-else>
+                        <span>未设置</span>
+                    </div>
                 </template>
             </van-cell>
-            <van-divider class="edit_data_divider"/>
         </van-cell-group>
-        <div class="user_id">
-            <div class="user_id_title">用户ID</div>
-            <div class="user_id_con">
-                <div>{{userInfo.id}}</div>
-                <img :src="require('@assets/copy_icon.png')" alt="" class="user_id_con_img" @click="copy">
-            </div>
-        </div>
     </div>
     <div class="edit_return">
         <div class="edit_return_con" @click="$router.go(-1)">返回</div>
@@ -56,8 +61,29 @@ import { mapState } from 'vuex';
 import { ref } from 'vue';
 import eruda from 'eruda';
 export default {
+    data() {
+        return {
+            set: false
+        };
+    },
     computed: {
-        ...mapState(['userInfo'])
+        ...mapState(['userInfo']),
+        showPhone() {
+            if (this.userInfo.phone) {
+                return this.userInfo.phone.slice(0, 3) + '****' + this.userInfo.phone.slice(-4);
+            }
+            return '';
+        }
+    },
+    mounted() {
+        this.$http
+            .get('/user/tradeCodeStatus', {
+                userId: this.userInfo.id
+            })
+            .then(res => {
+                console.log(res);
+                this.set = res.set;
+            });
     },
     methods: {
         copy() {
@@ -118,142 +144,160 @@ export default {
 </script>
 
 <style lang="less" scoped>
-/deep/ .van-cell--clickable:active{
-    background: #0F0F27;
+/deep/ .van-cell--clickable:active {
+    background: @bg;
 }
-    .content{
-        // margin-top: 44px;
-        width: 100%;
-        height: 100%;
-        position: absolute;
-        background: #0F0F27;
-        padding: 16px 12px 0px 16px;
-        box-sizing: border-box;
-        .edit_data{
-            font-size: 20px;
-            font-family: PingFangSC-Medium, PingFang SC;
-            font-weight: 500;
-            color: #FFFFFF;
-            margin-bottom: 30px;
-        }
-        .edit_data_divider{
-            margin: 14px 0;
-            height: 1px;
-            background: #5F646F;
-            opacity: 0.2;
+.content {
+    // margin-top: 44px;
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    background: @bg;
+    padding:20px 16px;
+    box-sizing: border-box;
+    .edit_data {
+        font-size: 20px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #ffffff;
+        margin-bottom: 30px;
+    }
+    .edit_data_divider {
+        margin: 14px 0;
+        height: 1px;
+        background: #5f646f;
+        opacity: 0.2;
+    }
+    .user_id {
+        display: flex;
+        justify-content: space-between;
+        .user_id_title {
+            font-size: 14px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #ffffff;
+            line-height: 24px;
         }
-        .user_id{
+        .user_id_con {
             display: flex;
-            justify-content: space-between;
-            .user_id_title{
-                font-size: 14px;
-                font-family: PingFangSC-Regular, PingFang SC;
-                font-weight: 400;
-                color: #FFFFFF;
-                line-height: 24px;
-            }
-            .user_id_con{
-                display: flex;
-                font-size: 12px;
-                font-family: PingFangSC-Regular, PingFang SC;
-                font-weight: 400;
-                color: #5F646F;
-                line-height: 24px;
-                .user_id_con_img{
-                    width: 18px;
-                    height: 20px;
-                    margin-left: 4px;
-                    padding-top: 2px;
-                    box-sizing: border-box;
-                }
+            font-size: 12px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #5f646f;
+            line-height: 24px;
+            .user_id_con_img {
+                width: 18px;
+                height: 20px;
+                margin-left: 4px;
+                padding-top: 2px;
+                box-sizing: border-box;
             }
         }
     }
-    .avatar {
-        position: absolute;
-        right: 0;
-        top: 0;
-        opacity: 0;
-        bottom: 0;
+}
+.avatar {
+    position: absolute;
+    right: 0;
+    top: 0;
+    opacity: 0;
+    bottom: 0;
+}
+
+.van-cell-group {
+    background-color: @bg2;
+    border-radius: 12px;
+    overflow: hidden;
+}
+.van-cell-group + .van-cell-group {
+    margin-top: 15px;
+}
+/deep/ .van-cell:after {
+    border-color: #97979710;
+}
+/deep/ .van-cell__title {
+    width: 120px;
+}
+/deep/ .van-cell {
+    align-items: center;
+    height: 66px;
+    position: relative;
+    padding: 0 16px;
+    .van-cell__title {
+        span {
+            font-size: 16px;
+            color: #ffffff;
+        }
     }
-    /deep/ .van-cell:after{
-        border: none;
+    .van-cell__value {
+        span {
+            font-size: 16px;
+            color: #ffffff66;
+            line-height: 24px;
+        }
     }
-    /deep/ .van-cell__title{
-        width: 120px;
+    .van-uploader__input {
+        position: absolute;
+        top: 7px;
+        left: 45px;
     }
-    /deep/ .van-cell {
-        align-items: center;
-        height: 45px;
-        position: relative;
-        padding: 0;
-        .van-cell__title {
+    &.not {
+        .van-cell__value {
             span {
-                font-size: 14px;
-                font-family: PingFangSC-Regular, PingFang SC;
-                font-weight: 400;
-                color: #FFFFFF;
+                font-size: 16px;
+                color: #ffffff66;
+                line-height: 24px;
             }
         }
+    }
+    &.intro {
+        overflow: hidden;
         .van-cell__value {
             span {
-                font-size: 14px;
-                font-family: PingFangSC-Medium, PingFang SC;
-                font-weight: 500;
-                color: #FFFFFF;
+                font-size: 13px;
+                color: #ffffff;
                 line-height: 24px;
-            }
-        }
-        .van-uploader__input{
-            position: absolute;
-            top: 7px;
-            left: 45px;
-        }
-        &.not {
-            .van-cell__value {
-                span {
-                    font-size: 12px;
-                    font-family: PingFangSC-Regular, PingFang SC;
-                    font-weight: 400;
-                    color: #5F646F;
-                    line-height: 24px;
-                }
-            }
-        }
-        &.intro {
-            overflow: hidden;
-            .van-cell__value {
-                span {
-                    font-size: 13px;
-                    color: #FFFFFF;
-                    line-height: 24px;
-                    display: -webkit-box;
-                    overflow: hidden;
-                    text-overflow: ellipsis;
-                    -webkit-line-clamp: 2;
-                    -webkit-box-orient: vertical;
-                }
+                display: -webkit-box;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                -webkit-line-clamp: 2;
+                -webkit-box-orient: vertical;
             }
         }
     }
-    .edit_return{
-        width: 100%;
-        height: 56px;
-        background: #15152D;
-        position: fixed;
-        bottom: 0;
-        padding: 8px 16px;
-        box-sizing: border-box;
-        .edit_return_con{
-            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;
-        }
+}
+.edit_return {
+    width: 100%;
+    height: 56px;
+    background: #15152d;
+    position: fixed;
+    bottom: 0;
+    padding: 8px 16px;
+    box-sizing: border-box;
+    .edit_return_con {
+        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;
+    }
+}
+
+.value-text {
+    .flex();
+    justify-content: flex-end;
+    img {
+        width: 16px;
+        height: 16px;
+    }
+    span {
+        font-size: 16px !important;
+        color: rgba(255, 255, 255, 0.5) !important;
+        line-height: 22px;
+        margin-left: 3px;
     }
+}
 </style>

+ 4 - 4
src/views/account/TradingPassword.vue

@@ -177,11 +177,11 @@ export default {
 }
 /deep/ .van-field__control {
     color: #ffffff;
-    background: #0f0f27;
+    background: @bg;
 }
 .login {
     padding: 60px 48px 0px;
-    background: #0f0f27;
+    background: @bg;
 }
 .tabs {
     font-size: 28px;
@@ -226,11 +226,11 @@ export default {
     .login_information_con {
         width: 250px;
         // height: 24px;
-        background: #0f0f27;
+        background: @bg;
         overflow: visible;
     }
     .send_verification {
-        background-color: #0f0f27;
+        background-color: @bg;
         border: none;
         font-size: 12px;
         font-family: PingFangSC-Regular, PingFang SC;

+ 2 - 2
src/views/account/Verified.vue

@@ -322,7 +322,7 @@ export default {
         width: 100%;
         height: 100%;
         position: absolute;
-        background: #0F0F27;
+        background: @bg;
         // margin-top: 44px;
         padding: 16px;
         padding-bottom: 0;
@@ -374,7 +374,7 @@ export default {
     }
     .van-field__control{
         color: #FFFFFF;
-        background-color: #0F0F27;
+        background-color: @bg;
     }
 }
 /deep/ .van-cell:after{

+ 1 - 1
src/views/account/VerifiedSuc.vue

@@ -110,7 +110,7 @@ export default {
     width: 100%;
     height: 100%;
     position: absolute;
-    background: #0F0F27;
+    background: @bg;
     margin-top: 44px;
     .authentication_successful{
             width: 100%;

+ 1 - 1
src/views/account/Waiting.vue

@@ -83,7 +83,7 @@ export default {
         width: 100%;
         height: 100%;
         position: absolute;
-        background: #0F0F27;
+        background: @bg;
         // margin-top: 44px;
         .under_review{
             .under_review_img{

+ 1 - 1
src/views/asset/Detail.vue

@@ -886,7 +886,7 @@ export default {
 <style lang="less" scoped>
 .detail_content {
     width: 100%;
-    background: #0f0f27;
+    background: @bg;
     // margin-top: 44px;
     .detail_content_img {
         margin-top: 30px;

+ 1 - 1
src/views/order/Detail.vue

@@ -220,7 +220,7 @@ export default {
         width: 100%;
         height: 100%;
         position: absolute;
-        background: #0F0F27;
+        background: @bg;
         // margin-top: 44px;
         padding: 10px 16px;
         box-sizing: border-box;

+ 4 - 4
src/views/order/Orders.vue

@@ -157,7 +157,7 @@ export default {
 
 <style lang="less" scoped>
 .load_refresh {
-    background: #0f0f27;
+    background: @bg;
 }
 /deep/ .van-button {
     width: 280px;
@@ -170,7 +170,7 @@ export default {
     width: 100%;
     height: 100%;
     // margin-top: 44px;
-    background: #0f0f27;
+    background: @bg;
 }
 .my_list {
     width: 100%;
@@ -214,7 +214,7 @@ export default {
 .list_display {
     width: 100%;
     height: 100%;
-    background: #0f0f27;
+    background: @bg;
     padding: 10px 16px 0px 16px;
     box-sizing: border-box;
 }
@@ -299,6 +299,6 @@ export default {
 .list_display_order {
     // padding-bottom: 40px;
     // box-sizing: border-box;
-    background: #0F0F27;
+    background: @bg;
 }
 </style>

+ 1 - 1
src/views/product/Detail.vue

@@ -827,7 +827,7 @@ export default {
 }
 .detail_content {
     width: 100%;
-    background: #0f0f27;
+    background: @bg;
     // .detail_content_top {
     //     height: 380px;
     // }

+ 2 - 2
src/views/product/Search.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="search" :style="{ backgroundColor: isSearch ? '#0F0F27' : '#0F0F27' }">
+    <div class="search" :style="{ backgroundColor: isSearch ? '@bg' : '@bg' }">
         <van-sticky ref="top" :offset-top="46">
             <van-search
                 v-model="search"
@@ -257,7 +257,7 @@ export default {
 
 <style lang="less" scoped>
 .search{
-    background: #0F0F27;
+    background: @bg;
 }
 /deep/ .van-sticky{
     padding: 12px 0px 10px;

+ 1 - 1
src/views/product/orderDetails.vue

@@ -83,7 +83,7 @@ export default {
         width: 100%;
         height: 100%;
         position: absolute;
-        background: #0F0F27;
+        background: @bg;
         margin-top: 44px;
         padding: 10px 16px;
         box-sizing: border-box;

+ 1 - 1
src/views/user/Banks.vue

@@ -121,7 +121,7 @@ export default {
 
 <style lang="less" scoped>
 .page {
-    background: #0f0f27;
+    background: @bg;
     padding: 16px;
     box-sizing: border-box;
     .page_top {

+ 1 - 1
src/views/user/BanksAdd.vue

@@ -190,7 +190,7 @@ export default {
     height: 100%;
     position: absolute;
     // margin-top: 44px;
-    background: #0f0f27;
+    background: @bg;
     padding: 16px 16px 16px 16px;
     box-sizing: border-box;
     .content_title {

+ 1 - 1
src/views/user/accountSecurity.vue

@@ -58,7 +58,7 @@ export default {
         width: 100%;
         height: 100%;
         position: absolute;
-        background: #0F0F27;
+        background: @bg;
         .account_security{
             margin-left: 6px;
             font-size: 20px;

+ 1 - 1
src/views/user/authenticationStatus.vue

@@ -76,7 +76,7 @@ export default {
         width: 100%;
         height: 100%;
         position: absolute;
-        background: #0F0F27;
+        background: @bg;
         margin-top: 44px;
         .authentication_successful{
             width: 100%;

+ 1 - 1
src/views/user/bankCard.vue

@@ -66,7 +66,7 @@ export default {
         height: 100%;
         position: absolute;
         margin-top: 44px;
-        background: #0F0F27;
+        background: @bg;
         padding: 16px 16px 16px 16px;
         box-sizing: border-box;
         .content_title{

+ 2 - 2
src/views/user/myOrder.vue

@@ -93,7 +93,7 @@ export default {
         height: 100%;
         margin-top: 44px;
         position: absolute;
-        background: #0F0F27;
+        background: @bg;
     }
     .my_list{
         width: 100%;
@@ -137,7 +137,7 @@ export default {
     .list_display{
         width: 100%;
         height: 812px;
-        background: #0F0F27;
+        background: @bg;
         padding: 10px 16px 16px 8px;
         box-sizing: border-box;
         .list_display_con{

+ 2 - 2
src/views/user/realName.vue

@@ -101,7 +101,7 @@ export default {
         width: 100%;
         height: 100%;
         position: absolute;
-        background: #0F0F27;
+        background: @bg;
         margin-top: 44px;
         padding: 16px;
         padding-bottom: 0;
@@ -141,7 +141,7 @@ export default {
                 box-sizing: border-box;
                 border: none;
                 border-bottom: 1px solid #5F646F;
-                background: #0F0F27;
+                background: @bg;
                 font-size: 14px;
                 font-family: PingFangSC-Regular, PingFang SC;
                 font-weight: 400;