From d6f1f0454b362acef3857847f7d9243654633ef6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E6=A9=99=E6=A5=8A?= <2370374436@qq.com>
Date: Fri, 25 Oct 2019 23:54:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                       |  7 ++++++-
 src/pages/waste_sorting/query.vue | 14 ++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 7741bc3..436513a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -22,7 +22,12 @@
                     uni.showModal({
                         title:"错误提示",
                         content:"服务端连接失败，请检查服务端地址"+config.server+"是否正确",
-                        showCancel:false
+                        showCancel:false,
+                        success:function (res) {
+                            if(res.confirm){
+
+                            }
+                        }
                     })
                 },
                 complete:function () {
diff --git a/src/pages/waste_sorting/query.vue b/src/pages/waste_sorting/query.vue
index 8a30638..0ae77cb 100644
--- a/src/pages/waste_sorting/query.vue
+++ b/src/pages/waste_sorting/query.vue
@@ -1,5 +1,6 @@
 <template>
     <view>
+<!--        <navigator on open-type='exit' target="miniProgram">退出程序</navigator>-->
         <view class="uni-padding-wrap uni-common-mt">
 
             <view class="uni-form-item uni-column">
@@ -18,7 +19,7 @@
             <view class="uni-flex uni-column">
                 <text class="title uni-center">打开相机拍照查询</text>
                 <view class="flex-item flex-item-V uni-center">
-                    <image class="photo" @click="chooseImage"></image>
+                    <image class="photo" @click="chooseImage"/>
                 </view>
             </view>
 
@@ -89,9 +90,9 @@
                                         if (json_res["result"].length === 0) {
                                             let str="没有匹配结果"
                                             console.info(str)
-                                            uni.showToast({
-                                                title:str,
-                                                duration:3000
+                                            uni.showModal({
+                                                content:str,
+                                                showCancel:false
                                             })
                                         } else {
                                             that.show_info = true
@@ -157,11 +158,8 @@
                                                     that.query_result=json_res["result"]
                                                 }
                                             } else {
-                                                let str = "照片解析失败"
-                                                console.info(str)
                                                 uni.showModal({
-                                                    title:"错误提示",
-                                                    content:str,
+                                                    content:json_res["error"],
                                                     showCancel:false
                                                 })
                                             }