Merge branch 'rmaster' of 39.97.239.116:gyfl/xyzshop into rmaster

admin/control/refill_order.php

@@ -265,6 +265,10 @@ class refill_orderControl extends SystemControl
         $third_refill = Model('thrid_refill');
         $data = $third_refill->getThird($order_id);
         $data['card_info'] = $data['card_info'] ?? '';
+        $account_type_text = ['手机号','QQ号','微信号'];
+        $data['account_type_text'] = $account_type_text[$data['account_type']-1];
+        $ret_state_text = ['初始化','已解析','解析失败'];
+        $data['ret_state_text'] = $ret_state_text[$data['ret_state']];
         $res = ['state' => 1, 'data' => $data];
         exit(json_encode($res));
     }

admin/templates/default/refill.order.index.php

@@ -350,12 +350,14 @@
                     <td class="align-center"><?php echo $order['quality_text']; ?></td>
                     <td class="align-center"><?php echo $order['org_quality_text']; ?></td>
 <!--                    <td class="align-center">--><?php //echo $order['mch_amount']; ?><!--</td>-->
-                    <td class="w144 align-center">
+                    <td class="align-center">
                         <a href="index.php?act=merchant&op=notify_merchant&order_id=<?php echo $order['order_id']; ?>">
                                 回调</a>
-                        <!-- |
-                        <a href="#" class="examine" data-order="<?php echo $order['order_id']; ?>">
-                            查看</a> -->
+                        <?php if($order['card_type'] == mtopcard\ThirdRefillCard){?>
+                            |
+                            <a href="#" class="examine" data-order="<?php echo $order['order_id']; ?>">
+                                查看</a>
+                        <?php }?>
                     </td>
 
                 </tr>
@@ -386,28 +388,40 @@
 <script type="text/javascript">
     $(function () {
         //查看
-        // $('.examine').click(function() {
-        //     let sq = $(this).attr('data-order')
-        //     console.log(sq);
-        //     $.get('index.php?act=refill_order&op=refill_third_info&order_id=',
+        $('.examine').click(function() {
+            let sq = $(this).attr('data-order')
+            // console.log(sq);
+            $.get('index.php?act=refill_order&op=refill_third_info', 
+            {
+                order_id:sq
+            },function(data) {
+              data = JSON.parse(data)
+              if (data.state == 1) {
+                let contentArr = []
+                contentArr.push(`单号：${data.data.order_sn}`)
+                contentArr.push(`产品编码：${data.data.pcode}`)
+                contentArr.push(`渠道编码：${data.data.chcode}`)
+                contentArr.push(`充值数量：${data.data.quantity}`)
+                if (data.data.user_account) {
+                  contentArr.push(`充值账号：${data.data.user_account}`)
+                  contentArr.push(`账号类型：${data.data.account_type_text}`)
+                } else {
+                  contentArr.push(`卡密验证状态：${data.data.ret_state_text}`)
+                  contentArr.push(`卡密信息：${data.data.card_info}`)
+                }
+                let content = ''
+                for (let index = 0; index < contentArr.length; index++) {
+                    content += `<p>${contentArr[index]}</p>`
+                }
+                layer.open({
+                    title: "查看",
+                    content: content
 
-        //      function(data) {
-        //         let selectStr = ''
-            
-        //             for(let i = 0; i < data.length; i++) {
-        //                 selectStr += ``
-        //             }
-                
-                
-        //         console.log(data);
-        //     }) 
-        //     layer.open({
-        //         title: "订单列表",
-        //         area: ['700px', '450px'],
-        //         content: ''
+                });
 
-        //     });
-        // })
+              }
+            }) 
+        })
         // 获取不包含客户
         let selest_nc
         let default_no_mch = $('input[name="default_no_mch"]').val().split(',');

data/config/win/base.ini.php

@@ -10,11 +10,11 @@ define('BONUS_EXPIRY_DATE',true);
 define('USE_BONUS_RATE',false);
 define('SERVER_TYPE','panda');
 define('CROSS_DOAMIN',true);
-define('COOKIE_DOMAIN','192.168.1.232');
+define('COOKIE_DOMAIN','192.168.1.218');
 define('COMPANY_NAME', 'XYZ_COMPANY');
 define('NET_IP','125.33.203.108');
 
-$SRV_HOST = 'http://192.168.1.232';
+$SRV_HOST = 'http://192.168.1.218';
 $REMOTE_IMG_HOST = $SRV_HOST;
 
 $config = [];

docker/conf/nginx/nginx-win-http.conf

@@ -29,7 +29,7 @@ http
     {
     	listen       80;
         set  $folder_name /var/www/html;
-        server_name 192.168.1.232 www.xyxy.com;
+        server_name 192.168.1.218 www.xyxy.com;
         root $folder_name;
         index index.html index.php; 
     	client_max_body_size 100m;