支付联调

pages/index/coupons/index.vue

@@ -32,7 +32,12 @@
 						</view>
 						<view
 							:class="item.status == 0?'containertopboxitemright_four':'containertopboxitemright_fours'">
-							{{item.status == 0 ? '兑换积分':'已过期'}}
+							<text v-if="orderfood">
+								{{item.status == 0 ? '去使用':'无法使用'}}
+							</text>
+							<text v-else>
+								{{item.status == 0 ? '兑换积分':'已过期'}}
+							</text>
 						</view>
 					</view>
 				</view>
@@ -141,7 +146,7 @@
 						uni.navigateBack()
 					} else {
 						uni.showToast({
-							title: '此优惠卷不能用于目前订单',
+							title: '优惠券面值大于支付金额',
 							icon: "none",
 						})
 					}
@@ -156,7 +161,7 @@
 						uni.navigateBack()
 					} else {
 						uni.showToast({
-							title: '此优惠卷不能用于目前订单',
+							title: '优惠券面值大于支付金额',
 							icon: "none",
 						})
 					}

pages/index/jtoday.vue

@@ -23,8 +23,8 @@
 							<view>
 								{{item.shopName}}
 							</view>
-							<view>
-								龙首.{{item.distances}}km
+							<view style="margin-top: 20rpx;">
+								{{item.distances}}
 							</view>
 						</view>
 						<view class="fivecontent_item_nav_lefttopstart flex-start">
@@ -42,7 +42,7 @@
 						<image :src="item.image" mode=""></image>
 						<view class="fivecontent_item_boxitemleft flex-colum-start">
 							<view class="fivecontent_item_boxitemleftone flex-between">
-								<view>{{item.productName}}</view>
+								<view>{{item.productName.length>7?item.productName.substring(0,7)+'...':item.productName}}</view>
 								<text>已抢{{item.realSalesNumber}}份</text>
 							</view>
 							<view class="flex-start flexstartboxfttow">
@@ -77,7 +77,7 @@
 											:hour="item.end_times.h" :minute="item.end_times.m"
 											:second="item.end_times.s" :indexs='index' color="#FFFFFF"
 											border-color="#00B26A" splitorColor="#FFFFFF"
-											:font-size="7"></uni-countdown>
+											:font-size="10"></uni-countdown>
 
 									</view>
 
@@ -426,10 +426,14 @@
 								.indexboxitemlefttheretext {
 									// width: 100%;
 									margin-top: 12rpx;
-									align-items: flex-end;
+									display: flex;
+									justify-content: center;
+									align-items: center;
 
 									.fivecontent_item_boxitemlefthere_one {
-										align-items: flex-end;
+										display: flex;
+										justify-content: center;
+										align-items: center;
 
 										.flex_startone {
 											font-family: Source Han Sans CN, Source Han Sans CN;