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

# Conflicts:
#	src/router/index.js
#	src/views/admin/user/index.vue

config/prod.env.js

 module.exports = {
     NODE_ENV: '"production"',
   // BASE_API: '"http://113.105.137.152:9800"',
-  BASE_API: '"https://xxfcmgmt.upyuns.com"',
+  BASE_API: '"https://mgmt.dfangche.com"',
     APP_ORIGIN: '"https://wallstreetcn.com"'
 };

src/api/vehicle/bookRecord/index.js

@@ -53,3 +53,30 @@ export function ret(data) {
     data: data
   });
 }
+
+/**
+ * 根据id获取一条违章查询记录
+ * @param query
+ */
+export function getOneIllegalRow(id) {
+  return fetch({
+    url: '/api/order/orderViolation/getOne/' + id,
+    method: 'get'
+  });
+}
+
+/**
+ * 保存违章记录
+ * @param query
+ * {price:图片地址(多个逗号分割)
+price:退款总金额
+detailId:租车订单id
+}
+ */
+export function saveOrderViolation(params) {
+  return fetch({
+    url: '/vehicle/departure/app/save',
+    method: 'post',
+    data: params
+  });
+}
\ No newline at end of file

src/router/index.js

@@ -77,17 +77,29 @@ export const constantRouterMap = [{
   component: _import('error/401'),
   hidden: true
 },
-{
-  path: '/',
-  component: Layout,
-  redirect: '/dashboard',
-  name: '首页',
-  hidden: true,
-  children: [{
-    path: 'dashboard',
-    component: _import('dashboard/index')
-  }]
-},
+  {
+    path: '/',
+    component: Layout,
+    redirect: '/dashboard',
+    name: '首页',
+    hidden: true,
+    children: [{
+      path: 'dashboard',
+      component: _import('dashboard/index')
+    }]
+  },
+
+// {
+//   path: '/',
+//   component: Layout,
+//   redirect: '/baseManager/userManager',
+//   name: '首页',
+//   hidden: true,
+//   children: [{
+//     path: 'userManager',
+//     component: _import('admin/user/index')
+//   }]
+// },
 {
   path: '/introduction',
   component: Layout,

src/views/baseInfo/stockCrowd/index.vue

@@ -357,7 +357,7 @@
               res.data.list.forEach(function (item) {
                 item.price = item.price / 1000 + ",000";
                 item.width = (item.total - item.balance) / item.total * 100 + "px";
-                item.companyPic = "https://xxfcmgmt.upyuns.com/vehicle/branchCompany/stock/download/companyPic?realFileRelPath=" + item.companyPic;
+                item.companyPic = "https://mgmt.dfangche.com/vehicle/branchCompany/stock/download/companyPic?realFileRelPath=" + item.companyPic;
                 allList.push(item);
               });
               this.lastPage = res.data.lastPage;
@@ -394,7 +394,7 @@
               res.data.list.forEach(function (item) {
                 item.price = item.price / 1000 + ",000";
                 item.width = (item.total - item.balance) / item.total * 100 + "px";
-                item.companyPic = "https://xxfcmgmt.upyuns.com/vehicle/branchCompany/stock/download/companyPic?realFileRelPath=" + item.companyPic;
+                item.companyPic = "https://mgmt.dfangche.com/vehicle/branchCompany/stock/download/companyPic?realFileRelPath=" + item.companyPic;
                 allList.push(item);
               });
               this.list = allList;

src/views/baseInfo/stockCrowd/stockCrowd.vue

@@ -231,7 +231,7 @@
             res.data.list.forEach(function (item) {
               item.price = item.price / 10000;
               item.width = (item.total - item.balance) / item.total * 100 + "px";
-              item.companyPic = "https://xxfcmgmt.upyuns.com/vehicle/branchCompany/stock/download/companyPic?realFileRelPath=" + item.companyPic;
+              item.companyPic = "https://mgmt.dfangche.com/vehicle/branchCompany/stock/download/companyPic?realFileRelPath=" + item.companyPic;
               allList.push(item);
             });
             if(res.data.list.length< this.listQuery.limit && allList.length>0){