1

pages/favorite/favoriteKotra.vue

@@ -14,12 +14,12 @@
     ></u-tabs>
     <template>
       <u-empty
-        v-if="current == 0 && goodslist.length == 0"
-        text="没有任何收藏商品哦~"
+        v-if="goodslist.length == 0"
+        text="没有任何收藏哦~"
         mode="favor"
       ></u-empty>
       <view
-        v-if="current == 0 && goodslist.length > 0"
+        v-if="goodslist.length > 0"
         style="
           height: calc(100vh - 50px);
           width: calc(100vw - 20px);
@@ -41,13 +41,18 @@
                 <view class="good" @click="clickHandler(cx)">
                   <view class="good-img">
                     <image
-                      mode="aspectFit"
-                      :src="cx.CoverImage"
+                      mode="aspectFill"
+                      :src="cx.BannerList[0]"
                       style="width: 100%; height: 100%"
                     />
                   </view>
-                  <view class="good-name">{{ cx.Name }}</view>
-                  <view
+                  <view class="good-name">
+                    <text>{{ cx.SourceName }}</text>
+                    <view class="SourceFullName">{{
+                      cx.SourceFullName
+                    }}</view></view
+                  >
+                  <!-- <view
                     class="good-info"
                     v-if="setting && setting.is_show_korea == 0"
                   >
@@ -58,7 +63,7 @@
                     <view class="cart" @click.stop="showSkuHandler(cx)">
                       <u-icon name="cart-o" size="40" :color="mainColor" />
                     </view>
-                  </view>
+                  </view> -->
                 </view>
               </u-col>
             </u-row>
@@ -111,27 +116,6 @@
             bg-color="#f3f4f6"
           />
         </scroll-view>
-        <u-empty
-          v-if="current == 0 && goodslist.length == 0"
-          text="没有任何收藏哦~"
-          mode="favor"
-        ></u-empty>
-      </view>
-      <view
-        v-show="current == 1"
-        style="
-          height: calc(100vh - 50px);
-          width: calc(100vw - 20px);
-          margin-left: 10px;
-          overflow: hidden;
-          padding-top: 10px;
-        "
-      >
-        <u-empty
-          v-if="current == 1 && topiclist.length == 0"
-          text="没有任何收藏哦~"
-          mode="favor"
-        ></u-empty>
       </view>
     </template>
     <good-sku
@@ -229,6 +213,7 @@ export default {
     },
     change(index) {
       this.current = index;
+      this.msg.pageIndex = 1;
       this.goodslist = [];
       this.getList();
     },
@@ -244,10 +229,11 @@ export default {
         },
         (res) => {
           uni.hideLoading();
-          console.log(209, res);
+
           if (res.resultCode == 1) {
             this.goodslist = this.goodslist.concat(res.data.pageData);
             this.page_count = res.data.pageCount;
+            console.log(209, this.goodslist);
             if (this.page_count == 1) {
               this.status = "nomore";
             }
@@ -266,7 +252,7 @@ export default {
     },
     clickHandler(cx) {
       uni.navigateTo({
-        url: "/pages/goods/goods?GoodsId=" + cx.Id,
+        url: "/pages/kotra/brand/detail?id=" + cx.SourceId,
       });
     },
     lower(e) {
@@ -335,6 +321,15 @@ export default {
   width: 40rpx;
   text-align: right;
 }
+.SourceFullName {
+  color: #999999;
+  font-size: 22rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 1;
+  -webkit-box-orient: vertical;
+}
 .good_study_one {
   margin: 12px;
   position: relative;

pages/kotra/brand/detail.vue

@@ -32,9 +32,9 @@
                 height: 86px;
                 margin-left: 12rpx;
                 margin-right: -40rpx;
-				position:absolute
-				top:0;
-				right:30rpx;
+                position: absolute;
+                top: 0;
+                right: 30rpx;
               "
               @click="follow"
             >
@@ -986,13 +986,12 @@ export default {
     },
     // 关注与取消关注
     follow() {
-      console.log("follow");
       let that = this;
       let parms = {
         url: "/api/AppletTrade/GetCollect",
         data: {
-          SourceId: this.id,
-          Id: this.detailData.CollectId,
+          SourceId: this.ID,
+          Id: this.details.CollectId,
           Type: 2,
         },
       };