From de7ee4231918b3929349f9111b0d9ff2d21c2485 Mon Sep 17 00:00:00 2001 From: ryx <2736755949@qq.com> Date: Wed, 21 Jan 2026 22:14:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8B=95=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fapp/ciyon_ap/App.vue | 22 +- fapp/ciyon_ap/pages.json | 9 + fapp/ciyon_ap/pages/main/index.vue | 6 +- fapp/ciyon_ap/pages/main/notify.vue | 412 +++++++++++++++++++++++++++ fapp/ciyon_ap/util/lang/zh-Hans.json | 1 + web/ambap/common.php | 14 +- web/ambap/login.php | 54 +--- web/ud/svgicon/index.txt | 2 +- 8 files changed, 445 insertions(+), 75 deletions(-) create mode 100644 fapp/ciyon_ap/pages/main/notify.vue diff --git a/fapp/ciyon_ap/App.vue b/fapp/ciyon_ap/App.vue index 575a15d..6cd2367 100644 --- a/fapp/ciyon_ap/App.vue +++ b/fapp/ciyon_ap/App.vue @@ -34,13 +34,13 @@ // selecticon: svg.replaceAll(/{{bg1}}/g, bgsel1).replaceAll(/{{bg2}}/g, bgsel2), // icon: svg.replaceAll(/{{bg1}}/g, bggray1).replaceAll(/{{bg2}}/g, bggray2) // }); - // var svg = ''; - // app.globalData.tabbarArr.push({ - // name: 'tabbar.cd', - // fullpath: '/pages/card', - // selecticon: svg.replaceAll(/{{bg1}}/g, bgsel1).replaceAll(/{{bg2}}/g, bgsel2), - // icon: svg.replaceAll(/{{bg1}}/g, bggray1).replaceAll(/{{bg2}}/g, bggray2) - // }); + var svg = ''; + app.globalData.tabbarArr.push({ + name: 'tabbar.notify', + fullpath: '/pages/main/notify', + selecticon: svg.replaceAll(/{{bg1}}/g, bgsel1).replaceAll(/{{bg2}}/g, bgsel2), + icon: svg.replaceAll(/{{bg1}}/g, bggray1).replaceAll(/{{bg2}}/g, bggray2) + }); var svg = ''; app.globalData.tabbarArr.push({ name: 'tabbar.me', @@ -57,7 +57,7 @@ app.globalData.srv = 't'; app.globalData.jsnajax = 'ambap/'; app.globalData.jsnurl = {}; - app.globalData.jsnurl.t = 'https://ciyon.ciy.cn/'; + app.globalData.jsnurl.t = 'https://labsci.ciy.cn/'; app.globalData.demourl = 'https://i.qiboc.cn/app.goc'; //原型图地址 app.globalData.tokenfield = "ciyap"; app.globalData.tokensalt = "ast34h$3"; @@ -67,15 +67,15 @@ app.globalData.dupsec = 60; app.globalData.storselect = '/'; app.globalData.storlist = { - '/': 'https://ciyon.ciy.cn/ud/', + '/': 'https://labsci.ciy.cn/ud/', 'A': 'https://cf5.nyyzsoft.cn/ud/' }; app.globalData.stortransfer = ['/']; if (process.env.NODE_ENV === 'development') { //#ifdef H5 - app.globalData.jsnurl.t = 'https://ciyon.local.ciy.cn/'; - app.globalData.storlist['/'] = 'https://ciyon.local.ciy.cn/ud/'; + app.globalData.jsnurl.t = 'https://labsci.local.ciy.cn/'; + app.globalData.storlist['/'] = 'https://labsci.local.ciy.cn/ud/'; //golang // app.globalData.jsnurl.t = 'http://ciyonhgo.local.ciy.cn/'; diff --git a/fapp/ciyon_ap/pages.json b/fapp/ciyon_ap/pages.json index 19834f4..ef01c23 100644 --- a/fapp/ciyon_ap/pages.json +++ b/fapp/ciyon_ap/pages.json @@ -6,6 +6,12 @@ "enablePullDownRefresh": true } }, + { + "path": "pages/main/notify", + "style": { + "enablePullDownRefresh": true + } + }, { "path": "pages/main/me", "style": { @@ -51,6 +57,9 @@ { "pagePath": "pages/main/index" }, + { + "pagePath": "pages/main/notify" + }, { "pagePath": "pages/main/me" } diff --git a/fapp/ciyon_ap/pages/main/index.vue b/fapp/ciyon_ap/pages/main/index.vue index 583d9b2..37281ed 100644 --- a/fapp/ciyon_ap/pages/main/index.vue +++ b/fapp/ciyon_ap/pages/main/index.vue @@ -22,9 +22,9 @@ 游客页面 - + - 用户页面 + 成员管理 @@ -55,6 +55,7 @@ } }, onLoad() { + console.log('onload'); if (this.opn.u) { uni.navigateTo({ url: decodeURIComponent(this.opn.u) @@ -76,6 +77,7 @@ onShow() { if (this._meid === this.me.id) return; + console.log('onshow 12'); this._meid = this.me.id; this.pageno = 0; this.init.members = []; diff --git a/fapp/ciyon_ap/pages/main/notify.vue b/fapp/ciyon_ap/pages/main/notify.vue new file mode 100644 index 0000000..aee1211 --- /dev/null +++ b/fapp/ciyon_ap/pages/main/notify.vue @@ -0,0 +1,412 @@ + + + + \ No newline at end of file diff --git a/fapp/ciyon_ap/util/lang/zh-Hans.json b/fapp/ciyon_ap/util/lang/zh-Hans.json index 32fff8a..c9aef05 100644 --- a/fapp/ciyon_ap/util/lang/zh-Hans.json +++ b/fapp/ciyon_ap/util/lang/zh-Hans.json @@ -19,6 +19,7 @@ "多语言切换": "多语言切换", "tabbar.index": "广场", + "tabbar.notify": "消息", "tabbar.me": "我的", "login.xieyi": "/pages/main/paper?id=3", "login.tablogin": "登录", diff --git a/web/ambap/common.php b/web/ambap/common.php index 131141d..613c11d 100644 --- a/web/ambap/common.php +++ b/web/ambap/common.php @@ -42,7 +42,7 @@ function verifyuser($post = null) { $auth = json_decode(encrypt($ciyauth, 'D', $_token['salt']), true); if ($auth == null) return null; - $csql = new \ciy\sql('ap_user'); //弃用redis集群 + $csql = new \ciy\sql('lab_user'); //弃用redis集群 $csql->where('id', $auth['id']); $userrow = $db->getone($csql); if (!is_array($userrow)) @@ -53,22 +53,12 @@ function verifyuser($post = null) { return null; if ($userrow['exptimes'] < time() - $_token['expsec']) return null; - if ($post && $userrow['upid'] == 0) { - $upid = $post->getint('upid'); - if ($upid > 0) { - $updata = array(); - $updata['upid'] = $upid; - $csql = new \ciy\sql('ap_user'); - $csql->where('id', $userrow['id']); - $db->update($csql, $updata); - } - } if ($userrow['exptimes'] > time()) return $userrow; $exp = time() + $_token['swapsec']; $sid = randstr(10); $auth['_s'] = $sid; - if ($db->execute('update ap_user set exptimes=?,sid=? where id=?', array($exp, $sid, $auth['id'])) === false) + if ($db->execute('update lab_user set exptimes=?,sid=? where id=?', array($exp, $sid, $auth['id'])) === false) return null; $authstr = json_encode($auth, JSON_PARTIAL_OUTPUT_ON_ERROR); $enauth = encrypt($authstr, 'E', $_token['salt']); diff --git a/web/ambap/login.php b/web/ambap/login.php index bf814c4..7dbf3ed 100644 --- a/web/ambap/login.php +++ b/web/ambap/login.php @@ -24,7 +24,7 @@ class login { $user = $post->get('user'); if (empty($user)) return errjson('请填写用户名'); - $csql = new \ciy\sql('ap_user'); + $csql = new \ciy\sql('lab_user'); $csql->where('mobile', $user); $rsuser = $db->getone($csql); if ($rsuser === false) @@ -52,7 +52,7 @@ class login { $updata = array(); $updata['trytime'] = array('trytime+1'); $updata['logintimes'] = tostamp(); - $csql = new \ciy\sql('ap_user'); + $csql = new \ciy\sql('lab_user'); $csql->where('id', $rsuser['id']); $db->update($csql, $updata); savelog($db, $rsuser['id'], 'LOGINERR', '用户[' . $user . ']登录密码错误' . md5('1' . $_token['salt'])); @@ -67,30 +67,12 @@ class login { $updata['sid'] = $sid; $updata['exptimes'] = $exp; $updata['ip'] = getip(); - $csql = new \ciy\sql('ap_user'); + $csql = new \ciy\sql('lab_user'); $csql->where('id', $id); if ($db->update($csql, $updata) === false) return errjson('user数据库更新失败:' . $db->error); - if (!empty($appcid)) { - $csql = new \ciy\sql('ap_usr_ext'); - $csql->where('id', $rsuser['id']); - $extrow = $db->getone($csql); - if (is_array($extrow)) { - if ($extrow['appcid'] != $appcid) { - $updata = array(); - $updata['appcid'] = $appcid; - if ($db->update($csql, $updata) === false) - throw new \Exception('ext更新失败:' . $db->error); - } - } else { - $updata = array(); - $updata['appcid'] = $appcid; - $updata['id'] = $rsuser['id']; - if ($db->insert($csql, $updata) === false) - throw new \Exception('ext新增失败:' . $db->error); - } - } + self::savelug($db, 1, $rsuser['id'], $model); $ret = self::getsync($rsuser, $sid); $csql = new \ciy\sql('zc_debug_user'); @@ -392,40 +374,14 @@ class login { $ret['pnttrack'] = $db->get($csql); $ret['me'] = array(); $ret['me']['addtimes'] = $userrow['addtimes']; - $ret['me']['accounttimes'] = $userrow['accounttimes']; //$ret['me']['saasid_a'] = $userrow['saasid_a']; $ret['me']['id'] = $userrow['id']; $ret['me']['eid'] = enid($userrow['id']); - $ret['me']['upid'] = $userrow['upid']; - $ret['me']['icon'] = $userrow['icon']; $ret['me']['mobile'] = $userrow['mobile']; $ret['me']['name'] = $userrow['name']; - $ret['me']['userlevel'] = $userrow['userlevel']; - $ret['me']['mymoney'] = $userrow['mymoney']; - $ret['me']['mycashmoney'] = $userrow['mycashmoney']; - $ret['me']['myinvmoney'] = $userrow['myinvmoney']; - $ret['me']['mybondmoney'] = $userrow['mybondmoney']; - $ret['me']['mypnt'] = $userrow['mypnt']; - $ret['me']['certs'] = $userrow['certs']; + $ret['me']['dvotecnt'] = $userrow['dvotecnt']; $ret['me']['needpass'] = empty($userrow['password']); $ret['me']['cciy'] = ''; - $csql = new \ciy\sql('ap_usr_ext'); - $csql->where('id', $userrow['id']); - $extrow = $db->getone($csql); - if (is_array($extrow)) { - $ret['me']['truename'] = $extrow['truename']; - $ret['me']['email'] = $extrow['email']; - $ret['me']['wxno'] = $extrow['wxno']; - $ret['me']['idid'] = $extrow['idid']; - $ret['me']['cciy'] = $extrow['cciy'] . ''; - $ret['me']['cashtype'] = $extrow['cashtype']; - $ret['me']['bankno'] = $extrow['bankno']; - $ret['me']['bankname'] = $extrow['bankname']; - $ret['me']['bankaccount'] = $extrow['bankaccount']; - $ret['me']['bankcode'] = $extrow['bankcode']; - } else { - $ret['me']['truename'] = ''; - } return succjson($ret); } public static function json_logout() { diff --git a/web/ud/svgicon/index.txt b/web/ud/svgicon/index.txt index dfdc767..f0145fe 100644 --- a/web/ud/svgicon/index.txt +++ b/web/ud/svgicon/index.txt @@ -1,5 +1,5 @@ cqd: -cjf: +cjf: cmh: ctg: