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

# Conflicts:
#	pages/kotra/carrier/list.vue

pages/kotra/brand/list.vue

@@ -116,7 +116,12 @@
 					},
 					(res) => {
 						if (res.resultCode == 1) {
+							let obj = {
+								ID:0,
+								ClassName:'全部'
+							}
 							this.typeList = res.data
+							this.typeList.unshift(obj)
 							if(this.msg.BrandClassId ==0){
 								this.msg.BrandClassId = this.typeList[0].ID
 							}else{//指定跳入分类

pages/kotra/carrier/detail.vue

@@ -21,7 +21,7 @@
 					</view>
 				</view>
 				<view
-					style="width: 100px;height: 50rpx;position: absolute;background-color: rgba(255,255,255,.6);border-radius: 50rpx;left: 50%;bottom: 80px;margin-left:-50px;">
+					style="width: 100px;height: 50rpx;position: absolute;background-color: rgba(255,255,255,.6);border-radius: 50rpx;left: 50%;bottom: 80px;margin-left:-50px;" v-if="detailData.VideoUrl!=''">
 					<u-tabs bg-color="rgba(0,0,0,0)" :is-scroll="false" name="Name" :list="typeList"
 						:active-color="mainColor" :current="active" @change="changeHandler" :show-bar="true"
 						:bold="false" height="50" duration="0" font-size="24" :activeFontSize="24" :typeStyle="2">
@@ -302,6 +302,9 @@
 					if (res.resultCode == 1) {
 						this.detailData=res.data
 						this.imgsList=[]
+						if(res.data.VideoUrl==''){
+							this.active=1
+						};
 						if(Array.isArray(res.data.BannerList)){
 							res.data.BannerList.map((e)=>{
 								let obj={