Merge branch 'liuin' into uat

src/components/currencyInput.vue

@@ -72,7 +72,10 @@ export default {
     onInput (value) {
       // if (this.disable) return
       this.newVal = this.value
-      this.newVal += ('' + value)
+      if (this.newVal.includes('.') && value === '.') {
+      } else {
+        this.newVal += ('' + value)
+      }
       this.$emit('input', this.newVal)
     },
     onDelete () {
@@ -92,7 +95,7 @@ export default {
       event.target.value = ''
       event.target.value = value
       setTimeout(function () {
-        event.target.type = 'number'
+        event.target.type = 'text'
         event.target.focus()
       }, 0)
     },

src/pages/myInfo/About.vue

 <template>
   <h-view class="public-style about" title="关于徐工金服">
     <h-header :proportion="[5,1,1]" class="bar-custom">
-      <div slot="left" class="h-header-btn" @click="$routeGo()">
+      <div slot="left" class="h-header-btn">
         <img src="@/assets/userBind/arrow.png" @click="$routeGo()">
         <span>关于徐工金服</span>
       </div>

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

@@ -22,7 +22,7 @@
         <section v-for="(item,index) in prj_lists" :key="index" class="contract-item">
           <div class="header">
             <img src="@/assets/payment/file.png" >
-            <p>&nbsp; {{ item.project_number }}</p>
+            <p>{{ item.project_number }}</p>
             <span>{{ item.bp_name }}</span>
           </div>
           <div class="content">
@@ -254,20 +254,22 @@ export default {
         background: #fff;
         display: flex;
         font-family: PingFangSC-Semibold;
-        font-size: 15px;
+        font-size: 12px;
         color: #383f45;
         letter-spacing: 0;
-        line-height: 44px;
-        padding: 0 16px;
+        // line-height: 44px;
+        // padding: 0 16px;
+        justify-content: space-around;
+        align-items: center;
 
         img {
           height: 30px;
-          margin-top: 10px;
-          margin-right: 6px;
+          // margin-top: 10px;
+          // margin-right: 6px;
         }
 
         p {
-          flex: 2;
+          // flex: 2;
           border-bottom: 1px solid #f3f3f7;
           font-weight: 700;
         }
@@ -275,6 +277,7 @@ export default {
         span {
           border-bottom: 1px solid #f3f3f7;
           font-weight: 700;
+          // margin-left:10px;
         }
       }
 

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

@@ -27,7 +27,9 @@
             </div>
             <div class="pay-input">
               <span>应还首付款</span>
-              <CurrencyInput ref="payInput" v-model="money" class="currencyInput" placeholder="请输入支付金额" />
+              <CurrencyInput
+                ref="payInput" v-model="money" class="currencyInput"
+                placeholder="请输入支付金额" />
               <div @click="createOrder">
                 <img src="@/assets/payment/into.png" >
               </div>

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

@@ -26,7 +26,7 @@
         <section v-for="(item,index) in showList" :key="index" class="contract-item">
           <div class="header">
             <img src="@/assets/payment/file.png" alt >
-            <p>&nbsp; {{ item.project_number }}</p>
+            <p>{{ item.project_number }}</p>
             <span>还款中</span>
           </div>
           <div class="my-content">
@@ -379,17 +379,18 @@ export default {
         height: 34px;
         background: #fff;
         display: flex;
+        justify-content: space-around;
         align-items: center;
-        line-height: 37px;
+        // line-height: 37px;
         padding: 0 16px;
         img {
           height: 30px;
         }
 
         p {
-          flex: 2;
+          // flex: 2;
           font-family: PingFangSC-Semibold;
-          font-size: 15px;
+          font-size: 12px;
           color: #383f45;
           letter-spacing: 0;
           font-weight: 700;
@@ -403,7 +404,7 @@ export default {
           border: 1px solid #1d3fff;
           border-radius: 2px;
           font-family: PingFangSC-Regular;
-          font-size: 14px;
+          font-size: 12px;
           color: #3957ff;
           letter-spacing: 0;
         }