From 9e433c75a8973245a0d31c9efae15c4f4114e10b Mon Sep 17 00:00:00 2001
From: renjianbo <263303411@qq.com>
Date: Wed, 1 Mar 2023 22:50:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AC=A1=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                           |  5 ++++-
 pages/orderdetail/orderdetail.js | 32 ++++++++++++++++++++------------
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/app.js b/app.js
index fbe54e1..41659fc 100644
--- a/app.js
+++ b/app.js
@@ -16,7 +16,10 @@ App({
 		iv:'',
 		code:'',
 	
-		url:'http://chengjie468.gnway.cc',
+ 
+   // url:'http://chengjie468.gnway.cc:9090',
+    url:'https://35q45673j2.goho.co',
+    
 	
 		phone:'',
 		uid:'',
diff --git a/pages/orderdetail/orderdetail.js b/pages/orderdetail/orderdetail.js
index f59ce02..613806f 100644
--- a/pages/orderdetail/orderdetail.js
+++ b/pages/orderdetail/orderdetail.js
@@ -378,21 +378,29 @@ isok(){
     var _this=this;
     console.log(this.data.id+'tttttttttttttttttttttttttttttttttt')
     wx.request({
-        url: app.globalData.url + '/app/Goddesswechat/buyGoods',
-        data: {
-            version_number: app.globalData.version_number,
-            uid: wx.getStorageSync('uid'),
-            token:wx.getStorageSync('token'),
-            goods_id:this.data.goods_id,
-            order_id:this.data.order_id,
-            tg_order:''
-        },
-        method: 'POST',
-        header: { 'content-type': 'application/x-www-form-urlencoded' },
+      url: app.globalData.url + '/system/weixinPay/12345678',
+      header: app.getRequestHeader(),
+      method: 'GET',
+      data: {
+
+      },
+
+        // url: app.globalData.url + '/system/weixinPay/123',
+        // header: app.getRequestHeader(),
+        // data: {
+        //     version_number: app.globalData.version_number,
+        //     uid: wx.getStorageSync('uid'),
+        //     token:wx.getStorageSync('token'),
+        //     goods_id:this.data.goods_id,
+        //     order_id:this.data.order_id,
+        //     tg_order:''
+        // },
+        //method: 'POST',
+     //   header: { 'content-type': 'application/x-www-form-urlencoded' },
         success(res) {
             console.log(1111111)
             console.log(res)
-            if (res.data.erro == 0) {                    
+            if (res.data.code == 200) {                    
                
                 wx.requestPayment({
                   timeStamp: res.data.data.timeStamp,