From 28cb87202b7a73567b4a9eff2755efa1ae94e057 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Mon, 18 Nov 2024 15:18:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E9=A2=84?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 http/yskApi/http.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/http/yskApi/http.js b/http/yskApi/http.js
index 67aef22..2f109f3 100644
--- a/http/yskApi/http.js
+++ b/http/yskApi/http.js
@@ -17,10 +17,10 @@ import infoBox from "@/commons/utils/infoBox.js"
 import go from '@/commons/utils/go.js';
 import { reject } from 'lodash';
 // 测试服
-let baseUrl = 'https://admintestpapi.sxczgkj.cn'
+// let baseUrl = 'https://admintestpapi.sxczgkj.cn'
 
 //预发布
-// let baseUrl = 'https://pre-cashieradmin.sxczgkj.cn'
+let baseUrl = 'https://pre-cashieradmin.sxczgkj.cn'
 
 //正式
 // let baseUrl = 'https://cashieradmin.sxczgkj.cn'

From 31df2b99d46f6ba627f84763a5d09f32455036e0 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Tue, 19 Nov 2024 14:51:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=9A=E5=91=98=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=B0=86=E6=B2=A1=E6=9C=89=E7=9A=84=E5=AD=97=E6=AE=B5=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E8=AE=A2=E5=8D=95=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesCreateOrder/confirm-order/confirm-order.vue | 4 ++--
 pagesOrder/detail/components/user.vue            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pagesCreateOrder/confirm-order/confirm-order.vue b/pagesCreateOrder/confirm-order/confirm-order.vue
index dd1ae59..a91007d 100644
--- a/pagesCreateOrder/confirm-order/confirm-order.vue
+++ b/pagesCreateOrder/confirm-order/confirm-order.vue
@@ -88,8 +88,8 @@
 								<view class="color-333 u-m-l-10"> {{user.accountPoints}}</view>
 							</view>
 							<view class="u-flex">
-								<view>已消费</view>
-								<view class="color-333 u-m-l-10"> 0.00</view>
+								<view class="u-text-center">订单数量</view>
+								<view class="color-333 u-m-l-10">{{user.orderNumber||0}}</view>
 							</view>
 						</view>
 					</view>
diff --git a/pagesOrder/detail/components/user.vue b/pagesOrder/detail/components/user.vue
index 49bc973..80820d6 100644
--- a/pagesOrder/detail/components/user.vue
+++ b/pagesOrder/detail/components/user.vue
@@ -37,8 +37,8 @@
 				<view class="color-666 u-m-t-8 u-font-24">积分</view>
 			</view>
 			<view class="">
-				<view class="font-bold">0.00</view>
-				<view class="color-666 u-m-t-8 u-font-24">已消费</view>
+				<view class="font-bold u-text-center">{{user.orderNumber||0}}</view>
+				<view class="color-666 u-m-t-8 u-font-24">订单数量</view>
 			</view>
 		</view>
 	</view>