1

mer_uniapp/config/app.js

@@ -9,6 +9,7 @@
 // +----------------------------------------------------------------------
 //移动端商城API 网络接口修改此配置，小程序域名要求https 例如：https://api.front.merchant.java.crmeb.net
 let domain = 'https://hncsyy.com.cn'
+//domain = 'https://cswanwu.com.cn'
 //let domain = 'http://127.0.0.1:20810' 
 
 module.exports = {

mer_uniapp/mixins/tags.js

@@ -7,11 +7,25 @@ export default {
 				id: 0,
 				label: "销量排行",
 				checked: true
-			}],
+			},
+			 {
+				id: 1,
+				label: "满减大促",
+				checked: false
+			}, {
+				id: 2,
+				label: "减配送费",
+				checked: false
+			}, {
+				id: 3,
+				label: "首单立减",
+				checked: false
+			}
+			],
 		};
 	},
 	onLoad() {
-		this.getMeasures()
+		//this.getMeasures()
 	},
 	methods: {
 		getTag(){

mer_uniapp/pages/goods/order_confirm/index.vue

@@ -133,6 +133,10 @@
 						<view v-if='!item.freightFee || item.freightFee == 0' class="noCoupon">免配送费</view>
 						<view v-else class='money'>￥{{item.freightFee}}</view>
 					</view>
+					<view v-show="item.firstDeduc>0" class='item acea-row row-between-wrapper'>
+						<view>首单立减</view>
+						<view  class='money'>-￥{{item.firstDeduc}}</view>
+					</view>
 					<view v-show="item.svipDiscountPrice != 0&&orderInfoVo.type!=2 && !orderType" class='item acea-row row-between-wrapper'>
 						<view>会员优惠</view>
 						<view class='money'>-￥{{item.svipDiscountPrice}}</view>

mer_uniapp/pages/goods/order_details/index.vue

@@ -256,6 +256,10 @@
 						<view><text v-if="shippingType==4||shippingType==1">打包费：</text></view>
 						<view class='conter'>￥{{orderInfo.packingFee || 0}}</view>
 					</view>
+					<view class='item acea-row row-between' v-if='orderInfo.firstDeducPrice > 0'>
+						<view>首单立减：</view>
+						<view class='conter'>-￥{{orderInfo.firstDeducPrice || 0}}</view>
+					</view>
 					<view class='item acea-row row-between' v-if='orderInfo.svipDiscountPrice > 0'>
 						<view>会员优惠：</view>
 						<view class='conter'>-￥{{orderInfo.svipDiscountPrice || 0}}</view>
@@ -487,6 +491,7 @@
 				url: 1
 			});
 			if (options.orderType) this.orderType = options.orderType;
+			console.log(options.orderType+"=======");
 			this.$set(this, 'orderNo', options.orderNo);
 			this.bgColor = setThemeColor();
 			uni.setNavigationBarColor({

mer_uniapp/pages/order/index.vue

@@ -26,7 +26,7 @@
 					<text class="left-text">{{item.merName}}</text>
 					<view class="right-group">
 						<text v-if="item.status==1||item.status==2||item.status==3" style="color: #0FBA42;font-size: 23rpx;">制作中</text>
-						<text v-if="item.status==4" style="color: #FF5500;font-size: 23rpx;">待取餐</text>
+						<text v-if="item.status==4" style="color: #FF5500;font-size: 23rpx;">配送中</text>
 
 						<image src="/static/img/ic-yx.png" class="image" />
 					</view>
@@ -95,7 +95,7 @@
 				urlDomain: this.$Cache.get("imgHost"),
 				statusBarHeight: app.globalData.statusBarHeight,
 				navigationBarHeight: 0,
-				isShow: 0,
+				isShow: 1,
 				loading: false,
 				noDataTip: '',
 				loadTitle: '',
@@ -183,7 +183,7 @@
 				} else {
 					// #ifdef MP
 					uni.navigateTo({
-						url: '/pages/goods/order_details/index?orderNo=' + item.orderNo + `&orderType=${this.isShow}`
+						url: '/pages/goods/order_details/index?orderNo=' + item.orderNo
 					})
 					// #endif
 				}