x/themblem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

camera-5.1: simplify api

Browse Source
This commit is contained in:
Fam Zheng 2025-09-15 22:21:26 +01:00
parent 36526aa066
commit 3e026f30e6
2 changed files with 30 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
web/public/camera-5.1/index.html
View File

@ -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">

57
web/public/camera-5.1/js/main.js
View File

@ -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) {
var delay = 3000 - (Date.now() - begin);
setTimeout(() => {
var wx_redirect_to = get_query("wx_redirect_to");
var query_params = `?qr_code=${encodeURIComponent(qrcode)}&serial_code=${encodeURIComponent(d.serial_code)}`;
if (wx) {
var delay = 3000 - (Date.now() - begin);
setTimeout(() => {
var wx_redirect_to = get_query("wx_redirect_to");
var query_params;
if (wx_redirect_to) {
wx.miniProgram.redirectTo({
url: wx_redirect_to + query_params,
});
} else if (get_query("ai_chat_mode")) {
wx.miniProgram.redirectTo({
url: '/pages/chat/chat' + query_params,
});
} else {
wx.miniProgram.redirectTo({
url: '/pages/productinfo/productinfo' + query_params,
});
}
}, delay > 0 ? delay : 0);
}
} else {
this.show_modal('verifyfailed');
if (d.serial_code) {
// Success: pass ok=1 with qr_code and serial_code
query_params = `?ok=1&qr_code=${encodeURIComponent(qrcode)}&serial_code=${encodeURIComponent(d.serial_code)}`;
} else {
// Failure: pass ok=0 only
query_params = `?ok=0`;
}
wx.miniProgram.redirectTo({
url: wx_redirect_to + query_params,
});
}, delay > 0 ? delay : 0);
}
} 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() {