Merge branch 'dev-v1.0.0' of https://git.banshouhui.com/wuzhenzhe/study into dev-v1.0.0

src/App.vue

 <script>
-import "./../.env.js"
+import './../.env.js'
+import { AnalysysAgent } from '@/common/analysys_paas.js'
 export default {
   globalData: {
     // 开发环境
     uniEnv: process.uniEnv,
-    questionList: []
+    questionList: [],
   },
   onLaunch: function(options) {
+    AnalysysAgent.registerSuperProperty('platform', 'study')
     // 版本更新
     this.updateApp()
   },
   onShow: function(options) {
-    console.log("options", options)
+    console.log('options', options)
     this.updateOrgId(options)
   },
   onHide: function() {
@@ -78,14 +80,36 @@ export default {
     },
     // 更新机构ID
     updateOrgId(options) {
-      const orgId =  options?.query?.orgId
+      const orgId = options?.query?.orgId
       // 需要更新机构ID的场景，详细可参考 https://developers.weixin.qq.com/miniprogram/dev/reference/scene-list.html
-      const scene = [1005, 1006, 1011, 1012, 1013, 1026, 1035, 1047, 1048, 1049, 1053, 1058, 1067, 1091, 1145, 1135, 1183, 1017] 
-      if (!this.orgId) { // 没有机构ID，更新
+      const scene = [
+        1005,
+        1006,
+        1011,
+        1012,
+        1013,
+        1026,
+        1035,
+        1047,
+        1048,
+        1049,
+        1053,
+        1058,
+        1067,
+        1091,
+        1145,
+        1135,
+        1183,
+        1017,
+      ]
+      if (!this.orgId) {
+        // 没有机构ID，更新
         this.$u.vuex('orgId', orgId || -1)
       } else {
-        if (scene.includes(options.scene)) { // 如果需要更新机构ID
-          if (!orgId && options.path === 'pages/index/index') { // 针对重新载入小程序 安卓的query参数会清空
+        if (scene.includes(options.scene)) {
+          // 如果需要更新机构ID
+          if (!orgId && options.path === 'pages/index/index') {
+            // 针对重新载入小程序 安卓的query参数会清空
             // 如果没有参数，需要重置为平台的场景
             const platformScene = [1005, 1006, 1026, 1053, 1145, 1183, 1017]
             if (platformScene.includes(options.scene)) {
@@ -108,7 +132,66 @@ export default {
       this.$u.vuex('questionList', {})
       this.$u.vuex('lastIndex', {})
       this.$u.vuex('answerCount', {})
-    }
+    },
+    /* ------------------------- 数据埋点begin ------------------------------ */
+    track(event, properties) {
+      if (AnalysysAgent) {
+        // 易观添加事件
+        let AnalysysAgent = wx.AnalysysAgent
+        AnalysysAgent.track('study_' + event, properties)
+      }
+    },
+    profileSet(vm) {
+      // 设备身份标识
+      if (AnalysysAgent) {
+        let profile = vm.$u.deepClone(vm.userInfo)
+        profile.token = vm.vuex_token
+        profile.openid = vm.openId
+        profile.orgid = vm.orgId
+        AnalysysAgent.profileSet(profile)
+      }
+    },
+    profileAppend(vm) {
+      if (AnalysysAgent) {
+        let user = vm.$u.deepClone(vm.userInfo)
+        user.token = vm.vuex_token
+        user.openid = vm.openId
+        // 用户id设置
+        AnalysysAgent.alias(user.openid + '')
+        // 用户附加属性
+        let profile = {
+          userfrom: '模考大师',
+          openid: user.openid,
+          nickName: user.nickName
+        }
+        Object.keys(profile).map((key) => {
+          if (key && profile[key]) {
+            AnalysysAgent.profileAppend(key, profile[key])
+          }
+        })
+      }
+    },
+    share(toShareProperties, trackProperties) {
+      if (AnalysysAgent) {
+        AnalysysAgent.share(toShareProperties, trackProperties)
+      }
+    },
+    trackPage(pageName, properties) {
+      if (AnalysysAgent) {
+        AnalysysAgent.pageView(pageName, properties)
+      }
+    },
+    initShare(option) {
+      option = option || {}
+      if (AnalysysAgent && option.user_id) {
+        let shareUserInfo = {
+          share_from_id: option.user_id || '',
+          share_from_nickname: option.user_name || '',
+        }
+        AnalysysAgent.registerSuperProperties(shareUserInfo)
+      }
+    },
+    /* ------------------------- 数据埋点end ------------------------------ */
   },
 }
 </script>

src/common/analysys_paas.js

+import AnalysysAgent from '@/libs/AnalysysAgent_WX_SDK.custom.min.js'
+
+/**
+ * 易观方舟
+ * @param appkey 易观平台应用key
+ * @param debugMode 读取evn文件配置
+ *      0 关闭调试模式(默认)。类型：Number。
+ *      1 开启调试模式，数据不入库。类型：Number。
+ *      2 开启调试模式，数据入库。类型：Number。
+ * @param autoTrack 自动跟踪
+ * @param uploadURL 跟踪地址
+ *
+ */
+const argo = {
+  appkey: '5f2ac5996f36c714',
+  debugMode: process.uniEnv.argoDebugMode,
+  autoTrack: true,
+  uploadURL: 'https://argo.banshouhui.com/',
+}
+
+if (AnalysysAgent) {
+  AnalysysAgent.identify(AnalysysAgent.getDistinctId())
+  AnalysysAgent.appkey = argo.appkey //设置您的APPKEY
+  AnalysysAgent.debugMode = argo.debugMode
+  AnalysysAgent.uploadURL = argo.uploadURL
+  // AnalysysAgent.autoShare = true
+  AnalysysAgent.allowTimeCheck = true
+  AnalysysAgent.autoTrack = true
+  AnalysysAgent.registerSuperProperty('platform', 'study')
+}
+
+export { AnalysysAgent }

src/pages/cert/detail.vue

@@ -59,6 +59,7 @@ export default {
     }
   },
   onLoad: function() {
+    getApp().trackPage('证书详情')
     this.formatDataByType()
   },
   computed: {

src/pages/cert/detailLearn.vue

@@ -88,6 +88,7 @@ export default {
     }
   },
   onLoad(){
+    getApp().trackPage('我的证书详情')
   },
   onShow: function() {
     this.formatDataByType()

src/pages/index/cert.vue

@@ -173,6 +173,7 @@ export default {
     }
   },
   onLoad() {
+    getApp().trackPage('证书查询')
     this.checkType = '特种作业操作证查询'
   },
   onShow: function(param) {

src/pages/index/index.vue

@@ -262,6 +262,7 @@ export default {
   //   },
   // },
   onLoad() {
+    getApp().trackPage('首页')
     if (this.vuex_token) {
       this.loading = true
       // this.getProvinceList()

src/pages/index/mine.vue

@@ -156,6 +156,9 @@ export default {
       return { 'font-size': '32rpx', coloe: '#191C27', 'margin-left': '26rpx' }
     },
   },
+  onLoad() {
+    getApp().trackPage('我的')
+  },
   onShow() {
     if (this.userInfo.nickName) {
       this.$u.api.getUserInfo().then((res) => {

src/pages/learn/addExam.vue

@@ -72,6 +72,7 @@ export default {
     },
   },
   onLoad(e) {
+    getApp().trackPage('选择题库')
     this.getPageInfo()
   },
   methods: {

src/pages/learn/answer.vue

@@ -288,6 +288,7 @@ export default {
       this.title = '错题记录'
     }
 
+    getApp().trackPage(this.title)
     this.init()
   },
   methods: {

src/pages/learn/beginAnswer.vue

@@ -79,6 +79,7 @@ export default {
     },
   },
   onLoad() {
+    getApp().trackPage('模拟考试开始')
     this.init()
   },
   methods: {

src/pages/learn/boundQuestions.vue

@@ -88,6 +88,7 @@ export default {
     // if (e && e.relationId) {
     //   this.relationId = e.relationId
     // }
+    getApp().trackPage('绑定题库')
     if (e && e.realPrice) {
       this.realPrice = e.realPrice
     }

src/pages/learn/boundTest.vue

@@ -63,6 +63,7 @@ export default {
     },
   },
   onLoad(e) {
+    getApp().trackPage('绑定试题')
     if (e && e.code) {
       var code = e.code
       this.param.cardNumber = code.slice(0, 14)

src/pages/learn/detail.vue

@@ -171,7 +171,7 @@ export default {
     // if (e && e.relationId) {
     //   this.relationId = e.relationId
     // }
-
+    getApp().trackPage('题库详情')
     if ((e && e.id) || this.questionWarehouseId) {
       this.queryQuestionWarehouseById((e && e.id) || this.questionWarehouseId)
     }

src/pages/learn/examSetting.vue

@@ -172,6 +172,7 @@ export default {
     },
   },
   onLoad(e) {
+    getApp().trackPage('科目设置')
     this.getPageInfo()
     this.getLocation()
     this.getProvinceList(this.category.id)

src/pages/learn/manualBinding.vue

@@ -110,6 +110,7 @@ export default {
     },
   },
   onLoad(e) {
+    getApp().trackPage('手动绑定')
     // if (e && e.relationId) {
     //   this.relationId = e.relationId
     // }

src/pages/learn/record.vue

@@ -209,6 +209,7 @@ export default {
     },
   },
   onLoad(e) {
+    getApp().trackPage('每日一练')
     if (e && e.key) {
       this.$nextTick(() => {
         // setTimeout(() => {

src/pages/learn/score.vue

@@ -191,6 +191,7 @@ export default {
     }
   },
   onLoad(options) {
+    getApp().trackPage('考试成绩')
     if (options) {
       this.id = options.id
     } else {

src/pages/learn/selectCategory.vue

@@ -94,6 +94,7 @@ export default {
     },
   },
   onLoad(e) {
+    getApp().trackPage('题库选择')
     this.loadLabel() // 获取标签
   },
   methods: {

src/pages/learn/selectSpecial.vue

@@ -78,6 +78,7 @@ export default {
     },
   },
   onLoad(e) {
+    getApp().trackPage('已选题库列表')
     this.getPageInfo()
   },
   methods: {

src/pages/learn/selectedList.vue

@@ -68,6 +68,7 @@ export default {
     },
   },
   onLoad(e) {
+    getApp().trackPage('已选题库')
     this.loadList() // 获取已选题库列表
   },
   methods: {

src/pages/learn/sweepResults.vue

@@ -59,6 +59,7 @@ export default {
     },
   },
   onLoad(e) {
+    getApp().trackPage('绑定试题')
     if (e & e.result) {
       this.computed = e.result
     }

src/pages/login/index.vue

@@ -44,6 +44,7 @@ export default {
     },
   },
   onLoad(params) {
+    getApp().trackPage('登录')
     if (params && params.path) {
       this.returnUrl = decodeURIComponent(params.path)
     }

src/pages/mine/bank.vue

@@ -44,6 +44,7 @@ export default {
     }
   },
   onLoad() {
+    getApp().trackPage('我的题库')
     this.getUserQuestionWareHouseList()
   },
   methods: {

src/pages/mine/certify.vue

@@ -118,6 +118,7 @@ export default {
     },
   },
   onLoad() {
+    getApp().trackPage('实名认证')
     this.student = getApp().globalData.student
     this.qiToken = getApp().globalData.qiNiuToken
   },

src/pages/mine/company.vue

@@ -36,6 +36,7 @@ export default {
   },
   computed: {},
   onLoad() {
+    getApp().trackPage('工作单位')
     this.student = getApp().globalData.student
     if (this.student.workUnit == '' || !this.student.workUnit) {
       this.isNotSet = true

src/pages/mine/customer.vue

@@ -32,6 +32,9 @@ export default {
       erweima: process.uniEnv.qn_base_url + 'kefuerweima@2x.png',
     }
   },
+  onLoad() {
+    getApp().trackPage('联系客服')
+  }
 }
 </script>
 

src/pages/mine/info.vue

@@ -43,10 +43,10 @@
               style="
               background: none;
               font-size: 26rpx;
-              padding-right: 0;
+              padding-left: 0;
               padding-right: 0;
               text-align: right;
-              width: 300rpx;
+              width: 550rpx;
               height: 150rpx;"
             >
               <text v-if="getMobile" class="fill-value">{{ getMobile }}</text>
@@ -117,6 +117,7 @@ export default {
     },
   },
   onLoad() {
+    getApp().trackPage('我的信息')
     this.refleshCode()
     this.$u.api.getQiNiuToken({ bucketName: 'wsy-exam' }).then((res) => {
       this.qiToken = res

src/pages/mine/setting.vue

@@ -21,7 +21,9 @@ export default {
     }
   },
   computed: {},
-  onLoad() {},
+  onLoad() {
+    getApp().trackPage('设置')
+  },
   methods: {
     upgrade: function() {
       let that = this

src/pages/search/detail.vue

@@ -74,6 +74,7 @@ export default {
     }
   },
   onLoad(e) {
+    getApp().trackPage('搜索结果')
     this.keyword = e ? decodeURIComponent(e.keyword) : ''
     setList([])
     this.lists = getList()

src/pages/search/index.vue

@@ -59,6 +59,9 @@ export default {
       return this.searchHistory
     }
   },
+  onLoad() {
+    getApp().trackPage('搜索')
+  },
   methods: {
     search(val) {
       if (val){