Merge branch 'feature/v2.4.46' of https://jygit.jydev.jianyu360.cn/jianyu/qmx_page_admin into feature/v2.4.46

src/views/create-order/components/schema-form/resort/common.js

@@ -126,5 +126,5 @@ export function sortValidityDateTime(product = {}) {
 // 判断是否有增购子账号
 // buyAccountCount+giftAccountCount>0 表示有增购子账号2
 export function hasAddSubAccount(filter = {}) {
-  return Number(filter.buyAccountCount) + Number(filter.giftAccountCount) > 0
+  return Number(filter.buyAccountCount || 0) + Number(filter.giftAccountCount || 0) > 0
 }

src/views/create-order/components/schema-form/schema-form.vue

@@ -1145,7 +1145,9 @@ export default {
 
       const { [schemaKeyMap.specification]: specification } = value
       const { [schemaKeyMap.payment]: payment } = value
-      ma.show = specification === dhy001  // 自定义规格才展示
+      const buy001 = payment === 1 && specification === dhy001
+      const upgradeAddService = payment === 3 && value[schemaKeyMap.upgradeContent].includes(1)
+      ma.show = buy001 || upgradeAddService  // 购买-自定义规格/升级-补充服务选中才展示
       const { buySubject } = this.pageForm
       this.$set(ma.props, 'buySubject', buySubject)