xuqiang před 4 roky
rodič
revize
7e8d067213

+ 1 - 2
src/main/nine-space/src/mixins/product.js

@@ -53,7 +53,7 @@ export default {
     },
     methods: {
         changeImgs(list = []) {
-            console.log(list);
+            // console.log(list);
             return list.map(item => {
                 if (item.type === 'video/mp4') {
                     return item.thumb;
@@ -66,7 +66,6 @@ export default {
             return info.type === 'video/mp4';
         },
         getTime(startTime) {
-            console.log(22);
             if (!startTime) {
                 return;
             }

+ 30 - 1
src/main/nine-space/src/views/Givesubmit.vue

@@ -14,7 +14,7 @@
             <van-password-input :value="password" :focused="showKeyboard" @focus="showKeyboard = true" />
             <!-- 数字键盘 -->
             <van-number-keyboard v-model="password" :show="showKeyboard" @blur="showKeyboard = false" maxlength="6" />
-            <div class="text2">忘记密码?</div>
+            <div class="text2" @click="$router.push('/tradingPassword')">忘记密码?</div>
         </div>
         <div class="list">
             <div class="info">
@@ -55,6 +55,7 @@ export default {
         return {
             info: {},
             message: '',
+            password: '',
             payType: inWeixin ? 'WEIXIN' : 'ALIPAY',
             payInfos: [
                 {
@@ -76,6 +77,7 @@ export default {
             bottom: null,
             orderId: 0,
             gas: 1,
+            showKeyboard: false,
             inWeixin
         };
     },
@@ -217,6 +219,33 @@ export default {
         margin-right: 15px;
     }
 }
+
+/deep/ .van-password-input {
+    margin: 0 0;
+    .van-password-input__security {
+        border: 1px solid #939599;
+        height: 42px;
+        border-radius: 2px;
+        li {
+            background-color: transparent;
+            &:not(:last-child) {
+                border-right: 1px solid #939599;
+            }
+            i {
+                background-color: #fff;
+            }
+        }
+    }
+}
+/deep/.van-number-keyboard__body {
+    background-color: #4a4a4a;
+    .van-key {
+        background-color: @bg;
+        &:active {
+            background-color: @bg3;
+        }
+    }
+}
 .info {
     display: flex;
     align-items: center;

+ 1 - 0
src/main/nine-space/src/views/Home.vue

@@ -174,6 +174,7 @@ export default {
                 )
                 .then(res => {
                     this.miners = res.content;
+                    // console.log(this.miners);
                 });
         }
     }

+ 39 - 1
src/main/nine-space/src/views/asset/Consignment.vue

@@ -14,7 +14,7 @@
             <van-password-input :value="password" :focused="showKeyboard" @focus="showKeyboard = true" />
             <!-- 数字键盘 -->
             <van-number-keyboard v-model="password" :show="showKeyboard" @blur="showKeyboard = false" maxlength="6" />
-            <div class="text2">忘记密码?</div>
+            <div class="text2" @click="$router.push('/tradingPassword')">忘记密码?</div>
         </div>
         <div class="bottom van-safe-area-bottom" ref="bottom">
             <van-notice-bar
@@ -35,6 +35,8 @@ export default {
     name: 'Top',
     data() {
         return {
+            password: '',
+            showKeyboard: false,
             list: [
                 {
                     title: '1. 作品寄售为单个作品价格?'
@@ -59,6 +61,42 @@ export default {
 </script>
 
 <style lang="less" scoped>
+/deep/ .van-password-input {
+    margin: 0 0;
+    .van-password-input__security {
+        border: 1px solid #939599;
+        height: 42px;
+        border-radius: 2px;
+        li {
+            background-color: transparent;
+            &:not(:last-child) {
+                border-right: 1px solid #939599;
+            }
+            i {
+                background-color: #fff;
+            }
+        }
+    }
+}
+/deep/.van-number-keyboard__body {
+    background-color: #4a4a4a;
+    .van-key {
+        background-color: @bg;
+        &:active {
+            background-color: @bg3;
+        }
+    }
+}
+
+.input {
+    margin-top: 20px;
+    .text1 {
+        font-size: 14px;
+        color: #ffffff;
+        line-height: 24px;
+        margin-bottom: 6px;
+    }
+}
 .top {
     /deep/ .van-password-input {
         margin: 10px 0;

+ 1 - 1
src/main/pc-space/src/components/TransactionPhone.vue

@@ -59,7 +59,7 @@ export default {
                         },
                         trigger: 'blur'
                     },
-                    { min: 8, max: 8, message: '密码长度在 8 到 8 个数字', trigger: 'blur' }
+                    { min: 6, max: 6, message: '密码长度在 6 到 6 个数字', trigger: 'blur' }
                 ]
             }
         };