Merge branch 'dev' of https://git.archgrid.xyz/zly/electricity_bill_calc_wx into dev

pages/home/index.js

@@ -144,9 +144,9 @@ Page({
       return;
     }
     wx.requestPayment({
-      timeStamp: `${Date.now()}`,
-      nonceStr: "123",
-      package: `prepay_id=${data?.prepay_id}`,
+      timeStamp: data?.time,
+      nonceStr: data?.nonceStr,
+      package: "prepay_id=" + data?.prepay_id,
       paySign: data?.paySign,
       signType: 'RSA',
       success: (res) => {

pages/index/index.js

@@ -19,11 +19,11 @@ Page({
   }, 500),
   payment: function() {
     wx.requestPayment({
-      timeStamp: `${Date.now()}`,
-      nonceStr: 'qwertyuiop',
-      package: 'prepay_id=111',
-      signType: 'MD5',
-      paySign: '11',
+      timeStamp: data?.time,
+      nonceStr: data?.nonceStr,
+      package: "prepay_id=" + data?.prepay_id,
+      paySign: data?.paySign,
+      signType: 'RSA',
       success (res) {
         console.log('success', res);
       },