1

mer_uniapp/manifest.json

@@ -198,7 +198,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx7a0eaf18a8203184",
+        "appid" : "wx6357992aa9b1ca10",
         "setting" : {
             "urlCheck" : false,
             "minified" : true,

mer_uniapp/pages/goods/order_confirm/index.vue

@@ -163,10 +163,10 @@
 						<view>商品总价</view>
 						<view class='money'>￥{{orderInfoVo.proTotalFee || 0}}</view>
 					</view>
-					<view class='item acea-row row-between-wrapper' v-if="parseInt(orderInfoVo.freightFee) > 0">
+					<!-- <view class='item acea-row row-between-wrapper' v-if="parseInt(orderInfoVo.freightFee) > 0">
 						<view>运费：</view>
 						<view class='money'>￥{{orderInfoVo.freightFee}}</view>
-					</view>
+					</view> -->
 					<view v-show="orderInfoVo.svipDiscountPrice != 0 &&orderInfoVo.type!=2 && !orderType" class='item acea-row row-between-wrapper'>
 						<view>会员优惠</view>
 						<view class='money'>-￥{{orderInfoVo.svipDiscountPrice}}</view>

mer_uniapp/pages/index/index.vue

@@ -129,12 +129,12 @@
 
 					<view style="margin-top: 10rpx;display: flex;align-items: center;">
 						<text class="goods-info">起送 ¥ {{item.perCapita==null?0:item.perCapita}}</text>
-						<text v-if="!item.isfreeDeliverfee" class="goods-info" style="color: #E5AD21;margin-left: 18rpx;">免配送费</text>
-						<view v-if="!item.isfreeDeliverfee && item.freeDeliverFee > 0" style="color: #999999;font-size: 21rpx;margin-left: 10rpx;text-decoration: line-through;">¥
+						<text v-if="item.isfreeDeliverfee" class="goods-info" style="color: #E5AD21;margin-left: 18rpx;">免配送费</text>
+						<view v-if="item.isfreeDeliverfee && item.freeDeliverFee > 0" style="color: #999999;font-size: 21rpx;margin-left: 10rpx;text-decoration: line-through;">¥
 							{{item.freeDeliverFee}}</view>
-						<text v-if="item.isfreeDeliverfee" style="color: #999999;font-size: 21rpx;margin-left: 10rpx;">配送费¥
+						<text v-if="!item.isfreeDeliverfee" style="color: #999999;font-size: 21rpx;margin-left: 10rpx;">配送费¥
 							{{item.distCosts}}</text>
-						<text class="goods-info" style="margin-left: 38rpx;">10分钟</text>
+						<text class="goods-info" style="margin-left: 38rpx;">{{item.deliverTime}}分钟</text>
 						<text class="goods-info" style="margin-left: 10rpx;">{{item.distance}}</text>
 					</view>
 

mer_uniapp/pages/takeout/index.vue

@@ -26,8 +26,8 @@
 							<text class="mer-tj">今日推荐</text>
 							<text class="goods-score">{{recommendObj.score}}</text>
 							<text class="goods-info">月销量{{getFormattedSales(recommendObj.salesVolume)}}</text>
-							<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;">¥
+							<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: 10rpx;">配送费¥
 								{{recommendObj.distCosts}}</text>
@@ -82,17 +82,17 @@
 						<view style="margin-top: 10rpx;">
 							<text class="goods-score">{{item.score}}</text>
 							<text class="goods-info" style="margin-left: 10rpx;">月销 {{getFormattedSales(item.salesVolume)}}</text>
-							<text class="goods-info" style="margin-left: 25rpx;">人均 ¥ {{item.perCapita}}</text>
+							<text class="goods-info" style="margin-left: 25rpx;">人均 ¥ {{item.perCapita==null?0:item.perCapita}}</text>
 						</view>
 
 						<view style="margin-top: 10rpx;display: flex;align-items: center;">
-							<text class="goods-info">起送 ¥ {{item.perCapita}}</text>
-							<text v-if="!item.isfreeDeliverfee" class="goods-info" style="color: #E5AD21;margin-left: 18rpx;">免配送费</text>
-							<view v-if="!item.isfreeDeliverfee && item.freeDeliverFee > 0" style="color: #999999;font-size: 21rpx;margin-left: 10rpx;text-decoration: line-through;">¥
+							<text class="goods-info">起送 ¥ {{item.perCapita==null?0:item.perCapita}}</text>
+							<text v-if="item.isfreeDeliverfee" class="goods-info" style="color: #E5AD21;margin-left: 18rpx;">免配送费</text>
+							<view v-if="item.isfreeDeliverfee && item.freeDeliverFee > 0" style="color: #999999;font-size: 21rpx;margin-left: 10rpx;text-decoration: line-through;">¥
 								{{item.freeDeliverFee}}</view>
-							<text v-if="item.isfreeDeliverfee" style="color: #999999;font-size: 21rpx;margin-left: 10rpx;">配送费¥
+							<text v-if="!item.isfreeDeliverfee" style="color: #999999;font-size: 21rpx;margin-left: 10rpx;">配送费¥
 								{{item.distCosts}}</text>
-							<text class="goods-info" style="margin-left: 38rpx;">10分钟</text>
+							<text class="goods-info" style="margin-left: 38rpx;">{{item.deliverTime}}分钟</text>
 							<text class="goods-info" style="margin-left: 10rpx;">{{item.distance}}</text>
 						</view>
 						<view style="margin-top: 22rpx;"><text class="goods-sales">已售卖{{getFormattedSales(item.salesAllNum)}}单</text></view>