Merge branch 'liuxin' into develop

config/dev.env.js

@@ -8,10 +8,10 @@ module.exports = merge(prodEnv, {
   debug: true,
   isMobilePlatform: false,
   loginPath: '"http://180.104.121.66:8088/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=admin&password=" ',
-  basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_UAT&apiName="',
+  basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_DEV&apiName="',
   rootPath: '"http://180.104.121.66:8088/r/api"',
-  filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"',
-  ocrPath:'"http://180.104.121.66:8088/r/api"',
+  filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_DEV&apiName=file_view&"',
+  ocrPath: '"http://180.104.121.66:8088/r/api"',
   appId: '"com.xcmg.app"',
-  currentVersion: '"1.0.1"'
-});
+  currentVersion: '"1.0.1"',
+})

config/prod.env.js

@@ -8,8 +8,8 @@ module.exports = {
   basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_UAT&apiName="',
   rootPath: '"http://180.104.121.66:8088/r/api"',
   filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"',
-  ocrPath:'"http://180.104.121.66:8088/r/api"',
-  fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
+  ocrPath: '"http://180.104.121.66:8088/r/api"',
+  fileUploadSvcPath: '"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
   appId: '"com.xcmg.app"',
-  currentVersion: '"1.0.1"'
+  currentVersion: '"1.0.1"',
 }

src/pages/contractCreate/sales-info.vue

@@ -87,7 +87,7 @@
         <item @click.native="showTime('YYYY-MM-DD')">
           <div slot="name" class="font-color required">签约日期</div>
           <input
-            slot="content" v-model="salesInfo.sale_date"
+            slot="content" v-model="salesInfo.sale_date" placeholder="请选择签约日期"
             readonly>
           <img src="@/assets/contractCreate/date.png" alt="" class="date-pic">
         </item>
@@ -168,7 +168,7 @@ export default {
         office_id: '', // 办事处id
         factory: '', // 主机厂id
         manu_manager: '', // 办事处业务员
-        sale_date: '请选择签约日期',
+        sale_date: '',
         project_id: '',
       },
     }
@@ -216,7 +216,7 @@ export default {
           office_id: '', // 办事处id
           factory: '', // 主机厂id
           manu_manager: '', // 办事处业务员
-          sale_date: '请选择',
+          sale_date: '',
           bp_type: window.localStorage.bp_type,
           project_id: '',
         }