From 0f0998e5727bc45979a1b9915565cc2c8ac6564a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Wed, 30 Jun 2021 12:04:04 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BC=98=E5=8C=96]=20=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=89=AB=E7=A0=81=E6=A0=B8=E9=94=80=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E8=B7=B3=E8=BD=AC=E5=88=B0=E5=95=86=E6=88=B7=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=20[=E4=BC=98=E5=8C=96]=20?=
 =?UTF-8?q?=E5=AE=A2=E6=9C=8D=E8=90=BD=E5=9C=B0=E9=A1=B5=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=BF=87=E9=95=BF=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20[=E4=BC=98=E5=8C=96]=20=E5=95=86=E5=AE=B6=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E5=A2=9E=E5=8A=A0=E5=90=B8?=
 =?UTF-8?q?=E5=BA=95=E7=8A=B6=E6=80=81=E6=8F=90=E7=A4=BA=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/api.js                     |  1 +
 pages/center/index.vue            |  8 +++++++-
 pages/contactService/index.vue    |  4 +---
 pages/shopOrder/order-details.vue | 12 +++++++++++-
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/common/api.js b/common/api.js
index 84f4555..a307cb6 100644
--- a/common/api.js
+++ b/common/api.js
@@ -15,6 +15,7 @@ export const API_USERORDER = '/api/order/list';
 
 // 商户订单
 export const API_SHOPORDER = '/api/order/listForStore';
+export const API_ORDER_DETAILFORSTORE = '/api/order/detailForStore'; // 商户订单详情
 
 //订单详情
 export const API_ORDER_DETAILS = '/api/order/detail';
diff --git a/pages/center/index.vue b/pages/center/index.vue
index e0fc1fb..f2001ad 100644
--- a/pages/center/index.vue
+++ b/pages/center/index.vue
@@ -8,7 +8,7 @@
 					<text class="lf-font-bold">{{ info.nickname }}</text>
 					<text class="user-label" v-for="(item, index) in info.tags" :key="index">{{ item }}</text>
 				</view>
-				<view class="lf-m-t-20 lf-font-28">
+				<view class="lf-m-t-20 lf-font-28" style="color: #555555;">
 					<text>ID {{ info.id }}</text>
 					<text class="lf-m-l-30">{{ hidePhone(info.tel) }}</text>
 				</view>
@@ -91,6 +91,8 @@
 </template>
 
 <script>
+	let time = null;
+	
 	export default {
 		data() {
 			return {
@@ -161,6 +163,10 @@
 							let content = result.result; // 核销码
 							this.$http(this.API.API_CONFIRM_CODE, {confirm_code: content}).then(res => {
 								this.$msg(res.msg, {icon: 'success'});
+								let order_id = res.data.id;
+								time = setTimeout(() => {
+									this.$url('/pages/shopOrder/order-details?order_id='+ order_id);
+								}, 1000);
 							});
 						}
 					}
diff --git a/pages/contactService/index.vue b/pages/contactService/index.vue
index 0981268..c052867 100644
--- a/pages/contactService/index.vue
+++ b/pages/contactService/index.vue
@@ -4,7 +4,6 @@
 			<view class="lf-color-gray">在线客服</view>
 			<button class="btn" open-type="contact">在线联系</button>
 		</view>
-		
 		<view class="lf-row-between item">
 			<view class="lf-color-gray">服务时间</view>
 			<view>{{ info.service_period }}</view>
@@ -15,7 +14,7 @@
 		</view>
 		<view class="lf-row-between item">
 			<view class="lf-color-gray">联系地址</view>
-			<view>{{ info.address }}</view>
+			<view style="max-width: 500rpx;">{{ info.address }}</view>
 		</view>
 		<view class="lf-row-between item">
 			<view class="lf-color-gray">客服微信</view>
@@ -24,7 +23,6 @@
 				<text class="lf-m-l-20 lf-color-primary" @click="copy">复制</text>
 			</view>
 		</view>
-		
 		<view class="lf-row-between item">
 			<view class="lf-color-gray">当前版本</view>
 			<view>{{ version }}</view>
diff --git a/pages/shopOrder/order-details.vue b/pages/shopOrder/order-details.vue
index 8f37561..8cd1b2a 100644
--- a/pages/shopOrder/order-details.vue
+++ b/pages/shopOrder/order-details.vue
@@ -56,6 +56,16 @@
 					</view>
 				</view>
 				<self-line/>
+				<view style="height: 92rpx;"></view>
+				<view class="padding-lr padding-tb-sm bg-white flex justify-between align-center solid-top1 btn-bottom">
+					<view class="flex align-center">
+						<text class="text-gray lf-font-28" style="margin-right: 20rpx;">实付款</text>
+						<lf-price :price="orderDetails.amount" /> 
+					</view>
+					<view class="lf-font-32 text-black1">
+						{{ orderDetails.state_text.text }}
+					</view>
+				</view>
 			</skeleton>
 		</block>
 	</view>
@@ -86,7 +96,7 @@
 		},
 		methods: {
 			getOrderDetails() {
-				this.$http(this.API.API_ORDER_DETAILS, {order_id: this.order_id}).then(res => {
+				this.$http(this.API.API_ORDER_DETAILFORSTORE, {order_id: this.order_id}).then(res => {
 					this.orderDetails = res.data
 					this.skeletonLoading = false
 				}).catch(err => {