From 88e36bcfe31401902a0f3e98c01c4bb96a9858e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E6=A9=99=E6=A5=8A?= <2370374436@qq.com>
Date: Tue, 22 Oct 2019 21:18:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=93=8D=E4=BD=9C=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/config.js              | 15 +++++++++++++--
 src/pages/waste_sorting/baike.vue |  9 +++++----
 src/pages/waste_sorting/query.vue |  7 ++++---
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/common/config.js b/src/common/config.js
index 1bd6de7..1fefabb 100644
--- a/src/common/config.js
+++ b/src/common/config.js
@@ -5,8 +5,19 @@ export var config={
 //    接口
     interface:{
         //图片解析
-        image_parse:"/api/BaiduImage.php?XDEBUG_SESSION_START=PHPSTORM",
+        image_parse:"/api/BaiduImage.php",
     //    文本查询
-        text_query:"/api/QueryText.php?XDEBUG_SESSION_START=PHPSTORM"
+        text_query:"/api/QueryText.php"
+    }
+
+}
+
+export var getInterface=function(url){
+    if(process.env.NODE_ENV === 'development'){
+        console.log("开发环境,通过XDEBUG调试接口")
+        return config.server+url+"?XDEBUG_SESSION_START=PHPSTORM"
+    }else{
+        console.log('生产环境')
+        return config.server+url
     }
 }
\ No newline at end of file
diff --git a/src/pages/waste_sorting/baike.vue b/src/pages/waste_sorting/baike.vue
index d66e62b..9985d54 100644
--- a/src/pages/waste_sorting/baike.vue
+++ b/src/pages/waste_sorting/baike.vue
@@ -55,7 +55,7 @@
 </template>
 
 <script>
-    import {config} from 'common/config'
+    import {config,getInterface} from 'common/config'
 
 
     export default {
@@ -109,6 +109,7 @@
             }
         },
         methods: {
+            getInterface:getInterface,
             //动画播放完更新按钮状态
             update_status: function () {
                 console.info("动画播放完毕")
@@ -116,12 +117,12 @@
                     let that = this
                     setTimeout(function () {
                         that.button_text="自动收缩"
-                    },1000)
+                    },500)
                     setTimeout(function () {
                         that.disabled_button = true
                         that.show_button = false
                         that.hide_button = true
-                    }, 2000)
+                    }, 1000)
                 }else{
                     this.button_text="长按返回"
                 }
@@ -136,7 +137,7 @@
                 console.info("选中" + group.name)
                 this.current_group = group.name
                 let that = this
-                let url = config.server + config.interface.text_query
+                let url = this.getInterface(config.interface.text_query)
                 console.info("文本查询接口地址：" + url)
                 uni.showLoading({
                     title:"加载中"
diff --git a/src/pages/waste_sorting/query.vue b/src/pages/waste_sorting/query.vue
index ae8a1da..000f1ed 100644
--- a/src/pages/waste_sorting/query.vue
+++ b/src/pages/waste_sorting/query.vue
@@ -43,7 +43,7 @@
 </template>
 
 <script>
-    import {config} from 'common/config'
+    import {config,getInterface} from 'common/config'
 
     export default {
         name: "query",
@@ -56,6 +56,7 @@
             }
         },
         methods: {
+            getInterface:getInterface,
             getWasteSorting:function(waste_type){
                 switch (waste_type) {
                     case 1:return "可回收垃圾";
@@ -72,7 +73,7 @@
                 console.info("文本查询值：" + this.textValue)
                 let that=this
                 if(this.textValue.length>0){
-                    let url = config.server + config.interface.text_query
+                    let url = this.getInterface(config.interface.text_query)
                     console.info("文本查询接口地址："+url)
                     uni.request({
                         url:url,
@@ -126,7 +127,7 @@
                                 uni.showLoading({
                                     title: "图片解析中"
                                 })
-                                let url = config.server + config.interface.image_parse
+                                let url = that.getInterface(config.interface.image_parse)
                                 console.info("图片解析接口地址：" + url)
                                 uni.uploadFile({
                                     url: url,