Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into develop

src/main.js

@@ -59,8 +59,8 @@ import Jpush from './scripts/jpushService'
 import Jmessage from './scripts/jmessageService'
 
 // if (process.env.CONFIG_ENV === 'uat') {
- const VConsole = require('vconsole')
-  new VConsole() // eslint-disable-line
+ //const VConsole = require('vconsole')
+ // new VConsole() // eslint-disable-line
 // }
 
 Vue.use(componentInstall)

src/pages/contractRepayment/refund.vue

@@ -20,15 +20,15 @@
             </tr>
             <tr>
               <td>本金</td>
-              <td>5,000.00</td>
-              <td>5,000.00</td>
-              <td>代扣;在线支付</td>
+              <td>{{ pop.principal|currency }}</td>
+              <td>{{ pop.received_principal|currency }}</td>
+              <td>{{ pop.pay_method }}</td>
             </tr>
             <tr>
-              <td>本金</td>
-              <td>5,000.00</td>
-              <td>5,000.00</td>
-              <td>代扣;在线支付</td>
+              <td>利息</td>
+              <td>{{ pop.interest|currency }}</td>
+              <td>{{ pop.received_interest|currency }}</td>
+              <td>{{ pop.pay_method }}</td>
             </tr>
           </table>
         </div>
@@ -51,11 +51,11 @@
         v-for="(item,index) in lists"
         :key="index"
         :class="{'plan-list':true,'or':statu==='orange','bl':statu==='blue','gr':statu==='green'}"
-        @click="showModel"
+        @click="showModel(item)"
       >
         <div
           :class="{'period':true,'orange':statu==='orange','blue':statu==='blue','green':statu==='green'}"
-        >{{ index + 1 }}期</div>
+        >{{ item.times }}期</div>
         <img v-if="statu === 'black'" src="@/assets/contractInquire/black.png" alt class="left" >
         <img v-if="statu === 'orange'" src="@/assets/contractInquire/orange.png" alt class="left" >
         <img v-if="statu === 'blue'" src="@/assets/contractInquire/blue.png" alt class="left" >
@@ -66,8 +66,8 @@
         </div>
         <div class="message">
           <p class="top">
-            现金流项目
-            <span>{{ item.cf_item_name }}</span>&nbsp; &nbsp; 支付
+            款项
+            <span>{{ item.cf_item_name }}</span>&nbsp; &nbsp; 付款方式
             <span>{{ item.pay_method }}</span>
           </p>
           <div class="name">
@@ -99,6 +99,7 @@ export default {
       //  已结清 black , 逾期 orange , 还款中 blue , 未还款 green
       statu: 'orange',
       show: true,
+      pop: {},
       info: {},
       lists: [],
     }
@@ -109,8 +110,11 @@ export default {
     })
   },
   methods: {
-    showModel () {
-      this.show = true
+    showModel (e) {
+      if (e.cf_item_name === '租金') {
+        this.show = true
+        this.pop = e
+      }
     },
     selectMonth (e) {
       return e.substring(5, 10)
@@ -174,7 +178,7 @@ export default {
           font-size: 14px;
           color: #1d3fff;
           font-weight: 600;
-          border-bottom: 1px solid #D9DBDF;
+          border-bottom: 1px solid #d9dbdf;
         }
         tr {
           width: 100%;
@@ -182,10 +186,10 @@ export default {
           line-height: 36px;
           text-align: center;
         }
-        td{
+        td {
           font-family: PingFangSC-Regular;
-font-size: 13px;
-color: #4B4A4B;
+          font-size: 13px;
+          color: #4b4a4b;
         }
       }
     }
@@ -233,18 +237,19 @@ color: #4B4A4B;
   .plan-content {
     background-color: #fff;
     padding: 0px 11px;
-
     .plan-list {
       position: relative;
       background-color: #f7f7f7;
-      height: 106px;
+      height: 126px;
       display: flex;
       padding-right: 20px;
       padding-left: 10px;
       padding-top: 16px;
       margin-bottom: 10px;
+      padding-bottom: 20px;
       .message {
         flex: 12;
+        height: 85%;
       }
       .left {
         height: 30px;
@@ -304,7 +309,7 @@ color: #4B4A4B;
       }
       .time {
         flex: 3;
-
+        height: 85%;
         p {
           font-family: DIN-Regular;
           font-size: 12px;

src/pages/contractRepayment/repay-details.vue

@@ -36,7 +36,7 @@
         </item>
         <item>
           <div slot="name">租赁物数量</div>
-          <div slot="content">{{ detailInfo.lease_num }}</div>
+          <div slot="content">{{ detailInfo.product_num }}</div>
         </item>
 
       </list-item>
@@ -88,7 +88,7 @@ export default {
         division_n: '',
         total_price: '',
         product_plan_id_n: '',
-        lease_num: '',
+        product_num: '',
       },
       lists: [{
         'lease_item_car_num': 'GH',

src/pages/contractStart/add-car.vue

@@ -128,18 +128,18 @@
           <div slot="name">商务政策</div>
           <input
             slot="content"
-            v-model="detail.product_plan_name"
+            v-model="detail.product_plan_id_n"
             placeholder="请选择合同政策"
             @click="selectProductPlan"
           >
         </item>
         <item v-if="read">
           <div slot="name">商务政策</div>
-          <input slot="content" v-model="detail.product_plan_name" readonly placeholder="暂无数据" >
+          <input slot="content" v-model="detail.product_plan_id_n" readonly placeholder="暂无数据" >
         </item>
         <item>
           <div slot="name">租赁物数量</div>
-          <input slot="content" v-model="detail.lease_num" readonly="read" placeholder="请输入租赁物数量" >
+          <input slot="content" v-model="detail.product_num " readonly="read" placeholder="请输入租赁物数量" >
         </item>
       </list-item>
       <div class="userInfo">设备清单</div>
@@ -292,7 +292,7 @@ export default {
         departure_date: '',
       },
       detail: {
-        lease_num: '',
+        product_num: '',
         first_pay: '',
         gps_fee: '',
         bp_name: '',
@@ -302,7 +302,6 @@ export default {
         division: '',
         division_n: '',
         product_plan_id: '',
-        product_plan_name: '',
         project_id: '',
         bp_id: '',
       },
@@ -612,7 +611,7 @@ export default {
         object: {},
         returnItem: function (index, obj) {
           vm.detail.product_plan_id = obj.bp_type
-          vm.detail.product_plan_name = obj.bp_type_n
+          vm.detail.product_plan_id_n = obj.bp_type_n
         },
       })
     },

src/pages/financingTrial/financing-details.vue

@@ -202,7 +202,6 @@ export default {
              code_name: item.annual_pay_times_n,
            }
          })
-         
        } else {
          hlsPopup.showLongCenter(res.message)
        }

src/pages/help/feedback.vue

@@ -24,7 +24,7 @@
               :key="index"
               class="file"
             >
-              <img :src="item.picture" @click="showBigPicture(item.picture)" >
+              <img :src="item.picture" class="file-img" @click="showBigPicture(item.picture)" >
               <div class="close" @click="remove_pic(item.attachment_id,index)">
                 <img src="@/assets/userBind/deleteIcon.png" >
               </div>
@@ -46,6 +46,8 @@
   </h-view>
 </template>
 <script>
+import ps from '../../assets/constractSigning/bank.png'
+
 export default {
   data () {
     return {
@@ -333,7 +335,7 @@ export default {
         align-items: center;
         justify-content: center;
         margin-left: 20px;
-        img {
+        .file-img {
           width: 80px;
           height: 80px;
         }

src/pages/myInfo/my-info.vue

@@ -178,14 +178,18 @@ export default {
     },
     // 进入待签约功能，客户类型为经销商则进入经销商功能，非经销商则进入合同签约
     goSign () {
-      if (this.user_bp_type === 'AGENT') {
-        this.$router.push({
-          name: 'ContractList',
-        })
+      if (this.bp_id) {
+        if (this.user_bp_type === 'AGENT') {
+          this.$router.push({
+            name: 'ContractList',
+          })
+        } else {
+          this.$router.push({
+            name: 'ContractSigning',
+          })
+        }
       } else {
-        this.$router.push({
-          name: 'ContractSigning',
-        })
+        hlsPopup.showLongCenter('请先进行用户绑定')
       }
     },
     // 进入待确认，（进件确认）
@@ -199,9 +203,13 @@ export default {
     },
     // 进入我的还款
     goReimburse () {
-      this.$router.push({
-        name: 'ReimburseMyselfList',
-      })
+      if (this.bp_id) {
+        this.$router.push({
+          name: 'ReimburseMyselfList',
+        })
+      } else {
+        hlsPopup.showLongCenter('请先进行用户绑定')
+      }
     },
     // 进入我的收藏
     goMyProduct () {
@@ -211,20 +219,32 @@ export default {
     },
     // 进入发车申请
     goStart () {
-      this.$router.push({
-        name: 'StartList',
-      })
+      if (this.bp_id) {
+        this.$router.push({
+          name: 'StartList',
+        })
+      } else {
+        hlsPopup.showLongCenter('请先进行用户绑定')
+      }
     },
     // 进入发车确认
     goCarConfirm () {
-      this.$router.push({
-        name: 'ConfirmList',
-      })
+      if (this.bp_id) {
+        this.$router.push({
+          name: 'ConfirmList',
+        })
+      } else {
+        hlsPopup.showLongCenter('请先进行用户绑定')
+      }
     },
     goVideoSign () {
-      this.$router.push({
-        name: 'VideoSign',
-      })
+      if (this.bp_id) {
+        this.$router.push({
+          name: 'VideoSign',
+        })
+      } else {
+        hlsPopup.showLongCenter('请先进行用户绑定')
+      }
     },
     changeHelp () {
       this.$router.push({
@@ -232,9 +252,13 @@ export default {
       })
     },
     changeDrawbackList () {
-      this.$router.push({
-        name: 'DrawbackList',
-      })
+      if (this.bp_id) {
+        this.$router.push({
+          name: 'DrawbackList',
+        })
+      } else {
+        hlsPopup.showLongCenter('请先进行用户绑定')
+      }
     },
     changePay () {
       if (window.sessionStorage.getItem('bp_id') !== 'undefined') {
@@ -446,32 +470,36 @@ export default {
     // 认证入口
     async certification () {
       let vm = this
-      if (vm.bp_identity === 'NP_NO' || vm.bp_identity === 'ORG_L_NO' || vm.bp_identity === 'ORG_AUTH_NO') {
-        let authUrl = await vm.getNpCertificationUrl()
-        if (authUrl) {
-          vm.$router.push({
-            name: 'Certification',
-            params: {
-              authUrl: authUrl,
-            },
-          })
-        } else {
-          hlsPopup.showLongCenter('获取认证url失败')
-        }
-      } else if (vm.bp_identity === 'ORG_NO') {
-        let authUrl = await vm.getOrgCertificationUrl()
-        if (authUrl) {
-          vm.$router.push({
-            name: 'Certification',
-            params: {
-              authUrl: authUrl,
-            },
-          })
+      if (vm.bp_id) {
+        if (vm.bp_identity === 'NP_NO' || vm.bp_identity === 'ORG_L_NO' || vm.bp_identity === 'ORG_AUTH_NO') {
+          let authUrl = await vm.getNpCertificationUrl()
+          if (authUrl) {
+            vm.$router.push({
+              name: 'Certification',
+              params: {
+                authUrl: authUrl,
+              },
+            })
+          } else {
+            hlsPopup.showLongCenter('获取认证url失败')
+          }
+        } else if (vm.bp_identity === 'ORG_NO') {
+          let authUrl = await vm.getOrgCertificationUrl()
+          if (authUrl) {
+            vm.$router.push({
+              name: 'Certification',
+              params: {
+                authUrl: authUrl,
+              },
+            })
+          } else {
+            hlsPopup.showLongCenter('获取认证url失败')
+          }
         } else {
-          hlsPopup.showLongCenter('获取认证url失败')
+          hlsPopup.showLongCenter('您已认证通过')
         }
       } else {
-        hlsPopup.showLongCenter('您已认证通过')
+        hlsPopup.showLongCenter('请先进行用户绑定')
       }
     },
     // 获取个人认证url

src/pages/videoSign/tab.vue

@@ -14,10 +14,10 @@
   </div>
 </template>
 <script>
-import signed from '@/assets/distributorSign/icon-signed.png'
-import finished from '@/assets/distributorSign/icon-finished.png'
-import sign from '@/assets/distributorSign/icon-sign.png'
-import finish from '@/assets/distributorSign/icon-finish.png'
+import signed from '@/assets/contractStart/noY.png'
+import finished from '@/assets/contractStart/confirmY.png'
+import sign from '@/assets/contractStart/noN.png'
+import finish from '@/assets/contractStart/confirmN.png'
 
 export default {
   props: {

src/scripts/filter.js

@@ -2,8 +2,8 @@
 export default (Vue) => {
   Vue.filter('currency', function (val) {
     if (!val) return '0.00'
-
-    var intPart = Number(val).toFixed(0) // 获取整数部分
+   // var intPart = Number(val).toFixed(0) // 获取整数部分
+    var intPart = val.toString().split('.')[0]
     var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') // 将整数部分逢三一断
 
     var floatPart = '.00' // 预定义小数部分

www/index.html

-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=CyOWd7pmPurvZ0PERgxEOlAlifG0y7Sp"></script><title>xcmg</title><link href=./static/css/app.84881c6cb7d5be64864b11323ab85fa6.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.efd596b798e6119ce4a4.js></script><script type=text/javascript src=./static/js/app.972addcd4e5bd52ea724.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=CyOWd7pmPurvZ0PERgxEOlAlifG0y7Sp"></script><title>xcmg</title><link href=./static/css/app.a4266b42e9e2d7359bb4ca6f12f1e0dd.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.efd596b798e6119ce4a4.js></script><script type=text/javascript src=./static/js/app.12d489fd8cb9b17cd278.js></script></body></html>
\ No newline at end of file