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

src/router/index.js

@@ -337,12 +337,12 @@ export const asyncRouterMap = [{
       name: '车辆排班管理',
       authority: 'bookRecord'
     },
-    // {
-    //   path: 'bookingManagement',
-    //   component: _import('vehicle/smallProgram/bookingManagement'),
-    //   name: '小程序车辆申请管理',
-    //   authority: 'bookingManagement'
-    // },
+    {
+      path: 'bookingManagement',
+      component: _import('vehicle/smallProgram/bookingManagement'),
+      name: '小程序车辆申请管理',
+      authority: 'bookingManagement'
+    },
     {
       path: 'vehicleWarningMsg',
       component: _import('vehicle/vehicleWarningMsg/index'),
@@ -427,12 +427,12 @@ export const asyncRouterMap = [{
       name: '会员订单管理',
       authority: 'memberOrderInfo'
     },
-    {
-      path: 'orderStatistics',
-      component: _import('order/orderStatistics/index'),
-      name: '会员订单统计',
-      authority: 'orderStatistics'
-    },
+    // {
+    //   path: 'orderStatistics',
+    //   component: _import('order/orderStatistics/index'),
+    //   name: '会员订单统计',
+    //   authority: 'orderStatistics'
+    // },
     {
       path: 'createOrder',
       component: _import('order/createOrder/index'),
@@ -537,12 +537,12 @@ export const asyncRouterMap = [{
       name: '首页精选活动',
       authority: 'selectedActivities'
     },
-	{
-      path: 'pushManagement',
-      component: _import('appManagement/pushManagement/index'),
-      name: '消息推送',
-      authority: 'pushManagement'
-    }
+	// {
+ //      path: 'pushManagement',
+ //      component: _import('appManagement/pushManagement/index'),
+ //      name: '消息推送',
+ //      authority: 'pushManagement'
+ //    }
   ]
 },
 {

src/views/admin/user/index.vue

@@ -464,15 +464,27 @@
         set[formName].validate(valid => {
           if (valid) {
             addObj(this.form)
-              .then(() => {
+              .then(response => {
+								console.log(response)
+								if(response.status == 200) {
+									this.$notify({
+									  title: '成功',
+									  message: "添加成功",
+									  type: 'success',
+									  duration: 2000
+									});
+								} else {
+									this.$notify({
+									  title: '失败',
+									  message: response.message,
+									  type: 'error',
+									  duration: 2000
+									});
+								}
                 this.dialogFormVisible = false;
                 this.getList();
-                this.$notify({
-                  title: '成功',
-                  message: '创建成功',
-                  type: 'success',
-                  duration: 2000
-                });
+                
+								
               })
           } else {
             return false;
@@ -510,16 +522,25 @@
             } else {
               this.form.password = undefined;
             }
-            putObj(this.form.id, this.form).then(() => {
+            putObj(this.form.id, this.form).then(response => {
+							if(response.status == 200) {
+								 this.$notify({
+								  title: '成功',
+								  message: '编辑成功',
+								  type: 'success',
+								  duration: 2000
+								});
+							} else {
+								this.$notify({
+								  title: '失败',
+								  message: response.message,
+								  type: 'error',
+								  duration: 2000
+								});
+							}
               this.dialogFormVisible = false;
               this.getList();
               this.form.password = undefined;
-              this.$notify({
-                title: '成功',
-                message: '编辑成功',
-                type: 'success',
-                duration: 2000
-              });
             });
           } else {
             return false;