|
|
@@ -21,13 +21,13 @@
|
|
|
<!-- <go-search :theme="themeClass" @subMitSearch="subMitSearch"></go-search> -->
|
|
|
<view v-else class="commodity-list-wrapper" :style="{'overflow':'auto','height':(listData.length>4? windowHeight + 'px' : 'auto')}">
|
|
|
<scroll-view :style="{'height':(listData.length>4? scrollHeight+'px' : 'auto')}" @scrolltolower="scrolltolower" scroll-y v-if="!showEmpty">
|
|
|
- <view v-for="(item,index) in listData" :key="index" :id="item.id" class="all-type-list-content commodity-list" @click.stop="navToDetailPage(item.pid)">
|
|
|
- <image mode='widthFix' :src="item.image" class="list-img" alt="list-img"></image>
|
|
|
+ <view v-for="(item,index) in listData" :key="index" :id="item.id" class="all-type-list-content commodity-list" @click.stop="navToDetailPage(item.p_id)">
|
|
|
+ <image mode='widthFix' :src="item.p_image" class="list-img" alt="list-img"></image>
|
|
|
<view class="list-details-info">
|
|
|
- <view class="list-details-title">{{isInterceptHtmlFn(item.name)}}</view>
|
|
|
- <text class="list-details-specs">规格：{{item.unit}}</text>
|
|
|
- <view class="list-details-specs" v-if="item.productcode!=''&&item.productCode!=null">
|
|
|
- <view>商品编码：{{item.productCode}}</view>
|
|
|
+ <view class="list-details-title">{{isInterceptHtmlFn(item.p_name)}}</view>
|
|
|
+ <text class="list-details-specs">规格：{{item.p_unit}}</text>
|
|
|
+ <view class="list-details-specs" v-if="item.p_code!=''&&item.p_code!=null">
|
|
|
+ <view>商品编码：{{item.p_code}}</view>
|
|
|
</view>
|
|
|
<view class="list-details-price">
|
|
|
<view v-if="hasLogin"class="list-price">
|
|
|
@@ -36,12 +36,12 @@
|
|
|
<text v-else>￥<text class="price-larger">{{item.price?item.price :'0.00'}}</text></text>
|
|
|
</view>
|
|
|
<view v-if="userIdentity == 4">
|
|
|
- <view class="price-larger" v-if="item.priceflag == '1'">
|
|
|
+ <view class="price-larger" v-if="item.p_price_flag == '1'">
|
|
|
<text class="txt">未公开价格</text>
|
|
|
</view>
|
|
|
<text v-else-if="priceLoading" class="price-larger small">正在获取价格...</text>
|
|
|
<view v-else>
|
|
|
- <view class="price-larger" v-if="item.priceflag == '2'">
|
|
|
+ <view class="price-larger" v-if="item.p_price_flag == '2'">
|
|
|
<text class="txt">价格仅会员可见</text>
|
|
|
<text class="btn" @click.stop="this.$api.navigateTo(`/pages/login/apply?clubStatus=${clubStatus}`)">去升级</text>
|
|
|
</view>
|
|
|
@@ -49,7 +49,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<view v-if="userIdentity == 2">
|
|
|
- <view class="price-larger" v-if="item.priceflag == '1'">
|
|
|
+ <view class="price-larger" v-if="item.p_price_flag == '1'">
|
|
|
<text class="txt">未公开价格</text>
|
|
|
</view>
|
|
|
<text v-else-if="priceLoading" class="price-larger small">正在获取价格...</text>
|
|
|
@@ -58,7 +58,7 @@
|
|
|
</view>
|
|
|
<view v-else class="list-login-now">
|
|
|
<text class="p-no">价格:</text>
|
|
|
- <uni-stars :stars="parseInt(item.pricegrade)" :font-size='36' :width-info="180"></uni-stars>
|
|
|
+ <uni-stars :stars="parseInt(item.p_price_grade)" :font-size='36' :width-info="180"></uni-stars>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -202,7 +202,6 @@
|
|
|
setTimeout(()=>{ this.pullFlag = true; },500)
|
|
|
// 底部提示文案
|
|
|
if(this.totalPage>this.listData.length) {
|
|
|
- console.log('1111111111')
|
|
|
this.loadingText = '上拉加载更多';
|
|
|
} else {
|
|
|
this.showLoading = true;
|
|
|
@@ -229,7 +228,7 @@
|
|
|
if (!this.hasLogin) {return false;}
|
|
|
let productIdArr = [];
|
|
|
this.listData.map(item=>{// 0公开价格 1不公开价格 2仅对会员机构公开
|
|
|
- productIdArr.push(item.pid)
|
|
|
+ productIdArr.push(item.p_id)
|
|
|
})
|
|
|
this.productIds = productIdArr.join(",");
|
|
|
querySearchProductPrice({userId: this.userID,productIds:this.productIds}).then(response =>{
|
|
|
@@ -246,7 +245,7 @@
|
|
|
price:Number(priceList[i].price).toFixed(2),
|
|
|
minBuyNumber:priceList[i].minBuyNumber
|
|
|
}
|
|
|
- if( item.pid == priceList[i].productId ){
|
|
|
+ if( item.p_id == priceList[i].productId ){
|
|
|
Object.assign(item,priceObj)
|
|
|
}
|
|
|
}
|
