From 8ccd5f5703ffa34955ba12497d7bb7f67207ad90 Mon Sep 17 00:00:00 2001 From: jia <1451658316@qq.com> Date: Thu, 28 Sep 2023 13:59:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 8 +++++--- pages/margin/margin.vue | 10 ++++------ pages/moreProject/moreProject.vue | 15 ++++++++++----- pages/plant_release/index.vue | 2 +- pages/short_video/appSwiper/index.nvue | 6 ++++-- pages/users/payment/payment.vue | 13 +++++++++---- 6 files changed, 33 insertions(+), 21 deletions(-) diff --git a/manifest.json b/manifest.json index c8c719f..21d401e 100644 --- a/manifest.json +++ b/manifest.json @@ -31,7 +31,8 @@ "UniMP" : { "description" : "uni小程序" }, - "Maps" : {} + "Maps" : {}, + "Push" : {} }, "safearea" : { "bottom" : { @@ -120,7 +121,8 @@ } }, "oauth" : {}, - "ad" : {} + "ad" : {}, + "push" : {} }, "icons" : { "android" : { @@ -161,7 +163,7 @@ "nativePlugins" : { "JG-JCore" : { "JPUSH_APPKEY_IOS" : "8a5efd65cda14fafa6e64ad3", - "JPUSH_CHANNEL_IOS" : "", + "JPUSH_CHANNEL_IOS" : "8a5efd65cda14fafa6e64ad3", "JPUSH_APPKEY_ANDROID" : "b5f679f4357018605ea6fd2e", "JPUSH_CHANNEL_ANDROID" : "", "__plugin_info__" : { diff --git a/pages/margin/margin.vue b/pages/margin/margin.vue index 122ff8e..9e9b518 100644 --- a/pages/margin/margin.vue +++ b/pages/margin/margin.vue @@ -118,11 +118,7 @@ }, //缴纳保证金 paydecimal() { - if (this.merchant_Data.is_margin != 1) { - this.$util.Tips({ - title: '暂时无需缴纳保证金' - }); - } else { + let that = this uni.showModal({ title: '提示', @@ -154,6 +150,9 @@ }); }).catch((err) => { console.log(err) + this.$util.Tips(()=>{ + + }) }) } else if (res.cancel) { console.log('用户点击取消'); @@ -163,7 +162,6 @@ } - }, } } diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue index 8b6ad68..8c40e8b 100644 --- a/pages/moreProject/moreProject.vue +++ b/pages/moreProject/moreProject.vue @@ -39,11 +39,11 @@ 在售管理 - 财务管理 - + --> - + diff --git a/pages/short_video/appSwiper/index.nvue b/pages/short_video/appSwiper/index.nvue index 6a82f59..dc96839 100644 --- a/pages/short_video/appSwiper/index.nvue +++ b/pages/short_video/appSwiper/index.nvue @@ -309,7 +309,7 @@ - + @@ -718,12 +718,14 @@ // }); // })' // that.isUser ? + videoList({ page: that.page, limit: that.limit, id: this.videoID }).then(res => { + console.log(res.data,'1') that.getVideoData(res.data.list); }) @@ -899,7 +901,7 @@ deoList(this.videoID).then(async (res) => { this.loadVideo = false this.userUid = res.data.uid - this.page = this.page + 1; + this.page = 1; var msg = [res.data]; for (let i = 0; i < msg.length; i++) { msg[i]['isMore'] = false diff --git a/pages/users/payment/payment.vue b/pages/users/payment/payment.vue index 1777648..4ebec4d 100644 --- a/pages/users/payment/payment.vue +++ b/pages/users/payment/payment.vue @@ -272,11 +272,16 @@ icon: 'none', title: res.message }) - setTimeout(() => { - uni.navigateTo({ - url:'/pages/users/order_list/index?status=2' + if(res.data.status='error'){ + + }else{ + setTimeout(() => { + uni.navigateBack({ + delta: 2 }) - }, 1000) + }, 1000) + } + } } From a759d3952f96717326c52ee0178292172923af1d Mon Sep 17 00:00:00 2001 From: jia <1451658316@qq.com> Date: Thu, 28 Sep 2023 14:01:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=20pages/moreProject/more?= =?UTF-8?q?Project.vue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/moreProject/moreProject.vue | 1504 ----------------------------- 1 file changed, 1504 deletions(-) delete mode 100644 pages/moreProject/moreProject.vue diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue deleted file mode 100644 index 8c40e8b..0000000 --- a/pages/moreProject/moreProject.vue +++ /dev/null @@ -1,1504 +0,0 @@ - - - - \ No newline at end of file From de6afb93917b2a1752d1aff74dc6634c78b52ef8 Mon Sep 17 00:00:00 2001 From: jia <1451658316@qq.com> Date: Thu, 28 Sep 2023 14:05:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/moreProject/moreProject.vue | 1504 +++++++++++++++++++++++++++++ 1 file changed, 1504 insertions(+) create mode 100644 pages/moreProject/moreProject.vue diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue new file mode 100644 index 0000000..8c40e8b --- /dev/null +++ b/pages/moreProject/moreProject.vue @@ -0,0 +1,1504 @@ + + + + \ No newline at end of file