Merge branch 'lwx_v28'

src/directive/permission/button.ts

@@ -79,12 +79,13 @@ export const hasAppGroup: Directive = {
 */
 export const appHasPower = (signCode:string,buttonKey:string) => {
   const userStore = useUserStore();
+  console.log("判断应用级权限--appSystemPower->",userStore.myPower.appSystemPower)
   return userStore.myPower.appSystemPower.some((perm: any) => {
 
-      // console.log("判断应用级权限--->",buttonKey)
+      console.log(signCode,"判断应用级权限--->",buttonKey)
       if(perm.AppId == signCode){
-        // console.log("判断应用级权限-1111-->",perm.AppId,buttonKey)
-        // console.log("判断应用级权限-222-->",perm.butPower && Array.isArray(perm.butPower))
+        console.log("判断应用级权限-1111-->",perm.AppId,buttonKey)
+        console.log("判断应用级权限-222-->",perm.butPower && Array.isArray(perm.butPower))
         if(perm.butPower && Array.isArray(perm.butPower)){
           // console.log("判断应用级权限--->",perm.AppId,buttonKey)
           return perm.butPower.includes(buttonKey)

src/views/login/index.vue

@@ -179,7 +179,7 @@ function handleLogin() {
       userStore
         .login(loginData.value)
         .then((datas:any) => {
-          // console.log("黄金卡刷卡结算",datas)
+          console.log("黄金卡刷卡结算",datas)
           ElMessage.success(datas.msg ||"登录成功");
           const query: LocationQuery = route.query;
           const redirect = (query.redirect as LocationQueryValue) ?? "/";
@@ -191,7 +191,7 @@ function handleLogin() {
             return acc;
           }, {});
           
-          //console.log("登陆输出：",redirect,otherQueryParams);
+          console.log("登陆输出：",redirect,otherQueryParams);
           router.push({ path: redirect, query: otherQueryParams });
           getCaptcha();
         })