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-file/CONTRIBUTING.md

-<!--
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
--->
-
-# Contributing to Apache Cordova
-
-Anyone can contribute to Cordova. And we need your contributions.
-
-There are multiple ways to contribute: report bugs, improve the docs, and
-contribute code.
-
-For instructions on this, start with the 
-[contribution overview](http://cordova.apache.org/contribute/).
-
-The details are explained there, but the important items are:
- - Sign and submit an Apache ICLA (Contributor License Agreement).
- - Have a Jira issue open that corresponds to your contribution.
- - Run the tests so your patch doesn't break existing functionality.
-
-We look forward to your contributions!
+<!--
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+-->
+
+# Contributing to Apache Cordova
+
+Anyone can contribute to Cordova. And we need your contributions.
+
+There are multiple ways to contribute: report bugs, improve the docs, and
+contribute code.
+
+For instructions on this, start with the 
+[contribution overview](http://cordova.apache.org/contribute/).
+
+The details are explained there, but the important items are:
+ - Sign and submit an Apache ICLA (Contributor License Agreement).
+ - Have a Jira issue open that corresponds to your contribution.
+ - Run the tests so your patch doesn't break existing functionality.
+
+We look forward to your contributions!

plugins/cordova-plugin-file/NOTICE

-Apache Cordova
-Copyright 2012 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
+Apache Cordova
+Copyright 2012 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).

plugins/cordova-plugin-file/src/android/EncodingException.java

-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-
-package org.apache.cordova.file;
-
-@SuppressWarnings("serial")
-public class EncodingException extends Exception {
-
-    public EncodingException(String message) {
-        super(message);
-    }
-
-}
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
+
+package org.apache.cordova.file;
+
+@SuppressWarnings("serial")
+public class EncodingException extends Exception {
+
+    public EncodingException(String message) {
+        super(message);
+    }
+
+}

src/pages/contractInquire/contract-records.vue

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