1

pages/favorite/favoriteKotra.vue

@@ -39,12 +39,19 @@
             <u-row gutter="20">
               <u-col span="6" v-for="(cx, ci) in goodslist" :key="ci">
                 <view class="good" @click="clickHandler(cx)">
-                  <view class="good-img">
+                  <view class="good-img" style="position: relative">
                     <image
                       mode="aspectFill"
                       :src="cx.BannerList[0]"
                       style="width: 100%; height: 100%"
                     />
+                    <view class="img-show-prize" v-if="x.ListEnroll[0]">
+                      <image
+                        style="width: 100%; height: 100%"
+                        mode="heightFix"
+                        :src="x.ListEnroll[0].MedalImage"
+                      />
+                    </view>
                   </view>
                   <view class="good-name">
                     <text>{{ cx.SourceName }}</text>
@@ -72,7 +79,7 @@
             <view v-for="(item, index) in goodslist" :key="index">
               <div
                 class="good_study_one"
-                @click="openGood(item.Id, item.ProjectType)"
+                @click="openGood(item.SourceId, item.ProjectType)"
                 :style="{
                   borderRadius: '15px',
                 }"
@@ -283,22 +290,29 @@ export default {
   border-radius: 10px;
   overflow: hidden;
   margin-bottom: 10px;
+  position: relative;
 }
 .favoriteStyle .u-good-list .good .good-img {
   width: calc(50vw - 15px);
   height: calc(50vw - 15px);
   display: block;
+  position: relative;
 }
 .favoriteStyle .u-good-list .good .good-name {
-  overflow: hidden;
+  /* overflow: hidden;
   text-overflow: ellipsis;
   display: -webkit-box;
   -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
+  -webkit-box-orient: vertical; */
+  white-space: nowrap;
   margin-bottom: 3px;
   font-size: 13px;
   margin: 7px 10px;
-  height: 36px;
+  /* height: 36px; */
+  margin-bottom: 8px;
+  color: #111111;
+  font-size: 26rpx;
+  font-weight: bold;
 }
 .favoriteStyle .u-good-list .good .good-info {
   display: flex;
@@ -325,10 +339,8 @@ export default {
   color: #999999;
   font-size: 22rpx;
   overflow: hidden;
+  white-space: nowrap;
   text-overflow: ellipsis;
-  display: -webkit-box;
-  -webkit-line-clamp: 1;
-  -webkit-box-orient: vertical;
 }
 .good_study_one {
   margin: 12px;
@@ -403,6 +415,7 @@ export default {
   color: #999999;
   font-size: 24rpx;
   margin-left: 10px;
+  margin-top: 10rpx;
 }
 .good_study_one .good-info .good-price-info {
   display: flex;
@@ -418,4 +431,13 @@ export default {
   width: 24px;
   text-align: right;
 }
+.img-show-prize {
+  height: 36rpx;
+  background: #ffffff;
+  border-radius: 0rpx 0rpx 20rpx 0rpx;
+  background-color: #fff;
+  position: absolute;
+  top: 0;
+  left: 0;
+}
 </style>

pages/kotra/brand/list.vue

@@ -55,7 +55,7 @@
         ><view
           class="screenBoxItemName"
           :class="{ activeName: item.Id == msg.PrizeId }"
-          >首店</view
+          >{{ item.Name }}</view
         >
       </view>
     </view>
@@ -442,7 +442,7 @@ export default {
   margin-bottom: 35rpx;
 }
 .screenBoxItem {
-  width: 130rpx;
+  /* width: 130rpx; */
   height: 46rpx;
   background-color: #e2e2e2;
   border-radius: 23rpx;
@@ -452,7 +452,7 @@ export default {
   overflow: hidden;
 }
 .screenBoxItemYear {
-  width: 50%;
+  /* width: 50%; */
   height: 46rpx;
   background: #e2e2e2;
   display: flex;
@@ -463,13 +463,15 @@ export default {
   font-weight: 500;
   white-space: nowrap;
   border-radius: 23px 0px 0px 23px;
+  box-sizing: border-box;
+  padding: 0 10rpx;
 }
 .activeYear {
   background: #1f1f1f;
   color: #ffffff;
 }
 .screenBoxItemName {
-  width: 50%;
+  /* width: 50%; */
   height: 46rpx;
   background: #eaeaea;
   display: flex;
@@ -478,7 +480,8 @@ export default {
   font-size: 22rpx;
   font-family: PingFang SC;
   font-weight: 500;
-
+  box-sizing: border-box;
+  padding: 0 10rpx;
   white-space: nowrap;
   border-radius: 0px 23px 23px 0px;
 }
@@ -487,11 +490,10 @@ export default {
   color: #111111;
 }
 .img-show-prize {
-  width: 126rpx;
   height: 36rpx;
   background: #ffffff;
   border-radius: 0rpx 0rpx 20rpx 0rpx;
-  background-color: #000;
+  background-color: #fff;
   position: absolute;
   top: 0;
   left: 0;

pages/kotra/carrier/detail.vue

@@ -210,6 +210,7 @@
               v-for="(item, index) in detailData.FirstShopNumList"
               :key="index"
               class="FirstShopBoxItem"
+              v-if="item.Num > 0"
             >
               <view
                 style="
@@ -236,9 +237,16 @@
           >
             <view style="flex: 1; font-size: 26rpx; color: #a4a4a4">
               <text style="width: 156rpx; text-align: right">去年业绩：</text>
-              <text style="color: #f30329; font-weight: bold"
+              <text
+                style="color: #f30329; font-weight: bold"
+                v-if="detailData.YeJi > 0"
                 >{{ detailData.YeJi }}w</text
               >
+              <text
+                style="color: #f30329; font-weight: bold"
+                v-if="detailData.YeJi <= 0"
+                >/</text
+              >
             </view>
             <view style="flex: 1; font-size: 26rpx; color: #a4a4a4">
               <text style="width: 156rpx; text-align: right">商业体量：</text>
@@ -306,15 +314,19 @@
           >
             <view style="flex: 1; font-size: 26rpx; color: #a4a4a4">
               <text style="width: 156rpx; text-align: right">可租面积：</text>
-              <text style="color: #f30329; font-weight: bold">{{
-                detailData.AreaRequirement
-              }}</text>
+              <text
+                style="color: #f30329; font-weight: bold"
+                v-if="detailData.AreaRequirement > 0"
+                >{{ detailData.AreaRequirement }}万平方米</text
+              >
             </view>
             <view style="flex: 1; font-size: 26rpx; color: #a4a4a4">
               <text style="width: 156rpx; text-align: right">经营面积：</text>
-              <text style="color: #f30329; font-weight: bold">{{
-                detailData.BuiltUpArea
-              }}</text>
+              <text
+                style="color: #f30329; font-weight: bold"
+                v-if="detailData.BuiltUpArea > 0"
+                >{{ detailData.BuiltUpArea }}万平方米</text
+              >
             </view>
           </view>
           <view
@@ -1040,11 +1052,13 @@ export default {
   margin-bottom: 30rpx;
 }
 .MedalBoxItem {
-  width: 33.33%;
+  width: 30%;
   height: 135rpx;
   display: flex;
   justify-content: center;
   align-items: center;
+  margin-right: 20rpx;
+  margin-bottom: 20rpx;
 }
 .FirstShopBox {
   margin-bottom: 30rpx;

pages/kotra/carrier/list.vue

@@ -114,8 +114,8 @@
                   <view v-if="item.ListEnroll.length > 0">
                     <image
                       style="height: 100%; border-radius: 10rpx 10rpx 0 0"
-                      mode="hrightFix"
-                      :src="item.ListEnroll[0]"
+                      mode="heightFix"
+                      :src="item.ListEnroll[0].MedalImage"
                     />
                   </view>
                 </div>
@@ -293,6 +293,9 @@ export default {
     }
     let c = this.$uiConfig.is_bang ? 78 : 50;
     this.contentHeight = this.$utils.calcContentHeight(c) + 40;
+    if (options && options.FirstStoreTest) {
+      this.msg.FirstStoreTest = options.FirstStoreTest;
+    }
     this.getTypeList();
   },
   created() {
@@ -451,16 +454,17 @@ export default {
   align-items: center;
 }
 .good_study_one .good-info .good-name .span-name {
-  overflow: hidden;
+  /* overflow: hidden;
   text-overflow: ellipsis;
   display: -webkit-box;
   -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
+  -webkit-box-orient: vertical; */
   font-size: 28rpx;
   font-weight: bold;
   color: #111;
   padding-bottom: 5px;
   flex: 1;
+  white-space: nowrap;
 }
 .good_study_one .good-info .good-name .span-type {
   font-weight: 500;