Merge branch 'dev' of http://git.izouma.com/xiongzhu/raex_front into dev

src/views/Mine.vue

@@ -50,7 +50,7 @@
                             <img @click="copy" src="@assets/svgs/copy_icon.svg" alt="" />
                         </div>
                         <div class="icons">
-                            <div class="auth-imgs" v-if="authStatus !== '已认证'" @click="goAuth">
+                            <div class="auth-imgs authed_con" v-if="authStatus !== '已认证'" @click="goAuth">
                                 <img src="../assets/renzheng_icon.png" alt="" />
                                 <span>未实名认证</span>
                             </div>
@@ -928,11 +928,12 @@ export default {
         top: 0;
         left: 0;
         z-index: 1;
+        overflow: visible;
         &::after {
             content: '';
             position: absolute;
             left: 0;
-            bottom: 0;
+            bottom: -3px;
             height: 90px;
             right: 0;
             z-index: 1;
@@ -949,7 +950,7 @@ export default {
         font-size: 12px;
         color: @text3;
         line-height: 17px;
-        padding: 4px 0 0;
+        padding: 8px 0 0;
         text-align: center;
     }
 
@@ -1073,8 +1074,11 @@ export default {
                     flex-shrink: 0;
                     white-space: nowrap;
                 }
-
+                &.authed_con{
+                    width: 90px;
+                }
                 &.authed {
+                    width: 90px;
                     span {
                         color: #418bff;
                         background: #e8f3ff;
@@ -1085,6 +1089,8 @@ export default {
                 }
                 &.autheds {
                     position: relative;
+                    width: 90px;
+                    margin-right: 5px;
                     span {
                         display: block;
                         width: 50px;
@@ -1106,7 +1112,8 @@ export default {
                     }
                 }
                 &.autheds_con {
-                    margin-right: 7px;
+                     width: 90px;
+                    margin-right: 10px;
                     span {
                         color: #39af00;
                         background: #f3ffed;

src/views/account/ChangeText.vue

@@ -170,6 +170,7 @@ export default {
         },
         save() {
             let data = {
+                userId: this.userInfo.id,
                 ...this.info,
                 nickname: this.message
             };

src/views/account/Setting.vue

@@ -505,11 +505,12 @@ export default {
         top: 0;
         left: 0;
         z-index: 1;
+        overflow: visible;
         &::after {
             content: '';
             position: absolute;
             left: 0;
-            bottom: 0;
+            bottom: -3px;
             height: 90px;
             right: 0;
             z-index: 1;
@@ -561,7 +562,7 @@ export default {
     }
     .setting_list {
         padding: 0px 16px;
-        transform: translateY(255px);
+        transform: translateY(45vw);
         position: relative;
         z-index: 2;
         padding-bottom: 100px;

src/views/account/SettingComplete.vue

@@ -42,7 +42,7 @@
                     <img @click="copy" src="@assets/svgs/copy_icon.svg" alt="" style="margin-left: 2px" />
                 </div>
                 <div class="icons">
-                    <div class="auth-imgs" v-if="authStatus != '已认证'">
+                    <div class="auth-imgs authed_con" v-if="authStatus != '已认证'">
                         <img :src="require('@assets/renzheng_icon.png')" alt="" />
                         <span>未实名认证</span>
                     </div>
@@ -278,6 +278,9 @@ export default {
 </script>
 
 <style lang="less" scoped>
+/deep/ .van-image{
+    // overflow: visible;
+}
 .risk-box {
     width: calc(100vw - 95px);
     background: #ffffff;
@@ -403,11 +406,12 @@ export default {
             top: 0;
             left: 0;
             z-index: 1;
+            overflow: visible;
             &::after {
                 content: '';
                 position: absolute;
                 left: 0;
-                bottom: 0;
+                bottom: -3px;
                 height: 90px;
                 right: 0;
                 z-index: 1;
@@ -458,7 +462,7 @@ export default {
     }
     .setting_list {
         padding: 0px 16px;
-        transform: translateY(255px);
+        transform: translateY(45vw);
         position: relative;
         z-index: 2;
         padding-bottom: 100px;
@@ -528,8 +532,11 @@ export default {
                         flex-shrink: 0;
                         white-space: nowrap;
                     }
-
+                    &.authed_con{
+                        width: 90px;
+                    }
                     &.authed {
+                        width: 90px;
                         span {
                             color: #418bff;
                             background: #e8f3ff;
@@ -539,7 +546,8 @@ export default {
                         }
                     }
                     &.autheds {
-                        margin-right: 7px;
+                        width: 90px;
+                        margin-right: 10px;
                         span {
                             color: #39af00;
                             background: #f3ffed;
@@ -550,6 +558,8 @@ export default {
                     }
                     &.autheds_one {
                         position: relative;
+                        width: 90px;
+                        margin-right: 5px;
                         span {
                             display: block;
                             width: 50px;
@@ -573,7 +583,7 @@ export default {
                 }
             }
             .personal_signature {
-                margin-top: 8px;
+                margin-top: 12px;
                 font-size: 13px;
                 font-family: PingFangSC-Regular, PingFang SC;
                 font-weight: 400;

src/views/activity/Detail1.vue

@@ -127,6 +127,7 @@ export default {
     overflow: hidden;
     background-color: #27272b;
     margin-right: 10px;
+    flex-shrink: 0;
 
     div {
         font-size: 12px;
@@ -156,7 +157,8 @@ export default {
     .bottom(9px);
 
     /deep/.van-button {
-        width: 132px;
+        max-width: 132px;
+        flex-grow: 1;
         &.van-button--disabled {
             background: #303133;
             color: @text3;