Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl

src/permission.js

@@ -45,7 +45,7 @@ router.beforeEach(async (to, from, next) => {
         const dictStore = useDictStoreWithOut()
         const userStore = useUserStoreWithOut()
         const permissionStore = usePermissionStoreWithOut()
-        if (!dictStore.getIsSetDict) {
+        if (!dictStore.getIsSetDict && to.path != '/nm-detail') {
           await dictStore.setDictMap()
         }
         if (!userStore.getIsSetUser) {

src/views/Clue/Order/Comp/DialogAfterSale.vue

@@ -45,7 +45,7 @@
         </el-col>
       </el-row>
       <el-row :gutter="20">
-        <el-col :span="24" :offset="0">
+        <el-col :span="24" :offset="0" v-if="appStore.getAppInfo?.instanceType == 2">
           <el-form-item label="是否退货" prop="isReturns">
             <el-radio-group v-model="form.isReturns">
               <el-radio :label="true"> 退货 </el-radio>
@@ -79,7 +79,9 @@
 
 <script setup name="DialogAfterSale">
 import { getAfterSalePage, createAfterSale } from '@/api/clue/afterSale'
+import { useAppStore } from '@/store/modules/app'
 
+const appStore = useAppStore()
 const message = useMessage() // 消息弹窗
 
 const show = ref(false)

src/views/Profile/NotifyMessageDetail.vue

@@ -7,7 +7,7 @@
 -->
 <template>
   <div class="container">
-    <ContentWrap style="max-width: 1000px; margin: 0 auto">
+    <ContentWrap style="max-width: 1000px; margin: 0 auto; overflow-x: auto">
       <div class="text-center">
         <div class="mb-10px" style="font-size: 24px; letter-spacing: 2px">
           {{ info.title }}
@@ -82,6 +82,8 @@ onMounted(() => {
   text-align: left;
   border-width: 1px;
   box-sizing: border-box;
+  min-width: 44px;
+  word-break: break-all;
 }
 :deep(.el-card__body) {
   padding: 20px 10px;