diff --git a/App.vue b/App.vue
index 57bdd46..19f646f 100644
--- a/App.vue
+++ b/App.vue
@@ -110,6 +110,7 @@
 							restaurant_id: this['globalData']['parameters'].restaurant_id,
 							restaurant_name: this['globalData']['parameters'].restaurant_name,
 							special: false,
+							distance: this['globalData']['parameters'].distance
 						})
 					};
 				}
diff --git a/components/b-rx-commodity-item/b-rx-commodity-item.vue b/components/b-rx-commodity-item/b-rx-commodity-item.vue
index a4958da..e5edc74 100644
--- a/components/b-rx-commodity-item/b-rx-commodity-item.vue
+++ b/components/b-rx-commodity-item/b-rx-commodity-item.vue
@@ -37,8 +37,8 @@
 				￥{{item['pay_price']}}
 			</view>
 			<view class="num" v-else-if="!item['original_price'] && (BrandInfor['brand_id'] == 13 || BrandInfor['brand_id'] == 1)">
-				<text class="now">￥{{item['bt_price'] * (item['num']?item['num']:item['amount'])}}</text>
-				<text class="last">￥{{item['pay_price'] * (item['num']?item['num']:item['amount'])}}</text>
+				<view class="now">￥{{item['bt_price'] * (item['num']?item['num']:item['amount'])}}</view>
+				<view class="last">￥{{item['pay_price'] * (item['num']?item['num']:item['amount'])}}</view>
 			</view>
 			<view class="num" v-else-if="!item['original_price'] && BrandInfor['brand_id'] == 10">
 				￥{{item['adj_pay'] * (item['num']?item['num']:item['amount'])}}
@@ -134,10 +134,9 @@
 
 		.quantity {
 			// display: flex;
-			// justify-content: space-between;
+			// justify-content: space-between;
 			font-size: 30rpx;
-			flex: 1;
-			color: #4A6FE7;
+			color: #3A6FE7;
 			.num {
 				text-align: center;
 			}
diff --git a/pages/restaurant/order/orders-settlement/orders-settlement.vue b/pages/restaurant/order/orders-settlement/orders-settlement.vue
index bc488be..ac146c0 100644
--- a/pages/restaurant/order/orders-settlement/orders-settlement.vue
+++ b/pages/restaurant/order/orders-settlement/orders-settlement.vue
@@ -163,12 +163,18 @@
 				<view>
 					<view class="zero-content">
 						<view class="item flex">
-							<text>抵用券</text>
-							<text class="blod">{{computedTotal.used_broker}}</text>
+							<text>抵用券抵扣</text>
+							<text class="blod">
+								<text v-if="computedTotal.used_broker">-</text>
+								<text>{{computedTotal.used_broker}}</text>
+							</text>
 						</view>
 						<view class="item flex">
-							<text>余额</text>
-							<text class="blod">{{computedTotal.used_coin}}</text>
+							<text>余额抵扣</text>
+							<text class="blod">
+								<text v-if="computedTotal.used_coin">-</text>
+								<text>{{computedTotal.used_coin}}</text>
+							</text>
 						</view>
 						<view class="know">
 							<view class="left">
@@ -428,8 +434,10 @@
 							wx.miniProgram.navigateTo({
 								url: `/pages/goods/order_list/index`
 							});
+							uni.hideLoading();
 						}, 1000)
 					} else {
+						uni.showLoading({ title: '支付成功, 跳转订单页' });
 						this.$Payment.H5TOWX_Payment({
 							datas: res['data'],
 							shopInfo: from.products,
diff --git a/pages/restaurant/order/orders-settlement/settlement.vue b/pages/restaurant/order/orders-settlement/settlement.vue
index 06059fe..7cb94ab 100644
--- a/pages/restaurant/order/orders-settlement/settlement.vue
+++ b/pages/restaurant/order/orders-settlement/settlement.vue
@@ -138,12 +138,18 @@
 				<view>
 					<view class="zero-content">
 						<view class="item flex">
-							<text>抵用券</text>
-							<text class="blod">{{computedTotal.used_broker}}</text>
+							<text>抵用券抵扣</text>
+							<text class="blod">
+								<text v-if="computedTotal.used_broker">-</text>
+								<text>{{computedTotal.used_broker}}</text>
+							</text>
 						</view>
 						<view class="item flex">
-							<text>余额</text>
-							<text class="blod">{{computedTotal.used_coin}}</text>
+							<text>余额抵扣</text>
+							<text class="blod">
+								<text v-if="computedTotal.used_coin">-</text>
+								<text>{{computedTotal.used_coin}}</text>
+							</text>
 						</view>
 						<view class="know">
 							<view class="left">
@@ -377,6 +383,7 @@
 							wx.miniProgram.navigateTo({
 								url: `/pages/goods/order_list/index`
 							});
+							uni.hideLoading();
 						}, 1000)
 					} else {
 						this.$Payment.H5TOWX_Payment({
diff --git a/static/js/mixin/PayMixin.js b/static/js/mixin/PayMixin.js
index 1742a08..a66e635 100644
--- a/static/js/mixin/PayMixin.js
+++ b/static/js/mixin/PayMixin.js
@@ -50,23 +50,23 @@ class Payment {
 					wx.miniProgram.navigateTo({
 						url: `/pages/extension/shop/wxPay/wxPay?data=${encodeURIComponent(JSON.stringify(OrderData))}&shopInfo=${encodeURIComponent(JSON.stringify(shopInfo))}`
 					});
-					
 					// 延迟两秒后H5内部跳转
-					// setTimeout(()=>{
-					// 	uni.hideLoading();
-					// 	if(return_url){
-					// 		// 是否需要关闭调起支付的页面
-					// 		if(redirect){
-					// 			uni.redirectTo({
-					// 				url:return_url
-					// 			});
-					// 		}else{
-					// 			uni.navigateTo({
-					// 				url:return_url
-					// 			})
-					// 		}
-					// 	}
-					// },2000)
+					setTimeout(()=>{
+						uni.hideLoading();
+						// if(return_url){
+						// 	// 是否需要关闭调起支付的页面
+						// 	if(redirect){
+						// 		uni.redirectTo({
+						// 			url:return_url
+						// 		});
+						// 	}else{
+						// 		uni.navigateTo({
+						// 			url:return_url
+						// 		})
+						// 	}
+						// }
+						uni.hideLoading();
+					},2000)
 				}catch(e){
 					console.log(e)
 					uni.hideLoading();
@@ -101,22 +101,23 @@ class Payment {
 				// 	// return
 				// 	location.href = res['data']['openlink'];
 				// 	// 延迟两秒后H5内部跳转
-					setTimeout(()=>{
-						uni.hideLoading();
-						if(return_url){
-							// 是否需要关闭调起支付的页面
-							if(redirect){
-								uni.redirectTo({
-									url:return_url
-								});
-							}else{
-								uni.navigateTo({
-									url:return_url
-								})
-							}
-						}
-					},2000)
+					// setTimeout(()=>{
+					// 	uni.hideLoading();
+					// 	if(return_url){
+					// 		// 是否需要关闭调起支付的页面
+					// 		if(redirect){
+					// 			uni.redirectTo({
+					// 				url:return_url
+					// 			});
+					// 		}else{
+					// 			uni.navigateTo({
+					// 				url:return_url
+					// 			})
+					// 		}
+					// 	}
+					// },2000)
 				// })
+				uni.hideLoading();
 			}
 		}else{
 			OrderData['WechatRetreat'] = true;