Merge branch 'main' of http://git.ycjcjy.com/marketing/miniapp into main

config/dev.js

@@ -12,7 +12,7 @@ module.exports = {
     OSS_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
     OSS_FAST_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',
-    BROKER_CITY: '"南京"',
+    BROKER_CITY: '"南京,上海"',
     Version: '"V0.0.20"'
   },
   mini: {},

config/prod.js

@@ -3,13 +3,14 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
-    HOST: '"https://www.newhousehold.cn"', //正式
-    WSS_HOST: '"wss://www.newhousehold.cn"',
-    // HOST: '"https://xlk.njyz.tech"',
-    // WSS_HOST: '"wss://xlk.njyz.tech"',
+    // HOST: '"https://www.newhousehold.cn"', //正式
+    // WSS_HOST: '"wss://www.newhousehold.cn"',
+    HOST: '"https://xlk.njyz.tech"',
+    WSS_HOST: '"wss://xlk.njyz.tech"',
     OSS_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
     OSS_FAST_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',
+    BROKER_CITY: '"南京,上海"',
     Version: '"V0.0.90-20211230"'
   },
   mini: {},

src/pages/index/components/Menu/index.jsx

@@ -140,7 +140,10 @@ export default function Menu() {
 
   useEffect(() => {
     // 如果是全民经纪人添加专属菜单
-    if (city.curCity.shortname === BROKER_CITY) {
+    const brokerCityList = BROKER_CITY.split(',')
+    console.log('----------->', brokerCityList)
+
+    if (brokerCityList.indexOf(city.curCity.shortname) > -1) {
       if(person.personType===ROLE_CODE.BROKER){
         setList([...brokerList, ...list]);
       }else if(person.personType===ROLE_CODE.CUSTOMER){