Merge branch 'feature/zhujian/0927/syoo' into dev

package.json

@@ -114,7 +114,7 @@
     "start:prod": "cross-env DEPLOY_ENV=prod node scripts/start.js",
     "start:prod": "cross-env DEPLOY_ENV=prod node scripts/start.js",
     "start:syoo": "better-npm-run  start:syoo",
     "start:syoo": "better-npm-run  start:syoo",
     "build:dev": "cross-env DEPLOY_ENV=dev node scripts/build.js",
     "build:dev": "cross-env DEPLOY_ENV=dev node scripts/build.js",
-    "build:dev1": "cross-env DEPLOY_ENV=dev node scripts/build.js",
+    "build:dev1": "better-npm-run build:dev1",
     "build:rc": "cross-env DEPLOY_ENV=rc node scripts/build.js",
     "build:rc": "cross-env DEPLOY_ENV=rc node scripts/build.js",
     "build:gray": "cross-env DEPLOY_ENV=gray node scripts/build.js",
     "build:gray": "cross-env DEPLOY_ENV=gray node scripts/build.js",
     "build:syoo": "better-npm-run  build:syoo",
     "build:syoo": "better-npm-run  build:syoo",
@@ -134,6 +134,13 @@
         "DEPLOY_ENV": "prod",
         "DEPLOY_ENV": "prod",
         "BRAND": "syoo"
         "BRAND": "syoo"
       }
       }
+    },
+    "build:dev1":{
+      "command": "node scripts/build.js",
+      "env": {
+        "DEPLOY_ENV": "dev1",
+        "BRAND": "syoo"
+      }
     }
     }
   },
   },
   "eslintConfig": {
   "eslintConfig": {

public/h5.html

@@ -119,7 +119,8 @@
             postJSON("hades/anon/hades/wXWorkUserTicketLogin", {
             postJSON("hades/anon/hades/wXWorkUserTicketLogin", {
                 appTermEnum: appTermEnum,
                 appTermEnum: appTermEnum,
                 code: code,
                 code: code,
-                ticket: ticket
+                ticket: ticket,
+                corpType
             }, (res) => {
             }, (res) => {
                 if (res.code == 200) {
                 if (res.code == 200) {
                     $('#success').show()
                     $('#success').show()

src/domains/basic-domain/constants.ts

@@ -14,14 +14,14 @@ const ENV: string = process.env.DEPLOY_ENV || 'dev'
 console.log('process.env.DEPLOY_ENV', process.env, ENV, 'hjkkkk')
 console.log('process.env.DEPLOY_ENV', process.env, ENV, 'hjkkkk')
 const BASIC_HOST_MAP: MapInterface = {
 const BASIC_HOST_MAP: MapInterface = {
   dev: 'https://dev-heimdall.xiaomai5.com/',
   dev: 'https://dev-heimdall.xiaomai5.com/',
-  dev1: 'https://dev1-heimdall.xiaomai5.com/',
+  dev1: 'https://dev-heimdall.xiaomai5.com/',
   rc: 'https://rc-heimdall.xiaomai5.com/',
   rc: 'https://rc-heimdall.xiaomai5.com/',
   gray: 'https://gray-heimdall.xiaomai5.com/',
   gray: 'https://gray-heimdall.xiaomai5.com/',
   prod: 'https://gateway.xiaomai5.com/',
   prod: 'https://gateway.xiaomai5.com/',
 }
 }
 const PATH_MAP: MapInterface = {
 const PATH_MAP: MapInterface = {
-  dev: 'https://dev.xiaomai5.com/xiaomai-cloud-class-web/h5.html',
-  dev1: 'https://dev.xiaomai5.com/xiaomai-cloud-class-web/h5.html',
+  dev: 'https://dev.xiaomai5.com/dev/xiaomai-cloud-class-web/h5.html',
+  dev1: 'https://dev.xiaomai5.com/dev1/xiaomai-cloud-class-web/h5.html',
   rc: 'https://rc.xiaomai5.com/xiaomai-cloud-class-web/h5.html',
   rc: 'https://rc.xiaomai5.com/xiaomai-cloud-class-web/h5.html',
   gray: 'https://res.xiaomai0.com/xiaomai-cloud-class-web/gray/h5.html',
   gray: 'https://res.xiaomai0.com/xiaomai-cloud-class-web/gray/h5.html',
   prod: path,
   prod: path,

src/domains/brand/constants.ts

@@ -28,7 +28,7 @@ const PATH_MAP: any = {
 
 
 const LIVE_SHARE_MAP: any = {
 const LIVE_SHARE_MAP: any = {
     xiaomai: 'https://res.xiaomai0.com/store-live/index.html#/',
     xiaomai: 'https://res.xiaomai0.com/store-live/index.html#/',
-    syoo: 'https://res.xiaomai0.com/store-live/index.html#/',
+    syoo: 'https://dev.xiaomai5.com/dev1/store-live/index.html#/',
 }
 }
 
 
 
 

src/domains/course-domain/constants.ts

@@ -28,7 +28,7 @@ const shareUrlMap: MapInterface = {
 
 
 const LIVE_SHARE_MAP: MapInterface = {
 const LIVE_SHARE_MAP: MapInterface = {
   dev: 'https://dev.xiaomai5.com/store-live/index.html#/',
   dev: 'https://dev.xiaomai5.com/store-live/index.html#/',
-  dev1: 'https://dev.xiaomai5.com/store-live/index.html#/',
+  dev1: 'https://dev.xiaomai5.com/dev1/store-live/index.html#/',
   rc: 'https://rc.xiaomai5.com/store-live/index.html#/',
   rc: 'https://rc.xiaomai5.com/store-live/index.html#/',
   gray: 'https://res.xiaomai0.com/store-live/gray/index.html#/',
   gray: 'https://res.xiaomai0.com/store-live/gray/index.html#/',
   prod: live,
   prod: live,

src/index.tsx

@@ -31,11 +31,7 @@ window.currentStoreUserInfo = {}
 const history = createHashHistory();
 const history = createHashHistory();
 
 
 document.title=brandName;
 document.title=brandName;
-var  iconUrl ='https://image.xiaomaiketang.com/xm/WGWCtxiGzE.png'
-if(BRAND !='xiaomai'){
-  iconUrl =brandIcon
-
-}
+var  iconUrl =brandIcon;
 var linkzh = document.createElement('link');
 var linkzh = document.createElement('link');
 linkzh.setAttribute('rel',"shortcut icon");
 linkzh.setAttribute('rel',"shortcut icon");
 linkzh.setAttribute('href',iconUrl);
 linkzh.setAttribute('href',iconUrl);