Merge branch 'liuin' into uat

src/pages/contractCreate/creat-rent-info.vue

@@ -185,7 +185,10 @@
         </item>
         <item>
           <div slot="name" class="required">年利率</div>
-          <input slot="content" v-model="saveInfo.int_rate_n" readonly placeholder="%">
+          <RateInput
+            v-if="!isReadOnly" slot="content" v-model="saveInfo.int_rate_n"
+            placeholder="%"/>
+          <span v-if="isReadOnly" slot="content">{{ saveInfo.int_rate_n }}</span>
         </item>
         <item v-if="!isReadOnly" :showArrow="true" @click.native="selectPayWay">
           <div slot="name" class="required">支付方式</div>
@@ -294,8 +297,8 @@
                       <span>{{ item.int_rate_n }}</span>
                     </p>
                     <p>
-                      <!-- <span>期&nbsp;&nbsp;&nbsp;限</span>
-                      <span>{{ item.lease_times }}期</span> -->
+                      <span>首付款比例</span>
+                      <span>{{ item.down_payment_ratio_n }}</span>
                     </p>
                   </div>
                 </div>
@@ -692,6 +695,8 @@ export default {
         hlsPopup.showLongCenter('支付方式不能为空!')
       } else if (!vm.saveInfo.residual_value) {
         hlsPopup.showLongCenter('留购价不能为空!')
+      } else if (!vm.saveInfo.int_rate_n) {
+        hlsPopup.showLongCenter('年利率不能为空!')
       } else {
         let url = process.env.basePath + 'prj_lease_info_save'
         vm.saveInfo.down_payment_ratio = (vm.saveInfo.down_payment_ratio_n.replace('%', '') / 100).toFixed(2)

src/pages/home/home-page.vue

@@ -54,7 +54,7 @@
               <img src="@/assets/homePage/hot.png" class="hot">
               <div class="center"><span class="firsts">经销商</span> <span class="seconds">{{ list.bp_name }}</span></div>
               <div class="center"><span class="firsts">设备识别号</span> <span class="seconds">{{ list.product_code }}</span></div>
-              <div class="center"><span class="firsts">地址</span> <span class="seconds">{{ list.province_id_n + list.city_id_n + list.district_id_n }}</span></div>
+              <div class="center"><span class="firsts">地址</span> <span class="seconds">{{ list.province_id_n === list.city_id_n?list.city_id_n + list.district_id_n:list.province_id_n + list.city_id_n + list.district_id_n }}</span></div>
             </div>
           </item>
         </list-item>
@@ -79,7 +79,6 @@ export default {
       guessingList: [],
     }
   },
-  computed: {},
   watch: {},
   created () {
     this.getLocation()
@@ -396,7 +395,7 @@ export default {
         margin-top: 6px;
         display: flex;
         .firsts {
-          width: 66px;
+          width: 76px;
           font-family: PingFangSC-Regular;
           font-size: 14px;
           color: rgba(56,63,69,0.60);

src/pages/productQuery/product-list.vue

@@ -305,7 +305,7 @@ export default {
               flex-direction: row;
               margin-top: 8px;
               .firsts1 {
-                  width: 60px;
+                  width: 85px;
                   height: 17px;
                   font-family: PingFangSC-Regular;
                   font-size: 13px;