1

application/api/controller/Secondary.php

@@ -293,7 +293,7 @@ class Secondary extends Base
                 'to_account'=>$real_money,
                 'pay_type'=>$pay_type
             ];
-            Db::name('store_order_info_order')->insert($data);
+            $id = Db::name('store_order_info_order')->insertGetId($data);
             $body = '纪元部落购买二级市场藏品';
             switch ($pay_type){
                 case 'wx':
@@ -324,6 +324,7 @@ class Secondary extends Base
                         }else{
                             $order1 = $app->jssdk->bridgeConfig($result['prepay_id']);//执行二次签名返回参数
                             $retrun_data['order_no'] = $order_no;
+                            $retrun_data['id'] = $id;
                             $retrun_data['pay'] = json_decode($order1,true);
                             Db::commit();
                         }
@@ -337,6 +338,7 @@ class Secondary extends Base
                     $notify_url = 'https://'.$_SERVER['SERVER_NAME'].'/api/Pay/alipaySecondaryNotify';//回调地址
                     $order = $zfb->ali_pay_pc($body, $total_fee, $order_no, $notify_url,'https://'.$_SERVER['SERVER_NAME'].'/web/h5/pages/shop/order');//调用支付宝支付的方法
                     $retrun_data['order_no'] = $order_no;
+                    $retrun_data['id'] = $id;
                     $retrun_data['pay'] = $order;
                     Db::commit();
                     break;
@@ -348,6 +350,7 @@ class Secondary extends Base
                     $total_fee = get0number($lenth).$total_fee;
                     $result = $client->orderPay($order_no,$total_fee,$body,$notify_url,'https://'.$_SERVER['SERVER_NAME'].'/web/h5/pages/shop/order');
                     $retrun_data['order_no'] = $order_no;
+                    $retrun_data['id'] = $id;
                     $retrun_data['pay'] = json_decode($result['data'],true);
                     Db::commit();
                     break;
@@ -564,16 +567,21 @@ class Secondary extends Base
         $this->checkSwitch(1);
         $user = getMemberInfoHash($this->uid); //获取用户信息
         $order_no = input('order_no');   //订单号
+        $id = input('id');
         $from = input('from','wx');
         if (!$order_no) $this->error('参数错误');
+        if (!$id) $this->error('参数错误');
         $order = Db::name('store_order_info_order')
-            ->where('order_no',$order_no)
+            ->where('id',$id)
             ->where('mid',$this->uid)
             ->find();
 
+        $order_no = $order['order_no'];
+
         $pay_type = $order['pay_type'];
         $this->checkSwitch(2,$pay_type);
 
+
         if (!$order) $this->error('订单不存在');
         if ($order['status']!=0) $this->error('订单已支付或已取消');
         $info = Db::name('store_order_info')->where('id',$order['info_id'])->find();
@@ -614,6 +622,7 @@ class Secondary extends Base
                         }else{
                             $order1 = $app->jssdk->bridgeConfig($result['prepay_id']);//执行二次签名返回参数
                             $retrun_data['order_no'] = $order_no;
+                            $retrun_data['id'] = $order['id'];
                             $retrun_data['pay'] = json_decode($order1,true);
                             Db::commit();
                         }
@@ -627,6 +636,7 @@ class Secondary extends Base
                     $notify_url = 'https://'.$_SERVER['SERVER_NAME'].'/api/Pay/alipaySecondaryNotify';//回调地址
                     $order = $zfb->ali_pay_pc($body, $total_fee, $order_no, $notify_url,'https://'.$_SERVER['SERVER_NAME'].'/web/h5/pages/shop/order');//调用支付宝支付的方法
                     $retrun_data['order_no'] = $order_no;
+                    $retrun_data['id'] = $order['id'];
                     $retrun_data['pay'] = $order;
                     Db::commit();
                     break;
@@ -643,6 +653,7 @@ class Secondary extends Base
                         ->update(['order_no'=>$order_nos])){
                         $result = $client->orderPay($order_nos,$total_fee,$body,$notify_url,'https://'.$_SERVER['SERVER_NAME'].'/web/h5/pages/shop/order');
                         $retrun_data['order_no'] = $order_nos;
+                        $retrun_data['id'] = $order['id'];
                         $retrun_data['pay'] = json_decode($result['data'],true);
                         Db::commit();
                     }else{

public/web/h5/index.html

@@ -2,4 +2,4 @@
 				.supports('top: constant(a)'))
 			document.write(
 				'<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
-				(coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><script src=https://www.jybl.cc/web/h5/hybrid/html/js/html2canvas.min.js></script><script src=https://res2.wx.qq.com/open/js/jweixin-1.6.0.js></script><script>window.wx1 = wx</script><link rel=stylesheet href=/web/h5/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/web/h5/static/js/chunk-vendors.4d0cdb33.js></script><script src=/web/h5/static/js/index.e4500bf5.js></script></body></html>
+				(coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><script src=https://www.jybl.cc/web/h5/hybrid/html/js/html2canvas.min.js></script><script src=https://jybl2.hdlkeji.com/web/h5/hybrid/html/js/html2canvas.min.js></script><script src=https://res2.wx.qq.com/open/js/jweixin-1.6.0.js></script><script>window.wx1 = wx</script><link rel=stylesheet href=/web/h5/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/web/h5/static/js/chunk-vendors.4d0cdb33.js></script><script src=/web/h5/static/js/index.010da039.js></script></body></html>

public/web/h5222/hybrid/html/login.html → public/web/h53333/hybrid/html/login.html

@@ -11,7 +11,7 @@
 	</body>
 	<script>
 		if (getQueryVariable('code')) {
-			// window.location.href = 'https://jybl2.hdlkeji.com/pages/mine/mine?code=' + getQueryVariable('code')
+			// window.location.href = 'https://jybl2.hdlkeji.com/web/h5/pages/mine/mine?code=' + getQueryVariable('code')
 			window.location.href = 'https://www.jybl.cc/web/h5/pages/mine/mine?code=' + getQueryVariable('code')
 		}
 

public/web/h5222/index.html → public/web/h53333/index.html

@@ -2,4 +2,4 @@
 				.supports('top: constant(a)'))
 			document.write(
 				'<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
-				(coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><script src=https://www.jybl.cc/web/h5/hybrid/html/js/html2canvas.min.js></script><script src=https://res2.wx.qq.com/open/js/jweixin-1.6.0.js></script><script>window.wx1 = wx</script><link rel=stylesheet href=/web/h5/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/web/h5/static/js/chunk-vendors.62868002.js></script><script src=/web/h5/static/js/index.b1b37671.js></script></body></html>
+				(coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><script src=https://www.jybl.cc/web/h5/hybrid/html/js/html2canvas.min.js></script><script src=https://res2.wx.qq.com/open/js/jweixin-1.6.0.js></script><script>window.wx1 = wx</script><link rel=stylesheet href=/web/h5/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/web/h5/static/js/chunk-vendors.4d0cdb33.js></script><script src=/web/h5/static/js/index.e4500bf5.js></script></body></html>