Merge branch 'ren' into develop

src/pages/contractSigning/contract-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-12-05 19:09:00
+ * @LastEditTime: 2019-12-09 11:01:19
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -413,6 +413,7 @@ export default {
         vm.getBseMsg()
         vm.getLease()
         vm.getGuarantor()
+        vm.getContractLists() // 合同列表
       } else if (from.name === 'EntryInfo') {
         vm.bankCardQuery()
       }
@@ -720,7 +721,22 @@ export default {
         }
       })
     },
-
+    // 合同列表查询
+    getContractLists () {
+      let vm = this
+      let url = $config.basePath + 'prj_contract_text_query'
+      let param = {
+        project_id: vm.project_id,
+      }
+      vm.hlsPopup.showLoading('数据加载中')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        console.log('合同列表', res)
+        // if (res.result === 'S') {
+        //   vm.info = res.info
+        // }
+      })
+    },
     // 还款计划
     repayPlan () {
       this.$router.push({

src/pages/financingTrial/financing-details.vue

@@ -2,7 +2,7 @@
    * @Descrip""/>User Settings Edit
  * @Author: your name
  * @Date: 2019-09-29 20:31:00
- * @LastEditTime: 2019-12-06 11:16:12
+ * @LastEditTime: 2019-12-09 13:57:18
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -298,9 +298,6 @@ export default {
 </script>
 <style lang='less' scoped>
   #details1 {
-    .content {
-      padding-bottom: 200px;
-    }
     .date-pic {
       height: 17px;
       width: 17px;

src/pages/help/feedback.vue

@@ -10,7 +10,7 @@
       <h4>问题反馈</h4>
       <div class="write">
         <div class="box">
-          <span @click="getPic">问题描述</span>
+          <span>问题描述</span>
           <textarea v-model="question_desc" placeholder="请输入您的描述……" />
         </div>
       </div>
@@ -20,7 +20,7 @@
           <div class="file-content">
             <div
               v-for="(item, index) in upload_list"
-              v-if="item.check_id==list.check_id"
+              v-if="item.check_id===question_id"
               :key="index"
               class="file"
             >
@@ -32,7 +32,7 @@
             <!-- <div class="file">
               <img src="@/assets/help/1.jpg" >
             </div> -->
-            <div class="file" @click="imgUploadShow(list.check_id)">
+            <div class="file" @click="imgUploadShow(question_id)">
               <img class="photo" src="@/assets/help/photo.png" >
             </div>
           </div>
@@ -52,9 +52,7 @@ export default {
   data () {
     return {
       question_desc: '', // 问题描述
-      list: {
-        chck_id: this.$route.params.question_id,
-      },
+      question_id: '',
       upload_list: [], // 上传图片列表
     }
   },
@@ -63,6 +61,8 @@ export default {
       if (from.name === 'HelpList') {
         vm.question_desc = ''
         vm.upload_list = []
+        vm.question_id = ''
+        vm.getQuestionId()
       }
     })
   },
@@ -269,20 +269,18 @@ export default {
       vm.upload_list.remove(index)
       vm.upload_list.sort()
     },
-    // 获取图片
-    getPic () {
+
+    // 获取question_id
+    getQuestionId () {
       let vm = this
-      let url = process.env.basePath + 'app_attment_query'
-      let param = {
-        master: {
-          source_type: 'HLS_APP_QUESTION',
-          pkvalue: vm.$route.params.question_id,
-        },
-      }
-      hlsPopup.showLoading('请稍候')
-      vm.$post(url, param).then(function (res) {
+      let url = process.env.basePath + 'get_app_question_id'
+      let param = { }
+      vm.hlsPopup.showLoading('请稍后!')
+      vm.hlsHttp.post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
-        console.log('sssss', res)
+        if (res.result === 'S') {
+          vm.question_id = res.info.question_id
+        }
       })
     },
   },

src/pages/help/help-list.vue

@@ -85,20 +85,8 @@ export default {
       })
     },
     changeFeedback () {
-      let vm = this
-      let url = process.env.basePath + 'get_app_question_id'
-      let param = { }
-      vm.hlsPopup.showLoading('请稍后!')
-      vm.hlsHttp.post(url, param).then(function (res) {
-        vm.hlsPopup.hideLoading()
-        if (res.result === 'S') {
-          vm.$router.push({
-            name: 'HelpFeedback',
-            params: {
-              question_id: res.info.question_id,
-            },
-          })
-        }
+      this.$router.push({
+        name: 'HelpFeedback',
       })
     },
   },