From 9c674cfeacb9db75a9ae081255bbd8b7c89c5755 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Wed, 8 May 2019 09:58:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=92=B1=E5=8C=85=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/view/default/slide/index.html     | 2 +-
 application/admin/view/default/slide/save_info.html | 4 ++--
 application/plugins/wallet/install.sql              | 2 +-
 application/plugins/wallet/service/PayService.php   | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/admin/view/default/slide/index.html b/application/admin/view/default/slide/index.html
index 83c326513..24206754c 100755
--- a/application/admin/view/default/slide/index.html
+++ b/application/admin/view/default/slide/index.html
@@ -84,7 +84,7 @@
                             </td>
                             <td>
                                 {{$v.event_value}}
-                                {{if !empty($v['event_value'])}}
+                                {{if !empty($v['event_value']) and !empty($v['event_type_text'])}}
                                     <br /><span class="am-badge am-badge-warning am-radius">{{$v.event_type_text}}</span>
                                 {{/if}}
                             </td>
diff --git a/application/admin/view/default/slide/save_info.html b/application/admin/view/default/slide/save_info.html
index 8060d09fa..0ecaa0e17 100755
--- a/application/admin/view/default/slide/save_info.html
+++ b/application/admin/view/default/slide/save_info.html
@@ -22,7 +22,7 @@
 			
 			<div class="am-form-group">
 				<label>所属平台</label>
-				<select name="platform" class="am-radius chosen-select" data-placeholder="可选择..." placeholder="所属平台有误">
+				<select name="platform" class="am-radius chosen-select" data-placeholder="可选择..." data-validation-message="请选择所属平台" required>
 					<option value="">可选择...</option>
 					{{foreach $common_platform_type as $v}}
 						<option value="{{$v.value}}" {{if isset($data['platform']) and $data['platform'] eq $v['value']}}selected{{else /}}{{if !isset($data['platform']) and isset($v['checked']) and $v['checked'] eq true}}selected{{/if}}{{/if}}>{{$v.name}}</option>
@@ -32,7 +32,7 @@
 
 			<div class="am-form-group">
 				<label>事件类型</label>
-				<select name="event_type" class="am-radius chosen-select" data-placeholder="可选择..." placeholder="事件值类型有误">
+				<select name="event_type" class="am-radius chosen-select" data-placeholder="可选择..." data-validation-message="请选择事件值类型">
 					<option value="">可选择...</option>
 					{{foreach $common_app_event_type as $v}}
 						<option value="{{$v.value}}" {{if isset($data['event_type']) and $data['event_type'] eq $v['value']}}selected{{else /}}{{if !isset($data['event_type']) and isset($v['checked']) and $v['checked'] eq true}}selected{{/if}}{{/if}}>{{$v.name}}</option>
diff --git a/application/plugins/wallet/install.sql b/application/plugins/wallet/install.sql
index c1cdc196b..62101bbda 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 2dee0e705..f3f05546b 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'],
-- 
GitLab