Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify

.gitignore

@@ -8,3 +8,4 @@ test/unit/coverage
 test/e2e/reports
 selenium-debug.log
 .idea
+config/dev.env.js

config/dev.env.js

 module.exports = {
     NODE_ENV: '"development"',
-  BASE_API: '"http://10.1.37.246:8765"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
+  BASE_API: '"https://dev.dfangche.com"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
     APP_ORIGIN: '"https://wallstreetcn.com"'
 }

src/api/officialWebsit/activity.js

+import fetch from 'utils/fetch';
+/**
+ * 获活动列表List
+ */
+export function getActivityList(query) {
+  return fetch({
+    url: '/api/uccn/admin/summitActivity/list',
+    method: 'post',
+    data: query
+  });
+}
+/**
+ * 根据id获取一条活动数据
+ */
+export function getOneActivityShop(id) {
+  return fetch({
+    url: '/api/uccn/admin/summitActivity/' + id,
+    method: 'get'
+  });
+}
+/**
+ * 编辑活动数据
+ * */
+export function editActivity(query) {
+  return fetch({
+    url: '/api/uccn/admin/summitActivity/save',
+    method: 'post',
+    data: query
+  });
+}
+/**
+ * 活动上架、下架
+ * */
+export function isShowStatus(id, state) {
+  return fetch({
+    url: '/api/uccn/admin/summitActivity/soldout/' + id + '/' + state,
+    method: 'put'
+  });
+}
+
+
+/**
+ * 活动发布、不发布
+ * */
+export function isPublishStatus(id, state) {
+  return fetch({
+    url: '/api/uccn/admin/summitActivity/publish/' + id + '/' + state,
+    method: 'put'
+  });
+}
+/**
+ *删除活动
+ */
+export function deleteActivityTag(id) {
+  return fetch({
+    url: '/api/uccn/admin/summitActivity/' + id,
+    method: 'delete'
+  });
+}

src/views/baseInfo/branchCompany/companyInfoModal.vue

@@ -7,7 +7,7 @@
             <el-input v-model="form.name" placeholder="输入公司全称"></el-input>
           </el-form-item>
 
-          <el-form-item label="公司简称" prop="name">
+          <el-form-item label="公司简称" prop="companyName">
             <el-input v-model="form.companyName" placeholder="输入公司简称"></el-input>
           </el-form-item>
 
@@ -42,18 +42,18 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="详细地址" prop="leader">
+          <el-form-item label="详细地址">
             <el-input v-model="form.addrDetail" placeholder="请输入详细地址"></el-input>
           </el-form-item>
-          <el-form-item label="经度" prop="longitude">
+          <el-form-item label="经度">
             <el-input v-model.number="form.longitude" placeholder="请输入经度"></el-input>
           </el-form-item>
 
-          <el-form-item label="纬度" prop="latitude">
+          <el-form-item label="纬度">
             <el-input v-model.number="form.latitude" placeholder="请输入纬度"></el-input>
           </el-form-item>
 
-          <el-form-item label="负责人" prop="leader">
+          <el-form-item label="负责人">
             <el-input v-model="form.leader" placeholder="请输入负责人"></el-input>
           </el-form-item>
 
@@ -61,11 +61,11 @@
             <el-input v-model="form.leaderContactInfo" placeholder="请输入负责人电话"></el-input>
           </el-form-item>
 
-          <el-form-item label="租车客服电话" prop="vehiceServicePhone">
+          <el-form-item label="租车客服电话">
             <el-input v-model="form.vehiceServicePhone" placeholder="请输入租车客服电话"></el-input>
           </el-form-item>
 
-          <el-form-item label="旅游客服电话" prop="tourServicePhone">
+          <el-form-item label="旅游客服电话">
             <el-input v-model="form.tourServicePhone" placeholder="请输入旅游客服电话"></el-input>
           </el-form-item>
           <el-form-item label="app展示">
@@ -188,22 +188,6 @@
           isShow: "2",//1：是， 2：否
         },
         rules: {
-//          latitude: [
-//            {
-//              type: 'number',
-//              required: true,
-//              message: '请输入数字',
-//              trigger: 'blur'
-//            }
-//          ],
-//          longitude: [
-//            {
-//              type: 'number',
-//              required: true,
-//              message: '请输入数字',
-//              trigger: 'blur'
-//            }
-//          ],
           status: [
             {
               type: 'integer',
@@ -220,10 +204,10 @@
               trigger: 'blur'
             }
           ],
-          name: [
+          companyName: [
             {
               required: true,
-              message: '请输名称',
+              message: '请输简称',
               trigger: 'blur'
             },
             {
@@ -233,10 +217,10 @@
               trigger: 'blur'
             }
           ],
-          addrDetail: [
+          name: [
             {
               required: true,
-              message: '请输入详细地址',
+              message: '请输名称',
               trigger: 'blur'
             },
             {
@@ -246,29 +230,42 @@
               trigger: 'blur'
             }
           ],
-          leaderContactInfo: [
+          addrDetail: [
             {
-              required: false,
-              message: '请输入联系人电话',
+              required: true,
+              message: '请输入详细地址',
               trigger: 'blur'
             },
             {
-              validator: (rule, value, callback) => {
-                if (!value) {
-                  return true;
-                } else {
-                  const reg = /^[1](([3][0-9])|([4][5,7,9])|([5][0-9])|([6][6])|([7][1,2,3,5,6,7,8])|([8][0-9])|([9][1,8,9]))[0-9]{8}$/
-                  console.log(reg.test(value));
-                  if (reg.test(value)) {
-                    callback();
-                  } else {
-                    return callback(new Error('请输入正确的手机号'));
-                  }
-                }
-              },
+              min: 0,
+              max: 200,
+              message: '长度小于 200 个字符',
               trigger: 'blur'
             }
           ],
+//          leaderContactInfo: [
+//            {
+//              required: false,
+//              message: '请输入联系人电话',
+//              trigger: 'blur'
+//            },
+//            {
+//              validator: (rule, value, callback) => {
+//                if (!value) {
+//                  return true;
+//                } else {
+//                  const reg = /^[1](([3][0-9])|([4][5,7,9])|([5][0-9])|([6][6])|([7][1,2,3,5,6,7,8])|([8][0-9])|([9][1,8,9]))[0-9]{8}$/
+//                  console.log(reg.test(value));
+//                  if (reg.test(value)) {
+//                    callback();
+//                  } else {
+//                    return callback(new Error('请输入正确的手机号'));
+//                  }
+//                }
+//              },
+//              trigger: 'blur'
+//            }
+//          ],
           addrProvince: [
             {
               required: true,
@@ -294,24 +291,6 @@
               },
               trigger: 'blur'
             }
-          ],
-          addrTown: [
-            {
-              required: true,
-              type: 'number',
-              message: '请选择镇(县)',
-              trigger: 'blur'
-            },
-            {
-              validator: (rule, value, callback) => {
-                if (this.$utils.isInteger(this.form.addrCity) &&
-                  value.toString().substr(0, 4) != this.form.addrCity.toString().substr(0, 4)) {
-                  return callback(new Error('请选择城市下相应镇（县）'));
-                }
-                callback();
-              },
-              trigger: 'blur'
-            }
           ]
         },
         tabName: "first",
@@ -330,6 +309,7 @@
     created() {
       this.activeName2 = undefined;
       if(this.dialogStatus == "create"){
+        this.activeName2 = "first";
         this.tabName = "first";
       }else if(this.dialogStatus == "companyInfoUpdate"){
         //公司介绍编辑
@@ -421,7 +401,7 @@
             t.form.companyName = info.companyName;//简称
             t.form.zoneId = info.zoneId;//简称
             t.form.describes = info.describes;//公司简介
-            t.form.content = info.content;//公司详情
+            t.form.content = info.content?info.content: "";//公司详情
             t.form.addrProvince = info.addrProvince;//省-编码
             t.form.addrCity = info.addrCity;//市-编码
             t.form.addrTown = info.addrTown;//县-编码
@@ -514,7 +494,7 @@
             });
             let provinceObj = this.form.addrProvince?getRegionByCodes([this.form.addrProvince]): [{name:""}];
             let cityObj = this.form.addrCity?getRegionByCodes([this.form.addrCity]):[{name:""}];
-            let addrTownObj = this.form.addrCity?getRegionByCodes([this.form.addrTown]):[{name:""}];
+            let addrTownObj = this.form.addrTown?getRegionByCodes([this.form.addrTown]):[{name:""}];
             params.state = this.state == 1?2:1;//("上下架:1-上架；2-下架")
             params.images = arr.join(",");
             params.id = this.form.id;
@@ -579,7 +559,7 @@
               });
               let provinceObj = this.form.addrProvince?getRegionByCodes([this.form.addrProvince]): [{name:""}];
               let cityObj = this.form.addrCity?getRegionByCodes([this.form.addrCity]):[{name:""}];
-              let addrTownObj = this.form.addrCity?getRegionByCodes([this.form.addrTown]):[{name:""}];
+              let addrTownObj = this.form.addrTown?getRegionByCodes([this.form.addrTown]):[{name:""}];
               params.images = arr.join(",");
               params.id = this.form.id;
               params.companyId = this.form.companyId;
@@ -688,7 +668,7 @@
             });
             let provinceObj = this.form.addrProvince?getRegionByCodes([this.form.addrProvince]): [{name:""}];
             let cityObj = this.form.addrCity?getRegionByCodes([this.form.addrCity]):[{name:""}];
-            let addrTownObj = this.form.addrCity?getRegionByCodes([this.form.addrTown]):[{name:""}];
+            let addrTownObj = this.form.addrTown?getRegionByCodes([this.form.addrTown]):[{name:""}];
             params.images = arr.join(",");
             params.name=  this.form.name;//全称
             params.companyName = this.form.companyName;//简称
@@ -811,13 +791,6 @@
         } else {
           this.form.addrTown = undefined;
         }
-      },
-      /**
-       * 弹框-取消
-       * */
-      cancel() {
-        console.log("取消禁用");
-        cancleBook(this.currentItem.ii.vehicleBookRecord.id).then(response => {this.$emit("companyInfoDialogEvent", true);});
       }
     }
   }

src/views/baseInfo/branchCompany/stockRightModal.vue

@@ -188,6 +188,7 @@
                   });
                   this.$emit("stockRightDialogEvent", true);
                 }else{
+                  this.form.price = this.form.price/10000;
                   this.$notify({
                     title: '失败',
                     message: res.message,