Selaa lähdekoodia

Merge branch 'dev/v1.0.53.5_yf' of jianyu/web into hotfix/v1.0.53.5

yangfeng 10 kuukautta sitten
vanhempi
commit
a68937c408

+ 1 - 1
apps/work-bench/src/api/modules/user.js

@@ -54,7 +54,7 @@ export function ajaxSwitchUserIdentity(data) {
 
 /**
  * 获取客服二维码
- * @param data { type: "kf" } 只获取客服的二维码,
+ * { type: "kf" } 只获取客服的二维码,
  * 不传参根据用户权限判断是否返回客成二维码
  */
 export function getCustomInfo(data) {

+ 2 - 0
apps/work-bench/src/components/CustomServiceCorner.vue

@@ -62,6 +62,7 @@
   </div>
 </template>
 <script>
+/* eslint-disable */
 import { Popover } from 'element-ui'
 import { mapGetters, mapActions } from 'vuex'
 export default {
@@ -114,6 +115,7 @@ export default {
     }
   }
 }
+/* eslint-disable */
 </script>
 <style lang="scss">
 .custom-popover-menu.el-popover {

+ 2 - 5
apps/work-bench/src/store/modules/customer.js

@@ -1,7 +1,5 @@
 import { ajaxObtainShunt, getCommonAdList } from '../../api/modules'
 
-const process = require('node:process')
-
 export default {
   namespaced: true,
   state: () => ({
@@ -21,14 +19,13 @@ export default {
     async open({ dispatch }) {
       dispatch('checkObtainShunt', { isFind: true })
     },
-    async checkObtainShunt({ commit }, payload = {}) {
+    async checkObtainShunt({ _, commit }, payload = {}) {
       ajaxObtainShunt({
         type: 'PC',
         isFind: payload.isFind
       }).then((res) => {
         if (res && res.data && res.data.url) {
           // window.open(process.env.VUE_APP_BASE_SITE + res.data.url)
-
           commit(
             'setCustomerUrl',
             `${process.env.VUE_APP_BASE_SITE + res.data.url}&from=aside`
@@ -40,7 +37,7 @@ export default {
     close({ commit }) {
       commit('setCustomerStatus', false)
     },
-    async getCommonAdListFn(payload = {}) {
+    async getCommonAdListFn(_, payload = {}) {
       const res = await getCommonAdList(payload)
       return res?.data
     }

+ 9 - 5
eslint.config.mjs

@@ -1,15 +1,19 @@
 import antfu from '@antfu/eslint-config'
 export default antfu({
-  ignores: ["dist","**/dist/**","public","**/public/**"],
+  ignores: ['dist', '**/dist/**', 'public', '**/public/**'],
   vue: {
     vueVersion: 2,
     overrides: {
-      "vue/block-order": ["error", {
-        "order": [ [ "script", "template" ], "style" ]
-      }]
+      'vue/block-order': [
+        'error',
+        {
+          order: [['script', 'template'], 'style']
+        }
+      ]
     }
   },
   rules: {
-    "style/comma-dangle": "off"
+    'style/comma-dangle': 'off',
+    'node/prefer-global/process': 'off'
   }
 })