更新

common/config.js

@@ -1,7 +1,7 @@
-const ROOTPATH = "https://mxys.chuanghai-tech.com/sqx_fast";//https://mxys.chuanghai-tech.com/sqx_fast/swagger/index.html
-// const ROOTPATH = "https://www.daweilinli.com/sqx_fast";
-const ROOTPATH1 = "https://mxys.chuanghai-tech.com/sqx_fast";//tcwm.xianmaxiong.com
-// const ROOTPATH1 = "https://www.daweilinli.com/sqx_fast";//tcwm.xianmaxiong.com
+// const ROOTPATH = "https://mxys.chuanghai-tech.com/sqx_fast";//https://mxys.chuanghai-tech.com/sqx_fast/swagger/index.html
+const ROOTPATH = "https://www.daweilinli.com/sqx_fast";
+// const ROOTPATH1 = "https://mxys.chuanghai-tech.com/sqx_fast";//tcwm.xianmaxiong.com
+const ROOTPATH1 = "https://www.daweilinli.com/sqx_fast";//tcwm.xianmaxiong.com
 const ROOTPATH2 = "wss://mxys.chuanghai-tech.com/wss/websocket/"//联系客服
 const ROOTPATH3 = "wss://mxys.chuanghai-tech.com/wss/ordersChat/"//聊天
 

my/setting/feedback.vue

@@ -5,7 +5,7 @@
 			<text @tap="chooseMsg">快速键入</text>
 		</view>
 		<view class="feedback-body"><textarea placeholder="请详细描述你的问题和意见..." v-model="sendDate.feedbackMessage" class="feedback-textare" /></view>
-		<view class="feedback-title"><text>QQ/邮箱</text></view>
+		<view class="feedback-title"><text>联系方式</text></view>
 		<view class="feedback-body"><input class="feedback-input" v-model="sendDate.userEmail" placeholder="方便我们联系你" /></view>
 
 		<button style="" class="feedback-submit" @tap="send">提交</button>
@@ -89,7 +89,7 @@ export default {
 			if (!this.sendDate.userEmail) {
 				uni.showToast({
 					icon: 'none',
-					title: '请填写QQ或邮箱'
+					title: '请填写联系方式'
 				});
 				return;
 			}

pages/index/search/index.vue

@@ -82,7 +82,11 @@
 										营业时间：{{item.businessHours}}-{{item.lockHours}}</view>
 									<view class="flex margin-top-xs justify-between align-start" style="width: 100%;">
 										<view class="flex flex-wrap align-center" style="width: 100%;height: 100%;overflow: hidden;">
-											<view class="lable flex justify-center align-center" v-if="item.exemptMinMoney">满{{item.exemptMinMoney}}免配送费</view>
+											<!-- <view class="lable flex justify-center align-center" v-if="item.enableFullReductionFlag==1">
+												不参与配送费满减</view> -->
+											<view class="lable flex justify-center align-center" v-if="item.enableFullReductionFlag==0&&item.exemptMinMoney">
+												满{{item.exemptMinMoney}}免配送费</view>
+											<!-- <view class="lable flex justify-center align-center" v-if="item.exemptMinMoney">满{{item.exemptMinMoney}}免配送费</view> -->
 											<view class="lable flex justify-center align-center" v-for="(ite,ind) in item.shopLable" :key='ind'
 												v-if="item.shopLable">
 												{{ite}}