Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev

template/admin/src/pages/setting/systemMenus/components/menusFrom.vue

@@ -4,7 +4,6 @@
       v-model="modals"
       width="700"
       scrollable
-      footer-hide
       closable
       :title="titleFrom"
       :mask-closable="false"
@@ -60,9 +59,8 @@
             <FormItem label="路由地址：" prop="menu_path">
               <Input v-model="formValidate.menu_path" placeholder="请输入路由地址">
                 <template #prepend>
-                  <span>{{$routeProStr}}</span>
+                  <span>{{ $routeProStr }}</span>
                 </template>
-
               </Input>
             </FormItem>
           </Col>
@@ -107,12 +105,12 @@
               </RadioGroup>
             </FormItem>
           </Col>
-
-          <Col span="24">
-            <Button type="primary" long @click="handleSubmit('formValidate')" :disabled="valids">提交</Button>
-          </Col>
         </Row>
       </Form>
+      <template #footer>
+        <Button @click="modals = false">取消</Button>
+        <Button type="primary" @click="handleSubmit('formValidate')" :disabled="valids">提交</Button>
+      </template>
     </Modal>
     <Modal v-model="modal12" scrollable width="600" title="图标选择" footer-hide>
       <Input

template/admin/src/pages/user/list/index.vue

@@ -951,31 +951,36 @@ export default {
     },
     // 赠送会员等级
     giveLevel(id) {
-      giveLevelApi(id)
-        .then(async (res) => {
-          if (res.data.status === false) {
-            return this.$authLapse(res.data);
-          }
-          this.FromData = res.data;
-          this.$refs.edits.modals = true;
-        })
-        .catch((res) => {
-          this.$Message.error(res.msg);
-        });
+      this.$modalForm(giveLevelApi(id)).then(() => this.getList(1));
+
+      // giveLevelApi(id)
+      //   .then(async (res) => {
+      //     if (res.data.status === false) {
+      //       return this.$authLapse(res.data);
+      //     }
+
+      //     this.FromData = res.data;
+      //     this.$refs.edits.modals = true;
+      //   })
+      //   .catch((res) => {
+      //     this.$Message.error(res.msg);
+      //   });
     },
     // 赠送会员等级
     giveLevelTime(id) {
-      giveLevelTimeApi(id)
-        .then(async (res) => {
-          if (res.data.status === false) {
-            return this.$authLapse(res.data);
-          }
-          this.FromData = res.data;
-          this.$refs.edits.modals = true;
-        })
-        .catch((res) => {
-          this.$Message.error(res.msg);
-        });
+      this.$modalForm(giveLevelTimeApi(id)).then(() => this.getList(1));
+      
+      // giveLevelTimeApi(id)
+      //   .then(async (res) => {
+      //     if (res.data.status === false) {
+      //       return this.$authLapse(res.data);
+      //     }
+      //     this.FromData = res.data;
+      //     this.$refs.edits.modals = true;
+      //   })
+      //   .catch((res) => {
+      //     this.$Message.error(res.msg);
+      //   });
     },
     // 删除
     del(row, tit, num, name) {
@@ -1131,32 +1136,9 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    // getUserFrom(id) {
-    //   getUserData(id)
-    //     .then(async (res) => {
-    //       if (res.data.status === false) {
-    //         return this.$authLapse(res.data);
-    //       }
-    //       this.FromData = res.data;
-    //       this.$refs.edits.modals = true;
-    //     })
-    //     .catch((res) => {
-    //       this.$Message.error(res.msg);
-    //     });
-    // },
     // 获取积分余额表单
     getOtherFrom(id) {
-      editOtherApi(id)
-        .then(async (res) => {
-          if (res.data.status === false) {
-            return this.$authLapse(res.data);
-          }
-          this.FromData = res.data;
-          this.$refs.edits.modals = true;
-        })
-        .catch((res) => {
-          this.$Message.error(res.msg);
-        });
+      this.$modalForm(editOtherApi(id)).then(() => this.getList(1));
     },
     // 修改状态
     onchangeIsShow(row) {

template/admin/src/router/modules/frameOut.js

@@ -23,7 +23,6 @@ export default [
     },
     component: () => import('@/pages/account/login'),
   },
-  // 客服
   {
     path: '/kefu',
     name: `${pre}index`,
@@ -34,6 +33,20 @@ export default [
     },
     component: () => import('@/pages/kefu/index'),
   },
+  // 客服
+  {
+    path: routePre + '/kefu',
+    name: `${pre}index`,
+    meta: {
+      auth: true,
+      title: '客服管理',
+      kefu: true,
+    },
+    redirect: {
+      name: `setting_service`,
+    },
+    component: () => import('@/pages/kefu/index'),
+  },
   {
     path: '/kefu/mobile_list',
     name: `${pre}mobile_list`,