更新路由配置，修改店铺信息展示，登录拦截

src/views/application/index.vue

@@ -0,0 +1 @@
+<template></template>

src/views/application/marketing.vue

@@ -0,0 +1 @@
+<template></template>

src/views/devices/printer.vue

@@ -0,0 +1 @@
+<template></template>

src/views/inventory/consumables.vue

@@ -0,0 +1 @@
+<template></template>

src/views/login/index.vue

@@ -2,22 +2,22 @@
   <div class="login" :style="'background-image:url(' + Background + ');'">
     <el-form
       ref="loginForm"
-      :model="loginForm"
-      :rules="loginRules"
+      :model="state.loginForm"
+      :rules="state.loginRules"
       label-position="left"
       label-width="0px"
       class="login-form"
     >
       <h3 class="title">银收客后台管理</h3>
       <el-form-item>
-        <el-radio-group v-model="loginForm.loginType">
+        <el-radio-group v-model="state.loginForm.loginType">
           <el-radio-button value="merchant">商户</el-radio-button>
           <el-radio-button value="staff">员工</el-radio-button>
         </el-radio-group>
       </el-form-item>
-      <el-form-item prop="merchantName" v-if="loginForm.loginType == 'staff'">
+      <el-form-item prop="merchantName" v-if="state.loginForm.loginType == 'staff'">
         <el-input
-          v-model="loginForm.merchantName"
+          v-model="state.loginForm.merchantName"
           type="text"
           auto-complete="off"
           placeholder="商户号"
@@ -25,7 +25,7 @@
       </el-form-item>
       <el-form-item prop="username">
         <el-input
-          v-model="loginForm.username"
+          v-model="state.loginForm.username"
           type="text"
           auto-complete="off"
           placeholder="账号"
@@ -33,7 +33,7 @@
       </el-form-item>
       <el-form-item prop="password">
         <el-input
-          v-model="loginForm.password"
+          v-model="state.loginForm.password"
           type="password"
           auto-complete="off"
           placeholder="密码"
@@ -43,27 +43,27 @@
       <el-form-item prop="code">
         <div class="code_wrap">
           <el-input
-            v-model="loginForm.code"
+            v-model="state.loginForm.code"
             auto-complete="off"
             placeholder="验证码"
             style="width: 63%"
             @keyup.enter="handleLogin"
           ></el-input>
           <div class="login-code">
-            <img :src="codeUrl" @click="getCode" />
+            <img :src="state.codeUrl" @click="getCode" />
           </div>
         </div>
       </el-form-item>
 
       <el-form-item style="width: 100%">
         <el-button
-          :loading="loading"
+          :loading="state.loading"
           size="default"
           type="primary"
           style="width: 100%"
           @click.prevent="handleLogin"
         >
-          <span v-if="!loading">登 录</span>
+          <span v-if="!state.loading">登 录</span>
           <span v-else>登 录 中...</span>
         </el-button>
       </el-form-item>
@@ -76,168 +76,125 @@
   </div>
 </template>
 
-<script>
+<script setup>
 import { encrypt } from "@/utils/rsaEncrypt";
 import { getCodeImg } from "@/api/login";
 import { $douyin_checkIn } from "@/api/coup/index";
 import Cookies from "js-cookie";
 import qs from "qs";
 import Background from "@/assets/images/background_img.jpg";
-export default {
-  name: "Login",
-  data() {
-    return {
-      Background: Background,
-      codeUrl: "",
-      cookiePass: "",
-      loginForm: {
-        username: "",
-        password: "",
-        rememberMe: false,
-        code: "",
-        uuid: "",
-        merchantName: "",
-        loginType: "merchant",
-      },
-      loginRules: {
-        username: [{ required: true, trigger: "blur", message: "用户名不能为空" }],
-        password: [{ required: true, trigger: "blur", message: "密码不能为空" }],
-        code: [{ required: true, trigger: "change", message: "验证码不能为空" }],
-        merchantName: [{ required: true, trigger: "change", message: "商户号不能为空" }],
-      },
-      loading: false,
-      redirect: undefined,
-    };
-  },
-  watch: {
-    $route: {
-      handler: function (route) {
-        const data = route.query;
-        if (data && data.redirect) {
-          this.redirect = data.redirect;
-          delete data.redirect;
-          if (JSON.stringify(data) !== "{}") {
-            this.redirect = this.redirect + "&" + qs.stringify(data, { indices: false });
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  created() {
-    // 获取验证码
-    this.getCode();
-    // // 获取用户名密码等Cookie
-    // this.getCookie()
-    // // token 过期提示
-    // this.point()
+import { useUserStore } from "@/store";
+import { useRoute } from "vue-router";
+import router from "@/router";
+const route = useRoute();
 
-    let getinfo = localStorage.getItem("MerchantId");
-    let info = JSON.parse(getinfo);
-    if (info && info.merchantName) {
-      this.loginForm.merchantName = info.merchantName;
-      this.loginForm.username = info.username;
-    }
+const state = reactive({
+  Background: Background,
+  codeUrl: "",
+  cookiePass: "",
+  loginForm: {
+    username: "",
+    password: "",
+    rememberMe: false,
+    code: "",
+    uuid: "",
+    merchantName: "",
+    loginType: "merchant",
   },
-  methods: {
-    getCode() {
-      getCodeImg().then((res) => {
-        console.log(res);
-        this.codeUrl = res.img;
-        this.loginForm.uuid = res.uuid;
-      });
-    },
-    getCookie() {
-      const username = Cookies.get("username");
-      let password = Cookies.get("password");
-      const rememberMe = Cookies.get("rememberMe");
-      // 保存cookie里面的加密后的密码
-      this.cookiePass = password === undefined ? "" : password;
-      password = password === undefined ? this.loginForm.password : password;
-      this.loginForm = {
-        username: username === undefined ? this.loginForm.username : username,
-        password: password,
-        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
-        code: "",
-        merchantName: "",
-        loginType: "merchant",
-      };
-    },
-    handleLogin() {
-      this.$refs.loginForm.validate((valid) => {
-        // const user = {
-        //   username: this.loginForm.username,
-        //   password: this.loginForm.password,
-        //   rememberMe: this.loginForm.rememberMe,
-        //   code: this.loginForm.code,
-        //   uuid: this.loginForm.uuid,
-        //   merchantName: this.loginForm.merchantName,
-        //   loginType: this.loginForm.loginType
-        // }
-        // if (user.password !== this.cookiePass) {
-        //   user.password = encrypt(user.password)
-        // }
-        if (valid) {
-          this.loading = true;
-          // if (user.rememberMe) {
-          //   Cookies.set('username', user.username, { expires: Config.passCookieExpires })
-          //   Cookies.set('password', user.password, { expires: Config.passCookieExpires })
-          //   Cookies.set('rememberMe', user.rememberMe, { expires: Config.passCookieExpires })
-          // } else {
-          //   Cookies.remove('username')
-          //   Cookies.remove('password')
-          //   Cookies.remove('rememberMe')
-          // }
-          // console.log(user);
-          const user = { ...this.loginForm };
-          console.log(user);
-          user.password = encrypt(user.password);
-          this.$store
-            .dispatch("Login", user)
-            .then(() => {
-              if (localStorage.getItem("shopName") != "admin") {
-                $douyin_checkIn({
-                  loginName: user.username,
-                });
-              }
+  loginRules: {
+    username: [{ required: true, trigger: "blur", message: "用户名不能为空" }],
+    password: [{ required: true, trigger: "blur", message: "密码不能为空" }],
+    code: [{ required: true, trigger: "change", message: "验证码不能为空" }],
+    merchantName: [{ required: true, trigger: "change", message: "商户号不能为空" }],
+  },
+  loading: false,
+  redirect: undefined,
+});
 
-              this.loading = false;
-              // 保存商户号
-              localStorage.setItem(
-                "MerchantId",
-                JSON.stringify({
-                  merchantName: this.loginForm.merchantName,
-                  username: this.loginForm.username,
-                })
-              );
-              this.$router.push({ path: this.redirect || "/" });
-              // window.location.replace = './'
-            })
-            .catch((err) => {
-              console.log(err);
-              this.loading = false;
-              this.getCode();
-            });
-        } else {
-          console.log("error submit!!");
-          return false;
-        }
-      });
-    },
-    point() {
-      const point = Cookies.get("point") !== undefined;
-      if (point) {
-        this.$notify({
-          title: "提示",
-          message: "当前登录状态已过期，请重新登录！",
-          type: "warning",
-          duration: 5000,
+onMounted(() => {
+  // 获取验证码
+  getCode();
+  // // 获取用户名密码等Cookie
+  // this.getCookie()
+  // // token 过期提示
+  // this.point()
+
+  let getinfo = localStorage.getItem("MerchantId");
+  let info = JSON.parse(getinfo);
+  if (info && info.merchantName) {
+    state.loginForm.merchantName = info.merchantName;
+    state.loginForm.username = info.username;
+  }
+});
+function getCode() {
+  getCodeImg().then((res) => {
+    console.log(res);
+    state.codeUrl = res.img;
+    state.loginForm.uuid = res.uuid;
+  });
+}
+function getCookie() {
+  const username = Cookies.get("username");
+  let password = Cookies.get("password");
+  const rememberMe = Cookies.get("rememberMe");
+  // 保存cookie里面的加密后的密码
+  state.cookiePass = password === undefined ? "" : password;
+  password = password === undefined ? state.loginForm.password : password;
+  state.loginForm = {
+    username: username === undefined ? state.loginForm.username : username,
+    password: password,
+    rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
+    code: "",
+    merchantName: "",
+    loginType: "merchant",
+  };
+}
+
+const loginForm = ref(null);
+const userStore = useUserStore();
+
+/**
+ * 解析 redirect 字符串 为 path 和  queryParams
+ *
+ * @returns { path: string, queryParams: Record<string, string> } 解析后的 path 和 queryParams
+ */
+function parseRedirect() {
+  const query = route.query;
+  const redirect = query.redirect ?? "/";
+
+  const url = new URL(redirect, window.location.origin);
+  const path = url.pathname;
+  const queryParams = {};
+
+  url.searchParams.forEach((value, key) => {
+    queryParams[key] = value;
+  });
+
+  return { path, queryParams };
+}
+function handleLogin() {
+  loginForm.value.validate((valid) => {
+    if (valid) {
+      state.loading = true;
+      const user = { ...state.loginForm };
+      user.password = encrypt(user.password);
+      console.log(user);
+      userStore
+        .login(user)
+        .then(async (res) => {
+          await userStore.getUserInfo();
+          const { path, queryParams } = parseRedirect();
+          router.push({ path: path, query: queryParams });
+        })
+        .catch(() => {
+          state.loading = false;
         });
-        Cookies.remove("point");
-      }
-    },
-  },
-};
+    } else {
+      console.log("error submit!!");
+      return false;
+    }
+  });
+}
 </script>
 
 <style scoped lang="scss">
@@ -287,6 +244,7 @@ export default {
 .code_wrap {
   display: flex;
   justify-content: space-between;
+  width: 100%;
 }
 
 .login-code {

src/views/online-shop/goods-group.vue

@@ -0,0 +1 @@
+<template></template>

src/views/online-shop/index.vue

@@ -0,0 +1 @@
+<template></template>

src/views/online-shop/pad-setting.vue

@@ -0,0 +1 @@
+<template></template>

src/views/order/group-purchase.vue

@@ -0,0 +1 @@
+<template></template>

src/views/order/index.vue

@@ -0,0 +1 @@
+<template></template>

src/views/product/category.vue

@@ -0,0 +1 @@
+<template></template>

src/views/product/list.vue

@@ -0,0 +1 @@
+<template></template>

src/views/product/specifications.vue

@@ -0,0 +1 @@
+<template></template>

src/views/product/unit.vue

@@ -0,0 +1 @@
+<template></template>

src/views/shop/index.vue

@@ -0,0 +1 @@
+<template></template>

src/views/shop/log.vue

@@ -0,0 +1 @@
+<template></template>

src/views/shop/role.vue

@@ -0,0 +1 @@
+<template></template>

src/views/shop/staff.vue

@@ -0,0 +1 @@
+<template></template>

src/views/system-setting/pay-types.vue

@@ -0,0 +1 @@
+<template></template>

src/views/tool/index.vue

@@ -0,0 +1,5 @@
+<template>
+  <div class="app-container">
+    11
+  </div>
+</template>

src/views/tool/table.vue

@@ -0,0 +1,3 @@
+<template>
+  <div class="app-container">11</div>
+</template>