Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

pages/kotra/brand/brandComponent.vue

@@ -22,7 +22,7 @@
             <view class="good-info">
               <view class="good-name">{{ x.BrandName }}</view>
               <view class="good-price-info">
-                <span class="price">{{ x.CategoryName }}</span>
+                <span class="price">{{ x.FullBrandName }}</span>
               </view>
             </view>
           </view>

pages/kotra/brand/list.vue

@@ -568,6 +568,7 @@ export default {
   color: #111111;
   font-size: 26rpx;
   font-weight: bold;
+  font-family: unset;
 }
 
 .good_study_two .good-info .good-price-info {

pages/kotra/carrier/list.vue

@@ -21,7 +21,7 @@
             ></u-search>
         </view>
         <view v-else class="carrierSearch" style="padding: 5px 10px;margin-top: 6rpx;">
-            <view class="carrierSearch-left">
+            <!-- <view class="carrierSearch-left">
               <uni-section title="" type="line">
                 <uni-data-select
                   v-model="msg.IsChengDu"
@@ -31,7 +31,7 @@
                 ></uni-data-select>
               </uni-section>
             </view>
-            <view class="carrierSearch-auto"></view>
+            <view class="carrierSearch-auto"></view> -->
             <view class="carrierSearch-right">
               <input v-if="replace.state=='1'" v-model="msg.CarrierName" 
               :placeholder="`搜索载体名称`"