展示

src/main/pc-space/src/components/FansInfo.vue

@@ -75,7 +75,7 @@ export default {
     }
     .border {
         height: 1px;
-        background: #494a4d;
+        background: @border1;
         border-radius: 1px;
         margin: 17px 10px 20px;
     }

src/main/pc-space/src/components/LoginInfo.vue

@@ -137,7 +137,7 @@ export default {
         },
         init() {
             this.isShow = false;
-            this.Show = true;
+            this.Show = false;
             this.phoneLogin = false;
         },
         handleClose() {

src/main/pc-space/src/components/RegisterInfo.vue

@@ -18,17 +18,22 @@
                     }"
                 >
                     <span class="el-icon-mobile-phone"></span>
-                    <el-input style="width: 300px" v-model="form.phone" placeholder="请输入手机号"></el-input>
+                    <el-input style="width: 300px;" v-model="form.phone" placeholder="请输入手机号"></el-input>
                 </el-form-item>
                 <div>
                     <el-form-item prop="code" :rules="{ required: true, message: '请输入', trigger: 'blur' }">
                         <span class="icon">
                             <img src="../assets/img/login_icon_yanzhengma@3x (2).png" alt="" />
                         </span>
-                        <el-input style="width: 300px" v-model="form.code" placeholder="请输入短信验证码">
+                        <el-input
+                            style="width: 300px;"
+                            maxlength="4"
+                            v-model="form.code"
+                            placeholder="请输入短信验证码"
+                        >
                             <span
                                 @click="send"
-                                style="color: #ff4f50; cursor: pointer; font-size: 13px"
+                                style="color: #ff4f50; cursor: pointer; font-size: 13px;"
                                 slot="suffix"
                                 >{{ time === 0 ? '发送验证码' : `重新发送${time}s` }}</span
                             >
@@ -38,7 +43,7 @@
                 <el-form-item prop="password">
                     <span class="el-icon-unlock"></span>
                     <el-input
-                        style="width: 300px"
+                        style="width: 300px;"
                         v-model="form.password"
                         type="password"
                         autocomplete="off"
@@ -48,7 +53,7 @@
                 <el-form-item prop="password2">
                     <span class="el-icon-unlock"></span>
                     <el-input
-                        style="width: 300px"
+                        style="width: 300px;"
                         v-model="form.password2"
                         type="password"
                         autocomplete="off"
@@ -58,18 +63,18 @@
             </el-form>
             <template>
                 <el-checkbox v-model="checked" v-if="isShow2">
-                    <el-link style="margin-bottom: 2px">点击同意注册协议</el-link>
+                    <el-link style="margin-bottom: 2px;">点击同意注册协议</el-link>
                 </el-checkbox>
             </template>
-            <div class="sub-btn" style="width: 300px" v-if="isShow2">
+            <div class="sub-btn" style="width: 300px;" v-if="isShow2">
                 <div class="btn1" @click="doRegister">立即注册</div>
-                <el-button style="background: #f2f3f5; color: #292c33" type="info" class="btn-block" @click="Login"
+                <el-button style="background: #f2f3f5; color: #292c33;" type="info" class="btn-block" @click="Login"
                     >已有账号，立即登录</el-button
                 >
             </div>
-            <div class="sub-btn" style="width: 300px" v-else>
+            <div class="sub-btn" style="width: 300px;" v-else>
                 <div class="btn1" @click="passwordFn2">重置密码</div>
-                <el-button style="background: #f2f3f5; color: #292c33" type="info" class="btn-block" @click="Login"
+                <el-button style="background: #f2f3f5; color: #292c33;" type="info" class="btn-block" @click="Login"
                     >想起密码，立即登录</el-button
                 >
             </div>
@@ -141,30 +146,21 @@ export default {
                 this.$message.warning('请点击同意注册协议');
                 return;
             }
-            this.verifyMsg(this.form.phone, this.form.code).then(() => {
-                return (
-                    this.$http
-                        .post('/auth/phoneRegister', {
-                            phone: this.form.phone,
-                            password: this.form.password
-                        })
-                        // })
-                        .then(res => {
-                            console.log(res);
-                            localStorage.setItem('webToken', res);
-                            return this.$store.dispatch('getUserInfo');
-                        })
-                        .then(() => {
-                            this.$message.success('注册成功');
-                            this.$emit('init');
-                        })
-                        .catch(e => {
-                            if (e) {
-                                this.$message.error(e.error);
-                            }
-                        })
-                );
-            });
+            return this.$http
+                .post('/auth/phoneRegister', this.form)
+                .then(res => {
+                    localStorage.setItem('webToken', res);
+                    return this.$store.dispatch('getUserInfo');
+                })
+                .then(() => {
+                    this.$message.success('注册成功');
+                    this.$emit('init');
+                })
+                .catch(e => {
+                    if (e) {
+                        this.$message.error(e.error);
+                    }
+                });
         },
         // 修改密码
         passwordFn2() {
@@ -297,7 +293,7 @@ export default {
             width: 330px;
             height: 40px;
             line-height: 40px;
-            background: linear-gradient(135deg, @prim 0%, @warn 100%);
+            background: @prim;
             border-radius: 4px;
             font-size: 13px;
             color: #fff;

src/main/pc-space/src/components/SingleUpload.vue

@@ -104,12 +104,11 @@ export default {
     height: 178px;
     line-height: 178px;
     text-align: center;
-    border: 1px dashed #d9d9d9;
+    border: 1px dashed #EBEFF1;
     border-radius: 6px;
     cursor: pointer;
     position: relative;
     overflow: hidden;
-    border: 1px solid #494a4d;
     background: #ffffff;
 
     &:hover {

src/main/pc-space/src/styles/app.less

@@ -231,3 +231,32 @@ body {
         position: relative;
     }
 }
+
+.myClass {
+    padding-bottom: 0;
+    .el-button {
+        color: @prim;
+        border: 0;
+    }
+    .el-button:nth-last-child(2) {
+        color: #c4c7cc;
+        font-size: 13px;
+    }
+    .el-button + .el-button {
+        margin-left: 0;
+        border-left: 1px solid @border1;
+    }
+    .el-message-box__content {
+        padding: 20px 15px 50px;
+    }
+    .el-message-box__btns {
+        padding: 0 0;
+        border-top: 1px solid @border1;
+        .flex();
+        .el-button {
+            padding: 15px 15px;
+            flex-grow: 1;
+            background-color: transparent;
+        }
+    }
+}

src/main/pc-space/src/views/AssetDetail.vue

@@ -864,21 +864,6 @@ export default {
     }
 };
 </script>
-<style lang="less">
-.myClass {
-    .el-button {
-        background: @prim;
-        border-radius: 4px;
-        border: 0;
-    }
-    .el-button:nth-last-child(2) {
-        background: #c4c7cc;
-        color: #ffffff;
-        font-size: 13px;
-    }
-}
-</style>
-
 <style lang="less" scoped>
 /deep/ .el-dialog__body {
     padding: 0 16px 12px !important;
@@ -1591,7 +1576,7 @@ export default {
         }
         .border {
             height: 1px;
-            background: #494a4d;
+            background: @border1;
             border-radius: 1px;
             margin: 0 16px;
         }

src/main/pc-space/src/views/CollectionDetail.vue

@@ -1009,7 +1009,7 @@ export default {
         }
         .border {
             height: 1px;
-            background: #494a4d;
+            background: @border1;
             border-radius: 1px;
             margin: 0 16px;
         }

src/main/pc-space/src/views/Send.vue

@@ -343,21 +343,6 @@ export default {
     }
 };
 </script>
-<style lang="less">
-.myClass {
-    width: 340px;
-    .el-button {
-        background: @prim;
-        border-radius: 4px;
-        border: 0;
-    }
-    .el-button:nth-last-child(2) {
-        background: #c4c7cc;
-        color: #ffffff;
-        font-size: 13px;
-    }
-}
-</style>
 <style lang="less" scoped>
 /deep/ .el-checkbox__inner {
     // width: 24px;

src/main/pc-space/src/views/Submit.vue

@@ -421,21 +421,6 @@ export default {
     }
 };
 </script>
-<style lang="less">
-.myClass {
-    width: 340px;
-    .el-button {
-        background: @prim;
-        border-radius: 4px;
-        border: 0;
-    }
-    .el-button:nth-last-child(2) {
-        background: #c4c7cc;
-        color: #ffffff;
-        font-size: 13px;
-    }
-}
-</style>
 <style lang="less" scoped>
 /deep/ .el-dialog__body {
     padding: 4px 20px 0;

src/main/pc-space/src/views/user/AccountData.vue

@@ -472,20 +472,6 @@ export default {
     }
 };
 </script>
-<style lang="less">
-.myClass {
-    .el-button {
-        background: @prim;
-        border-radius: 4px;
-        border: 0;
-    }
-    .el-button:nth-last-child(2) {
-        background: #c4c7cc;
-        color: #ffffff;
-        font-size: 13px;
-    }
-}
-</style>
 <style lang="less" scoped>
 .containers {
     & > div {
@@ -494,7 +480,7 @@ export default {
     }
     .border2 {
         height: 1px;
-        background: #494a4d;
+        background: @border1;
         border-radius: 1px;
         margin: 17px 10px 20px;
     }
@@ -551,7 +537,7 @@ export default {
             .text3 {
                 font-size: 22px;
                 font-weight: normal;
-                color: #ffffff;
+                color: @text0;
                 line-height: 24px;
                 &.active {
                     color: @prim;
@@ -596,7 +582,7 @@ export default {
         // position: relative;
         .borderUser {
             height: 1px;
-            background: #494a4d;
+            background: @border1;
             border-radius: 1px;
             margin: 17px 0 26px 0;
         }
@@ -661,7 +647,7 @@ export default {
                         // margin-top: 5px;
                         .name1 {
                             font-size: @menuFont2;
-                            color: #ffffff;
+                            color: @text0;
                             line-height: 24px;
                             margin-right: 6px;
                         }
@@ -694,7 +680,7 @@ export default {
                                 margin-right: 20px;
                             }
                             span {
-                                color: #fff;
+                                color: @text0;
                             }
                         }
                         .btnFollow {

src/main/pc-space/src/views/user/Addipc.vue

@@ -193,7 +193,7 @@ input::-webkit-inner-spin-button {
         margin-top: 66px;
     }
     /deep/ .el-input__inner {
-        border: 1px solid #494a4d;
+        border: 1px solid #EBEFF1;
         background: #ffffff;
         color: #ffffff;
     }
@@ -232,7 +232,7 @@ input::-webkit-inner-spin-button {
     }
     .border {
         height: 1px;
-        background: #494a4d;
+        background: @border1;
         margin: 0 16px 40px;
     }
 }

src/main/pc-space/src/views/user/Address.vue

@@ -131,7 +131,7 @@ export default {
     }
     .border {
         height: 1px;
-        background: #494a4d;
+        background: @border1;
         border-radius: 1px;
         margin: 24px 0 34px;
     }

src/main/pc-space/src/views/user/Authentication.vue

@@ -51,8 +51,7 @@ export default {
         height: 30px;
         font-size: 30px;
         font-family: ZhenyanGB-Regular, ZhenyanGB;
-        font-weight: 400;
-        color: #ffffff;
+        color: @text0;
         line-height: 30px;
         padding-top: 60px;
     }
@@ -64,7 +63,7 @@ export default {
         margin: 10px 0 40px;
     }
     span {
-        color: #fdfb60;
+        color: @danger;
     }
     .box {
         display: flex;
@@ -77,14 +76,14 @@ export default {
             margin-right: 52px;
             text-align: center;
             .img {
-                width: 56px;
-                height: 56px;
+                width: 60px;
+                height: 50px;
                 margin-top: 90px;
             }
             .text1 {
                 font-size: 16px;
                 font-weight: bold;
-                color: #ffffff;
+                color: @text0;
                 line-height: 26px;
                 margin: 20px 0 10px;
             }
@@ -101,10 +100,10 @@ export default {
             /deep/ .el-button {
                 width: 130px;
                 height: 36px;
-                background: linear-gradient(133deg, @prim 0%, @warn 100%);
+                background: @prim;
                 border-radius: 4px;
                 margin-top: 60px;
-                color: #1a1a1a;
+                color: #fff;
                 border: 0;
             }
         }

src/main/pc-space/src/views/user/CollectionOrder.vue

@@ -231,20 +231,6 @@ export default {
     }
 };
 </script>
-<style lang="less">
-.myClass {
-    .el-button {
-        background: @prim;
-        border-radius: 4px;
-        border: 0;
-    }
-    .el-button:nth-last-child(2) {
-        background: #c4c7cc;
-        color: #ffffff;
-        font-size: 13px;
-    }
-}
-</style>
 <style lang="less" scoped>
 /deep/ .el-table__header {
     background: @bg2 !important;

src/main/pc-space/src/views/user/EnterpriseAuthentication.vue

@@ -267,15 +267,15 @@ export default {
     /deep/ .el-form-item__label {
         width: 294px;
         text-align: right;
-        color: #ffffff;
+        color: @text0;
     }
     /deep/ .el-form {
         padding-left: 175px;
     }
     /deep/ .el-input__inner {
-        border: 1px solid #494a4d;
+        border: 1px solid #EBEFF1;
         background: #ffffff;
-        color: #ffffff;
+        color: @text0;
     }
     /deep/ .el-form-item__error {
         padding-top: 3px;
@@ -324,7 +324,7 @@ export default {
         font-size: 30px;
         font-weight: 400;
         font-family: ZhenyanGB-Regular, ZhenyanGB;
-        color: #ffffff;
+        color: @text0;
         line-height: 30px;
         padding: 60px 0;
     }
@@ -333,7 +333,8 @@ export default {
         font-weight: 400;
         color: #494a4d;
         line-height: 24px;
-        margin: -7px 0 2px 294px;
+        margin: -7px 0 20px 294px;
+        // transform: translateY(-15px);
     }
     .box {
         background: #ffffff;
@@ -341,7 +342,7 @@ export default {
         padding-bottom: 120px;
         .border {
             height: 1px;
-            background: #494a4d;
+            background: @border1;
             margin: 17px 0 80px;
         }
         .fail {
@@ -360,7 +361,7 @@ export default {
             .text3 {
                 font-size: 14px;
                 font-weight: 400;
-                color: #ffffff;
+                color: @text0;
                 line-height: 24px;
             }
             .botn {
@@ -379,7 +380,7 @@ export default {
         .name {
             font-size: 16px;
             font-weight: bold;
-            color: #ffffff;
+            color: @text0;
             line-height: 26px;
             span {
                 font-size: 12px;
@@ -391,10 +392,10 @@ export default {
         /deep/ .el-button {
             width: 130px;
             height: 36px;
-            background: linear-gradient(133deg, @prim 0%, @warn 100%);
+            background: @prim;
             border-radius: 4px;
             margin-top: 60px;
-            color: #1a1a1a;
+            color: #fff;
             border: 0;
         }
     }

src/main/pc-space/src/views/user/Modifypad.vue

@@ -195,7 +195,7 @@ export default {
         margin-top: 66px;
     }
     /deep/ .el-input__inner {
-        border: 1px solid #494a4d;
+        border: 1px solid #EBEFF1;
         background: #ffffff;
         color: #ffffff;
         height: 36px;
@@ -235,7 +235,7 @@ export default {
     }
     .border {
         height: 1px;
-        background: #494a4d;
+        background: @border1;
         margin: 0 16px 40px;
     }
 }

src/main/pc-space/src/views/user/PayRecord.vue

@@ -169,20 +169,6 @@ export default {
     }
 };
 </script>
-<style lang="less">
-.myClass {
-    .el-button {
-        background: @prim;
-        border-radius: 4px;
-        border: 0;
-    }
-    .el-button:nth-last-child(2) {
-        background: #c4c7cc;
-        color: #ffffff;
-        font-size: 13px;
-    }
-}
-</style>
 <style lang="less" scoped>
 /deep/ .el-table__header {
     background: @bg2 !important;

src/main/pc-space/src/views/user/Personal.vue

@@ -5,7 +5,7 @@
             <el-menu
                 :default-openeds="openeds"
                 :collapse-transition="false"
-                default-active="/accountdata"
+                :default-active="defaultActive"
                 router
                 class="aside-menu"
                 text-color="#939599"
@@ -52,6 +52,11 @@ export default {
             // NavActive: ''
         };
     },
+    computed: {
+        defaultActive() {
+            return this.$route.path;
+        }
+    },
     methods: {
         handleSelect(index) {
             this.NavActive = index;

src/main/pc-space/src/views/user/Security.vue

@@ -187,7 +187,7 @@ export default {
         margin-top: 66px;
     }
     /deep/ .el-input__inner {
-        border: 1px solid #494a4d;
+        border: 1px solid #EBEFF1;
         background: #ffffff;
         color: #ffffff;
         height: 36px;
@@ -227,7 +227,7 @@ export default {
     }
     .border {
         height: 1px;
-        background: #494a4d;
+        background: @border1;
         margin: 0 16px 40px;
     }
 }

src/main/pc-space/src/views/user/SecuritySuccess.vue

@@ -133,7 +133,7 @@ export default {
     }
     .border {
         height: 1px;
-        background: #494a4d;
+        background: @border1;
         margin: 0 16px 40px;
     }
 }

src/main/pc-space/src/views/user/Transaction.vue

@@ -112,7 +112,7 @@ export default {
 }
 /deep/.el-step:nth-child(1) {
     .el-step__icon {
-        background: linear-gradient(143deg, @prim 0%, @warn 100%, @warn 100%);
+        background: @prim;
         color: #ffffff;
         border: 0;
     }
@@ -139,13 +139,13 @@ export default {
     color: #939599;
 }
 /deep/ .el-step__title.is-finish {
-    color: #fdfb60;
+    color: @prim;
 }
 /deep/ .el-step__title {
     font-size: 12px !important;
 }
 /deep/ .el-step__head.is-finish {
-    border-color: #fdfb60;
+    border-color: @prim;
 }
 .container {
     .btn1 {
@@ -171,9 +171,9 @@ export default {
     /deep/ .el-button {
         width: 130px;
         height: 36px;
-        background: linear-gradient(133deg, @prim 0%, @warn 100%);
+        background: @prim;
         border-radius: 4px;
-        color: #1a1a1a;
+        color: #fff;
         font-size: 13px;
         border: 0;
     }
@@ -181,7 +181,7 @@ export default {
         font-size: 13px;
     }
     /deep/ .el-form-item__label {
-        color: #ffffff;
+        color: @text0;
         margin-left: 175px;
         font-size: 13px;
     }
@@ -189,16 +189,16 @@ export default {
         margin-top: 66px;
     }
     /deep/ .el-input__inner {
-        border: 1px solid #494a4d;
+        border: 1px solid #EBEFF1;
         background: #ffffff;
-        color: #ffffff;
+        color: @text0;
         height: 36px;
     }
     .title {
         height: 30px;
         font-size: 30px;
         font-weight: 400;
-        color: #ffffff;
+        color: @text0;
         line-height: 30px;
         font-family: ZhenyanGB-Regular, ZhenyanGB;
         padding: 60px 0;
@@ -213,7 +213,7 @@ export default {
         .name1 {
             font-size: 16px;
             font-weight: bold;
-            color: #ffffff;
+            color: @text0;
             line-height: 26px;
         }
         .name2 {
@@ -224,12 +224,12 @@ export default {
         }
     }
     .phone {
-        color: #ffffff;
+        color: @text0;
         font-size: 18px;
     }
     .border {
         height: 1px;
-        background: #494a4d;
+        background: @border1;
         margin: 0 16px 40px;
     }
 }

src/main/pc-space/src/views/user/TransactionOrdes.vue

@@ -152,20 +152,6 @@ export default {
     }
 };
 </script>
-<style lang="less">
-.myClass {
-    .el-button {
-        background: @prim;
-        border-radius: 4px;
-        border: 0;
-    }
-    .el-button:nth-last-child(2) {
-        background: #c4c7cc;
-        color: #ffffff;
-        font-size: 13px;
-    }
-}
-</style>
 <style lang="less" scoped>
 /deep/ .el-table__header {
     background: @bg2 !important;

src/main/pc-space/src/views/user/TransactionSuccess.vue

@@ -136,7 +136,7 @@ export default {
     }
     .border {
         height: 1px;
-        background: #494a4d;
+        background: @border1;
         margin: 0 16px 40px;
     }
 }

src/main/pc-space/src/views/user/UserAuthentication.vue

@@ -204,15 +204,15 @@ export default {
     /deep/ .el-form-item__label {
         width: 94px;
         text-align: right;
-        color: #ffffff;
+        color: @text0;
     }
     /deep/ .el-form {
         padding-left: 390px;
     }
     /deep/ .el-input__inner {
-        border: 1px solid #494a4d;
+        border: 1px solid #EBEFF1;
         background: #ffffff;
-        color: #ffffff;
+        color: @text0;
     }
     /deep/ .el-form-item__error {
         padding-top: 3px !important;
@@ -248,7 +248,7 @@ export default {
         font-size: 30px;
         font-weight: 400;
         font-family: ZhenyanGB-Regular, ZhenyanGB;
-        color: #ffffff;
+        color: @text0;
         line-height: 30px;
         padding: 60px 0;
     }
@@ -257,7 +257,8 @@ export default {
         font-weight: 400;
         color: #494a4d;
         line-height: 24px;
-        margin: -7px 0 2px 94px;
+        margin: -7px 0 20px 94px;
+        
     }
     .box {
         background: #ffffff;
@@ -265,7 +266,7 @@ export default {
         padding-bottom: 120px;
         .border {
             height: 1px;
-            background: #494a4d;
+            background: @border1;
             margin: 17px 0 80px;
         }
         .fail {
@@ -284,7 +285,7 @@ export default {
             .text3 {
                 font-size: 14px;
                 font-weight: 400;
-                color: #ffffff;
+                color: @text0;
                 line-height: 24px;
                 margin-bottom: 80px;
             }
@@ -304,7 +305,7 @@ export default {
         .name {
             font-size: 16px;
             font-weight: bold;
-            color: #ffffff;
+            color: @text0;
             line-height: 26px;
             span {
                 font-size: 12px;
@@ -316,10 +317,10 @@ export default {
         /deep/ .el-button {
             width: 130px;
             height: 36px;
-            background: linear-gradient(133deg, @prim 0%, @warn 100%);
+            background: @prim;
             border-radius: 4px;
             margin-top: 60px;
-            color: #1a1a1a;
+            color: #fff;
             border: 0;
         }
     }