1111

sparkrc.js

@@ -9,6 +9,6 @@ module.exports ={
   "IMAGE_Q1": 0.6,
   "IMAGE_Q2": 0.8,
   "RES_PATH": "/src/assets/",
-  "RES_PATH_PROD": "//yun.duiba.com.cn/spark/v2/temp_base/1634694835210",
-  "JS_PATH_PROD": "https://yun.duiba.com.cn/spark/v2/temp_base/1634694837984/js"
+  "RES_PATH_PROD": "//yun.duiba.com.cn/spark/v2/temp_base/1635131154456",
+  "JS_PATH_PROD": "https://yun.duiba.com.cn/spark/v2/temp_base/1635131156963/js"
 }
\ No newline at end of file

src/app.jsx

@@ -15,22 +15,23 @@ MD();
 class App extends Component {
 
   async componentDidMount() {
-    const url = 'https://activity.m.duibatest.com.cn/projectx/p19dcfe16/index.html?appId=19432';
+    const urlPrefix = 'https://activity.m.duibatest.com.cn/projectx/p19dcfe16/';
+    const url = urlPrefix + 'index.html';
 
-    // const url = 'https://activity-pre.m.duiba.com.cn/projectx/pb4398bdc/index.html?appKey=jlg88lyxz7siqtmr&openBs=openbs&appID=1';
-    
-    const callBackUrl = url + '&iscallback=1';
-    const redirectUrl = url + '&isredirect=1';
+    const callBackUrl = urlPrefix + 'callback.html';
+    const redirectUrl = urlPrefix + 'redirect.html';
+
+    const iscallback = location.href.indexOf('callback.html') > 0;
 
     let activityId = CFG.projectId;
-    let { iscallback, cmbdata, isredirect } = queryParams;
+    let { cmbdata } = queryParams;
 
     setTimeout(() => {
       console.error('queryParams', JSON.stringify(queryParams));
       console.error('cmbdata', decodeURIComponent(cmbdata));
       console.error('location', location.href);
-
     }, 1000);
+
     if (isredirect) {
       API.getLoginUser({}).then(data => {
         console.error('getLoginUser', data)
@@ -57,13 +58,12 @@ class App extends Component {
       //请求授权协议，需要如果是同一活动需求区分是起始页还是授权回调页，注意开头要https
 
       // 请求授权协议
-      // const result = await ajaxImg(
-      //   '/chw/cmbautologin/generateApproval',
-      //   JSON.stringify({ activityId: activityId, callBackUrl: ( callBackUrl)  })
-      // );
-      // const protocol = result.data;
+      const result = await ajaxImg(
+        '/chw/cmbautologin/generateApproval',
+        JSON.stringify({ activityId: activityId, callBackUrl: (callBackUrl) })
+      );
+      const protocol = result.data;
 
-      const protocol = 'cmblife://approval?aid=6b9a76cce8b54060a3a31867c4c9281d&callback=https%3A%2F%2Factivity.m.duibatest.com.cn%2Fprojectx%2Fp19dcfe16%2Findex.html%3FappId%3D1%26iscallback%3D1&clientType=h5&date=20211020095331&keyAlias=CO_PUB_KEY_SM2&mid=1611e17549f83f6d83c77822d0bf7bef&random=e11ae5ff4db540118048098089305972&responseType=code&scope=defaultScope%2CgetBasketballGameMainPage%2CparticipateBasketballGame%2CqueryBasketballGameParticipateRecords%2CbasketballGameResultSubmit&sign=MEUCIQDKvyFrG6LXssn%2BQE4OQUyTDQT%2BqRmEXoJ9TL%2BmViSFpwIgeGGOwkhCSCH82iwT7TDftJekP%2BLF8sqNRiLsldgmhN0%3D&state=state';
       setTimeout(() => {
         console.error('protocol', protocol)
       }, 1000);