Merge branch 'dev' into 'master'

Dev

See merge request liangkaiping/saas-weichat!1

src/common/polyvVideo/polyvVideo.jsx

@@ -194,10 +194,11 @@ class PolyvVideo extends Component {
       loading_bg_img: poster || '/lib/black-bg.png',
       df: 2,
       showHd: 'off',
+      forceH5: true,
       autoplay: autoplay,
       ban_ui: 'off',
       vid: videoId,
-      speed: companyCode == "fudan" ? true : false,
+      speed: companyCode == "fulan" ? true : false,
       playsafe: polyvToken,
       history_video_duration: 1000,
       watchStartTime: videoStartTime ? videoStartTime : 0,

src/services/baseUrl.js

 // const NODE_ENV_API = process.env.NODE_ENV_API;
-const original = process.env.NODE_ENV_API ? process.env.NODE_ENV_API : JSON.parse(process.env.npm_config_argv)["original"];
-let NODE_ENV_API = 'dev';
-if(process.env.NODE_ENV_API){
+const original = process.env.NODE_ENV_API
+  ? process.env.NODE_ENV_API
+  : JSON.parse(process.env.npm_config_argv)["original"];
+let NODE_ENV_API = "dev";
+if (process.env.NODE_ENV_API) {
   NODE_ENV_API = original;
-}else{
-  NODE_ENV_API = original[original.length - 1].split('--')[1] ? original[original.length - 1].split('--')[1] : 'dev';
+} else {
+  NODE_ENV_API = original[original.length - 1].split("--")[1]
+    ? original[original.length - 1].split("--")[1]
+    : "dev";
 }
 const config = {
   prod: {
-    BASE_URL: "http://dev.mg.kmelearning.com",
+    BASE_URL: "https://wx.fairyclass.cn",
   },
   deve: {
-    BASE_URL: "http://dev.mg.kmelearning.com",
+    BASE_URL: "https://wx.fairyclass.cn",
   },
   sit: {
-    BASE_URL: "https://test.wechat.kmelearning.com",
+    BASE_URL: "https://wx.fairyclass.cn",
   },
   uat: {
-    BASE_URL: "https://uat.mg.kmelearning.com",
+    BASE_URL: "https://wx.fairyclass.cn",
   },
   other: {
     BASE_URL: "",