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

pages/kotra/BrandEnterSetIn/components/carrierInformation.vue

@@ -284,7 +284,7 @@
       >
       <view class="bottom-border_r" style="padding: 10px 0;height: 42px;display: flex;" 
       @click="disabled ||disabled2?'':(showTypeStatus= true,showType=1)">
-				<input type="text" v-model="BrandClassName" :disabled="true" style="padding: 10px 0;width: 1px;flex:1" placeholder="请选择品牌分类"  placeholder-style="color:#CECECE;">
+				<input type="text" v-model="BrandClassName" :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>
       <u-popup v-model="showTypeStatus" mode="bottom" >