From 4d0901b6509abf804eba56ca9cf025bb7f5e541f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=8E=AB=E5=94=90=E5=B0=BC?= <1431128779@qq.com>
Date: Wed, 26 Jun 2024 23:41:00 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E5=88=A0=E9=99=A4=E5=88=86=E4=BA=AB?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E4=BD=BF=E7=94=A8=E5=BE=AE=E4=BF=A1?=
=?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=9A=84=E5=88=86=E4=BA=AB=E6=9C=BA=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 102 +++++++++++------------
common/mixins/index.js | 12 ---
common/mixins/wxshare.mixin.js | 68 ---------------
pages/index/index.vue | 2 +-
pagesA/article-detail/article-detail.vue | 12 ---
5 files changed, 49 insertions(+), 147 deletions(-)
delete mode 100644 common/mixins/wxshare.mixin.js
diff --git a/App.vue b/App.vue
index 024fbe7..b0ef747 100644
--- a/App.vue
+++ b/App.vue
@@ -1,66 +1,60 @@
\ No newline at end of file
+page {
+ background-color: #fafafa;
+}
+
diff --git a/common/mixins/index.js b/common/mixins/index.js
index 159efbf..ca762e5 100644
--- a/common/mixins/index.js
+++ b/common/mixins/index.js
@@ -42,18 +42,6 @@ export default {
}
}
},
- watch: {
- haloConfig: {
- deep: true,
- immediate: true,
- handler(newVal) {
- if (!newVal) return;
- // #ifdef MP-WEIXIN
- uni.$tm.vx.commit('setWxShare', newVal.shareConfig);
- // #endif
- }
- }
- },
onLoad() {
this.fnResetSetAniWaitIndex()
},
diff --git a/common/mixins/wxshare.mixin.js b/common/mixins/wxshare.mixin.js
deleted file mode 100644
index bbff669..0000000
--- a/common/mixins/wxshare.mixin.js
+++ /dev/null
@@ -1,68 +0,0 @@
-// 微信分享配置
-import HaloTokenConfig from '@/config/token.config.js'
-import {jsonToUrlParams2} from '@/utils/url.params.js'
-import utils from '@/utils/index.js'
-
-export const haloWxShareMixin = {
- computed: {
- haloWxShareData() {
- const configs = this.$tm.vx.getters().getConfigs?.shareConfig;
- if(!configs) return {};
- configs.imageUrl = utils.checkImageUrl(configs.imageUrl)
- return configs
- }
- },
- //#ifdef MP-WEIXIN
- onShareAppMessage(res) {
- return {
- ...this.haloWxShareData,
- success: res => {
- }
- }
- },
- //#endif
- /* 分享到微信好友 */
- onShareAppMessage(res) {
- const promise = new Promise(resolve => {
- setTimeout(() => {
- resolve({
- title: this.haloWxShareData.title,
- path: this.haloWxShareData.path,
- })
- }, 2000)
- })
- return {
- title: this.haloWxShareData.title,
- path: '',
- promise
- }
- },
-
- // 分享到朋友圈-这里封装不够，在页面还要声明一次，否则是拿不到参数的，被分享者在朋友圈打开链接是空的
- onShareTimeline: function () {
- return {
- title: this.haloWxShareData.title,
- query: {},
- imageUrl: this.haloWxShareData.imageUrl,
- }
- },
- methods: {
- // 设置分享信息（需要在页面调用）
- fnSetWxShareConfig(config = {}) {
- let currentRoutes = getCurrentPages(); // 获取当前打开过的页面路由数组
- let currentRoute = currentRoutes[currentRoutes.length - 1].route; //获取当前页面路由(分销思路，分享者点开使用的小程序将获取到分享者的id)
- let sharePath = currentRoutes
- if (config.params) {
- const URLParams = config.params ? jsonToUrlParams2(config.params) : {};
- sharePath += URLParams
- }
- let _config = Object.assign({}, {
- path: sharePath,
- copyLink: HaloTokenConfig.BASE_API,
- query: {}
- }, config)
-
- uni.$tm.vx.commit('setWxShare', _config);
- }
- }
-}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c15914b..843168d 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -14,7 +14,7 @@ export default {
onLoad() {
uni.$tm.vx.actions('config/fetchConfigs').then((res) => {
// #ifdef MP-WEIXIN
- uni.$tm.vx.commit('setWxShare', res.shareConfig);
+ // uni.$tm.vx.commit('setWxShare', res.shareConfig);
// #endif
this.fnCheckShowStarted();
}).catch((err) => {
diff --git a/pagesA/article-detail/article-detail.vue b/pagesA/article-detail/article-detail.vue
index fb1c2a4..af43a52 100644
--- a/pagesA/article-detail/article-detail.vue
+++ b/pagesA/article-detail/article-detail.vue
@@ -233,8 +233,6 @@ import commentModal from '@/components/comment-modal/comment-modal.vue';
import rCanvas from '@/components/r-canvas/r-canvas.vue';
import barrage from '@/components/barrage/barrage.vue';
-import {haloWxShareMixin} from '@/common/mixins/wxshare.mixin.js';
-
export default {
components: {
tmSkeleton,
@@ -251,7 +249,6 @@ export default {
barrage,
commentModal
},
- mixins: [haloWxShareMixin],
data() {
return {
loading: 'loading',
@@ -394,15 +391,6 @@ export default {
this.fnSetPageTitle('文章详情');
this.loading = 'success';
- this.fnSetWxShareConfig({
- title: this.result.spec.title,
- desc: this.result.content.raw,
- imageUrl: this.$utils.checkThumbnailUrl(this.result.spec.cover),
- path: `/pagesA/article-detail/article-detail?name=${this.result.metadata.name}`,
- copyLink: this.$baseApiUrl,
- query: {}
- });
-
})
.catch(err => {
console.log("错误", err)