完成搜索页面

src/components/Thanksgiving/index.vue

@@ -3,17 +3,17 @@
         <div class="head">
             <span class="title">感恩功德</span>
             <div class="list">
-                <span :class="[nav.id === type_id && 'current']" v-for="nav in type_nav" :key="nav.id" >{{ nav.title }}</span>
+                <span :class="[nav.id === type_id && 'current']" v-for="nav in type_nav" :key="nav.id" @click="onSetType(nav)">{{ nav.title }}</span>
             </div>
         </div>
         <div class="body">
-            <swiper :options="swiperOptions">
-                <swiper-slide v-for="slide in type_nav" :key="slide.id">
-                    <scroll-view>
+            <div :options="swiperOptions">
+                <div v-for="slide in type_nav"  :key="slide.id">
+                    <div v-if="type_id === slide.id">
                         <user-merit v-for="dynamic in slide.list" :key="dynamic.id" :data="dynamic" ></user-merit>
-                    </scroll-view>
-                </swiper-slide>
-            </swiper>
+                    </div>
+                </div>
+            </div>
             <div class="thanks-more" @click="onThankMore">查看更多</div>
         </div>
     </div>
@@ -48,10 +48,11 @@ export default {
                 { id: 3, title: "总榜", list: [] },
             ],
             swiperOptions: {
-                onSlideChangeEnd: ({realIndex}) => {
-                    this.type_id = this.type_nav[realIndex].id;
-                    this.getOrderCompare();
-                }
+
+                // onSlideChangeEnd: ({realIndex}) => {
+                //     this.type_id = this.type_nav[realIndex].id;
+                //     this.getOrderCompare();
+                // }
             }
         }
     },
@@ -59,9 +60,12 @@ export default {
         this.getOrderCompare();
     },
     methods: {
+        onSetType(type){
+            this.type_id = type.id;
+            this.getOrderCompare();
+        },
         async getOrderCompare(){
-            const res = await getOrderCompare(this.templeId, this.type_id, this.goodsId, this.goodsType)
-            console.log(res)
+            const res = await getOrderCompare(this.templeId || '1', this.type_id, this.goodsId, this.goodsType)
             const current = this.type_nav.find(item => item.id === this.type_id);
             current.list = res.list
         },

src/components/buddha-process/index.vue

@@ -12,7 +12,7 @@
             <div class="bar">
                 <span class="join">已有{{ privateData.sales }}人参与</span>
                 <div class="btn-group">
-                    <span class="btn" :class="[privateData.is_collected === 1 ? 'collect' : 'un-collect']" @click.stop="onCollect">
+                    <span class="btn" :class="[privateData.is_collected === 1 || privateData.collect === 1 ? 'collect' : 'un-collect']" @click.stop="onCollect">
                         <i class="iconfont icon-guanzhu-yiguanzhu"></i>
                         <b>关注</b>
                     </span>

src/components/user-merit/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="user-merit border-bottom" v-if="data">
+	<div class="user-merit border-bottom" v-if="data && data.user_info">
 		<img
 			:src="data.user_info.avatar"
 			alt=""
@@ -10,7 +10,7 @@
 					<span>{{data.user_info.nickname}}</span>
 					<span>{{data.user_info.region}}</span>
 				</div>
-				<p>{{data.goods_name}}</p>
+				<p class="goods_name">{{data.goods_name}}</p>
 			</div>
 		</div>
 		<div class="result">
@@ -27,7 +27,7 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .user-merit {
 	display: flex;
 	padding: .27rem 0.4rem;
@@ -58,8 +58,12 @@ export default {
 				display: inline-block;
 			}
 		}
-		p {
+		p.goods_name{
 			font-size: 0.32rem;
+            max-width: 4rem;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
 		}
 	}
 	.result {