Merge branch 'gq' of ssh://git.9026.com:2212/roobe/miao into gq

miaomiao/www/templates/my/my-recharge.html

@@ -1,7 +1,7 @@
 <ion-view view-title="充值">
     <ion-nav-buttons side="right">
         <button class="button button-clear" ng-click="payExplain()">
-            支付记录
+            交易记录
         </button>
     </ion-nav-buttons>
     <ion-content>

miaomiao/www/templates/my/payDetail.html

@@ -1,4 +1,4 @@
-<ion-view view-title="支付记录">
+<ion-view view-title="交易记录">
     <ion-content style="text-align: center; color: #0A0A0A;">
         <p style=" margin: 80px auto; ">
             <i class="icon ion-checkmark-circled" style="color: #148F2C; font-size: 50px;"></i>

miaomiao/www/templates/my/payExplain.html

@@ -1,4 +1,4 @@
-<ion-view view-title="支付记录">
+<ion-view view-title="交易记录">
     <ion-content>
         <div class="list">
             <a ui-sref="app.payDetail" class="item reply-item" >

server/app/Helper/PayHelper.php

@@ -149,7 +149,8 @@ trait PayHelper
         $order = [
             'body'              => $data['subject'],
             'out_trade_no'      => $data['transaction_id'],
-            'total_fee'         => $data['amount']*100,
+//            'total_fee'         => $data['amount']*100,
+            'total_fee'         => $data['amount'],
             'spbill_create_ip'  => Request::ip(),
             'fee_type'          => 'CNY'
         ];