marketing
/
miniapp
Watch 4
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

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

1002884655 3 years ago
parent
72b933898e aa459fa447
commit
78d140ed79
4 changed files with 7 additions and 7 deletions
Unified View Show Diff Stats
  1. 4
    4
      config/dev.js
  2. 1
    1
      config/prod.js
  3. 1
    1
      project.config.json
  4. 1
    1
      src/pages/index/webview/index.jsx

+ 4
- 4
config/dev.js View File

3 
     NODE_ENV: '"development"'
 3 
     NODE_ENV: '"development"'
4 
   },
 4 
   },
5 
   defineConstants: {
 5 
   defineConstants: {
6 
-    HOST: '"https://xlk.njyz.tech"',
6 
+    // HOST: '"https://xlk.njyz.tech"',
7 
     // HOST: '"https://www.newhousehold.cn"',
 7 
     // HOST: '"https://www.newhousehold.cn"',
8 
-    // HOST: '"http://127.0.0.1:8567"',
9 
-    WSS_HOST: '"wss://www.newhousehold.cn"',
10 
-    // WSS_HOST: '"wss://xlk.njyz.tech"',
8 
+    HOST: '"http://127.0.0.1:8567"',
9 
+    // WSS_HOST: '"wss://www.newhousehold.cn"',
10 
+    WSS_HOST: '"wss://xlk.njyz.tech"',
11 
     OSS_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
 11 
     OSS_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
12 
     OSS_FAST_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
 12 
     OSS_FAST_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
13 
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',
 13 
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',

+ 1
- 1
config/prod.js View File

10 
     OSS_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
 10 
     OSS_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
11 
     OSS_FAST_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
 11 
     OSS_FAST_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
12 
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',
 12 
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',
13 
-    Version: '"V0.0.69-20210906"'
13 
+    Version: '"V0.0.75-20211101"'
14 
   },
 14 
   },
15 
   mini: {},
 15 
   mini: {},
16 
   h5: {
 16 
   h5: {

+ 1
- 1
project.config.json View File

2 
 	"miniprogramRoot": "dist/",
 2 
 	"miniprogramRoot": "dist/",
3 
 	"projectname": "miniapp",
 3 
 	"projectname": "miniapp",
4 
 	"description": "",
 4 
 	"description": "",
5 
-	"appid": "wxe44244d1a5ea3364",
5 
+	"appid": "wxc96058d57e77f373",
6 
 	"setting": {
 6 
 	"setting": {
7 
 		"urlCheck": false,
 7 
 		"urlCheck": false,
8 
 		"es6": false,
 8 
 		"es6": false,

+ 1
- 1
src/pages/index/webview/index.jsx View File

14 
   }, [title])
 14 
   }, [title])
15
15
16 
   return (
 16 
   return (
17 
-    <WebView url={decodeURIComponent(url)} />
17 
+    <WebView src={decodeURIComponent(url)} />
18 
   )
 18 
   )
19 
 })
 19 
 })