Merge branch 'dev-v1.0.0' of https://git.banshouhui.com/wuzhenzhe/study into dev-v1.0.0

src/pages/learn/detail.vue

@@ -198,20 +198,13 @@ export default {
       })
     },
     pay(data) {
-      const timeStamp = String(Date.now())
-      const paySign = md5
-        .hexMD5(
-          `appId=wx4bd80cf10c2a1d14&nonceStr=${data.nonce_str}&package=prepay_id=${data.prepay_id}&signType=MD5&timeStamp=${timeStamp}&key=304b5d1810e481224d4a9199e8ba6c6e`
-        )
-        .toUpperCase()
-
       uni.requestPayment({
         provider: 'wxpay',
-        timeStamp: timeStamp,
+        timeStamp: data.timeStamp,
         nonceStr: data.nonce_str,
         package: `prepay_id=${data.prepay_id}`,
         signType: 'MD5',
-        paySign: paySign,
+        paySign: data.sign,
         success: (res) => {
           console.log('success:' + JSON.stringify(res))
           this.checkPayStatus(data.out_trade_no)