From 8e5065a58867ad8ad7b14f93d0d1ae2e5962ee53 Mon Sep 17 00:00:00 2001 From: duan <1004387497@qq.com> Date: Tue, 31 Dec 2024 17:41:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/empty.vue | 2 +- me/detail/detail.vue | 4 ++-- me/juqing/new/first-select.vue | 2 +- me/message/new/first.vue | 6 +++--- me/message/new/getInfo.vue | 2 +- me/rHTgyqGoIV/rHTgyqGoIV.vue | 6 +++--- me/yaoqing/index - 副本.vue | 6 +++--- me/yaoqing/ymf-yaoqing-home.vue | 6 +++--- me/yaoqing/ymg-yaoqing-tixian.vue | 6 ++---- pages/BdwbOqUuVz/BdwbOqUuVz.vue | 2 +- pages/index/index copy.vue | 4 ++-- pages/index/index.vue | 4 ++-- pages/login/appEq.vue | 2 +- pages/login/iosmobile.vue | 4 ++-- pages/login/login - 副本.vue | 14 +++++++------- pages/login/phonebind.vue | 4 ++-- pages/login/register.vue | 2 +- pages/login/registerApp.vue | 2 +- pages/login/wxmobile.vue | 4 ++-- pages/me/index.vue | 2 +- pages/task/index.vue | 6 +++--- tuniao-ui/components/tn-nav-bar/tn-nav-bar.vue | 6 +++--- 22 files changed, 47 insertions(+), 49 deletions(-) diff --git a/components/empty.vue b/components/empty.vue index 51c1d66..2537477 100644 --- a/components/empty.vue +++ b/components/empty.vue @@ -27,7 +27,7 @@ methods: { goNav() { uni.switchTab({ - url: '/pages/index/index' + url: '/pages/index/index2' }) } } diff --git a/me/detail/detail.vue b/me/detail/detail.vue index ff84a26..21d263b 100644 --- a/me/detail/detail.vue +++ b/me/detail/detail.vue @@ -832,7 +832,7 @@ export default { content: '尊重他人劳动成功，请勿录屏！', complete() { uni.switchTab({ - url: '/pages/index/index' + url: '/pages/index/index2' }); } }); @@ -2040,7 +2040,7 @@ export default { } else { //否则跳转到首页 uni.switchTab({ - url: '/pages/index/index' + url: '/pages/index/index2' }); } }, diff --git a/me/juqing/new/first-select.vue b/me/juqing/new/first-select.vue index a9c9663..d6d749d 100644 --- a/me/juqing/new/first-select.vue +++ b/me/juqing/new/first-select.vue @@ -89,7 +89,7 @@ this.userInfo = res1.data uni.setStorageSync('userInfo', res1.data) uni.switchTab({ - url:'/pages/index/index' + url:'/pages/index/index2' }) } } diff --git a/me/message/new/first.vue b/me/message/new/first.vue index 391fb5d..a799f64 100644 --- a/me/message/new/first.vue +++ b/me/message/new/first.vue @@ -174,7 +174,7 @@ return this.init() } uni.switchTab({ - url: '/pages/index/index' + url: '/pages/index/index2' }) }, methods: { @@ -186,7 +186,7 @@ return uni.setStorageSync('first', false) uni.switchTab({ - url: '/pages/index/index' + url: '/pages/index/index2' }) }, popshow(){ @@ -216,7 +216,7 @@ iKnow() { uni.setStorageSync('first', false) uni.switchTab({ - url: '/pages/index/index' + url: '/pages/index/index2' }) } } diff --git a/me/message/new/getInfo.vue b/me/message/new/getInfo.vue index df007ab..53fe684 100644 --- a/me/message/new/getInfo.vue +++ b/me/message/new/getInfo.vue @@ -154,7 +154,7 @@ if(res.code==200){ this.timer=setTimeout(()=>{ uni.switchTab({ - url:'/pages/index/index' + url:'/pages/index/index2' }) },1000) } diff --git a/me/rHTgyqGoIV/rHTgyqGoIV.vue b/me/rHTgyqGoIV/rHTgyqGoIV.vue index 92c3826..15cab4f 100644 --- a/me/rHTgyqGoIV/rHTgyqGoIV.vue +++ b/me/rHTgyqGoIV/rHTgyqGoIV.vue @@ -240,7 +240,7 @@ }, onShareAppMessage(res) { return { - path: '/pages/index/index?invitation=' + this.invitationCode + '&qdCode=' + this + path: '/pages/index/index2?invitation=' + this.invitationCode + '&qdCode=' + this .qdCode, //这是为了传参 onload(data){let id=data.id;} title: this.tuiguang, imageUrl: this.bgImgs @@ -248,7 +248,7 @@ }, onShareTimeline(res) { return { - path: '/pages/index/index?invitation=' + this.invitationCode + '&qdCode=' + this + path: '/pages/index/index2?invitation=' + this.invitationCode + '&qdCode=' + this .qdCode, //这是为了传参 onload(data){let id=data.id;} title: this.tuiguang, imageUrl: this.bgImgs @@ -298,7 +298,7 @@ uni.downloadFile({ url: config.APIHOST + '/app/invite/dyCreateQr?invitationCode=' + that - .invitationCode + ',' + that.qdCode + '&page=/pages/index/index', + .invitationCode + ',' + that.qdCode + '&page=/pages/index/index2', success: (res) => { console.log(res) if (res.statusCode === 200) { diff --git a/me/yaoqing/index - 副本.vue b/me/yaoqing/index - 副本.vue index 38a9518..c87ce17 100644 --- a/me/yaoqing/index - 副本.vue +++ b/me/yaoqing/index - 副本.vue @@ -155,7 +155,7 @@ }, onShareAppMessage(res) { return { - path: '/pages/index/index?invitation=' + this.invitationCode + '&qdCode=' + this + path: '/pages/index/index2?invitation=' + this.invitationCode + '&qdCode=' + this .qdCode, //这是为了传参 onload(data){let id=data.id;} title: this.tuiguang, imageUrl: this.bgImg @@ -163,7 +163,7 @@ }, onShareTimeline(res) { return { - path: '/pages/index/index?invitation=' + this.invitationCode + '&qdCode=' + this + path: '/pages/index/index2?invitation=' + this.invitationCode + '&qdCode=' + this .qdCode, //这是为了传参 onload(data){let id=data.id;} title: this.tuiguang, imageUrl: this.bgImg @@ -222,7 +222,7 @@ uni.downloadFile({ url: config.APIHOST + '/app/invite/dyCreateQr?invitationCode=' + that - .invitationCode + ',' + that.qdCode + '&page=/pages/index/index', + .invitationCode + ',' + that.qdCode + '&page=/pages/index/index2', success: (res) => { console.log(res) if (res.statusCode === 200) { diff --git a/me/yaoqing/ymf-yaoqing-home.vue b/me/yaoqing/ymf-yaoqing-home.vue index 51d1adb..0574ab8 100644 --- a/me/yaoqing/ymf-yaoqing-home.vue +++ b/me/yaoqing/ymf-yaoqing-home.vue @@ -220,7 +220,7 @@ }, onShareAppMessage(res) { return { - path: '/pages/index/index?invitation=' + this.invitationCode + '&qdCode=' + this + path: '/pages/index/index2?invitation=' + this.invitationCode + '&qdCode=' + this .qdCode, //这是为了传参 onload(data){let id=data.id;} title: this.tuiguang, imageUrl: this.bgImg @@ -228,7 +228,7 @@ }, onShareTimeline(res) { return { - path: '/pages/index/index?invitation=' + this.invitationCode + '&qdCode=' + this + path: '/pages/index/index2?invitation=' + this.invitationCode + '&qdCode=' + this .qdCode, //这是为了传参 onload(data){let id=data.id;} title: this.tuiguang, imageUrl: this.bgImg @@ -297,7 +297,7 @@ uni.downloadFile({ url: config.APIHOST + '/app/invite/dyCreateQr?invitationCode=' + that - .invitationCode + ',' + that.qdCode + '&page=/pages/index/index', + .invitationCode + ',' + that.qdCode + '&page=/pages/index/index2', success: (res) => { console.log(res) if (res.statusCode === 200) { diff --git a/me/yaoqing/ymg-yaoqing-tixian.vue b/me/yaoqing/ymg-yaoqing-tixian.vue index 9c70012..b2d4b9a 100644 --- a/me/yaoqing/ymg-yaoqing-tixian.vue +++ b/me/yaoqing/ymg-yaoqing-tixian.vue @@ -306,7 +306,6 @@ export default { let token = that.token let userId = that.userId let cashMoney = that.cashMoney; - console.log('tixian'); if (token) { if (that.aliZhiFuBao && that.aliZhiFuBaoName) { if (!/^\d+(\.\d{1,2})?$/.test(that.money)) { @@ -368,9 +367,8 @@ export default { }); } } else { - uni.navigateTo({ - url: "/me/yaoqing/aliZhiFuBao" - }) + console.log(that.aliZhiFuBao,that.aliZhiFuBaoName,'tixian'); + this.ymfgoaliZhiFuBao() } } else { uni.navigateTo({ diff --git a/pages/BdwbOqUuVz/BdwbOqUuVz.vue b/pages/BdwbOqUuVz/BdwbOqUuVz.vue index d2b7265..acecb9f 100644 --- a/pages/BdwbOqUuVz/BdwbOqUuVz.vue +++ b/pages/BdwbOqUuVz/BdwbOqUuVz.vue @@ -132,7 +132,7 @@ //返回值：arg1乘以arg2的精确结果 enter(){ uni.reLaunch({ - url:'/pages/index/index' + url:'/pages/index/index2' }) }, init(){ diff --git a/pages/index/index copy.vue b/pages/index/index copy.vue index 1008d23..eb3e745 100644 --- a/pages/index/index copy.vue +++ b/pages/index/index copy.vue @@ -195,7 +195,7 @@ }, onShareAppMessage(res) { return { - path: '/pages/index/index?invitation=' + this.invitationCode + '&qdCode=' + this + path: '/pages/index/index2?invitation=' + this.invitationCode + '&qdCode=' + this .qdCode, //这是为了传参 onload(data){let id=data.id;} title: this.tuiguang, imageUrl: this.bgImg @@ -203,7 +203,7 @@ }, onShareTimeline(res) { return { - path: '/pages/index/index?invitation=' + this.invitationCode + '&qdCode=' + this + path: '/pages/index/index2?invitation=' + this.invitationCode + '&qdCode=' + this .qdCode, //这是为了传参 onload(data){let id=data.id;} title: this.tuiguang, imageUrl: this.bgImg diff --git a/pages/index/index.vue b/pages/index/index.vue index f3c6346..9c95602 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -268,7 +268,7 @@ }, onShareAppMessage(res) { return { - path: '/pages/index/index?invitation=' + this.invitationCode + '&qdCode=' + this + path: '/pages/index/index2?invitation=' + this.invitationCode + '&qdCode=' + this .qdCode, //这是为了传参 onload(data){let id=data.id;} title: this.tuiguang, imageUrl: this.bgImg @@ -276,7 +276,7 @@ }, onShareTimeline(res) { return { - path: '/pages/index/index?invitation=' + this.invitationCode + '&qdCode=' + this + path: '/pages/index/index2?invitation=' + this.invitationCode + '&qdCode=' + this .qdCode, //这是为了传参 onload(data){let id=data.id;} title: this.tuiguang, imageUrl: this.bgImg diff --git a/pages/login/appEq.vue b/pages/login/appEq.vue index 66e53d3..0bc828e 100644 --- a/pages/login/appEq.vue +++ b/pages/login/appEq.vue @@ -132,7 +132,7 @@ }); uni.switchTab({ - url: '/pages/index/index' + url: '/pages/index/index2' }) // window.location.href = res.data.value; // #endif diff --git a/pages/login/iosmobile.vue b/pages/login/iosmobile.vue index 56ee63f..f165280 100644 --- a/pages/login/iosmobile.vue +++ b/pages/login/iosmobile.vue @@ -215,7 +215,7 @@ this.$queue.setData("token", res.token); this.$queue.setData("userId", res.user.userId); uni.switchTab({ - url: '/pages/index/index' + url: '/pages/index/index2' }) } else { _this.isRotate = false; @@ -245,7 +245,7 @@ } }); uni.switchTab({ - url: '/pages/index/index' + url: '/pages/index/index2' }); } else { uni.showModal({ diff --git a/pages/login/login - 副本.vue b/pages/login/login - 副本.vue index 1a9f605..2bb7da7 100644 --- a/pages/login/login - 副本.vue +++ b/pages/login/login - 副本.vue @@ -186,7 +186,7 @@ that.$queue.setData('token', res.token); that.$queue.setData('userId', res.user.userId); uni.switchTab({ - url: '/pages/index/index' + url: '/pages/index/index2' }) } else { uni.hideLoading(); @@ -307,7 +307,7 @@ console.log(ress.user.userId) console.log(ress.token) uni.switchTab({ - url: '/pages/index/index' + url: '/pages/index/index2' }) } else { uni.hideLoading(); @@ -354,7 +354,7 @@ that.$queue.setData('userId', res.user .userId); uni.switchTab({ - url: '/pages/index/index' + url: '/pages/index/index2' }) } else { uni.hideLoading(); @@ -446,7 +446,7 @@ this.$queue.setData("invitationCode", res.user.invitationCode); this.$queue.setData("inviterCode", res.user.inviterCode); uni.switchTab({ - url: '/pages/index/index' + url: '/pages/index/index2' }) } else { uni.navigateTo({ @@ -498,7 +498,7 @@ this.$queue.setData("inviterCode", res.user .inviterCode); uni.switchTab({ - url: '/pages/index/index' + url: '/pages/index/index2' }) } else { uni.navigateTo({ @@ -526,7 +526,7 @@ this.$queue.setData("invitationCode", res.user.invitationCode); this.$queue.setData("inviterCode", res.user.inviterCode); uni.switchTab({ - url: '/pages/index/index' + url: '/pages/index/index2' }) } else { uni.navigateTo({ @@ -977,7 +977,7 @@ }) setTimeout(function() { uni.switchTab({ - url: '/pages/index/index' + url: '/pages/index/index2' }); }, 1000) diff --git a/pages/login/phonebind.vue b/pages/login/phonebind.vue index 6284f1b..dd9890e 100644 --- a/pages/login/phonebind.vue +++ b/pages/login/phonebind.vue @@ -188,7 +188,7 @@ this.$queue.setData("token", res.token); this.$queue.setData("userId", res.user.userId); uni.switchTab({ - url: '/pages/index/index' + url: '/pages/index/index2' }) } else { _this.isRotate = false; @@ -218,7 +218,7 @@ } }); uni.switchTab({ - url: '/pages/index/index' + url: '/pages/index/index2' }); } else { uni.showModal({ diff --git a/pages/login/register.vue b/pages/login/register.vue index f1ca398..ff0840b 100644 --- a/pages/login/register.vue +++ b/pages/login/register.vue @@ -308,7 +308,7 @@ // this.$queue.setData('nickName', res.data.nickName ? res.data.nickName : res.data.phone); // this.$queue.setData('gender', parseInt(res.data.gender)); uni.switchTab({ - url: '/pages/index/index' + url: '/pages/index/index2' }); } else { uni.showModal({ diff --git a/pages/login/registerApp.vue b/pages/login/registerApp.vue index 2b60c49..2b2b886 100644 --- a/pages/login/registerApp.vue +++ b/pages/login/registerApp.vue @@ -314,7 +314,7 @@ // this.$queue.setData('nickName', res.data.nickName ? res.data.nickName : res.data.phone); // this.$queue.setData('gender', parseInt(res.data.gender)); uni.switchTab({ - url: '/pages/index/index' + url: '/pages/index/index2' }); } else { uni.showModal({ diff --git a/pages/login/wxmobile.vue b/pages/login/wxmobile.vue index ccc5dac..6c85098 100644 --- a/pages/login/wxmobile.vue +++ b/pages/login/wxmobile.vue @@ -224,7 +224,7 @@ this.$queue.setData("token", res.token); this.$queue.setData("userId", res.user.userId); uni.switchTab({ - url: '/pages/index/index' + url: '/pages/index/index2' }) } else { _this.isRotate = false; @@ -254,7 +254,7 @@ } }); uni.switchTab({ - url: '/pages/index/index' + url: '/pages/index/index2' }); } else { uni.showModal({ diff --git a/pages/me/index.vue b/pages/me/index.vue index c214c22..f76361c 100644 --- a/pages/me/index.vue +++ b/pages/me/index.vue @@ -3,7 +3,7 @@ - + diff --git a/pages/task/index.vue b/pages/task/index.vue index ca2d681..4fe2fb6 100644 --- a/pages/task/index.vue +++ b/pages/task/index.vue @@ -319,7 +319,7 @@ this.taskReceive(item.id) } else { uni.navigateTo({ - url: '/pages/index/index' + url: '/pages/index/index2' }) } } else if (item.jumpType == 1) { @@ -338,7 +338,7 @@ }) } else if (item.jumpType == 3) { uni.navigateTo({ - url: '/pages/index/index' + url: '/pages/index/index2' }) } else if (item.jumpType == 2) { plus.runtime.openURL(buttonUrl) @@ -365,7 +365,7 @@ }, 1000) } else { uni.navigateTo({ - url: '/pages/index/index' + url: '/pages/index/index2' }) } }) diff --git a/tuniao-ui/components/tn-nav-bar/tn-nav-bar.vue b/tuniao-ui/components/tn-nav-bar/tn-nav-bar.vue index 52201c4..221002e 100644 --- a/tuniao-ui/components/tn-nav-bar/tn-nav-bar.vue +++ b/tuniao-ui/components/tn-nav-bar/tn-nav-bar.vue @@ -251,9 +251,9 @@ const pages = getCurrentPages() if (pages && pages.length > 0) { const firstPage = pages[0] - if (pages.length == 1 && (!firstPage.route || firstPage.route != 'pages/index/index')) { + if (pages.length == 1 && (!firstPage.route || firstPage.route != 'pages/index/index2')) { uni.reLaunch({ - url: '/pages/index/index' + url: '/pages/index/index2' }) } else { uni.navigateBack({ @@ -262,7 +262,7 @@ } } else { uni.reLaunch({ - url: '/pages/index/index' + url: '/pages/index/index2' }) } }