[优化] 个人中心扫码核销成功跳转到商户订单详情页

[优化] 客服落地页地址信息过长显示问题
[优化] 商家订单详情页增加吸底状态提示，并更换接口

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';

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);
 							});
 						}
 					}

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>

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 => {