Merge branch 'feature/zl2' into 'develop'

auto commit

See merge request !15

package.json

@@ -24,14 +24,15 @@
     "axios": "^0.19.2",
     "core-js": "^3.6.5",
     "dayjs": "^1.8.30",
+    "dingtalk-jsapi": "^3.0.12",
     "dsbridge": "^3.1.4",
     "lodash": "^4.17.15",
     "md5": "^2.3.0",
+    "pica-area": "^1.2.1",
     "pre-commit": "^1.2.2",
     "vant": "^2.8.4",
     "vconsole": "^3.3.4",
     "vue": "^2.6.11",
-    "pica-area": "^1.2.1",
     "vue-fragment": "^1.5.1",
     "vue-router": "^3.3.1",
     "vuescroll": "^4.15.1",

src/main.js

 import { router, store, vueApp } from '@pica-cli/vue-cli-plugin-pica-cli-plugin/auto';
+import * as dd from 'dingtalk-jsapi';
 import '@/router';
 console.log('router, store, vueApp: ', router, store, vueApp);
 import '@/assets/js/flexible';
@@ -35,6 +36,13 @@ document.documentElement.addEventListener(
 );
 
 vueApp.$rocNative.appInit();
+vueApp.$rocNative.on('wx_ready', function () {
+  console.log('-wx_ready-');
+  window._picaWechat = 'wechat';
+});
+if(dd.env.platform) {
+  window._picaWechat = 'dingtalk';
+}
 window.Vue.use(PicaArea);
 console.log('router, store, vueApp: ', router, store, vueApp);
 console.log('window :>> ', window);