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

config/dev.js

@@ -3,11 +3,11 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    HOST: '"https://xlk.njyz.tech"',
+    // HOST: '"https://xlk.njyz.tech"',
     // HOST: '"https://www.newhousehold.cn"',
-    // HOST: '"http://127.0.0.1:8567"',
-    WSS_HOST: '"wss://www.newhousehold.cn"',
-    // WSS_HOST: '"wss://xlk.njyz.tech"',
+    HOST: '"http://127.0.0.1:8567"',
+    // WSS_HOST: '"wss://www.newhousehold.cn"',
+    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"',

config/prod.js

@@ -10,7 +10,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"',
-    Version: '"V0.0.69-20210906"'
+    Version: '"V0.0.75-20211101"'
   },
   mini: {},
   h5: {

project.config.json

@@ -2,7 +2,7 @@
 	"miniprogramRoot": "dist/",
 	"projectname": "miniapp",
 	"description": "",
-	"appid": "wxe44244d1a5ea3364",
+	"appid": "wxc96058d57e77f373",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,

src/pages/index/webview/index.jsx

@@ -14,6 +14,6 @@ export default withLayout((props) => {
   }, [title])
 
   return (
-    <WebView url={decodeURIComponent(url)} />
+    <WebView src={decodeURIComponent(url)} />
   )
 })