From 06679ba6f55139a0b75d76f7a94db6b5d3f83284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= Date: Sun, 2 Apr 2023 15:04:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=8F=92=E4=BB=B6=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/index/controller/Index.php | 5 ++-- app/wechat/Service.php | 2 +- app/wechat/command/Auto.php | 2 +- app/wechat/command/Fans.php | 8 +----- app/wechat/controller/Auto.php | 2 +- app/wechat/controller/Config.php | 17 ++--------- app/wechat/controller/Fans.php | 2 +- app/wechat/controller/Keys.php | 2 +- app/wechat/controller/Menu.php | 3 +- app/wechat/controller/News.php | 2 +- app/wechat/controller/api/Js.php | 8 +----- app/wechat/controller/api/Login.php | 5 +--- app/wechat/controller/api/Push.php | 6 ++-- app/wechat/controller/api/Test.php | 13 ++------- app/wechat/controller/api/View.php | 2 +- app/wechat/model/WechatAuto.php | 2 +- app/wechat/model/WechatFans.php | 2 +- app/wechat/model/WechatFansTags.php | 2 +- app/wechat/model/WechatKeys.php | 2 +- app/wechat/model/WechatMedia.php | 2 +- app/wechat/model/WechatNews.php | 2 +- app/wechat/model/WechatNewsArticle.php | 2 +- app/wechat/service/AutoService.php | 5 +--- app/wechat/service/FansService.php | 2 +- app/wechat/service/LoginService.php | 8 ++---- app/wechat/service/MediaService.php | 5 +--- app/wechat/service/WechatService.php | 34 ++++++++-------------- app/wechat/view/config/payment.html | 8 ++++++ app/wechat/view/menu/index.html | 39 ++++++++++++++------------ 29 files changed, 76 insertions(+), 118 deletions(-) diff --git a/app/index/controller/Index.php b/app/index/controller/Index.php index a86ef80d2..dea445d17 100644 --- a/app/index/controller/Index.php +++ b/app/index/controller/Index.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | Static Plugin for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2023 Anyon +// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ] // +---------------------------------------------------------------------- // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- @@ -17,12 +17,11 @@ namespace app\index\controller; use think\admin\Controller; -use think\admin\extend\ToolsExtend; class Index extends Controller { public function index() { - ToolsExtend::removeEmptyDirectory(syspath('database'), true); + $this->redirect(sysuri('admin/login/index')); } } diff --git a/app/wechat/Service.php b/app/wechat/Service.php index a721e05e9..9a09de097 100644 --- a/app/wechat/Service.php +++ b/app/wechat/Service.php @@ -23,7 +23,7 @@ use think\admin\Plugin; /** * 组件注册服务 - * Class Service + * @class Service * @package app\wechat */ class Service extends Plugin diff --git a/app/wechat/command/Auto.php b/app/wechat/command/Auto.php index 21f00cf9b..db27b4e46 100644 --- a/app/wechat/command/Auto.php +++ b/app/wechat/command/Auto.php @@ -26,7 +26,7 @@ use think\console\Output; /** * 向指定用户推送消息 - * Class Auto + * @class Auto * @package app\wechat\command */ class Auto extends Command diff --git a/app/wechat/command/Fans.php b/app/wechat/command/Fans.php index e32a9dfec..11e6e1c30 100644 --- a/app/wechat/command/Fans.php +++ b/app/wechat/command/Fans.php @@ -24,7 +24,7 @@ use think\admin\Command; /** * 微信粉丝管理指令 - * Class Fans + * @class Fans * @package app\wechat\command */ class Fans extends Command @@ -60,9 +60,6 @@ class Fans extends Command * @throws \WeChat\Exceptions\InvalidResponseException * @throws \WeChat\Exceptions\LocalCacheException * @throws \think\admin\Exception - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException */ protected function _list(string $next = '', int $done = 0): string { @@ -132,9 +129,6 @@ class Fans extends Command * @throws \WeChat\Exceptions\InvalidResponseException * @throws \WeChat\Exceptions\LocalCacheException * @throws \think\admin\Exception - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException */ public function _tags(int $done = 0): string { diff --git a/app/wechat/controller/Auto.php b/app/wechat/controller/Auto.php index 06b5665a5..c36ddbd94 100644 --- a/app/wechat/controller/Auto.php +++ b/app/wechat/controller/Auto.php @@ -24,7 +24,7 @@ use think\admin\service\SystemService; /** * 关注自动回复 - * Class Auto + * @class Auto * @package app\wechat\controller */ class Auto extends Controller diff --git a/app/wechat/controller/Config.php b/app/wechat/controller/Config.php index fcbf4e690..c63da47fd 100644 --- a/app/wechat/controller/Config.php +++ b/app/wechat/controller/Config.php @@ -23,7 +23,7 @@ use think\admin\storage\LocalStorage; /** * 微信授权绑定 - * Class Config + * @class Config * @package app\wechat\controller */ class Config extends Controller @@ -32,9 +32,7 @@ class Config extends Controller * 微信授权配置 * @auth true * @menu true - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException + * @throws \think\admin\Exception */ public function options() { @@ -90,10 +88,7 @@ class Config extends Controller /** * 微信第三方平台接口配置 * @auth true - * @return void - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException + * @throws \think\admin\Exception */ public function options_jsonrpc() { @@ -121,9 +116,6 @@ class Config extends Controller * @auth true * @menu true * @throws \think\admin\Exception - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException */ public function payment() { @@ -155,9 +147,6 @@ class Config extends Controller * 微信支付修改 * @auth true * @throws \think\admin\Exception - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException */ public function payment_save() { diff --git a/app/wechat/controller/Fans.php b/app/wechat/controller/Fans.php index 9f3e5a1b8..f3a7b165d 100644 --- a/app/wechat/controller/Fans.php +++ b/app/wechat/controller/Fans.php @@ -25,7 +25,7 @@ use think\exception\HttpResponseException; /** * 微信用户管理 - * Class Fans + * @class Fans * @package app\wechat\controller */ class Fans extends Controller diff --git a/app/wechat/controller/Keys.php b/app/wechat/controller/Keys.php index f9d03fdd8..272179d76 100644 --- a/app/wechat/controller/Keys.php +++ b/app/wechat/controller/Keys.php @@ -25,7 +25,7 @@ use think\exception\HttpResponseException; /** * 回复规则管理 - * Class Keys + * @class Keys * @package app\wechat\controller */ class Keys extends Controller diff --git a/app/wechat/controller/Menu.php b/app/wechat/controller/Menu.php index e50add75d..6f459fecb 100644 --- a/app/wechat/controller/Menu.php +++ b/app/wechat/controller/Menu.php @@ -22,7 +22,7 @@ use think\exception\HttpResponseException; /** * 微信菜单管理 - * Class Menu + * @class Menu * @package app\wechat\controller */ class Menu extends Controller @@ -54,6 +54,7 @@ class Menu extends Controller * 微信菜单管理 * @auth true * @menu true + * @throws \think\admin\Exception * @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException diff --git a/app/wechat/controller/News.php b/app/wechat/controller/News.php index 66a7d557b..6cdd42ad8 100644 --- a/app/wechat/controller/News.php +++ b/app/wechat/controller/News.php @@ -25,7 +25,7 @@ use think\admin\service\AdminService; /** * 微信图文管理 - * Class News + * @class News * @package app\wechat\controller */ class News extends Controller diff --git a/app/wechat/controller/api/Js.php b/app/wechat/controller/api/Js.php index 80c59d507..e1c9392a2 100644 --- a/app/wechat/controller/api/Js.php +++ b/app/wechat/controller/api/Js.php @@ -22,7 +22,7 @@ use think\Response; /** * 前端JS获取控制器 - * Class Js + * @class Js * @package app\wechat\controller\api */ class Js extends Controller @@ -42,9 +42,6 @@ class Js extends Controller * @throws \WeChat\Exceptions\InvalidResponseException * @throws \WeChat\Exceptions\LocalCacheException * @throws \think\admin\Exception - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException */ public function index(): Response { @@ -71,9 +68,6 @@ class Js extends Controller * @throws \WeChat\Exceptions\InvalidResponseException * @throws \WeChat\Exceptions\LocalCacheException * @throws \think\admin\Exception - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException */ public function sdk() { diff --git a/app/wechat/controller/api/Login.php b/app/wechat/controller/api/Login.php index c6005d100..118b228cd 100644 --- a/app/wechat/controller/api/Login.php +++ b/app/wechat/controller/api/Login.php @@ -21,7 +21,7 @@ use think\admin\Controller; /** * 微信扫码登录 - * Class Login + * @class Login * @package app\wechat\controller\api */ class Login extends Controller @@ -42,9 +42,6 @@ class Login extends Controller * @throws \WeChat\Exceptions\InvalidResponseException * @throws \WeChat\Exceptions\LocalCacheException * @throws \think\admin\Exception - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException */ public function oauth() { diff --git a/app/wechat/controller/api/Push.php b/app/wechat/controller/api/Push.php index 86078348e..0de69892d 100644 --- a/app/wechat/controller/api/Push.php +++ b/app/wechat/controller/api/Push.php @@ -22,7 +22,7 @@ use think\admin\Controller; /** * 微信消息推送处理 - * Class Push + * @class Push * @package app\wechat\controller\api */ class Push extends Controller @@ -78,9 +78,9 @@ class Push extends Controller /** * 获取网络出口IP - * @return mixed + * @return string */ - public function geoip() + public function geoip(): string { return $this->request->ip(); } diff --git a/app/wechat/controller/api/Test.php b/app/wechat/controller/api/Test.php index cf2b7d20c..e4e532055 100644 --- a/app/wechat/controller/api/Test.php +++ b/app/wechat/controller/api/Test.php @@ -25,7 +25,7 @@ use WeChat\Contracts\Tools; /** * 微信测试工具 - * Class Test + * @class Test * @package app\wechat\controller\api */ class Test extends Controller @@ -94,9 +94,6 @@ class Test extends Controller * @throws \WeChat\Exceptions\InvalidResponseException * @throws \WeChat\Exceptions\LocalCacheException * @throws \think\admin\Exception - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException */ public function oauth() { @@ -110,9 +107,6 @@ class Test extends Controller * @throws \WeChat\Exceptions\InvalidResponseException * @throws \WeChat\Exceptions\LocalCacheException * @throws \think\admin\Exception - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException */ public function jssdk() { @@ -163,12 +157,9 @@ class Test extends Controller /** * 微信JSAPI支付测试 * @return string + * @throws \WeChat\Exceptions\InvalidResponseException * @throws \WeChat\Exceptions\LocalCacheException * @throws \think\admin\Exception - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - * @throws \WeChat\Exceptions\InvalidResponseException */ public function jsapi(): string { diff --git a/app/wechat/controller/api/View.php b/app/wechat/controller/api/View.php index 27a3e3b9e..76559dfa6 100644 --- a/app/wechat/controller/api/View.php +++ b/app/wechat/controller/api/View.php @@ -22,7 +22,7 @@ use think\admin\Controller; /** * 微信图文显示 - * Class View + * @class View * @package app\wechat\controller\api */ class View extends Controller diff --git a/app/wechat/model/WechatAuto.php b/app/wechat/model/WechatAuto.php index c3ecc69c4..fe8d43926 100644 --- a/app/wechat/model/WechatAuto.php +++ b/app/wechat/model/WechatAuto.php @@ -20,7 +20,7 @@ use think\admin\Model; /** * 微信自动回复模型 - * Class WechatAuto + * @class WechatAuto * @package app\wechat\model */ class WechatAuto extends Model diff --git a/app/wechat/model/WechatFans.php b/app/wechat/model/WechatFans.php index 26ee95f37..2a1293ad7 100644 --- a/app/wechat/model/WechatFans.php +++ b/app/wechat/model/WechatFans.php @@ -20,7 +20,7 @@ use think\admin\Model; /** * 微信粉丝用户模型 - * Class WechatFans + * @class WechatFans * @package app\wechat\model */ class WechatFans extends Model diff --git a/app/wechat/model/WechatFansTags.php b/app/wechat/model/WechatFansTags.php index 29d206796..8bfff6ebb 100644 --- a/app/wechat/model/WechatFansTags.php +++ b/app/wechat/model/WechatFansTags.php @@ -20,7 +20,7 @@ use think\admin\Model; /** * 微信粉丝标签模型 - * Class WechatFansTags + * @class WechatFansTags * @package app\wechat\model */ class WechatFansTags extends Model diff --git a/app/wechat/model/WechatKeys.php b/app/wechat/model/WechatKeys.php index 194a5bb7c..337ea4a4c 100644 --- a/app/wechat/model/WechatKeys.php +++ b/app/wechat/model/WechatKeys.php @@ -20,7 +20,7 @@ use think\admin\Model; /** * 微信回复关键词模型 - * Class WechatKeys + * @class WechatKeys * @package app\wechat\model */ class WechatKeys extends Model diff --git a/app/wechat/model/WechatMedia.php b/app/wechat/model/WechatMedia.php index f6186d817..d40665cd6 100644 --- a/app/wechat/model/WechatMedia.php +++ b/app/wechat/model/WechatMedia.php @@ -20,7 +20,7 @@ use think\admin\Model; /** * 微信媒体文件模型 - * Class WechatMedia + * @class WechatMedia * @package app\wechat\model */ class WechatMedia extends Model diff --git a/app/wechat/model/WechatNews.php b/app/wechat/model/WechatNews.php index 0aab501cb..5256fc57b 100644 --- a/app/wechat/model/WechatNews.php +++ b/app/wechat/model/WechatNews.php @@ -20,7 +20,7 @@ use think\admin\Model; /** * 微信图文主模型 - * Class WechatNews + * @class WechatNews * @package app\wechat\model */ class WechatNews extends Model diff --git a/app/wechat/model/WechatNewsArticle.php b/app/wechat/model/WechatNewsArticle.php index 1ac595a6a..56a3cce0c 100644 --- a/app/wechat/model/WechatNewsArticle.php +++ b/app/wechat/model/WechatNewsArticle.php @@ -20,7 +20,7 @@ use think\admin\Model; /** * 微信图文详细模型 - * Class WechatNewsArticle + * @class WechatNewsArticle * @package app\wechat\model */ class WechatNewsArticle extends Model diff --git a/app/wechat/service/AutoService.php b/app/wechat/service/AutoService.php index efccf36bf..803680d2d 100644 --- a/app/wechat/service/AutoService.php +++ b/app/wechat/service/AutoService.php @@ -22,7 +22,7 @@ use think\admin\service\QueueService; /** * 关注自动回复服务 - * Class AutoService + * @class AutoService * @package app\wechat\service */ class AutoService extends Service @@ -31,9 +31,6 @@ class AutoService extends Service * 注册微信用户推送任务 * @param string $openid * @throws \think\admin\Exception - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException */ public static function register(string $openid) { diff --git a/app/wechat/service/FansService.php b/app/wechat/service/FansService.php index cb450925b..d9ddf6202 100644 --- a/app/wechat/service/FansService.php +++ b/app/wechat/service/FansService.php @@ -22,7 +22,7 @@ use think\admin\Service; /** * 微信粉丝信息 - * Class FansService + * @class FansService * @package app\wechat\service */ class FansService extends Service diff --git a/app/wechat/service/LoginService.php b/app/wechat/service/LoginService.php index ee44bd186..41f712aab 100644 --- a/app/wechat/service/LoginService.php +++ b/app/wechat/service/LoginService.php @@ -51,12 +51,13 @@ class LoginService * 生成授权二维码 * @param string $code 请求编号 * @param integer $mode 授权模式 + * @param boolean|string $domain * @return array */ - public static function qrcode(string $code, int $mode = 0): array + public static function qrcode(string $code, int $mode = 0, $domain = true): array { $data = ['auth' => self::gauth($code), 'mode' => $mode]; - $image = MediaService::getQrcode(sysuri('wechat/api.login/oauth', $data, false, true)); + $image = MediaService::getQrcode(sysuri('wechat/api.login/oauth', $data, false, $domain)); return ['code' => $code, 'auth' => $data['auth'], 'image' => $image->getDataUri()]; } @@ -68,9 +69,6 @@ class LoginService * @throws \WeChat\Exceptions\InvalidResponseException * @throws \WeChat\Exceptions\LocalCacheException * @throws \think\admin\Exception - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException */ public static function oauth(string $auth = '', int $mode = 0): bool { diff --git a/app/wechat/service/MediaService.php b/app/wechat/service/MediaService.php index 3e0313bd7..60f2620d0 100644 --- a/app/wechat/service/MediaService.php +++ b/app/wechat/service/MediaService.php @@ -31,7 +31,7 @@ use WeChat\Contracts\MyCurlFile; /** * 微信素材管理 - * Class MediaService + * @class MediaService * @package app\wechat\service */ class MediaService extends Service @@ -73,9 +73,6 @@ class MediaService extends Service * @throws \WeChat\Exceptions\InvalidResponseException * @throws \WeChat\Exceptions\LocalCacheException * @throws \think\admin\Exception - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException */ public static function upload(string $url, string $type = 'image', array $video = []): string { diff --git a/app/wechat/service/WechatService.php b/app/wechat/service/WechatService.php index 59105a35a..baaf4d305 100644 --- a/app/wechat/service/WechatService.php +++ b/app/wechat/service/WechatService.php @@ -24,7 +24,8 @@ use think\admin\storage\LocalStorage; use think\exception\HttpResponseException; /** - * Class WechatService + * 微信接口调度服务 + * @class WechatService * @package app\wechat\serivce * * @method \WeChat\Card WeChatCard() static 微信卡券管理 @@ -77,6 +78,10 @@ use think\exception\HttpResponseException; * @method \WePay\Transfers WePayTransfers() static 微信商户打款到零钱 * @method \WePay\TransfersBank WePayTransfersBank() static 微信商户打款到银行卡 * + * ----- WePayV3 ----- + * @method \WePayV3\Transfers WePayV3Transfers() static 微信商家转账到零钱 + * @method \WePayV3\ProfitSharing WePayV3ProfitSharing() static 微信商户分账 + * * ----- WeOpen ----- * @method \WeOpen\Login WeOpenLogin() static 第三方微信登录 * @method \WeOpen\Service WeOpenService() static 第三方服务 @@ -93,9 +98,6 @@ class WechatService extends Service * @param array $arguments * @return mixed * @throws \think\admin\Exception - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException */ public static function __callStatic(string $name, array $arguments) { @@ -127,7 +129,7 @@ class WechatService extends Service */ private static function parseName(string $name): array { - foreach (['WeChat', 'WeMini', 'WeOpen', 'WePay', 'ThinkService'] as $type) { + foreach (['WeChat', 'WeMini', 'WeOpen', 'WePayV3', 'WePay', 'ThinkService'] as $type) { if (strpos($name, $type) === 0) { [, $base] = explode($type, $name); return [$type, $base, "\\{$type}\\{$base}"]; @@ -140,9 +142,6 @@ class WechatService extends Service * 获取当前微信APPID * @return string * @throws \think\admin\Exception - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException */ public static function getAppid(): string { @@ -157,9 +156,6 @@ class WechatService extends Service * 获取接口授权模式 * @return string * @throws \think\admin\Exception - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException */ public static function getType(): string { @@ -172,9 +168,6 @@ class WechatService extends Service * 获取公众号配置参数 * @return array * @throws \think\admin\Exception - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException */ public static function getConfig(): array { @@ -185,6 +178,7 @@ class WechatService extends Service 'encodingaeskey' => sysconf('wechat.encodingaeskey'), 'mch_id' => sysconf('wechat.mch_id'), 'mch_key' => sysconf('wechat.mch_key'), + 'mch_v3_key' => sysconf('wechat.mch_v3_key'), 'cache_path' => syspath('runtime/wechat'), ]; $local = LocalStorage::instance(); @@ -193,8 +187,10 @@ class WechatService extends Service $options['ssl_p12'] = $local->path(sysconf('wechat.mch_ssl_p12'), true); break; case 'pem': - $options['ssl_key'] = $local->path(sysconf('wechat.mch_ssl_key'), true); $options['ssl_cer'] = $local->path(sysconf('wechat.mch_ssl_cer'), true); + $options['ssl_key'] = $local->path(sysconf('wechat.mch_ssl_key'), true); + $options['cert_public'] = $local->path(sysconf('wechat.mch_ssl_cer'), true); + $options['cert_private'] = $local->path(sysconf('wechat.mch_ssl_key'), true); break; } return $options; @@ -209,9 +205,6 @@ class WechatService extends Service * @throws \WeChat\Exceptions\InvalidResponseException * @throws \WeChat\Exceptions\LocalCacheException * @throws \think\admin\Exception - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException */ public static function getWebOauthInfo(string $source, int $isfull = 0, bool $redirect = true): array { @@ -275,9 +268,6 @@ class WechatService extends Service * @throws \WeChat\Exceptions\InvalidResponseException * @throws \WeChat\Exceptions\LocalCacheException * @throws \think\admin\Exception - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException */ public static function getWebJssdkSign(?string $location = null): array { @@ -288,4 +278,4 @@ class WechatService extends Service return static::ThinkServiceConfig()->jsSign($location); } } -} \ No newline at end of file +} diff --git a/app/wechat/view/config/payment.html b/app/wechat/view/config/payment.html index bc46d0788..5ae02af77 100644 --- a/app/wechat/view/config/payment.html +++ b/app/wechat/view/config/payment.html @@ -34,6 +34,14 @@ +
+ +
+ +

微信商户密钥，需要在微信商户平台操作设置操作密码并获取商户接口密钥

+
+
+
diff --git a/app/wechat/view/menu/index.html b/app/wechat/view/menu/index.html index 7c312c22d..8ba0716a6 100644 --- a/app/wechat/view/menu/index.html +++ b/app/wechat/view/menu/index.html @@ -8,13 +8,13 @@
  • - + ဆ
    • - + ဆ
      • @@ -152,16 +152,16 @@ if (one.sub_button[i].active) _two = one.sub_button[i]; } one.sub_button = tmp; - return $rootScope.setActiveItem(one, _two); + return $rootScope.setActiveItem(one, _two, true); } for (var i in $rootScope.list) if (one !== $rootScope.list[i]) tmp.push($rootScope.list[i]); $rootScope.list = tmp; - if ($rootScope.list.length > 1) $rootScope.setActiveItem($rootScope.list[0]) + if ($rootScope.list.length > 1) $rootScope.setActiveItem($rootScope.list[0], null, false) }; // 切换选择菜单 - $rootScope.setActiveItem = function (one, two) { - if (!vali.checkAllInput()) return; + $rootScope.setActiveItem = function (one, two, force) { + if (!force && !vali.checkAllInput()) return; $rootScope.list.forEach(function (item) { item.show = item === one; item.active = two ? false : (item === one) @@ -171,30 +171,33 @@ }); $rootScope.item = two || one || {}; $rootScope.item.type = $rootScope.item.type || 'click'; - if ($rootScope.item.type === 'click') setTimeout(function () { - layui.form.render('select'), ($rootScope.item.key = $('[lay-filter="key"]').val()); - }, 50); + $rootScope.item.type === 'click' && syncActiveItem(); }; - // 下拉列表处理 + // 列表处理 $rootScope.$watch('item', function () { - if ($rootScope.item.type === 'click') setTimeout(function () { - layui.form.render('select'), ($rootScope.item.key = $('[lay-filter="key"]').val()); - }, 50) + $rootScope.item.type === 'click' && syncActiveItem(); }, true); - layui.form.on('select(key)', function (data) { - $rootScope.item.key = data.value; - }); - // 提交数据 $rootScope.submit = function () { if (!vali.checkAllInput()) return false; $.form.load('{:url("push")}', {data: angular.toJson($rootScope.list)}, 'post'); } + + // 同步选择项值 + function syncActiveItem() { + setTimeout(function () { + layui.form.render('select'); + $rootScope.item.key = $('[lay-filter="key"]').val(); + }, 50); + } + + layui.form.on('select(key)', function (data) { + $rootScope.item.key = data.value; + }); } }); }); - {/block} \ No newline at end of file