fix conflict

2021-03-22 11:38:19 +08:00 · 2021-03-22 11:38:19 +08:00 · feb7e82423
parent e8685e804c
commit feb7e82423
1 changed files with 2 additions and 2 deletions
--- a/test_mini/app.js
+++ b/test_mini/app.js
@ -69,9 +69,9 @@ App({
  globalData: {
    userInfo: {},
    userinfo: {}, // 服务器传回的消费者信息
-    //host: 'https://apitest.ahctc.cn',
+    host: 'https://apitest.ahctc.cn',
    mediahost: 'https://apitest.ahctc.cn',
-    host: 'http://127.0.0.1:8000',
+    //host: 'http://127.0.0.1:8000',
    //mediahost: 'http://127.0.0.1:8000',
    token : '',
  }