修改特色美食

config.js

@@ -18,25 +18,25 @@ export default {
 			icon: "icon-weibiaoti2fuzhi04",
 			title: "待付款",
 			status: "0",
-			route: "pagesMy/order/index",
+			route: "pagesIndex/order/index",
 		},
 		{
 			icon: "icon-daishiyong",
 			title: "待使用",
 			status: "1",
-			route: "pagesMy/order/index",
+			route: "pagesIndex/order/index",
 		},
 		{
 			icon: "icon-daipingjia",
 			title: "待评价",
 			status: "2",
-			route: "pagesMy/order/index",
+			route: "pagesIndex/order/index",
 		},
 		{
 			icon: "icon-shouhou",
 			title: "退款/售后",
 			status: "5",
-			route: "pagesMy/order/index",
+			route: "pagesIndex/order/index",
 		}
 	],
 	menuList: [{

pages.json

@@ -61,6 +61,13 @@
 						"navigationBarTitleText": "收藏",
 						"enablePullDownRefresh": true
 					}
+				},
+				{
+					"path": "order/index",
+					"style": {
+						"navigationBarTitleText": "我的订单",
+						"enablePullDownRefresh": true
+					}
 				}
 			]
 		},
@@ -121,6 +128,19 @@
 						"navigationBarTitleText": "分类",
 						"enablePullDownRefresh": true
 					}
+				},
+				{
+					"path": "notice/index",
+					"style": {
+						"navigationBarTitleText": "公告",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "notice/detail",
+					"style": {
+						"navigationBarTitleText": "公告详情"
+					}
 				}
 			]
 		}

pages/home/index.vue

@@ -178,7 +178,9 @@
 			},
 			// 查看更多公告
 			toMore() {
-				console.log('公告')
+				uni.navigateTo({
+					url: `/pagesHome/notice/index`,
+				})
 			},
 			// 查看详情
 			toInfo(item) {

pages/my/index.vue

@@ -24,7 +24,7 @@
 		<view class="two">
 			<view class="two_1">
 				<view class="left">我的订单</view>
-				<view class="right" @tap="toCommon(`pagesMy/order/index`)">查看全部订单 <text
+				<view class="right" @tap="toCommon(`pagesIndex/order/index`)">查看全部订单 <text
 						class="iconfont icon-dayuhao"></text></view>
 			</view>
 			<view class="two_2">

pagesHome/info/index.vue

@@ -1,6 +1,44 @@
 <template>
 	<view class="main">
-		{{info}}
+		<view class="one" v-if="info.file.length>0">
+			<swiper class="swiper" circular :indicator-dots="true" indicator-color="#F5F5F5"
+				indicator-active-color="#ffffff" :autoplay="true" :interval="3000" :duration="1000">
+				<swiper-item class="list" v-for="(item,index) in info.file" :key="index">
+					<image class="image" :src="item.url" mode="">
+					</image>
+				</swiper-item>
+			</swiper>
+		</view>
+		<view class="bottom">
+			<view class="two">
+				<view class="two_1">{{info.name}}</view>
+				<view class="two_2">{{info.open_time}}</view>
+			</view>
+			<view class="thr">
+				<view class="thr_1">
+					<view class="left">地址：</view>
+					<view class="right"><text :user-select='true'>{{info.address}}</text></view>
+				</view>
+				<view class="thr_1">
+					<view class="left">状态：</view>
+					<view class="right">
+						<text :class="[info.status=='0'?'text_1':'text_2']">{{info.zhStatus}}</text>
+					</view>
+				</view>
+				<view class="thr_1">
+					<view class="left">官方电话：</view>
+					<view class="right"><text :user-select='true'>{{info.phone}}</text></view>
+				</view>
+			</view>
+			<view class="four" v-if="info.policy">
+				<view class="four_1">优待政策</view>
+				<rich-text :nodes="formatRichText(info.policy)"></rich-text>
+			</view>
+			<view class="four">
+				<view class="four_1">简介</view>
+				<rich-text :nodes="formatRichText(info.brief)"></rich-text>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -9,7 +47,11 @@
 		data() {
 			return {
 				user: {},
-				info: {},
+				info: {
+					file: []
+				},
+				// 字典表
+				statusList: []
 			}
 		},
 		onLoad: async function(e) {
@@ -26,7 +68,9 @@
 				const that = this;
 				try {
 					const res = uni.getStorageSync('token');
-					if (res) that.$set(that, `user`, res);
+					if (res) {
+						that.$set(that, `user`, res);
+					}
 				} catch (e) {
 					uni.showToast({
 						title: err.errmsg,
@@ -35,12 +79,12 @@
 					});
 				}
 			},
-			// 查询
 			async search() {
 				const that = this;
-				let res;
-				res = await that.$api(`/config`, 'GET', {})
+				const res = await that.$api(`/config`, 'GET', {})
 				if (res.errcode == '0') {
+					const status = that.statusList.find(i => i.value == res.data.status)
+					if (status) res.data.zhStatus = status.label
 					that.$set(that, `info`, res.data)
 				} else {
 					uni.showToast({
@@ -48,13 +92,114 @@
 					});
 				}
 			},
+			// 处理富文本
+			formatRichText(html) {
+				// 富文本内容格式化
+				return html && html.replace(/<img[^>]*>/gi, function(match, capture) {
+					// 查找所有的 img 元素
+					return match.replace(/style=".*"/gi, '').replace(/style='.*'/gi,
+						'')
+					// 删除找到的所有 img 元素中的 style 属性
+				}).replace(/\<img/gi, '<img style="width:100%;"') // 对 img 元素增加 style 属性，并设置宽度为 100%
+			},
+			// 查询其他信息
 			async searchOther() {
 				const that = this;
-			}
+				let res;
+				// 查询类型
+				res = await that.$api(`/dictData`, 'GET', {
+					type: 'config_status',
+					is_use: '0',
+				})
+				if (res.errcode == '0') that.$set(that, `statusList`, res.data);
+			},
 		}
 	}
 </script>
 
-<style>
-	.main {}
+<style lang="scss" scoped>
+	.main {
+		.one {
+			.swiper {
+				height: 70vw;
+
+				.list {
+					.image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+			}
+		}
+
+		.bottom {
+			position: absolute;
+			top: 65vw;
+			left: 0;
+			right: 0;
+			background-color: var(--mainColor);
+			border-radius: 20px;
+			padding: 2vw 0 0 0;
+
+			.two {
+				padding: 4vw 2vw;
+				text-align: center;
+
+				.two_1 {
+					padding: 1vw 0;
+					font-weight: bold;
+					font-size: var(--font16Size);
+				}
+
+				.two_2 {
+					color: var(--f85Color);
+					font-size: var(--font12Size);
+				}
+
+			}
+
+			.thr {
+				padding: 2vw;
+
+				.thr_1 {
+					display: flex;
+					font-size: var(--font14Size);
+					padding: 0 0 1vw 0;
+
+					.left {
+						padding: 0 1vw 0 0;
+						font-weight: bold;
+					}
+
+					.right {
+						color: var(--f85Color);
+
+						.text_1 {
+							font-size: var(--font12Size);
+							padding: 3px 5px;
+							color: var(--mainColor);
+							background-color: mediumseagreen;
+						}
+
+						.text_2 {
+							font-size: var(--font12Size);
+							padding: 3px 5px;
+							color: var(--mainColor);
+							background-color: red;
+						}
+					}
+				}
+			}
+
+			.four {
+				padding: 2vw;
+
+				.four_1 {
+					font-weight: bold;
+					font-size: var(--font16Size);
+					padding: 0 0 1vw 0;
+				}
+			}
+		}
+	}
 </style>

pagesHome/notice/detail.vue

@@ -0,0 +1,114 @@
+<template>
+	<view class="main">
+		<view class="one">
+			<view class="one_1">{{info.name}}</view>
+			<view class="one_2">{{info.create_time}}</view>
+		</view>
+		<view class="two" v-if="info.file.length>0">
+			<swiperImg :imgsList='info.file'></swiperImg>
+		</view>
+		<view class="thr">
+			<rich-text :nodes="formatRichText(info.content)"></rich-text>
+		</view>
+	</view>
+</template>
+
+<script>
+	import swiperImg from '../../components/swiper/index.vue';
+	export default {
+		components: {
+			swiperImg
+		},
+		data() {
+			return {
+				id: '',
+				user: {},
+				info: {
+					file: []
+				},
+			}
+		},
+		onLoad: async function(e) {
+			const that = this;
+			that.$set(that, `id`, e && e.id || '');
+			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;
+				if (that.id) {
+					const res = await that.$api(`/notice/${that.id}`, 'GET', {})
+					if (res.errcode == '0') {
+						that.$set(that, `info`, res.data)
+					} else {
+						uni.showToast({
+							title: res.errmsg,
+						});
+					}
+				}
+			},
+			// 处理富文本
+			formatRichText(html) {
+				// 富文本内容格式化
+				return html && html.replace(/<img[^>]*>/gi, function(match, capture) {
+					// 查找所有的 img 元素
+					return match.replace(/style=".*"/gi, '').replace(/style='.*'/gi,
+						'')
+					// 删除找到的所有 img 元素中的 style 属性
+				}).replace(/\<img/gi, '<img style="width:100%;"') // 对 img 元素增加 style 属性，并设置宽度为 100%
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.main {
+
+		.one {
+			padding: 4vw 2vw;
+			text-align: center;
+
+			.one_1 {
+				padding: 1vw 0;
+				font-weight: bold;
+				font-size: var(--font16Size);
+			}
+
+			.one_2 {
+				color: var(--f85Color);
+				font-size: var(--font12Size);
+			}
+
+		}
+
+		.two {
+			text-align: center;
+			padding: 2vw;
+
+			.image {
+				width: 50vw;
+				height: 50vw;
+			}
+		}
+
+		.thr {
+			padding: 2vw;
+		}
+	}
+</style>

pagesHome/notice/index.vue

@@ -0,0 +1,213 @@
+<template>
+	<view class="main">
+		<view class="one">
+			<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" @tap="toInfo(item)">
+						<view class="list_1 textOver">{{item.name}}</view>
+						<view class="list_2">
+							<view class="time"><text>发布时间：</text>{{item.create_time||'暂无'}}
+							</view>
+						</view>
+					</view>
+					<view class="is_bottom" v-if="is_bottom">
+						<text>{{config.bottom_title}}</text>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				config: {},
+				user: {},
+				list: [],
+				total: 0,
+				skip: 0,
+				limit: 15,
+				page: 0,
+				// 数据是否触底
+				is_bottom: false,
+				scrollTop: 0,
+			}
+		},
+		onLoad: async function(e) {
+			const that = this;
+			that.searchToken();
+			that.searchConfig();
+		},
+		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;
+				if (!that.user._id) return
+				let info = {
+					skip: that.skip,
+					limit: that.limit,
+					is_use: '0'
+				}
+				const res = await that.$api(`/notice`, '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,
+					});
+				}
+			},
+			// 查看详情
+			toInfo(item) {
+				uni.navigateTo({
+					url: `/pagesHome/notice/detail?id=${item.id||item._id}`
+				})
+			},
+			// 分页
+			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)
+			},
+			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`, 15)
+				that.$set(that, `page`, 0)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.main {
+		display: flex;
+		flex-direction: column;
+		width: 100vw;
+		height: 100vh;
+
+		.one {
+			position: relative;
+			flex-grow: 1;
+			background-color: var(--f9Color);
+			margin: 2vw 0 0 0;
+
+			.list {
+				background-color: var(--mainColor);
+				border: 1px solid var(--f5Color);
+				padding: 2vw;
+				margin: 2vw 2vw 0 2vw;
+				border-radius: 5px;
+
+				.list_1 {
+					padding: 2vw;
+					font-weight: bold;
+					font-size: var(--font16Size);
+				}
+
+				.list_2 {
+					padding: 2vw;
+					font-size: var(--font12Size);
+					text-align: right;
+
+					.time {
+						padding: 0 0 2px 0;
+
+						text {
+							color: var(--f85Color);
+						}
+					}
+				}
+			}
+		}
+	}
+
+	.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>

pagesHome/type/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="main">
-		{{info}}
+		分类
 	</view>
 </template>
 

pagesIndex/collect/index.vue

@@ -37,7 +37,6 @@
 	export default {
 		data() {
 			return {
-				searchInfo: {},
 				config: {},
 				user: {},
 				list: [],
@@ -54,7 +53,6 @@
 			const that = this;
 			that.searchToken();
 			that.searchConfig();
-			await that.searchOther();
 		},
 		onShow: async function() {
 			const that = this;
@@ -133,10 +131,6 @@
 					that.search()
 				}
 			},
-			async searchOther() {
-				const that = this;
-				let res;
-			},
 			// 分页
 			toPage(e) {
 				const that = this;

pagesIndex/like/index.vue

@@ -53,7 +53,6 @@
 			const that = this;
 			that.searchToken();
 			that.searchConfig();
-			await that.searchOther();
 		},
 		onShow: async function() {
 			const that = this;
@@ -132,10 +131,6 @@
 					that.search()
 				}
 			},
-			async searchOther() {
-				const that = this;
-				let res;
-			},
 			// 分页
 			toPage(e) {
 				const that = this;

pagesIndex/order/index.vue

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

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

@@ -13,7 +13,8 @@
         "login/index",
         "like/index",
         "comment/index",
-        "collect/index"
+        "collect/index",
+        "order/index"
       ]
     },
     {
@@ -31,7 +32,9 @@
       "pages": [
         "article/index",
         "info/index",
-        "type/index"
+        "type/index",
+        "notice/index",
+        "notice/detail"
       ]
     }
   ],

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

@@ -10188,22 +10188,22 @@ var _default = {
     icon: "icon-weibiaoti2fuzhi04",
     title: "待付款",
     status: "0",
-    route: "pagesMy/order/index"
+    route: "pagesIndex/order/index"
   }, {
     icon: "icon-daishiyong",
     title: "待使用",
     status: "1",
-    route: "pagesMy/order/index"
+    route: "pagesIndex/order/index"
   }, {
     icon: "icon-daipingjia",
     title: "待评价",
     status: "2",
-    route: "pagesMy/order/index"
+    route: "pagesIndex/order/index"
   }, {
     icon: "icon-shouhou",
     title: "退款/售后",
     status: "5",
-    route: "pagesMy/order/index"
+    route: "pagesIndex/order/index"
   }],
   menuList: [{
     icon: "icon-fabu",
@@ -39320,6 +39320,12 @@ var _default = {
         "navigationBarTitleText": "收藏",
         "enablePullDownRefresh": true
       }
+    }, {
+      "path": "order/index",
+      "style": {
+        "navigationBarTitleText": "我的订单",
+        "enablePullDownRefresh": true
+      }
     }]
   }, {
     "root": "pagesMy",
@@ -39368,6 +39374,17 @@ var _default = {
         "navigationBarTitleText": "分类",
         "enablePullDownRefresh": true
       }
+    }, {
+      "path": "notice/index",
+      "style": {
+        "navigationBarTitleText": "公告",
+        "enablePullDownRefresh": true
+      }
+    }, {
+      "path": "notice/detail",
+      "style": {
+        "navigationBarTitleText": "公告详情"
+      }
     }]
   }],
   "globalStyle": {

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

@@ -424,7 +424,9 @@ var _default = {
     },
     // 查看更多公告
     toMore: function toMore() {
-      console.log('公告');
+      uni.navigateTo({
+        url: "/pagesHome/notice/index"
+      });
     },
     // 查看详情
     toInfo: function toInfo(item) {

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

@@ -1,3 +1,68 @@
-
-.main {}
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.main .one .swiper.data-v-7ff17dea {
+  height: 70vw;
+}
+.main .one .swiper .list .image.data-v-7ff17dea {
+  width: 100%;
+  height: 100%;
+}
+.main .bottom.data-v-7ff17dea {
+  position: absolute;
+  top: 65vw;
+  left: 0;
+  right: 0;
+  background-color: var(--mainColor);
+  border-radius: 20px;
+  padding: 2vw 0 0 0;
+}
+.main .bottom .two.data-v-7ff17dea {
+  padding: 4vw 2vw;
+  text-align: center;
+}
+.main .bottom .two .two_1.data-v-7ff17dea {
+  padding: 1vw 0;
+  font-weight: bold;
+  font-size: var(--font16Size);
+}
+.main .bottom .two .two_2.data-v-7ff17dea {
+  color: var(--f85Color);
+  font-size: var(--font12Size);
+}
+.main .bottom .thr.data-v-7ff17dea {
+  padding: 2vw;
+}
+.main .bottom .thr .thr_1.data-v-7ff17dea {
+  display: flex;
+  font-size: var(--font14Size);
+  padding: 0 0 1vw 0;
+}
+.main .bottom .thr .thr_1 .left.data-v-7ff17dea {
+  padding: 0 1vw 0 0;
+  font-weight: bold;
+}
+.main .bottom .thr .thr_1 .right.data-v-7ff17dea {
+  color: var(--f85Color);
+}
+.main .bottom .thr .thr_1 .right .text_1.data-v-7ff17dea {
+  font-size: var(--font12Size);
+  padding: 3px 5px;
+  color: var(--mainColor);
+  background-color: mediumseagreen;
+}
+.main .bottom .thr .thr_1 .right .text_2.data-v-7ff17dea {
+  font-size: var(--font12Size);
+  padding: 3px 5px;
+  color: var(--mainColor);
+  background-color: red;
+}
+.main .bottom .four.data-v-7ff17dea {
+  padding: 2vw;
+}
+.main .bottom .four .four_1.data-v-7ff17dea {
+  font-weight: bold;
+  font-size: var(--font16Size);
+  padding: 0 0 1vw 0;
+}
 

unpackage/dist/dev/mp-weixin/pagesHome/notice/detail.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "公告详情",
+  "usingComponents": {
+    "swiper-img": "/components/swiper/index"
+  }
+}

unpackage/dist/dev/mp-weixin/pagesHome/notice/detail.wxss

@@ -0,0 +1,28 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.main .one.data-v-22fd37fe {
+  padding: 4vw 2vw;
+  text-align: center;
+}
+.main .one .one_1.data-v-22fd37fe {
+  padding: 1vw 0;
+  font-weight: bold;
+  font-size: var(--font16Size);
+}
+.main .one .one_2.data-v-22fd37fe {
+  color: var(--f85Color);
+  font-size: var(--font12Size);
+}
+.main .two.data-v-22fd37fe {
+  text-align: center;
+  padding: 2vw;
+}
+.main .two .image.data-v-22fd37fe {
+  width: 50vw;
+  height: 50vw;
+}
+.main .thr.data-v-22fd37fe {
+  padding: 2vw;
+}
+

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

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "公告",
+  "enablePullDownRefresh": true,
+  "usingComponents": {}
+}

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

@@ -0,0 +1,60 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.main.data-v-46899e35 {
+  display: flex;
+  flex-direction: column;
+  width: 100vw;
+  height: 100vh;
+}
+.main .one.data-v-46899e35 {
+  position: relative;
+  flex-grow: 1;
+  background-color: var(--f9Color);
+  margin: 2vw 0 0 0;
+}
+.main .one .list.data-v-46899e35 {
+  background-color: var(--mainColor);
+  border: 1px solid var(--f5Color);
+  padding: 2vw;
+  margin: 2vw 2vw 0 2vw;
+  border-radius: 5px;
+}
+.main .one .list .list_1.data-v-46899e35 {
+  padding: 2vw;
+  font-weight: bold;
+  font-size: var(--font16Size);
+}
+.main .one .list .list_2.data-v-46899e35 {
+  padding: 2vw;
+  font-size: var(--font12Size);
+  text-align: right;
+}
+.main .one .list .list_2 .time.data-v-46899e35 {
+  padding: 0 0 2px 0;
+}
+.main .one .list .list_2 .time text.data-v-46899e35 {
+  color: var(--f85Color);
+}
+.scroll-view.data-v-46899e35 {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view.data-v-46899e35 {
+  display: flex;
+  flex-direction: column;
+}
+.is_bottom.data-v-46899e35 {
+  width: 100%;
+  text-align: center;
+}
+.is_bottom text.data-v-46899e35 {
+  padding: 2vw 0;
+  display: inline-block;
+  color: var(--f85Color);
+  font-size: var(--font14Size);
+}
+

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

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

unpackage/dist/dev/mp-weixin/pagesIndex/collect/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: [],
@@ -225,9 +224,7 @@ var _default = {
               that = this;
               that.searchToken();
               that.searchConfig();
-              _context.next = 5;
-              return that.searchOther();
-            case 5:
+            case 3:
             case "end":
               return _context.stop();
           }
@@ -388,23 +385,6 @@ var _default = {
         }, _callee5);
       }))();
     },
-    searchOther: function searchOther() {
-      var _this3 = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6() {
-        var that, res;
-        return _regenerator.default.wrap(function _callee6$(_context6) {
-          while (1) {
-            switch (_context6.prev = _context6.next) {
-              case 0:
-                that = _this3;
-              case 1:
-              case "end":
-                return _context6.stop();
-            }
-          }
-        }, _callee6);
-      }))();
-    },
     // 分页
     toPage: function toPage(e) {
       var that = this;

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

@@ -224,9 +224,7 @@ var _default = {
               that = this;
               that.searchToken();
               that.searchConfig();
-              _context.next = 5;
-              return that.searchOther();
-            case 5:
+            case 3:
             case "end":
               return _context.stop();
           }
@@ -387,23 +385,6 @@ var _default = {
         }, _callee5);
       }))();
     },
-    searchOther: function searchOther() {
-      var _this3 = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6() {
-        var that, res;
-        return _regenerator.default.wrap(function _callee6$(_context6) {
-          while (1) {
-            switch (_context6.prev = _context6.next) {
-              case 0:
-                that = _this3;
-              case 1:
-              case "end":
-                return _context6.stop();
-            }
-          }
-        }, _callee6);
-      }))();
-    },
     // 分页
     toPage: function toPage(e) {
       var that = this;

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

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "我的订单",
+  "enablePullDownRefresh": true,
+  "usingComponents": {}
+}

unpackage/dist/dev/mp-weixin/pagesIndex/order/index.wxml

@@ -0,0 +1 @@
+<view class="main">订单</view>

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

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