camera-5.1: simplify api

web/public/camera-5.1/index.html

@@ -96,23 +96,6 @@
                 长按识别二维码，添加人工客服
             </div>
           </div>
-          <div class="verifyfailed hidden">
-            <div class="circle">
-              !
-            </div>
-            <div class="title">验证未通过</div>
-            <div class="hints">
-                <div>
-                请按照验证指引
-                </div>
-                <div>重新验证</div>
-                <div>
-                -
-                </div>
-                <div>如反复验证仍无法通过</div>
-                <div>请联系人工客服</div>
-            </div>
-          </div>
           <div class="actions">
             <button onclick="show_modal('serviceqr')" class="service">人工客服</button>
             <button onclick="hide_modal()" class="back">

web/public/camera-5.1/js/main.js

@@ -274,34 +274,38 @@ async function submit_image(qrcode, angle, image_data_urls) {
     });
     var d = await r.json();
     debug_log(JSON.stringify(d));
-    if (d.serial_code) {
+    if (wx) {
-      if (wx) {
+      var delay = 3000 - (Date.now() - begin);
-        var delay = 3000 - (Date.now() - begin);
+      setTimeout(() => {
-        setTimeout(() => {
+        var wx_redirect_to = get_query("wx_redirect_to");
-          var wx_redirect_to = get_query("wx_redirect_to");
+        var query_params;
-          var query_params = `?qr_code=${encodeURIComponent(qrcode)}&serial_code=${encodeURIComponent(d.serial_code)}`;
 
-          if (wx_redirect_to) {
+        if (d.serial_code) {
-            wx.miniProgram.redirectTo({
+          // Success: pass ok=1 with qr_code and serial_code
-              url: wx_redirect_to + query_params,
+          query_params = `?ok=1&qr_code=${encodeURIComponent(qrcode)}&serial_code=${encodeURIComponent(d.serial_code)}`;
-            });
+        } else {
-          } else if (get_query("ai_chat_mode")) {
+          // Failure: pass ok=0 only
-            wx.miniProgram.redirectTo({
+          query_params = `?ok=0`;
-              url: '/pages/chat/chat' + query_params,
+        }
-            });
+
-          } else {
+        wx.miniProgram.redirectTo({
-            wx.miniProgram.redirectTo({
+          url: wx_redirect_to + query_params,
-              url: '/pages/productinfo/productinfo' + query_params,
+        });
-            });
+      }, delay > 0 ? delay : 0);
-          }
-        }, delay > 0 ? delay : 0);
-      }
-    } else {
-      this.show_modal('verifyfailed');
     }
   } catch (e) {
     debug_log(`submission error: ${e}`);
-    this.show_modal('verifyfailed');
+    if (wx) {
+      var delay = 3000 - (Date.now() - begin);
+      setTimeout(() => {
+        var wx_redirect_to = get_query("wx_redirect_to");
+        var query_params = `?ok=0`;
+
+        wx.miniProgram.redirectTo({
+          url: wx_redirect_to + query_params,
+        });
+      }, delay > 0 ? delay : 0);
+    }
   }
 }
 
@@ -376,7 +380,7 @@ function remove_class_by_query(query, to_remove) {
   }
 }
 
-var modals = ['serviceqr', 'scanguide', 'verifyfailed', 'verifyspin'];
+var modals = ['serviceqr', 'scanguide', 'verifyspin'];
 
 function hide_modal() {
   busy = false;
@@ -403,9 +407,6 @@ function show_modal(which) {
     remove_class_by_query('.serviceqr', 'hidden');
     add_class_by_query('.actions', 'hidden');
   }
-  if (which == 'verifyfailed') {
-    remove_class_by_query('.verifyfailed', 'hidden');
-  }
 }
 
 function set_service_qr_img() {