commit

app/admin/model/water/WaterCardOrder.php

@@ -56,12 +56,10 @@ class WaterCardOrder extends BaseModel
         }
         $list = $model->select()->toArray();
         foreach ($list as &$item){
-            if ($item['pay_type'] == 'yue'){
-                $item['pay_type'] = '余额';
-            }elseif ($item['pay_type'] == 'weixin'){
-                $item['pay_type'] = '微信';
-            }elseif ($item['pay_type'] == 'alipay'){
-                $item['pay_type'] = '支付宝';
+            if ($item['pay_type'] == 'routine'){
+                $item['pay_type'] = '小程序';
+            }elseif ($item['pay_type'] == 'weixinh5'){
+                $item['pay_type'] = '公众号';
             }else{
                 $item['pay_type'] = '其他支付';
             }

app/admin/view/water/water_card_order/index.php

@@ -111,7 +111,7 @@
                     <script type="text/html" id="paid">
                         {{#  if(d.paid == 0){ }}
                             未支付
-                        {{#  } else if(d.suc == 1) { }}
+                        {{#  } else if(d.paid == 1) { }}
                             已支付
                         {{#  } }}
                     </script>
@@ -145,9 +145,9 @@
             {field: 'time', title: '购买天数',  align: 'center'},
             {field: 'price', title: '价格',  align: 'center'},
             {field: 'paid', title: '支付', templet: '#paid', align: 'center'},
-            {field: 'pay_time', title: '支付类型', align: 'center'},
+            {field: 'pay_type', title: '支付类型', align: 'center'},
             {field: 'create_time', title: '时间', align: 'center'},
-            {field: 'right', title: '操作', align: 'center', toolbar: '#act',width: '15%'},
+            {field: 'right', title: '操作', align: 'center', toolbar: '#act',width: '8%'},
         ];
     });
 

app/api/controller/user/UserCardController.php

@@ -72,7 +72,7 @@ class UserCardController
         list($card_id, $type, $from) = UtilService::postMore([['char_id', 0], ['type', 0]], $request, true);
         switch ((int)$type) {
             case 0: //支付充值余额
-                $order = WaterCardOrder::addCard($request->uid(), $card_id, 'routine');
+                $order = WaterCardOrder::addCard($request->uid(), $card_id, 'weixinh5');
                 if (!$order) return app('json')->fail('订单生成失败!');
                 try {
                     if ($from == 'weixinh5') {