🎉 init(all): 合并分支

src/pages.json

@@ -21,7 +21,11 @@
       "path": "pages/tabbar/message/index",
       "style": {
         "navigationBarTitleText": "消息",
+<<<<<<< HEAD
         "navigationStyle": "custom"
+=======
+        "navigationStyle":"custom"
+>>>>>>> 5c64821b583febbe84eb9ada69db507c9555ff73
       }
     },
     {

src/pages/business/detail/index.vue

@@ -1,5 +1,6 @@
 <template>
   <view class="detail">
+<<<<<<< HEAD
     <!-- 轮播图 -->
     <view class="carousel-map">
       <u-swiper
@@ -220,6 +221,21 @@
           </view>
         </view>
       </view>
+=======
+    <view class="detailItem">
+      <u-swiper
+        :list="list6"
+        :autoplay="false"
+        indicatorStyle="right: 20px"
+        class="swiper"
+      >
+        <view slot="indicator" class="indicator-num">
+          <text class="indicator-num__text"
+            >{{ currentNum + 1 }}/{{ list6.length }}</text
+          >
+        </view>
+      </u-swiper>
+>>>>>>> 5c64821b583febbe84eb9ada69db507c9555ff73
     </view>
   </view>
 </template>
@@ -228,13 +244,21 @@
 export default {
   data() {
     return {
+<<<<<<< HEAD
       count: 5,
       value: 3,
       list3: [
+=======
+      id: null, // 商家id
+      currentNum: 0,
+      list6: [
+        'https://cdn.uviewui.com/uview/swiper/swiper2.png',
+>>>>>>> 5c64821b583febbe84eb9ada69db507c9555ff73
         'https://cdn.uviewui.com/uview/swiper/swiper3.png',
         'https://cdn.uviewui.com/uview/swiper/swiper2.png',
         'https://cdn.uviewui.com/uview/swiper/swiper1.png',
       ],
+<<<<<<< HEAD
       list1: [
         { name: '全部' },
         { name: '养车' },
@@ -250,6 +274,20 @@ export default {
     click(item) {
       console.log('item', item);
     },
+=======
+    };
+  },
+  onLoad(option) {
+    if (option.id) this.id = option.id;
+    this.getBusinessInfo(this.id);
+    this.getBusinessComment(this.id);
+  },
+  methods: {
+    // 获取商家详情信息
+    getBusinessInfo(id) {},
+    // 获取商家评论信息
+    getBusinessComment(id) {},
+>>>>>>> 5c64821b583febbe84eb9ada69db507c9555ff73
   },
 };
 </script>
@@ -260,6 +298,7 @@ export default {
   background-color: #efefef;
 }
 
+<<<<<<< HEAD
 // 轮播图
 .carousel-map {
   background-color: #fff;
@@ -450,4 +489,18 @@ export default {
     }
   }
 }
+=======
+  &__text {
+    color: #ffffff;
+    font-size: 12px;
+  }
+}
+.detailItem {
+  height: 400rpx;
+  background-color: pink;
+  .u-swiper__wrapper__item__wrapper__image.data-v-7b038a67 {
+    height: 100%;
+  }
+}
+>>>>>>> 5c64821b583febbe84eb9ada69db507c9555ff73
 </style>

src/pages/tabbar/home/index.vue

@@ -1,5 +1,23 @@
 <template>
   <view class="home">
+<<<<<<< HEAD
+=======
+    <view class="nav-bar" v-if="opacity == 1">
+      <u-navbar :bgColor="'#ffffff'">
+        <view slot="left">
+          <text>地址</text>
+          <text class="iconfont icon-sanjiaoxing1"></text>
+        </view>
+        <view slot="center">
+          <u-search
+            placeholder="请输入搜索内容"
+            :showAction="false"
+            v-model="keyword"
+          />
+        </view>
+      </u-navbar>
+    </view>
+>>>>>>> 5c64821b583febbe84eb9ada69db507c9555ff73
     <!-- 顶部导航 -->
     <view
       class="home-header"
@@ -11,7 +29,11 @@
       </view>
       <view
         class="search-item"
+<<<<<<< HEAD
         @tap="$Router.push('/pages/client/search/index')"
+=======
+        @click="Router.push('/pages/client/search/index')"
+>>>>>>> 5c64821b583febbe84eb9ada69db507c9555ff73
       >
         <u-search
           placeholder="请输入搜索内容"
@@ -27,11 +49,19 @@
     <!-- 商品分类 -->
     <view class="home-list">
       <u-grid :border="false" col="5">
+<<<<<<< HEAD
         <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="20"
+=======
+        <u-grid-item v-for="(listItem, listIndex) in list1" :key="listIndex">
+          <u-icon
+            :customStyle="{ paddingTop: 20 + 'rpx' }"
+            :name="listItem.name"
+            :size="25"
+>>>>>>> 5c64821b583febbe84eb9ada69db507c9555ff73
           ></u-icon>
           <text class="grid-text">{{ listItem.title }}</text>
         </u-grid-item>
@@ -40,8 +70,12 @@
     </view>
     <!-- 热门推荐 -->
     <view class="hot">
+<<<<<<< HEAD
       <u-cell :border="false" value="查看更多" isLink 
       @tap="$Router.push('/pages/business/hot/index')">
+=======
+      <u-cell :border="false" value="查看更多" isLink>
+>>>>>>> 5c64821b583febbe84eb9ada69db507c9555ff73
         <view slot="title" class="hot-title"> 热门推荐 </view>
       </u-cell>
       <block v-if="homeData.recommendMerchants.length > 0">
@@ -68,8 +102,12 @@
     </view>
     <!-- 附近商家 -->
     <view class="near">
+<<<<<<< HEAD
       <u-cell :border="false" value="查看更多" isLink 
       @tap="$Router.push('/pages/business/nearby/index')">
+=======
+      <u-cell :border="false" value="查看更多" isLink>
+>>>>>>> 5c64821b583febbe84eb9ada69db507c9555ff73
         <view slot="title" class="near-title"> 附近商家 </view>
       </u-cell>
       <block v-if="homeData.nearbyMerchants.length > 0">

src/pages/tabbar/message/index.vue

@@ -1,5 +1,9 @@
 <template>
+<<<<<<< HEAD
   <view class="messages">
+=======
+  <view>
+>>>>>>> 5c64821b583febbe84eb9ada69db507c9555ff73
     <u-navbar>
       <view slot="left"></view>
       <view slot="center">