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

pages/kotra/brandInformation.vue

@@ -93,13 +93,13 @@
 
 <template>
 	<view class="brandInformation">
-		<view class="bottom-border" v-if="datas.CompanyStatus==-1">
+		<!-- <view class="bottom-border" v-if="datas.CompanyStatus==-1">
 			<view class="label-text">关联品牌</view>
 			<view class="bottom-border_r" style="padding: 10px 0;height: 42px;display: flex;" @click="disabled==false? gobrandsearch():''">
 				<input type="text" v-model="glBrandName" :disabled="true" style="padding: 10px 0;width: 1px;flex:1" placeholder="请选择关联品牌"  placeholder-style="color:#CECECE;">
 				<u-icon name="arrow" color="#A5A4AC" size="30" ></u-icon>
 			</view>
-		</view>
+		</view> -->
 		<view class="bottom-border">
 			<view class="label-text">品牌分类<span style='color: #E54D42;' >*</span></view>
 			<view class="bottom-border_r" style="padding: 10px 0;height: 42px;display: flex;" @click="disabled || disabled3?'':showTypeStatus= true">
@@ -139,7 +139,7 @@
 				<image class="image" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616498310000_18.png" mode="widthFix"></image>
 			</view>
 			<view class="slot-btn" v-if="model.Logo!=''" @click="disabled?previewImage([model.Logo],1):''">
-				<image  :src="model.Logo" mode="widthFix"></image>
+				<image style="width: 220rpx;height: 220rpx;"  :src="model.Logo" mode="aspectFill"></image>
 			</view>
 			
 		</view>

pages/kotra/carrierInformation.vue

@@ -303,7 +303,7 @@
         v-if="model.Logo != ''"
         @click="disabled ? previewImage([model.Logo], 1) : ''"
       >
-        <image :src="model.Logo" mode="widthFix"></image>
+        <image style="width: 220rpx;height: 220rpx;" :src="model.Logo" mode="aspectFill"></image>
       </view>
     </view>
     <view class="label-text" style="margin-top: 20px; margin-bottom: 30rpx">