From d1a15a4c4296d7e6a1515d6369c78abd3cc33cc6 Mon Sep 17 00:00:00 2001 From: xucong <850806214@qq.com> Date: Mon, 13 Jul 2026 16:33:09 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/user/User.php | 5 +- app/admin/logic/user/UserLogic.php | 3 +- app/admin/view/user/user/edit.html | 12 ++ app/api/controller/Index.php | 17 +- app/api/controller/Shop.php | 3 +- app/api/controller/ShopGoodsCategory.php | 3 +- app/api/logic/DistributionLogic.php | 22 ++- app/api/logic/ShopGoodsCategoryLogic.php | 26 +-- app/api/logic/ShopLogic.php | 36 ++-- app/common/logic/CityLogic.php | 178 ++++++++++++++++++ public/mp-weixin/common/main.js | 2 +- public/mp-weixin/common/vendor.js | 4 +- .../components/privacy-popup/privacy-popup.js | 2 +- public/mp-weixin/pages/index/index.js | 2 +- scripts/patch-mp-entry-city.js | 71 +++++++ 15 files changed, 348 insertions(+), 38 deletions(-) create mode 100644 app/common/logic/CityLogic.php create mode 100644 scripts/patch-mp-entry-city.js diff --git a/app/admin/controller/user/User.php b/app/admin/controller/user/User.php index 7bce7440..146f87a9 100644 --- a/app/admin/controller/user/User.php +++ b/app/admin/controller/user/User.php @@ -7,7 +7,7 @@ use app\admin\logic\user\LevelLogic; use app\admin\logic\user\UserLogic; use app\common\model\user\UserLevel; use app\common\server\JsonServer; -use app\common\enum\ClientEnum; +use app\common\logic\RegionLogic; use app\admin\validate\user\UserValidate; use think\exception\ValidateException; @@ -65,7 +65,8 @@ class User extends AdminBase return view('', [ 'info' => $detail, - 'tag_list' => json_encode(TagLogic::getTagList()) + 'tag_list' => json_encode(TagLogic::getTagList()), + 'city_list' => RegionLogic::hotCity(), ]); } diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php index 8bf93e5d..77190ee2 100644 --- a/app/admin/logic/user/UserLogic.php +++ b/app/admin/logic/user/UserLogic.php @@ -141,7 +141,7 @@ class UserLogic extends Logic { $field = [ 'id', 'sn','nickname','avatar','mobile','sex','birthday','tag_ids', - 'remark','user_money','user_growth','user_integral','earnings', 'disable' + 'remark','user_money','user_growth','user_integral','earnings', 'disable', 'city_id' ]; $user = User::field($field)->where(['del' => 0, 'id' => $id])->findOrEmpty(); @@ -170,6 +170,7 @@ class UserLogic extends Logic 'tag_ids' => $post['select'], 'remark' => $post['remark'], 'disable' => $post['disable'], + 'city_id' => (int)($post['city_id'] ?? 0), 'update_time' => time() ]; User::update($data); diff --git a/app/admin/view/user/user/edit.html b/app/admin/view/user/user/edit.html index 54c65f50..ee244acf 100644 --- a/app/admin/view/user/user/edit.html +++ b/app/admin/view/user/user/edit.html @@ -69,6 +69,18 @@ +
0;L--)_[L]=_[L]?_[L-1]^v[w(c[_[L]]+E)]:_[L-1];_[0]=v[w(c[_[0]]+E)]}for(E=0;E<=r;E++)_[E]=c[_[E]];for(T=P,A=0,E=0;E>=1)1&A&&(b[t-1-T+8*t]=1,T<6?b[8+t*T]=1:b[8+t*(T+1)]=1);for(T=0;T<7;T++,A>>=1)1&A&&(b[8+t*(t-7+T)]=1,T?b[6-T+8*t]=1:b[7+8*t]=1);return b}(d)},utf16to8:function(e){var t,a,l,n;for(t="",l=e.length,a=0;a