-
+
diff --git a/pages/tabbar/home/template/tpl_promotions_detail.vue b/pages/tabbar/home/template/tpl_promotions_detail.vue
index 0939658..bc146cc 100644
--- a/pages/tabbar/home/template/tpl_promotions_detail.vue
+++ b/pages/tabbar/home/template/tpl_promotions_detail.vue
@@ -39,8 +39,10 @@
:key="_index"
>
- ![]()
diff --git a/utils/request.js b/utils/request.js
index 3cb42cc..e7b0ccc 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -121,6 +121,7 @@ http.interceptors.response.use(
if (!isRefreshing) {
console.log('旧token',token)
isRefreshing = true;
+ storage.setAccessToken('')
let oldRefreshToken = storage.getRefreshToken();
//调用刷新token的接口
return refreshTokenFn(oldRefreshToken)
From f281011a4770a8b8e3d78f2585bb57739d319404 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E5=BE=88=E5=B7=AE=E5=95=A6?=
<17633066053@163.com>
Date: Thu, 25 Aug 2022 18:25:45 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B0=8F=E7=A8=8B?=
=?UTF-8?q?=E5=BA=8F=E5=88=86=E4=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/m-share/index.vue | 22 ++++++++++++++++------
main.js | 3 +++
pages/product/goods.vue | 10 +---------
3 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/components/m-share/index.vue b/components/m-share/index.vue
index 449ea4b..0f8d394 100644
--- a/components/m-share/index.vue
+++ b/components/m-share/index.vue
@@ -8,7 +8,7 @@
-
@@ -19,7 +19,7 @@
{{ item.title }}
-
+
{{ '复制链接' }}
@@ -62,6 +62,16 @@ export default {
close() {
this.$emit("close");
},
+ weChatShare(){
+ this.$u.mpShare = {
+ title: this.shareTitle(), // 默认为小程序名称，可自定义
+ path: '', // 默认为当前页面路径，一般无需修改，QQ小程序不支持
+ // 分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径。
+ // 支持PNG及JPG，默认为当前页面的截图
+ imageUrl: this.thumbnail ||''
+ }
+ },
+
// h5复制链接
// #ifdef H5
copyLink() {
@@ -93,13 +103,13 @@ export default {
shareTitle() {
let shareTitle;
if (this.type == "goods") {
- shareTitle = `我发现了一个${this.goodsName}商品快来跟我一起看看吧`;
+ shareTitle = `[好友推荐]${this.goodsName}快来跟我一起看看吧`;
} else if (this.type == "shops") {
- shareTitle = `我发现了一个${this.goodsName}店铺快来跟我一起看看吧`;
+ shareTitle = `[好友发现]${this.goodsName}快来跟我一起看看吧`;
} else if (this.type == "pintuan") {
- shareTitle = `我拼了一个${this.goodsName}快来跟我一起抢购吧!`;
+ shareTitle = `[好友邀请]${this.goodsName}快来跟我一起抢购吧!`;
} else if (this.type == "kanjia") {
- shareTitle = `请快来帮我砍一刀${this.goodsName}`;
+ shareTitle = `[好友邀请]请快来帮我砍一刀${this.goodsName}`;
}
return shareTitle;
},
diff --git a/main.js b/main.js
index e02f774..ba42846 100644
--- a/main.js
+++ b/main.js
@@ -16,6 +16,9 @@ let btn = Vue.component("airBtn", airBtn); //全局注册
document.body.appendChild(new btn().$mount().$el);
// #endif
+// 引入uView对小程序分享的mixin封装
+let mpShare = require('uview-ui/libs/mixin/mpShare.js');
+Vue.mixin(mpShare)
/**
* 全局filters
diff --git a/pages/product/goods.vue b/pages/product/goods.vue
index 1cf8b5c..76ac9e1 100644
--- a/pages/product/goods.vue
+++ b/pages/product/goods.vue
@@ -605,15 +605,7 @@ export default {
this.init(this.routerVal.id, this.routerVal.goodsId, this.routerVal.distributionId);
}
},
- // #ifdef MP-WEIXIN
- onShareAppMessage(res) {
- return {
- path: this.share(),
- title: `[好友推荐]${this.goodsDetail.goodsName}`,
- imageUrl: this.goodsDetail.goodsGalleryList[0],
- };
- },
- // #endif
+
methods: {
share() {
return `/pages/product/goods?id=${this.routerVal.id}&goodsId=${this.routerVal.goodsId}`;
From dcf77ba862b9d2f1728b35890dab5f0131270b16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E5=BE=88=E5=B7=AE=E5=95=A6?=
<17633066053@163.com>
Date: Tue, 6 Sep 2022 16:25:53 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4app=E7=89=88=E6=9C=AC?=
=?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=8D=87=E7=BA=A7bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
plugins/APPUpdate/index.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/APPUpdate/index.js b/plugins/APPUpdate/index.js
index 595514a..cfa6979 100644
--- a/plugins/APPUpdate/index.js
+++ b/plugins/APPUpdate/index.js
@@ -854,7 +854,7 @@ function downloadPopup(data, callback, cancelCallback, rebootCallback) {
export default function (isPrompt = false) {
getCurrentNo((version) => {
getServerNo((res) => {
- if (res.versionCode.replace(/\./g, "") <= version.version) {
+ if (res.versionCode.replace(/\./g, "") <= version.version.replace(/\./g, "") ) {
return false;
}
From af21d1abbaee8e6f49ad0d3b921abeb2039ae495 Mon Sep 17 00:00:00 2001
From: paulGao
Date: Tue, 6 Sep 2022 19:46:00 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=83=AD=E5=8C=BA?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/tabbar/home/template/tpl.js | 15 +++---
pages/tabbar/home/template/tpl_flex_one.vue | 9 +++-
pages/tabbar/home/template/tpl_hot_zone.vue | 57 +++++++++++++++++++++
pages/tabbar/home/views.vue | 13 ++---
4 files changed, 79 insertions(+), 15 deletions(-)
create mode 100644 pages/tabbar/home/template/tpl_hot_zone.vue
diff --git a/pages/tabbar/home/template/tpl.js b/pages/tabbar/home/template/tpl.js
index 0e8897e..c1af693 100644
--- a/pages/tabbar/home/template/tpl.js
+++ b/pages/tabbar/home/template/tpl.js
@@ -1,8 +1,9 @@
/** 配置楼层模块的跳转 */
export function modelNavigateTo(item) {
- let val = item.url;
-
- switch (val.___type) {
+ let val = item.url || item;
+ console.log(item);
+ // return;
+ switch (val.___type || item.type) {
case "goods":
uni.navigateTo({
url: "/pages/product/goods?id=" + val.id + "&goodsId=" + val.goodsId,
@@ -36,7 +37,7 @@ export function modelNavigateTo(item) {
});
break;
case "other":
- switch (val.title) {
+ switch (val.title || item.title) {
case "首页":
uni.switchTab({
url: `/pages/tabbar/home/index`,
@@ -102,12 +103,12 @@ export function modelNavigateTo(item) {
url: `/pages/product/shopList`,
});
break;
- case "外部链接":
+ default:
// #ifdef H5
- window.location.href = val.url;
+ window.location.href = val.url || item.link;
// #endif
// #ifdef APP-PLUS
- plus.runtime.openURL(val.url) //不需要拼接\
+ plus.runtime.openURL(val.url || item.link) //不需要拼接\
// #endif
break;
}
diff --git a/pages/tabbar/home/template/tpl_flex_one.vue b/pages/tabbar/home/template/tpl_flex_one.vue
index 9af2c5c..7945a4e 100644
--- a/pages/tabbar/home/template/tpl_flex_one.vue
+++ b/pages/tabbar/home/template/tpl_flex_one.vue
@@ -1,15 +1,20 @@
@@ -125,13 +125,14 @@ export default {
getFloorData().then((res) => {
if (res.data.success) {
this.pageData = JSON.parse(res.data.result.pageData);
+ console.log(this.pageData);
}
});
- },
- // 是否有网络链接
- isConnected(val){
- val ? this.init() : ''
- },
+ },
+ // 是否有网络链接
+ isConnected(val) {
+ val ? this.init() : "";
+ },
/**
* TODO 扫码功能后续还会后续增加
-
-
-
+
diff --git a/pages/tabbar/home/views.vue b/pages/tabbar/home/views.vue
index 4001ee8..aae0ad5 100644
--- a/pages/tabbar/home/views.vue
+++ b/pages/tabbar/home/views.vue
@@ -50,7 +50,7 @@
+
+