Merge branch 'feihesanqi_20251014' of gitlab2.dui88.com:fh/20250528_FHQ1 into feihesanqi_20251014

api/goods.js

@@ -83,3 +83,24 @@ export const fetchSeckillTakeOrder = (data) => api.post('/c/seckill/takeOrder',
 
 
 
+
+
+/**
+ * 订单物流信息
+ * @param {Object} data - 请求参数
+ * @param {string} data.order_no - 订单ID (必须)
+ * @returns {Promise} API响应
+ * @description 获取订单物流信息
+ */
+export const fetchOrderExpressRoute = (data) => api.get('/c/order/express/route', data);
+
+
+
+/**
+ * 取消订单
+ * @param {Object} data - 请求参数
+ * @param {string} data.order_no - 订单ID (必须)
+ * @returns {Promise} API响应
+ * @description 取消订单
+ */
+export const fetchOrderCancel = (data) => api.post('/c/order/cancel', data);

stores/user.js

@@ -76,7 +76,7 @@ export const useUserStore = defineStore("userInfo", {
 		 * @param {Object} data : {encryptedData, iv, code}
 		 * @returns
 		 */
-		async phoneCallback(data, onOpenRegisterFn = () => {}, cb = null, cb2 = null, invitationInfo = null) {
+		async phoneCallback(data, onOpenRegisterFn = () => { }, cb = null, cb2 = null, invitationInfo = null) {
 			uni.login({
 				provider: "weixin",
 				success: async (res) => {
@@ -84,9 +84,7 @@ export const useUserStore = defineStore("userInfo", {
 					if (res.errMsg === "login:ok") {
 						// 用户手机授权F
 						const {
-							data: {
-								babyExistence
-							}
+							data
 						} = await fetchAutoPhone({
 							phoneEncryptedData: data.encryptedData,
 							phoneIv: data.iv,
@@ -94,9 +92,12 @@ export const useUserStore = defineStore("userInfo", {
 							codeLogin: res.code,
 							...invitationInfo,
 						});
+						const {
+							babyExistence
+						} = data || {};
 
 						!babyExistence && onOpenRegisterFn && onOpenRegisterFn();
-						if (!babyExistence.value && cb) {
+						if (!babyExistence && cb) {
 							cb();
 						}
 

v3/goodDetail/goodDetail.vue

@@ -73,7 +73,7 @@
 					<view class="product-details">
 						<text class="product-points">{{ goodsData.points }}{{ goodsData.creditsTypeName || '积分'
 						}}</text>
-						<text class="product-stock">库存 {{ formatCount(goodsData.saleCount) }}件</text>
+						<text class="product-stock">库存 {{ formatCount(goodsData.exchangeCount) }}件</text>
 					</view>
 				</view>