|
|
|
@ -59,14 +59,13 @@ |
|
|
|
|
<view class="sort-item" @click="handleSortType1('')"> |
|
|
|
|
<text>筛选</text> |
|
|
|
|
</view> |
|
|
|
|
|
|
|
|
|
<!-- <view class="sort-item" :class="{ active: sortType === 'city' }" |
|
|
|
|
<view class="sort-item" :class="{ active: sortType === 'city' }" |
|
|
|
|
@click="handleSortType('city')"> |
|
|
|
|
<picker mode="selector" @change="multiChange" value="{{multiIndex}}" :range="multiArray" |
|
|
|
|
range-key="name"> |
|
|
|
|
<text>类型</text> |
|
|
|
|
<text>渠道</text> |
|
|
|
|
</picker> |
|
|
|
|
</view> --> |
|
|
|
|
</view> |
|
|
|
|
<!-- <view class="show-view btnOpera" @click="handleShowView"> |
|
|
|
|
<text class="iconfont icon-view-tile" v-if="showView"></text> |
|
|
|
|
<text class="iconfont icon-view-list" v-else></text> |
|
|
|
@ -148,7 +147,7 @@ |
|
|
|
|
{{item.cmmdty_model}} |
|
|
|
|
</view> |
|
|
|
|
</view> --> |
|
|
|
|
<!-- <view class="goodsSend"> |
|
|
|
|
<view class="goodsSend"> |
|
|
|
|
<view class="sendLeft"> |
|
|
|
|
<view class="left_1"> |
|
|
|
|
{{item.goods_source}} |
|
|
|
@ -166,7 +165,7 @@ |
|
|
|
|
<text v-if="item.delivery_time==5">30天内发货</text> |
|
|
|
|
<text v-if="item.delivery_time==6">45天内发货</text> |
|
|
|
|
</view> |
|
|
|
|
</view> --> |
|
|
|
|
</view> |
|
|
|
|
</view> |
|
|
|
|
</view> |
|
|
|
|
</view> |
|
|
|
@ -298,19 +297,25 @@ |
|
|
|
|
tabbar: [], |
|
|
|
|
multiArray: [{ |
|
|
|
|
value: 'JD', |
|
|
|
|
name: 'JD' |
|
|
|
|
name: '京东 ' |
|
|
|
|
}, { |
|
|
|
|
value: 'SN', |
|
|
|
|
name: 'SN' |
|
|
|
|
name: '苏宁' |
|
|
|
|
}, { |
|
|
|
|
value: 'GC', |
|
|
|
|
name: 'GC' |
|
|
|
|
name: '工厂' |
|
|
|
|
}, { |
|
|
|
|
value: 'CC', |
|
|
|
|
name: 'CC ' |
|
|
|
|
name: '仓储' |
|
|
|
|
}, { |
|
|
|
|
value: 'ZC', |
|
|
|
|
name: 'ZC' |
|
|
|
|
name: '自采' |
|
|
|
|
}, { |
|
|
|
|
value: 'TM', |
|
|
|
|
name: '天猫' |
|
|
|
|
}, { |
|
|
|
|
value: 'PF', |
|
|
|
|
name: '批发平台' |
|
|
|
|
}], |
|
|
|
|
multiIndex: -1, |
|
|
|
|
blheight: 0, |
|
|
|
@ -478,20 +483,21 @@ |
|
|
|
|
if (this.isActive) { |
|
|
|
|
categoryId = this.isActive |
|
|
|
|
} else { |
|
|
|
|
categoryId = this.isBanrdActive >0? this.isBanrdActive : ((app.options.categoryId || app.options.categoryId != undefined) ? app.options |
|
|
|
|
categoryId = this.isBanrdActive > 0 ? this.isBanrdActive : ((app.options.categoryId || app.options |
|
|
|
|
.categoryId != undefined) ? app.options |
|
|
|
|
.categoryId : 0) |
|
|
|
|
} |
|
|
|
|
const param = { |
|
|
|
|
sortType: app.sortType != 'city' ? app.sortType : '', |
|
|
|
|
sortPrice: Number(app.sortPrice), |
|
|
|
|
categoryId:categoryId, |
|
|
|
|
categoryId: categoryId, |
|
|
|
|
merchantId: app.options.merchantId, |
|
|
|
|
// goodsName: app.options.search || '', |
|
|
|
|
page: pageNo, |
|
|
|
|
// keywords: keywords.length > 0 ? keywords.join(',') : '', |
|
|
|
|
keyword: app.options.search || '', |
|
|
|
|
is_grad: app.is_grad |
|
|
|
|
// goods_source: this.multiIndex > -1 ? this.multiArray[this.multiIndex].value : '' |
|
|
|
|
is_grad: app.is_grad, |
|
|
|
|
goods_source: this.multiIndex > -1 ? this.multiArray[this.multiIndex].value : '' |
|
|
|
|
} |
|
|
|
|
return new Promise((resolve, reject) => { |
|
|
|
|
GoodsApi.list(param) |
|
|
|
|