修改

App.vue

@@ -128,6 +128,7 @@
 
 	/* 设置整个项目的公用样式*/
 	page {
+		// font-family: 'Franklin Gothic Medium', 'Arial Narrow', Arial, sans-serif;
 		/* 窗口可用高度 */
 		/* 有头有底 */
 		--oneHeight: 100vh;

pages.json

@@ -41,13 +41,6 @@
 						"navigationBarTitleText": "登录"
 					}
 				},
-				{
-					"path": "type/index",
-					"style": {
-						"navigationBarTitleText": "分类",
-						"enablePullDownRefresh": true
-					}
-				},
 				{
 					"path": "like/index",
 					"style": {
@@ -115,6 +108,19 @@
 					"style": {
 						"navigationBarTitleText": "文章详情"
 					}
+				},
+				{
+					"path": "info/index",
+					"style": {
+						"navigationBarTitleText": "神鹿峰"
+					}
+				},
+				{
+					"path": "type/index",
+					"style": {
+						"navigationBarTitleText": "分类",
+						"enablePullDownRefresh": true
+					}
 				}
 			]
 		}

pages/home/index.vue

@@ -115,11 +115,11 @@
 		},
 		onLoad: async function() {
 			const that = this;
-			that.searchToken();
-			await that.searchOther();
 		},
 		onShow: async function(e) {
 			const that = this;
+			that.searchToken();
+			await that.searchOther();
 			that.clearPage();
 			await that.search();
 		},
@@ -172,7 +172,9 @@
 			},
 			// 点击模块
 			toChange(item) {
-				console.log(item)
+				uni.navigateTo({
+					url: `${item.route}?title=${item.name}`,
+				})
 			},
 			// 查看更多公告
 			toMore() {

pages/index/index.vue

@@ -1,56 +1,65 @@
-<template>
-	<view class="main">
-		<view class="one">
-			<image class="logo" :src="logoUrl"></image>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
+<template>
+	<view class="main">
+		<view class="one">
+			<image class="logo" :src="logoUrl"></image>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
 				logoUrl: ''
-			};
-		},
-		onLoad: async function() {
-			const that = this;
-			await that.searchConfig();
-		},
-		methods: {
-			// 查询基本设置
-			async searchConfig() {
-				const that = this;
-				let res = await that.$api(`/config`, 'GET', {});
-				if (res.errcode == '0') {
-					that.$set(that, `logoUrl`, res.data.logo_url[0].url);
-					let url = `/pages/home/index`;
-					uni.reLaunch({
-						url
-					})
-				}
-			}
-		},
-	}
-</script>
-
-<style lang="scss">
-	.main {
-		display: flex;
-		flex-direction: column;
-		width: 100vw;
+			};
+		},
+		onLoad: async function() {
+			const that = this;
+			await that.searchConfig();
+		},
+		methods: {
+			// 查询基本设置
+			async searchConfig() {
+				const that = this;
+				let res = await that.$api(`/config`, 'GET', {});
+				if (res.errcode == '0') {
+					that.$set(that, `logoUrl`, res.data.logo_url[0].url);
+					uni.setStorage({
+						key: 'config',
+						data: res.data,
+						success: function(res) {
+							let url = `/pages/home/index`;
+							uni.reLaunch({
+								url
+							})
+						},
+						fail: function(err) {
+							console.log(err);
+						}
+					})
+				}
+			}
+		},
+	}
+</script>
+
+<style lang="scss">
+	.main {
+		display: flex;
+		flex-direction: column;
+		width: 100vw;
 		height: 100vh;
-
-		.one {
-			text-align: center;
-			margin: 40vw 0 0 0;
-
-			.logo {
-				width: 50vw;
-				height: 50vw;
-				border-radius: 90px;
-				box-shadow: 0 0 5px var(--f1Color);
-			}
-		}
-	}
-</style>
+
+		.one {
+			text-align: center;
+			margin: 40vw 0 0 0;
+
+			.logo {
+				width: 50vw;
+				height: 50vw;
+				border-radius: 90px;
+				box-shadow: 0 0 5px var(--f1Color);
+			}
+		}
+	}
+</style>

pagesHome/article/index.vue

@@ -109,13 +109,17 @@
 			await that.search();
 		},
 		methods: {
-			async searchConfig() {
+			searchConfig() {
 				const that = this;
-				let res;
-				// 基本设置
-				res = await that.$api(`/config`, 'GET', {});
-				if (res.errcode == '0') {
-					that.$set(that, `config`, res.data);
+				try {
+					const res = uni.getStorageSync('config');
+					if (res) that.$set(that, `config`, res);
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
 				}
 			},
 			searchToken() {

pagesHome/info/index.vue

@@ -0,0 +1,60 @@
+<template>
+	<view class="main">
+		{{info}}
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				user: {},
+				info: {},
+			}
+		},
+		onLoad: async function(e) {
+			const that = this;
+			uni.setNavigationBarTitle({
+				title: e && e.title || '分类'
+			});
+			await that.searchOther();
+			that.searchToken();
+			that.search();
+		},
+		methods: {
+			searchToken() {
+				const that = this;
+				try {
+					const res = uni.getStorageSync('token');
+					if (res) that.$set(that, `user`, res);
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			// 查询
+			async search() {
+				const that = this;
+				let res;
+				res = await that.$api(`/config`, 'GET', {})
+				if (res.errcode == '0') {
+					that.$set(that, `info`, res.data)
+				} else {
+					uni.showToast({
+						title: res.errmsg,
+					});
+				}
+			},
+			async searchOther() {
+				const that = this;
+			}
+		}
+	}
+</script>
+
+<style>
+	.main {}
+</style>

pagesHome/type/index.vue

@@ -0,0 +1,67 @@
+<template>
+	<view class="main">
+		{{info}}
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				config: {},
+				user: {},
+			}
+		},
+		onLoad: async function(e) {
+			const that = this;
+			uni.setNavigationBarTitle({
+				title: e && e.title || '分类'
+			});
+			await that.searchOther();
+			that.searchConfig();
+			that.searchToken();
+			that.search();
+		},
+		methods: {
+			searchToken() {
+				const that = this;
+				try {
+					const res = uni.getStorageSync('token');
+					if (res) that.$set(that, `user`, res);
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			searchConfig() {
+				const that = this;
+				try {
+					const res = uni.getStorageSync('config');
+					if (res) that.$set(that, `config`, res);
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			// 查询
+			async search() {
+				const that = this;
+				let res;
+
+			},
+			async searchOther() {
+				const that = this;
+			}
+		}
+	}
+</script>
+
+<style>
+	.main {}
+</style>

pagesIndex/collect/index.vue

@@ -247,4 +247,29 @@
 			}
 		}
 	}
+
+	.scroll-view {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+
+		.list-scroll-view {
+			display: flex;
+			flex-direction: column;
+		}
+	}
+
+	.is_bottom {
+		width: 100%;
+		text-align: center;
+
+		text {
+			padding: 2vw 0;
+			display: inline-block;
+			color: var(--f85Color);
+			font-size: var(--font14Size);
+		}
+	}
 </style>

pagesIndex/comment/index.vue

@@ -1,20 +1,332 @@
 <template>
 	<view class="main">
-		系统首页
+		<view class="one">
+			<tabs :tabs="tabs" @tabsChange="tabsChange">
+				<view class="tabsList">
+					<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage" @scroll="toScroll">
+						<view class="list-scroll-view">
+							<view class="list" v-for="(item, index) in list" :key="index">
+								<view class="list_1">
+									{{item.content}}
+								</view>
+								<view class="list_2" @tap="toInfo(item)">
+									<view class="left">
+										<image class="image"
+											:src="item.source.file&&item.source.file.length>0?item.source.file[0].url:''"
+											mode="aspectFill">
+									</view>
+									<view class="right">
+										<view class="right_1 textOver">{{item.source.title||'暂无标题'}}</view>
+										<view class="right_2"><text>发布人：</text>{{item.source.contact_name||'暂无'}}</view>
+										<view class="right_2"><text>发布时间：</text>{{item.source.create_time||'暂无'}}
+										</view>
+									</view>
+								</view>
+								<view class="button">
+									<button size="mini" type="warn" @tap.stop="toDel(item)">删除</button>
+								</view>
+							</view>
+						</view>
+						<view class="is_bottom" v-if="is_bottom">
+							<text>{{config.bottom_title}}</text>
+						</view>
+					</scroll-view>
+				</view>
+			</tabs>
+		</view>
 	</view>
 </template>
 
 <script>
+	import tabs from '../../components/tabs/index.vue';
 	export default {
+		components: {
+			tabs
+		},
 		data() {
-			return {}
+			return {
+				searchInfo: {},
+				config: {},
+				user: {},
+				tabs: {
+					active: '0',
+					bgColor: '#ffffff',
+					menu: []
+				},
+				list: [],
+				total: 0,
+				skip: 0,
+				limit: 6,
+				page: 0,
+				// 数据是否触底
+				is_bottom: false,
+				scrollTop: 0,
+			}
+		},
+		onLoad: async function(e) {
+			const that = this;
+			that.searchToken();
+			that.searchConfig();
+			await that.searchOther();
+		},
+		onShow: async function() {
+			const that = this;
+			that.clearPage();
+			await that.search();
+		},
+		onPullDownRefresh: async function() {
+			const that = this;
+			that.clearPage();
+			await that.search();
+			uni.stopPullDownRefresh();
 		},
 		methods: {
-
+			searchToken() {
+				const that = this;
+				try {
+					const res = uni.getStorageSync('token');
+					if (res) that.$set(that, `user`, res);
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			searchConfig() {
+				const that = this;
+				try {
+					const res = uni.getStorageSync('config');
+					if (res) that.$set(that, `config`, res);
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			async search() {
+				const that = this;
+				let info = {
+					skip: that.skip,
+					limit: that.limit,
+					status: that.tabs.active,
+					user: that.user._id,
+				}
+				const res = await that.$api(`/comment`, 'GET', {
+					...info,
+					...that.searchInfo
+				})
+				if (res.errcode == '0') {
+					let list = [...that.list, ...res.data];
+					that.$set(that, `list`, list)
+					that.$set(that, `total`, res.total)
+				} else {
+					uni.showToast({
+						title: res.errmsg,
+					});
+				}
+			},
+			// 选择选项卡
+			tabsChange(e) {
+				const that = this;
+				that.$set(that.tabs, `active`, e.active)
+				that.clearPage();
+				that.search()
+			},
+			// 查看详情
+			toInfo(item) {
+				uni.navigateTo({
+					url: `/pagesHome/article/index?id=${item.source._id}`
+				})
+			},
+			// 输入框
+			toInput(e) {
+				const that = this;
+				if (that.searchInfo.title) that.$set(that.searchInfo, `title`, e.detail.value)
+				else that.$set(that, `searchInfo`, {})
+				that.clearPage();
+				that.search();
+			},
+			// 删除
+			async toDel(e) {
+				const that = this;
+				uni.showModal({
+					title: '提示',
+					content: '确定删除该评论吗?',
+					success: async function(res) {
+						if (res.confirm) {
+							const res = await that.$api(`/comment/${e._id}`, 'DELETE', {})
+							if (res.errcode == 0) {
+								that.clearPage();
+								that.search();
+							} else {
+								uni.showToast({
+									title: res.errmsg,
+									icon: 'none'
+								})
+							}
+						}
+					}
+				});
+			},
+			async searchOther() {
+				const that = this;
+				let res;
+				//状态
+				res = await that.$api('/dictData', 'GET', {
+					type: 'exam_status',
+					is_use: '0'
+				})
+				if (res.errcode == '0') {
+					const menu = res.data.map((item) => {
+						return {
+							title: item.label,
+							active: item.value
+						}
+					})
+					that.$set(that.tabs, `menu`, menu)
+				}
+			},
+			// 分页
+			toPage(e) {
+				const that = this;
+				let list = that.list;
+				let limit = that.limit;
+				if (that.total > list.length) {
+					uni.showLoading({
+						title: '加载中',
+						mask: true
+					})
+					let page = that.page + 1;
+					that.$set(that, `page`, page)
+					let skip = page * limit;
+					that.$set(that, `skip`, skip)
+					that.search();
+					uni.hideLoading();
+				} else that.$set(that, `is_bottom`, true)
+				console.log(list.length);
+			},
+			toScroll(e) {
+				const that = this;
+				let up = that.scrollTop;
+				that.$set(that, `scrollTop`, e.detail.scrollTop);
+				let num = Math.sign(up - e.detail.scrollTop);
+				if (num == 1) that.$set(that, `is_bottom`, false);
+			},
+			// 清空列表
+			clearPage() {
+				const that = this;
+				that.$set(that, `list`, [])
+				that.$set(that, `skip`, 0)
+				that.$set(that, `limit`, 6)
+				that.$set(that, `page`, 0)
+			}
 		}
 	}
 </script>
 
-<style>
-	.main {}
+<style lang="scss" scoped>
+	.main {
+		display: flex;
+		flex-direction: column;
+		width: 100vw;
+		height: 100vh;
+
+		.one {
+			background-color: var(--f9Color);
+			margin: 2vw 0 0 0;
+
+			.tabsList {
+				position: relative;
+				width: 100vw;
+				height: 90vh;
+
+				.list {
+					background-color: var(--mainColor);
+					border: 1px solid var(--f5Color);
+					padding: 2vw;
+					margin: 2vw 2vw 0 2vw;
+					border-radius: 5px;
+					font-size: var(--font12Size);
+
+					.list_1 {
+						padding: 1vw;
+					}
+
+					.list_2 {
+						display: flex;
+						padding: 1vw;
+						border-radius: 5px;
+						border: 1px solid var(--f9Color);
+
+						.left {
+							width: 15vw;
+
+							.image {
+								width: 100%;
+								height: 15vw;
+							}
+						}
+
+						.right {
+							padding: 2vw;
+							width: 75vw;
+
+							.right_1 {
+								font-size: var(--font14Size);
+								padding: 0 0 2px 0;
+							}
+
+							.right_2 {
+								padding: 0 0 2px 0;
+
+								text {
+									color: var(--f85Color);
+								}
+							}
+						}
+					}
+
+					.button {
+						text-align: center;
+						margin: 1vw 0 0 0;
+
+						.button {
+							background-color: var(--f3CColor);
+							color: var(--mainColor);
+							margin: 0 1vw 0 0;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	.scroll-view {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+
+		.list-scroll-view {
+			display: flex;
+			flex-direction: column;
+		}
+	}
+
+	.is_bottom {
+		width: 100%;
+		text-align: center;
+
+		text {
+			padding: 2vw 0;
+			display: inline-block;
+			color: var(--f85Color);
+			font-size: var(--font14Size);
+		}
+	}
 </style>

pagesIndex/like/index.vue

@@ -37,7 +37,6 @@
 	export default {
 		data() {
 			return {
-				searchInfo: {},
 				config: {},
 				user: {},
 				list: [],
@@ -247,4 +246,29 @@
 			}
 		}
 	}
+
+	.scroll-view {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+
+		.list-scroll-view {
+			display: flex;
+			flex-direction: column;
+		}
+	}
+
+	.is_bottom {
+		width: 100%;
+		text-align: center;
+
+		text {
+			padding: 2vw 0;
+			display: inline-block;
+			color: var(--f85Color);
+			font-size: var(--font14Size);
+		}
+	}
 </style>

pagesIndex/type/index.vue

@@ -1,20 +0,0 @@
-<template>
-	<view class="main">
-		系统首页
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {}
-		},
-		methods: {
-
-		}
-	}
-</script>
-
-<style>
-	.main {}
-</style>

pagesMy/article/add.vue

@@ -71,9 +71,9 @@
 		onLoad: async function(e) {
 			const that = this;
 			that.$set(that, `id`, e && e.id || '');
+			that.searchToken();
 			await that.searchOther();
 			that.search();
-			that.searchToken();
 		},
 		methods: {
 			searchToken() {

pagesMy/article/index.vue

@@ -289,80 +289,109 @@
 		}
 
 		.two {
-			position: relative;
-			flex-grow: 1;
 			background-color: var(--f9Color);
 			margin: 2vw 0 0 0;
 
-			.pubuBox {
-				padding: 2vw;
-			}
-
-			.pubuItem {
-				column-count: 2;
-				column-gap: 2vw;
-			}
-
-			.list {
-				box-sizing: border-box;
-				border-radius: 2vw;
-				overflow: hidden;
-				background-color: var(--mainColor);
-				break-inside: avoid;
-				/*避免在元素内部插入分页符*/
-				box-sizing: border-box;
-				margin-bottom: 2vw;
-			}
+			.tabsList {
+				position: relative;
+				width: 100vw;
+				height: 82vh;
 
-			.list image {
-				width: 100%;
-			}
+				.pubuBox {
+					padding: 2vw;
+				}
 
-			.title {
-				padding: 2vw;
+				.pubuItem {
+					column-count: 2;
+					column-gap: 2vw;
+				}
 
-				.title_1 {
-					font-size: var(--font14Size);
-					line-height: 4vw;
-					text-overflow: -o-ellipsis-lastline;
+				.list {
+					box-sizing: border-box;
+					border-radius: 2vw;
 					overflow: hidden;
-					text-overflow: ellipsis;
-					display: -webkit-box;
-					-webkit-line-clamp: 2;
-					line-clamp: 2;
-					-webkit-box-orient: vertical;
-					min-height: 6vw;
-					max-height: 20vw;
+					background-color: var(--mainColor);
+					break-inside: avoid;
+					/*避免在元素内部插入分页符*/
+					box-sizing: border-box;
+					margin-bottom: 2vw;
+				}
+
+				.list image {
+					width: 100%;
 				}
 
-				.title_2 {
-					display: flex;
-					justify-content: space-between;
-					font-size: var(--font12Size);
-					color: var(--f69Color);
-					padding: 1vw 0;
+				.title {
+					padding: 2vw;
+
+					.title_1 {
+						font-size: var(--font14Size);
+						line-height: 4vw;
+						text-overflow: -o-ellipsis-lastline;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						display: -webkit-box;
+						-webkit-line-clamp: 2;
+						line-clamp: 2;
+						-webkit-box-orient: vertical;
+						min-height: 6vw;
+						max-height: 20vw;
+					}
 
-					.right {
+					.title_2 {
 						display: flex;
-						align-items: center;
+						justify-content: space-between;
+						font-size: var(--font12Size);
+						color: var(--f69Color);
+						padding: 1vw 0;
 
-						text:first-child {
-							padding: 0 1vw 0 0;
+						.right {
+							display: flex;
+							align-items: center;
+
+							text:first-child {
+								padding: 0 1vw 0 0;
+							}
 						}
 					}
 				}
-			}
-
-			.button {
-				text-align: center;
-				margin: 0 0 1vw 0;
 
 				.button {
-					background-color: var(--f3CColor);
-					color: var(--mainColor);
-					margin: 0 1vw 0 0;
+					text-align: center;
+					margin: 0 0 1vw 0;
+
+					.button {
+						background-color: var(--f3CColor);
+						color: var(--mainColor);
+						margin: 0 1vw 0 0;
+					}
 				}
 			}
 		}
 	}
+
+	.scroll-view {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+
+		.list-scroll-view {
+			display: flex;
+			flex-direction: column;
+		}
+	}
+
+	.is_bottom {
+		width: 100%;
+		text-align: center;
+
+		text {
+			padding: 2vw 0;
+			display: inline-block;
+			color: var(--f85Color);
+			font-size: var(--font14Size);
+		}
+	}
 </style>

unpackage/dist/dev/mp-weixin/app.json

@@ -11,7 +11,6 @@
       "root": "pagesIndex",
       "pages": [
         "login/index",
-        "type/index",
         "like/index",
         "comment/index",
         "collect/index"
@@ -30,7 +29,9 @@
     {
       "root": "pagesHome",
       "pages": [
-        "article/index"
+        "article/index",
+        "info/index",
+        "type/index"
       ]
     }
   ],

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -32325,7 +32325,7 @@ var b = "development" === "development",
   T = S([]),
   P = "h5" === k ? "web" : "app-plus" === k ? "app" : k,
   A = S(undefined),
-  E = S(undefined) || [],
+  E = S([]) || [],
   O = true;
 var x = "";
 try {
@@ -39302,12 +39302,6 @@ var _default = {
       "style": {
         "navigationBarTitleText": "登录"
       }
-    }, {
-      "path": "type/index",
-      "style": {
-        "navigationBarTitleText": "分类",
-        "enablePullDownRefresh": true
-      }
     }, {
       "path": "like/index",
       "style": {
@@ -39363,6 +39357,17 @@ var _default = {
       "style": {
         "navigationBarTitleText": "文章详情"
       }
+    }, {
+      "path": "info/index",
+      "style": {
+        "navigationBarTitleText": "神鹿峰"
+      }
+    }, {
+      "path": "type/index",
+      "style": {
+        "navigationBarTitleText": "分类",
+        "enablePullDownRefresh": true
+      }
     }]
   }],
   "globalStyle": {

unpackage/dist/dev/mp-weixin/pages/home/index.js

@@ -298,10 +298,7 @@ var _default = {
           switch (_context.prev = _context.next) {
             case 0:
               that = this;
-              that.searchToken();
-              _context.next = 4;
-              return that.searchOther();
-            case 4:
+            case 1:
             case "end":
               return _context.stop();
           }
@@ -321,10 +318,14 @@ var _default = {
           switch (_context2.prev = _context2.next) {
             case 0:
               that = this;
-              that.clearPage();
+              that.searchToken();
               _context2.next = 4;
-              return that.search();
+              return that.searchOther();
             case 4:
+              that.clearPage();
+              _context2.next = 7;
+              return that.search();
+            case 7:
             case "end":
               return _context2.stop();
           }
@@ -417,7 +418,9 @@ var _default = {
     },
     // 点击模块
     toChange: function toChange(item) {
-      console.log(item);
+      uni.navigateTo({
+        url: "".concat(item.route, "?title=").concat(item.name)
+      });
     },
     // 查看更多公告
     toMore: function toMore() {

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -185,7 +185,7 @@ var _default = {
     searchConfig: function searchConfig() {
       var _this = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var that, res, url;
+        var that, res;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
@@ -197,9 +197,18 @@ var _default = {
                 res = _context2.sent;
                 if (res.errcode == '0') {
                   that.$set(that, "logoUrl", res.data.logo_url[0].url);
-                  url = "/pages/home/index";
-                  uni.reLaunch({
-                    url: url
+                  uni.setStorage({
+                    key: 'config',
+                    data: res.data,
+                    success: function success(res) {
+                      var url = "/pages/home/index";
+                      uni.reLaunch({
+                        url: url
+                      });
+                    },
+                    fail: function fail(err) {
+                      console.log(err);
+                    }
                   });
                 }
               case 5:

unpackage/dist/dev/mp-weixin/pagesHome/info/index.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "神鹿峰",
+  "usingComponents": {}
+}

unpackage/dist/dev/mp-weixin/pagesHome/info/index.wxml

@@ -0,0 +1 @@
+<view class="main">{{''+info+''}}</view>

unpackage/dist/dev/mp-weixin/pagesHome/info/index.wxss

@@ -0,0 +1,3 @@
+
+.main {}
+

unpackage/dist/dev/mp-weixin/pagesHome/type/index.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "分类",
+  "enablePullDownRefresh": true,
+  "usingComponents": {}
+}

unpackage/dist/dev/mp-weixin/pagesHome/type/index.wxml

@@ -0,0 +1 @@
+<view class="main">{{''+info+''}}</view>

unpackage/dist/dev/mp-weixin/pagesHome/type/index.wxss

@@ -0,0 +1,3 @@
+
+.main {}
+

unpackage/dist/dev/mp-weixin/pagesIndex/collect/index.wxss

@@ -66,4 +66,25 @@
 .main .one .title .title_2 .right text.data-v-5dd57b4c:first-child {
   padding: 0 1vw 0 0;
 }
+.scroll-view.data-v-5dd57b4c {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view.data-v-5dd57b4c {
+  display: flex;
+  flex-direction: column;
+}
+.is_bottom.data-v-5dd57b4c {
+  width: 100%;
+  text-align: center;
+}
+.is_bottom text.data-v-5dd57b4c {
+  padding: 2vw 0;
+  display: inline-block;
+  color: var(--f85Color);
+  font-size: var(--font14Size);
+}
 

unpackage/dist/dev/mp-weixin/pagesIndex/comment/index.json

@@ -1,5 +1,7 @@
 {
   "navigationBarTitleText": "评论",
   "enablePullDownRefresh": true,
-  "usingComponents": {}
+  "usingComponents": {
+    "tabs": "/components/tabs/index"
+  }
 }

unpackage/dist/dev/mp-weixin/pagesIndex/comment/index.wxss

@@ -1,3 +1,87 @@
-
-.main {}
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.main.data-v-6170914f {
+  display: flex;
+  flex-direction: column;
+  width: 100vw;
+  height: 100vh;
+}
+.main .one.data-v-6170914f {
+  background-color: var(--f9Color);
+  margin: 2vw 0 0 0;
+}
+.main .one .tabsList.data-v-6170914f {
+  position: relative;
+  width: 100vw;
+  height: 90vh;
+}
+.main .one .tabsList .list.data-v-6170914f {
+  background-color: var(--mainColor);
+  border: 1px solid var(--f5Color);
+  padding: 2vw;
+  margin: 2vw 2vw 0 2vw;
+  border-radius: 5px;
+  font-size: var(--font12Size);
+}
+.main .one .tabsList .list .list_1.data-v-6170914f {
+  padding: 1vw;
+}
+.main .one .tabsList .list .list_2.data-v-6170914f {
+  display: flex;
+  padding: 1vw;
+  border-radius: 5px;
+  border: 1px solid var(--f9Color);
+}
+.main .one .tabsList .list .list_2 .left.data-v-6170914f {
+  width: 15vw;
+}
+.main .one .tabsList .list .list_2 .left .image.data-v-6170914f {
+  width: 100%;
+  height: 15vw;
+}
+.main .one .tabsList .list .list_2 .right.data-v-6170914f {
+  padding: 2vw;
+  width: 75vw;
+}
+.main .one .tabsList .list .list_2 .right .right_1.data-v-6170914f {
+  font-size: var(--font14Size);
+  padding: 0 0 2px 0;
+}
+.main .one .tabsList .list .list_2 .right .right_2.data-v-6170914f {
+  padding: 0 0 2px 0;
+}
+.main .one .tabsList .list .list_2 .right .right_2 text.data-v-6170914f {
+  color: var(--f85Color);
+}
+.main .one .tabsList .list .button.data-v-6170914f {
+  text-align: center;
+  margin: 1vw 0 0 0;
+}
+.main .one .tabsList .list .button .button.data-v-6170914f {
+  background-color: var(--f3CColor);
+  color: var(--mainColor);
+  margin: 0 1vw 0 0;
+}
+.scroll-view.data-v-6170914f {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view.data-v-6170914f {
+  display: flex;
+  flex-direction: column;
+}
+.is_bottom.data-v-6170914f {
+  width: 100%;
+  text-align: center;
+}
+.is_bottom text.data-v-6170914f {
+  padding: 2vw 0;
+  display: inline-block;
+  color: var(--f85Color);
+  font-size: var(--font14Size);
+}
 

unpackage/dist/dev/mp-weixin/pagesIndex/like/index.js

@@ -202,7 +202,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 var _default = {
   data: function data() {
     return {
-      searchInfo: {},
       config: {},
       user: {},
       list: [],

unpackage/dist/dev/mp-weixin/pagesIndex/like/index.wxss

@@ -66,4 +66,25 @@
 .main .one .title .title_2 .right text.data-v-394fef7d:first-child {
   padding: 0 1vw 0 0;
 }
+.scroll-view.data-v-394fef7d {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view.data-v-394fef7d {
+  display: flex;
+  flex-direction: column;
+}
+.is_bottom.data-v-394fef7d {
+  width: 100%;
+  text-align: center;
+}
+.is_bottom text.data-v-394fef7d {
+  padding: 2vw 0;
+  display: inline-block;
+  color: var(--f85Color);
+  font-size: var(--font14Size);
+}
 

unpackage/dist/dev/mp-weixin/pagesMy/article/add.js

@@ -234,11 +234,11 @@ var _default = {
             case 0:
               that = this;
               that.$set(that, "id", e && e.id || '');
-              _context.next = 4;
+              that.searchToken();
+              _context.next = 5;
               return that.searchOther();
-            case 4:
+            case 5:
               that.search();
-              that.searchToken();
             case 6:
             case "end":
               return _context.stop();

unpackage/dist/dev/mp-weixin/pagesMy/article/index.wxss

@@ -24,21 +24,24 @@
   border-radius: 5px;
 }
 .main .two.data-v-730cc59c {
-  position: relative;
-  flex-grow: 1;
   background-color: var(--f9Color);
   margin: 2vw 0 0 0;
 }
-.main .two .pubuBox.data-v-730cc59c {
+.main .two .tabsList.data-v-730cc59c {
+  position: relative;
+  width: 100vw;
+  height: 82vh;
+}
+.main .two .tabsList .pubuBox.data-v-730cc59c {
   padding: 2vw;
 }
-.main .two .pubuItem.data-v-730cc59c {
+.main .two .tabsList .pubuItem.data-v-730cc59c {
   -webkit-column-count: 2;
           column-count: 2;
   -webkit-column-gap: 2vw;
           column-gap: 2vw;
 }
-.main .two .list.data-v-730cc59c {
+.main .two .tabsList .list.data-v-730cc59c {
   box-sizing: border-box;
   border-radius: 2vw;
   overflow: hidden;
@@ -49,13 +52,13 @@
   box-sizing: border-box;
   margin-bottom: 2vw;
 }
-.main .two .list image.data-v-730cc59c {
+.main .two .tabsList .list image.data-v-730cc59c {
   width: 100%;
 }
-.main .two .title.data-v-730cc59c {
+.main .two .tabsList .title.data-v-730cc59c {
   padding: 2vw;
 }
-.main .two .title .title_1.data-v-730cc59c {
+.main .two .tabsList .title .title_1.data-v-730cc59c {
   font-size: var(--font14Size);
   line-height: 4vw;
   text-overflow: -o-ellipsis-lastline;
@@ -68,27 +71,48 @@
   min-height: 6vw;
   max-height: 20vw;
 }
-.main .two .title .title_2.data-v-730cc59c {
+.main .two .tabsList .title .title_2.data-v-730cc59c {
   display: flex;
   justify-content: space-between;
   font-size: var(--font12Size);
   color: var(--f69Color);
   padding: 1vw 0;
 }
-.main .two .title .title_2 .right.data-v-730cc59c {
+.main .two .tabsList .title .title_2 .right.data-v-730cc59c {
   display: flex;
   align-items: center;
 }
-.main .two .title .title_2 .right text.data-v-730cc59c:first-child {
+.main .two .tabsList .title .title_2 .right text.data-v-730cc59c:first-child {
   padding: 0 1vw 0 0;
 }
-.main .two .button.data-v-730cc59c {
+.main .two .tabsList .button.data-v-730cc59c {
   text-align: center;
   margin: 0 0 1vw 0;
 }
-.main .two .button .button.data-v-730cc59c {
+.main .two .tabsList .button .button.data-v-730cc59c {
   background-color: var(--f3CColor);
   color: var(--mainColor);
   margin: 0 1vw 0 0;
 }
+.scroll-view.data-v-730cc59c {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view.data-v-730cc59c {
+  display: flex;
+  flex-direction: column;
+}
+.is_bottom.data-v-730cc59c {
+  width: 100%;
+  text-align: center;
+}
+.is_bottom text.data-v-730cc59c {
+  padding: 2vw 0;
+  display: inline-block;
+  color: var(--f85Color);
+  font-size: var(--font14Size);
+}
 

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -2,6 +2,8 @@
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "projectname": "travel_applet",
   "setting": {
-    "compileHotReLoad": true
+    "compileHotReLoad": true,
+    "bigPackageSizeSupport": true,
+    "urlCheck": false
   }
 }