Merge branch 'master' of iqiyoo:zhuishuyun_quickapp_front

sign/release/certificate.pem

@@ -0,0 +1,26 @@
+-----BEGIN CERTIFICATE-----
+MIIEXjCCA0agAwIBAgIJAMejl+Lvsjn8MA0GCSqGSIb3DQEBCwUAMIHDMQswCQYD
+VQQGEwJaSDERMA8GA1UECAwIWmhlSmlhbmcxEjAQBgNVBAcMCUhhbmcgWmhvdTFF
+MEMGA1UECgw8w6bCncKtw6XCt8Kew6bCjsKMw6fCu8K0w6fCp8KRw6bCisKAw6bC
+nMKJw6nCmcKQw6XChcKsw6XCj8K4MRMwEQYDVQQLDApPcGVyYXRpb25zMRAwDgYD
+VQQDDAdkZWZhdWx0MR8wHQYJKoZIhvcNAQkBFhA1MDMzMjUwMTdAcXEuY29tMB4X
+DTE5MTAzMDA4MjkwM1oXDTI5MTAyNzA4MjkwM1owgcMxCzAJBgNVBAYTAlpIMREw
+DwYDVQQIDAhaaGVKaWFuZzESMBAGA1UEBwwJSGFuZyBaaG91MUUwQwYDVQQKDDzD
+psKdwq3DpcK3wp7DpsKOwozDp8K7wrTDp8KnwpHDpsKKwoDDpsKcwonDqcKZwpDD
+pcKFwqzDpcKPwrgxEzARBgNVBAsMCk9wZXJhdGlvbnMxEDAOBgNVBAMMB2RlZmF1
+bHQxHzAdBgkqhkiG9w0BCQEWEDUwMzMyNTAxN0BxcS5jb20wggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDgF4Vxg3qofpvewPsa0PNIu2Cd5nCF3zGQMfSP
+bwey1bhGkUHsu1FARI72ltJfaKqBnUDMH1gLcfoDiS2QYxLAQsKZb243eumvkEo4
+2564WJd9Wp8UPbQ7FomwefNXD7xNnj29YFo/rzj3CQTyBfo7yOQP2ZXPTXg+AR+a
+CgPozzSPQv2P9UJ+inkftWuPpJw51F832B2cloRyoznYoQRaJ1nFXJtxscelaNoy
+BRh9qrgBsXNMRE51T7kwf/e7TuKl9HvJ4bGuMUOG9K6rGYuWcvMnjPx50TyokxnF
+U3+FqfnuUxEfHZBOzsIFB/XF3FRoPiIN35dqlt0oDXxF03k5AgMBAAGjUzBRMB0G
+A1UdDgQWBBTiK+2T4ctk3lTlVDeWt49JaHyEKzAfBgNVHSMEGDAWgBTiK+2T4ctk
+3lTlVDeWt49JaHyEKzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IB
+AQBLYVYAq0LPl+/iuvPT/MluHU2fzyAIcqeoLZ0x+AxufFi0YWA6vfmVLAdYAJ9S
+UIHIJGoaA2b8bKQ7OXDgyv6hV4TXnX+YC17oQpUYTg65Va3xTI1yyoHsCHy4fYBc
+HduFEdcWWbJKRI75OlSjLnqnvPTmCs9cABRH2DPGaOyRGgr46xugZvtKrfYZv9m+
+eBAp20OKTrw+v7TzsbGjMEKrT5aJEmNvdFdtVfCFioNXi4fn7TxOli2q4E2JJSLN
+UBT00Eyuo0ywHrq+2BmWeRgrIiZULFIW0Nhe/sXXse7BaFE/d/PV4G0cPEnrwLE2
+mADdDi8gGdy+5rehrHrVSjcD
+-----END CERTIFICATE-----

sign/release/private.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDgF4Vxg3qofpve
+wPsa0PNIu2Cd5nCF3zGQMfSPbwey1bhGkUHsu1FARI72ltJfaKqBnUDMH1gLcfoD
+iS2QYxLAQsKZb243eumvkEo42564WJd9Wp8UPbQ7FomwefNXD7xNnj29YFo/rzj3
+CQTyBfo7yOQP2ZXPTXg+AR+aCgPozzSPQv2P9UJ+inkftWuPpJw51F832B2cloRy
+oznYoQRaJ1nFXJtxscelaNoyBRh9qrgBsXNMRE51T7kwf/e7TuKl9HvJ4bGuMUOG
+9K6rGYuWcvMnjPx50TyokxnFU3+FqfnuUxEfHZBOzsIFB/XF3FRoPiIN35dqlt0o
+DXxF03k5AgMBAAECggEAcR4udECEWC2hDO6pUr4LMLm1ab97KXijEkDFTOolHrcX
+kDee6Zscxq5U5FD53MN+3nK81M01qoFcTRCf+XSpcHfCt6UyI7td3wudC9qA4lmG
+DvcBujvzkKgt1PGaTmZZDW1FiSTsKZ2PydO5tVojGK6twPp6zuwyOEpk42MO2iNc
+eojVmJX14vJ2pAAwwKq8X4YDtVoS4vFKcXsKlYuz+d5vqxurzsq0gCxsPZnV90Ad
+ACb4WtGTtoeKX7lD4b7fGlilZ3RBKXM5D3yRVq0i9akzDZIXTFnojxbCxwBIIrQ6
+MYN3kAYKZcp3JOVeAAgH2jo+0SDYgpMEOEHM5UEwAQKBgQDws6/lfciGWnKJJ1v8
+eviinohnRuILbEhIajjyC/I32j28g/p6O2LasslpH4TZRgIQljmLvMeMHM8BRpfw
+MH8NR0EGJRG4YpSuaDwGGRcYp8wpOOJvyeFP2EKbBG6GzV1gE6HWD9yVZ9QKHZK4
+D8UtAlWfXZhzqt0sLYcjE+34OQKBgQDuVZUquZL4ZnRx3MdnzNFEDCpQChzOr9z3
+H+mrK70KhKE3xzsbHFmUOoFCSTnYyMSGi5UuuVY7yl7hHkw6h7XvNOKKpRf3dLb7
+VoxzXgj/l/8L/xAJ+6+wkhp3jwUzYmqOkuIRGzB+gHxr20oR0vRJKo3q1gsrlanS
+Ui9EgoeJAQKBgQDnpCVc98Xo9lZPg99UhYuOBH9E1MRpNdYCSqdu2OxLr+3F5EVD
+KK+jxHdsgXa6GlOWXtwWjKCFSJw2oBdMgX9j6fS70yTQi56Gka1iOPcvNRyXdzUD
+XAdHbdn7kTJE7JI2Ce6vMSiZaAh5i6hNFnAtNpfr/Ijgl8it4UqyCVX0kQKBgQDn
+IyzFALAeIw6vFlR0wFf6zGmEsin58Og06kgtbv+o4bOQarFRu47MiGivJmDpctvV
+OC134NpWpg6Z+E4pPVAeKoXBvBagMBr9aZRQllPXvUrmEXk2lVZvwWHVrWh3yuxY
+VO7VdC71oBoKZ+NPoeyzwIddxjOTE1Rc2sNoh8Z2AQKBgQDEkydkQVLA1Xx36U6j
+VxCt6U1ap+LS8YDv86VAUszHF1EqZ7ULHcmQHCNB/BJURijXu+fWk4WWmXBRiaE2
+Qfn3m+4VC2WqBub9Q3oQt1X8DEDvu9+nlSWysi40O4On73OCu1KuCdGj4YJ78NoB
+HSKG9Rcz0pW0o3Q05kZWo8F2HA==
+-----END PRIVATE KEY-----

src/api/index.js

@@ -96,10 +96,15 @@ export const deleteShelfBook = params => {
 };
 
 // 充值
-export const getPayQuery = params => {
+export const getConfigOfWxPay = (params) => {
   return fly.get("/goToPay", params);
 };
 
+// 支付宝充值
+export const getConfigOfAliPay = (params) => {
+  return fly.get("/goToAliPay", params)
+}
+
 //获取用户信息
 export const getUserInfo = () => {
   return fly.get(`/userinfo`);

src/api/utils.js

@@ -64,7 +64,11 @@ const refreshToken = () => {
   return fly
     .get("/RefreshToken", {
       token: token.token
-    })
+    }, {
+        headers: {
+          a: 1
+        }
+      })
     .then(r => {
       return checkResult(r);
     })
@@ -153,7 +157,7 @@ export const downImg = photoPath => {
         }
       });
     },
-    fail: () => {}
+    fail: () => { }
   });
 };
 //校验手机号

src/helper/index.js

@@ -1,6 +1,7 @@
 
 import wxpay from '@service.wxpay';
-import { getPayQuery } from "../api";
+import alipay from '@service.alipay';
+import { getConfigOfWxPay, getConfigOfAliPay } from "../api";
 
 export const pageLoad = (meta, fn, params) => {
   return new Promise(async (resolve, reject) => {
@@ -19,7 +20,7 @@ export const pageLoad = (meta, fn, params) => {
 
 // 支付配置
 export const configWxPay = async (params) => {
-  let config = await getPayQuery(params);
+  let config = await getConfigOfWxPay(params);
   console.log("pay config", config);
   let prepayid = config.prepay_id;
   // app中的配置信息
@@ -72,3 +73,17 @@ let useWxPay = (prepayid, extra) => {
     })
   })
 }
+
+// 配置支付宝支付
+export const configAliPay = (params) => {
+  return new Promise(async (resolve) => {
+    let orderInfo = await getConfigOfAliPay(params);
+    alipay.pay({
+      orderInfo: orderInfo,
+      callback: (ret) => {
+        console.log("alipay cb", ret);
+        resolve({ code: ret.resultStatus, result: ret.result ? JSON.parse(ret.result) : "" })
+      }
+    })
+  })
+}

src/manifest.json

@@ -1,5 +1,5 @@
 {
-  "package": "com.application.zhuishuyun",
+  "package": "com.beidao.kuaiying.zsy",
   "name": "追书云小说",
   "versionName": "1.0.0",
   "versionCode": "1",
@@ -37,10 +37,16 @@
       "name": "system.storage"
     },
     {
+      "name": "service.alipay"
+    },
+    {
+      "name": "system.webview"
+    },
+    {
       "name": "service.wxpay",
       "params": {
-        "package": "com.application.zhuishuyun",
-        "sign": "",
+        "package": "com.beidao.kuaiying.zsy",
+        "sign": "NEJEMkI2RjFFMzM2RDlEMTYyRjc4NTZCRTYwQjVEQjY=",
         "url": ""
       }
     }

src/views/Pay/index.ux

@@ -66,8 +66,9 @@
 </template>
 
 <script>
+import prompt from '@system.prompt';
 import { getChargeList } from "../../api";
-import { configWxPay } from "../../helper";
+import { configWxPay, configAliPay } from "../../helper";
 
 export default {
   private: {
@@ -103,9 +104,29 @@ export default {
       }
     })
   },
-  toPay() {
+  async toPay() {
+    let cur_pay_type = this.curPayType;
     let product_id = this.rechargeList[this.curSelect].product_id;
-    configWxPay({ product_id: product_id })
+    console.log(cur_pay_type);
+    if (cur_pay_type === 1) {
+      let ret = await configAliPay({ product_id: product_id });
+      this.showToastByCode(ret.code);
+    }
+    else configWxPay({ product_id: product_id });
+  },
+  showToastByCode(code) {
+    let msg = "支付成功！";
+    switch (code) {
+      case "9000": msg = "支付成功！"; break;
+      case "8000": msg = "订单已提交，请等待结果"; break;
+      case "4000": msg = "订单支付失败！"; break;
+      case "5000": msg = "订单重复！"; break;
+      case "6001": msg = "您已取消支付"; break;
+      case "6002": msg = "网络错误！"; break;
+      case "6004": msg = "请联系客服查询订单"; break;
+      default: msg = "请联系客服" + code;
+    }
+    prompt.showToast({ message: msg });
   },
   onInit() {
     this.initChargeList();