Merge branch 'dev' into reportexcel

src/api/other/logistics.js

@@ -4,7 +4,7 @@ import request from '@/utils/request'
 export function getLogisticsListAPI(queryParams) {
   console.log(queryParams)
   return request({
-    url: '/schedule/order/sent/query_p', // 不会走 token 校验后台
+    url: '/schedule/sent/query_p', // 不会走 token 校验后台
     params: queryParams
   })
 }
\ No newline at end of file

src/layout/components/Navbar.vue

@@ -14,7 +14,7 @@
     <div class="right-menu">
       <template v-if="appStore.device !== 'mobile'">
         <!-- 新版本 -->
-        <div class="right-menu-item hover-effect new-version"
+        <!-- <div class="right-menu-item hover-effect new-version"
           @click="showVersionFn">
           <svg-icon icon-class="new-version" />
         </div>
@@ -22,7 +22,7 @@
         <version-notice v-model="showVersionNoticeVisible"
           :nowVersion="nowVersion"
           :versionList="showVersionList"
-          @confirm="saveNowVersion" />
+          @confirm="saveNowVersion" /> -->
 
         <header-search id="header-search"
           class="right-menu-item" />
@@ -107,12 +107,12 @@ const nowVersion = ref('') // 当前最新版本
 
 // 判断是否有新版本出现
 onMounted(() => {
-  const oldVersion = proxy.$cache.local.get('version')
-  const versionObj = versionStore.version[0]
-  nowVersion.value = versionObj.version
-  if (oldVersion !== nowVersion.value) {
-    handleVersionList()
-  }
+  // const oldVersion = proxy.$cache.local.get('version')
+  // const versionObj = versionStore.version[0]
+  // nowVersion.value = versionObj.version
+  // if (oldVersion !== nowVersion.value) {
+  //   handleVersionList()
+  // }
 })
 // 展示版本通知弹框
 const showVersionFn = () => {

src/store/modules/version.js

@@ -10,12 +10,13 @@ export default defineStore(
       // 获取版本信息
       getVersion() {
         return new Promise((resolve, reject) => {
-          getVersionAPI().then(res => {
-            this.version = res.data
-            resolve(res)
-          }).catch(error => {
-            reject(error)
-          })
+          // getVersionAPI().then(res => {
+          //   this.version = res.data
+          //   resolve(res)
+          // }).catch(error => {
+          //   reject(error)
+          // })
+          resolve()
         })
       }
     }

src/views/promotion/task/index.vue

@@ -137,6 +137,7 @@ import userStore from '@/store/modules/user'
 import SelectProvinceCity from '../components/SelectProvinceCity'
 
 const { recentPickerOptions: pickerOptions, todayDate } = useDatePickerOptions(0)
+const { proxy } = getCurrentInstance()
 
 // 城市经理状态为 true
 const isCityManager = userStore().promotionIdentity