'提交代码'

src/pages/contractSigning/contract-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-11-13 09:37:51
+ * @LastEditTime: 2019-11-13 17:20:21
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -565,12 +565,11 @@ export default {
           auth_credit_flag: 'Y',
         },
       }
-      // vm.hlsPopup.showLoading('数据加载中')
+      vm.hlsPopup.showLoading('请稍后')
       vm.hlsHttp.post(url, param).then(function (res) {
-      // vm.hlsPopup.hideLoading()
+        vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-          // vm.guarantorInfo = res.lists
-          console.log('同意')
+
         }
       })
     },

src/pages/distributorSign/contract-list.vue

@@ -19,55 +19,55 @@
         <img src="@/assets/distributorSign/search.png" alt="">
       </div>
     </div>
-      <scroll
-        v-if="tabNum === 0"
-        ref="scroll"
-        :updateData="[submitLists]"
-        :pullUp="true"
-      >
-        <div class="wrap">
-          <div v-for="(item,index) in submitLists" :key="index" class="contract-lists" >
-            <div class="pro-code" @click="goDetails(item)">
-              <img src="@/assets/distributorSign/fileIcon.png" alt="" class="file-icon">
-              <p>
-                <span>合同号</span>
-                <span>{{ item.project_number }}</span>
-              </p>
-              <img src="@/assets/distributorSign/goDetails.png" alt="" class="arrow">
-            </div>
-            <div class="box">
-              <div><p>承租人</p><p>{{ item.bp_name }}</p></div>
-              <div><p>合同租金</p><p class="money">{{ item.total_price|currency }}</p></div>
-              <div><p>申请时间</p><p>{{ dateConverse(item.confirm_start_date) }}</p></div>
-            </div>
+    <scroll
+      v-if="tabNum === 0"
+      ref="scroll"
+      :updateData="[submitLists]"
+      :pullUp="true"
+    >
+      <div class="wrap">
+        <div v-for="(item,index) in submitLists" :key="index" class="contract-lists" >
+          <div class="pro-code" @click="goDetails(item)">
+            <img src="@/assets/distributorSign/fileIcon.png" alt="" class="file-icon">
+            <p>
+              <span>合同号</span>
+              <span>{{ item.project_number }}</span>
+            </p>
+            <img src="@/assets/distributorSign/goDetails.png" alt="" class="arrow">
+          </div>
+          <div class="box">
+            <div><p>承租人</p><p>{{ item.bp_name }}</p></div>
+            <div><p>合同租金</p><p class="money">{{ item.total_price|currency }}</p></div>
+            <div><p>申请时间</p><p>{{ dateConverse(item.confirm_start_date) }}</p></div>
           </div>
         </div>
-      </scroll>
+      </div>
+    </scroll>
 
-      <scroll
-        v-if="tabNum === 1"
-        ref="scrollList"
-        :updateData="[approvedLists]"
-        :pullUp="true"
-      >
-        <div class="wrap">
-          <div v-for="(item,index) in approvedLists" :key="index" class="contract-lists" >
-            <div class="pro-code" @click="goDetails(item)">
-              <img src="@/assets/distributorSign/fileIcon.png" alt="" class="file-icon">
-              <p>
-                <span>合同号</span>
-                <span>{{ item.project_number }}</span>
-              </p>
-              <img src="@/assets/distributorSign/goDetails.png" alt="" class="arrow">
-            </div>
-            <div class="box">
-              <div><p>承租人</p><p>{{ item.bp_name }}</p></div>
-              <div><p>合同租金</p><p class="money">{{ item.total_price|currency }}</p></div>
-              <div><p>申请时间</p><p>{{ dateConverse(item.confirm_start_date) }}</p></div>
-            </div>
+    <scroll
+      v-if="tabNum === 1"
+      ref="scrollList"
+      :updateData="[approvedLists]"
+      :pullUp="true"
+    >
+      <div class="wrap">
+        <div v-for="(item,index) in approvedLists" :key="index" class="contract-lists" >
+          <div class="pro-code" @click="goDetails(item)">
+            <img src="@/assets/distributorSign/fileIcon.png" alt="" class="file-icon">
+            <p>
+              <span>合同号</span>
+              <span>{{ item.project_number }}</span>
+            </p>
+            <img src="@/assets/distributorSign/goDetails.png" alt="" class="arrow">
+          </div>
+          <div class="box">
+            <div><p>承租人</p><p>{{ item.bp_name }}</p></div>
+            <div><p>合同租金</p><p class="money">{{ item.total_price|currency }}</p></div>
+            <div><p>申请时间</p><p>{{ dateConverse(item.confirm_start_date) }}</p></div>
           </div>
         </div>
-      </scroll>
+      </div>
+    </scroll>
 
   </h-view>
 </template>
@@ -96,34 +96,34 @@ export default {
       let vm = this
       let url = $config.basePath + 'prj_confirm_list_query'
       let param = {
-      user_phone: window.localStorage.user_phone,
-    }
+        user_phone: window.localStorage.user_phone,
+      }
       vm.hlsPopup.showLoading('数据加载中')
       vm.hlsHttp.post(url, param).then(function (res) {
-      vm.hlsPopup.hideLoading()
-      if (res.result === 'S') {
-        vm.submitLists = res.lists.filter(item => item.confirm_status === 'SUBMIT')
-        vm.approvedLists = res.lists.filter(item => item.confirm_status === 'APPROVED')
-        if (vm.submitLists.length > 0 && vm.submitLists.length < 10) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.submitLists = res.lists.filter(item => item.confirm_status === 'SUBMIT')
+          vm.approvedLists = res.lists.filter(item => item.confirm_status === 'APPROVED')
+          if (vm.submitLists.length > 0 && vm.submitLists.length < 10) {
             vm.$refs.scroll.update(true)
           }
           if (vm.approvedLists.length > 0 && vm.approvedLists.length < 10) {
             vm.$refs.scrollList.update(true)
           }
-      }else {
-        hlsPopup.showLongCenter(res.message)
-      }
-    })
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
     },
     goDetails (item) {
+      window.sessionStorage.setItem('confirm_id', item.confirm_id)
       window.sessionStorage.setItem('bp_class', item.bp_class)
       window.sessionStorage.setItem('project_id', item.project_id)
+      window.sessionStorage.setItem('confirm_status', item.confirm_status)
       this.$router.push({
         name: 'ContractDetails',
         params: {
           confirm_id: item.confirm_id,
-          confirm_status: item.confirm_status,
-          hasButtom: true,
         },
       })
     },

src/pages/distributorSign/financ-details.vue

 <!--
  * @Author: your name
  * @Date: 2019-10-30 19:29:24
- * @LastEditTime: 2019-11-13 10:39:56
+ * @LastEditTime: 2019-11-13 16:36:01
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -17,7 +17,7 @@
 
       <div class="total">
         <div class="sum">
-          <div>融资额</div>
+          <div>租金总额</div>
           <p>{{ info.total_rental_sum | currency }}</p>
           <img src="@/assets/contractInquire/num.png" alt="">
           <h3><span>{{ info.lease_times }}期</span></h3>
@@ -46,11 +46,11 @@
           <span>{{ dateConverse(item.due_date).substr(5,10) }}</span>
         </div>
         <div class="name">
-          <p>款项</p>
-          <p>租金</p>
+          <span>款项</span>
+          <span>租金</span>
         </div>
         <div class="number">
-          <p>应还金额</p>
+          <span>应还金额</span>
           <span :class="{'orang':statu==='orange','blu':statu==='blue','gree':statu==='green'}">{{ item.rental*product_num |currency }}</span>
         </div>
         <img v-if="statu === 'black'" src="@/assets/contractInquire/done.png" alt="" class="status">

src/pages/myInfo/my-info.vue

 <!--
  * @Author: your name
  * @Date: 2019-11-07 17:48:53
- * @LastEditTime: 2019-11-08 14:20:16
+ * @LastEditTime: 2019-11-13 11:29:25
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->

src/pages/productQuery/product-detailed.vue

@@ -2,7 +2,7 @@
  * @Descrip: 产品明细
  * @Author: your name
  * @Date: 2019-10-15 14:30:00
- * @LastEditTime: 2019-11-08 14:06:15
+ * @LastEditTime: 2019-11-13 14:44:06
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -178,6 +178,7 @@ export default {
         vueTouch: function (s, e) {
           let clientHeight = document.body.clientHeight // 屏幕可视高度
           let procnfGather = document.getElementsByClassName('procnf')[0].getBoundingClientRect() // 配置信息元素集合
+          console.log(procnfGather)
           let detailGather = document.getElementsByClassName('prodetail')[0].getBoundingClientRect() // 详情信息元素集合
           let baseGather = document.getElementsByClassName('base')[0].getBoundingClientRect() // 基本信息元素集合
           if (clientHeight - procnfGather.top >= procnfGather.height) {
@@ -277,7 +278,6 @@ export default {
                 item['url'] = process.env.filePath + 'attachment_id=' + item.product_attachment_id + '&access_token=' + window.localStorage.access_token
               })
               vm.picLists = res.lists
-              console.log(vm.picLists)
             } else {
               hlsPopup.showLongCenter(res.message)
             }