筛选修改

src/components/tab/index.vue

@@ -1,64 +0,0 @@
-<template>
-  <view>
-    <view class="tabs">
-      <view class="tab" :class="{ active: currentIndex === index }" v-for="(item, index) in navList" :key="index"
-        @tap="onClickNav(index)">
-        <view class="name-item">{{ item.name }}</view>
-      </view>
-    </view>
-    <slot :name="navList[currentIndex].name"></slot>
-  </view>
-</template>
-
-<script>
-export default {
-  props: {
-    navList: {
-      type: Array,
-      default() {
-        return [];
-      },
-    },
-  },
-  data() {
-    return {
-      currentIndex: 0,
-    };
-  },
-  methods: {
-    onClickNav(index) {
-      this.currentIndex = index;
-    },
-  },
-};
-</script>
-
-<style scoped lang="scss">
-.tabs {
-  display: flex;
-  justify-content: space-around;
-  font-size: 28rpx;
-  color: #ffffff;
-  background-color: #347caf;
-
-  .name-item {
-    padding: 20rpx 0;
-    color: #ffffff;
-  }
-}
-
-.active {
-  font-weight: bold;
-  position: relative;
-
-  .name-item::after {
-    content: '';
-    height: 2px;
-    width: 100%;
-    background-color: #ffffff;
-    position: absolute;
-    bottom: 0;
-    left: 0;
-  }
-}
-</style>

src/pages.json

@@ -1,371 +1,175 @@
-{
-  "easycom": {
-    "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
-  },
-  "pages": [{
-      "path": "pages/index",
-      "style": {
-        "navigationBarTitleText": "首页",
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/tabbar/home/index",
-      "style": {
-        "navigationBarTitleText": "首页",
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/tabbar/community/index",
-      "style": {
-        "navigationBarTitleText": "社区",
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/tabbar/message/index",
-      "style": {
-        "navigationBarTitleText": "消息",
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/tabbar/mine/index",
-      "style": {
-        "navigationBarTitleText": "我的"
-      }
-    },
-    {
-      "path": "pages/login/index",
-      "style": {
-        "navigationBarTitleText": "登录"
-      }
-    },
-    {
-      "path": "pages/login/phoneLogin",
-      "style": {
-        "navigationBarTitleText": "手机验证"
-      }
-    }
-  ],
-  "subPackages": [{
-      "root": "pages/client",
-      "pages": [{
-          "path": "CommunitySearch/index",
-          "style": {
-            "navigationBarTitleText": "社区搜索"
-          }
-        },
-        {
-          "path": "allComments/index",
-          "style": {
-            "navigationBarTitleText": "全部评论"
-          }
-        },
-        {
-          "path": "checkIn/index",
-          "style": {
-            "navigationBarTitleText": "每日签到"
-          }
-        },
-        {
-          "path": "search/index",
-          "style": {
-            "navigationBarTitleText": "搜索"
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/business",
-      "pages": [{
-          "path": "detail/index",
-          "style": {
-            "navigationBarTitleText": "商家详情"
-          }
-        },
-        {
-          "path": "buy/index",
-          "style": {
-            "navigationBarTitleText": "提交订单"
-          }
-        },
-        {
-          "path": "hot/index",
-          "style": {
-            "navigationBarTitleText": "热门推荐"
-          }
-        },
-        {
-          "path": "nearby/index",
-          "style": {
-            "navigationBarTitleText": "附近商家"
-          }
-        },
-        {
-          "path": "service/index",
-          "style": {
-            "navigationBarTitleText": "服务详情"
-          }
-        },
-        {
-          "path": "classify/index",
-          "style": {
-            "navigationBarTitleText": "养车"
-          }
-        },
-        {
-          "path": "classfication/classfication",
-          "style": {
-            "navigationBarTitleText": "分类"
-          }
-        }, {
-          "path": "listpage/index",
-          "style": {
-            "navigationBarTitleText": "商家列表页",
-            "enablePullDownRefresh": false
-          }
-
-        }
-      ]
-    },
-    {
-      "root": "pages/points",
-      "pages": [{
-          "path": "myPoints/index",
-          "style": {
-            "navigationBarTitleText": "我的积分"
-          }
-        },
-        {
-          "path": "checkIn/index",
-          "style": {
-            "navigationBarTitleText": "每日签到"
-          }
-        },
-        {
-          "path": "detail/index",
-          "style": {
-            "navigationBarTitleText": "积分说明"
-          }
-        },
-        {
-          "path": "instructions/index",
-          "style": {
-            "navigationBarTitleText": "积分明细"
-          }
-        },
-        {
-          "path": "withdraw/index",
-          "style": {
-            "navigationBarTitleText": "积分提现"
-          }
-        },
-        {
-          "path": "activity/index",
-          "style": {
-            "navigationBarTitleText": "积分活动"
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/message",
-      "pages": [{
-          "path": "evaluate/index",
-          "style": {
-            "navigationBarTitleText": "评价通知"
-          }
-        },
-        {
-          "path": "favorable/index",
-          "style": {
-            "navigationBarTitleText": "优惠福利"
-          }
-        },
-        {
-          "path": "order/index",
-          "style": {
-            "navigationBarTitleText": "订单通知"
-          }
-        },
-        {
-          "path": "payment/index",
-          "style": {
-            "navigationBarTitleText": "付款"
-          }
-        },
-        {
-          "path": "info/index",
-          "style": {
-            "navigationBarTitleText": "私信"
-          }
-        },
-        {
-          "path": "upvote/index",
-          "style": {
-            "navigationBarTitleText": "点赞回复"
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/pointMethod",
-      "pages": [{
-          "path": "foren/index",
-          "style": {
-            "navigationBarTitleText": "发帖"
-          }
-        },
-        {
-          "path": "consume/index",
-          "style": {
-            "navigationBarTitleText": "消费"
-          }
-        },
-        {
-          "path": "comment/index",
-          "style": {
-            "navigationBarTitleText": "点评"
-          }
-        },
-        {
-          "path": "share/index",
-          "style": {
-            "navigationBarTitleText": "分享"
-          }
-        },
-        {
-          "path": "recover/index",
-          "style": {
-            "navigationBarTitleText": "回帖"
-          }
-        },
-        {
-          "path": "advertise/index",
-          "style": {
-            "navigationBarTitleText": "广告"
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/community",
-      "pages": [{
-          "path": "commDetail/index",
-          "style": {
-            "navigationBarTitleText": "社区详情"
-          }
-        },
-        {
-          "path": "commSearch/index",
-          "style": {
-            "navigationBarTitleText": "搜索"
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/my",
-      "pages": [{
-          "path": "collect/index",
-          "style": {
-            "navigationBarTitleText": "我的收藏"
-          }
-        },
-        {
-          "path": "appoint/index",
-          "style": {
-            "navigationBarTitleText": "预约列表"
-          }
-        },
-        {
-          "path": "appointDetail/index",
-          "style": {
-            "navigationBarTitleText": "预约详情"
-          }
-        },
-        {
-          "path": "coupon/index",
-          "style": {
-            "navigationBarTitleText": "优惠券"
-          }
-        },
-        {
-          "path": "inquiry/index",
-          "style": {
-            "navigationBarTitleText": "询价"
-          }
-        },
-        {
-          "path": "score/index",
-          "style": {
-            "navigationBarTitleText": "我的积分"
-          }
-        },
-        {
-          "path": "myOrder/index",
-          "style": {
-            "navigationBarTitleText": "我的订单"
-          }
-        },
-        {
-          "path": "personalCenter/index",
-          "style": {
-            "navigationBarTitleText": "个人中心"
-          }
-        },
-        {
-          "path": "editData/index",
-          "style": {
-            "navigationBarTitleText": "编辑资料"
-          }
-        },
-        {
-          "path": "settings/index",
-          "style": {
-            "navigationBarTitleText": "设置"
-          }
-        }
-      ]
-    }
-  ],
-  "tabBar": {
-    "color": "#999999",
-    "selectedColor": "#42b2fa",
-    "borderStyle": "black",
-    "backgroundColor": "#ffffff",
-    "list": [{
-        "text": "首页",
-        "pagePath": "pages/tabbar/home/index",
-        "iconPath": "static/images/home.png",
-        "selectedIconPath": "static/images/home-select.png"
-      },
-      {
-        "pagePath": "pages/tabbar/community/index",
-        "text": "社区",
-        "iconPath": "static/images/community.png",
-        "selectedIconPath": "static/images/community-select.png"
-      },
-      {
-        "pagePath": "pages/tabbar/message/index",
-        "text": "消息",
-        "iconPath": "static/images/message.png",
-        "selectedIconPath": "static/images/message-select.png"
-      },
-      {
-        "pagePath": "pages/tabbar/mine/index",
-        "text": "我的",
-        "iconPath": "static/images/mine.png",
-        "selectedIconPath": "static/images/mine-select.png"
-      }
-    ]
-  },
-  "globalStyle": {
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "uni-app",
-    "navigationBarBackgroundColor": "#F8F8F8",
-    "backgroundColor": "#F8F8F8"
-  }
-}
+{
+  "easycom": {
+    "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
+  },
+  "pages": [
+    {
+      "path": "pages/index",
+      "style": {
+        "navigationBarTitleText": "开屏广告",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/tabbar/home/index",
+      "style": {
+        "navigationBarTitleText": "首页",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/tabbar/community/index",
+      "style": {
+        "navigationBarTitleText": "社区",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/tabbar/message/index",
+      "style": {
+        "navigationBarTitleText": "消息",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/tabbar/mine/index",
+      "style": {
+        "navigationBarTitleText": "我的"
+      }
+    },
+    {
+      "path": "pages/login/index",
+      "style": {
+        "navigationBarTitleText": "登录"
+      }
+    },
+    {
+      "path": "pages/login/phoneLogin",
+      "style": {
+        "navigationBarTitleText": "手机验证"
+      }
+    }
+  ],
+  "subPackages": [
+    {
+      "root": "pages/business",
+      "pages": [
+        {
+          "path": "category",
+          "style": {
+            "navigationBarTitleText": "商家分类"
+          }
+        },
+        {
+          "path": "list",
+          "style": {
+            "navigationBarTitleText": "商家列表"
+          }
+        },
+        {
+          "path": "detail",
+          "style": {
+            "navigationBarTitleText": "商家详情"
+          }
+        },
+        {
+          "path": "service/list",
+          "style": {
+            "navigationBarTitleText": "服务列表"
+          }
+        },
+        {
+          "path": "service/detail",
+          "style": {
+            "navigationBarTitleText": "服务详情"
+          }
+        }
+      ]
+    },
+    {
+      "root": "pages/user",
+      "pages": [
+        {
+          "path": "collect/list",
+          "style": {
+            "navigationBarTitleText": "我的收藏"
+          }
+        },
+        {
+          "path": "appoint/index",
+          "style": {
+            "navigationBarTitleText": "预约列表"
+          }
+        },
+        {
+          "path": "coupon/index",
+          "style": {
+            "navigationBarTitleText": "优惠券"
+          }
+        },
+        {
+          "path": "score/index",
+          "style": {
+            "navigationBarTitleText": "我的积分"
+          }
+        },
+        {
+          "path": "info/index",
+          "style": {
+            "navigationBarTitleText": "个人中心"
+          }
+        },
+        {
+          "path": "info/update",
+          "style": {
+            "navigationBarTitleText": "编辑资料"
+          }
+        },
+        {
+          "path": "settings/index",
+          "style": {
+            "navigationBarTitleText": "设置"
+          }
+        }
+      ]
+    }
+  ],
+  "tabBar": {
+    "color": "#999999",
+    "selectedColor": "#42b2fa",
+    "borderStyle": "black",
+    "backgroundColor": "#ffffff",
+    "list": [
+      {
+        "text": "首页",
+        "pagePath": "pages/tabbar/home/index",
+        "iconPath": "static/images/home.png",
+        "selectedIconPath": "static/images/home-select.png"
+      },
+      {
+        "pagePath": "pages/tabbar/community/index",
+        "text": "社区",
+        "iconPath": "static/images/community.png",
+        "selectedIconPath": "static/images/community-select.png"
+      },
+      {
+        "pagePath": "pages/tabbar/message/index",
+        "text": "消息",
+        "iconPath": "static/images/message.png",
+        "selectedIconPath": "static/images/message-select.png"
+      },
+      {
+        "pagePath": "pages/tabbar/mine/index",
+        "text": "我的",
+        "iconPath": "static/images/mine.png",
+        "selectedIconPath": "static/images/mine-select.png"
+      }
+    ]
+  },
+  "globalStyle": {
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "uni-app",
+    "navigationBarBackgroundColor": "#F8F8F8",
+    "backgroundColor": "#F8F8F8"
+  }
+}

src/pages/business/buy/index.vue

@@ -1,56 +0,0 @@
-<template>
-  <view class="buy">
-
-    <!-- 底部提交按钮的实现 -->
-    <view class="buy-bottom">
-      <view class="but-text">总计:￥<text>83</text></view>
-      <view class="buyButton">
-        <u-button color="#fa6f19" shape="circle" text="立即购买" />
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-export default {
-
-}
-</script>
-
-<style lang="scss" scoped>
-.buy {
-  height: 100vh;
-  background-color: #efefef;
-  position: relative;
-}
-
-/* 底部提交按钮的样式 */
-.buy-bottom {
-  height: 100rpx;
-  line-height: 100rpx;
-  background-color: #fff;
-  position: fixed;
-  left: 0;
-  bottom: 0;
-  right: 0;
-  display: flex;
-  justify-content: space-between;
-  padding: 10rpx 50rpx;
-  box-sizing: border-box;
-
-  .but-text {
-    color: #fa6f19;
-    font-size: 34rpx;
-    margin-top: -10rpx;
-
-    >text {
-      font-size: 38rpx;
-    }
-  }
-
-  .buyButton {
-    width: 160px;
-    margin-top: 10rpx;
-  }
-}
-</style>

src/pages/business/classfication/classfication.vue → src/pages/business/category.vue

@@ -40,7 +40,7 @@
                 class="thumb-box"
                 v-for="(child, childIndex) in item.children"
                 :key="childIndex"
-                @click="featureC(child.id, child.name)"
+                @click="handleItemClick(child.id, child.name)"
               >
                 <image
                   v-if="child.icon != ''"
@@ -229,6 +229,9 @@ export default {
         }
       }, 10);
     },
+    handleItemClick(id,name){
+      this.$Router.push('/pages/business/list')
+    }
   },
 };
 </script>

src/pages/business/classify/index.vue

@@ -1,47 +0,0 @@
-<template>
-  <view class="recommend">
-    <view class="search-item">
-      <u-search :showAction="true" actionText="取消" />
-    </view>
-
-    <service />
-    <service />
-    <service />
-    <service />
-    <service />
-    <service />
-  </view>
-</template>
-
-<script>
-import service from '@/components/service'
-export default {
-  components: {
-    service,
-  },
-  data() {
-    return {
-      count: 5,
-      value: 4,
-    };
-  },
-  onLoad() { },
-  methods: {},
-};
-</script>
-
-<style lang="scss" scoped>
-.recommend {
-  min-height: 100vh;
-  background-color: #efefef;
-
-  /* 搜索样式 */
-  .search-item {
-    padding: 0 20rpx;
-    height: 80rpx;
-    line-height: 80rpx;
-    background-color: #fff;
-    margin-bottom: 10rpx;
-  }
-}
-</style>

src/pages/business/hot/index copy.vue

@@ -1,90 +0,0 @@
-<template>
-  <view class="recommend" v-for="item in indexList" :key="item.id">
-    <view class="hot">
-      <Image :src="item.img"/>
-      <view>
-        <view class="item-text">{{ item.title }}</view>
-        <view class="item-flex">
-          <view class="star">
-            <u-rate :count="item.count" v-model="item.value" />
-            <text class="line">|</text>
-          </view>
-          <view>{{item.number}}单</view>
-        </view>
-        <view class="address-flex">
-          <view>{{ item.address }}</view>
-          <view>{{item.distance}}km</view>
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-			indexList: [
-				{
-					id: '1',
-					title: '途虎养车洗车机(贵州省贵阳市云岩区)',
-					count: 5,
-					value: 4,
-					number: 679,
-					address: '宝安中心区美容洗车',
-					distance: 2.7,
-					img: 'https://cdn.uviewui.com/uview/album/1.jpg'
-				},
-			],
-    };
-  },
-  onLoad() {},
-  methods: {},
-};
-</script>
-
-<style lang="scss" scoped>
-.recommend {
-  min-height: 100vh;
-  margin: 0 20rpx;
-  background-color: #efefef;
-  .hot {
-    height: 220rpx;
-    background-color: #fff;
-    margin-bottom: 20rpx;
-    display: flex;
-    Image {
-      width: 120px;
-      height: calc(100% - 20rpx);
-      margin: 10rpx 20rpx 10rpx 0;
-    }
-    .item-text {
-      font-weight: bold;
-			margin: 10rpx 0 10rpx;
-			color: #333;
-    }
-    .item-flex {
-      display: flex;
-			justify-content: space-between;
-			font-size: 14px;
-			margin: 0 20rpx 30rpx 0;
-			color: #0d0d0d66;
-			.star{
-				display: flex;
-				.line{
-					margin-left: 18rpx;
-					margin-top: 5rpx;
-					font-size: 24rpx;
-				}
-			}
-    }
-    .address-flex {
-      display: flex;
-			justify-content: space-between;
-			font-size: 12px;
-			color: #999;
-			margin-right: 20rpx;
-    }
-  }
-}
-</style>

src/pages/business/hot/index.vue

@@ -1,178 +0,0 @@
-<template>
-  <view class="recommend">
-    <view class="search-item">
-      <u-search :showAction="true" actionText="取消" />
-    </view>
-    <view class="hot">
-      <Image src="https://cdn.uviewui.com/uview/album/1.jpg"></Image>
-      <view>
-        <view class="item-text">途虎养车洗车机(贵州省贵阳市云岩区)</view>
-        <view class="item-flex">
-          <view class="star">
-            <u-rate :count="count" v-model="value" />
-            <text class="line">|</text>
-          </view>
-          <view>989单</view>
-        </view>
-        <view class="address-flex">
-          <view>宝安中心区美容洗车</view>
-          <view>2.7km</view>
-        </view>
-      </view>
-    </view>
-		<view class="hot">
-      <Image src="https://cdn.uviewui.com/uview/album/2.jpg"></Image>
-      <view>
-        <view class="item-text">途虎养车洗车机(贵州省贵阳市云岩区)</view>
-        <view class="item-flex">
-          <view class="star">
-            <u-rate :count="count" v-model="value" />
-            <text class="line">|</text>
-          </view>
-          <view>989单</view>
-        </view>
-        <view class="address-flex">
-          <view>宝安中心区美容洗车</view>
-          <view>2.7km</view>
-        </view>
-      </view>
-    </view>
-		<view class="hot">
-      <Image src="https://cdn.uviewui.com/uview/album/3.jpg"></Image>
-      <view>
-        <view class="item-text">途虎养车洗车机(贵州省贵阳市云岩区)</view>
-        <view class="item-flex">
-          <view class="star">
-            <u-rate :count="count" v-model="value" />
-            <text class="line">|</text>
-          </view>
-          <view>989单</view>
-        </view>
-        <view class="address-flex">
-          <view>宝安中心区美容洗车</view>
-          <view>2.7km</view>
-        </view>
-      </view>
-    </view>
-		<view class="hot">
-      <Image src="https://cdn.uviewui.com/uview/album/1.jpg"></Image>
-      <view>
-        <view class="item-text">途虎养车洗车机(贵州省贵阳市云岩区)</view>
-        <view class="item-flex">
-          <view class="star">
-            <u-rate :count="count" v-model="value" />
-            <text class="line">|</text>
-          </view>
-          <view>989单</view>
-        </view>
-        <view class="address-flex">
-          <view>宝安中心区美容洗车</view>
-          <view>2.7km</view>
-        </view>
-      </view>
-    </view>
-		<view class="hot">
-      <Image src="https://cdn.uviewui.com/uview/album/1.jpg"></Image>
-      <view>
-        <view class="item-text">途虎养车洗车机(贵州省贵阳市云岩区)</view>
-        <view class="item-flex">
-          <view class="star">
-            <u-rate :count="count" v-model="value" />
-            <text class="line">|</text>
-          </view>
-          <view>989单</view>
-        </view>
-        <view class="address-flex">
-          <view>宝安中心区美容洗车</view>
-          <view>2.7km</view>
-        </view>
-      </view>
-    </view>
-		<view class="hot">
-      <Image src="https://cdn.uviewui.com/uview/album/1.jpg"></Image>
-      <view>
-        <view class="item-text">途虎养车洗车机(贵州省贵阳市云岩区)</view>
-        <view class="item-flex">
-          <view class="star">
-            <u-rate :count="count" v-model="value" />
-            <text class="line">|</text>
-          </view>
-          <view>989单</view>
-        </view>
-        <view class="address-flex">
-          <view>宝安中心区美容洗车</view>
-          <view>2.7km</view>
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      count: 5, 
-      value: 4,
-    };
-  },
-  onLoad() {},
-  methods: {},
-};
-</script>
-
-<style lang="scss" scoped>
-.recommend {
-  min-height: 100vh;
-  background-color: #efefef;
-  /* 搜索样式 */
-.search-item {
-  padding: 0 20rpx;
-  height: 80rpx;
-  line-height: 80rpx;
-  background-color: #fff;
-  margin-bottom: 10rpx;
-}
-
-// 列表样式
-  .hot {
-    height: 220rpx;
-    background-color: #fff;
-		padding: 0 20rpx;
-    margin-bottom: 20rpx;
-    display: flex;
-    Image {
-      width: 120px;
-      height: calc(100% - 20rpx);
-      margin: 10rpx 20rpx 10rpx 0;
-    }
-    .item-text {
-      font-weight: bold;
-			margin: 10rpx 0 10rpx;
-			color: #333;
-    }
-    .item-flex {
-      display: flex;
-			justify-content: space-between;
-			font-size: 14px;
-			margin: 0 20rpx 30rpx 0;
-			color: #0d0d0d66;
-			.star{
-				display: flex;
-				.line{
-					margin-left: 18rpx;
-					margin-top: 5rpx;
-					font-size: 24rpx;
-				}
-			}
-    }
-    .address-flex {
-      display: flex;
-			justify-content: space-between;
-			font-size: 12px;
-			color: #999;
-			margin-right: 20rpx;
-    }
-  }
-}
-</style>

src/pages/business/list.vue

@@ -0,0 +1,347 @@
+<template>
+  <view class="container" @click="filterShow = false">
+    <view class="top-box">
+      <view class="search-box">
+        <view class="search-left">
+          <u-search placeholder="请输入搜索内容" :showAction="false" v-model="keyword" />
+        </view>
+        <view class="search-right">取消</view>
+      </view>
+      <view class="filter-box">
+        <view class="filter-item">
+          <view class="fiter1 " >
+            <u-icon name="map"></u-icon>
+            <span class="filter-l">贵阳市青少年人才社区</span>
+            <u-icon name="arrow-down-fill"></u-icon>
+          </view>
+          <view class="fiter2" @tap.stop="handlerSelectAllFilter(2)">
+            <span>综合排序</span>
+            <u-icon name="arrow-down-fill"></u-icon>
+          </view>
+          <view class="fiter1" @tap.stop="handlerSelectMenu(1)">
+            <span>筛选</span>
+            <u-icon name="arrow-down-fill"></u-icon>
+          </view>
+        </view>
+        <view class="filter-drapdown" v-show="filterShow">
+          <view class="filter1" v-show="filterType == 1">
+            <view class="scroll-box">
+              <scroll-view :scroll-top="scrollTop" scroll-y="true" class="filter-menu-left scroll-Y" @scrolltoupper="upper"
+                @scrolltolower="lower" @scroll="scroll">
+                <view id="demo1" class="scroll-view-item uni-bg-red menu-item"
+                      :class="current == index ? 'act-left-menu' : ''"
+                      v-for="(item,index) of menuList"
+                      @click.stop='handlerSelectLMenu(item,index)'>{{ item.name }}
+                </view>
+              </scroll-view>
+              <scroll-view :scroll-top="scrollTop" scroll-y="true" class="filter-menu-right scroll-Y" @scrolltoupper="upper"
+                @scrolltolower="lower" @scroll="scroll">
+                <view id="demo1" class="scroll-view-item uni-bg-red" v-for="item of 15">
+                  <view class="menu-right-title">洗车</view>
+                  <view class="menu-right-contentbox" >
+                    <span class="menu-item" v-for="item of 7">测试</span>
+                  </view>
+                </view>
+              </scroll-view>
+            </view>
+          </view>
+          <view class="filter2" v-show="filterType == 2">
+            <view class="">离我最近</view>
+            <view class="">好评优先</view>
+            <view class="">离我有点远</view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <view class="content-box">
+      <view class="content-item" v-for="item of 10">
+        <view class="item-left">
+          <image class="img" src="../../../static/logo.png" mode=""></image>
+        </view>
+        <view class="item-right">
+
+          <view class="">
+            <view class="item-title">
+              <view class="tag">常去 </view>
+              <view class="title">途虎养车洗车机（贵州省贵阳市云岩区）</view>
+            </view>
+            <view class="str-box">
+              <view class="srt-left">
+                <u-rate activeColor="#fc8400" :value="3.7" readonly></u-rate>
+                <text>5.0</text>
+              </view>
+              <view class="border"></view>
+              <view class="srt-right">998单</view>
+            </view>
+          </view>
+
+          <view class="bottom-textbox">
+            <view class="bottom-left">宝安中心区美容洗车</view>
+            <view class="bottom-right">2.7km</view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        keyword: null,
+        filterShow: false,
+        filterType: 0,
+
+        current:0,
+
+        menuList:[
+          {name:'汽车'},
+          {name:'汽车2'},
+          {name:'汽车3'},
+          {name:'汽车4'},
+        ]
+      }
+    },
+    methods: {
+      // 点击综合排序
+      handlerSelectAllFilter(e) {
+        this.filterShow = true
+        this.filterType = 2
+      },
+      //
+      handlerSelectMenu(e){
+         this.filterShow = true
+         this.filterType = 1
+      },
+      // 选择左侧菜单
+      handlerSelectLMenu(item,index){
+        this.current = index
+      },
+      scroll(){
+
+      },
+      lower(){},
+      upper(){},
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .container {
+    min-height: 100vh;
+    background-color: #efefef;
+
+    .top-box {
+      width: 100%;
+      background-color: #fff;
+      padding: 10rpx 20rpx;
+      box-sizing: border-box;
+
+      .search-box {
+        display: flex;
+        justify-content: space-around;
+        align-items: center;
+
+        .search-left {
+          width: 80%;
+
+        }
+
+        .search-right {
+          text-align: center;
+        }
+      }
+
+      .filter-box {
+        margin-top: 20rpx;
+
+        .filter-item {
+          display: flex;
+          justify-content: space-between;
+
+          .fiter1,
+          .fiter2 {
+            display: flex;
+            align-items: center;
+          }
+
+          .filter-l {
+            width: 200rpx;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+          }
+
+          .fiter1 {
+            color: #808080;
+            font-size: 24rpx
+          }
+
+          .fiter2 {}
+        }
+
+        .filter-drapdown {
+          position: fixed;
+          left: 0;
+          width: 100%;
+          background-color: #fff;
+          // height: 300rpx;
+          z-index: 999;
+          box-shadow: 0 10rpx 20rpx -5rpx rgba(0, 0, 0, 0.2);
+          .filter1{
+            .scroll-box {
+              display: flex;
+              max-height: 1200rpx;
+              .filter-menu-left{
+                width: 30%;
+                background-color: #ebebeb;
+                overflow-y: scroll;
+                .menu-item{
+                  width: 100%;
+                  height: 100rpx;
+                  text-align: center;
+                  line-height: 100rpx;
+                  font-size: 30rpx;
+                  background-color: #ebebeb;
+                  color: #5a5a5a;
+                }
+                .act-left-menu{
+                  background-color: #fff;
+                  color: #5992bb;
+                  border-right: 8rpx solid #5992bb !important;
+                }
+              }
+              .filter-menu-right{
+                background-color: #fff;
+                padding: 10rpx 20rpx;
+                box-sizing: border-box;
+                width: 70%;
+                overflow-y: scroll;
+                .menu-right-title{
+                  font-size: 30rpx;
+                  color: #000;
+                  margin-bottom: 10rpx;
+                }
+                .menu-right-contentbox{
+                  padding: 0 0 0 30rpx;
+                  display: flex;
+                  justify-content: left;
+                  flex-wrap: wrap;
+                  .menu-item{
+                    // width: 100rpx;
+                    padding: 0 20rpx;
+                    height: 40rpx;
+                    background-color: #cccccc;
+                    color: #000;
+                    text-align: center;
+                    line-height: 40rpx;
+                    margin: 10rpx 20rpx;
+                  }
+                }
+              }
+            }
+          }
+          .filter2 {
+            padding: 20rpx 50rpx;
+            box-sizing: border-box;
+            view {
+              margin: 30rpx 0;
+            }
+          }
+        }
+      }
+    }
+
+
+    .content-box {
+      width: 100%;
+
+      .content-item {
+        background-color: #fff;
+        padding: 10rpx 20rpx;
+        box-sizing: border-box;
+        margin: 10rpx 0;
+        display: flex;
+
+        .item-left {
+          margin-right: 10rpx;
+
+          .img {
+            width: 200rpx;
+            height: 200rpx;
+            border-radius: 10rpx;
+          }
+        }
+
+        .item-right {
+          height: 200rpx;
+          align-content: space-between;
+
+          .item-title {
+            display: flex;
+            align-items: center;
+
+            .tag {
+              width: 80rpx;
+              height: 46rpx;
+              // line-height: 50rpx;
+              padding: 4rpx;
+              font-size: 22rpx;
+              box-sizing: border-box;
+              background-color: #f6e7d4;
+              color: #f99a47;
+              border: 2rpx solid #f99a47;
+              text-align: center;
+              // align-items: center;
+              margin-right: 10rpx;
+            }
+
+            .title {
+              font-size: 30rpx;
+              color: #000;
+              font-weight: bold;
+              flex-wrap: wrap;
+            }
+          }
+
+          .str-box {
+            display: flex;
+            margin-top: 10rpx;
+
+            .srt-left {
+              display: flex;
+              color: #fc8400;
+            }
+
+            .border {
+              border-left: 2rpx solid #cfcfcf;
+              margin: 0 20rpx;
+            }
+
+            .srt-right {}
+          }
+
+
+          .bottom-textbox {
+            display: flex;
+            justify-content: space-between;
+            font-size: 26rpx;
+            margin-top: 40rpx;
+
+            .bottom-left {
+              color: #c7c7c7;
+            }
+
+            .bottom-right {
+              color: #000;
+            }
+          }
+        }
+      }
+    }
+  }
+
+
+</style>

src/pages/business/nearby/index.vue

@@ -1,178 +0,0 @@
-<template>
-  <view class="recommend">
-    <view class="search-item">
-      <u-search :showAction="true" actionText="取消" />
-    </view>
-    <view class="hot">
-      <Image src="https://cdn.uviewui.com/uview/album/1.jpg"></Image>
-      <view>
-        <view class="item-text">途虎养车洗车机(贵州省贵阳市云岩区)</view>
-        <view class="item-flex">
-          <view class="star">
-            <u-rate :count="count" v-model="value" />
-            <text class="line">|</text>
-          </view>
-          <view>989单</view>
-        </view>
-        <view class="address-flex">
-          <view>宝安中心区美容洗车</view>
-          <view>2.7km</view>
-        </view>
-      </view>
-    </view>
-		<view class="hot">
-      <Image src="https://cdn.uviewui.com/uview/album/2.jpg"></Image>
-      <view>
-        <view class="item-text">途虎养车洗车机(贵州省贵阳市云岩区)</view>
-        <view class="item-flex">
-          <view class="star">
-            <u-rate :count="count" v-model="value" />
-            <text class="line">|</text>
-          </view>
-          <view>989单</view>
-        </view>
-        <view class="address-flex">
-          <view>宝安中心区美容洗车</view>
-          <view>2.7km</view>
-        </view>
-      </view>
-    </view>
-		<view class="hot">
-      <Image src="https://cdn.uviewui.com/uview/album/3.jpg"></Image>
-      <view>
-        <view class="item-text">途虎养车洗车机(贵州省贵阳市云岩区)</view>
-        <view class="item-flex">
-          <view class="star">
-            <u-rate :count="count" v-model="value" />
-            <text class="line">|</text>
-          </view>
-          <view>989单</view>
-        </view>
-        <view class="address-flex">
-          <view>宝安中心区美容洗车</view>
-          <view>2.7km</view>
-        </view>
-      </view>
-    </view>
-		<view class="hot">
-      <Image src="https://cdn.uviewui.com/uview/album/1.jpg"></Image>
-      <view>
-        <view class="item-text">途虎养车洗车机(贵州省贵阳市云岩区)</view>
-        <view class="item-flex">
-          <view class="star">
-            <u-rate :count="count" v-model="value" />
-            <text class="line">|</text>
-          </view>
-          <view>989单</view>
-        </view>
-        <view class="address-flex">
-          <view>宝安中心区美容洗车</view>
-          <view>2.7km</view>
-        </view>
-      </view>
-    </view>
-		<view class="hot">
-      <Image src="https://cdn.uviewui.com/uview/album/1.jpg"></Image>
-      <view>
-        <view class="item-text">途虎养车洗车机(贵州省贵阳市云岩区)</view>
-        <view class="item-flex">
-          <view class="star">
-            <u-rate :count="count" v-model="value" />
-            <text class="line">|</text>
-          </view>
-          <view>989单</view>
-        </view>
-        <view class="address-flex">
-          <view>宝安中心区美容洗车</view>
-          <view>2.7km</view>
-        </view>
-      </view>
-    </view>
-		<view class="hot">
-      <Image src="https://cdn.uviewui.com/uview/album/1.jpg"></Image>
-      <view>
-        <view class="item-text">途虎养车洗车机(贵州省贵阳市云岩区)</view>
-        <view class="item-flex">
-          <view class="star">
-            <u-rate :count="count" v-model="value" />
-            <text class="line">|</text>
-          </view>
-          <view>989单</view>
-        </view>
-        <view class="address-flex">
-          <view>宝安中心区美容洗车</view>
-          <view>2.7km</view>
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      count: 5, 
-      value: 4,
-    };
-  },
-  onLoad() {},
-  methods: {},
-};
-</script>
-
-<style lang="scss" scoped>
-.recommend {
-  min-height: 100vh;
-  background-color: #efefef;
-  /* 搜索样式 */
-.search-item {
-  padding: 0 20rpx;
-  height: 80rpx;
-  line-height: 80rpx;
-  background-color: #fff;
-  margin-bottom: 10rpx;
-}
-
-// 列表样式
-  .hot {
-    height: 220rpx;
-    background-color: #fff;
-		padding: 0 20rpx;
-    margin-bottom: 20rpx;
-    display: flex;
-    Image {
-      width: 120px;
-      height: calc(100% - 20rpx);
-      margin: 10rpx 20rpx 10rpx 0;
-    }
-    .item-text {
-      font-weight: bold;
-			margin: 10rpx 0 10rpx;
-			color: #333;
-    }
-    .item-flex {
-      display: flex;
-			justify-content: space-between;
-			font-size: 14px;
-			margin: 0 20rpx 30rpx 0;
-			color: #0d0d0d66;
-			.star{
-				display: flex;
-				.line{
-					margin-left: 18rpx;
-					margin-top: 5rpx;
-					font-size: 24rpx;
-				}
-			}
-    }
-    .address-flex {
-      display: flex;
-			justify-content: space-between;
-			font-size: 12px;
-			color: #999;
-			margin-right: 20rpx;
-    }
-  }
-}
-</style>

src/pages/client/CommunitySearch/index.vue

@@ -1,74 +0,0 @@
-
-<template>
-  <view class="search">
-    <view class="searchItem">
-      <u-search :showAction="true" actionText="取消" />
-    </view>
-
-    <view class="history">
-      <view class="historyTop">
-        <h3>推荐搜索</h3>
-      </view>
-      <view class="label">
-        <u-tag text="标签" type="warning" shape="circle"></u-tag>
-        <u-tag text="标签" type="warning" shape="circle"></u-tag>
-        <u-tag text="标签" type="warning" shape="circle"></u-tag>
-        <u-tag text="标签" type="warning" shape="circle"></u-tag>
-        <u-tag text="标签" type="warning" shape="circle"></u-tag>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-export default {
-
-}
-</script>
-
-<style lang="scss" scoped>
-.search {
-  height: 1400rpx;
-  background-color: #efefef;
-
-  .searchItem {
-    padding: 0 20rpx;
-    height: 90rpx;
-    line-height: 90rpx;
-    background-color: #fff;
-    margin-bottom: 10rpx;
-  }
-
-  .history {
-    padding: 20rpx;
-    margin-bottom: 50rpx;
-
-    .historyTop {
-      display: flex;
-      justify-content: space-between;
-      margin-bottom: 20rpx;
-      .historyRight {
-        margin-top: 10rpx;
-        display: flex;
-        font-size:24rpx;
-        .icon-sanjiaoxing1{
-          margin: 5rpx 5rpx 0 0;
-          font-size: 26rpx; 
-        }
-      }
-      h3 {
-        font-size: 34rpx;
-        font-weight: bold;
-        color:#404045;
-      }
-    }
-    .label{
-      display: flex;
-      width: 120rpx;
-      .labelItem{
-        margin-right: 20rpx;
-      }
-    }
-  }
-}
-</style>

src/pages/client/allComments/index.vue

@@ -1,210 +0,0 @@
-<template>
-    <view>
-      <view>
-        <view class="top-nav">
-          <view class="nav-left" @click="backTop">
-            <u-icon name="arrow-left"></u-icon>
-            <view class="left-text">返回</view>
-          </view>
-          <u-tabs v-if="isAllReply" :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
-          <u-icon name="search" size="25" @click="searchTop"></u-icon>
-        </view>
-        <view>
-          <view class="album">
-            <view class="album__avatar">
-              <image src="/static/uview/common/logo.png" style="width: 32px; height: 32px"></image>
-            </view>
-            <view class="album__content">
-              <u--text :text="niackName" bold size="17"></u--text>
-              <u--text
-                margin="0 0 8px 0"
-                style="padding-top: 7px"
-                text="全面的组件和便捷的工具会让您信手拈来，如鱼得水全面的组件和便捷的工具会让您信手拈来，如鱼得水全面的组件和便捷的工具会让您信手拈来，如鱼得水全面的组件和便捷的工具会让您信手拈来，如鱼得水全面的组件和便捷的工具会让您信手拈来，如鱼得水"
-              >
-              </u--text>
-              <u-album :urls="urls2"></u-album>
-            </view>
-          </view>
-          <view class="reply-info">
-            <view class="reply-left">
-              <u-icon name="red-packet" size="30px"></u-icon>
-              <u--text :text="followNum" size="22px"></u--text>
-            </view>
-            <view class="reply-right">
-              <u-icon name="thumb-up-fill" size="30px"></u-icon>
-              <u-icon name="chat-fill" size="30px" @click="allReply"></u-icon>
-              <u-icon name="share-fill" size="30px"></u-icon>
-            </view>
-          </view>
-        </view>
-        <view v-if="showAllCom">
-          <view class="all-comments">
-            <view>
-              <u--text sizi="15px" text="全部评论"> </u--text>
-            </view>
-            <view class="comment-order">
-              <u-subsection fontSize="15px" :list="subsectionList" :current="subsectionListCurrent" @change="changeCom"></u-subsection>
-            </view>
-          </view>
-          <view class="album">
-            <view class="album__avatar">
-              <image src="/static/uview/common/logo.png" style="width: 32px; height: 32px"></image>
-            </view>
-            <view class="album__content">
-              <u--text :text="niackName" bold size="17"></u--text>
-              <u--text
-                margin="0 0 8px 0"
-                style="padding-top: 9px"
-                text="全面的组件和便捷的工具会让您信手拈来，如鱼得水全面的组件和便捷的工具会让您信手拈来，如鱼得水全面的组件和便捷的工具会让您信手拈来，如鱼得水全面的组件和便捷的工具会让您信手拈来，如鱼得水全面的组件和便捷的工具会让您信手拈来，如鱼得水"
-              >
-              </u--text>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-  </template>
-  <script>
-  export default {
-    data() {
-      return {
-        list: [
-          {
-            name: '关注',
-          },
-          {
-            name: '推荐',
-          },
-        ],
-        current: 0,
-        subsectionListCurrent: 0,
-        subsectionList: ['最新', '推荐'],
-        isAllReply: true,
-        showAllCom: false,
-        searching: false,
-        isSearch: true,
-        followNum: 111111,
-        urls2: [
-          'https://cdn.uviewui.com/uview/album/1.jpg',
-          'https://cdn.uviewui.com/uview/album/2.jpg',
-          'https://cdn.uviewui.com/uview/album/3.jpg',
-          'https://cdn.uviewui.com/uview/album/4.jpg',
-          'https://cdn.uviewui.com/uview/album/5.jpg',
-          'https://cdn.uviewui.com/uview/album/6.jpg',
-          'https://cdn.uviewui.com/uview/album/7.jpg',
-          'https://cdn.uviewui.com/uview/album/8.jpg',
-          'https://cdn.uviewui.com/uview/album/9.jpg',
-          'https://cdn.uviewui.com/uview/album/10.jpg',
-        ],
-        niackName: '昵称昵称昵称',
-        followInfo: '昵称昵称昵称昵称昵称昵称昵称昵称昵称昵称昵称昵称昵称昵称昵称昵称昵称昵称昵称昵称昵称',
-        keyword: '123',
-        searchCon: '',
-        src: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2119_s.jpg',
-      };
-    },
-    methods: {
-      change(index) {
-        this.current = index;
-      },
-      backTop() {
-        this.isAllReply = true;
-        this.showAllCom = true;
-      },
-      searchTop() {
-        // this.isSearch = false;
-        // this.searching = true;
-        uni.navigateTo({
-          url: "/pages/client/CommunitySearch/index",
-        })
-      },
-      allReply() {
-        this.isAllReply = false;
-        this.showAllCom = true;
-      },
-      changeCom(index) {
-        this.subsectionListCurrent = index;
-      },
-      getFocus() {},
-      cancelSearch() {
-        this.isSearch = true;
-        this.searching = false;
-      },
-    },
-  };
-  </script>
-  <style lang="scss" scoped>
-  .top-nav {
-    width: 100%;
-    height: 50px;
-    display: flex;
-    justify-content: space-between;
-  }
-  
-  .nav-left {
-    display: flex;
-  }
-  
-  .left-text {
-    font-size: 15px;
-    padding-top: 22%;
-    padding-left: 5px;
-  }
-  
-  .album {
-    display: flex;
-  }
-  
-  .album__avatar {
-    padding: 5px;
-    border-radius: 3px;
-  }
-  
-  .album__content {
-    margin-left: 10px;
-    flex: 1;
-  }
-  
-  .reply-info {
-    margin-top: 15px;
-    margin-left: 15px;
-    display: flex;
-    justify-content: space-between;
-  }
-  
-  .reply-left {
-    display: flex;
-  }
-  
-  .reply-right {
-    display: flex;
-  }
-  
-  .all-comments {
-    margin: 15px 0 10px 12px;
-    display: flex;
-    justify-content: space-between;
-  }
-  
-  .comment-order {
-    width: 100px;
-  }
-  
-  .comment-order .u-subsection__item {
-    display: flex;
-    justify-content: center;
-  }
-  
-  .comment-order .u-subsection--button {
-    border: 0.2px solid;
-    border-radius: 55px;
-  }
-  .search-content {
-    display: flex;
-  }
-  .search-tags {
-    display: flex;
-    justify-content: space-around;
-  }
-  </style>
-  

src/pages/client/checkIn/index.vue

@@ -1,9 +0,0 @@
-<template>
-  <view> 积分签到 </view>
-</template>
-
-<script>
-export default {};
-</script>
-
-<style lang="scss" scoped></style>

src/pages/community/commDetail/index.vue

@@ -1,9 +0,0 @@
-<template>
-  <div>动态详情</div>
-</template>
-
-<script>
-export default {};
-</script>
-
-<style lang="scss" scoped></style>

src/pages/community/commSearch/index.vue

@@ -1,9 +0,0 @@
-<template>
-  <div>搜索</div>
-</template>
-
-<script>
-export default {};
-</script>
-
-<style lang="scss" scoped></style>

src/pages/message/evaluate/index.vue

@@ -1,9 +0,0 @@
-<template>
-  <view>评价通知</view>
-</template>
-
-<script>
-export default {};
-</script>
-
-<style lang="scss" scoped></style>

src/pages/message/favorable/index.vue

@@ -1,9 +0,0 @@
-<template>
-  <view>优惠福利</view>
-</template>
-
-<script>
-export default {};
-</script>
-
-<style lang="scss" scoped></style>

src/pages/message/info/index.vue

@@ -1,9 +0,0 @@
-<template>
-    <view>私聊页面</view>
-  </template>
-  
-  <script>
-  export default {};
-  </script>
-  
-  <style lang="scss" scoped></style>

src/pages/message/order/index.vue

@@ -1,61 +0,0 @@
-<template>
-  <view>
-    <view style="display: flex;justify-content: space-between;margin: 8px;">
-      <view>
-        <h1>订单通知</h1>
-        <h3>共 {{ total }} 条新订单</h3>
-      </view>
-      <view @click="allRead">
-        <h2 align="right">全部已读</h2>
-      </view>
-    </view>
-    <view style="margin-top: 25px;margin-left: 25px;">
-      <h2>待处理订单</h2>
-      <view style="margin-top: 10px;margin-left: 15px;">
-        <h3>订单编号：{{ waitOrder }}</h3>
-        <h3>客户名称：{{ waitName }}</h3>
-        <h3>订单金额：{{ waitMoney }}</h3>
-        <h3>下单时间：{{ waittime }}</h3>
-      </view>
-    </view>
-    <view style="margin-top: 25px;margin-left: 25px;">
-      <h2>待处理订单</h2>
-      <view style="margin-top: 10px;margin-left: 15px;">
-        <h3>订单编号：{{ waitOrder }}</h3>
-        <h3>客户名称：{{ waitName }}</h3>
-        <h3>订单金额：{{ waitMoney }}</h3>
-        <h3>下单时间：{{ waittime }}</h3>
-      </view>
-    </view>
-    <view style="margin-top: 25px;margin-left: 25px;">
-      <h2>新订单提醒</h2>
-      <view style="margin-top: 10px;margin-left: 15px;">
-        <h3>订单编号：{{ waitOrder }}</h3>
-        <h3>客户名称：{{ waitName }}</h3>
-        <h3>订单金额：{{ waitMoney }}</h3>
-        <h3>下单时间：{{ waittime }}</h3>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        total: 3,
-        waitName: '张三',
-        waitOrder: 999999999,
-        waitMoney: 999,
-        waittime: "2022-01-01 12:00:00",
-      };
-    },
-    methods: {
-      allRead() {
-
-      },
-    },
-  };
-</script>
-
-<style lang="scss" scoped></style>

src/pages/message/payment/index.vue

@@ -1,65 +0,0 @@
-<template>
-  <view>
-    <view style="margin-top: 15px;">
-      <view style="display: flex;justify-content: center;">
-        <u-icon name="checkmark-circle-fill" color="#16a34a" size="60"></u-icon>
-      </view>
-      <view style="display: flex;justify-content: center;">
-        <h1>付款成功</h1>
-      </view>
-    </view>
-    <view style="margin: 15px 0px 0px 15px;">
-      <h3>订单号：{{ orderNum }}</h3>
-      <h3>付款方式：{{ payStyle }}</h3>
-      <h3>付款金额：{{ orderMon }}</h3>
-    </view>
-    <view style="margin: 15px 0px 0px 15px;">
-      <h2>商品名称：{{ productName }}</h2>
-      <h3>规格：个 x{{number}}</h3>
-      <h3>商家名称：{{ name }}</h3>
-    </view>
-    <view style="margin: 15px 0px 0px 15px;">
-      <h2>收件人：{{ productName }}</h2>
-      <h2>联系电话：{{ orderNum }}</h2>
-      <h3>收货地址：{{ name }}</h3>
-      <h3>订单备注：{{ name }}</h3>
-    </view>
-    <view style="margin: 15px 0px 0px 15px;">
-      <h2>物流状态：{{ tranStatu }}</h2>
-      <h3>物流公司：{{ tranName }}</h3>
-      <h3>物流单号：{{ tranNum }}</h3>
-    </view>
-    <view style="margin: 15px 0px 0px 15px;">
-      <view style="display: flex;justify-content: center;">
-        <h3>创建时间：{{ waittime }}</h3>
-      </view>
-      <view style="display: flex;justify-content: center;">
-        <h3>付款时间：{{ waittime }}</h3>
-      </view>
-    </view>
-    <view style="display: flex;justify-content: center;margin: 15px 0px 0px 15px;">
-      <h3>客服热线：400-8888-8888</h3>
-    </view>
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        orderNum: 9999999999999,
-        tranNum: 9999999999999,
-        payStyle: '微信支付',
-        productName: '洗车',
-        name: '成都王牌汽车保养店',
-        tranStatu: '已发货',
-        tranName: '成都王牌汽车保养店',
-        number: 3,
-        orderMon: 99999,
-        waittime: "2022年01月01日 12:00:00",
-      };
-    },
-  };
-</script>
-
-<style lang="scss" scoped></style>

src/pages/message/upvote/index.vue

@@ -1,9 +0,0 @@
-<template>
-  <view>点赞回复</view>
-</template>
-
-<script>
-export default {};
-</script>
-
-<style lang="scss" scoped></style>

src/pages/my/inquiry/index.vue

@@ -1,13 +0,0 @@
-<template>
-  <view>
-    询价
-  </view>
-</template>
-
-<script>
-export default {
-
-}
-</script>
-
-<style lang="scss" scoped></style>

src/pages/my/personalCenter/index copy.vue

@@ -1,145 +0,0 @@
-<template>
-  <view class="container">
-    <view class="box">
-      <view class="card-wrap">
-        <u-cell-group :border="false">
-          <u-cell title="头像">
-            <button
-              slot="value"
-              class="open-btn"
-              open-type="chooseAvatar"
-              @chooseavatar="chooseAvatar"
-              plain="true"
-            >
-              <u-avatar size="60" :src="user_info.avatar"></u-avatar>
-            </button>
-          </u-cell>
-          <u-cell title="昵称" :border="false">
-            <view slot="value">
-              <input
-                inputAlign="right"
-                slot="value"
-                class="open-input"
-                type="nickname"
-                maxlength="16"
-                minlength="2"
-                v-model="user_info.nickname"
-                placeholder="请输入昵称"
-                @change="nicknameChange"
-              />
-            </view>
-          </u-cell>
-          <u-cell title="绑定手机号" :border="false">
-            <view slot="value">
-              <input
-                inputAlign="right"
-                slot="value"
-                class="open-input"
-                maxlength="16"
-                minlength="2"
-                v-model="user_info.mobile"
-                readonly
-              />
-            </view>
-          </u-cell>
-        </u-cell-group>
-      </view>
-    </view>
-    <view class="btn-wrap">
-      <u-button
-        type="primary"
-        shape="circle"
-        @tap="submit"
-        :loading="loading"
-        :loadingText="loadingText"
-        >保存</u-button
-      >
-    </view>
-  </view>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { uploadFile } from '@/utils/request';
-import { updateUserInfo } from '@/api/user';
-export default {
-  computed: {
-    ...mapGetters(['user_info']),
-  },
-  data() {
-    return {
-      loading: false,
-      loadingText: '正在保存',
-    };
-  },
-  methods: {
-    chooseAvatar(e) {
-      uploadFile(e.detail.avatarUrl)
-        .then(res => {
-          const result = JSON.parse(res);
-          this.user_info.avatar = result.data;
-        })
-        .catch(err => {
-          uni.$u.toast(err);
-        });
-    },
-    nicknameChange(e) {
-      this.user_info.nickname = e.detail.value;
-    },
-    submit() {
-      // TODO: check user information
-      // if (!this.user_info.avatar.length) return uni.$u.toast('请上传您的头像');
-      // if (!this.user_info.nickname.length)
-      //   return uni.$u.toast('请输入您的昵称');
-      // if (!this.user_info.mobile.length)
-      //   return uni.$u.toast('请输入您的手机号');
-      this.loading = true;
-      const param = {
-        avatar: this.user_info.avatar,
-        nickname: this.user_info.nickname,
-      };
-      updateUserInfo(param)
-        .then(res => {
-          this.$store.dispatch('GetUserInfo');
-          this.loading = false;
-        })
-        .catch(err => {
-          this.loading = false;
-        });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.container {
-  height: 100vh;
-  position: relative;
-  .box {
-    padding: 20rpx 20rpx 0 20rpx;
-    box-sizing: border-box;
-    .open-btn {
-      border: none;
-    }
-
-    .open-input {
-      text-align: right;
-      border: none;
-    }
-
-    .card-wrap {
-      border-radius: 20rpx;
-      background-color: #ffffff;
-    }
-  }
-  .btn-wrap {
-    width: 100vw;
-    padding: 20rpx;
-    box-sizing: border-box;
-    position: absolute;
-    bottom: 0;
-    display: flex;
-    justify-content: center;
-  }
-}
-</style>

src/pages/pointMethod/advertise/index.vue

@@ -1,9 +0,0 @@
-<template>
-  <view> 广告</view>
-</template>
-
-<script>
-export default {};
-</script>
-
-<style lang="scss" scoped></style>

src/pages/pointMethod/comment/index.vue

@@ -1,9 +0,0 @@
-<template>
-  <view> 点评</view>
-</template>
-
-<script>
-export default {};
-</script>
-
-<style lang="scss" scoped></style>

src/pages/pointMethod/consume/index.vue

@@ -1,9 +0,0 @@
-<template>
-  <view> 消费</view>
-</template>
-
-<script>
-export default {};
-</script>
-
-<style lang="scss" scoped></style>

src/pages/pointMethod/foren/index.vue

@@ -1,9 +0,0 @@
-<template>
-  <view> 发帖</view>
-</template>
-
-<script>
-export default {};
-</script>
-
-<style lang="scss" scoped></style>

src/pages/pointMethod/recover/index.vue

@@ -1,9 +0,0 @@
-<template>
-  <view> 回帖</view>
-</template>
-
-<script>
-export default {};
-</script>
-
-<style lang="scss" scoped></style>

src/pages/pointMethod/share/index.vue

@@ -1,9 +0,0 @@
-<template>
-  <view> 分享</view>
-</template>
-
-<script>
-export default {};
-</script>
-
-<style lang="scss" scoped></style>

src/pages/points/activity/index.vue

@@ -1,9 +0,0 @@
-<template>
-  <view> 积分活动 </view>
-</template>
-
-<script>
-export default {};
-</script>
-
-<style lang="scss" scoped></style>

src/pages/points/checkIn/index.vue

@@ -1,3 +0,0 @@
-<template>
-
-</template>

src/pages/points/detail/index.vue

@@ -1,9 +0,0 @@
-<template>
-  <view> 积分明细 </view>
-</template>
-
-<script>
-export default {};
-</script>
-
-<style lang="scss" scoped></style>

src/pages/points/instructions/index.vue

@@ -1,9 +0,0 @@
-<template>
-  <view> 积分说明 </view>
-</template>
-
-<script>
-export default {};
-</script>
-
-<style lang="scss" scoped></style>

src/pages/points/myPoints/index.vue

@@ -1,3 +0,0 @@
-<template>
-
-</template>

src/pages/points/withdraw/index.vue

@@ -1,9 +0,0 @@
-<template>
-  <view> 积分提现 </view>
-</template>
-
-<script>
-export default {};
-</script>
-
-<style lang="sass" scoped></style>

src/pages/tabbar/home/index.vue

@@ -1,364 +1,342 @@
-<template>
-  <view class="home">
-    <view class="nav-bar" v-if="opacity == 1">
-      <u-navbar :bgColor="'#ffffff'">
-        <view slot="left">
-          <text>地址</text>
-          <text class="iconfont icon-chevron-down"></text>
-        </view>
-        <view slot="center">
-          <u-search
-            placeholder="请输入搜索内容"
-            :showAction="false"
-            v-model="keyword"
-          />
-        </view>
-      </u-navbar>
-    </view>
-    <!-- 顶部导航 -->
-    <view
-      class="home-header"
-      :style="{ paddingTop: totalHeight + 'px', opacity: 1 - opacity }"
-    >
-      <view class="goto-address" @click="manualGetLocation">
-        <text>地址</text>
-        <text class="iconfont icon-chevron-down"></text>
-      </view>
-      <view
-        class="search-item"
-        @click="$Router.push('/pages/client/search/index')"
-      >
-        <u-search
-          placeholder="请输入搜索内容"
-          :showAction="false"
-          v-model="keyword"
-        />
-      </view>
-    </view>
-    <!-- 轮播图 -->
-    <view class="home-swiper">
-      <u-swiper :list="swiperList" indicator @change="change" @click="click" />
-    </view>
-    <!-- 商品分类 -->
-    <view class="home-list">
-      <u-grid :border="false" col="5">
-        <u-grid-item
-          v-for="(listItem, listIndex) in list1"
-          :key="listIndex"
-          @tap="$Router.push(listItem.url)"
-        >
-          <u-icon
-            :customStyle="{ paddingTop: 20 + 'rpx' }"
-            :name="listItem.name"
-            :size="25"
-          ></u-icon>
-          <text class="grid-text">{{ listItem.title }}</text>
-        </u-grid-item>
-      </u-grid>
-      <u-toast ref="uToast" />
-    </view>
-    <!-- 热门推荐 -->
-    <view class="hot">
-      <u-cell
-        :border="false"
-        value="查看更多"
-        isLink
-        @click="$Router.push('/pages/business/hot/index')"
-      >
-        <view slot="title" class="hot-title"> 热门推荐 </view>
+<template>
+  <view class="home">
+    <view class="nav-bar" v-if="opacity == 1">
+      <u-navbar :bgColor="'#ffffff'">
+        <view slot="left">
+          <text>地址</text>
+          <text class="iconfont icon-chevron-down"></text>
+        </view>
+        <view slot="center">
+          <u-search
+            placeholder="请输入搜索内容"
+            :showAction="false"
+            v-model="keyword"
+          />
+        </view>
+      </u-navbar>
+    </view>
+    <!-- 顶部导航 -->
+    <view
+      class="home-header"
+      :style="{ paddingTop: totalHeight + 'px', opacity: 1 - opacity }"
+    >
+      <view class="goto-address" @click="manualGetLocation">
+        <text>地址</text>
+        <text class="iconfont icon-chevron-down"></text>
+      </view>
+      <view
+        class="search-item"
+        @click="$Router.push('/pages/client/search/index')"
+      >
+        <u-search
+          placeholder="请输入搜索内容"
+          :showAction="false"
+          v-model="keyword"
+        />
+      </view>
+    </view>
+    <!-- 轮播图 -->
+    <view class="home-swiper">
+      <u-swiper :list="swiperList" indicator @change="change" @click="click" />
+    </view>
+    <!-- 商品分类 -->
+    <view class="home-list">
+      <u-grid :border="false" col="5">
+        <u-grid-item
+          v-for="(item, index) in categories"
+          :key="item.id"
+          @tap="handleMenuClick(item)"
+        >
+          <u-icon
+            :customStyle="{ paddingTop: 20 + 'rpx' }"
+            :name="item.icon"
+            :size="25"
+          ></u-icon>
+          <text class="grid-text">{{ item.name }}</text>
+        </u-grid-item>
+      </u-grid>
+      <u-toast ref="uToast" />
+    </view>
+    <!-- 热门推荐 -->
+    <view class="hot">
+      <u-cell
+        :border="false"
+        value="查看更多"
+        isLink
+        @click="$Router.push('/pages/business/hot/index')"
+      >
+        <view slot="title" class="hot-title"> 热门推荐 </view>
       </u-cell>
-      <block v-if="homeData.recommends&&homeData.recommends.length > 0">
-        <view>
-          <u-grid :border="false" col="2">
-            <u-grid-item
-              @click=" $Router.push(`/pages/business/detail/index?id=${item.id}`) "
-              v-for="item in homeData.recommends"
-              :key="item.id" >
-              <!-- homeData.recommends -->
-              <recommend-item :item="item"></recommend-item>
-            </u-grid-item>
-          </u-grid>
-        </view>
-      </block>
-      <block v-else>
-        <u-empty
-          icon="/static/default-graph/no-business.png"
-          text="暂无推荐商家"
-        ></u-empty>
-      </block>
-    </view>
-    <!-- 附近商家 -->
-    <view class="near">
-      <u-cell
-        :border="false"
-        value="查看更多"
-        isLink
-        @click="$Router.push('/pages/business/nearby/index')"
-      >
-        <view slot="title" class="near-title"> 附近商家 </view>
-      </u-cell>
-      <block v-if="homeData.nears&&homeData.nears.length > 0">
-        <view>
-          <u-grid :border="false" col="2">
-            <u-grid-item
-              @click="
-                $Router.push(`/pages/business/detail/index?id=${item.id}`)
-              "
-              v-for="item in homeData.nears"
-              :key="item.id"
-            >
-              <hot-item :item="item"></hot-item>
-            </u-grid-item>
-          </u-grid>
-        </view>
-      </block>
-      <block v-else>
-        <u-empty
-          icon="/static/default-graph/no-business.png"
-          text="暂无附近商家"
-        ></u-empty>
-      </block>
-    </view>
-  </view>
-</template>
-
-<script>
-import { getHomePage } from '@/api/home';
-import { mapGetters } from 'vuex';
-import RecommendItem from '@/components/merchant/RecommendItem.vue';
-import HotItem from '@/components/merchant/HotItem.vue';
-
-export default {
-  components: {
-    RecommendItem,
-    HotItem,
-  },
-  data() {
-    return {
-      list: [],
-      keyword: '',
-      swiperList: [
-        'https://cdn.uviewui.com/uview/swiper/swiper1.png',
-        'https://cdn.uviewui.com/uview/swiper/swiper2.png',
-        'https://cdn.uviewui.com/uview/swiper/swiper3.png',
-      ],
-      list1: [
-        {
-          name: 'photo',
-          title: '养车',
-          url: '/pages/business/classify/index',
-        },
-        {
-          name: 'lock',
-          title: '福利',
-        },
-        {
-          name: 'star',
-          title: '分类',
-        },
-        {
-          name: 'hourglass',
-          title: '自驾游',
-        },
-        {
-          name: 'home',
-          title: '门店',
-        },
-        {
-          name: 'photo',
-          title: '养车',
-        },
-        {
-          name: 'lock',
-          title: '福利',
-        },
-        {
-          name: 'star',
-          title: '分类',
-        },
-        {
-          name: 'hourglass',
-          title: '自驾游',
-        },
-        {
-          name: 'home',
-          title: '门店',
-        },
-        {
-          name: 'photo',
-          title: '养车',
-        },
-        {
-          name: 'lock',
-          title: '福利',
-        },
-        {
-          name: 'star',
-          title: '分类',
-        },
-        {
-          name: 'hourglass',
-          title: '自驾游',
-        },
-        {
-          name: 'home',
-          title: '商家列表',
-          url: '/pages/business/listpage/index',
-        },
-      ],
-      homeData: {
-        categories:[],
-        nears: [],
-        recommends: [],
-      },
-      scrollTop: 0,
-    };
-  },
-  computed: {
-    ...mapGetters(['location']),
-    totalHeight() {
-      return (
-        uni.getSystemInfoSync().statusBarHeight +
-        uni.getMenuButtonBoundingClientRect().height
-      );
-    },
-    opacity() {
-      if (this.scrollTop < this.totalHeight) {
-        return (this.scrollTop / this.totalHeight).toFixed(2);
-      }
-      return 1;
-    },
-  },
-  onPageScroll(e) {
-    this.scrollTop = e.scrollTop;
-  },
-  onLoad() {
-    setTimeout(() => {
-      this.list = new Array(10000).fill(1);
-    }, 5000);
-    uni.getLocation({
-      type: 'gcj02',
-      success: res => {
-        this.location.longitude = res.longitude;
-        this.location.latitude = res.latitude;
-        this.$store.commit('SET_LOCATION', {
-          longitude: res.longitude,
-          latitude: res.latitude,
-        });
-      },
-      fail: () => {
-        this.manualGetLocation();
-      },
-    });
-  },
-  methods: {
-    change() {},
-    click(name) {
-      this.$refs.uToast.success(`点击了第${name}个`);
-    },
-    getHomeData(location) {
-      getHomePage(location)
-        .then(res => {
-          this.homeData = res.data;
-          // 将分类数据做缓存处理
-          this.$store.commit('SET_CATEGORIES',this.homeData.categories)
-        })
-        .catch(err => {
-          console.log(err);
-        });
-    },
-    manualGetLocation() {
-      uni.chooseLocation({
-        success: res => {
-          this.$store.commit('SET_LOCATION', {
-            longitude: res.longitude,
-            latitude: res.latitude,
-          });
-        },
-      });
-    },
-  },
-  watch: {
-    location: {
-      handler: function (newVal, oldVal) {
-        this.getHomeData(newVal);
-      },
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.home {
-  background-color: #f0efef;
-  .nav-bar {
-    ::v-deep .u-navbar__content {
-      background-color: #ffffff;
-    }
-  }
-}
-
-/* 头部搜索栏 */
-.home-header {
-  display: flex;
-  align-items: center;
-  height: 90rpx;
-  line-height: 90rpx;
-  padding: 0 20rpx;
-  background-color: #ffffff;
-
-  .goto-address {
-    display: flex;
-    align-items: center;
-
-    .icon-sanjiaoxing1 {
-      font-size: 24rpx;
-      margin: 17rpx 10rpx 0 6rpx;
-    }
-  }
-  .search-item {
-    flex: 1;
-  }
-}
-
-/* 轮播图 */
-.home-swiper {
-  padding: 20rpx;
-  margin-bottom: 10rpx;
-}
-
-/* 商品分类 */
-.home-list {
-  background-color: #ffffff;
-  height: 360rpx;
-  margin: 0 20rpx 20rpx 20rpx;
-  border-radius: 10rpx;
-
-  .grid-text {
-    font-size: 12px;
-    color: #909399;
-    padding: 10rpx 0 20rpx 0rpx;
-    box-sizing: border-box;
-  }
-}
-
-/* 热门推荐 */
-.hot {
-  ::v-deep .u-cell__body {
-    padding: 10rpx 20rpx;
-    .hot-title {
-      border-left: 4px solid $uni-color-primary;
-      padding-left: 20rpx;
-    }
-  }
-}
-.near {
-  ::v-deep .u-cell__body {
-    padding: 10rpx 20rpx;
-    .near-title {
-      border-left: 4px solid $uni-color-primary;
-      padding-left: 20rpx;
-    }
-  }
-}
-</style>
+      <block v-if="homeData.recommends && homeData.recommends.length > 0">
+        <view>
+          <u-grid :border="false" col="2">
+            <u-grid-item
+              @click="
+                $Router.push(`/pages/business/detail/index?id=${item.id}`)
+              "
+              v-for="item in homeData.recommends"
+              :key="item.id"
+            >
+              <recommend-item :item="item"></recommend-item>
+            </u-grid-item>
+          </u-grid>
+        </view>
+      </block>
+      <block v-else>
+        <u-empty
+          icon="/static/default-graph/no-business.png"
+          text="暂无推荐商家"
+        ></u-empty>
+      </block>
+    </view>
+    <!-- 附近商家 -->
+    <view class="near">
+      <u-cell
+        :border="false"
+        value="查看更多"
+        isLink
+        @click="$Router.push('/pages/business/nearby/index')"
+      >
+        <view slot="title" class="near-title"> 附近商家 </view>
+      </u-cell>
+      <block v-if="homeData.nears && homeData.nears.length > 0">
+        <view>
+          <u-grid :border="false" col="2">
+            <u-grid-item
+              @click="
+                $Router.push(`/pages/business/detail/index?id=${item.id}`)
+              "
+              v-for="item in homeData.nears"
+              :key="item.id"
+            >
+              <hot-item :item="item"></hot-item>
+            </u-grid-item>
+          </u-grid>
+        </view>
+      </block>
+      <block v-else>
+        <u-empty
+          icon="/static/default-graph/no-business.png"
+          text="暂无附近商家"
+        ></u-empty>
+      </block>
+    </view>
+  </view>
+</template>
+
+<script>
+import { getHomePage, getCurrentLocation } from '@/api/home';
+import { mapGetters } from 'vuex';
+import RecommendItem from '@/components/merchant/RecommendItem.vue';
+import HotItem from '@/components/merchant/HotItem.vue';
+import { getHomePageApi, getCategoriesApi } from '@/api/tabbar/home';
+
+export default {
+  components: {
+    RecommendItem,
+    HotItem,
+  },
+  data() {
+    return {
+      list: [],
+      keyword: '',
+      swiperList: [
+        'https://cdn.uviewui.com/uview/swiper/swiper1.png',
+        'https://cdn.uviewui.com/uview/swiper/swiper2.png',
+        'https://cdn.uviewui.com/uview/swiper/swiper3.png',
+      ],
+      homeData: {
+        categories: [],
+        nears: [],
+        recommends: [],
+      },
+      scrollTop: 0,
+    };
+  },
+  computed: {
+    ...mapGetters(['location']),
+    totalHeight() {
+      return (
+        uni.getSystemInfoSync().statusBarHeight +
+        uni.getMenuButtonBoundingClientRect().height
+      );
+    },
+    opacity() {
+      if (this.scrollTop < this.totalHeight) {
+        return (this.scrollTop / this.totalHeight).toFixed(2);
+      }
+      return 1;
+    },
+    categories() {
+      let initData = this.homeData.categories.map(item => {
+        if (!item.icon) {
+          item.icon = 'level';
+        }
+        return item;
+      });
+      let result =
+        initData.length > 14
+          ? initData
+              .splice(0, 14)
+              .concat([
+                {
+				  id:'all',
+                  icon: 'grid-fill',
+                  name: '全部',
+                  type: { code: 'ALL', description: '全部' }
+                },
+              ])
+          : initData.push({ id:'all', icon: 'grid-fill', name: '全部' });
+      return result;
+    },
+  },
+  onPageScroll(e) {
+    this.scrollTop = e.scrollTop;
+  },
+  onLoad() {
+    setTimeout(() => {
+      this.list = new Array(10000).fill(1);
+    }, 5000);
+    uni.getLocation({
+      type: 'gcj02',
+      success: res => {
+        this.location.longitude = res.longitude;
+        this.location.latitude = res.latitude;
+        this.$store.commit('SET_LOCATION', {
+          longitude: res.longitude,
+          latitude: res.latitude,
+        });
+      },
+      fail: () => {
+        this.manualGetLocation();
+      },
+    });
+  },
+  methods: {
+    change() {},
+    click(name) {
+      this.$refs.uToast.success(`点击了第${name}个`);
+    },
+    // 获取首页数据
+    getHomeData(location) {
+      getHomePageApi(location)
+        .then(res => {
+          this.homeData = res.data;
+          // 将分类数据做缓存处理
+          this.$store.commit('SET_CATEGORIES', this.homeData.categories);
+        })
+        .catch(err => {
+          console.log(err);
+        });
+    },
+    // 手动选择城市
+    manualGetLocation() {
+      uni.chooseLocation({
+        success: res => {
+          this.$store.commit('SET_LOCATION', {
+            longitude: res.longitude,
+            latitude: res.latitude,
+          });
+        },
+      });
+    },
+    // 点击菜单
+    handleMenuClick(item){
+		if(item.id==='all'){
+			uni.navigateTo({
+				url:'pages/business/classfication/classfication'
+			})
+		}
+      uni.showToast({
+        title:'跳转至分类页面',
+        icon:'none'
+      })
+    }
+  },
+  watch: {
+    location: {
+      handler: async function (newVal, oldVal) {
+        const result = await getCurrentLocation(newVal);
+        const param = Object.assign({}, { region: result.data.id }, newVal);
+        this.getHomeData(param);
+      },
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.home {
+  background-color: #f0efef;
+  .nav-bar {
+    ::v-deep .u-navbar__content {
+      background-color: #ffffff;
+    }
+  }
+}
+
+/* 头部搜索栏 */
+.home-header {
+  display: flex;
+  align-items: center;
+  height: 90rpx;
+  line-height: 90rpx;
+  padding: 0 20rpx;
+  background-color: #ffffff;
+
+  .goto-address {
+    display: flex;
+    align-items: center;
+
+    .icon-sanjiaoxing1 {
+      font-size: 24rpx;
+      margin: 17rpx 10rpx 0 6rpx;
+    }
+  }
+  .search-item {
+    flex: 1;
+  }
+}
+
+/* 轮播图 */
+.home-swiper {
+  padding: 20rpx;
+  margin-bottom: 10rpx;
+}
+
+/* 商品分类 */
+.home-list {
+  background-color: #ffffff;
+  height: 360rpx;
+  margin: 0 20rpx 20rpx 20rpx;
+  padding: 20rpx 0;
+  border-radius: 10rpx;
+
+  .grid-text {
+    font-size: 12px;
+    color: #909399;
+    padding: 10rpx 0 20rpx 0rpx;
+    box-sizing: border-box;
+  }
+}
+
+/* 热门推荐 */
+.hot {
+  ::v-deep .u-cell__body {
+    padding: 10rpx 20rpx;
+    .hot-title {
+      border-left: 4px solid $uni-color-primary;
+      padding-left: 20rpx;
+    }
+  }
+}
+.near {
+  ::v-deep .u-cell__body {
+    padding: 10rpx 20rpx;
+    .near-title {
+      border-left: 4px solid $uni-color-primary;
+      padding-left: 20rpx;
+    }
+  }
+}
+</style>

src/pages/tabbar/mine/index.vue

@@ -4,7 +4,7 @@
       <view class="content">
         <view
           class="avatar-wrap"
-          @tap="$Router.push('/pages/my/personalCenter/index')"
+          @tap="$Router.push('/pages/user/personalCenter/index')"
         >
           <u-avatar :src="user_info.avatar" size="80"></u-avatar>
         </view>
@@ -15,7 +15,7 @@
             <view class="btn-wrap">
               <view
                 class="btn-content"
-                @tap="$Router.push('/pages/my/settings/index')"
+                @tap="$Router.push('/pages/user/settings/index')"
                 >设置</view
               >
               <view class="btn-content">认证</view>
@@ -55,7 +55,7 @@
       <!-- 我的订单 -->
       <view
         class="order-out-box"
-        @tap="$Router.push('/pages/my/myOrder/index')"
+        @tap="$Router.push('/pages/user/myOrder/index')"
       >
         <view class="order-inner-box">
           <u-grid :border="false" col="4" style="background-color: #fff">
@@ -102,7 +102,7 @@
         icon="setting-fill"
         title="预约列表"
         isLink
-        url="/pages/my/appoint/index"
+        url="/pages/user/appoint/index"
       />
     </view>
 
@@ -156,22 +156,22 @@ export default {
         {
           name: 'photo',
           title: '收藏',
-          url: '/pages/my/collect/index',
+          url: '/pages/user/collect/list',
         },
         {
           name: 'lock',
           title: '积分',
-          url: '/pages/my/score/index',
+          url: '/pages/user/score/index',
         },
         {
           name: 'star',
           title: '询价记录',
-          url: '/pages/my/inquiry/index',
+          url: '/pages/user/inquiry/index',
         },
         {
           name: 'hourglass',
           title: '优惠券',
-          url: '/pages/my/coupon/index',
+          url: '/pages/user/coupon/index',
         },
       ],
       list2: [

src/pages/my/appoint/index.vue → src/pages/user/appoint/index.vue

@@ -11,7 +11,7 @@
           <view>联系方式：18285564342</view>
         </view>
         <view class="appoint-goto">
-          <view class="detail" @tap="$Router.push('/pages/my/appointDetail/index')">详情</view>
+          <view class="detail" @tap="$Router.push('/pages/user/appointDetail/index')">详情</view>
           <view class="cancel" @click="show = true">取消</view>
         </view>
       </view>
@@ -32,7 +32,7 @@
           <view>联系方式：18285564342</view>
         </view>
         <view class="appoint-goto">
-          <view class="detail" @tap="$Router.push('/pages/my/appointDetail/index')">详情</view>
+          <view class="detail" @tap="$Router.push('/pages/user/appointDetail/index')">详情</view>
           <view class="cancel" @click="show = true">取消</view>
         </view>
       </view>
@@ -54,7 +54,7 @@
           <view>联系方式：18285564342</view>
         </view>
         <view class="appoint-goto">
-          <view class="detail" @tap="$Router.push('/pages/my/appointDetail/index')">详情</view>
+          <view class="detail" @tap="$Router.push('/pages/user/appointDetail/index')">详情</view>
           <view class="cancel" @click="show = true">取消</view>
         </view>
       </view>
@@ -170,4 +170,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/pages/my/collect/index.vue → src/pages/user/collect/list.vue

@@ -3,10 +3,7 @@
     <view class="text">以下是您收藏的商品服务</view>
 
     <!-- 收藏的服务 -->
-    <service />
-    <service />
-    <service />
-    <service />
+    <service v-for="item in 10" />
   </view>
 </template>
 

src/pages/my/coupon/index.vue → src/pages/user/coupon/index.vue

@@ -1,7 +1,5 @@
 <template>
   <view class="container">
-    <tab :navList="list" />
-
     <!-- 优惠券的可用和失效 -->
     <view class="use">
       <u-tabs
@@ -50,11 +48,7 @@
 </template>
 
 <script>
-import tab from '@/components/tab';
 export default {
-  components: {
-    tab,
-  },
   data() {
     return {
       list: [

src/pages/my/personalCenter/index.vue → src/pages/user/info/index.vue

@@ -9,7 +9,7 @@
       <view class="info-box">
         <view class="info-avatar">
           <Image src="https://cdn.uviewui.com/uview/album/1.jpg" />
-          <view class="edit" @tap="$Router.push('/pages/my/editData/index')">
+          <view class="edit" @tap="$Router.push('/pages/user/editData/index')">
             <u-icon name="edit-pen" color="#4688b6" />
             <view> 编辑资料</view>
           </view>