.

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

@@ -501,7 +501,6 @@ export default {
             border-width: 0px;
             margin-left: 10px;
         }
-
         .like {
             position: absolute;
             right: 0;

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

@@ -17,11 +17,7 @@
             <div class="title">寄售价格</div>
             <div class="price">
                 <el-form :model="form" :rules="rules" ref="numberValidateForm" label-width="85px" class="demo-ruleForm">
-                    <el-form-item
-                        label="寄售价格(元）"
-                        prop="price"
-                        :rules="[{ required: true, message: '价格不能为空' }]"
-                    >
+                    <el-form-item label="寄售价格(元）" prop="price">
                         <el-input
                             placeholder="请设置寄售价格"
                             style="width: 300px; margin-top: 20px"
@@ -32,19 +28,26 @@
                     </el-form-item>
                     <div class="border1"></div>
                     <div class="title">请输入交易密码，验证信息</div>
-                    <el-form-item prop="password">
-                        <el-input
-                            style="width: 300px; margin: 20px 0 0 100px"
-                            type="password"
-                            v-model="form.password"
-                            placeholder="请输入纯数字交易密码"
-                            autocomplete="off"
-                        ></el-input>
-                    </el-form-item>
+                    <div v-if="sets">
+                        <el-form-item prop="password">
+                            <el-input
+                                style="width: 300px; margin: 20px 0 0 100px"
+                                type="password"
+                                v-model="form.password"
+                                placeholder="请输入纯数字交易密码"
+                                autocomplete="off"
+                            ></el-input>
+                        </el-form-item>
+                        <div @click="all('/transaction')" class="password">
+                            <el-link type="danger" class="sets"> 忘记密码？</el-link>
+                        </div>
+                    </div>
+                    <div v-else>
+                        <el-link type="danger" @click="all('/transaction')" class="set"
+                            >您当前没有交易密码，点击去设置</el-link
+                        >
+                    </div>
                 </el-form>
-                <div @click="all('/transaction')" class="password">
-                    <el-link> 忘记密码？</el-link>
-                </div>
             </div>
             <span slot="footer" class="sub-btn">
                 <el-button :disabled="btn" type="primary" @click="submit">立即寄售</el-button>
@@ -54,14 +57,16 @@
     </el-dialog>
 </template>
 <script>
+import { mapState } from 'vuex';
 export default {
     data() {
         return {
             isShow: false,
-
+            sets: false,
             form: { price: '', password: '' },
             rules: {
-                password: { min: 6, max: 6, message: '密码长度在 6 到 6 个数字', trigger: 'blur' }
+                password: { min: 6, max: 6, message: '密码长度在 6 到 6 个数字', trigger: 'blur' },
+                price: { min: 1, max: 8, message: '价格长度在 1 到 8 位数', trigger: 'blur' }
             },
             list: [
                 {
@@ -83,6 +88,7 @@ export default {
         };
     },
     computed: {
+        ...mapState(['userInfo']),
         btn() {
             if (this.form.price && this.form.password) {
                 return false;
@@ -91,7 +97,23 @@ export default {
             }
         }
     },
+    mounted() {
+        if (this.isLogin) {
+            this.passFn();
+        }
+    },
     methods: {
+        passFn() {
+            this.$http
+                .get('/user/tradeCodeStatus', {
+                    // set: true
+                    userId: this.userInfo.id
+                })
+                .then(res => {
+                    console.log(res);
+                    this.sets = res.set;
+                });
+        },
         handleClose() {
             this.isShow = false;
         },
@@ -169,6 +191,9 @@ input::-webkit-inner-spin-button {
 /deep/ .el-dialog__body {
     padding: 0;
 }
+/deep/ .el-form-item__content {
+    margin-left: 98px !important;
+}
 /deep/ .el-form-item__label {
     width: 200px !important;
     margin-top: 20px;
@@ -218,6 +243,20 @@ input::-webkit-inner-spin-button {
             margin-top: 0;
         }
     }
+    .sets {
+        /deep/ .el-link--inner {
+            color: #ff4f50;
+        }
+    }
+    .set {
+        font-size: 14px;
+        line-height: 24px;
+        margin-top: 50px;
+        margin-left: 225px;
+        /deep/ .el-link--inner {
+            color: #ff4f50;
+        }
+    }
     .sub-btn {
         padding-top: 62px;
         display: flex;

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

@@ -124,7 +124,7 @@
                     <div class="name name2">持有特权<span>（灰色表示已使用）</span></div>
                 </div>
                 <div class="init1">
-                    <div class="name">{{ info.category || '暂无' }}</div>
+                    <div class="name">{{ info.category || '铸造者未设置' }}</div>
                     <div class="bor"></div>
                     <div class="box" v-if="init2 != ''">
                         <div

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

@@ -112,7 +112,7 @@
                     <div class="name name2">持有特权<span>（灰色表示已使用）</span></div>
                 </div>
                 <div class="init1">
-                    <div class="name">{{ info.category }}</div>
+                    <div class="name">{{ info.category || '铸造者未设置' }}</div>
                     <!-- <div class="Notset">铸造者未设置</div> -->
                     <div class="bor"></div>
                     <div class="box" v-if="init2 != ''">

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

@@ -1,7 +1,7 @@
 <template>
     <el-dialog center title="赠送" :visible.sync="show" width="680px" :before-close="handleClose">
         <div class="page" v-loading="loading">
-            <div class="top-tips">通过手机号码检索用户信息，<span>赠送后该加密作品将会被转移</span></div>
+            <div class="top-tips">通过手机号码检索用户信息，<span class="span1">赠送后该加密作品将会被转移</span></div>
             <div class="user">
                 <el-input
                     v-model="phone"
@@ -43,19 +43,27 @@
             </div> -->
             <el-form :model="form" :rules="rules" 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="password"
-                        v-model="form.password"
-                        placeholder="请输入纯数字交易密码"
-                        autocomplete="off"
-                    ></el-input>
-                </el-form-item>
+                <div v-if="sets">
+                    <el-form-item prop="password">
+                        <el-input
+                            style="width: 300px; margin: 20px 0 0 100px"
+                            type="password"
+                            v-model="form.password"
+                            placeholder="请输入纯数字交易密码"
+                            autocomplete="off"
+                        ></el-input>
+                    </el-form-item>
+                    <div @click="all('/transaction')" class="password">
+                        <el-link class="sets" type="danger"> 忘记密码？</el-link>
+                    </div>
+                </div>
+                <div v-else>
+                    <el-link type="danger" @click="all('/transaction')" class="set"
+                        >您当前没有交易密码，点击去设置</el-link
+                    >
+                </div>
             </el-form>
-            <div @click="all('/transaction')" class="password">
-                <el-link> 忘记密码？</el-link>
-            </div>
+
             <div class="payMethods">
                 <div class="title">支付GAS</div>
                 <div class="pay-list">
@@ -104,6 +112,7 @@
 
 <script>
 import vueQrcode from '@chenfengyuan/vue-qrcode';
+import { mapState } from 'vuex';
 import resolveUrl from 'resolve-url';
 import phone from '../mixins/phone';
 export default {
@@ -148,13 +157,17 @@ export default {
             seconds: 0,
             allTime: 5 * 60 - 1,
             closeTime: '',
-            phone: ''
+            phone: '',
+            sets: false
         };
     },
     mounted() {
         this.$http.get('/sysConfig/get/gas_fee').then(res => {
             this.gas = res.value;
         });
+        if (this.isLogin) {
+            this.passFn();
+        }
     },
     computed: {
         btn() {
@@ -164,6 +177,7 @@ export default {
                 return true;
             }
         },
+        ...mapState(['userInfo']),
         payUrl() {
             return resolveUrl(
                 this.$baseUrl,
@@ -173,6 +187,17 @@ export default {
         }
     },
     methods: {
+        passFn() {
+            this.$http
+                .get('/user/tradeCodeStatus', {
+                    // set: true
+                    userId: this.userInfo.id
+                })
+                .then(res => {
+                    console.log(res);
+                    this.sets = res.set;
+                });
+        },
         handleClose() {
             this.show = false;
             if (this.payTimeout) {
@@ -373,6 +398,20 @@ export default {
 //     line-height: 24px;
 //     text-align: center;
 // }
+.sets {
+    /deep/ .el-link--inner {
+        color: #ff4f50;
+    }
+}
+.set {
+    font-size: 14px;
+    line-height: 24px;
+    margin-top: 50px;
+    margin-left: 225px;
+    /deep/ .el-link--inner {
+        color: #ff4f50;
+    }
+}
 .info {
     .flex();
     height: 94px;
@@ -545,11 +584,10 @@ export default {
     font-size: 14px;
     color: #939599;
     line-height: 28px;
-    span {
-        color: #ff4f50;
-    }
 }
-
+.span1 {
+    color: #ff4f50 !important;
+}
 .user {
     padding: 20px 0;
 

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

@@ -197,6 +197,7 @@ export default {
         if (this.isLogin) {
             this.add();
         }
+        
     },
     methods: {
         initTime(dingdanId, initTime) {
@@ -248,6 +249,7 @@ export default {
                 }, 1000);
             }
         },
+        
         add() {
             this.$http
                 .post(