xuqiang 4 лет назад
Родитель
Сommit
7289e477ee

+ 5 - 3
src/main/pc-space/src/components/ConsignmentInfo.vue

@@ -15,7 +15,7 @@
             <div class="border"></div>
             <div class="title">寄售价格</div>
             <div class="price">
-                <el-form :model="form" ref="numberValidateForm" label-width="85px" class="demo-ruleForm">
+                <el-form :model="form" :rules="rules" ref="numberValidateForm" label-width="85px" class="demo-ruleForm">
                     <el-form-item
                         label="寄售价格(元)"
                         prop="price"
@@ -34,7 +34,7 @@
                     <el-form-item prop="password">
                         <el-input
                             style="width: 300px; margin: 20px 0 0 100px"
-                            type="number"
+                            type="password"
                             v-model="form.password"
                             placeholder="请输入纯数字交易密码"
                             autocomplete="off"
@@ -59,7 +59,9 @@ export default {
             isShow: false,
 
             form: { price: '', password: '' },
-
+            rules: {
+                password: { min: 6, max: 6, message: '密码长度在 6 到 6 个数字', trigger: 'blur' }
+            },
             list: [
                 {
                     title: '1. 作品寄售为单个作品价格'

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

@@ -9,7 +9,7 @@
             <el-form-item label="新交易密码" prop="password">
                 <el-input
                     style="width: 300px"
-                    type="number"
+                    type="password"
                     v-model="ruleForm.password"
                     placeholder="请输入新密码"
                     autocomplete="off"
@@ -18,7 +18,7 @@
             <el-form-item label="确认新密码" prop="checkPass">
                 <el-input
                     style="width: 300px"
-                    type="number"
+                    type="password"
                     v-model="ruleForm.checkPass"
                     placeholder="请再次输出新密码"
                     autocomplete="off"

+ 18 - 9
src/main/pc-space/src/views/Send.vue

@@ -41,12 +41,12 @@
                     <el-button type="info" @click="copy" size="mini" plain>复制</el-button>
                 </div>
             </div> -->
-            <el-form :model="form" ref="numberValidateForm" label-width="85px" class="demo-ruleForm">
+            <el-form :model="form" ref="rules" label-width="85px" class="demo-ruleForm">
                 <div class="title">请输入交易密码,验证信息</div>
                 <el-form-item prop="password">
                     <el-input
                         style="width: 300px; margin: 20px 0 0 100px"
-                        type="number"
+                        type="password"
                         v-model="form.password"
                         placeholder="请输入纯数字交易密码"
                         autocomplete="off"
@@ -108,13 +108,16 @@ export default {
             checked: true,
             id: 103,
             form: { password: '' },
-            gas: 1,
+            gas: 0,
+            rules: {
+                password: { min: 6, max: 6, message: '密码长度在 6 到 6 个数字', trigger: 'blur' }
+            },
             payList: [
-                {
-                    icon: require('../assets/alipay.png'),
-                    name: '支付宝',
-                    type: 'ALIPAY'
-                },
+                // {
+                //     icon: require('../assets/alipay.png'),
+                //     name: '支付宝',
+                //     type: 'ALIPAY'
+                // },
                 {
                     icon: require('../assets/weixin.png'),
                     name: '微信',
@@ -138,8 +141,14 @@ export default {
     },
     computed: {
         payUrl() {
-            return resolveUrl(this.$baseUrl, '9th/submit?id=' + this.info.id);
+            return resolveUrl(this.$baseUrl, '9th/payOrder/weixin_pc?id=' + this.info.id);
         }
+        // payUrl() {
+        //     return resolveUrl(
+        //         this.$baseUrl,
+        //         'https://nfttest.9space.vip/wx/redirect?redirectUrl=https://nfttest.9space.vip/payOrder/weixin_pc?id=2006'
+        //     );
+        // }
     },
     methods: {
         submit() {

+ 16 - 13
src/main/pc-space/src/views/Submit.vue

@@ -17,7 +17,7 @@
             </div>
 
             <div class="payMethods">
-                <!-- <div class="title">选择支付方式</div>
+                <div class="title">选择支付方式</div>
                 <div class="pay-list">
                     <div class="pay-info">
                         <el-radio-group v-model="payMethods">
@@ -27,7 +27,7 @@
                             </el-radio>
                         </el-radio-group>
                     </div>
-                </div> -->
+                </div>
 
                 <div class="qrcode">
                     <vue-qrcode :value="payUrl" :options="{ width: 140, margin: 1 }" class="code"></vue-qrcode>
@@ -63,21 +63,21 @@ export default {
             show: false,
             payMethods: 'ALIPAY',
             payList: [
-                {
-                    icon: require('../assets/alipay.png'),
-                    name: '支付宝',
-                    type: 'ALIPAY'
-                },
+                // {
+                //     icon: require('../assets/alipay.png'),
+                //     name: '支付宝',
+                //     type: 'ALIPAY'
+                // },
                 {
                     icon: require('../assets/weixin.png'),
                     name: '微信',
                     type: 'WEIXIN'
-                },
-                {
-                    icon: require('../assets/dcep.png'),
-                    name: 'DCEP支付',
-                    type: 'DCEP'
                 }
+                // {
+                //     icon: require('../assets/dcep.png'),
+                //     name: 'DCEP支付',
+                //     type: 'DCEP'
+                // }
             ],
             loading: true,
             info: {},
@@ -86,7 +86,10 @@ export default {
     },
     computed: {
         payUrl() {
-            return resolveUrl(this.$baseUrl, '9th/submit?id=' + this.info.id);
+            return resolveUrl(
+                this.$baseUrl,
+                'https://nfttest.9space.vip/wx/redirect?redirectUrl=https://nfttest.9space.vip/payOrder/weixin_pc?id=2006'
+            );
         },
         money() {
             if (this.info.price) {

+ 13 - 12
src/main/pc-space/src/views/user/Transaction.vue

@@ -84,18 +84,19 @@ export default {
             this.$router.go(-1);
         },
         codeSend() {
-            this.$http
-                .get('/sms/verify', {
-                    phone: this.userInfo.phone,
-                    code: this.ruleForm.code
-                })
-                .then(res => {
-                    this.token = res;
-                    this.flag = false;
-                })
-                .catch(e => {
-                    this.$message.error(e.error);
-                });
+            this.flag = false;
+            // this.$http
+            //     .get('/sms/verify', {
+            //         phone: this.userInfo.phone,
+            //         code: this.ruleForm.code
+            //     })
+            //     .then(res => {
+            //         this.token = res;
+            //         this.flag = false;
+            //     })
+            //     .catch(e => {
+            //         this.$message.error(e.error);
+            //     });
         },
         Jump() {
             this.flag = true;