Merge branch 'dev' of https://code.itechtop.cn/yangyang/ztx_wx_minapp into dev
# Conflicts: # config.js
Showing
2 changed files
with
10 additions
and
9 deletions
| ... | @@ -4,15 +4,16 @@ | ... | @@ -4,15 +4,16 @@ |
| 4 | 4 | ||
| 5 | // staging 会员系统 | 5 | // staging 会员系统 |
| 6 | // const baseUrl_api = "http://123.60.96.243/stage-api/"; | 6 | // const baseUrl_api = "http://123.60.96.243/stage-api/"; |
| 7 | const baseUrl_api = 'https://ztx.itechtop.cn/stage-api' | 7 | // const baseUrl_api = 'https://ztx.itechtop.cn/stage-api' |
| 8 | // const baseUrl_api = 'https://newsystem.taekwondo.org.cn/stage-api/' | 8 | // const baseUrl_api = 'https://newsystem.taekwondo.org.cn/stage-api/' |
| 9 | 9 | ||
| 10 | // train | 10 | const baseUrl_api = 'http://192.168.1.97:8787' |
| 11 | // const baseUrl_api = 'http://192.168.1.98:8787' | 11 | const trainUrl_api = 'http://192.168.1.97:8686' |
| 12 | const trainUrl_api = 'http://192.168.1.98:8686' | 12 | const vipWebView = 'http://192.168.1.97:8080' |
| 13 | // match | 13 | // const vipWebView = 'https://kvdbz74ct98h.ngrok.xiaomiqiu123.top' |
| 14 | // const baseUrl_api = 'http://192.168.1.132:8081' | 14 | |
| 15 | export default { | 15 | export default { |
| 16 | baseUrl_api, | 16 | baseUrl_api, |
| 17 | trainUrl_api | 17 | trainUrl_api, |
| 18 | vipWebView | ||
| 18 | } | 19 | } | ... | ... |
| 1 | <template> | 1 | <template> |
| 2 | <view> | 2 | <view> |
| 3 | <web-view src="http://192.168.1.98:5173"> | 3 | <web-view :src="config.vipWebView"> |
| 4 | 4 | ||
| 5 | </web-view> | 5 | </web-view> |
| 6 | </view> | 6 | </view> |
| 7 | </template> | 7 | </template> |
| 8 | 8 | ||
| 9 | <script setup> | 9 | <script setup> |
| 10 | 10 | import config from '@/config.js' | |
| 11 | </script> | 11 | </script> |
| 12 | 12 | ||
| 13 | <style> | 13 | <style> | ... | ... |
-
Please register or sign in to post a comment