From 95539b882ebf01fb48f6c4478d21aa3807a5bca6 Mon Sep 17 00:00:00 2001 From: 26947 <12@1> Date: Sat, 8 Jun 2024 18:57:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pages.json b/pages.json index 6f967bf..f0aee09 100644 --- a/pages.json +++ b/pages.json @@ -66,13 +66,7 @@ "navigationStyle": "custom" } }, - // { - // "path": "pages/signln/harvestaddress", - // "style": { - // "navigationBarTitleText": "收货地址", - // "navigationStyle": "custom" - // } - // }, + { "path": "pages/signln/successfulexchange", @@ -311,12 +305,7 @@ "selectedIconPath": "static/images/tabbar/tu1-3.png", "text": "活动" } - // , { - // "pagePath": "pages/work/index", - // "iconPath": "static/images/tabbar/work.png", - // "selectedIconPath": "static/images/tabbar/work_.png", - // "text": "工作台" - // } + ,{ "pagePath": "pages/partJob/index", "iconPath": "static/images/tabbar/tu1-6.png", From 23a8b6d7190ec8835016dcd786df4a10a6c7ef57 Mon Sep 17 00:00:00 2001 From: Connor <1813766834@qq.com> Date: Sat, 8 Jun 2024 18:57:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=AE=E7=9B=98?= =?UTF-8?q?=E9=81=AE=E6=8C=A1=E8=BE=93=E5=85=A5=E6=A1=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/post/postInfo/postInfo.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pages/post/postInfo/postInfo.vue b/pages/post/postInfo/postInfo.vue index 0f4020f..e8f9905 100644 --- a/pages/post/postInfo/postInfo.vue +++ b/pages/post/postInfo/postInfo.vue @@ -61,7 +61,7 @@ - + @@ -517,5 +517,11 @@ .comment-po{ // height: 500rpx; } + + .input-bt-text{ + font-weight: 400; + font-size: 28rpx; + color: #FFFFFF; + } From 0a479f638b7257d67f6848e914a7d206c6eadfc2 Mon Sep 17 00:00:00 2001 From: 26947 <12@1> Date: Sat, 8 Jun 2024 19:02:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 3 -- pages.json | 70 +++++++-------------------------- pages/common/postview/index.vue | 6 +-- permission.js | 6 +-- 4 files changed, 20 insertions(+), 65 deletions(-) diff --git a/manifest.json b/manifest.json index b14d530..e9579a4 100644 --- a/manifest.json +++ b/manifest.json @@ -1,10 +1,7 @@ { "name" : "若依移动端", -<<<<<<< HEAD "appid" : "__UNI__9F2C9D7", -======= "appid" : "__UNI__9285214", ->>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d "description" : "", "versionName" : "1.1.0", "versionCode" : "100", diff --git a/pages.json b/pages.json index 60ca896..6abce93 100644 --- a/pages.json +++ b/pages.json @@ -21,22 +21,12 @@ } }, { -<<<<<<< HEAD "path": "pages/Friend/Interactivemessage", "style": { "navigationBarTitleText": "互动消息", "navigationStyle": "custom" -======= - "path": "pages/Friend/violationreporting" - }, - { - "path" : "pages/post/postInfo/postInfo", - "style" : - { - "navigationBarTitleText" : "话题详情" ->>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d - } - }, + }}, + { "path": "pages/Friend/addfruebd", "style": { @@ -45,39 +35,20 @@ } }, { -<<<<<<< HEAD - "path": "pages/communication/addfriends", - "style": { - "navigationBarTitleText": "添加好友", - "navigationStyle": "custom" - } - }, - - { - "path": "pages/signln/signid", - "style": { - "navigationBarTitleText": "签到任务", - "navigationStyle": "custom" - } - }, - { - "path": "pages/Friend/violationreporting", -======= "path": "pages/signln/harvestaddress", ->>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d "style": { "navigationBarTitleText": "违规举报", "navigationStyle": "custom" } }, - { - "path": "pages/signln/harvestaddress", - "style": { - "navigationBarTitleText": "地址", - "navigationStyle": "custom" - } - }, + // { + // "path": "pages/signln/harvestaddress", + // "style": { + // "navigationBarTitleText": "地址", + // "navigationStyle": "custom" + // } + // }, { "path": "pages/post/postInfo/postInfo", "style": { @@ -107,15 +78,7 @@ "navigationStyle": "custom" } }, -<<<<<<< HEAD -======= - // { - // "path": "pages/signln/harvestaddress", - // "style": { - // "navigationBarTitleText": "收货地址", - // "navigationStyle": "custom" - // } - // }, + { "path": "pages/signln/successfulexchange", @@ -327,12 +290,7 @@ "selectedIconPath": "static/images/tabbar/tu1-3.png", "text": "活动" } - // , { - // "pagePath": "pages/work/index", - // "iconPath": "static/images/tabbar/work.png", - // "selectedIconPath": "static/images/tabbar/work_.png", - // "text": "工作台" - // } + ,{ "pagePath": "pages/partJob/index", "iconPath": "static/images/tabbar/tu1-6.png", @@ -357,8 +315,8 @@ "navigationBarTitleText": "RuoYi", "navigationBarBackgroundColor": "#FFFFFF" } -<<<<<<< HEAD -} -======= } + + + diff --git a/pages/common/postview/index.vue b/pages/common/postview/index.vue index 965442a..bf7d06b 100644 --- a/pages/common/postview/index.vue +++ b/pages/common/postview/index.vue @@ -54,11 +54,11 @@ -<<<<<<< HEAD + -======= + ->>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d + {{ postValue.transmitCount }} diff --git a/permission.js b/permission.js index 453440d..7c268f4 100644 --- a/permission.js +++ b/permission.js @@ -1,6 +1,6 @@ import { getToken } from "@/utils/auth"; -<<<<<<< HEAD + // // 登录页面 // const loginPage = "/pages/loginInfo/login"; @@ -10,7 +10,7 @@ import { getToken } from "@/utils/auth"; // "/pages/register", // "/pages/common/webview/index", // ]; -======= + // 登录页面 const loginPage = "/pages/login"; @@ -20,7 +20,7 @@ const whiteList = [ "/pages/register", "/pages/common/webview/index", ]; ->>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d + // // 检查地址白名单 // function checkWhite(url) {