src/pages.json

@@ -6,7 +6,7 @@
     {
       "path": "pages/index",
       "style": {
-        "navigationBarTitleText": "首页",
+        "navigationBarTitleText": "开屏广告",
         "navigationStyle": "custom"
       }
     },
@@ -57,38 +57,32 @@
         {
           "path": "category",
           "style": {
-            "navigationBarTitleText": "分类"
+            "navigationBarTitleText": "商家分类"
           }
         },
         {
-          "path": "buy/index",
+          "path": "list",
           "style": {
-            "navigationBarTitleText": "提交订单"
+            "navigationBarTitleText": "商家列表"
           }
         },
         {
-          "path": "hot/index",
+          "path": "detail",
           "style": {
-            "navigationBarTitleText": "热门推荐"
+            "navigationBarTitleText": "商家详情"
           }
         },
         {
-          "path": "nearby/index",
+          "path": "service/list",
           "style": {
-            "navigationBarTitleText": "附近商家"
+            "navigationBarTitleText": "服务列表"
           }
         },
         {
-          "path": "service/index",
+          "path": "service/detail",
           "style": {
             "navigationBarTitleText": "服务详情"
           }
-        },
-        {
-          "path": "classify/index",
-          "style": {
-            "navigationBarTitleText": "养车"
-          }
         }
       ]
     },

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/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/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/tabbar/home/index.vue

@@ -176,17 +176,15 @@ export default {
       });
       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: '全部' });
+          ? 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;
     },
   },
@@ -241,17 +239,11 @@ export default {
       });
     },
     // 点击菜单
-    handleMenuClick(item){
-		if(item.id==='all'){
-			uni.navigateTo({
-				url:'pages/business/classfication/classfication'
-			})
-		}
-      uni.showToast({
-        title:'跳转至分类页面',
-        icon:'none'
-      })
-    }
+    handleMenuClick(item) {
+      if (item.id === 'all') {
+        this.$Router.push('/pages/business/category')
+      }
+    },
   },
   watch: {
     location: {