更新

hdApp/src/admin/tools/calculator.vue

@@ -289,7 +289,7 @@ const DISCOUNT_CUSTOM_STORAGE_KEY = 'hdApp_calculator_customDiscountZhe'
 const DISCOUNT_SELECTED_STORAGE_KEY = 'hdApp_calculator_discountZhe'
 /** 计算器选客回填：hdApp 零售 selectCustom 使用 style=6（style=3 为花束开单） */
 const CALCULATOR_PICK_CUSTOMER_KEY = 'hdApp_calculator_pick_customer'
-/** 与首页「快捷开单」一致：取自 loginInfo.skCustomId，界面展示名固定 */
+/** 与 mall 首页「快捷开单」一致：取自 vuex getMyShopInfo.defaultCustomId；名称接口回填前暂显示 */
 const SHORTCUT_CUSTOM_DISPLAY_NAME = '快捷开单'
 
 const SETTLE_FORM_DEFAULTS = {
@@ -358,15 +358,15 @@ export default {
 	},
 	computed: {
 		...mapGetters({
-			loginInfo: 'getLoginInfo',
 			getMerchantInfo: 'getMerchantInfo',
+			myShopInfo: 'getMyShopInfo',
 		}),
-		/** 工作台「快捷开单」客户 id，与 workbench skKd 使用的 loginInfo.skCustomId 一致 */
+		/** 与 mall.vue 快捷开单一致：myShopInfo.defaultCustomId（goItemKjKd / goHsKjKd） */
 		shortcutCustomerId() {
-			const login = this.loginInfo || {}
-			const sid = login.skCustomId
-			if (this.$util.isEmpty(sid) || Number(sid) <= 0) return 0
-			return Number(sid)
+			const shop = this.myShopInfo || {}
+			const id = shop.defaultCustomId
+			if (this.$util.isEmpty(id) || Number(id) <= 0) return 0
+			return Number(id)
 		},
 		customerDisplayName() {
 			const n = (this.customName || '').trim()
@@ -502,7 +502,11 @@ export default {
 				.then((res) => {
 					if (!res || res.code !== 1 || !res.data || !res.data.custom) return
 					const prevHasPay = this.selHasPay
-					this.customInfo = res.data.custom
+					const c = res.data.custom
+					this.customInfo = c
+					if (c.name != null && String(c.name).trim() !== '') {
+						this.customName = String(c.name).trim()
+					}
 					const bal = Number(this.customInfo.balance) || 0
 					const due =
 						this.keyboardTarget === 'calc'
@@ -1277,7 +1281,7 @@ export default {
 				modifyPrice: p,
 				cash: cashSubmit,
 				orderName,
-				gatheringPrice: p,
+				lsGoodsPrice: p,
 			}
 			const xjRaw = this._resolveXjPayload()
 			const payload = {