Commit 35d2efe2 authored by wildfirecode13's avatar wildfirecode13

1

parent 485af4be
No preview for this file type
...@@ -5,8 +5,8 @@ const generateApproval = require("./common/generateApproval"); ...@@ -5,8 +5,8 @@ const generateApproval = require("./common/generateApproval");
const generateLoginUrl = require("./common/generateLoginUrl"); const generateLoginUrl = require("./common/generateLoginUrl");
const proxy = { const proxy = {
"GET /customActivity/cmbautologin/generateApproval": generateApproval, "GET /chw/cmbautologin/generateApproval": generateApproval,
"GET /customActivity/cmbautologin/generateLoginUrl": generateLoginUrl, "GET /chw/cmbautologin/generateLoginUrl": generateLoginUrl,
"GET /projectRule.query": rule, "GET /projectRule.query": rule,
"GET /drawNum.query": drawNum "GET /drawNum.query": drawNum
}; };
......
...@@ -9,6 +9,6 @@ module.exports ={ ...@@ -9,6 +9,6 @@ module.exports ={
"IMAGE_Q1": 0.6, "IMAGE_Q1": 0.6,
"IMAGE_Q2": 0.8, "IMAGE_Q2": 0.8,
"RES_PATH": "/src/assets/", "RES_PATH": "/src/assets/",
"RES_PATH_PROD": "//yun.duiba.com.cn/spark/v2/temp_base/1632981807428", "RES_PATH_PROD": "//yun.duiba.com.cn/spark/v2/temp_base/1633660597490",
"JS_PATH_PROD": "https://yun.duiba.com.cn/spark/v2/temp_base/1632981809441/js" "JS_PATH_PROD": "https://yun.duiba.com.cn/spark/v2/temp_base/1633660599708/js"
} }
\ No newline at end of file
const apiCfg = { const apiCfg = {
getRule:`projectRule.query`, getRule:`projectRule.query`,
generateApproval:`/customActivity/cmbautologin/generateApproval`, generateApproval:`/chw/cmbautologin/generateApproval`,
generateLoginUrl:`/customActivity/cmbautologin/generateLoginUrl`, generateLoginUrl:`/chw/cmbautologin/generateLoginUrl`,
doJoin: { doJoin: {
uri: `join.do`, uri: `join.do`,
method: "post" method: "post"
......
...@@ -14,8 +14,6 @@ MD(); ...@@ -14,8 +14,6 @@ MD();
class App extends Component { class App extends Component {
async componentDidMount() { async componentDidMount() {
const { code } = queryParams; const { code } = queryParams;
if (code) { //获取到code if (code) { //获取到code
...@@ -28,11 +26,11 @@ class App extends Component { ...@@ -28,11 +26,11 @@ class App extends Component {
} else { //没有获取到code } else { //没有获取到code
//请求授权协议 //请求授权协议
// const generateApprovalResult = await API.generateApproval(); const generateApprovalResult = await API.generateApproval();
// const { protocol } = generateApprovalResult; const { protocol } = generateApprovalResult;
console.error(202) // console.error(202)
const protocol = 'cmblife://approval?aid=9dad6d3900ec3ffabd80e46522a10ead&callback=https%3A%2F%2Ftest.com%2Fmerchant%2FapprovalCallback.html&clientType=h5&date=20210930134315&keyAlias=CO_PUB_KEY_SM2&mid=f806c259d86e3b9aa956c98d475b6af7&random=6d5e7923308d489b969376cdb448072c&responseType=code&scope=defaultScope&sign=MEUCICIfC6OJFUUHYAIKlswzWvy2H%2BCPSyebZLb48OoTdqRaAiEA6UlFWD2Qd6OHBC0Cd69kFuu8%2FplOiddP%2FCcdokhPPoE%3D&state=state'; // const protocol = 'cmblife://approval?aid=9dad6d3900ec3ffabd80e46522a10ead&callback=https%3A%2F%2Ftest.com%2Fmerchant%2FapprovalCallback.html&clientType=h5&date=20210930134315&keyAlias=CO_PUB_KEY_SM2&mid=f806c259d86e3b9aa956c98d475b6af7&random=6d5e7923308d489b969376cdb448072c&responseType=code&scope=defaultScope&sign=MEUCICIfC6OJFUUHYAIKlswzWvy2H%2BCPSyebZLb48OoTdqRaAiEA6UlFWD2Qd6OHBC0Cd69kFuu8%2FplOiddP%2FCcdokhPPoE%3D&state=state';
// var redirectUrl = "https://open.cmbchina.com/DevEnv/redirect/auth" // var redirectUrl = "https://open.cmbchina.com/DevEnv/redirect/auth"
// + "?protocol=" + encodeURIComponent(protocol) // + "?protocol=" + encodeURIComponent(protocol)
// + "&merchantApprovalUrl=" + encodeURIComponent(window.location.href); // + "&merchantApprovalUrl=" + encodeURIComponent(window.location.href);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment