Merge branch 'feat/1.2.2-pre' into 'master'

Feat/1.2.2 pre

See merge request !20

.gitignore

@@ -18,7 +18,6 @@ config/plugin.local.js
 config/plugin.js
 config/config.*.js
 config/apollo.json
-config/apollo.ssr.json
 index.js
 config/manifest.json
 app/view/*

app/web/service/sa.service.ts

@@ -2,7 +2,7 @@ import Vue from 'vue';
 import sa from 'sa-sdk-javascript';
 import config from '@/config';
 import Storage from '@/service/localStorage.service';
-import { getParameterByName } from '@/service/utils.service';
+import { getParameterByName, isWxMp, isApp } from '@/service/utils.service';
 
 export function initSa(router) {
   console.log('initSa', EASY_ENV_IS_BROWSER, config, window.location.pathname);
@@ -24,10 +24,10 @@ export function initSa(router) {
   });
   // 添加公共属性
   sa.registerPage({
-    platformType: 'H5',
+    platformType: isWxMp ? 'MP' : isApp ? 'APP' : 'H5',
     activity_id,
-    vccChannel,
-    sonVccChannel
+    parent_channel_id: vccChannel || '',
+    channel_id: sonVccChannel || ''
   });
   router.afterEach(() => {
     Vue.nextTick(() => {

app/web/service/utils.service.ts

@@ -124,6 +124,9 @@ const ua = !EASY_ENV_IS_BROWSER ? { match() {} } : window.navigator.userAgent.to
 // 判断微信环境
 export const isWechat = ua.match(/MicroMessenger/i) == "micromessenger";
 
+// 判断微信小程序环境
+export const isWxMp = ua.match(/miniProgram/i) == 'miniprogram' || (!EASY_ENV_IS_BROWSER ? false : window.__wxjs_environment === 'miniprogram');
+
 // 判断羊小咩（信用钱包）环境
 export const isApp = ua.match(/xyqb/i) == "xyqb";
 

config/apollo.ssr.json

+{}
\ No newline at end of file

package-lock.json

@@ -1658,9 +1658,9 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.1.10",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.1.10.tgz",
-      "integrity": "sha512-aK3zz9HBzMZDPfYbYfx5q2cq6Hm4Yj1FjsxXMJDPMPGebBOmgpeIsaEVZQjdRbpcLU9VcqVmS4ByTCE8jXO2Hw==",
+      "version": "0.1.13",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.1.13.tgz",
+      "integrity": "sha512-hsiOo61SwlAhp1Cc0gmOhBCH4S7aESrftZAWqWp0HbL6qwcNTLqfIOUxiFJEw0m5nrU+Evjaa8H7iAsDOBkvLg==",
       "requires": {
         "@better-scroll/core": "^2.1.1",
         "@qg/cherry-ui": "^2.20.20",
@@ -20870,9 +20870,9 @@
       "integrity": "sha1-8z/pz7Urv9UgqhgyO8ZdsRCht2w="
     },
     "rollup": {
-      "version": "2.51.0",
-      "resolved": "http://npmprivate.quantgroups.com/rollup/-/rollup-2.51.0.tgz",
-      "integrity": "sha512-ITLt9sScNCBVspSHauw/W49lEZ0vjN8LyCzSNsNaqT67vTss2lYEfOyxltX8hjrhr1l/rQwmZ2wazzEqhZ/fUg==",
+      "version": "2.51.1",
+      "resolved": "http://npmprivate.quantgroups.com/rollup/-/rollup-2.51.1.tgz",
+      "integrity": "sha512-8xfDbAtBleXotb6qKEHWuo/jkn94a9dVqGc7Rwl3sqspCVlnCfbRek7ldhCARSi7h32H0xR4QThm1t9zHN+3uw==",
       "requires": {
         "fsevents": "~2.3.1"
       },

package.json

@@ -24,7 +24,7 @@
     "@better-scroll/core": "^2.0.5",
     "@qg/apollo-nodejs": "^2.1.2",
     "@qg/cherry-ui": "2.20.20",
-    "@qg/citrus-ui": "0.1.10",
+    "@qg/citrus-ui": "0.1.13",
     "babel-plugin-transform-vue-jsx": "^4.0.1",
     "cos-nodejs-sdk-v5": "^2.9.12",
     "egg": "^2.3.0",