Merge branch 'dev' into test

src/store/modules/permission/index.js

@@ -122,6 +122,7 @@ export const usePermissionStore = defineStore('permission', {
     generateRoutes() {
       const menus = JSON.parse(localStorage.getItem('menu'))
       const accessRoutes = filterAsyncRoutes(menus)
+      // console.log(accessRoutes)
       window.localStorage.setItem('roles', JSON.stringify(findType3Routes(menus)))
       this.accessRoutes = accessRoutes
       return accessRoutes

src/views/commodity/hot_list/index.vue

@@ -41,6 +41,7 @@
       :pagination="pagination"
       :bordered="false"
       :row-key="(row) => row.gid"
+      :checked-row-keys="queryParams.checkedRowKeysRef"
       remote
       @update:checked-row-keys="handleCheck"
     />
@@ -525,6 +526,8 @@ const clear = () => {
   isDzModel.value = false
   notesVal.value = ''
   nowRow.value = {}
+  queryParams.value.word = ''
+  getList()
 }
 
 const veeify = async () => {

src/views/error-page/404.vue

@@ -5,7 +5,7 @@
         <img src="@/assets/images/404.webp" width="500" />
       </template>
       <template #footer>
-        <n-button @click="replace('/')">返回首页</n-button>
+        <n-button @click="replace('/workbench')">返回首页</n-button>
       </template>
     </n-result>
   </AppPage>

src/views/login/index.vue

@@ -114,7 +114,7 @@ async function handleLogin() {
       Reflect.deleteProperty(query, 'redirect')
       router.push({ path, query })
     } else {
-      router.push('/')
+      router.push('/workbench')
     }
   } catch (error) {
     $message.removeMessage()

src/views/marketing/code/index.vue

@@ -101,6 +101,7 @@
       :pagination="pagination"
       :bordered="false"
       :row-key="rowKey"
+      :checked-row-keys="checkedRowKeysRef"
       remote
       @update:checked-row-keys="handleCheck"
     />
@@ -425,6 +426,7 @@ const handleclear = () => {
     pulse: null,
     activate_status: 2,
   }
+  checkedRowKeysRef.value = []
 }
 
 const modalType = ref(null)
@@ -458,7 +460,6 @@ const handleValidateClick = (e) => {
             ...formValue.value,
           })
         }
-        $message.success('成功')
         handleclear()
         getList()
       } catch (error) {