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

.gitignore

@@ -3,6 +3,7 @@ node_modules/
 platforms/
 www/static/
 .idea/
+www/static/
 /dist/
 npm-debug.log*
 yarn-debug.log*

config.xml

 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.xcmg.app" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.xcmg.app.dev" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>徐工融租</name>
     <description>
     测试环境版

plugins/cordova-plugin-baidumaplocation/plugin.xml

@@ -112,7 +112,7 @@
     <!--定位模式 TODO 设置为前后台永远定位-->
     <!--NSLocationAlwaysUsageDescription / NSLocationWhenInUseUsageDescription-->
     <config-file parent="NSLocationWhenInUseUsageDescription" target="*-Info.plist">
-      <string>$IOS_LOCATION_DESC</string>
+      <string>根据您当前的位置将自动选择最近的服务网点</string>
     </config-file>
 
     <!--API_KEY-->

plugins/cordova-plugin-camera/plugin.xml

@@ -165,16 +165,16 @@
     <framework src="AVFoundation.framework"/>
 
     <config-file parent="NSCameraUsageDescription" target="*-Info.plist">
-      <string>我们将在拍照模块使用您的相机</string>
+      <string>我们会在上传用户信息,发送图片信息时需要使用到您的相机,方便更新您的用户信息</string>
     </config-file>
     <config-file parent="NSPhotoLibraryUsageDescription" target="*-Info.plist">
-      <string>我们将在照片模块访问您的相册</string>
+      <string>我们会在上传用户信息,发送图片信息时需要使用到您的相册,方便更新您的用户信息</string>
     </config-file>
     <config-file parent="NSLocationWhenInUseUsageDescription" target="*-Info.plist">
-      <string>我们将在位置模块使用您的定位</string>
+      <string>根据您当前的位置将自动选择最近的服务网点</string>
     </config-file>
     <config-file parent="NSPhotoLibraryAddUsageDescription" target="*-Info.plist">
-      <string>我们将在照片模块访问您的相册</string>
+      <string>我们会在上传用户信息,发送图片信息时需要使用到您的相册,方便更新您的用户信息</string>
     </config-file>
 
   </platform>

plugins/cordova-plugin-contacts/plugin.xml

@@ -132,9 +132,9 @@
             </feature>
         </config-file>
 
-        <preference name="CONTACTS_USAGE_DESCRIPTION" default="我们将在通讯录模块读取您的联系人" />
+        <preference name="CONTACTS_USAGE_DESCRIPTION" default="我们将在通讯功能读取您的联系人，为你提供便捷服务" />
         <config-file target="*-Info.plist" parent="NSContactsUsageDescription">
-            <string>$CONTACTS_USAGE_DESCRIPTION</string>
+            <string>我们将在通讯功能读取您的联系人，为你提供便捷服务</string>
         </config-file>
 
         <js-module src="www/ios/contacts.js" name="contacts-ios">

plugins/cordova-plugin-hrms-faceidentify/plugin.xml

@@ -112,11 +112,11 @@
 
         <!--麦克风权限-->
         <config-file target="*-Info.plist"  parent="NSMicrophoneUsageDescription">
-            <string>我们将在拍照模块使用您的麦克风</string>
+            <string>我们会在跟新用户信息，使用您的麦克风权限</string>
         </config-file>
         <!--相机使用权限-->
         <config-file target="*-Info.plist"  parent="NSCameraUsageDescription">
-            <string>我们将在拍照模块使用您的相机</string>
+            <string>我们会在上传用户信息,发送图片信息时需要使用到您的相机,方便更新您的用户信息</string>
         </config-file>
 
         <!-- 图片资源 -->

plugins/cordova-plugin-image-picker/plugin.xml

@@ -56,10 +56,10 @@
 		<resource-file src="src/ios/ELCImagePicker/Resources/Overlay@2x.png" />
 
     <config-file parent="NSPhotoLibraryUsageDescription" target="*-Info.plist">
-      <string>我们将在照片模块访问您的相册</string>
+      <string>我们会在上传用户信息,发送图片信息时需要使用到您的相册,方便更新您的用户信息</string>
     </config-file>
     <config-file parent="NSPhotoLibraryAddUsageDescription" target="*-Info.plist">
-      <string>我们将在照片模块访问您的相册</string>
+      <string>我们会在上传用户信息,发送图片信息时需要使用到您的相册,方便更新您的用户信息</string>
     </config-file>
 	</platform>
 

plugins/cordova-plugin-touch-id/plugin.xml

@@ -37,9 +37,9 @@
     </config-file>
 
     <!-- Usage description of Face ID for iOS 11+ -->
-    <preference name="FACEID_USAGE_DESCRIPTION" default="我们将在登录模块使用您的Touch ID" />
+    <preference name="FACEID_USAGE_DESCRIPTION" default="方便你进行便捷登录，将使用你的Touch ID ID" />
     <config-file target="*-Info.plist" parent="NSFaceIDUsageDescription">
-      <string>我们将在登录模块使用您的Touch ID</string>
+      <string>方便你进行便捷登录，将使用你的Touch ID</string>
     </config-file>
 
     <framework src="LocalAuthentication.framework" />

src/pages/contractInquire/contract-records.vue

+<<<<<<< HEAD
 <!--
  * @Author: your name
  * @Date: 2019-10-31 09:49:57

src/pages/contractRepayment/repay-details.vue

@@ -6,7 +6,6 @@
         <span>合同明细</span>
       </div>
     </h-header>
-
     <h-content class="repay-content">
       <div class="header">合同单据</div>
       <list-item :item-height="44" class="invoice">
@@ -206,8 +205,9 @@ export default {
   }
 
   .repay-content {
+    overflow: hidden;
     .header {
-      position: relative;
+      // position: relative;
       height: 40px;
       line-height: 40px;
       font-family: PingFangSC-Semibold;

src/pages/contractStart/add-car.vue

@@ -770,6 +770,7 @@ export default {
       position: relative;
       width: 314px;
       height: 516px;
+      z-index: 999;
       background-size: 301px 24.7px;
       background-color: #fff;
     }

src/pages/productQuery/product-list.vue

@@ -56,6 +56,7 @@ export default {
     return {
       lists: [],
       pagenum: 1,
+      division: '',
       searchInput: '',
     }
   },
@@ -74,6 +75,7 @@ export default {
   beforeRouteEnter (to, from, next) {
     next(vm => {
       if (from.name === 'QueryHome') {
+        vm.division = vm.$route.params.division
         vm.pagenum = 1
         vm.searchInput = ''
         vm.proQuery()
@@ -89,7 +91,7 @@ export default {
      let vm = this
      let url = $config.basePath + 'prd_product_list'
      let param = {
-       division: vm.$route.params.division,
+       division: vm.division,
        user_phone: window.localStorage.user_phone,
        searchInput: vm.searchInput,
        pagenum: vm.pagenum,

src/pages/userBindNew/org/bankInfo.vue

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-24 21:29:35
- * @LastEditTime: 2019-12-18 14:25:13
+ * @LastEditTime: 2019-12-18 15:07:39
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -16,7 +16,7 @@
     <div class="info">
       <div class="info-icon">
         <img src="@/assets/userBind/info.png" >
-        <span>温馨提示</span>
+        <span @click="getOrgCertificationUrl">温馨提示</span>
       </div>
       <p>推荐使用农行卡，农行卡支付免收手续费!</p>
     </div>

src/pages/userBindNew/org/enclosure.vue

@@ -2,7 +2,7 @@
  * @Description: 附件信息
  * @Author: your name
  * @Date: 2019-09-20 09:35:11
- * @LastEditTime: 2019-12-18 11:13:47
+ * @LastEditTime: 2019-12-18 14:36:26
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -169,63 +169,54 @@
               </item>
               <item>
                 <div slot="name">坐落</div>
-                <input
-                  slot="content"
-                  v-model="propertyInfo.house_located"
+                <textarea
+                  slot="content" v-model="propertyInfo.house_located" cols="25" rows="2"
+                  contenteditable="true"
                   placeholder="识别不动产权证自动填充"
-                >
+                  @input="addRow" />
               </item>
               <item>
                 <div slot="name">不动产单元号</div>
-                <input
-                  slot="content"
-                  v-model="propertyInfo.real_unit_number"
+                <textarea
+                  slot="content" v-model="propertyInfo.real_unit_number" cols="25" rows="2"
                   placeholder="识别不动产权证自动填充"
-                >
+                  @input="addRow"/>
               </item>
               <item>
                 <div slot="name">权利类型</div>
-                <input
-                  slot="content"
-                  v-model="propertyInfo.right_type"
-                  placeholder="识别不动产权证自动填充"
-                >
+                <textarea
+                  slot="content" v-model="propertyInfo.right_type" cols="25" rows="2"
+                  placeholder="识别不动产权证自动填充" @input="addRow"/>
               </item>
               <item>
                 <div slot="name">权利性质</div>
-                <input
-                  slot="content"
-                  v-model="propertyInfo.right_property"
-                  placeholder="识别不动产权证自动填充"
-                >
+                <textarea
+                  slot="content" v-model="propertyInfo.right_property" cols="25" rows="2"
+                  placeholder="识别不动产权证自动填充" @input="addRow"/>
               </item>
               <item>
                 <div slot="name">用途</div>
-                <input
-                  slot="content"
-                  v-model="propertyInfo.house_purpose"
-                  placeholder="识别不动产权证自动填充"
-                >
+                <textarea
+                  slot="content" v-model="propertyInfo.house_purpose" cols="25" rows="2"
+                  placeholder="识别不动产权证自动填充" @input="addRow"/>
               </item>
               <item>
                 <div slot="name">面积</div>
-                <input
-                  slot="content"
-                  v-model="propertyInfo.house_area"
-                  placeholder="识别不动产权证自动填充"
-                >
+                <textarea
+                  slot="content" v-model="propertyInfo.house_area" cols="25" rows="2"
+                  placeholder="识别不动产权证自动填充" @input="addRow"/>
               </item>
               <item>
                 <div slot="name">使用期限</div>
-                <input
-                  slot="content"
-                  v-model="propertyInfo.land_use_limit"
-                  placeholder="识别不动产权证自动填充"
-                >
+                <textarea
+                  slot="content" v-model="propertyInfo.land_use_limit" cols="25" rows="2"
+                  placeholder="识别不动产权证自动填充" @input="addRow"/>
               </item>
               <item>
                 <div slot="name">权利其他状况</div>
-                <input slot="content" v-model="propertyInfo.right_others" placeholder="识别不动产权证自动填充" >
+                <textarea
+                  slot="content" v-model="propertyInfo.right_others" cols="25" rows="2"
+                  placeholder="识别不动产权证自动填充" @input="addRow"/>
               </item>
             </list-item>
           </div>
@@ -436,7 +427,22 @@ export default {
     })
   },
   created () {},
+  updated () {
+    let myArea = document.querySelectorAll('textarea')
+    myArea.forEach(i => {
+      let num = Math.round((i.scrollHeight - 42) / 20)
+      if (num > 0) {
+        i.rows = num + 2
+      }
+    })
+  },
   methods: {
+    addRow (el) {
+      let num = Math.round((el.target.scrollHeight - 42) / 20)
+      if (num > 0) {
+        el.target.rows = num + 2
+      }
+    },
     // 房产证信息查询
     houseQuery () {
       let vm = this

www/index.html

-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=CyOWd7pmPurvZ0PERgxEOlAlifG0y7Sp"></script><title>徐工融租</title><link href=./static/css/app.306ad5d22c0ce6231ea7f632defd1375.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.efd596b798e6119ce4a4.js></script><script type=text/javascript src=./static/js/app.04ef20cd5c225aadd640.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=CyOWd7pmPurvZ0PERgxEOlAlifG0y7Sp"></script><title>徐工融租</title><link href=./static/css/app.2cb3a4213d1f697420ffc08898e3ddfc.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.b8d844a40484f981e78e.js></script><script type=text/javascript src=./static/js/app.4cfae4e2dcade1b7908e.js></script></body></html>
\ No newline at end of file