Commit d19457d8 authored by 罗超's avatar 罗超

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

# Conflicts:
#	pages/kotra/carrier/list.vue
parents 2ef9e43d 93e8f53e
...@@ -116,7 +116,12 @@ ...@@ -116,7 +116,12 @@
}, },
(res) => { (res) => {
if (res.resultCode == 1) { if (res.resultCode == 1) {
let obj = {
ID:0,
ClassName:'全部'
}
this.typeList = res.data this.typeList = res.data
this.typeList.unshift(obj)
if(this.msg.BrandClassId ==0){ if(this.msg.BrandClassId ==0){
this.msg.BrandClassId = this.typeList[0].ID this.msg.BrandClassId = this.typeList[0].ID
}else{//指定跳入分类 }else{//指定跳入分类
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</view> </view>
</view> </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" <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" :active-color="mainColor" :current="active" @change="changeHandler" :show-bar="true"
:bold="false" height="50" duration="0" font-size="24" :activeFontSize="24" :typeStyle="2"> :bold="false" height="50" duration="0" font-size="24" :activeFontSize="24" :typeStyle="2">
...@@ -302,6 +302,9 @@ ...@@ -302,6 +302,9 @@
if (res.resultCode == 1) { if (res.resultCode == 1) {
this.detailData=res.data this.detailData=res.data
this.imgsList=[] this.imgsList=[]
if(res.data.VideoUrl==''){
this.active=1
};
if(Array.isArray(res.data.BannerList)){ if(Array.isArray(res.data.BannerList)){
res.data.BannerList.map((e)=>{ res.data.BannerList.map((e)=>{
let obj={ let obj={
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment