修改特色美食

App.vue

@@ -94,6 +94,13 @@
 		height: 100vh;
 	}
 
+	.textOne {
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		-o-text-overflow: ellipsis;
+	}
+
 	.textOver {
 		overflow: hidden;
 		text-overflow: ellipsis;

pages/home/index.vue

@@ -173,7 +173,7 @@
 			// 点击模块
 			toChange(item) {
 				uni.navigateTo({
-					url: `${item.route}?title=${item.name}`,
+					url: `${item.route}?title=${item.name}&type=${item.type}`,
 				})
 			},
 			// 查看更多公告

pagesHome/article/index.vue

@@ -279,8 +279,6 @@
 						that.search()
 					}
 				}
-
-
 			},
 			// 发送
 			async toSend(content) {

pagesHome/type/index.vue

@@ -1,6 +1,28 @@
 <template>
 	<view class="main">
-		分类
+		<view class="one">
+			<input type="text" v-model="searchInfo.name" @input="toInput" placeholder="搜索名称">
+		</view>
+		<view class="two">
+			<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)">
+						<image class="image" :src="item.file&&item.file.length>0?item.file[0].url:''" mode="aspectFill">
+						</image>
+						<view class="list_1">
+							<view class="name textOver">{{ item.name ||'暂无'}}</view>
+							<view class="other other_1"><text>人均消费：</text>￥{{ item.money ||'暂无'}}</view>
+							<view class="other other_2"><text>营业时间：</text>{{ item.open_time||'暂无' }}</view>
+							<view class="other other_2"><text>联系电话：</text>{{ item.phone||'暂无' }}</view>
+							<view class="other other_2">{{ item.address ||'暂无'}}</view>
+						</view>
+					</view>
+					<view class="is_bottom" v-if="is_bottom">
+						<text>{{config.bottom_title}}</text>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
 	</view>
 </template>
 
@@ -8,16 +30,26 @@
 	export default {
 		data() {
 			return {
+				type: '',
+				searchInfo: {},
 				config: {},
 				user: {},
+				list: [],
+				total: 0,
+				skip: 0,
+				limit: 10,
+				page: 0,
+				// 数据是否触底
+				is_bottom: false,
+				scrollTop: 0,
 			}
 		},
 		onLoad: async function(e) {
 			const that = this;
+			that.$set(that, `type`, e && e.type || '');
 			uni.setNavigationBarTitle({
 				title: e && e.title || '分类'
 			});
-			await that.searchOther();
 			that.searchConfig();
 			that.searchToken();
 			that.search();
@@ -52,16 +84,171 @@
 			// 查询
 			async search() {
 				const that = this;
-				let res;
-
+				let info = {
+					skip: that.skip,
+					limit: that.limit,
+					is_use: '0',
+					type: that.type
+				}
+				const res = await that.$api(`/location`, '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,
+					});
+				}
 			},
-			async searchOther() {
+			// 输入框
+			toInput(e) {
 				const that = this;
-			}
+				if (that.searchInfo.name) that.$set(that.searchInfo, `name`, e.detail.value)
+				else that.$set(that, `searchInfo`, {})
+				that.clearPage();
+				that.search();
+			},
+			// 分页
+			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.searchComment();
+					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`, 10)
+				that.$set(that, `page`, 0)
+			},
 		}
 	}
 </script>
 
-<style>
-	.main {}
+<style lang="scss" scoped>
+	.main {
+		display: flex;
+		flex-direction: column;
+		width: 100vw;
+		height: 100vh;
+
+		.one {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			padding: 2vw;
+
+			input {
+				width: 100%;
+				padding: 2vw;
+				background-color: var(--f1Color);
+				font-size: var(--font14Size);
+				border-radius: 5px;
+			}
+		}
+
+		.two {
+			position: relative;
+			flex-grow: 1;
+			background-color: var(--f9Color);
+			margin: 2vw 0 0 0;
+
+			.list {
+				display: flex;
+				background-color: var(--mainColor);
+				border: 1px solid var(--f5Color);
+				padding: 2vw;
+				margin: 2vw 2vw 0 2vw;
+				border-radius: 5px;
+
+				.image {
+					width: 25vw;
+					height: 25vw;
+					border-radius: 5px;
+				}
+
+				.list_1 {
+					width: 63vw;
+					padding: 0 0 0 2vw;
+
+					.name {
+						font-size: var(--font14Size);
+						font-weight: bold;
+						padding: 0 0 1vw 0;
+					}
+
+					.other {
+						font-size: var(--font12Size);
+						padding: 0 0 2px 0;
+
+						text {
+							color: #000;
+						}
+					}
+
+					.other_1 {
+						color: red;
+					}
+
+					.other_2 {
+						color: var(--f85Color);
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+						-o-text-overflow: ellipsis;
+					}
+				}
+			}
+		}
+	}
+
+	.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/common/main.wxss

@@ -2412,6 +2412,12 @@
   width: 100vw;
   height: 100vh;
 }
+.textOne {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  -o-text-overflow: ellipsis;
+}
 .textOver {
   overflow: hidden;
   text-overflow: ellipsis;

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

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uniBadge: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-badge/components/uni-badge/uni-badge */ "uni_modules/uni-badge/components/uni-badge/uni-badge").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-badge/components/uni-badge/uni-badge.vue */ 318))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-badge/components/uni-badge/uni-badge */ "uni_modules/uni-badge/components/uni-badge/uni-badge").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-badge/components/uni-badge/uni-badge.vue */ 350))
     },
   }
 } catch (e) {

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

@@ -1,3 +1,89 @@
-
-.main {}
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.main.data-v-3031ac97 {
+  display: flex;
+  flex-direction: column;
+  width: 100vw;
+  height: 100vh;
+}
+.main .one.data-v-3031ac97 {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 2vw;
+}
+.main .one input.data-v-3031ac97 {
+  width: 100%;
+  padding: 2vw;
+  background-color: var(--f1Color);
+  font-size: var(--font14Size);
+  border-radius: 5px;
+}
+.main .two.data-v-3031ac97 {
+  position: relative;
+  flex-grow: 1;
+  background-color: var(--f9Color);
+  margin: 2vw 0 0 0;
+}
+.main .two .list.data-v-3031ac97 {
+  display: flex;
+  background-color: var(--mainColor);
+  border: 1px solid var(--f5Color);
+  padding: 2vw;
+  margin: 2vw 2vw 0 2vw;
+  border-radius: 5px;
+}
+.main .two .list .image.data-v-3031ac97 {
+  width: 25vw;
+  height: 25vw;
+  border-radius: 5px;
+}
+.main .two .list .list_1.data-v-3031ac97 {
+  width: 63vw;
+  padding: 0 0 0 2vw;
+}
+.main .two .list .list_1 .name.data-v-3031ac97 {
+  font-size: var(--font14Size);
+  font-weight: bold;
+  padding: 0 0 1vw 0;
+}
+.main .two .list .list_1 .other.data-v-3031ac97 {
+  font-size: var(--font12Size);
+  padding: 0 0 2px 0;
+}
+.main .two .list .list_1 .other text.data-v-3031ac97 {
+  color: #000;
+}
+.main .two .list .list_1 .other_1.data-v-3031ac97 {
+  color: red;
+}
+.main .two .list .list_1 .other_2.data-v-3031ac97 {
+  color: var(--f85Color);
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  -o-text-overflow: ellipsis;
+}
+.scroll-view.data-v-3031ac97 {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view.data-v-3031ac97 {
+  display: flex;
+  flex-direction: column;
+}
+.is_bottom.data-v-3031ac97 {
+  width: 100%;
+  text-align: center;
+}
+.is_bottom text.data-v-3031ac97 {
+  padding: 2vw 0;
+  display: inline-block;
+  color: var(--f85Color);
+  font-size: var(--font14Size);
+}
 

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

@@ -1 +0,0 @@
-Component({})

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

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

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

@@ -1 +0,0 @@
-<view class="main">系统首页</view>

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

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

unpackage/dist/dev/mp-weixin/pagesMy/account/index.js

@@ -146,7 +146,7 @@ var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime
 var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 32));
 var upload = function upload() {
   __webpack_require__.e(/*! require.ensure | components/upload/index */ "components/upload/index").then((function () {
-    return resolve(__webpack_require__(/*! ../../components/upload/index.vue */ 364));
+    return resolve(__webpack_require__(/*! ../../components/upload/index.vue */ 396));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

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

@@ -101,16 +101,16 @@ var components
 try {
   components = {
     uniForms: function () {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 325))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 357))
     },
     uniFormsItem: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 338))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 370))
     },
     uniEasyinput: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 345))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 377))
     },
     uniDataSelect: function () {
-      return Promise.all(/*! import() | uni_modules/uni-data-select/components/uni-data-select/uni-data-select */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-select/components/uni-data-select/uni-data-select")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue */ 352))
+      return Promise.all(/*! import() | uni_modules/uni-data-select/components/uni-data-select/uni-data-select */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-select/components/uni-data-select/uni-data-select")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue */ 384))
     },
   }
 } catch (e) {
@@ -183,7 +183,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 var upload = function upload() {
   __webpack_require__.e(/*! require.ensure | components/upload/index */ "components/upload/index").then((function () {
-    return resolve(__webpack_require__(/*! ../../components/upload/index.vue */ 364));
+    return resolve(__webpack_require__(/*! ../../components/upload/index.vue */ 396));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

unpackage/dist/dev/mp-weixin/pagesMy/opinion/index.js

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     uniForms: function () {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 325))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 357))
     },
     uniFormsItem: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 338))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 370))
     },
     uniEasyinput: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 345))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 377))
     },
   }
 } catch (e) {
@@ -176,7 +176,7 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/r
 var _toConsumableArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/toConsumableArray */ 18));
 var upload = function upload() {
   __webpack_require__.e(/*! require.ensure | components/upload/index */ "components/upload/index").then((function () {
-    return resolve(__webpack_require__(/*! ../../components/upload/index.vue */ 364));
+    return resolve(__webpack_require__(/*! ../../components/upload/index.vue */ 396));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {