|
@@ -29,8 +29,8 @@
|
|
|
<text v-if="recommendObj.isFreeDeliverFee" class="goods-info" style="color: #E5AD21;margin-left: 18rpx;">免配送费</text>
|
|
|
<view v-if="recommendObj.isFreeDeliverFee && recommendObj.freeDeliverFee > 0" style="color: #999999;font-size: 21rpx;margin-left: 10rpx;text-decoration: line-through;">¥
|
|
|
{{recommendObj.freeDeliverFee}}</view>
|
|
|
- <text v-if="!recommendObj.isFreeDeliverFee" style="color: #999999;font-size: 21rpx;margin-left: 2rpx;">配送费¥
|
|
|
- {{recommendObj.distCosts}}</text>
|
|
|
+ <!-- <text v-if="!recommendObj.isFreeDeliverFee" style="color: #999999;font-size: 21rpx;margin-left: 2rpx;">配送费¥
|
|
|
+ {{recommendObj.distCosts}}</text> -->
|
|
|
<text class="goods-info" style="margin-left: 10rpx;">{{recommendObj.distance}}</text>
|
|
|
</view>
|
|
|
</view>
|
|
@@ -131,7 +131,7 @@
|
|
|
getMerchantSearchList
|
|
|
} from '@/api/home.js';
|
|
|
import {
|
|
|
- getTakeoutList,
|
|
|
+ getRecommend,
|
|
|
getProduct
|
|
|
} from '@/api/takeout.js';
|
|
|
import tags from '../../mixins/tags';
|
|
@@ -210,8 +210,7 @@
|
|
|
that.getMatchedData()
|
|
|
console.log(that.optionData, '12312321321312321321312312')
|
|
|
})
|
|
|
-
|
|
|
- getTakeoutList({
|
|
|
+ getRecommend({
|
|
|
latitude: uni.getStorageSync('user_latitude'),
|
|
|
longitude: uni.getStorageSync('user_longitude'),
|
|
|
cateId: that.takeoutId
|
|
@@ -223,7 +222,7 @@
|
|
|
methods: {
|
|
|
getFormattedSales(value) {
|
|
|
// 转换成字符串,然后截取前三位,并添加“+”
|
|
|
- return value.length>3?`${String(value).slice(0, 3)}+`:value;
|
|
|
+ return value!=null&& String(value).length>3?`${String(value).slice(0, 3)}+`:value;
|
|
|
},
|
|
|
onScrollBottom() {
|
|
|
if (!this.loadTitle) {
|