diff --git a/application/admin/view/default/slide/index.html b/application/admin/view/default/slide/index.html index 83c32651368f070d0014c69d85fda82faaadbb7e..24206754cf9352d0a3b62c40a528452a67ea048c 100755 --- a/application/admin/view/default/slide/index.html +++ b/application/admin/view/default/slide/index.html @@ -84,7 +84,7 @@ {{$v.event_value}} - {{if !empty($v['event_value'])}} + {{if !empty($v['event_value']) and !empty($v['event_type_text'])}}
{{$v.event_type_text}} {{/if}} diff --git a/application/admin/view/default/slide/save_info.html b/application/admin/view/default/slide/save_info.html index 8060d09fae80dd5c092b875b89e9351178967eac..0ecaa0e17d559944b9140de1f52439bf3c4ccb4f 100755 --- a/application/admin/view/default/slide/save_info.html +++ b/application/admin/view/default/slide/save_info.html @@ -22,7 +22,7 @@
- {{foreach $common_platform_type as $v}} @@ -32,7 +32,7 @@
- {{foreach $common_app_event_type as $v}} diff --git a/application/plugins/wallet/install.sql b/application/plugins/wallet/install.sql index c1cdc196b5211134603ab58f56530077dc6a4bb5..62101bbda22e0fbda3c4b8a79835a92f8767ab74 100644 --- a/application/plugins/wallet/install.sql +++ b/application/plugins/wallet/install.sql @@ -6,7 +6,7 @@ CREATE TABLE `s_plugins_wallet_recharge` ( `recharge_no` char(60) NOT NULL DEFAULT '' COMMENT '充值单号', `status` tinyint(2) unsigned NOT NULL DEFAULT '0' COMMENT '状态(0未支付, 1已支付)', `money` decimal(10,2) unsigned NOT NULL DEFAULT '0.00' COMMENT '金额', - `pay_price` decimal(10,2) unsigned NOT NULL DEFAULT '0.00' COMMENT '支付金额', + `pay_money` decimal(10,2) unsigned NOT NULL DEFAULT '0.00' COMMENT '支付金额', `payment_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '支付方式id', `payment` char(60) NOT NULL DEFAULT '' COMMENT '支付方式标记', `payment_name` char(60) NOT NULL DEFAULT '' COMMENT '支付方式名称', diff --git a/application/plugins/wallet/service/PayService.php b/application/plugins/wallet/service/PayService.php index 2dee0e70559ce2db2281d8c3242e62eb06aea96c..f3f05546b6359c932a16704834c3040a3a417947 100644 --- a/application/plugins/wallet/service/PayService.php +++ b/application/plugins/wallet/service/PayService.php @@ -309,7 +309,7 @@ class PayService return DataReturn('支付方式有误', -1); } - // 支付参数 + // 支付金额 $pay_price = isset($params['pay']['pay_price']) ? $params['pay']['pay_price'] : 0; // 写入支付日志 @@ -345,7 +345,7 @@ class PayService // 更新充值状态 $upd_data = array( 'status' => 1, - 'pay_price' => $pay_price, + 'pay_money' => $pay_price, 'payment_id' => $params['payment']['id'], 'payment' => $params['payment']['payment'], 'payment_name' => $params['payment']['name'],