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

134df0b6 · 李晓兵 · 00d53d40 · e779af2a · 134df0b6 · 134df0b6
Commit 134df0b6 authored Dec 27, 2019 by 李晓兵
14 changed files
--- a/src/pages/contractCreate/contract-create-list.vue
+++ b/src/pages/contractCreate/contract-create-list.vue
 <!--
 * @Author: your name
 * @Date: 2019-09-29 10:02:11
- * @LastEditTime : 2019-12-26 13:30:22
+ * @LastEditTime : 2019-12-26 17:27:43
 * @LastEditors  : Please set LastEditors
 * @Description: In User Settings Edit
 -->
@@ -29,7 +29,7 @@
    >
      <div class="wrap">
        <div v-for="(item,index) in showLists" :key="index" class="contract-lists" >
-          <div class="pro-code" @click="changeBase">
+          <div class="pro-code" @click="changeBase(item)">
            <img src="@/assets/distributorSign/fileIcon.png" alt="" class="file-icon">
            <p>
              <span>合同号</span>
@@ -85,16 +85,17 @@ export default {
  watch: {
    'num': {
      handler (newVal, oldVal) {
+        this.$refs.scroll.scrollToTop()
        this.$refs.scroll.update(false)
        if (newVal === 2) {
          if (!this.approvedFlag) {
            this.contractList()
          }
-          this.$refs.scroll.scrollToTop()
+          //  this.$refs.scroll.scrollToTop()
          this.showLists = this.approvedLists
        } else if (newVal === 1) {
          this.showLists = this.submitLists
-          this.$refs.scroll.scrollToTop()
+          // this.$refs.scroll.scrollToTop()
        }
      },
    },
@@ -339,13 +340,12 @@ export default {
      }
    },
    changePage () {
-      window.localStorage.setItem('contractReadonly', false)
      window.localStorage.setItem('formPage', 'sale')
      this.$router.push({
        name: 'SalesInfo',
      })
    },
-    changeBase () {
+    changeBase (item) {
      if (this.num === 1) {
        window.localStorage.setItem('contractReadonly', false)
        window.localStorage.setItem('formPage', 'list')
@@ -355,6 +355,9 @@ export default {
      }
      this.$router.push({
        name: 'CreateBaseInfo',
+        params: {
+          bp_id: item.bp_id,
+        },
      })
    },
    goDetails () {

--- a/src/pages/contractCreate/creat-rent-info.vue
+++ b/src/pages/contractCreate/creat-rent-info.vue
@@ -25,14 +25,22 @@
      </div>
      <div class="userInfo">租赁产品</div>
      <list-item :item-height="44">
-        <item :showArrow="true" @click.native="selectProductLine">
+        <item v-if="!isReadOnly":showArrow="true" @click.native="selectProductLine">
          <div slot="name">产品线</div>
          <input slot="content" v-model="saveInfo.division_n" readonly placeholder="请选择" >
        </item>
-        <item :showArrow="true" @click.native="getProduct">
+        <item v-if="isReadOnly">
+          <div slot="name">产品线</div>
+          <input slot="content" v-model="saveInfo.division_n" readonly>
+        </item>
+        <item v-if="!isReadOnly" :showArrow="true" @click.native="getProduct">
          <div slot="name">产品型号</div>
          <input slot="content" v-model="productInfo.product_id_n" readonly placeholder="请选择" >
        </item>
+        <item v-if="isReadOnly" :showArrow="true">
+          <div slot="name">产品型号</div>
+          <input slot="content" v-model="productInfo.product_id_n" readonly >
+        </item>
        <item>
          <div slot="name">产品数量</div>
          <input slot="content" v-model="productInfo.product_num" placeholder="请填写产品数量" >
@@ -277,6 +285,13 @@ export default {
    'finance_amount' () { // 融资金额
      return parseFloat(this.saveInfo.equip_price - this.saveInfo.equip_price * this.saveInfo.down_payment_ratio_n.replace('%', '') / 100).toFixed(2)
    },
+    isReadOnly () {
+      if (window.localStorage.contractReadonly === 'true' && this.fromPage === 'list') {
+        return true
+      } else {
+        return false
+      }
+    },
  },
  watch: {
    policyKeyWord (newVal, oldVal) {
@@ -314,7 +329,8 @@ export default {
      vm.pagenumPolicy = 1
      if (vm.fromPage === 'sale') {
        vm.fromList = false
-      } else if (vm.status === 'list') {
+      } else if (vm.fromPage === 'list') {
+        debugger
        vm.fromList = true
        vm.rentInfoQuery()
      }

--- a/src/pages/contractCreate/create-enclosure-info.vue
+++ b/src/pages/contractCreate/create-enclosure-info.vue
@@ -76,7 +76,7 @@
        <!--待上传图片列表-->
        <div
          v-for="(item, index) in upload_list"
-          v-if="item.check_id==list.check_id"
+          v-if="item.check_id === checkId"
          :key="index"
          class="card-upload"
        >
@@ -87,14 +87,14 @@
        </div>
        <!--从服务器上下载的图片-->
        <div v-for="(pic, index) in dowload_list" :key="index">
-          <div v-if="pic.check_id==list.check_id" :key="index" class="card-upload">
+          <div v-if="pic.check_id==checkId" :key="index" class="card-upload">
            <img :src="pic.url" @click="showBigPicture(pic.url)" >
            <div class="close" @click="delete_pic(pic.attachment_id)">
              <img src="@/assets/userBind/deleteIcon.png" >
            </div>
          </div>
        </div>
-        <div class="card-upload plus" @click="ocrShow(list.description,list.check_id)">
+        <div class="card-upload plus" @click="ocrShow('','')">
          <img src="@/assets/userBind/camera.png" class="upload-btn" >
        </div>
      </div>

--- a/src/pages/contractInquire/repay-plans.vue
+++ b/src/pages/contractInquire/repay-plans.vue
 <!--
 * @Author: your name
 * @Date: 2019-10-31 09:49:57
- * @LastEditTime : 2019-12-24 18:34:37
+ * @LastEditTime : 2019-12-26 16:47:18
 * @LastEditors  : Please set LastEditors
 * @Description: 还款
 * @FilePath:
@@ -368,13 +368,13 @@ export default {
        // flex: 9;
        display: flex;
        flex-direction: column;
-        justify-content: space-evenly;
        font-family: PingFangSC-Regular;
        font-size: 13px;
        color: #4B4A4B;
-        //padding-top: 20px;
-        margin-left: 40px;
-        margin-top: -16px;
+        margin-left: 20px;
+        div:nth-of-type(2) {
+          margin-top: 12px;
+        }
        span:nth-of-type(2) {
          margin-left: 8px;
        }

--- a/src/pages/contractSigning/contract-repay-plan.vue
+++ b/src/pages/contractSigning/contract-repay-plan.vue
 <!--
 * @Author: your name
 * @Date: 2019-10-30 19:29:24
- * @LastEditTime : 2019-12-24 18:38:21
+ * @LastEditTime : 2019-12-26 16:47:28
 * @LastEditors  : Please set LastEditors
 * @Description: In User Settings Edit
 -->
@@ -404,13 +404,13 @@ export default {
        // flex: 9;
        display: flex;
        flex-direction: column;
-        justify-content: space-evenly;
        font-family: PingFangSC-Regular;
        font-size: 13px;
        color: #4B4A4B;
-        //padding-top: 20px;
-        margin-left: 40px;
-        margin-top: -16px;
+        margin-left: 20px;
+        div:nth-of-type(2) {
+          margin-top: 12px;
+        }
        span:nth-of-type(2) {
          margin-left: 8px;
        }

--- a/src/pages/distributorSign/contract-list.vue
+++ b/src/pages/distributorSign/contract-list.vue
@@ -76,7 +76,7 @@ export default {
  watch: {
    'num': {
      handler (newVal, oldVal) {
-        this.$refs.scroll.update(false)
+        // this.$refs.scroll.update(false)
        this.$refs.scroll.scrollToTop()
        if (newVal === 2) {
          if (!this.approvedFlag) {

--- a/src/pages/distributorSign/financ-details.vue
+++ b/src/pages/distributorSign/financ-details.vue
 <!--
 * @Author: your name
 * @Date: 2019-10-30 19:29:24
- * @LastEditTime : 2019-12-24 18:39:52
+ * @LastEditTime : 2019-12-26 16:47:36
 * @LastEditors  : Please set LastEditors
 * @Description: In User Settings Edit
 -->
@@ -368,13 +368,13 @@ export default {
        // flex: 9;
        display: flex;
        flex-direction: column;
-        justify-content: space-evenly;
        font-family: PingFangSC-Regular;
        font-size: 13px;
        color: #4B4A4B;
-        //padding-top: 20px;
-        margin-left: 40px;
-        margin-top: -16px;
+        margin-left: 20px;
+        div:nth-of-type(2) {
+          margin-top: 12px;
+        }
        span:nth-of-type(2) {
          margin-left: 8px;
        }

--- a/src/pages/financingTrial/trial-repay-plan.vue
+++ b/src/pages/financingTrial/trial-repay-plan.vue
 <!--
 * @Author: your name
 * @Date: 2019-10-30 19:29:24
- * @LastEditTime : 2019-12-24 18:41:37
+ * @LastEditTime : 2019-12-26 16:47:07
 * @LastEditors  : Please set LastEditors
 * @Description: In User Settings Edit
 -->
@@ -386,13 +386,13 @@ export default {
        // flex: 9;
        display: flex;
        flex-direction: column;
-        justify-content: space-evenly;
        font-family: PingFangSC-Regular;
        font-size: 13px;
        color: #4B4A4B;
-        //padding-top: 20px;
-        margin-left: 40px;
-        margin-top: -16px;
+        margin-left: 20px;
+        div:nth-of-type(2) {
+          margin-top: 12px;
+        }
        span:nth-of-type(2) {
          margin-left: 8px;
        }

--- a/src/pages/messageCenter/message-list.vue
+++ b/src/pages/messageCenter/message-list.vue
@@ -4,11 +4,7 @@
      <div slot="center" class="top-word">消息通知</div>
    </h-header>
    <!-- <h-content class="content"> -->
-      <div v-if="list.length===0">
-        <div class="display">
-          <img src="@/assets/messageCenter/noMsg.png" alt="">
-        </div>
-      </div>
+
    <scroll
      v-if="list.length !== 0"
      ref="scroll" :updateData="[list]" :pullUp="true" class="has-footer"
@@ -59,6 +55,11 @@
      </section>
      <!-- </h-content> -->
    </scroll>
+    <div v-if="list.length===0">
+      <div class="display">
+        <img src="@/assets/messageCenter/noMsg.png" alt="">
+      </div>
+    </div>
  </h-view>
 </template>
 <script>

--- a/src/pages/myProductCollection/my-product-list.Vue
+++ b/src/pages/myProductCollection/my-product-list.Vue
@@ -47,7 +47,11 @@
      </list-item>
 </div>
      </scroll>
-
+      <div v-if="productList.length===0">
+      <div class="display">
+        <img src="@/assets/messageCenter/noMsg.png" alt="">
+      </div>
+      </div>
  </h-view>
 </template>

@@ -208,6 +212,15 @@ export default {

 <style lang="less" rel="stylesheet">
 #my-collect {
+  .display {
+    position: fixed;
+    top: 0;
+    img {
+      width: 100%;
+      height: 100%;
+     // margin-top: -70px;
+    }
+  }
  .search {
      background-color: #fff;
      padding: 8px 12px;

--- a/src/pages/pay/firstPay/pay-entry.vue
+++ b/src/pages/pay/firstPay/pay-entry.vue
@@ -19,52 +19,14 @@
          <scroll>
            <list-item :item-height="56" class="pay-way">
              <item
-                v-for="(item,index) in nongBank"
-                :proportion="[7,1,1]"
-                :key="item.bank_account_num"
-                @click.native="isSelect(`nong${index}`);ischeck(item);confirmToPay(item)"
-              >
-                <div slot="name" style="flex=3">
-                  <img :src="selectImg(item)" alt class="icon" >
-                  {{ item.bank_full_name }}({{ selectLast(item) }})
-                  <img
-                    v-show="item.recommand"
-                    class="push"
-                    src="@/assets/payment/push.png"
-                  >
-                </div>
-                <section slot="content">
-                  <img v-show="select === `nong${index}`" src="@/assets/payment/select.png" alt >
-                  <img v-show="select !== `nong${index}`" src="@/assets/payment/unselect.png" alt >
-                </section>
-              </item>
-              <!-- <item :proportion="[7,1,1]" @click.native="isSelect('one');ischeck('one')">
-                <div slot="name">
-                  <img src="@/assets/payment/alipay.png" alt class="icon1" > 支付宝
-                </div>
-                <section slot="content">
-                  <img v-show="select === 'one'" src="@/assets/payment/select.png" alt >
-                  <img v-show="select !== 'one'" src="@/assets/payment/unselect.png" alt >
-                </section>
-              </item>
-              <item :proportion="[7,1,1]" @click.native="isSelect('two');ischeck('two')">
-                <div slot="name">
-                  <img src="@/assets/payment/wx.png" alt class="icon2" > 微信
-                </div>
-                <section slot="content">
-                  <img v-show="select === 'two'" src="@/assets/payment/select.png" alt >
-                  <img v-show="select !== 'two'" src="@/assets/payment/unselect.png" alt >
-                </section>
-              </item> -->
-              <item
-                v-for="(item,index) in newList"
+                v-for="(item,index) in payTypeList"
                :proportion="[7,1,1]"
                :key="index"
                @click.native="isSelect(`three${index}`);ischeck(item);confirmToPay(item)"
              >
                <div slot="name" style="flex=3">
                  <img :src="selectImg(item)" alt class="icon" >
-                  {{ item.bank_full_name }}({{ selectLast(item) }})
+                  {{ item.code_name }}
                  <img
                    v-show="item.recommand"
                    class="push"
@@ -100,22 +62,21 @@
              <span>手续费</span>
              <span>+¥{{ serviceCharge |currency }}</span>
            </div>
-            <!-- <div class="info-item" @click="show=true">
-              <span>银行卡</span>
+            <div class="info-item" @click="show=true">
+              <span>支付渠道</span>
              <span>
-                <img :src="checkType.img" >
-                <span>{{ checkType.bank_full_name }}</span>
-                <span v-if="sectctNong">({{ selectLast(checkType) }})</span>
+                <img :src="payTypeObj.img" >
+                <span>{{ payTypeObj.payType_n }}</span>
                <img class="arrow" src="@/assets/payment/go.png" >
              </span>
-            </div> -->
-            <list-item :item-height="44">
+            </div>
+            <!-- <list-item :item-height="44">
              <item :showArrow="true" @click.native="selectPayType">
                <div slot="name">支付渠道</div>
                <input
                  slot="content" v-model="payTypeObj.payType_n" readonly>
              </item>
-            </list-item>
+            </list-item> -->
          </div>
          <bottom-tab>
            <tab-button class="foot" @click.native="checkPay">去支付</tab-button>
@@ -146,22 +107,21 @@
          <span>手续费</span>
          <span>+¥{{ serviceCharge }}</span>
        </div>
-        <list-item :item-height="44">
+        <!-- <list-item :item-height="44">
          <item :showArrow="true" @click.native="selectPayType">
            <div slot="name">支付渠道</div>
            <input
              slot="content" v-model="payTypeObj.payType_n" readonly>
          </item>
-        </list-item>
-        <!-- <div class="info-item" @click="show=true">
-          <span>银行卡</span>
+        </list-item> -->
+        <div class="info-item" @click="show=true">
+          <span>支付渠道</span>
          <span>
-            <img :src="checkType.img" >
-            <span>{{ checkType.bank_full_name }}</span>
-            <span v-if="sectctNong">({{ selectLast(checkType) }})</span>
+            <img :src="payTypeObj.img" >
+            <span>{{ payTypeObj.payType_n }}</span>
            <img class="arrow" src="@/assets/payment/go.png" >
          </span>
-        </div> -->
+        </div>
      </div>
    </h-content>
    <bottom-tab>
@@ -188,6 +148,7 @@ import zg from '@/assets/payment/zg.png'
 import zs from '@/assets/payment/zs.png'
 import zx from '@/assets/payment/zx.png'
 import bank from '@/assets/payment/bank.png'
+import yinlian from '@/assets/payment/bind.png'
 export default {
  name: 'PayEntry',
  components: {},
@@ -209,6 +170,7 @@ export default {
      },
      payTypeList: [],
      payTypeObj: {
+        img: ny,
        payType: 'ABC_PAY',
        payType_n: '农行支付',
      },
@@ -317,37 +279,11 @@ export default {
      })
    },
    selectImg (e) {
-      if (e.bank_full_name.indexOf('建设') !== -1) {
-        return js
-      } else if (e.bank_full_name.indexOf('农业') !== -1) {
+      if (e.code_name.indexOf('农行') !== -1) {
        e.recommand = true
        return ny
-      } else if (e.bank_full_name.indexOf('光大') !== -1) {
-        return gd
-      } else if (e.bank_full_name.indexOf('广发') !== -1) {
-        return gf
-      } else if (e.bank_full_name.indexOf('浦') !== -1) {
-        return pf
-      } else if (e.bank_full_name.indexOf('工商') !== -1) {
-        return gs
-      } else if (e.bank_full_name.indexOf('交通') !== -1) {
-        return jt
-      } else if (e.bank_full_name.indexOf('民生') !== -1) {
-        return ms
-      } else if (e.bank_full_name.indexOf('平安') !== -1) {
-        return pa
-      } else if (e.bank_full_name.indexOf('兴业') !== -1) {
-        return xy
-      } else if (e.bank_full_name.indexOf('邮') !== -1) {
-        return yzcx
-      } else if (e.bank_full_name.indexOf('中国') !== -1) {
-        return zg
-      } else if (e.bank_full_name.indexOf('招商') !== -1) {
-        return zs
-      } else if (e.bank_full_name.indexOf('中信') !== -1) {
-        return zx
-      } else {
-        return bank
+      } else if (e.code_name.indexOf('银联') !== -1) {
+        return yinlian
      }
    },
    selectLast (item) {
@@ -358,26 +294,16 @@ export default {
      this.select = way
    },
    ischeck (way) {
-      if (way === 'one') {
-        this.checkType.bank_full_name = '支付宝'
-        this.checkType.img = zfb
-        this.sectctNong = false
-      } else if (way === 'two') {
-        this.checkType.bank_full_name = '微信'
-        this.checkType.img = wx
-        this.sectctNong = false
-      } else {
-        this.checkType.bank_full_name = way.bank_full_name
-        this.checkType.bank_account_num = way.bank_account_num
-        this.checkType.img = this.selectImg(way)
-        this.sectctNong = true
-      }
+      this.payTypeObj.payType = way.code
+      this.payTypeObj.payType_n = way.code_name
+      this.payTypeObj.img = this.selectImg(way)
      this.show = false
-      this.showOutside = false
    },
    confirmToPay (e) {
      let vm = this
-      let url = process.env.basePath + 'update_order_info'
+      let randomString = Math.floor(Math.random() * 21)
+      let url = process.env.basePath + 'update_order_info' + '&index' +
+        `'${randomString}'`
      if (e) {
        vm.pay_type = e.pay_type
        vm.bank_account_id = e.bank_account_id
@@ -386,14 +312,14 @@ export default {
        info: {
          order_id: vm.$route.params.order_id,
          fee: vm.serviceCharge,
-          bank_account_id: vm.bank_account_id,
+          bank_account_id: '9099',
          pay_type: vm.payTypeObj.payType,
        },
      }
      hlsPopup.showLoading('请稍候')
      vm.$post(url, param).then(function (res) {
-        vm.hlsPopup.hideLoading()
        if (res.result === 'S') {
+          vm.hlsPopup.hideLoading()
        } else {
          hlsPopup.showLongCenter(res.message)
        }

--- a/src/pages/pay/pay-page.vue
+++ b/src/pages/pay/pay-page.vue
@@ -103,6 +103,7 @@
    </h-content>
    <bottom-tab>
      <tab-button v-if="showpay" class="foot" @click.native="pay">立即支付</tab-button>
+      <tab-button v-if="nextPay" class="foot" @click.native="pay">继续支付</tab-button>
      <tab-button v-if="showSelect" class="foot" @click.native="searchResult">查询支付结果</tab-button>
      <tab-button v-if="isGo" class="foot" @click.native="goMyInfo">返回个人中心</tab-button>
    </bottom-tab>
@@ -129,11 +130,13 @@ export default {
      isSuccess: false,
      isFaild: false,
      isGo: false,
+      nextPay: false,
    }
  },
  beforeRouteEnter (to, from, next) {
    next(vm => {
      vm.showSelect = false
+      vm.nextPay = false
      vm.showpay = true
      vm.isSuccess = false
      vm.isFaild = false
@@ -147,10 +150,8 @@ export default {
  computed: {
    isShowpayInfo () {
      if (this.isSuccess ^ this.isFaild == 0) {
-        debugger
        return true
      } else if (this.isSuccess ^ this.isFaild == 1) {
-        debugger
        return false
      }
    },
@@ -202,7 +203,6 @@ export default {
        vm.hlsPopup.hideLoading()
        if (res.result === 'S') {
          Object.assign(vm.info, res.info)
-          vm.isGo = true
          vm.showSelect = false
        } else {
          hlsPopup.showLongCenter(res.message)
@@ -226,22 +226,28 @@ export default {
            hlsPopup.showLongCenter(res.error_message)
          } else {
            if (res.status === '01') {
+              vm.nextPay = true
              vm.isSuccess = false
              vm.isFaild = false
-              hlsPopup.showLongCenter('可再次提交')
+              hlsPopup.showLongCenter('支付未完成')
            } else if (res.status === '02') {
+              vm.nextPay = true
              vm.isSuccess = false
              vm.isFaild = false
-              hlsPopup.showLongCenter('正在支付...')
+              hlsPopup.showLongCenter('支付未完成')
            } else if (res.status === '03') {
+              vm.isGo = true
              vm.isSuccess = true
              vm.isFaild = false
              hlsPopup.showLongCenter('交易成功')
            } else if (res.status === '04') {
+              vm.isGo = true
              vm.isSuccess = true
              vm.isFaild = false
              hlsPopup.showLongCenter('交易完成')
            } else {
+              vm.isGo = true
+
              vm.isSuccess = false
              vm.isFaild = true
              hlsPopup.showLongCenter('交易失败')

--- a/src/pages/pay/payment/pay-entry.vue
+++ b/src/pages/pay/payment/pay-entry.vue
--- a/src/pages/productQuery/product-list.vue
+++ b/src/pages/productQuery/product-list.vue
 <!--
   * @Description: 产品展示列表
 * @Author: y/>e: 2019-10-16 14:39:07
- * @LastEditors: Please set LastEditors
+ * @LastEditors  : Please set LastEditors
 -->
 <template>
  <h-view id="prolist" class="public-style" title="产品查询">
@@ -47,6 +47,11 @@
        </list-item>
      </div>
    </scroll>
+    <div v-if="lists.length===0">
+      <div class="display">
+        <img src="@/assets/messageCenter/noMsg.png" alt="">
+      </div>
+    </div>
  </h-view>
 </template>
 <script>
@@ -206,6 +211,15 @@ export default {
 </script>
 <style lang='less'>
 #prolist {
+  .display {
+    position: fixed;
+    top: 0;
+    img {
+      width: 100%;
+      height: 100%;
+     // margin-top: -70px;
+    }
+  }
    .search {
      background-color: #fff;
      padding: 8px 12px;