修改

src/main/nine-space/src/views/account/VerifiedSucs.vue

@@ -123,18 +123,30 @@
                 :rules="[{ required: true, message: '请输入企业名称' }]"
             >
             </van-field>
-            <div>工商营业执照注册号/统一社会信用代码</div>
+            <div class="name">工商营业执照注册号/统一社会信用代码</div>
             <van-field
                 placeholder="工商营业执照注册号/统一社会信用代码"
                 v-model="form.orgNo"
                 :rules="[{ required: true, message: '工商营业执照注册号/统一社会信用代码' }]"
             >
             </van-field>
+            <van-checkbox :value="checked" @change="onChange">长期</van-checkbox>
+            <!-- <van-field name="isPostPoster" label="9.是否在明显位置张贴《疫情防控指南》海报?">
+                <template #input>
+                    <van-radio-group v-model="formData.isPostPoster" direction="horizontal">
+                        <van-radio :name="true">
+                            是
+                            <template #icon="props">
+                                <img class="img-icon" :src="props.checked ? activeIcon : inactiveIcon" />
+                            </template>
+                        </van-radio>
+                    </van-radio-group>
+                </template>
+            </van-field> -->
             <van-field
-                label="拼箱结束"
-                is-link
+                label="例2034-06-17"
                 :value="form.startTime"
-                placeholder="请输入结束日期"
+                placeholder="请选择"
                 @click="pickerShow('newShow')"
                 readonly
             >
@@ -198,6 +210,7 @@ export default {
     mixins: [phone],
     data() {
         return {
+            checked: true,
             active: 'phone',
             emailPattern: /^([a-zA-Z0-9]+[_|_|\-|.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|_|.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,6}$/,
             IDPattern: /^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/,
@@ -232,6 +245,7 @@ export default {
     methods: {
         onInput(event) {
             console.log(event);
+            var date = new Date(date);
             this.setData({
                 currentDate: event.detail
             });
@@ -240,6 +254,12 @@ export default {
             this[key] = true;
             // wx.hideKeyboard();
         },
+        onChange(event) {
+            console.log(event);
+            this.setData({
+                checked: event.detail
+            });
+        },
         // // 时间确认按钮
         // onConfirm(event) {
         //     this.currentDate = event.detail;
@@ -308,6 +328,13 @@ export default {
         }
     }
 }
+.name {
+    font-size: 14px;
+    font-weight: bold;
+    color: #ffffff;
+    line-height: 24px;
+    margin-top: 10px;
+}
 .van-cell::after {
     border-bottom-color: #202122;
 }

src/main/nine-space/src/views/asset/Consignment.vue

@@ -6,7 +6,7 @@
         </div>
         <div class="border border1"></div>
         <div class="content">
-            <van-field type="number" label="寄售价格(元)" placeholder="请设置寄售价格" v-model="message" />
+            <van-field type="number" label="寄售价格(元)" placeholder="请设置寄售价格" v-model="price" />
         </div>
         <div class="border"></div>
         <div class="input">
@@ -35,8 +35,9 @@ export default {
     name: 'Top',
     data() {
         return {
-            password: '',
+            price: '',
             showKeyboard: false,
+            password: '',
             list: [
                 {
                     title: '1. 作品寄售为单个作品价格'
@@ -56,7 +57,34 @@ export default {
             ]
         };
     },
-    methods: {}
+    methods: {
+        submit() {
+            this.$http
+                .post('/user/verifyTradeCode', {
+                    tradeCode: this.password
+                })
+                .then(() => {
+                    this.$http
+                        .post('/asset/consignment', {
+                            id: this.$route.query.id,
+                            price: this.price
+                        })
+                        .then(res => {
+                            console.log(res);
+                        })
+                        .catch(e => {
+                            if (e) {
+                                this.$toast(e.error);
+                            }
+                        });
+                })
+                .catch(e => {
+                    if (e) {
+                        this.$toast(e.error);
+                    }
+                });
+        }
+    }
 };
 </script>
 

src/main/nine-space/src/views/asset/Detail.vue

@@ -119,7 +119,7 @@
         </div> -->
         <div class="btn van-safe-area-bottom" ref="btn">
             <div class="btns1">
-                <div @click="$router.push('/giveSearch')">
+                <div @click="$router.push('/giveSearch?id' + info.id)">
                     <img
                         class="img"
                         src="https://9space-2021.oss-cn-shenzhen.aliyuncs.com/image/2021-11-09-15-17-04hsdZwERv.png"
@@ -130,7 +130,9 @@
                 <van-button class="btn1" type="primary" block round @click="Exhibition">{{
                     info.publicShow ? '取消展示' : '公开展示'
                 }}</van-button>
-                <van-button type="primary" block round @click="$router.push('/Consignment')">寄售上架</van-button>
+                <van-button type="primary" block round @click="$router.push('/Consignment?id' + info.id)"
+                    >寄售上架</van-button
+                >
             </div>
         </div>
 

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

@@ -64,9 +64,10 @@
                         ></el-input>
                     </el-form-item>
                     <div class="content">
-                        <el-form-item prop="orgLicenseExpire" label="工商营业执照有效日期截止时间">
+                        <el-form-item @change="Price" prop="orgLicenseExpire" label="工商营业执照有效日期截止时间">
                             <el-date-picker
                                 v-model="sizeForm.orgLicenseExpire"
+                                :disabled="sizeForm.negotiateDirectly"
                                 type="date"
                                 style="width: 300px"
                                 value-format="yyyy-MM-dd"
@@ -74,9 +75,7 @@
                             >
                             </el-date-picker>
                         </el-form-item>
-                        <template>
-                            <el-radio v-model="sizeForm.radio" label="1">长期</el-radio>
-                        </template>
+                        <el-checkbox @change="Directly" v-model="sizeForm.negotiateDirectly">长期</el-checkbox>
                     </div>
                     <div class="description">证照有效截止日期需大于60天，如证照上日期为长期或无，请勾选长期</div>
                     <el-form-item label="营业执照" prop="orgLicense">
@@ -102,12 +101,12 @@ export default {
             sizeForm: {
                 realName: '',
                 orgLicenseExpire: '',
+                negotiateDirectly: false,
                 idFront: '',
                 orgLicense: '',
                 idBack: '',
                 orgName: '',
                 orgNo: '',
-                // phone: '',
                 idNo: '',
                 radio: '1'
             },
@@ -120,12 +119,25 @@ export default {
                     message: '请输入18位统一社会信用代码',
                     trigger: 'blur'
                 },
+                orgLicenseExpire: [
+                    {
+                        required: true,
+                        validator: (rule, value, callback) => {
+                            if (!this.sizeForm.negotiateDirectly) {
+                                if (!this.sizeForm.orgLicenseExpire) {
+                                    callback(new Error('请选择日期截止方式'));
+                                } else {
+                                    callback();
+                                }
+                            } else {
+                                callback();
+                            }
+                        }
+                    }
+                ],
                 idNo: { required: true, min: 18, max: 18, message: '请输入18位身份证号', trigger: 'blur' },
                 realName: { required: true, message: '请输入', trigger: 'blur' },
-                orgLicenseExpire: { required: true, message: '请选择', trigger: 'blur' },
-                // orgNo: { required: true, message: '请选择', trigger: 'blur' },
                 orgName: { required: true, message: '请输入企业名称', trigger: 'blur' },
-                // phone: { required: true, message: '请输入您的联系方式', trigger: 'blur' },
                 idFront: { required: true, message: '请添加您的法人身份证（正面）', trigger: 'blur' },
                 idBack: { required: true, message: '请添加您的法人身份证（反面）', trigger: 'blur' },
                 orgLicense: { required: true, message: '请添加营业执照', trigger: 'blur' }
@@ -147,23 +159,18 @@ export default {
             });
         }
     },
-    // created() {
-    //     this.$http
-    //         .get('/personal/my')
-    //         .then(res => {
-    //             this.sizeForm = {
-    //                 ...res,
-    //                 realName: this.userInfo.realName,
-    //                 phone: this.userInfo.phone,
-    //                 avatar: this.userInfo.avatar,
-    //                 email: this.userInfo.email
-    //             };
-    //         })
-    //         .catch(e => {
-    //             console.log(e);
-    //         });
-    // },
     methods: {
+        Price() {
+            if (this.sizeForm.orgLicenseExpire) {
+                this.sizeForm.negotiateDirectly = false;
+            }
+        },
+        Directly() {
+            if (this.sizeForm.negotiateDirectly == true) {
+                this.$set(this.sizeForm, 'orgLicenseExpire', undefined);
+            }
+            this.$forceUpdate();
+        },
         Jump() {
             this.$router.go(-1);
         },
@@ -185,12 +192,11 @@ export default {
         },
         preservation() {
             let form = { ...this.sizeForm };
+            delete form.negotiateDirectly;
             form.userId = this.userInfo.id;
             form.status = 'PENDING';
             form.org = true;
             console.log(form);
-            // let org = false;
-            // this.updateUser({ org: org }).then(res => {
             this.$http
                 .post('/identityAuth/apply', {
                     ...form
@@ -198,7 +204,6 @@ export default {
                 .then(res => {
                     this.$store.dispatch('getUserInfo', res);
                 });
-            // });
         }
     }
 };
@@ -225,8 +230,12 @@ export default {
     /deep/ .el-form-item__content {
         display: flex;
     }
-    /deep/ .el-radio {
-        margin-top: 14px;
+    /deep/ .el-checkbox {
+        margin-top: 12px;
+        border-radius: 50%;
+    }
+    /deep/ .el-checkbox__inner {
+        border-radius: 50%;
     }
     /deep/ .el-button {
         width: 130px;

src/main/vue/package-lock.json

@@ -1871,70 +1871,6 @@
           "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
           "dev": true
         },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true,
-          "optional": true
-        },
-        "emojis-list": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-          "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true,
-          "optional": true
-        },
-        "loader-utils": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
-          "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
         "minimist": {
           "version": "1.2.5",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
@@ -1949,28 +1885,6 @@
           "requires": {
             "minipass": "^3.1.1"
           }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "vue-loader-v16": {
-          "version": "npm:vue-loader@16.8.3",
-          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
-          "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "chalk": "^4.1.0",
-            "hash-sum": "^2.0.0",
-            "loader-utils": "^2.0.0"
-          }
         }
       }
     },
@@ -4636,7 +4550,7 @@
     },
     "de-indent": {
       "version": "1.0.2",
-      "resolved": "https://registry.npm.taobao.org/de-indent/download/de-indent-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
       "integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=",
       "dev": true
     },
@@ -14077,6 +13991,94 @@
         }
       }
     },
+    "vue-loader-v16": {
+      "version": "npm:vue-loader@16.8.3",
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
+      "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "chalk": "^4.1.0",
+        "hash-sum": "^2.0.0",
+        "loader-utils": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true,
+          "optional": true
+        },
+        "emojis-list": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+          "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+          "dev": true,
+          "optional": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true,
+          "optional": true
+        },
+        "loader-utils": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
+          "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
     "vue-router": {
       "version": "3.5.3",
       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.3.tgz",
@@ -14101,9 +14103,9 @@
       }
     },
     "vue-template-compiler": {
-      "version": "2.6.10",
-      "resolved": "https://registry.npm.taobao.org/vue-template-compiler/download/vue-template-compiler-2.6.10.tgz",
-      "integrity": "sha1-MjtPNJXwT6o1AzN6gvXWUHeZycw=",
+      "version": "2.6.14",
+      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz",
+      "integrity": "sha512-ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g==",
       "dev": true,
       "requires": {
         "de-indent": "^1.0.2",