refactor(1): 1

src/api/promotion/task.js

@@ -56,4 +56,16 @@ export const getTaskListAPI = (queryParams) => {
       }
     }
   })
+}
+
+
+
+// 促销系统权限开通
+export function openPromotionSystemAPI(data) {
+  return request({
+    baseURL: VITE_APP_PROMOTION,
+    url: '/user/employee/core/account',
+    method: 'POST',
+    data
+  })  
 }
\ No newline at end of file

src/utils/request.js

@@ -31,7 +31,12 @@ service.interceptors.request.use(config => {
   // 是否需要防止数据重复提交
   const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
   if (getToken() && !isToken) {
-    config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+    console.log(config.url, promotionBaseURL)
+    if (config.url.includes(promotionBaseURL)) {
+      config.headers['Authorization'] = getToken()
+    } else {
+      config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+    }
   }
   // get请求映射params参数
   if (config.method === 'get' && config.params) {

src/views/system/user/index.vue

@@ -217,6 +217,28 @@
         :rules="rules"
         ref="userRef"
         label-width="80px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item v-if="form.userId == undefined"
+              label="登录账号"
+              prop="userName">
+              <el-input v-model="form.userName"
+                placeholder="只能小写字母数字组成"
+                maxlength="30" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item v-if="form.userId == undefined"
+              label="登录密码"
+              prop="password">
+              <el-input v-model="form.password"
+                placeholder="请输入密码"
+                type="password"
+                maxlength="20"
+                show-password />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="用户昵称"
@@ -267,28 +289,7 @@
             </el-form-item>
           </el-col> -->
         </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined"
-              label="用户名称"
-              prop="userName">
-              <el-input v-model="form.userName"
-                placeholder="请输入用户名称"
-                maxlength="30" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined"
-              label="用户密码"
-              prop="password">
-              <el-input v-model="form.password"
-                placeholder="请输入用户密码"
-                type="password"
-                maxlength="20"
-                show-password />
-            </el-form-item>
-          </el-col>
-        </el-row>
+
 
         <el-row>
           <el-col :span="12">
@@ -423,7 +424,7 @@
   name="User">
   import { getToken } from "@/utils/auth";
   import useAppStore from '@/store/modules/app'
-  import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser, deptTreeSelectList, getProCityAPI } from "@/api";
+  import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser, deptTreeSelectList, getProCityAPI, openPromotionSystemAPI } from "@/api";
   // import { Splitpanes, Pane } from "splitpanes"
   // import "splitpanes/dist/splitpanes.css"
 
@@ -486,7 +487,8 @@
       deptId: undefined
     },
     rules: {
-      userName: [{ required: true, message: "用户名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }],
+      userName: [{ required: true, message: "用户名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" },
+      { pattern: /^[a-z0-9]+$/, message: "只能小写字母数字组成", trigger: "blur" }],
       nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
       password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }, { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }],
       email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
@@ -717,17 +719,19 @@
     getUser(userId).then(async response => {
       // 省市回显
       const index = provinceList.value.findIndex(o => o.value === response.data.workProvinceNum)
-      const cityList = await getProCityList(response.data.workProvinceNum)
-      provinceList.value[index].children = cityList.data.map(o => {
-        return {
-          value: o.num,
-          label: o.name,
-          leaf: true
-        }
-      })
-      response.data.workCityList = [response.data.workProvinceNum, response.data.workCityNum]
+      if (index !== -1) {
+        const cityList = await getProCityList(response.data.workProvinceNum)
+        provinceList.value[index].children = cityList.data.map(o => {
+          return {
+            value: o.num,
+            label: o.name,
+            leaf: true
+          }
+        })
+        response.data.workCityList = [response.data.workProvinceNum, response.data.workCityNum]
+      }
       // 促销权限 0 开 1 关
-      response.data.proStatus = response.data.proStatus == 1 ? false : true;
+      response.data.proStatus = response.data.proStatus == 1 || response.data.proStatus == undefined ? false : true;
       form.value = response.data;
       postOptions.value = response.posts;
       roleOptions.value = response.roles;
@@ -740,11 +744,11 @@
 
   /** 提交按钮 */
   function submitForm() {
-    proxy.$refs["userRef"].validate(valid => {
+    proxy.$refs["userRef"].validate(async valid => {
       if (valid) {
         // 城市列表转城市参数
-        form.value.workProvinceNum = form.value.workCityList[0]
-        form.value.workCityNum = form.value.workCityList[1]
+        form.value.workProvinceNum = form.value.workCityList && form.value.workCityList[0]
+        form.value.workCityNum = form.value.workCityList && form.value.workCityList[1]
         // 促销开关 true 转 0，false 转 1
         form.value.proStatus = form.value.proStatus == true ? 0 : 1;
         if (form.value.userId != undefined) {
@@ -755,11 +759,21 @@
           });
         } else {
           addUser(form.value).then(response => {
+            console.log(response)
             proxy.$modal.msgSuccess("新增成功");
             open.value = false;
             getList();
           });
         }
+
+        // 同步促销角色权限，给另外一个系统
+        const ress = await openPromotionSystemAPI({
+          loginName: form.value.userName,
+          privilegeId: form.value.privilegeId,
+          status: form.value.proStatus
+        })
+        console.log(ress)
+
         reset()
       }
     });