Merge branch 'feat/1229' into 'master'

Feat/1229

See merge request !104

app/web/api/editor.api.ts

@@ -50,7 +50,7 @@ export default {
     return http.get(`${config.apiHost}/editor/getServerTime`);
   },
 
-  getTongDunIdByKey(params) {
+  getShumeiIdByKey(params) {
     return http.post(`${config.kdspHost}/api/kdsp/fraud/getDeviceId`, params);
   },
 };
\ No newline at end of file

app/web/component/layout/activity/index.ts

@@ -54,9 +54,9 @@ if (EASY_ENV_IS_BROWSER) {
     if (json.event === 'getTokenSuccess') {
       EventBus.$emit('NATIVE_EVENT_GET_TOKEN', json);
     }
-    // if (json.event === 'getTongdunIdSuccess') {
-    //   EventBus.$emit('NATIVE_EVENT_GET_TDONGDUN_ID', json);
-    // }
+    if (json.event === 'getShuMeiIdSuccess') {
+      EventBus.$emit('NATIVE_EVENT_GET_SHUMEI_ID', json);
+    }
   };
 }
 @Component({

app/web/page/activity/view/activity/index.ts

@@ -178,30 +178,32 @@ export default class Activity extends Mixins(TransformStyleMixin, BottomNavStyle
     // 获取优惠券弹窗相关配置
     if (this.pageData?.props?.couponModal && this.pageData?.props?.couponModal.length) {
       const couponPushIdList = this.pageData.props.couponModal.join(',');
-      // 先获取同盾ID，再调用优惠券弹窗推送接口
+      let shumeiDeviceId = '';
+      // 先获取数美ID，再调用优惠券弹窗推送接口
       if (EASY_ENV_IS_BROWSER) {
         if (isApp) {
-          this.getCouponModalDetailReq(couponPushIdList);
-          // // app的时候通过事件获取同盾id
-          // EventBus.$on('NATIVE_EVENT_GET_TDONGDUN_ID', res => {
-          //   console.log('getTongdunIdInAppSuccess', JSON.stringify(res));
-          //   tongdunDeviceId = res.data.tongdunDeviceId || '';
-          //   this.getCouponModalDetailReq(couponPushIdList, tongdunDeviceId);
-          // });
-          // const bridge = new Bridge();
-          // bridge.run({
-          //   event: 'getTongdunId',
-          //   data: {},
-          // });
+          // TODO 接入小程序数美id，app的时候通过事件获取数美id, 因优惠券弹窗暂时不在小程序弹出，故搁置
+          EventBus.$on('NATIVE_EVENT_GET_SHUMEI_ID', res => {
+            console.log('getShuMeiIdInAppSuccess', JSON.stringify(res));
+            shumeiDeviceId = res.data.shumeiDeviceId || '';
+            this.getCouponModalDetailReq(couponPushIdList, shumeiDeviceId);
+          });
+          const bridge = new Bridge();
+          bridge.run({
+            event: 'getShuMeiId',
+            data: {},
+          });
         }
       }
     }
-  },
-  async getCouponModalDetailReq(couponPushIdList) {
+  }
+  async getCouponModalDetailReq(couponPushIdList, shumeiDeviceId) {
     // 获取推送弹窗数据
+    shumeiDeviceId = shumeiDeviceId || '';
     if (!couponPushIdList) { return; }
     const [res, err] = await modalApi.getCouponModal({
       couponPushIdList,
+      shumeiDeviceId
     });
     if (err) { return; }
     if (res && Object.keys(res).length) {

package-lock.json

@@ -2367,9 +2367,9 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.3.61",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.61.tgz",
-      "integrity": "sha512-RHwiyabltYgokRdtn/3WoDaS+zJ2bpdjyOwzaHDkSOy2DNhxWcD3gsOBidiYWewZy3sS1BRbKKk7NMw5vTSocg==",
+      "version": "0.3.62",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.62.tgz",
+      "integrity": "sha512-3GQaG9i/SnmMOOHz/NahuSB8o9t2xtTbXxmX9k5MdU4PJsFApqfN2cjLAEeKqq9/0O+d/AT+Aj/JfUHKVU6m4A==",
       "requires": {
         "@better-scroll/core": "^2.1.1",
         "@qg/cherry-ui": "^2.23.9",
@@ -23214,9 +23214,9 @@
       }
     },
     "sa-sdk-javascript": {
-      "version": "1.24.6",
-      "resolved": "http://npmprivate.quantgroups.com/sa-sdk-javascript/-/sa-sdk-javascript-1.24.6.tgz",
-      "integrity": "sha512-5X/45Il9bnEAR1i8p2E/ATSZgsVKYAQ07vPv9gIJO5sVZLdYNAtNedHUWCyqsXFDbRehuKP7XR0Ma4gDXE2Qww=="
+      "version": "1.24.7",
+      "resolved": "http://npmprivate.quantgroups.com/sa-sdk-javascript/-/sa-sdk-javascript-1.24.7.tgz",
+      "integrity": "sha512-8ESvUdrHSjCJ8sOAWWi9RG3nmvrN/ZrWMFml1GlsHRyKRn5SD6gbEgtmEOVd85DXMtB/RV3CQ7W1Iwh7/0kg7g=="
     },
     "safe-buffer": {
       "version": "5.2.1",

package.json

@@ -26,7 +26,7 @@
     "@better-scroll/core": "^2.0.5",
     "@qg/apollo-nodejs": "^2.1.2",
     "@qg/cherry-ui": "2.23.10",
-    "@qg/citrus-ui": "0.3.61",
+    "@qg/citrus-ui": "0.3.62",
     "@qg/js-bridge": "^1.1.12",
     "babel-plugin-transform-vue-jsx": "^4.0.1",
     "cos-nodejs-sdk-v5": "^2.9.12",