From 47678edb02573924ed2e69338269d700a297addb Mon Sep 17 00:00:00 2001 From: boi Date: Thu, 22 May 2025 12:54:03 +0800 Subject: [PATCH] update --- fapp/ciyon_ap/App.vue | 2 +- .../ciy-cameraqrcode/ciy-cameraqrcode.vue | 451 ------------------ .../components/ciy-upload/ciy-upload.vue | 2 +- fapp/ciyon_ap/pages/demo/comform/upload.vue | 26 +- fapp/ciyon_ap/pages/demo/curd/demo_edit.vue | 6 +- fapp/ciyon_ap/pages/main/me_info.vue | 3 +- fapp/ciyon_ap/pages/main/me_problem.vue | 2 +- fapp/ciyon_ap/pages/main/me_real.vue | 1 - fapp/ciyon_ap/pages/main/me_suggest.vue | 2 +- fapp/ciyon_ap/util/ciy.js | 14 +- web/{amb => ambap}/aiapi.php | 2 +- web/{amb => ambap}/common.php | 0 web/{amb => ambap}/demo/demo.php | 2 +- web/{amb => ambap}/index.php | 2 +- web/{amb => ambap}/login.php | 2 +- web/{amb => ambap}/me.php | 30 +- web/{amb => ambap}/upload.php | 2 +- web/{amb => ambap}/wxpay.php | 2 +- 18 files changed, 51 insertions(+), 500 deletions(-) delete mode 100644 fapp/ciyon_ap/components/ciy-cameraqrcode/ciy-cameraqrcode.vue rename web/{amb => ambap}/aiapi.php (99%) rename web/{amb => ambap}/common.php (100%) rename web/{amb => ambap}/demo/demo.php (99%) rename web/{amb => ambap}/index.php (99%) rename web/{amb => ambap}/login.php (99%) rename web/{amb => ambap}/me.php (98%) rename web/{amb => ambap}/upload.php (99%) rename web/{amb => ambap}/wxpay.php (99%) diff --git a/fapp/ciyon_ap/App.vue b/fapp/ciyon_ap/App.vue index 978e41e..c2e335f 100644 --- a/fapp/ciyon_ap/App.vue +++ b/fapp/ciyon_ap/App.vue @@ -54,7 +54,7 @@ app.globalData.errdata = []; app.globalData.srv = 't'; - app.globalData.jsnajax = 'z/?func=amb/'; + app.globalData.jsnajax = 'z/?func=ambap/'; app.globalData.jsnurl = {}; app.globalData.jsnurl.t = 'https://ciyon.ciy.cn/'; app.globalData.demourl = 'https://i.qiboc.cn/app.goc'; //原型图地址 diff --git a/fapp/ciyon_ap/components/ciy-cameraqrcode/ciy-cameraqrcode.vue b/fapp/ciyon_ap/components/ciy-cameraqrcode/ciy-cameraqrcode.vue deleted file mode 100644 index ba472b8..0000000 --- a/fapp/ciyon_ap/components/ciy-cameraqrcode/ciy-cameraqrcode.vue +++ /dev/null @@ -1,451 +0,0 @@ - - - - - \ No newline at end of file diff --git a/fapp/ciyon_ap/components/ciy-upload/ciy-upload.vue b/fapp/ciyon_ap/components/ciy-upload/ciy-upload.vue index d0f6e33..dadfccb 100644 --- a/fapp/ciyon_ap/components/ciy-upload/ciy-upload.vue +++ b/fapp/ciyon_ap/components/ciy-upload/ciy-upload.vue @@ -73,7 +73,7 @@ type: Boolean, default: false }, - action: { //设置 work.t work httpxxx + action: { type: String, default: '' }, diff --git a/fapp/ciyon_ap/pages/demo/comform/upload.vue b/fapp/ciyon_ap/pages/demo/comform/upload.vue index d4b8f19..43f9a85 100644 --- a/fapp/ciyon_ap/pages/demo/comform/upload.vue +++ b/fapp/ciyon_ap/pages/demo/comform/upload.vue @@ -12,79 +12,79 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/fapp/ciyon_ap/pages/demo/curd/demo_edit.vue b/fapp/ciyon_ap/pages/demo/curd/demo_edit.vue index 1f81928..773495b 100644 --- a/fapp/ciyon_ap/pages/demo/curd/demo_edit.vue +++ b/fapp/ciyon_ap/pages/demo/curd/demo_edit.vue @@ -62,13 +62,13 @@ - + - + @@ -149,7 +149,7 @@ - + diff --git a/fapp/ciyon_ap/pages/main/me_info.vue b/fapp/ciyon_ap/pages/main/me_info.vue index f38b94c..b3308b0 100644 --- a/fapp/ciyon_ap/pages/main/me_info.vue +++ b/fapp/ciyon_ap/pages/main/me_info.vue @@ -12,7 +12,7 @@ - + @@ -69,7 +69,6 @@ }; opn.path = 'icon'; opn.stor = app.globalData.storselect; - opn.action = 'amb'; opn.maxkb = 0; opn.imgwidth = 400; opn.imgheight = 400; diff --git a/fapp/ciyon_ap/pages/main/me_problem.vue b/fapp/ciyon_ap/pages/main/me_problem.vue index ae521d1..036c1c4 100644 --- a/fapp/ciyon_ap/pages/main/me_problem.vue +++ b/fapp/ciyon_ap/pages/main/me_problem.vue @@ -31,7 +31,7 @@ - + diff --git a/fapp/ciyon_ap/pages/main/me_real.vue b/fapp/ciyon_ap/pages/main/me_real.vue index 073e969..8003bf8 100644 --- a/fapp/ciyon_ap/pages/main/me_real.vue +++ b/fapp/ciyon_ap/pages/main/me_real.vue @@ -101,7 +101,6 @@ var opn = {}; opn.basepath = 'idcard'; opn.stor = '/'; - opn.action = 'amb'; e.detail.value.idcard1 = await this.file_upload1(this.idimg, opn); } var retjson = await this.callajax({ diff --git a/fapp/ciyon_ap/pages/main/me_suggest.vue b/fapp/ciyon_ap/pages/main/me_suggest.vue index b639bd1..6d59669 100644 --- a/fapp/ciyon_ap/pages/main/me_suggest.vue +++ b/fapp/ciyon_ap/pages/main/me_suggest.vue @@ -18,7 +18,7 @@ - + diff --git a/fapp/ciyon_ap/util/ciy.js b/fapp/ciyon_ap/util/ciy.js index b63e283..f7b9952 100644 --- a/fapp/ciyon_ap/util/ciy.js +++ b/fapp/ciyon_ap/util/ciy.js @@ -2183,11 +2183,15 @@ export default { } opn.path = path; } - if (opn.action.substring(0, 4) != 'http') { - var uus = opn.action.split('.'); - if (uus.length == 1) - uus[1] = this.srv; - opn.action = app.globalData.jsnurl[uus[1]] + 'z/?func=' + uus[0] + '/upload.'; + if (opn.action) { + if (opn.action.substring(0, 4) != 'http') { + var uus = opn.action.split('.'); + if (uus.length == 1) + uus[1] = this.srv; + opn.action = app.globalData.jsnurl[uus[1]] + 'z/?func=' + uus[0] + '/upload.'; + } + } else { + opn.action = app.globalData.jsnurl[app.globalData.srv] + app.globalData.jsnajax + 'upload.'; } if (typeof(fn.fail) != 'function') fn.fail = () => {}; diff --git a/web/amb/aiapi.php b/web/ambap/aiapi.php similarity index 99% rename from web/amb/aiapi.php rename to web/ambap/aiapi.php index 7dd8415..999ef35 100644 --- a/web/amb/aiapi.php +++ b/web/ambap/aiapi.php @@ -1,6 +1,6 @@ update($csql, $updata) === false) return errjson('更新失败:' . $db->error); - else { - $updata['id'] = $rsuser['id']; - if ($db->insert($csql, $updata) === false) - return errjson('新增失败:' . $db->error); - } + else { + $updata['id'] = $rsuser['id']; + if ($db->insert($csql, $updata) === false) + return errjson('新增失败:' . $db->error); + } return succjson(); } public static function json_cashout_get() { @@ -479,11 +479,11 @@ class me { return errjson('需填开票金额'); if ($rsuser['myinvmoney'] < $money) return errjson('可开票金额不足'); - $csql = new \ciy\sql('ap_usr_invoicetitle'); - $csql->where('id', $invtit); - $invoicerow = $db->getone($csql); - if (!is_array($invoicerow)) - return errjson('开票抬头不存在'); + $csql = new \ciy\sql('ap_usr_invoicetitle'); + $csql->where('id', $invtit); + $invoicerow = $db->getone($csql); + if (!is_array($invoicerow)) + return errjson('开票抬头不存在'); try { $db->begin(); $updata = array(); @@ -748,13 +748,13 @@ class me { $csql = new \ciy\sql('ap_usr_ext'); $csql->where('id', $rsuser['id']); $extrow = $db->getone($csql); - if (is_array($extrow)) + if (is_array($extrow)) { if ($db->update($csql, $updata) === false) - return errjson('更新失败:' . $db->error); - else { + return errjson('ext更新失败:' . $db->error); + } else { $updata['id'] = $rsuser['id']; if ($db->insert($csql, $updata) === false) - return errjson('更新失败:' . $db->error); + return errjson('ext新增失败:' . $db->error); } return succjson(); } diff --git a/web/amb/upload.php b/web/ambap/upload.php similarity index 99% rename from web/amb/upload.php rename to web/ambap/upload.php index b989bfb..0327d69 100644 --- a/web/amb/upload.php +++ b/web/ambap/upload.php @@ -5,7 +5,7 @@ * Version: 0.1.2 ====================================================================================*/ -namespace web\amb; +namespace web\ambap; class upload { public static function json_upload() { diff --git a/web/amb/wxpay.php b/web/ambap/wxpay.php similarity index 99% rename from web/amb/wxpay.php rename to web/ambap/wxpay.php index 114f016..862dd43 100644 --- a/web/amb/wxpay.php +++ b/web/ambap/wxpay.php @@ -1,7 +1,7 @@