From feb7e8242350fcb1efe8e79ce8542b7e161dc186 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 22 Mar 2021 11:38:19 +0800
Subject: [PATCH] fix conflict

---
 test_mini/app.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test_mini/app.js b/test_mini/app.js
index 75f30df..4e9ce27 100644
--- 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 : '',
   }