From 85ff894003bbd871afc8b8e3649888e30e2cdc71 Mon Sep 17 00:00:00 2001 From: From-wh Date: Thu, 8 Jun 2023 18:15:59 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B7=B3=E8=BD=AC=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/uni-app/components/guide/index.vue | 22 +- .../uni-app/components/recommend/index.vue | 4 +- .../activity/goods_combination/index.vue | 749 +++++++------- .../uni-app/pages/activity/presell/index.vue | 958 +++++++++--------- .../pages/columnGoods/HotNewGoods/index.vue | 371 ++++--- .../uni-app/pages/goods_cate/goods_cate1.vue | 11 + .../index/diy/components/activeParty.vue | 11 +- .../pages/index/diy/components/menus.vue | 492 +++++---- .../pages/index/diy/components/news.vue | 270 +++-- .../index/diy/components/pictureCube.vue | 640 ++++++------ .../pages/index/diy/components/swiperBg.vue | 22 +- .../pages/index/diy/components/titles.vue | 140 +-- template/uni-app/pages/index/index.vue | 2 +- .../visualization/components/activity.vue | 19 +- .../visualization/components/mBanner.vue | 20 +- .../index/visualization/components/menus.vue | 21 +- .../visualization/components/newGoods.vue | 4 +- .../index/visualization/components/news.vue | 364 ++++--- .../visualization/components/popular.vue | 10 +- .../visualization/components/promotion.vue | 4 +- .../visualization/components/swiperBg.vue | 28 +- template/uni-app/pages/points_mall/index.vue | 805 ++++++++------- .../pages/users/wechat_login/index.vue | 2 +- template/uni-app/static/css/style.scss | 2 +- template/uni-app/utils/util.js | 56 +- 25 files changed, 2448 insertions(+), 2579 deletions(-) diff --git a/template/uni-app/components/guide/index.vue b/template/uni-app/components/guide/index.vue index 312caa8f9..83e6ce9f6 100644 --- a/template/uni-app/components/guide/index.vue +++ b/template/uni-app/components/guide/index.vue @@ -44,9 +44,9 @@ }, mounted() { this.timer() - }, - onHide() { - clearInterval(this.timecount) + }, + onHide() { + clearInterval(this.timecount) }, methods: { timer() { @@ -70,22 +70,8 @@ jump(url) { if (url) { clearInterval(this.timecount) - if (url.indexOf("http") != -1) { - uni.navigateTo({ - url: `/pages/annex/web_view/index?url=${url}` - }); - } else { - uni.reLaunch({ - url: url, - fail: () => { - uni.switchTab({ - url - }) - } - }) - } + this.$util.JumpPath(url); } - }, } } diff --git a/template/uni-app/components/recommend/index.vue b/template/uni-app/components/recommend/index.vue index 0a8ed8dfc..ebcaaed91 100644 --- a/template/uni-app/components/recommend/index.vue +++ b/template/uni-app/components/recommend/index.vue @@ -19,14 +19,14 @@ {{item.store_name}} {{$t(`¥`)}}{{item.price}} - + diff --git a/template/uni-app/pages/activity/goods_combination/index.vue b/template/uni-app/pages/activity/goods_combination/index.vue index 38f74acdd..403e86250 100644 --- a/template/uni-app/pages/activity/goods_combination/index.vue +++ b/template/uni-app/pages/activity/goods_combination/index.vue @@ -1,384 +1,367 @@ - - - - - diff --git a/template/uni-app/pages/activity/presell/index.vue b/template/uni-app/pages/activity/presell/index.vue index fd2a2faeb..02b94dbed 100644 --- a/template/uni-app/pages/activity/presell/index.vue +++ b/template/uni-app/pages/activity/presell/index.vue @@ -1,464 +1,496 @@ - - - - - diff --git a/template/uni-app/pages/columnGoods/HotNewGoods/index.vue b/template/uni-app/pages/columnGoods/HotNewGoods/index.vue index 667bcfa59..5748ace66 100644 --- a/template/uni-app/pages/columnGoods/HotNewGoods/index.vue +++ b/template/uni-app/pages/columnGoods/HotNewGoods/index.vue @@ -1,194 +1,179 @@ - - - diff --git a/template/uni-app/pages/goods_cate/goods_cate1.vue b/template/uni-app/pages/goods_cate/goods_cate1.vue index 1d4610f7e..42cb83da9 100644 --- a/template/uni-app/pages/goods_cate/goods_cate1.vue +++ b/template/uni-app/pages/goods_cate/goods_cate1.vue @@ -35,6 +35,16 @@ + + + + + + + {{$t(`全部商品`)}} + - - - - - - - - - - - - {{ $t(itemn.info[0].value) }} - - - - - - - - - - - - - - - - - - {{ $t(item.info[0].value) }} - - - - - - - - - - diff --git a/template/uni-app/pages/index/diy/components/news.vue b/template/uni-app/pages/index/diy/components/news.vue index 555b01284..13a97d985 100644 --- a/template/uni-app/pages/index/diy/components/news.vue +++ b/template/uni-app/pages/index/diy/components/news.vue @@ -1,138 +1,134 @@ - - - - - diff --git a/template/uni-app/pages/index/diy/components/pictureCube.vue b/template/uni-app/pages/index/diy/components/pictureCube.vue index 22cd534be..326c214ab 100644 --- a/template/uni-app/pages/index/diy/components/pictureCube.vue +++ b/template/uni-app/pages/index/diy/components/pictureCube.vue @@ -1,331 +1,311 @@ - - - - - diff --git a/template/uni-app/pages/index/diy/components/swiperBg.vue b/template/uni-app/pages/index/diy/components/swiperBg.vue index d40e3c654..1b29eca4e 100644 --- a/template/uni-app/pages/index/diy/components/swiperBg.vue +++ b/template/uni-app/pages/index/diy/components/swiperBg.vue @@ -117,27 +117,7 @@ }, goDetail(url) { let urls = url.info[1].value - if (urls.indexOf("http") != -1) { - // #ifdef H5 - location.href = urls - // #endif - // #ifdef MP || APP-PLUS - uni.navigateTo({ - url: `/pages/annex/web_view/index?url=${urls}` - }); - // #endif - } else { - if (['/pages/goods_cate/goods_cate', '/pages/order_addcart/order_addcart', '/pages/user/index'] - .indexOf(urls) == -1) { - uni.navigateTo({ - url: urls - }) - } else { - uni.reLaunch({ - url: urls - }) - } - } + this.$util.JumpPath(urls); } } } diff --git a/template/uni-app/pages/index/diy/components/titles.vue b/template/uni-app/pages/index/diy/components/titles.vue index 78d8233a4..0990bfe84 100644 --- a/template/uni-app/pages/index/diy/components/titles.vue +++ b/template/uni-app/pages/index/diy/components/titles.vue @@ -1,67 +1,75 @@ - - - - - diff --git a/template/uni-app/pages/index/index.vue b/template/uni-app/pages/index/index.vue index 845a2908f..e5fd894c8 100644 --- a/template/uni-app/pages/index/index.vue +++ b/template/uni-app/pages/index/index.vue @@ -68,7 +68,7 @@ this.$util.Tips({ title: err }); - // #endiff + // #endif }) }, // 微信分享; diff --git a/template/uni-app/pages/index/visualization/components/activity.vue b/template/uni-app/pages/index/visualization/components/activity.vue index 8328aab98..ec4e3c584 100644 --- a/template/uni-app/pages/index/visualization/components/activity.vue +++ b/template/uni-app/pages/index/visualization/components/activity.vue @@ -81,24 +81,7 @@ methods: { gopage(url) { goPage().then(res => { - if (url.indexOf("http") != -1) { - // #ifdef H5 - location.href = url - // #endif - } else { - if (['/pages/goods_cate/goods_cate', '/pages/order_addcart/order_addcart', - '/pages/user/index' - ].indexOf(url) == - -1) { - uni.navigateTo({ - url: url - }) - } else { - uni.navigateTo({ - url: url - }) - } - } + this.$util.JumpPath(url); }) } } diff --git a/template/uni-app/pages/index/visualization/components/mBanner.vue b/template/uni-app/pages/index/visualization/components/mBanner.vue index ab21eef28..2b3e0a1ee 100644 --- a/template/uni-app/pages/index/visualization/components/mBanner.vue +++ b/template/uni-app/pages/index/visualization/components/mBanner.vue @@ -103,25 +103,7 @@ }, goDetail(url) { goPage().then(res => { - let urls = url.info[1].value - if (urls.indexOf("http") != -1) { - // #ifdef H5 || APP-PLUS - location.href = urls - // #endif - } else { - if (['/pages/goods_cate/goods_cate', '/pages/order_addcart/order_addcart', - '/pages/user/index' - ].indexOf(urls) == - -1) { - uni.navigateTo({ - url: urls - }) - } else { - uni.navigateTo({ - url: urls - }) - } - } + this.$util.JumpPath(urls); }) } } diff --git a/template/uni-app/pages/index/visualization/components/menus.vue b/template/uni-app/pages/index/visualization/components/menus.vue index d22211153..02fc58f1f 100644 --- a/template/uni-app/pages/index/visualization/components/menus.vue +++ b/template/uni-app/pages/index/visualization/components/menus.vue @@ -71,26 +71,7 @@ methods: { menusTap(url) { goPage().then(res => { - if (url.indexOf("http") != -1) { - // #ifdef H5 - location.href = url - // #endif - } else { - // uni.navigateTo({ - // url: url - // }) - if (['/pages/goods_cate/goods_cate', '/pages/order_addcart/order_addcart', - '/pages/user/index' - ].indexOf(url) == -1) { - uni.navigateTo({ - url: url - }) - } else { - uni.switchTab({ - url: url - }) - } - } + this.$util.JumpPath(url); }) } } diff --git a/template/uni-app/pages/index/visualization/components/newGoods.vue b/template/uni-app/pages/index/visualization/components/newGoods.vue index e20ee77fe..efca0c73c 100644 --- a/template/uni-app/pages/index/visualization/components/newGoods.vue +++ b/template/uni-app/pages/index/visualization/components/newGoods.vue @@ -207,9 +207,7 @@ }, gopage(url) { goPage().then(res => { - uni.navigateTo({ - url: url - }) + this.$util.JumpPath(url); }) }, goDetail(item) { diff --git a/template/uni-app/pages/index/visualization/components/news.vue b/template/uni-app/pages/index/visualization/components/news.vue index c7fc6d615..54bc96502 100644 --- a/template/uni-app/pages/index/visualization/components/news.vue +++ b/template/uni-app/pages/index/visualization/components/news.vue @@ -1,191 +1,175 @@ - - - - - diff --git a/template/uni-app/pages/index/visualization/components/popular.vue b/template/uni-app/pages/index/visualization/components/popular.vue index 05f862e3e..523f39a62 100644 --- a/template/uni-app/pages/index/visualization/components/popular.vue +++ b/template/uni-app/pages/index/visualization/components/popular.vue @@ -223,9 +223,7 @@ }, gopage(url) { goPage().then(res => { - uni.navigateTo({ - url: url - }) + this.$util.JumpPath(url); }) } } @@ -235,7 +233,7 @@ diff --git a/template/uni-app/pages/users/wechat_login/index.vue b/template/uni-app/pages/users/wechat_login/index.vue index dca49328f..b0e010a20 100644 --- a/template/uni-app/pages/users/wechat_login/index.vue +++ b/template/uni-app/pages/users/wechat_login/index.vue @@ -315,7 +315,7 @@ }, { tab: 3 }); - // #endiff + // #endif } }, // #ifdef MP diff --git a/template/uni-app/static/css/style.scss b/template/uni-app/static/css/style.scss index 35e0a61fd..4c758f37b 100644 --- a/template/uni-app/static/css/style.scss +++ b/template/uni-app/static/css/style.scss @@ -340,7 +340,7 @@ .coupon-list .item.svip .line1 .image{width:30rpx;height:30rpx;margin-right:10rpx;vertical-align:middle;z-index:0;} .noCommodity { - border-top: 7rpx solid #f5f5f5 + // border-top: 7rpx solid #f5f5f5 } .noCommodity .pictrue { diff --git a/template/uni-app/utils/util.js b/template/uni-app/utils/util.js index 7844fcb22..79942f99b 100644 --- a/template/uni-app/utils/util.js +++ b/template/uni-app/utils/util.js @@ -746,10 +746,10 @@ export default { } return 0 - }, - /* - * 获取当前时间 - */ + }, + /* + * 获取当前时间 + */ getNowTime() { let today = new Date(); let year = today.getFullYear(); // 获取当前年份 @@ -995,6 +995,52 @@ export default { } return status; }, - } + }, + /** + * 跳转路径封装函数 + * @param url 跳转路径 + */ + JumpPath: function(url) { + let arr = url.split('@APPID='); + if (arr.length > 1) { + //#ifdef MP + uni.navigateToMiniProgram({ + appId: arr[arr.length - 1], // 此为生活缴费appid + path: arr[0], // 此为生活缴费首页路径 + envVersion: "release", + success: res => { + console.log("打开成功", res); + }, + fail: err => { + console.log('sgdhgf', err); + } + }) + //#endif + //#ifndef MP + this.Tips({ + title: 'h5与app端不支持跳转外部小程序' + }); + //#endif + } else { + if (url.indexOf("http") != -1) { + uni.navigateTo({ + url: `/pages/annex/web_view/index?url=${url}` + }); + } else { + if (['/pages/goods_cate/goods_cate', '/pages/order_addcart/order_addcart', '/pages/user/index', + '/pages/index/index' + ] + .indexOf(url) == -1) { + uni.navigateTo({ + url + }) + } else { + uni.switchTab({ + url + }) + } + } + } + }, }