Merge remote-tracking branch 'origin/rongxin_dev' into rongxin_dev

src/views/project/signUp.vue

@@ -32,9 +32,7 @@
           <span style="color:#C21F3A" @click="show1=true">《农村产权交易项目报名服务协议》</span>
         </p>
         <van-dialog v-model="show1" title="农村产权交易项目报名服务协议" confirmButtonText="关闭">
-
           <div class="dialog_content_center" v-html="fwxyConfig"></div>
-
         </van-dialog>
 
 
@@ -42,9 +40,14 @@
           <span style="color:#C21F3A" @click="show2=true">《竞买人承诺书》</span>
         </p>
         <van-dialog v-model="show2" title="竞买人承诺书" confirmButtonText="关闭">
-
           <div class="dialog_content_center" v-html="cnsConfig"></div>
+        </van-dialog>
 
+        <p style="margin-bottom:10px;">· 已阅读并知晓：
+          <span style="color:#C21F3A" @click="show3=true">《竞买须知》</span>
+        </p>
+        <van-dialog v-model="show3" title="竞买须知" confirmButtonText="关闭">
+          <div class="dialog_content_center" v-html="xzConfig"></div>
         </van-dialog>
 
         <van-checkbox v-model="checked" shape="square" checked-color="#007E72" >
@@ -226,6 +229,7 @@ export default {
       checked: false,
       show1: false,
       show2: false,
+      show3: false,
       color:"#007E72",
       nickName:"",
       userName:"",
@@ -253,6 +257,7 @@ export default {
       height:null,
       cnsConfig:'',
       fwxyConfig:'',
+      xzConfig:'',
       signFileUrl:'',
       signFileUrlUp:'',
     };
@@ -296,6 +301,7 @@ export default {
       this.bankName = res.data.bankName
     });
     getWebConfig().then(response =>{
+      this.xzConfig = response.data[6].configValue;
       this.fwxyConfig = response.data[15].configValue;
       this.cnsConfig = response.data[16].configValue;
     });