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

.env.production

@@ -3,7 +3,7 @@ VUE_APP_ADMIN_TOKEN_NAME = 'admin_token'
 VUE_APP_API_URL_PREFIX = '/api/admin/'
 VUE_APP_API_ACTION_NAME = '_action'
 VUE_APP_API_TOKEN_NAME = '_token'
-VUE_APP_INDEX_URL = '/index'
+VUE_APP_INDEX_URL = '/'
 VUE_APP_SITE_NAME = '管理平台'
 VUE_APP_SITE_TITLE_TPL = '{title}'
 

src/store/order.js

@@ -405,7 +405,8 @@ export default {
           }
           return productList
         } else {
-          showNotify({ message: msg })
+          // showNotify({ message: msg })
+          console.error(msg)
         }
         return []
       } catch (error) {
@@ -485,7 +486,8 @@ export default {
           commit('setConfInfo', { key: 'bigServiceInfo', value: data })
           return data
         } else {
-          showNotify({ message: msg })
+          // showNotify({ message: msg })
+          console.error(msg)
         }
       } catch (error) {
         commit('setLoadingState', { key: 'bigServiceInfo', value: false })

src/views/create-order/components/product-info-submodule/ServiceList.vue

@@ -652,7 +652,7 @@ export default {
       if (names_str.includes('市场分析定制报告') && !idArr.includes(26)) {
         idArr.push(26) // 添加基础服务
       }
-      if (names_str.includes('企业分析') && !idArr.includes(4) && !idArr.includes(19)) {
+      if (names_str.includes('企业分析') && !idArr.includes(4)) {
         idArr.push(4) // 添加基础服务
       }
       if (names_str.includes('业主分析') && !idArr.includes(5)) {

src/views/create-order/components/schema-form/params/bigmember.js

@@ -1,6 +1,6 @@
 import { Parameters } from './base'
 import { getCommonParams, getCommonFilterParams } from "./common";
-import { productTypeMap } from '@/views/create-order/data'
+import { schemaKeyMap, productTypeMap } from '@/views/create-order/data'
 import { calcServiceArrNames } from '@/views/create-order/hooks/service'
 import { getIntersection } from '@/utils/utils'
 import store from '@/store'
@@ -43,7 +43,7 @@ export class BigMemberParamsGroup extends Parameters {
 
     // 由于套餐升级自定义过程中，serviceList组件可能会造成套餐特定id丢失(serviceList是自定义选择,隐藏了套餐id的选项,不会回显套餐id)
     // 所以，所有id需要结合关联订单中的id
-    let serviceList = productForm.serviceList
+    let serviceList = this.calcCurrentSelectServiceList(productForm, relateOrdersServiceList)
     let allServiceList = cloneDeep(serviceList)
     let supServiceIds = []
     if (Array.isArray(relateOrdersServiceList)) {
@@ -101,6 +101,24 @@ export class BigMemberParamsGroup extends Parameters {
     return nameArr.join(splitter)
   }
 
+  // serviceList计算
+  calcCurrentSelectServiceList(productForm, relateOrdersServiceList) {
+    const formServiceList = productForm.serviceList
+    const isRenew = productForm[schemaKeyMap.payment] === 3
+    // 0. 处理4和19不能共存提交的问题
+    // 1. 升级下才做处理
+    // 2. 从生效服务(relateOrder)判断是否有19。如果有当前生效服务有19，并且当前选中服务(formServiceList)有4、则移除当前选中服务的4
+    if (isRenew) {
+      if (relateOrdersServiceList.includes(19) && formServiceList.includes(4)) {
+        return formServiceList.filter(s => s !== 4)
+      } else {
+        return formServiceList
+      }
+    } else {
+      return formServiceList
+    }
+  }
+
   // 筛选服务：从所有服务列表中提取服务（数据服务只能5选1(最高)）返回结果
   sortAllServiceList(ids = []) {
     const nIds = [...new Set(ids)]