From 3fd3b2247a545a3a2ce38be13e5d89b7608f3332 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=8E=AB=E5=94=90=E5=B0=BC?= <1431128779@qq.com>
Date: Fri, 9 Dec 2022 10:48:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=96=87=E7=AB=A0=E8=AE=BE=E7=BD=AEBUG?=
 =?UTF-8?q?=EF=BC=9B=20=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=8F=8B=E9=93=BE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?BUG;=20=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=BA=94=E7=94=A8=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E7=82=B9=E5=87=BB=E8=BF=94=E5=9B=9E=EF=BC=8C=E8=A7=A6?=
 =?UTF-8?q?=E5=8F=91=E6=8F=90=E7=A4=BABUG;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/tabbar/gallery/gallery.vue    | 9 ++++++---
 pages/tabbar/links/links.vue        | 6 ++----
 pagesA/setting/setting.vue          | 1 +
 pagesB/articles/article-edit.vue    | 4 ++--
 pagesB/articles/article-setting.vue | 6 +-----
 pagesB/articles/articles.vue        | 2 +-
 6 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/pages/tabbar/gallery/gallery.vue b/pages/tabbar/gallery/gallery.vue
index cfd1470..5f19cc5 100644
--- a/pages/tabbar/gallery/gallery.vue
+++ b/pages/tabbar/gallery/gallery.vue
@@ -26,7 +26,7 @@
 					<template v-slot:left="{ hdata }">
 						<tm-translate animation-name="fadeUp">
 							<view class="round-3 shadow-2 overflow white">
-								<tm-images :previmage="true" :src="hdata.item.image"></tm-images>
+								<tm-images :previmage="false" :src="hdata.item.image" @click="fnPreview(hdata.item)"></tm-images>
 								<view class="pa-10 text-size-s">
 									<view class="text-overflow-2">
 										<tm-tags color="bg-gradient-amber-accent" :shadow="0" :dense="true" size="s" model="fill">{{ hdata.item.team }}</tm-tags>
@@ -51,7 +51,7 @@
 					<template v-slot:right="{ hdata }">
 						<tm-translate animation-name="fadeUp">
 							<view class="round-3 shadow-2 overflow white">
-								<tm-images :previmage="true" :src="hdata.item.image"></tm-images>
+								<tm-images :previmage="false" :src="hdata.item.image" @click="fnPreview(hdata.item)"></tm-images>
 								<view class="pa-10 text-size-s">
 									<view class="text-overflow-2">
 										<tm-tags :shadow="0" :dense="true" color="bg-gradient-amber-accent" size="s" model="fill">{{ hdata.item.team }}</tm-tags>
@@ -282,6 +282,9 @@ export default {
 		},
 		// 预览
 		fnPreview(item, index) {
+			if (!index) {
+				index = this.dataList.findIndex(x => x.id == item.id);
+			}
 			uni.previewImage({
 				current: index,
 				urls: this.dataList.map(x => x.image),
@@ -293,7 +296,7 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .app-page {
 	width: 100vw;
 	min-height: 100vh;
diff --git a/pages/tabbar/links/links.vue b/pages/tabbar/links/links.vue
index 68b1cc1..ec93709 100644
--- a/pages/tabbar/links/links.vue
+++ b/pages/tabbar/links/links.vue
@@ -190,14 +190,12 @@ export default {
 							};
 						});
 
-						// this.result = _result.reverse();
+						this.result = _result.reverse();
 						setTimeout(() => {
 							this.loading = 'success';
 						}, 500);
 					} else {
-						setTimeout(() => {
-							this.loading = 'error';
-						}, 500);
+						this.loading = 'error';
 					}
 				})
 				.catch(err => {
diff --git a/pagesA/setting/setting.vue b/pagesA/setting/setting.vue
index 41451d7..1bb561f 100644
--- a/pagesA/setting/setting.vue
+++ b/pagesA/setting/setting.vue
@@ -271,6 +271,7 @@ export default {
 		fnOnBack() {
 			if (this.isSaved) {
 				uni.navigateBack();
+				return;
 			}
 			uni.$eShowModal({
 				title: '提示',
diff --git a/pagesB/articles/article-edit.vue b/pagesB/articles/article-edit.vue
index 544c167..2a3d9a9 100644
--- a/pagesB/articles/article-edit.vue
+++ b/pagesB/articles/article-edit.vue
@@ -540,10 +540,10 @@ export default {
 			if (this.form.id) {
 				this.$Router.push({
 					path: '/pagesB/articles/article-setting',
-					query: { postsId: this.form.id, postTitle: this.form.title, isEdit: true, from: 'edit' }
+					query: { postsId: this.form.id, postTitle: this.form.title, isEdit: 1, from: 'edit' }
 				});
 			} else {
-				this.$Router.push({ path: '/pagesB/articles/article-setting', query: { postsId: '', postTitle: '', isEdit: false, from: 'edit' } });
+				this.$Router.push({ path: '/pagesB/articles/article-setting', query: { postsId: '', postTitle: '', isEdit: 0, from: 'edit' } });
 			}
 
 			return;
diff --git a/pagesB/articles/article-setting.vue b/pagesB/articles/article-setting.vue
index f3a3442..738f2d6 100644
--- a/pagesB/articles/article-setting.vue
+++ b/pagesB/articles/article-setting.vue
@@ -404,13 +404,10 @@ export default {
 		const from = this.$Route.query.from;
 		this.postsId = postsId;
 		this.postTitle = postTitle || '';
-		this.isEdit = isEdit;
+		this.isEdit = isEdit == 1 ? true : false;
 		this.from = from;
 		this.createTime = uni.$tm.dayjs(new Date().getTime()).format('YYYY-MM-DD HH:mm:ss');
 		this.fnGetSettings();
-
-		console.log(uni.getStorageSync('posts-content'));
-		console.log(uni.getStorageSync('posts-content-source'));
 	},
 	onPullDownRefresh() {
 		if (this.isEdit == false) {
@@ -591,7 +588,6 @@ export default {
 				})
 				.catch(err => {
 					this.$tm.toast('数据加载失败，请重试！');
-					console.log(err);
 					this.loading = 'error';
 				})
 				.finally(() => {
diff --git a/pagesB/articles/articles.vue b/pagesB/articles/articles.vue
index de63a1e..460b32a 100644
--- a/pagesB/articles/articles.vue
+++ b/pagesB/articles/articles.vue
@@ -306,7 +306,7 @@ export default {
 		},
 		// 设置文章信息
 		fnOnSetArticle(article, index) {
-			this.$Router.push({ path: '/pagesB/articles/article-setting', query: { postsId: article.id, postTitle: article.title, isEdit: true, from: 'list' } });
+			this.$Router.push({ path: '/pagesB/articles/article-setting', query: { postsId: article.id, postTitle: article.title, isEdit: 1, from: 'list' } });
 		},
 		// 删除文章
 		fnOnDelArticle(article, index) {