Merge branch 'liuxin' into develop

index.html

@@ -8,6 +8,7 @@
   <!--<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">-->
   <meta name="format-detection" content="telephone=no">
   <meta name="format-detection" content="email=no">
+
   <!-- safari私有meta标签 允许全屏模式浏览 指定safari顶部状态栏样式(黑色) -->
   <meta name="apple-mobile-web-app-capable" content="yes">
   <meta name="apple-mobile-web-app-status-bar-style" content="black">

src/pages/carConfirm/confirm-list.vue

@@ -53,7 +53,9 @@ export default {
     return {
       tabNum: 0,
       keyWord: '',
-      pagenum: 1,
+      status: '',
+      pagenumNew: 1,
+      pagenumApproved: 1,
       lists: [],
       showList: [],
       undo: [],
@@ -64,10 +66,13 @@ export default {
     tabNum: {
       handler (newVal, oldVal) {
         if (newVal === 0) {
+          this.status = 'SUBMIT'
           this.showList = this.undo
         } else if (newVal === 1) {
+          this.status = 'APPROVED'
           this.showList = this.done
         }
+        this.getList()
       },
       immediate: true,
     },
@@ -78,9 +83,9 @@ export default {
   created () {},
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      vm.pagenum = 1
+      vm.pagenumNew = 1
+      vm.pagenumApproved = 1
       vm.lists = []
-      vm.getList()
     })
   },
   methods: {
@@ -94,6 +99,7 @@ export default {
         `'${randomString}'`
       let param = {
         user_phone: window.localStorage.getItem('user_phone'),
+        confirm_status: vm.status,
         searchInput: vm.keyWord,
       }
       vm.$post(url, param).then(function (res) {
@@ -109,7 +115,6 @@ export default {
       let vm = this
       vm.undo = []
       vm.done = []
-      vm.tabNum = 0
       this.lists.forEach(item => {
         if (item.confirm_status === 'SUBMIT') {
           vm.undo.push(item)
@@ -117,7 +122,11 @@ export default {
           vm.done.push(item)
         }
       })
-      this.showList = this.undo
+      if (vm.tabNum === 0) {
+        this.showList = this.undo
+      } else {
+        this.showList = this.done
+      }
     },
     getTabNum (i) {
       this.tabNum = i
@@ -142,7 +151,8 @@ export default {
       let param = {
         user_phone: window.localStorage.getItem('user_phone'),
         pagesize: 10,
-        pagenum: vm.pagenum,
+        pagenum: vm.status === 'APPROVED' ? vm.pagenumApproved : vm.pagenumNew,
+        confirm_status: vm.status,
         searchInput: vm.keyWord,
       }
       hlsPopup.showLoading('请稍候')
@@ -157,13 +167,13 @@ export default {
             vum.forEach(returnData, function (data, index, array) {
               vm.lists.push(array[index])
             })
-            vm.pagenum++
+            vm.status === 'APPROVED' ? vm.pagenumApproved++ : vm.pagenumNew++
             vm.$refs.scroll.update(true)
           } else if (returnData.length === 10) {
             vum.forEach(returnData, function (data, index, array) {
               vm.lists.push(array[index])
             })
-            vm.pagenum++
+            vm.status === 'APPROVED' ? vm.pagenumApproved++ : vm.pagenumNew++
             vm.$refs.scroll.update(false)
           }
           vm.selectShowList()

src/pages/contractStart/start-list.vue

@@ -6,7 +6,7 @@
         <span>合同发车</span>
       </div>
     </h-header>
-    <Tab :fatherTabNum="tabNum" @getTabNum="getTabNum" />
+    <Tab @getTabNum="getTabNum" />
     <div class="search has-header">
       <input v-model="keyWord" placeholder="请输入合同号/产品线/承租人名称" >
     </div>
@@ -56,7 +56,9 @@ export default {
     return {
       tabNum: 0,
       keyWord: '',
-      pagenum: 1,
+      status: '',
+      pagenumNew: 1,
+      pagenumApproved: 1,
       lists: [],
       showList: [],
       undo: [],
@@ -66,9 +68,9 @@ export default {
   beforeRouteEnter (to, from, next) {
     next(vm => {
       // if (from.name === 'MyInfo') {
-      vm.pagenum = 1
+      vm.pagenumNew = 1
+      vm.pagenumApproved = 1
       vm.lists = []
-      vm.getList()
       // }
     })
   },
@@ -76,10 +78,13 @@ export default {
     tabNum: {
       handler (newVal, oldVal) {
         if (newVal === 0) {
+          this.status = 'NEW'
           this.showList = this.undo
         } else if (newVal === 1) {
+          this.status = 'APPROVED'
           this.showList = this.done
         }
+        this.getList()
       },
       immediate: true,
     },
@@ -99,6 +104,7 @@ export default {
         `'${randomString}'`
       let param = {
         user_phone: window.localStorage.getItem('user_phone'),
+        car_start_status: vm.status,
         searchInput: vm.keyWord,
       }
       vm.$post(url, param).then(function (res) {
@@ -114,7 +120,6 @@ export default {
       let vm = this
       vm.undo = []
       vm.done = []
-      vm.tabNum = 0
       vm.undo = vm.lists.filter(i => {
         return (
           i.car_start_status === 'REJECTED' || i.car_start_status === 'NEW'
@@ -123,7 +128,11 @@ export default {
       vm.done = vm.lists.filter(i => {
         return i.car_start_status === 'APPROVED'
       })
-      this.showList = this.undo
+      if (vm.tabNum === 0) {
+        this.showList = this.undo
+      } else {
+        this.showList = this.done
+      }
     },
     getTabNum (i) {
       this.tabNum = i
@@ -155,8 +164,9 @@ export default {
       let param = {
         user_phone: window.localStorage.getItem('user_phone'),
         pagesize: 10,
-        pagenum: vm.pagenum,
+        pagenum: vm.status === 'APPROVED' ? vm.pagenumApproved : vm.pagenumNew,
         searchInput: vm.keyWord,
+        car_start_status: vm.status,
       }
       hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {
@@ -170,13 +180,13 @@ export default {
             vum.forEach(returnData, function (data, index, array) {
               vm.lists.push(array[index])
             })
-            vm.pagenum++
+            vm.status === 'APPROVED' ? vm.pagenumApproved++ : vm.pagenumNew++
             vm.$refs.scroll.update(true)
           } else if (returnData.length === 10) {
             vum.forEach(returnData, function (data, index, array) {
               vm.lists.push(array[index])
             })
-            vm.pagenum++
+            vm.status === 'APPROVED' ? vm.pagenumApproved++ : vm.pagenumNew++
             vm.$refs.scroll.update(false)
           }
           vm.selectShowList()

src/pages/contractStart/tab.vue

@@ -20,11 +20,6 @@ import sign from '@/assets/contractStart/1.png'
 import finish from '@/assets/contractStart/3.png'
 
 export default {
-  props: {
-    'fatherTabNum': {
-      type: Number,
-    },
-  },
   data () {
     return {
       tabNum: 0,
@@ -34,13 +29,6 @@ export default {
       finish: finish,
     }
   },
-  watch: {
-    'fatherTabNum': {
-      handler (newVal, oldVal) {
-        this.tabNum = newVal
-      },
-    },
-  },
   methods: {
     sendTabNum () {
       this.$emit('getTabNum', this.tabNum)

src/pages/myInfo/my-info.vue

@@ -153,7 +153,7 @@ export default {
     bp_identity (newVal, oldVal) {
       if (newVal === 'NP_NO' || newVal === 'ORG_NO' || newVal === 'ORG_L_NO' || newVal === 'ORG_AUTH_NO ' || !newVal) {
         this.elecStatus = false
-      } else if (newVal === 'NP_OK' || newVal === 'ORG_YES' || newVal === 'ORG_L_YES' || newVal === 'ORG_AUTH_YES') {
+      } else if (newVal === 'NP_YES' || newVal === 'ORG_YES' || newVal === 'ORG_L_YES' || newVal === 'ORG_AUTH_YES') {
         this.elecStatus = true
       }
     },
@@ -513,7 +513,7 @@ export default {
               },
             })
           } else {
-           // hlsPopup.showLongCenter('获取认证url失败')
+            // hlsPopup.showLongCenter('获取认证url失败')
           }
         } else if (vm.bp_identity === 'ORG_NO') {
           let authUrl = await vm.getOrgCertificationUrl()
@@ -525,7 +525,7 @@ export default {
               },
             })
           } else {
-            //hlsPopup.showLongCenter('获取认证url失败')
+            // hlsPopup.showLongCenter('获取认证url失败')
           }
         } else {
           hlsPopup.showLongCenter('您已认证通过')

src/pages/pay/firstPay/pay-entry.vue

@@ -339,7 +339,12 @@ export default {
           if (res.return_code !== '0000') {
             hlsPopup.showLongCenter(res.error_message)
           } else {
-            window.open(res.paymentURL)
+            vm.$router.push({
+              name: 'PayPage',
+              params: {
+                url: res.paymentURL,
+              },
+            })
           }
         } else {
           hlsPopup.showLongCenter(res.message)

src/pages/pay/pay-page.vue

+<template>
+  <h-view id="pay-page" class="public-style">
+    <h-header :proportion="[5,1,1]" class="bar-custom">
+      <div slot="left" class="h-header-btn">
+        <img src="@/assets/userBind/arrow.png" @click="changePage">
+        <span>支付中心</span>
+      </div>
+    </h-header>
+    <h-content>
+      <iframe
+        :src="url" sandbox="allow-scripts" frameborder="0"
+        scrolling="no"
+        width="100%" height="100%"/>
+        <!-- <object :data="url" width="100%" height="100%" type="text/html"/> -->
+    </h-content>
+  </h-view>
+</template>
+<script>
+export default {
+  data () {
+    return {
+      name: '',
+      url: '',
+    }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.name = from.name
+      vm.url = vm.$route.params.url
+    })
+  },
+  methods: {
+    changePage () {
+      let toPath
+      if (this.name === 'PayEntry') {
+        toPath = 'FirstPay'
+      } else if (this.name === 'PaymentPayEntry') {
+        toPath = 'NewList'
+      }
+      this.$router.replace({
+        name: toPath,
+      })
+    },
+  },
+}
+</script>
+<style lang="less" scoped>
+#pay-page {
+
+}
+</style>

src/pages/pay/payment/pay-entry.vue

@@ -279,7 +279,12 @@ export default {
           if (res.return_code !== '0000') {
             hlsPopup.showLongCenter(res.error_message)
           } else {
-            window.open(res.paymentURL)
+            vm.$router.push({
+              name: 'PayPage',
+              params: {
+                url: res.paymentURL,
+              },
+            })
           }
         } else {
           hlsPopup.showLongCenter(res.message)

src/router/index.js

@@ -62,6 +62,8 @@ import NewList from '@/pages/pay/payment/new-list'
 // 保证金支付
 import MarginFirstPay from '@/pages/pay/marginPay/first-pay'
 import MarginPayEntry from '@/pages/pay/marginPay/pay-entry'
+// 支付页
+import PayPage from '@/pages/pay/pay-page'
 // 产品查询
 import QueryHome from '@/pages/productQuery/query-home'
 import ProDetailed from '@/pages/productQuery/product-detailed'
@@ -216,6 +218,8 @@ export default new Router({
     // 保证金支付
     {path: '/margin-first-pay', component: MarginFirstPay, name: 'MarginFirstPay', meta: {keepAlive: true}},
     {path: '/margin-pay-entry', component: MarginPayEntry, name: 'MarginPayEntry', meta: {keepAlive: true}},
+    // 支付页
+    {path: '/pay-page', component: PayPage, name: 'PayPage', meta: {keepAlive: true}},
     // 产品查询
     {path: '/query-home', component: QueryHome, name: 'QueryHome', meta: {keepAlive: true}},
     {path: '/product-detailed', component: ProDetailed, name: 'ProDetailed', meta: {keepAlive: true}},