Merge remote-tracking branch 'origin/master'

.env.production

@@ -2,7 +2,7 @@
 ENV = 'production'
 
 # base api
-#VUE_APP_BASE_API = https://sstt.115.langye.net/
-#VUE_APP_UPLOAD_API = https://sstt.115.langye.net/api/admin/upload-file
-VUE_APP_BASE_API = http://sstt.ali251.langye.net/
-VUE_APP_UPLOAD_API = http://sstt.ali251.langye.net/api/admin/upload-file
+VUE_APP_BASE_API = https://sstt.115.langye.net/
+VUE_APP_UPLOAD_API = https://sstt.115.langye.net/api/admin/upload-file
+#VUE_APP_BASE_API = http://sstt.ali251.langye.net/
+#VUE_APP_UPLOAD_API = http://sstt.ali251.langye.net/api/admin/upload-file

src/views/customer/component/addCustomer.vue

@@ -56,7 +56,7 @@
       <template v-slot:contact_name>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>委托人：
+            <!-- <span style="color: red;font-weight: 600;padding-right: 4px;">*</span> -->委托人：
           </div>
           <div class="xy-table-item-content">
             <el-input v-model="form.contact_name " clearable placeholder="请输入委托人姓名" style="width: 300px;"></el-input>
@@ -67,7 +67,7 @@
       <template v-slot:contact_phone>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>委托人电话：
+            <!-- <span style="color: red;font-weight: 600;padding-right: 4px;">*</span> -->委托人电话：
           </div>
           <div class="xy-table-item-content">
             <el-input v-model="form.contact_phone " clearable placeholder="请输入委托人电话" style="width: 300px;"></el-input>
@@ -152,7 +152,7 @@
       <template v-slot:level_id>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>失能等级：
+            <!-- <span style="color: red;font-weight: 600;padding-right: 4px;">*</span> -->失能等级：
           </div>
           <div class="xy-table-item-content">
             <el-select v-model="form.level_id" placeholder="请选择失能等级" style="width: 300px;">
@@ -166,7 +166,7 @@
       <template v-slot:level_type>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>失能类型：
+            <!-- <span style="color: red;font-weight: 600;padding-right: 4px;">*</span> -->失能类型：
           </div>
           <div class="xy-table-item-content">
             <el-select v-model="form.level_type" placeholder="请选择失能类型" style="width: 300px;">
@@ -464,21 +464,21 @@ export default {
             message: '身份证格式错误'
           }
         ],
-        contact_name: [
-          {required: true, message: '请填写联系人姓名'}
-        ],
-        contact_phone: [
-          {validator: validatePhone}
-        ],
+        // contact_name: [
+        //   {required: true, message: '请填写联系人姓名'}
+        // ],
+        // contact_phone: [
+        //   {validator: validatePhone}
+        // ],
         idcard_address: [
           {required: true, message: '请填写户籍地址'},
         ],
         customer_address_list: [
           {required: true, message: '请填写地址'},
         ],
-        level_id: [
-          {required: true, message: '请选择失能等级'},
-        ],
+        // level_id: [
+        //   {required: true, message: '请选择失能等级'},
+        // ],
         product_type_customer_links:[
           {validator: validateProductType}
         ]

vue.config.js

@@ -25,7 +25,7 @@ module.exports = {
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
   publicPath: '/admin/',
-  outputDir: '/Users/liuxiangyu/Work/s-sishitongtang/app/sishitongtang-service/public/admin',
+  outputDir: '/Users/mac/Documents/Work/c-常州四世同堂/code/shishitongtang-service/public/admin',
   assetsDir: 'static',
   css: {
     loaderOptions: { // 向 CSS 相关的 loader 传递选项