From 3152785e0cd595152e8577405cd0a98bb34db792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=97=E4=BA=A7-=E7=8E=8B=E5=9D=A4?= Date: Wed, 26 Nov 2025 16:31:56 +0800 Subject: [PATCH] up251126 --- c5_ciyon.sql | 88 +++++++++++++++++---------- fapp/ciyon_ap/pages.json | 9 +++ fapp/ciyon_ap/pages/main/me.vue | 8 ++- fapp/ciyon_ap/pages/me/cashie_lst.vue | 4 +- fapp/ciyon_ap/pages/me/cashoe_lst.vue | 80 ++++++++++++++++++++++++ web/ambap/me.php | 20 ++++++ web/cweb_ap.php | 2 +- 7 files changed, 174 insertions(+), 37 deletions(-) create mode 100644 fapp/ciyon_ap/pages/me/cashoe_lst.vue diff --git a/c5_ciyon.sql b/c5_ciyon.sql index 705c64a..0fa4a76 100644 --- a/c5_ciyon.sql +++ b/c5_ciyon.sql @@ -125,7 +125,7 @@ CREATE TABLE `ap_cash_bundle` ( DROP TABLE IF EXISTS `ap_cash_ie`; CREATE TABLE `ap_cash_ie` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, - `cashietype` int(11) NOT NULL COMMENT '收支分类,CATA,cashietype', + `cashtype` int(11) NOT NULL COMMENT '收支分类,CATA,cashtype', `vuser` bigint(20) NOT NULL COMMENT '所属用户,DB,ap_user', `iemoney` int(11) NOT NULL COMMENT '金额|,CNY', `addtimes` bigint(20) NOT NULL COMMENT '发生时间,DATE', @@ -137,6 +137,24 @@ CREATE TABLE `ap_cash_ie` ( -- Records of ap_cash_ie -- ---------------------------- +-- ---------------------------- +-- Table structure for ap_cash_oe +-- ---------------------------- +DROP TABLE IF EXISTS `ap_cash_oe`; +CREATE TABLE `ap_cash_oe` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `cashtype` int(11) NOT NULL COMMENT '收支分类,CATA,cashtype', + `vuser` bigint(20) NOT NULL COMMENT '所属用户,DB,ap_user', + `oemoney` int(11) NOT NULL COMMENT '金额|,CNY', + `addtimes` bigint(20) NOT NULL COMMENT '发生时间,DATE', + `name` varchar(180) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '摘要', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 10 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '收益记录' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of ap_cash_oe +-- ---------------------------- + -- ---------------------------- -- Table structure for ap_cash_in -- ---------------------------- @@ -518,6 +536,7 @@ CREATE TABLE `ap_usr_ext` ( `wxno` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '微信号', `idid` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '身份证号', `cciy` bigint(20) NOT NULL DEFAULT 0 COMMENT '众识码,CCIY', + `appcid` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'APPpush', `cashtype` int(11) NOT NULL DEFAULT 2 COMMENT '提现方式,BOOL,网银提现.微信提现', `bankaccount` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '账户名称', `bankno` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '银行卡号', @@ -529,7 +548,7 @@ CREATE TABLE `ap_usr_ext` ( -- ---------------------------- -- Records of ap_usr_ext -- ---------------------------- -INSERT INTO `ap_usr_ext` VALUES (100, '', '', '', '', 0, 1, '', '', '', ''); +INSERT INTO `ap_usr_ext` VALUES (100, '', '', '', '', 0, '', 1, '', '', '', ''); -- ---------------------------- -- Table structure for ap_usr_invoicetitle @@ -1237,11 +1256,11 @@ INSERT INTO `zc_cata` VALUES (12, 1, 0, 1, 0, 'auditstatus', '审核状态', '', INSERT INTO `zc_cata` VALUES (13, 1, 0, 1, 0, 'autotaskstatus', '任务状态', '', 'zc_autotask'); INSERT INTO `zc_cata` VALUES (14, 2, 0, 1, 0, 'targettype', '子系统', '', 'zc_debug_user\nzc_online'); INSERT INTO `zc_cata` VALUES (18, 1, 0, 1, 0, 'cashstatus', '提现状态', '', 'ap_cash_out'); -INSERT INTO `zc_cata` VALUES (19, 2, 0, 1, 0, 'cashietype', '收入分类', '', 'ap_cash_ie'); -INSERT INTO `zc_cata` VALUES (20, 2, 0, 1, 0, 'certs', '认证范围', '', 'ap_user'); +INSERT INTO `zc_cata` VALUES (19, 2, 0, 1, 0, 'cashtype', '收支分类', '', 'ap_cash_ie,ap_cash_oe'); INSERT INTO `zc_cata` VALUES (21, 2, 0, 1, 0, 'userlevel', '用户等级', '', 'ap_user'); INSERT INTO `zc_cata` VALUES (22, 1, 0, 1, 0, 'artsort', '文章排序', '', 'ap_art_post'); INSERT INTO `zc_cata` VALUES (23, 1, 0, 1, 0, 'artstatus', '文章状态', '', 'ap_art_post'); +INSERT INTO `zc_cata` VALUES (24, 2, 0, 1, 0, 'certs', '认证范围', '', 'ap_user'); INSERT INTO `zc_cata` VALUES (100, 2, 0, 1, 0, 'aicapacity', 'AI能力', '', 'zc_ai_key'); INSERT INTO `zc_cata` VALUES (101, 1, 0, 1, 0, 'aidotype', 'AI执行方式', '', 'zc_ai_tsk_run'); INSERT INTO `zc_cata` VALUES (102, 1, 10, 1, 0, 'education', '学历', '', ''); @@ -1252,37 +1271,42 @@ INSERT INTO `zc_cata` VALUES (1002, 0, 90, 1, 10, '90', '其他', '', ''); INSERT INTO `zc_cata` VALUES (1010, 0, 8, 1, 11, '8', '被禁用', 'dag', ''); INSERT INTO `zc_cata` VALUES (1011, 0, 9, 1, 11, '9', '登录保护', 'warn', ''); INSERT INTO `zc_cata` VALUES (1012, 0, 10, 1, 11, '10', '正常', 'succ', ''); -INSERT INTO `zc_cata` VALUES (1020, 0, 20, 1, 12, '20', '未审核', 'man', ''); -INSERT INTO `zc_cata` VALUES (1021, 0, 50, 1, 12, '50', '审核中', 'man', ''); -INSERT INTO `zc_cata` VALUES (1022, 0, 90, 1, 12, '90', '驳回', 'warn', ''); -INSERT INTO `zc_cata` VALUES (1023, 0, 95, 1, 12, '95', '撤回', 'def', ''); -INSERT INTO `zc_cata` VALUES (1024, 0, 100, 1, 12, '100', '通过', 'succ', ''); +INSERT INTO `zc_cata` VALUES (1020, 0, 10, 1, 12, '10', '草稿', 'def', ''); +INSERT INTO `zc_cata` VALUES (1021, 0, 20, 1, 12, '20', '未审核', 'man', ''); +INSERT INTO `zc_cata` VALUES (1022, 0, 50, 1, 12, '50', '审核中', 'warn', ''); +INSERT INTO `zc_cata` VALUES (1023, 0, 90, 1, 12, '90', '驳回', 'dag', ''); +INSERT INTO `zc_cata` VALUES (1024, 0, 95, 1, 12, '95', '撤回', 'def', ''); +INSERT INTO `zc_cata` VALUES (1025, 0, 100, 1, 12, '100', '通过', 'succ', ''); INSERT INTO `zc_cata` VALUES (1030, 0, 20, 1, 13, '20', '等待执行', 'succ', ''); INSERT INTO `zc_cata` VALUES (1031, 0, 30, 1, 13, '30', '执行中', 'warn', ''); INSERT INTO `zc_cata` VALUES (1039, 0, 90, 1, 13, '90', '禁止执行', 'dag', ''); INSERT INTO `zc_cata` VALUES (1040, 0, 10, 1, 14, '10', '总控', '', ''); INSERT INTO `zc_cata` VALUES (1041, 0, 20, 1, 14, '20', 'SaaS PC端', '', ''); INSERT INTO `zc_cata` VALUES (1042, 0, 21, 1, 14, '21', 'SaaS 移动端', '', ''); -INSERT INTO `zc_cata` VALUES (1120, 0, 10, 1, 18, '10', '申请中', 'def', ''); -INSERT INTO `zc_cata` VALUES (1121, 0, 20, 1, 18, '20', '已通过', 'warn', ''); -INSERT INTO `zc_cata` VALUES (1122, 0, 21, 1, 18, '21', '微信操作中', 'warn', ''); -INSERT INTO `zc_cata` VALUES (1123, 0, 90, 1, 18, '90', '已拒绝', 'dag', ''); -INSERT INTO `zc_cata` VALUES (1125, 0, 100, 1, 18, '100', '已打款', 'succ', ''); -INSERT INTO `zc_cata` VALUES (1150, 0, 10, 1, 19, '10', '推荐奖', '', ''); -INSERT INTO `zc_cata` VALUES (1151, 0, 20, 1, 19, '20', '带新奖', '', ''); -INSERT INTO `zc_cata` VALUES (1152, 0, 30, 1, 19, '30', '领导奖', '', ''); +INSERT INTO `zc_cata` VALUES (1150, 0, 10, 1, 18, '10', '申请中', 'def', ''); +INSERT INTO `zc_cata` VALUES (1151, 0, 20, 1, 18, '20', '已通过', 'warn', ''); +INSERT INTO `zc_cata` VALUES (1152, 0, 21, 2, 18, '21', '微信操作中', 'warn', ''); +INSERT INTO `zc_cata` VALUES (1153, 0, 30, 1, 18, '30', '已传发票', 'man', ''); +INSERT INTO `zc_cata` VALUES (1154, 0, 50, 1, 18, '50', '待打款', 'def', ''); +INSERT INTO `zc_cata` VALUES (1155, 0, 90, 1, 18, '90', '已拒绝', 'dag', ''); +INSERT INTO `zc_cata` VALUES (1156, 0, 100, 1, 18, '100', '已完成', 'succ', ''); +INSERT INTO `zc_cata` VALUES (1210, 0, 10, 1, 19, '10', '充值', '', ''); +INSERT INTO `zc_cata` VALUES (1211, 0, 11, 1, 19, '11', '提现', '', ''); +INSERT INTO `zc_cata` VALUES (1210, 0, 20, 1, 19, '20', '推荐奖', '', ''); +INSERT INTO `zc_cata` VALUES (1211, 0, 21, 1, 19, '21', '带新奖', '', ''); +INSERT INTO `zc_cata` VALUES (1212, 0, 22, 1, 19, '22', '领导奖', '', ''); INSERT INTO `zc_cata` VALUES (1180, 0, 1, 1, 20, 'a', '实名认证', '', ''); INSERT INTO `zc_cata` VALUES (1181, 0, 2, 1, 20, 'b', '付费会员', '', ''); -INSERT INTO `zc_cata` VALUES (1200, 0, 10, 1, 21, '10', 'LV.1', '', ''); -INSERT INTO `zc_cata` VALUES (1201, 0, 20, 1, 21, '20', 'LV.2', '', ''); -INSERT INTO `zc_cata` VALUES (1230, 0, 0, 1, 22, '10', '劣后', '', ''); -INSERT INTO `zc_cata` VALUES (1231, 0, 0, 1, 22, '20', '正常', '', ''); -INSERT INTO `zc_cata` VALUES (1232, 0, 0, 1, 22, '30', '置顶', '', ''); -INSERT INTO `zc_cata` VALUES (1233, 0, 0, 1, 22, '40', '总置顶', '', ''); -INSERT INTO `zc_cata` VALUES (1250, 0, 0, 1, 23, '10', '草稿', 'def', ''); -INSERT INTO `zc_cata` VALUES (1251, 0, 0, 1, 23, '20', '待审核', 'warn', ''); -INSERT INTO `zc_cata` VALUES (1252, 0, 0, 1, 23, '90', '驳回', 'dag', ''); -INSERT INTO `zc_cata` VALUES (1253, 0, 0, 1, 23, '100', '发布', 'succ', ''); +INSERT INTO `zc_cata` VALUES (1600, 0, 0, 1, 22, '10', '劣后', '', ''); +INSERT INTO `zc_cata` VALUES (1601, 0, 0, 1, 22, '20', '正常', '', ''); +INSERT INTO `zc_cata` VALUES (1602, 0, 0, 1, 22, '30', '置顶', '', ''); +INSERT INTO `zc_cata` VALUES (1603, 0, 0, 1, 22, '40', '总置顶', '', ''); +INSERT INTO `zc_cata` VALUES (1650, 0, 0, 1, 23, '10', '草稿', 'def', ''); +INSERT INTO `zc_cata` VALUES (1651, 0, 0, 1, 23, '20', '待审核', 'warn', ''); +INSERT INTO `zc_cata` VALUES (1652, 0, 0, 1, 23, '90', '驳回', 'dag', ''); +INSERT INTO `zc_cata` VALUES (1653, 0, 0, 1, 23, '100', '发布', 'succ', ''); +INSERT INTO `zc_cata` VALUES (1700, 0, 10, 1, 24, '10', 'LV.1', '', ''); +INSERT INTO `zc_cata` VALUES (1701, 0, 20, 1, 24, '20', 'LV.2', '', ''); INSERT INTO `zc_cata` VALUES (10100, 0, 1, 1, 100, 'text', '文本', '', ''); INSERT INTO `zc_cata` VALUES (10101, 0, 2, 1, 100, 'json', 'JSON', '', ''); INSERT INTO `zc_cata` VALUES (10105, 0, 5, 1, 100, 'fcall', '函数', '', ''); @@ -1611,10 +1635,10 @@ CREATE TABLE `zc_log` ( -- ---------------------------- -- ---------------------------- --- Table structure for zc_luser +-- Table structure for zc_lug -- ---------------------------- -DROP TABLE IF EXISTS `zc_luser`; -CREATE TABLE `zc_luser` ( +DROP TABLE IF EXISTS `zc_lug`; +CREATE TABLE `zc_lug` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, `isinout` int(11) NOT NULL COMMENT '|登录|,BOOL,登入.登出', `loguser` int(11) NOT NULL COMMENT '用户,CATA,adminuser', @@ -1622,10 +1646,10 @@ CREATE TABLE `zc_luser` ( `ip` varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'IP,IP', `model` varchar(250) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '设备指纹', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 3434 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '日志表' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 3434 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '登录记录表' ROW_FORMAT = Dynamic; -- ---------------------------- --- Records of zc_luser +-- Records of zc_lug -- ---------------------------- -- ---------------------------- diff --git a/fapp/ciyon_ap/pages.json b/fapp/ciyon_ap/pages.json index 640b20b..19834f4 100644 --- a/fapp/ciyon_ap/pages.json +++ b/fapp/ciyon_ap/pages.json @@ -316,6 +316,12 @@ "enablePullDownRefresh": true } }, + { + "path": "cashoe_lst", + "style": { + "enablePullDownRefresh": true + } + }, { "path": "cashout_cash" }, @@ -390,6 +396,9 @@ }, { "path": "user_shipaddr" + }, + { + "path": "user_show" } ] } diff --git a/fapp/ciyon_ap/pages/main/me.vue b/fapp/ciyon_ap/pages/main/me.vue index 63b00ff..1ac3d87 100644 --- a/fapp/ciyon_ap/pages/main/me.vue +++ b/fapp/ciyon_ap/pages/main/me.vue @@ -76,13 +76,17 @@ 充值 + + + 收支明细 + 提现 - + - 收支明细 + 收益明细 diff --git a/fapp/ciyon_ap/pages/me/cashie_lst.vue b/fapp/ciyon_ap/pages/me/cashie_lst.vue index d9a93cb..768ba30 100644 --- a/fapp/ciyon_ap/pages/me/cashie_lst.vue +++ b/fapp/ciyon_ap/pages/me/cashie_lst.vue @@ -9,11 +9,11 @@ - + {{item.name}} - {{ccode(g.cashietype, item.cashietype)}} + {{ccode(g.cashtype, item.cashtype)}} {{todatetime(item.addtimes)}} {{item.iemoney/100}} diff --git a/fapp/ciyon_ap/pages/me/cashoe_lst.vue b/fapp/ciyon_ap/pages/me/cashoe_lst.vue new file mode 100644 index 0000000..6fbb5a0 --- /dev/null +++ b/fapp/ciyon_ap/pages/me/cashoe_lst.vue @@ -0,0 +1,80 @@ + + + + + \ No newline at end of file diff --git a/web/ambap/me.php b/web/ambap/me.php index afb4070..e161f55 100644 --- a/web/ambap/me.php +++ b/web/ambap/me.php @@ -315,6 +315,26 @@ class me { $ret = array('pageno' => $pageno, 'pagecount' => $pagecount, 'list' => $rows); return succjson($ret); } + public static function json_cashoe_lst_list() { + global $db; + $rsuser = verifyfast(); + $post = new \ciy\post(); + $query = $post->get('query'); + $csql = new \ciy\sql('ap_cash_oe'); + $csql->where('vuser', $rsuser['id']); + $liid = $post->getint('liid'); + if ($liid == 1) + $csql->where('oemoney>0'); + if ($liid == 2) + $csql->where('oemoney<0'); + $csql->order(objstr($query, 'order', 'id desc')); + $pageno = $post->getint('pageno', 1); + $pagecount = $post->getint('pagecount', 10); + $csql->limit($pageno, $pagecount); + $rows = $db->get($csql); + $ret = array('pageno' => $pageno, 'pagecount' => $pagecount, 'list' => $rows); + return succjson($ret); + } public static function json_cashin_lst_list() { global $db; $rsuser = verifyfast(); diff --git a/web/cweb_ap.php b/web/cweb_ap.php index 5a6b55f..5bc11b7 100644 --- a/web/cweb_ap.php +++ b/web/cweb_ap.php @@ -70,7 +70,7 @@ class cweb_ap { //直接打款 $updata = array(); $updata['cashtype'] = $type; - $updata['iemoney'] = $money; + $updata['oemoney'] = $money; $updata['vuser'] = $userid; $updata['name'] = $name; $updata['addtimes'] = tostamp();