From 2115b4a161842c0ce29e2728a836b88a923ea713 Mon Sep 17 00:00:00 2001
From: renjianbo <263303411@qq.com>
Date: Sat, 18 Mar 2023 20:59:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/image/home/.DS_Store        | Bin 0 -> 6148 bytes
 pages/index/index.js              |   2 +-
 shopping/pages/goddess/goddess.js |  85 ++++++++++++++++++++----------
 3 files changed, 59 insertions(+), 28 deletions(-)
 create mode 100644 pages/image/home/.DS_Store

diff --git a/pages/image/home/.DS_Store b/pages/image/home/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001

diff --git a/pages/index/index.js b/pages/index/index.js
index 188ad6f..765328b 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -2,7 +2,7 @@
 Page({
 
     /**
-     * 页面的初始数据
+     * 页面的初始数据00
      */
     data: {
       bannerdata:[
diff --git a/shopping/pages/goddess/goddess.js b/shopping/pages/goddess/goddess.js
index a30a18b..64ce708 100644
--- a/shopping/pages/goddess/goddess.js
+++ b/shopping/pages/goddess/goddess.js
@@ -152,35 +152,66 @@ Page({
             },
             success(res) {
                 if (res.data.code == 200) {
-                    that.setData({
-                        // order_id: res.data.order_id,
-                        order_id: 123456,
-                    })
-                    // wx.showToast({ title: res.data.msg, icon: 'none' });            
-                    wx.requestPayment({
-                        timeStamp: res.data.data.timeStamp,
-                        nonceStr: res.data.data.nonceStr,
-                        package: res.data.data.package,
-                        signType: 'MD5',
-                        paySign: res.data.data.paySign,
-                        success(res) {
-                            console.log('支付成功');
-                            wx.navigateTo({
-                                url: '../paysuccess/paysuccess?' + '&order_id=' + that.data.order_id,
-                            })
-                        },
-                        fail(res) {
-                            console.log('支付失败');
-                        }
-                    })
+                    console.log('timeStamp=='+res.data.data.timeStamp)
+                    console.log('nonceStr=='+res.data.data.nonceStr)
+                    console.log('package=='+res.data.data.package)
+                    console.log('signType=='+res.data.data.signType)
+                    console.log('paySign=='+res.data.data.paySign)
+                  wx.requestPayment({
+                    timeStamp: res.data.data.timeStamp,
+                    nonceStr: res.data.data.nonceStr,
+                    package: res.data.data.package,
+                    signType: res.data.data.signType,
+                    paySign: res.data.data.paySign,
+                    success(res) {
+                      console.log('支付成功');
+                      wx.navigateTo({
+                        url: '/shopping/pages/paysuccess/paysuccess',
+                      })
+                    },
+                    fail(res) {
+                      console.log('支付失败');
+                    }
+                  })
                 } else {
-                    wx.showToast({
-                        title: res.data.msg,
-                        icon: 'none'
-                    });
-
+                  wx.showToast({
+                    title: res.data.msg,
+                    icon: 'error',
+                    duration: 2000
+                  })
                 }
-            }
+              }
+            // success(res) {
+            //     if (res.data.code == 200) {
+            //         that.setData({
+            //             // order_id: res.data.order_id,
+            //             order_id: 123456,
+            //         })
+            //         // wx.showToast({ title: res.data.msg, icon: 'none' });            
+            //         wx.requestPayment({
+            //             timeStamp: res.data.data.timeStamp,
+            //             nonceStr: res.data.data.nonceStr,
+            //             package: res.data.data.package,
+            //             signType: 'MD5',
+            //             paySign: res.data.data.paySign,
+            //             success(res) {
+            //                 console.log('支付成功');
+            //                 wx.navigateTo({
+            //                     url: '../paysuccess/paysuccess?' + '&order_id=' + that.data.order_id,
+            //                 })
+            //             },
+            //             fail(res) {
+            //                 console.log('支付失败');
+            //             }
+            //         })
+            //     } else {
+            //         wx.showToast({
+            //             title: res.data.msg,
+            //             icon: 'none'
+            //         });
+
+            //     }
+            // }
         })
     },