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

src/components/currencyInput.vue

@@ -9,62 +9,62 @@
 </template>
 
 <script>
-  export default {
-    name: 'CurrencyInput',
-    props: {
-      value: {
-        type: Number,
-        default: 0,
-      },
-      disable: {
-        type: Boolean,
-        default: false,
-      },
+export default {
+  name: 'CurrencyInput',
+  props: {
+    value: {
+      type: Number,
+      default: 0,
     },
+    disable: {
+      type: Boolean,
+      default: false,
+    },
+  },
 
-    data () {
-      return {
-        focused: false,
+  data () {
+    return {
+      focused: false,
+    }
+  },
+  filter: {
+    uncurrency (val) {
+      if (!val) return null
+      return (Number((val).replace(/,/gi, ''))) === 0 ? null : Number((val).replace(/,/gi, ''))
+    },
+  },
+  computed: {
+    formatValue () {
+      let currency = this.$options.filters['currency']
+      if (!this.focused) {
+        return currency(this.value)
+      } else {
+        return this.value
       }
     },
-    filter: {
-      uncurrency (val) {
-        if (!val) return null
-        return (Number((val).replace(/,/gi, ''))) === 0 ? null : Number((val).replace(/,/gi, ''))
-      },
+  },
+  methods: {
+    onInput: function (value) {
+      if (this.disable) return
+      let uncurrency = this.$options.filter['uncurrency']
+      this.currencyValue = uncurrency(value)
+      this.$emit('input', this.currencyValue)
     },
-    computed: {
-      formatValue () {
-        let currency = this.$options.filters['currency']
-        if (!this.focused) {
-          return currency(this.value)
-        } else {
-          return this.value
-        }
-      },
+    onFocus (event) {
+      if (this.disable) return
+      this.focused = true
+      setTimeout(function () {
+        event.target.type = 'number'
+        event.target.focus()
+      }, 0)
     },
-    methods: {
-      onInput: function (value) {
-        if (this.disable) return
-        let uncurrency = this.$options.filter['uncurrency']
-        this.currencyValue = uncurrency(value)
-        this.$emit('input', this.currencyValue)
-      },
-      onFocus (event) {
-        if (this.disable) return
-        this.focused = true
-        setTimeout(function () {
-          event.target.type = 'number'
-          event.target.focus()
-        }, 0)
-      },
-      onBlur (event) {
-        if (this.disable) return
-        event.target.type = 'text'
-        this.focused = false
-      },
+    onBlur (event) {
+      if (this.disable) return
+      event.target.type = 'text'
+      this.focused = false
     },
-  }
+  },
+}
 </script>
 
 <style scoped lang="less">

src/pages/carConfirm/confirm-detail.vue

@@ -204,6 +204,11 @@ export default {
         if (res.result === 'S') {
           vm.equip = res.lists
           vm.hlsPopup.showSuccess('发车成功')
+          setTimeout(() => {
+            vm.$router.push({
+              name: 'ConfirmList',
+            })
+          }, 2000)
         } else {
           hlsPopup.showLongCenter(res.message)
         }

src/pages/contractSigning/contract-signing.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-11-20 17:01:18
+ * @LastEditTime: 2019-11-21 13:40:59
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -131,7 +131,6 @@ export default {
       vm.hlsHttp.post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-          console.log(res.lists)
           vm.lists = res.lists
           vm.submitLists = res.lists.filter(item => item.confirm_status === 'SUBMIT')
           vm.approvedLists = res.lists.filter(item => item.confirm_status === 'APPROVED')

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-11-13 09:31:10
+ * @LastEditTime: 2019-11-21 12:39:19
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -21,7 +21,7 @@
         </item>
         <item>
           <div slot="name" class="font-color">设备总价</div>
-          <input slot="content" v-model="equip_price" placeholder="请输入设备总价">
+          <CurrencyInput slot="content" :value="equip_price" @input="getVal" />
         </item>
         <item>
           <div slot="name" class="font-color">融资金额</div>
@@ -117,8 +117,12 @@
 </template>
 
 <script>
+import CurrencyInput from '@/components/currencyInput'
 export default {
   name: 'FinancingDetails',
+  components: {
+    CurrencyInput,
+  },
   data () {
     return {
       info: {},
@@ -126,7 +130,7 @@ export default {
       insurance_fee: '', // 保险押金
       quotation_id: '', // 试算成功返回id
       trial_flag: false, // 检测是否通过试算
-      equip_price: null, // 设备价格
+      equip_price: '', // 设备价格
       periodLists: [], // 还款周期
       product_num: '', // 产品数量
       price_date_to: '请选择时间', // 预计还款日
@@ -143,7 +147,7 @@ export default {
   beforeRouteEnter (to, from, next) {
     next(vm => {
       if (from.name === 'FinancingTrial') {
-        vm.equip_price = vm.$route.params.plan_price // 参考价
+        vm.equip_price = Number(vm.$route.params.plan_price) // 参考价
         // if (vm.product_plan_id !== vm.$route.params.product_plan_id) {
         // 重置产品id、试算返回id、试算状态、保险押金、gps费用、预计还款日
         vm.product_plan_id = vm.$route.params.product_plan_id
@@ -162,7 +166,10 @@ export default {
   created () {},
   methods:
     {
-    // 还款计划
+      getVal (val) {
+        this.equip_price = val
+      },
+      // 还款计划
       goRepay () {
         if (this.trial_flag) {
           this.$router.push({

src/pages/myInfo/my-info.vue

@@ -47,7 +47,8 @@
         <div class="userInfo">我的合同</div>
         <div class="my-contract">
           <div class="content-wrap" @click="goSign">
-            <span v-if="signCount > 0"
+            <span
+              v-if="signCount > 0"
               :class="{'content-wrap-class-width':signCount>99, 'content-wrap-class':signCount<99}"
             >{{ signCount > 99 ? '99+' : signCount }}</span>
             <img src="@/assets/myInfo/unSign.png" >
@@ -61,14 +62,16 @@
             <p>待确认</p>
           </div> -->
           <div class="content-wrap" @click="goVideoSign">
-            <span v-if="vedioCount > 0"
+            <span
+              v-if="vedioCount > 0"
               :class="{'content-wrap-class-width':vedioCount>99, 'content-wrap-class':vedioCount<99}"
             >{{ vedioCount > 99 ? '99+' : vedioCount }}</span>
             <img src="@/assets/myInfo/unFace.png" >
             <p>待面签</p>
           </div>
           <div class="content-wrap" @click="goCarConfirm">
-            <span v-if="carCount > 0"
+            <span
+              v-if="carCount > 0"
               :class="{'content-wrap-class-width':carCount>99, 'content-wrap-class':carCount<99}" style="margin-left:5px;"
             >{{ carCount > 99 ? '99+' : carCount }}</span>
             <img src="@/assets/myInfo/carConfirm.png" >
@@ -87,7 +90,8 @@
           <item @click.native="goMyProduct">
             <img slot="left-icon" src="@/assets/myInfo/collect.png" class="left-icon" >
             <div slot="name">我的收藏</div>
-            <div v-if="productCount > 0"
+            <div
+              v-if="productCount > 0"
               slot="right-icon"
               :class="{'right-icon-width':productCount>99, 'right-icon':productCount<99}"
             >{{ productCount > 99 ? '99+' : productCount }}</div>
@@ -796,4 +800,23 @@ export default {
   color: #fff;
   border-radius: 50%;
 }
+@media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
+  .platform-ios {
+    #my-info {
+      button {
+         margin-bottom: 98px;
+      }
+    }
+  }
+}
+// iPhoneXR适配
+@media (device-width: 414px) and (device-height: 896px) {
+  .platform-ios {
+    #my-info {
+      button {
+         margin-bottom: 98px;
+      }
+    }
+  }
+}
 </style>

src/pages/pay/firstPay/contract-record.vue

@@ -36,8 +36,7 @@
               <div class="item-right">
                 <p>{{ parseFloat(e.due_amount).toFixed(2)|currency }}</p>
                 <p>{{ e.received_amount|currency }}</p>
-                <input v-model="e.amount" type="number" placeholder="请输入还款金额">
-              </div>
+              <CurrencyInput v-model="e.amount" placeholder="请输入还款金额"/></div>
             </div>
           </div>
         </section>
@@ -60,8 +59,11 @@
 </template>
 
 <script>
+import CurrencyInput from '../../../components/currencyInput'
 export default {
-  components: {},
+  components: {
+    CurrencyInput,
+  },
   data () {
     return {
       money: 0,
@@ -120,7 +122,7 @@ export default {
           vm.prj_lists = res.prj_lists
           vm.prj_lists.forEach(i => {
             i.cf_lists.forEach(j => {
-              let num = (parseFloat(j.due_amount) - parseFloat(j.received_amount))
+              let num = (parseFloat(j.due_amount) - parseFloat(j.received_amount)).toFixed(2)
               vm.$set(j, 'amount', num)
             })
           })
@@ -213,7 +215,8 @@ export default {
     bottom: 150px;
     width: 100%;
     //margin-top:-60px;
-    height: 370px;
+    // height: 370px;
+    height:7.4rem;
     overflow: scroll;
     //background-color: #FFF;
     .contract-item {
@@ -382,4 +385,31 @@ export default {
     color: #fff;
   }
 }
+.platform-ios {
+  #contract-record  {
+    .pay-content {
+      height: 370px;
+    }
+  }
+}
+@media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
+  .platform-ios {
+    #contract-record {
+      .pay-content {
+        height: 9.4rem;
+      }
+    }
+  }
+}
+// iPhoneXR适配
+@media (device-width: 414px) and (device-height: 896px) {
+  .platform-ios {
+    #contract-record {
+      .pay-content {
+        height: 9.4rem;
+      }
+    }
+  }
+}
+
 </style>

src/pages/pay/payment/contract-record.vue

@@ -71,7 +71,7 @@
                 <div>
                   <span>本次还款</span>
                   <section>
-                    <input v-model="detail.amount" type="number" placeholder="请输入还款金额" >
+                    <CurrencyInput v-model="detail.amount" placeholder="请输入还款金额" />
                   </section>
                 </div>
               </div>
@@ -102,9 +102,12 @@
   </h-view>
 </template>
 <script>
+import CurrencyInput from '../../../components/currencyInput'
 export default {
   name: 'PaymentContractRecord',
-  components: {},
+  components: {
+    CurrencyInput,
+  },
   beforeRouteEnter (to, from, next) {
     next(vm => {
       vm.getRentInfo()
@@ -478,4 +481,23 @@ export default {
     color: white;
   }
 }
+@media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
+  .platform-ios {
+    #payment-contract-record {
+      .pay-content {
+        height: 63%;
+      }
+    }
+  }
+}
+// iPhoneXR适配
+@media (device-width: 414px) and (device-height: 896px) {
+  .platform-ios {
+    #payment-contract-record {
+      .pay-content {
+        height: 63%;
+      }
+    }
+  }
+}
 </style>