Merge branch 'master' of https://git.citupro.com/zhengnaiwen_citu/menduner-uniapp

api/file.js

@@ -21,7 +21,9 @@ export const uploadFile = (file, path) => {
       header: {
         Accept: '*/*',
         'tenant-id': tenantId,
-        'Authorization': 'Bearer ' + uni.getStorageSync('token')
+        'Authorization': 'Bearer ' + uni.getStorageSync('token'),
+        'Accept-Language': 'zh_CN',
+        'terminal': 'mp-weixin'
       },
       success: (uploadFileRes) => {
         let result = JSON.parse(uploadFileRes.data)

pages/index/position.vue

@@ -108,7 +108,7 @@ const filterList = ref([
 const gridList = [
   { label: '门墩儿猎头', icon: '/static/img/headhunting.png', path: '/pagesB/headhunting/index' },
   { label: '精选企业', icon: '/static/img/enterprise.png', path: '/pagesB/recommendEnterprise/index' },
-  { label: '酒店英语', icon: '/static/img/group.png', path: '' },
+  { label: '酒店英语', icon: '/static/img/group.png', weiXinPublicUrl: 'https://mp.weixin.qq.com/s/zta8NvNaJOFhPxq9NAE9pw' },
   { label: '早报资讯', icon: '/static/img/information.png', id: 'morningNews' },
   { label: '了解门墩儿', icon: '/static/img/contact.png', path: '/pagesB/about/index' }
 ]
@@ -149,7 +149,7 @@ const handleGrid = async (e) => {
     })
   }
   if (obj?.weiXinPublicUrl) {
-		uni.navigateTo({ url: `/pages/addWebView/index?url=${obj?.weiXinPublicUrl}&title=${obj?.title || '风尚榜奖投票'}` })
+		uni.navigateTo({ url: `/pages/addWebView/index?url=${obj?.weiXinPublicUrl}&title=${obj?.title || obj.label}` })
 	}
 }