修改支付通道

app/data/controller/api/Notify.php

@@ -20,6 +20,7 @@ class Notify extends Controller
      * @param string $param 支付通道
      * @return string
      * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \think\Exception
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
@@ -27,7 +28,7 @@ class Notify extends Controller
     public function wxpay(string $scene = 'order', string $param = ''): string
     {
         if (strtolower($scene) === 'order') {
-            return WechatPaymentService::instance()->notify($param);
+            return WechatPaymentService::instance($param)->notify();
         } else {
             return 'success';
         }
@@ -39,6 +40,7 @@ class Notify extends Controller
      * @param string $param 支付通道
      * @return string
      * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \think\Exception
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
@@ -46,7 +48,7 @@ class Notify extends Controller
     public function alipay(string $scene = 'order', string $param = ''): string
     {
         if (strtolower($scene) === 'order') {
-            return AlipayPaymentService::instance()->notify($param);
+            return AlipayPaymentService::instance($param)->notify();
         } else {
             return 'success';
         }
@@ -57,6 +59,8 @@ class Notify extends Controller
      * @param string $scene 支付场景
      * @param string $param 支付通道
      * @return string
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \think\Exception
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
@@ -64,7 +68,7 @@ class Notify extends Controller
     public function joinpay(string $scene = 'order', string $param = ''): string
     {
         if (strtolower($scene) === 'order') {
-            return JoinPaymentService::instance()->notify($param);
+            return JoinPaymentService::instance($param)->notify();
         } else {
             return 'success';
         }

app/data/controller/api/auth/Order.php

@@ -105,11 +105,15 @@ class Order extends Auth
                 'total_selling' => $goodsItem['price_selling'] * $count,
             ];
         }
-        // 统计订单金额
-        $order['amount_reduct'] = OrderService::instance()->getReduct();
-        $order['amount_goods'] = array_sum(array_column($items, 'total_selling'));
-        $order['amount_total'] = $order['amount_goods'] - $order['amount_reduct'];
         try {
+            // 统计订单商品
+            $order['amount_reduct'] = OrderService::instance()->getReduct();
+            // 统计订单金额
+            $order['number_goods'] = array_sum(array_column($items, 'stock_sales'));
+            $order['amount_goods'] = array_sum(array_column($items, 'total_selling'));
+            $order['amount_total'] = $order['amount_goods'] - $order['amount_reduct'];
+            // 支付金额不能为零
+            if ($order['amount_total'] <= 0) $order['amount_total'] = 0.01;
             // 订单数据写入
             $this->app->db->name('ShopOrder')->insert($order);
             $this->app->db->name('ShopOrderItem')->insertAll($items);
@@ -169,6 +173,8 @@ class Order extends Auth
         $map = ['uid' => $this->uuid, 'order_no' => $data['order_no']];
         $update = ['status' => 2, 'amount_express' => $express['template_amount']];
         $update['amount_total'] = $order['amount_goods'] + $amount - $order['amount_reduct'] - $order['amount_discount'];
+        // 支付金额不能为零
+        if ($update['amount_total'] <= 0) $update['amount_total'] = 0.01;
         if ($this->app->db->name('ShopOrder')->where($map)->update($update) !== false) {
             $this->success('订单确认成功！', ['order_no' => $order['order_no']]);
         } else {
@@ -200,7 +206,7 @@ class Order extends Auth
                 $openid = $this->user[UserService::TYPES[$this->type]['auth']] ?? '';
                 if (empty($openid)) $this->error("无法创建支付，未获取到OPENID");
             }
-            $params = PaymentService::build($data['payment_code'])->create($openid, $order['order_no'], $order['amount_total'], '商城订单支付', '', $data['payment_back']);
+            $params = PaymentService::instance($data['payment_code'])->create($openid, $order['order_no'], $order['amount_total'], '商城订单支付', '', $data['payment_back']);
             $this->success('获取支付参数成功！', $params);
         } catch (HttpResponseException $exception) {
             throw  $exception;

app/data/service/PaymentService.php

@@ -6,13 +6,16 @@ use app\data\service\payment\AlipayPaymentService;
 use app\data\service\payment\JoinPaymentService;
 use app\data\service\payment\WechatPaymentService;
 use think\admin\Service;
+use think\App;
+use think\Container;
+use think\Exception;
 
 /**
  * 支付基础服务
  * Class PaymentService
  * @package app\data\service
  */
-abstract class PaymentService extends Service
+abstract class PaymentService
 {
 
     // 汇聚支付通道
@@ -88,23 +91,29 @@ abstract class PaymentService extends Service
         ],
     ];
 
+    /**
+     * 当前应用
+     * @var App
+     */
+    protected $app;
+
     /**
      * 支付通道编号
      * @var string
      */
-    protected static $code;
+    protected $code;
 
     /**
      * 默认支付类型
      * @var string
      */
-    protected static $type;
+    protected $type;
 
     /**
      * 当前支付通道
      * @var array
      */
-    protected static $params;
+    protected $params;
 
     /**
      * 支付服务对象
@@ -112,25 +121,44 @@ abstract class PaymentService extends Service
      */
     protected static $driver = [];
 
+    /**
+     * PaymentService constructor.
+     * @param App $app 当前应用对象
+     * @param string $code 支付通道编号
+     * @param string $type 支付类型代码
+     * @param array $params 支付通道配置
+     */
+    public function __construct(App $app, string $code, string $type, array $params)
+    {
+        $this->app = $app;
+        $this->code = $code;
+        $this->type = $type;
+        $this->params = $params;
+        if (method_exists($this, 'initialize')) {
+            $this->initialize();
+        }
+    }
+
     /**
      * 根据配置实例支付服务
      * @param string $code 支付通道编号
      * @return JoinPaymentService|WechatPaymentService|AlipayPaymentService
-     * @throws \think\Exception
+     * @throws Exception
      */
-    public static function build(string $code): PaymentService
+    public static function instance(string $code): PaymentService
     {
-        [static::$code, static::$type, static::$params] = self::config($code);
+        [, $type, $params] = self::config($code);
         if (isset(static::$driver[$code])) return static::$driver[$code];
+        $vars = ['code' => $code, 'type' => $type, 'params' => $params];
         // 实例化具体支付通道类型
-        if (stripos(static::$type, 'alipay_') === 0) {
+        if (stripos($type, 'alipay_') === 0) {
-            return static::$driver[$code] = AlipayPaymentService::instance();
+            return static::$driver[$code] = Container::getInstance()->make(AlipayPaymentService::class, $vars);
-        } elseif (stripos(static::$type, 'wechat_') === 0) {
+        } elseif (stripos($type, 'wechat_') === 0) {
-            return static::$driver[$code] = WechatPaymentService::instance();
+            return static::$driver[$code] = Container::getInstance()->make(WechatPaymentService::class, $vars);
-        } elseif (stripos(static::$type, 'joinpay_') === 0) {
+        } elseif (stripos($type, 'joinpay_') === 0) {
-            return static::$driver[$code] = JoinPaymentService::instance();
+            return static::$driver[$code] = Container::getInstance()->make(JoinPaymentService::class, $vars);
         } else {
-            throw new \think\Exception(sprintf('支付驱动[%s]未定义', static::$type));
+            throw new \think\Exception(sprintf('支付驱动[%s]未定义', $type));
         }
     }
 
@@ -138,26 +166,27 @@ abstract class PaymentService extends Service
      * 根据通道编号获取配置参数
      * @param string $code
      * @return array [code,type,params]
-     * @throws \think\Exception
+     * @throws Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
      */
     public static function config(string $code): array
     {
-        $map = ['code' => $code, 'status' => 1, 'deleted' => 0];
+        try {
-        $payment = app()->db->name('DataPayment')->where($map)->find();
+            $map = ['code' => $code, 'status' => 1, 'deleted' => 0];
-        if (empty($payment)) {
+            $payment = app()->db->name('DataPayment')->where($map)->find();
-            throw new \think\Exception("支付通道[#{$code}]禁用关闭");
+            if (empty($payment)) {
+                throw new \think\Exception("支付通道[#{$code}]禁用关闭");
+            }
+            $params = @json_decode($payment['content'], true);
+            if (empty($params)) {
+                throw new \think\Exception("支付通道[#{$code}]配置无效");
+            }
+            if (empty(static::TYPES[$payment['type']])) {
+                throw new \think\Exception("支付通道[@{$payment['type']}]匹配失败");
+            }
+            return [$payment['code'], $payment['type'], $params];
+        } catch (\Exception $exception) {
+            throw new Exception($exception->getMessage(), $exception->getCode());
         }
-        $params = @json_decode($payment['content'], true);
-        if (empty($params)) {
-            throw new \think\Exception("支付通道[#{$code}]配置无效");
-        }
-        if (empty(static::TYPES[$payment['type']])) {
-            throw new \think\Exception("支付通道[@{$payment['type']}]匹配失败");
-        }
-        return [$payment['code'], $payment['type'], $params];
     }
 
     /**
@@ -165,13 +194,12 @@ abstract class PaymentService extends Service
      * @param string $orderNo 订单单号
      * @param string $paymentTrade 交易单号
      * @param string $paymentAmount 支付金额
-     * @param null|string $paymentType 支付类型
      * @return boolean
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function updateOrder(string $orderNo, string $paymentTrade, string $paymentAmount, ?string $paymentType = null): bool
+    public function updateOrder(string $orderNo, string $paymentTrade, string $paymentAmount): bool
     {
         // 检查订单支付状态
         $map = ['order_no' => $orderNo, 'payment_status' => 0, 'status' => 2];
@@ -180,10 +208,11 @@ abstract class PaymentService extends Service
         // 更新订单支付状态
         $data = [
             'status'           => 3,
-            'payment_type'     => $paymentType,
+            'payment_type'     => $this->type,
+            'payment_code'     => $this->code,
             'payment_trade'    => $paymentTrade,
-            'payment_status'   => 1,
             'payment_amount'   => $paymentAmount,
+            'payment_status'   => 1,
             'payment_remark'   => '在线支付',
             'payment_datetime' => date('Y-m-d H:i:s'),
         ];
@@ -195,28 +224,21 @@ abstract class PaymentService extends Service
 
     /**
      * 创建支付行为
-     * @param string $param 通道-编号
      * @param string $orderNo 商户订单单号
      * @param string $paymentTitle 商户订单标题
      * @param string $paymentAmount 需要支付金额
      */
-    protected function createPaymentAction(string $param, string $orderNo, string $paymentTitle, string $paymentAmount)
+    protected function createPaymentAction(string $orderNo, string $paymentTitle, string $paymentAmount)
     {
-        if (is_numeric(stripos($param, '-'))) {
-            [$paymentType, $paymentCode] = explode('-', $param);
-        } else {
-            [$paymentType, $paymentCode] = [$param ?: static::$type, static::$code];
-        }
         // 创建支付记录
         $this->app->db->name('DataPaymentItem')->insert([
-            'payment_code' => $paymentCode, 'payment_type' => $paymentType,
+            'payment_code' => $this->code, 'payment_type' => $this->type,
             'order_name'   => $paymentTitle, 'order_amount' => $paymentAmount, 'order_no' => $orderNo,
         ]);
     }
 
     /**
      * 更新支付记录并更新订单
-     * @param string $param 通道-编号
      * @param string $orderNo 商户订单单号
      * @param string $paymentTrade 平台交易单号
      * @param string $paymentAmount 实际到账金额
@@ -225,28 +247,23 @@ abstract class PaymentService extends Service
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    protected function updatePaymentAction(string $param, string $orderNo, string $paymentTrade, string $paymentAmount): bool
+    protected function updatePaymentAction(string $orderNo, string $paymentTrade, string $paymentAmount): bool
     {
-        if (is_numeric(stripos($param, '-'))) {
-            [$paymentType, $paymentCode] = explode('-', $param);
-        } else {
-            [$paymentType, $paymentCode] = [$param ?: static::$type, static::$code];
-        }
         // 更新支付记录
         data_save('DataPaymentItem', [
             'order_no'         => $orderNo,
-            'payment_code'     => $paymentCode,
+            'payment_code'     => $this->code,
-            'payment_type'     => $paymentType,
+            'payment_type'     => $this->type,
             'payment_trade'    => $paymentTrade,
             'payment_amount'   => $paymentAmount,
             'payment_status'   => 1,
             'payment_datatime' => date('Y-m-d H:i:s'),
         ], 'order_no', [
-            'payment_code' => $paymentCode,
+            'payment_code' => $this->code,
-            'payment_type' => $paymentType,
+            'payment_type' => $this->type,
         ]);
         // 更新记录状态
-        return $this->updateOrder($orderNo, $paymentTrade, $paymentAmount, $paymentType);
+        return $this->updateOrder($orderNo, $paymentTrade, $paymentAmount);
     }
 
     /**
@@ -258,10 +275,9 @@ abstract class PaymentService extends Service
 
     /**
      * 支付通知处理
-     * @param string $param 支付通道-支付编号
      * @return string
      */
-    abstract public function notify(string $param = ''): string;
+    abstract public function notify(): string;
 
     /**
      * 创建支付订单

app/data/service/payment/AlipayPaymentService.php

@@ -30,11 +30,11 @@ class AlipayPaymentService extends PaymentService
             // 签名类型（RSA|RSA2）
             'sign_type'   => "RSA2",
             // 应用ID
-            'appid'       => static::$params['alipay_appid'],
+            'appid'       => $this->params['alipay_appid'],
             // 支付宝公钥 (1行填写，特别注意，这里是支付宝公钥，不是应用公钥，最好从开发者中心的网页上去复制)
-            'public_key'  => $this->_trimCertHeader(static::$params['alipay_public_key']),
+            'public_key'  => $this->_trimCertHeader($this->params['alipay_public_key']),
             // 支付宝私钥 (1行填写)
-            'private_key' => $this->_trimCertHeader(static::$params['alipay_private_key']),
+            'private_key' => $this->_trimCertHeader($this->params['alipay_private_key']),
             // 应用公钥证书（新版资金类接口转 app_cert_sn）
             # 'app_cert'    => '',
             // 支付宝根证书（新版资金类接口转 alipay_root_cert_sn）
@@ -57,41 +57,6 @@ class AlipayPaymentService extends PaymentService
         return preg_replace(['/\s+/', '/-{5}.*?-{5}/'], '', $content);
     }
 
-    /**
-     * 支付结果处理
-     * @param string $param 支付通道
-     * @return string
-     * @throws \WeChat\Exceptions\InvalidResponseException
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function notify(string $param = ''): string
-    {
-        $notify = \AliPay\App::instance($this->config)->notify();
-        if (in_array($notify['trade_status'], ['TRADE_SUCCESS', 'TRADE_FINISHED'])) {
-            if ($this->updatePaymentAction($param, $notify['out_trade_no'], $notify['trade_no'], $notify['total_amount'])) {
-                return 'success';
-            } else {
-                return 'error';
-            }
-        } else {
-            return 'success';
-        }
-    }
-
-    /**
-     * 查询订单数据
-     * @param string $orderNo
-     * @return array
-     * @throws \WeChat\Exceptions\InvalidResponseException
-     * @throws \WeChat\Exceptions\LocalCacheException
-     */
-    public function query(string $orderNo): array
-    {
-        return \AliPay\App::instance($this->config)->query($orderNo);
-    }
-
     /**
      * 创建订单支付参数
      * @param string $openid 会员OPENID
@@ -106,13 +71,12 @@ class AlipayPaymentService extends PaymentService
     public function create(string $openid, string $orderNo, string $paymentAmount, string $paymentTitle, string $paymentRemark, string $paymentReturn = ''): array
     {
         try {
-            if (isset(static::TYPES[static::$type])) {
+            if (isset(static::TYPES[$this->type])) {
-                $tradeType = static::TYPES[static::$type]['type'];
+                $tradeType = static::TYPES[$this->type]['type'];
-                $tradeParam = static::$type . '-' . static::$code;
             } else {
-                throw new \think\Exception('支付类型[' . static::$type . ']未配置定义！');
+                throw new \think\Exception(sprintf('支付类型[%s]未配置定义！', $this->type));
             }
-            $this->config['notify_url'] = sysuri("@data/api.notify/alipay/scene/order/param/{$tradeParam}", [], false, true);
+            $this->config['notify_url'] = sysuri("@data/api.notify/alipay/scene/order/param/{$this->code}", [], false, true);
             if (in_array($tradeType, [static::PAYMENT_ALIPAY_WAP, static::PAYMENT_ALIPAY_WEB])) {
                 if (empty($paymentReturn)) {
                     throw new \think\Exception('支付回跳地址不能为空！');
@@ -133,7 +97,7 @@ class AlipayPaymentService extends PaymentService
             if (!empty($paymentRemark)) $data['body'] = $paymentRemark;
             $result = $payment->apply($data);
             // 创建支付记录
-            $this->createPaymentAction($tradeParam, $orderNo, $paymentTitle, $paymentAmount);
+            $this->createPaymentAction($orderNo, $paymentTitle, $paymentAmount);
             // 返回支付参数
             return ['result' => $result];
         } catch (\think\Exception $exception) {
@@ -142,4 +106,38 @@ class AlipayPaymentService extends PaymentService
             throw new \think\Exception($exception->getMessage(), $exception->getCode());
         }
     }
+
+    /**
+     * 支付结果处理
+     * @return string
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function notify(): string
+    {
+        $notify = \AliPay\App::instance($this->config)->notify();
+        if (in_array($notify['trade_status'], ['TRADE_SUCCESS', 'TRADE_FINISHED'])) {
+            if ($this->updatePaymentAction($notify['out_trade_no'], $notify['trade_no'], $notify['total_amount'])) {
+                return 'success';
+            } else {
+                return 'error';
+            }
+        } else {
+            return 'success';
+        }
+    }
+
+    /**
+     * 查询订单数据
+     * @param string $orderNo
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function query(string $orderNo): array
+    {
+        return \AliPay\App::instance($this->config)->query($orderNo);
+    }
 }

app/data/service/payment/JoinPaymentService.php

@@ -48,10 +48,10 @@ class JoinPaymentService extends PaymentService
      */
     protected function initialize(): JoinPaymentService
     {
-        $this->appid = static::$params['joinpay_appid'];
+        $this->appid = $this->params['joinpay_appid'];
-        $this->trade = static::$params['joinpay_trade'];;
+        $this->trade = $this->params['joinpay_trade'];;
-        $this->mchid = static::$params['joinpay_mch_id'];
+        $this->mchid = $this->params['joinpay_mch_id'];
-        $this->mchkey = static::$params['joinpay_mch_key'];
+        $this->mchkey = $this->params['joinpay_mch_key'];
         return $this;
     }
 
@@ -69,11 +69,10 @@ class JoinPaymentService extends PaymentService
     public function create(string $openid, string $orderNo, string $paymentAmount, string $paymentTitle, string $paymentRemark, string $paymentReturn = ''): array
     {
         try {
-            if (isset(static::TYPES[static::$type])) {
+            if (isset(static::TYPES[$this->type])) {
-                $tradeType = static::TYPES[static::$type]['type'];
+                $tradeType = static::TYPES[$this->type]['type'];
-                $tradeParam = static::$type . '-' . static::$code;
             } else {
-                throw new \think\Exception('支付类型[' . static::$type . ']未配置定义！');
+                throw new \think\Exception(sprintf('支付类型[%s]未配置定义！', $this->type));
             }
             $data = [
                 'p0_Version'         => '1.0',
@@ -83,7 +82,7 @@ class JoinPaymentService extends PaymentService
                 'p4_Cur'             => '1',
                 'p5_ProductName'     => $paymentTitle,
                 'p6_ProductDesc'     => $paymentRemark,
-                'p9_NotifyUrl'       => sysuri("@data/api.notify/joinpay/scene/order/param/{$tradeParam}", [], false, true),
+                'p9_NotifyUrl'       => sysuri("@data/api.notify/joinpay/scene/order/param/{$this->code}", [], false, true),
                 'q1_FrpCode'         => $tradeType ?? '',
                 'q5_OpenId'          => $openid,
                 'q7_AppId'           => $this->appid,
@@ -94,7 +93,7 @@ class JoinPaymentService extends PaymentService
             $result = $this->_doReuest($data);
             if (is_array($result) && isset($result['ra_Code']) && intval($result['ra_Code']) === 100) {
                 // 创建支付记录
-                $this->createPaymentAction($tradeParam, $orderNo, $paymentTitle, $paymentAmount);
+                $this->createPaymentAction($orderNo, $paymentTitle, $paymentAmount);
                 // 返回支付参数
                 return json_decode($result['rc_Result'], true);
             } elseif (is_array($result) && isset($result['rb_CodeMsg'])) {
@@ -122,13 +121,12 @@ class JoinPaymentService extends PaymentService
 
     /**
      * 支付结果处理
-     * @param string $param 支付通道
      * @return string
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function notify(string $param = ''): string
+    public function notify(): string
     {
         $notify = $this->app->request->get();
         foreach ($notify as &$item) $item = urldecode($item);
@@ -136,7 +134,7 @@ class JoinPaymentService extends PaymentService
             return 'error';
         }
         if (isset($notify['r6_Status']) && intval($notify['r6_Status']) === 100) {
-            if ($this->updatePaymentAction($param, $notify['r2_OrderNo'], $notify['r9_BankTrxNo'], $notify['r3_Amount'])) {
+            if ($this->updatePaymentAction($notify['r2_OrderNo'], $notify['r9_BankTrxNo'], $notify['r3_Amount'])) {
                 return 'success';
             } else {
                 return 'error';

app/data/service/payment/WechatPaymentService.php

@@ -25,9 +25,9 @@ class WechatPaymentService extends PaymentService
     protected function initialize(): WechatPaymentService
     {
         $this->payment = Order::instance([
-            'appid'      => static::$params['wechat_appid'],
+            'appid'      => $this->params['wechat_appid'],
-            'mch_id'     => static::$params['wechat_mch_id'],
+            'mch_id'     => $this->params['wechat_mch_id'],
-            'mch_key'    => static::$params['wechat_mch_key'],
+            'mch_key'    => $this->params['wechat_mch_key'],
             'cache_path' => $this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . 'wechat',
         ]);
         return $this;
@@ -47,28 +47,27 @@ class WechatPaymentService extends PaymentService
     public function create(string $openid, string $orderNo, string $paymentAmount, string $paymentTitle, string $paymentRemark, string $paymentReturn = ''): array
     {
         try {
-            if (isset(static::TYPES[static::$type])) {
+            if (isset(static::TYPES[$this->type])) {
-                $tradeType = static::TYPES[static::$type]['type'];
+                $tradeType = static::TYPES[$this->type]['type'];
-                $tradeParam = static::$type . '-' . static::$code;
             } else {
-                throw new \think\Exception('支付类型[' . static::$type . ']未配置定义！');
+                throw new \think\Exception(sprintf('支付类型[%s]未配置定义！', $this->type));
             }
             $body = empty($paymentRemark) ? $paymentTitle : ($paymentTitle . '-' . $paymentRemark);
             $data = [
                 'body'             => $body,
                 'openid'           => $openid,
-                'attach'           => $tradeParam,
+                'attach'           => $this->code,
                 'out_trade_no'     => $orderNo,
                 'total_fee'        => $paymentAmount * 100,
                 'trade_type'       => $tradeType ?: '',
-                'notify_url'       => sysuri("@data/api.notify/wxpay/scene/order/param/{$tradeParam}", [], false, true),
+                'notify_url'       => sysuri("@data/api.notify/wxpay/scene/order/param/{$this->code}", [], false, true),
                 'spbill_create_ip' => $this->app->request->ip(),
             ];
             if (empty($data['openid'])) unset($data['openid']);
             $info = $this->payment->create($data);
             if ($info['return_code'] === 'SUCCESS' && $info['result_code'] === 'SUCCESS') {
                 // 创建支付记录
-                $this->createPaymentAction($tradeParam, $orderNo, $paymentTitle, $paymentAmount);
+                $this->createPaymentAction($orderNo, $paymentTitle, $paymentAmount);
                 // 返回支付参数
                 return $this->payment->jsapiParams($info['prepay_id']);
             }
@@ -99,7 +98,7 @@ class WechatPaymentService extends PaymentService
         $result = $this->payment->query(['out_trade_no' => $orderNo]);
         if (isset($result['return_code']) && isset($result['result_code']) && isset($result['attach'])) {
             if ($result['return_code'] === 'SUCCESS' && $result['result_code'] === 'SUCCESS') {
-                $this->updatePaymentAction($result['attach'], $result['out_trade_no'], $result['cash_fee'] / 100, $result['transaction_id']);
+                $this->updatePaymentAction($result['out_trade_no'], $result['cash_fee'] / 100, $result['transaction_id']);
             }
         }
         return $result;
@@ -107,18 +106,17 @@ class WechatPaymentService extends PaymentService
 
     /**
      * 支付结果处理
-     * @param string $param 支付通道
      * @return string
      * @throws \WeChat\Exceptions\InvalidResponseException
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function notify(string $param = ''): string
+    public function notify(): string
     {
         $notify = $this->payment->getNotify();
         if ($notify['result_code'] == 'SUCCESS' && $notify['return_code'] == 'SUCCESS') {
-            if ($this->updatePaymentAction($param, $notify['out_trade_no'], $notify['transaction_id'], $notify['cash_fee'] / 100)) {
+            if ($this->updatePaymentAction($notify['out_trade_no'], $notify['transaction_id'], $notify['cash_fee'] / 100)) {
                 return $this->payment->getNotifySuccessReply();
             } else {
                 return 'error';

app/data/view/config/slider.html

@@ -2,9 +2,6 @@
 
 {block name="content"}
 <div class="think-box-shadow">
-    <p class=" margin-bottom-15">
-        演示接口文档：<a target="_blank" href="http://www.docway.net/project/1WkI0ZyQ7M1/share/1Wld0z7b1zE">http://www.docway.net/project/1WkI0ZyQ7M1/share/1Wld0z7b1zE</a>
-    </p>
     <form onsubmit="return false;" id="DataForm" class='layui-form layui-card' autocomplete="off" style="width:850px">
         <div class="layui-card-header text-center margin-20 font-w7 color-text layui-bg-gray border-radius-5">
             {$title|default='图片数据管理'}<span class="color-desc font-s12"> ( 建议上传图片尺寸为 690px  250px )</span>

app/data/view/news_item/index.html

@@ -58,7 +58,9 @@
 
                 <!--{if auth("state") and $vo.status eq 1}-->
                 <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('state')}" data-value="id#{$vo.id};status#0">禁 用</a>
-                <!--{elseif auth("state") and $vo.status eq 0}-->
+                <!--{/if}-->
+
+                <!--{if auth("state") and $vo.status eq 0}-->
                 <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('state')}" data-value="id#{$vo.id};status#1">激 活</a>
                 <!--{/if}-->
 

app/data/view/news_mark/index.html

@@ -33,19 +33,18 @@
             <td>{if $vo.status eq 0}<span class="color-red">已禁用</span>{elseif $vo.status eq 1}<span class="color-green">已激活</span>{/if}</td>
             <td class="text-left nowrap">{$vo.create_at|format_datetime}</td>
             <td class='text-left nowrap'>
-                <!--{if auth("edit")}-->
+                {if auth("edit")}
                 <a data-dbclick class="layui-btn layui-btn-sm" data-width="500px" data-title="编辑标签" data-modal="{:url('edit')}?id={$vo.id}">编 辑</a>
-                <!--{/if}-->
+                {/if}
-
+                {if auth("state") and $vo.status eq 1}
-                <!--{if auth("state") and $vo.status eq 1}-->
                 <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('state')}" data-value="id#{$vo.id};status#0">禁 用</a>
-                <!--{elseif auth("state") and $vo.status eq 0}-->
+                {/if}
+                {if auth("state") and $vo.status eq 0}
                 <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('state')}" data-value="id#{$vo.id};status#1">激 活</a>
-                <!--{/if}-->
+                {/if}
-
+                {if auth("remove")}
-                <!--{if auth("remove")}-->
                 <a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除该标签吗？" data-action="{:url('remove')}" data-value="id#{$vo.id}">删 除</a>
-                <!--{/if}-->
+                {/if}
             </td>
         </tr>
         {/foreach}

app/data/view/payment/form.html

@@ -8,13 +8,14 @@
             <span class="color-green font-w7">支付名称</span>
             <span class="color-desc margin-left-5">Payment Name</span>
             <input class="layui-input" required placeholder="请输入支付名称" maxlength="50" name="name" value="{$vo.name|default=''}"/>
-            <span class="help-block"><b>必填，</b>请填写分类名称（如：微信小程序支付），建议字符不要太长一般4-6个汉字</span>
+            <span class="help-block"><b>必填，</b>请填写支付通道名称，通道名称尽量不要重复，字符不要太长一般4-6个汉字</span>
         </label>
 
         <div class="layui-form-item">
             <span class="color-green font-w7 label-required-prev">支付方式</span>
             <span class="color-desc margin-left-5">Payment Channel</span>
             <label class="block full-width">
+                {empty name='vo.type'}
                 <select name="type" class="layui-select" lay-search lay-filter="payment-type">
                     {foreach $payments as $k=>$v}{if isset($vo.type) and $vo.type eq $k}
                     <option selected value="{$k}">{$v.name} ( {$v.allow} )</option>
@@ -22,6 +23,16 @@
                     <option value="{$k}">{$v.name} ( {$v.allow} )</option>
                     {/if}{/foreach}
                 </select>
+                {else}
+                <select name="type" disabled class="layui-select" lay-filter="payment-type">
+                    {foreach $payments as $k=>$v}{if isset($vo.type) and $vo.type eq $k}
+                    <option selected value="{$k}">{$v.name} ( {$v.allow} )</option>
+                    {else}
+                    <option value="{$k}">{$v.name} ( {$v.allow} )</option>
+                    {/if}{/foreach}
+                </select>
+                {/empty}
+                <span class="help-block"><b>必选，</b>请选择预置的支付方式，支付通道创建之后不能修改，请谨慎选择并配置参数</span>
             </label>
         </div>
 

app/data/view/payment/index_search.html

@@ -7,7 +7,6 @@
                 <input name="name" value="{:input('name','')}" placeholder="请输入通道名称" class="layui-input">
             </label>
         </div>
-
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">支付方式</label>
             <div class="layui-input-inline">
@@ -22,7 +21,6 @@
                 </select>
             </div>
         </div>
-
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">使用状态</label>
             <div class="layui-input-inline">
@@ -36,14 +34,12 @@
                 </select>
             </div>
         </div>
-
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">创建时间</label>
             <label class="layui-input-inline">
                 <input data-date-range name="create_at" value="{:input('create_at','')}" placeholder="请选择创建时间" class="layui-input">
             </label>
         </div>
-
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
         </div>

app/data/view/shop_goods_mark/index.html

@@ -40,7 +40,9 @@
 
                 <!--{if auth("state") and $vo.status eq 1}-->
                 <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('state')}" data-value="id#{$vo.id};status#0">禁 用</a>
-                <!--{elseif auth("state") and $vo.status eq 0}-->
+                <!--{/if}-->
+
+                <!--{if auth("state") and $vo.status eq 0}-->
                 <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('state')}" data-value="id#{$vo.id};status#1">激 活</a>
                 <!--{/if}-->
 

app/data/view/shop_order/index_search.html

@@ -48,7 +48,7 @@
             <label class="layui-form-label">订单状态</label>
             <label class="layui-input-inline">
                 <select class="layui-select" name="status">
-                    <option value=''>- 全部状态 -</option>
+                    <option value=''>- 全部订单 -</option>
                     {foreach ['2'=>'待付款','3'=>'待发货','4'=>'已发货','5'=>'已完成'] as $k=>$v}
                     {if input('status') eq $k.''}
                     <option selected value="{$k}">{$v}</option>
@@ -63,8 +63,8 @@
             <label class="layui-form-label">付款状态</label>
             <label class="layui-input-inline">
                 <select class="layui-select" name="payment_status">
-                    <option value=''>- 全部状态 -</option>
+                    <option value=''>- 全部订单 -</option>
-                    {foreach ['未支付的订单','已支付的订单'] as $k=>$v}
+                    {foreach ['0'=>'未支付的订单','1'=>'已支付的订单'] as $k=>$v}
                     {if input('payment_status') eq $k.''}
                     <option selected value="{$k}">{$v}</option>
                     {else}

app/data/view/shop_order/truck.html

@@ -55,27 +55,24 @@
             </label>
         </fieldset>
     </div>
-
     <div class="hr-line-dashed"></div>
     {notempty name='vo.order_no'}<input type='hidden' value='{$vo.order_no}' name='order_no'>{/notempty}
     {notempty name='vo.send_datetime'}<input type='hidden' value='{$vo.send_datetime}' name='send_datetime'>{/notempty}
-
     <div class="layui-form-item text-center">
         <button class="layui-btn" type='submit'>保存数据</button>
         <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>
     </div>
-</form>
+    <script>
-
+        require(['pcasunzips'], function () {
-<script>
+            (function (province, city, area) {
-    require(['pcasunzips'], function () {
+                new PCAS("form_province", "form_city", "form_area", province, city, area);
-        (function (province, city, area) {
+                window.form.render();
-            new PCAS("form_province", "form_city", "form_area", province, city, area);
+            })('{$vo.address_province|default=""}', '{$vo.address_city|default=""}', '{$vo.address_area|default=""}');
-            window.form.render();
+        });
-        })('{$vo.address_province|default=""}', '{$vo.address_city|default=""}', '{$vo.address_area|default=""}');
+        $('[data-express-query]').on('click', function () {
-    });
+            (function (code, number) {
-    $('[data-express-query]').on('click', function () {
+                $.form.modal('{:url("truckQuery")}', {code: code, number: number}, '快递追踪查询')
-        (function (code, number) {
+            })($('[data-truck-code]').val(), $('[data-truck-number]').val());
-            $.form.modal('{:url("truckQuery")}', {code: code, number: number}, '快递追踪查询')
+        });
-        })($('[data-truck-code]').val(), $('[data-truck-number]').val());
+    </script>
-    });
+</form>
-</script>

app/data/view/shop_order_service/index_search.html

@@ -7,48 +7,41 @@
                 <input name="member_phone" value="{:input('member_phone')}" placeholder="请输入用户手机" class="layui-input">
             </label>
         </div>
-
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">用户昵称</label>
             <label class="layui-input-inline">
                 <input name="member_nickname" value="{:input('member_nickname')}" placeholder="请输入用户昵称" class="layui-input">
             </label>
         </div>
-
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">推荐手机</label>
             <label class="layui-input-inline">
                 <input name="agent_phone" value="{:input('agent_phone')}" placeholder="请输入用户手机" class="layui-input">
             </label>
         </div>
-
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">推荐昵称</label>
             <label class="layui-input-inline">
                 <input name="agent_nickname" value="{:input('agent_nickname')}" placeholder="请输入用户昵称" class="layui-input">
             </label>
         </div>
-
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">订单单号</label>
             <label class="layui-input-inline">
                 <input name="order_no" value="{:input('order_no')}" placeholder="请输入订单单号" class="layui-input">
             </label>
         </div>
-
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">发货单号</label>
             <label class="layui-input-inline">
                 <input name="express_send_no" value="{:input('express_send_no')}" placeholder="请输入发货单号" class="layui-input">
             </label>
         </div>
-
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">订单状态</label>
             <label class="layui-input-inline">
                 <select class="layui-select" name="status">
-                    <option value=''>- 全部状态 -</option>
+                    {foreach [''=>'- 全部订单 -','2'=>'待付款','3'=>'待发货','4'=>'已发货','5'=>'已完成'] as $k=>$v}
-                    {foreach ['2'=>'待付款','3'=>'待发货','4'=>'已发货','5'=>'已完成'] as $k=>$v}
                     {if input('status') eq $k.''}
                     <option selected value="{$k}">{$v}</option>
                     {else}
@@ -57,13 +50,11 @@
                 </select>
             </label>
         </div>
-
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">付款状态</label>
             <label class="layui-input-inline">
                 <select class="layui-select" name="pay_state">
-                    <option value=''>- 全部状态 -</option>
+                    {foreach [''=>'- 全部订单 -','0'=>'未支付的订单','1'=>'已支付的订单'] as $k=>$v}
-                    {foreach ['未支付的订单','已支付的订单'] as $k=>$v}
                     {if input('pay_state') eq $k.''}
                     <option selected value="{$k}">{$v}</option>
                     {else}
@@ -72,63 +63,54 @@
                 </select>
             </label>
         </div>
-
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">下单时间</label>
             <label class="layui-input-inline">
                 <input data-date-range name="create_at" value="{:input('create_at')}" placeholder="请选择下单时间" class="layui-input">
             </label>
         </div>
-
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">支付时间</label>
             <label class="layui-input-inline">
                 <input data-date-range name="pay_datetime" value="{:input('pay_datetime')}" placeholder="请选择支付时间" class="layui-input">
             </label>
         </div>
-
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">收货姓名</label>
             <label class="layui-input-inline">
                 <input name="express_name" value="{:input('express_name')}" placeholder="请输入收货姓名" class="layui-input">
             </label>
         </div>
-
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">收货手机</label>
             <label class="layui-input-inline">
                 <input name="express_phone" value="{:input('express_phone')}" placeholder="请输入收货手机" class="layui-input">
             </label>
         </div>
-
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">收货省份</label>
             <label class="layui-input-inline">
                 <input name="express_province" value="{:input('express_province')}" placeholder="请输入收货省份" class="layui-input">
             </label>
         </div>
-
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">收货城市</label>
             <label class="layui-input-inline">
                 <input name="express_city" value="{:input('express_city')}" placeholder="请输入收货城市" class="layui-input">
             </label>
         </div>
-
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">收货区域</label>
             <label class="layui-input-inline">
                 <input name="express_area" value="{:input('express_area')}" placeholder="请输入收货区域" class="layui-input">
             </label>
         </div>
-
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">详细地址</label>
             <label class="layui-input-inline">
                 <input name="express_address" value="{:input('express_address')}" placeholder="请输入详细地址" class="layui-input">
             </label>
         </div>
-
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
         </div>

app/data/view/shop_truck_company/index.html

@@ -69,13 +69,11 @@
                     <!--{if auth("edit") and $type eq 'index'}-->
                     <a data-dbclick class="layui-btn layui-btn-sm" data-title="编辑快递公司" data-modal='{:url("edit")}?id={$vo.id}'>编 辑</a>
                     <!--{/if}-->
-
+                    <!--{if $vo.status eq 1 and auth("state")}-->
-                    <!--{if auth("state") and $vo.status eq 1}-->
                     <a class="layui-btn layui-btn-warm layui-btn-sm" data-action="{:url('state')}" data-value="id#{$vo.id};status#0">禁 用</a>
-                    <!--{elseif auth("state") and $vo.status eq 0}-->
+                    <!--{elseif auth("state")}-->
                     <a class="layui-btn layui-btn-warm layui-btn-sm" data-action="{:url('state')}" data-value="id#{$vo.id};status#1">激 活</a>
                     <!--{/if}-->
-
                     <!--{if auth("remove") and $type eq 'recycle'}-->
                     <a class="layui-btn layui-btn-danger layui-btn-sm" data-confirm="确定要删除数据吗?" data-action="{:url('remove')}" data-value="id#{$vo.id}">删 除</a>
                     <!--{/if}-->

app/data/view/shop_truck_company/index_search.html

@@ -7,21 +7,18 @@
                 <input name="name" value="{:input('name','')}" placeholder="请输入快递名称" class="layui-input">
             </label>
         </div>
-
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">快递编码</label>
             <label class="layui-input-inline">
                 <input name="code" value="{:input('code','')}" placeholder="请输入快递编码" class="layui-input">
             </label>
         </div>
-
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">添加时间</label>
             <label class="layui-input-inline">
                 <input data-date-range name="create_at" value="{:input('create_at','')}" placeholder="请选择添加时间" class="layui-input">
             </label>
         </div>
-
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
         </div>

app/data/view/shop_truck_template/form_region.html

@@ -13,7 +13,6 @@
             </div>
         </div>
     </div>
-
     <div class="layui-card border-line">
         <div class="layui-card-header layui-bg-gray border-bottom-line"><b class="color-green" ng-bind="province.name"></b><span class="font-s12 color-desc margin-left-10">配送城市</span></div>
         <div class="layui-card-body">
@@ -22,7 +21,6 @@
             </div>
         </div>
     </div>
-
     <div class="layui-card border-line">
         <div class="layui-card-header layui-bg-gray border-bottom-line"><b class="color-green" ng-bind="city.name"></b><span class="font-s12 color-desc margin-left-10">配送区域</span></div>
         <div class="layui-card-body">
@@ -31,13 +29,11 @@
             </div>
         </div>
     </div>
-
     <div class="hr-line-dashed margin-top-40"></div>
     <div class="layui-form-item text-center">
         <button class="layui-btn" ng-click="Confirm()">确定修改</button>
     </div>
 </div>
-
 <label class="layui-hide">
     <textarea class="layui-textarea" id="RegionData">{$citys|json_encode|raw}</textarea>
 </label>

app/data/view/shop_truck_template/index_search.html

@@ -7,26 +7,22 @@
                 <input name="code" value="{:input('code','')}" placeholder="请输入模板编号" class="layui-input">
             </label>
         </div>
-
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">模板名称</label>
             <label class="layui-input-inline">
                 <input name="name" value="{:input('name','')}" placeholder="请输入模板名称" class="layui-input">
             </label>
         </div>
-
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">添加时间</label>
             <label class="layui-input-inline">
                 <input data-date-range name="create_at" value="{:input('create_at','')}" placeholder="请选择添加时间" class="layui-input">
             </label>
         </div>
-
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
         </div>
     </form>
-
+    <script>form.render()</script>
 </fieldset>
-<script>form.render()</script>
 

app/data/view/store_item/form.html

@@ -6,7 +6,6 @@
             <input class="layui-input" required placeholder="请输入标签名称" name="name" value="{$vo.name|default=''}"/>
             <span class="help-block"><b>必填，</b>请填写分类名称（如：系统管理），建议字符不要太长，一般4-6个汉字</span>
         </label>
-
         <div class="layui-form-item relative block">
             <span class="color-green font-w7">标签描述</span>
             <span class="color-desc margin-left-5">Mark Remark</span>
@@ -15,10 +14,8 @@
             </label>
         </div>
     </div>
-
     <div class="hr-line-dashed"></div>
     {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
-
     <div class="layui-form-item text-center">
         <button class="layui-btn" type='submit'>保存数据</button>
         <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>

app/data/view/store_item/index.html

@@ -49,7 +49,9 @@
 
                 <!--{if auth("state") and $vo.status eq 1}-->
                 <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('state')}" data-value="id#{$vo.id};status#0">禁 用</a>
-                <!--{elseif auth("state") and $vo.status eq 0}-->
+                <!--{/if}-->
+
+                <!--{if auth("state") and $vo.status eq 0}-->
                 <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('state')}" data-value="id#{$vo.id};status#1">激 活</a>
                 <!--{/if}-->
 

app/data/view/store_item/index_search.html

@@ -7,13 +7,11 @@
                 <input name="name" value="{:input('name','')}" placeholder="请输入标签名称" class="layui-input">
             </label>
         </div>
-
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">使用状态</label>
             <div class="layui-input-inline">
                 <select class="layui-select" name="status">
-                    <option value="">-- 全部 --</option>
+                    {foreach [''=>'-- 全部 --','0'=>'已禁用的记录','1'=>'已激活的记录'] as $k=>$v}
-                    {foreach ['已禁用的记录','已激活的记录'] as $k=>$v}
                     {if $k.'' eq input('status')}
                     <option selected value="{$k}">{$v}</option>
                     {else}
@@ -22,14 +20,12 @@
                 </select>
             </div>
         </div>
-
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">创建时间</label>
             <label class="layui-input-inline">
                 <input data-date-range name="create_at" value="{:input('create_at','')}" placeholder="请选择创建时间" class="layui-input">
             </label>
         </div>
-
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
         </div>

app/data/view/store_used/form.html

@@ -6,7 +6,6 @@
             <input class="layui-input" required placeholder="请输入标签名称" name="name" value="{$vo.name|default=''}"/>
             <span class="help-block"><b>必填，</b>请填写分类名称（如：系统管理），建议字符不要太长，一般4-6个汉字</span>
         </label>
-
         <div class="layui-form-item relative block">
             <span class="color-green font-w7">标签描述</span>
             <span class="color-desc margin-left-5">Mark Remark</span>
@@ -15,10 +14,8 @@
             </label>
         </div>
     </div>
-
     <div class="hr-line-dashed"></div>
     {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
-
     <div class="layui-form-item text-center">
         <button class="layui-btn" type='submit'>保存数据</button>
         <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>

app/data/view/store_used/index.html

@@ -49,7 +49,9 @@
 
                 <!--{if auth("state") and $vo.status eq 1}-->
                 <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('state')}" data-value="id#{$vo.id};status#0">禁 用</a>
-                <!--{elseif auth("state") and $vo.status eq 0}-->
+                <!--{/if}-->
+
+                <!--{if auth("state") and $vo.status eq 0}-->
                 <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('state')}" data-value="id#{$vo.id};status#1">激 活</a>
                 <!--{/if}-->
 

app/data/view/store_used/index_search.html

@@ -7,13 +7,11 @@
                 <input name="name" value="{:input('name','')}" placeholder="请输入标签名称" class="layui-input">
             </label>
         </div>
-
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">使用状态</label>
             <div class="layui-input-inline">
                 <select class="layui-select" name="status">
-                    <option value="">-- 全部 --</option>
+                    {foreach [''=>'-- 全部 --','0'=>'已禁用的记录','1'=>'已激活的记录'] as $k=>$v}
-                    {foreach ['已禁用的记录','已激活的记录'] as $k=>$v}
                     {if $k.'' eq input('status')}
                     <option selected value="{$k}">{$v}</option>
                     {else}
@@ -22,14 +20,12 @@
                 </select>
             </div>
         </div>
-
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">创建时间</label>
             <label class="layui-input-inline">
                 <input data-date-range name="create_at" value="{:input('create_at','')}" placeholder="请选择创建时间" class="layui-input">
             </label>
         </div>
-
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
         </div>

app/data/view/store_user/form.html

@@ -6,7 +6,6 @@
             <input class="layui-input" required placeholder="请输入标签名称" name="name" value="{$vo.name|default=''}"/>
             <span class="help-block"><b>必填，</b>请填写分类名称（如：系统管理），建议字符不要太长，一般4-6个汉字</span>
         </label>
-
         <div class="layui-form-item relative block">
             <span class="color-green font-w7">标签描述</span>
             <span class="color-desc margin-left-5">Mark Remark</span>
@@ -15,10 +14,8 @@
             </label>
         </div>
     </div>
-
     <div class="hr-line-dashed"></div>
     {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
-
     <div class="layui-form-item text-center">
         <button class="layui-btn" type='submit'>保存数据</button>
         <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>

app/data/view/store_user/index.html

@@ -49,7 +49,9 @@
 
                 <!--{if auth("state") and $vo.status eq 1}-->
                 <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('state')}" data-value="id#{$vo.id};status#0">禁 用</a>
-                <!--{elseif auth("state") and $vo.status eq 0}-->
+                <!--{/if}-->
+
+                <!--{if auth("state") and $vo.status eq 0}-->
                 <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('state')}" data-value="id#{$vo.id};status#1">激 活</a>
                 <!--{/if}-->
 

app/data/view/store_user/index_search.html

@@ -7,13 +7,11 @@
                 <input name="name" value="{:input('name','')}" placeholder="请输入标签名称" class="layui-input">
             </label>
         </div>
-
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">使用状态</label>
             <div class="layui-input-inline">
                 <select class="layui-select" name="status">
-                    <option value="">-- 全部 --</option>
+                    {foreach [''=>'-- 全部 --','0'=>'已禁用的记录','1'=>'已激活的记录'] as $k=>$v}
-                    {foreach ['已禁用的记录','已激活的记录'] as $k=>$v}
                     {if $k.'' eq input('status')}
                     <option selected value="{$k}">{$v}</option>
                     {else}
@@ -22,14 +20,12 @@
                 </select>
             </div>
         </div>
-
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">创建时间</label>
             <label class="layui-input-inline">
                 <input data-date-range name="create_at" value="{:input('create_at','')}" placeholder="请选择创建时间" class="layui-input">
             </label>
         </div>
-
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
         </div>

app/data/view/user/index.html

@@ -44,7 +44,9 @@
             <td class="nowrap">
                 <!--{if auth("state") and $vo.status eq 1}-->
                 <a class="layui-btn layui-btn-sm layui-btn-danger" data-action="{:url('state')}" data-value="id#{$vo.id};status#0">冻结账号</a>
-                <!--{elseif auth("state") and $vo.status eq 0}-->
+                <!--{/if}-->
+
+                <!--{if auth("state") and $vo.status eq 0}-->
                 <a class="layui-btn layui-btn-sm layui-btn-normal" data-action="{:url('state')}" data-value="id#{$vo.id};status#1">解冻账号</a>
                 <!--{/if}-->
             </td>

app/data/view/user/index_search.html

@@ -7,20 +7,17 @@
                 <input name="phone" value="{:input('phone')}" placeholder="请输入用户手机" class="layui-input">
             </label>
         </div>
-
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">姓名昵称</label>
             <label class="layui-input-inline">
                 <input name="username" value="{:input('username')}" placeholder="请输入姓名昵称" class="layui-input">
             </label>
         </div>
-
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">使用状态</label>
             <div class="layui-input-inline">
                 <select class="layui-select" name="status">
-                    <option value="">-- 全部 --</option>
+                    {foreach [''=>'-- 全部 --','0'=>'已冻结的用户','1'=>'已激活的用户'] as $k=>$v}
-                    {foreach ['已冻结的用户','已激活的用户'] as $k=>$v}
                     {if $k.'' eq input('status')}
                     <option selected value="{$k}">{$v}</option>
                     {else}
@@ -29,18 +26,16 @@
                 </select>
             </div>
         </div>
-
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">注册时间</label>
             <div class="layui-input-inline">
                 <input data-date-range name="create_at" value="{:input('create_at','')}" placeholder="请选择注册时间" class="layui-input">
             </div>
         </div>
-
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
             <button type="button" data-export-list class="layui-btn layui-btn-primary layui-hide"><i class="layui-icon layui-icon-export"></i> 导 出</button>
         </div>
     </form>
-</fieldset>
+    <script>form.render()</script>
-<script>form.render()</script>
+</fieldset>

app/data/view/user_message/config.html

@@ -53,5 +53,6 @@
 
         </div>
     </form>
+
 </div>
 {/block}

app/data/view/user_message/index_search.html

@@ -41,5 +41,5 @@
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
         </div>
     </form>
-</fieldset>
+    <script>form.render()</script>
-<script>form.render()</script>
+</fieldset>

public/static/admin.js

@@ -761,22 +761,22 @@ $(function () {
     $body.on('click', '[data-tips-image]', function () {
         $.previewImage(this.dataset.tipsImage || this.dataset.lazySrc || this.src, this.dataset.with);
     });
-    $.previewImage = function (src, area, done, close) {
+    $.previewImage = function (src, area) {
-        var img = new Image(), index = $.msg.loading();
+        var img = new Image(), defer = $.Deferred(), load = $.msg.loading();
-        img.style.background = '#fff', img.style.display = 'none';
         img.style.height = 'auto', img.style.width = area || '480px';
+        img.style.display = 'none', img.style.background = '#FFFFFF';
         document.body.appendChild(img), img.onerror = function () {
-            $.msg.close(index);
+            $.msg.close(load), defer.reject();
         }, img.onload = function () {
             layer.open({
                 type: 1, title: false, shadeClose: true, content: $(img), success: function ($ele, idx) {
-                    $.msg.close(index), (typeof done === 'function' && done($ele, idx))
+                    $.msg.close(load), defer.notify($ele, idx);
-                }, area: area || '480px', closeBtn: 1, skin: 'layui-layer-nobg', end: function () {
+                }, area: area || '480px', skin: 'layui-layer-nobg', closeBtn: 1, end: function () {
-                    document.body.removeChild(img), (typeof close === 'function' && close())
+                    document.body.removeChild(img), defer.resolve()
                 }
             });
         };
-        return img.src = src;
+        return (img.src = src), defer;
     };
 
     /*! 注册 data-phone-view 事件行为 */