Merge branch 'master' of http://118.178.224.202:3000/ewide/zsxt_nbzs_h5

FrontCode2/sunshine_levy/package.json

@@ -10,7 +10,7 @@
     "build": "node build/build.js"
   },
   "dependencies": {
-    "@aligov/jssdk-mgop": "^3.1.7",
+    "@aligov/jssdk-mgop": "^3.0.0",
     "axios": "^0.21.4",
     "element-ui": "^2.15.6",
     "js-md5": "^0.7.3",

FrontCode2/sunshine_levy/src/views/index.vue

@@ -314,20 +314,33 @@ export default {
           id: 11,
           area: "全大市",
           title: "宁波市住房和城乡建设委员会开展关于住房的政策",
+<<<<<<< HEAD
           publish_date: "2021年09月05日"
+=======
+          publish_date: "2021年09月05日",
+>>>>>>> 97c617cc8fa2a51a6a3b976ad2f92b4f20d8794f
         },
         {
           id: 22,
           area: "全大市",
           title: "宁波市住房和城乡建设委员会开展关于住房的政策",
+<<<<<<< HEAD
           publish_date: "2021年09月05日"
+=======
+          publish_date: "2021年09月05日",
+>>>>>>> 97c617cc8fa2a51a6a3b976ad2f92b4f20d8794f
         },
         {
           id: 33,
           area: "全大市",
           title: "宁波市住房和城乡建设委员会开展关于住房的政策",
+<<<<<<< HEAD
           publish_date: "2021年09月05日"
         }
+=======
+          publish_date: "2021年09月05日",
+        },
+>>>>>>> 97c617cc8fa2a51a6a3b976ad2f92b4f20d8794f
       ],
       loading: false,
       finished: true,
@@ -349,18 +362,29 @@ export default {
         dataType: "JSON",
         type: "GET",
         data: {
+<<<<<<< HEAD
           ticket: "1234567"
         },
         appKey: "es4b8zmz+2001833218+dehllx", // 必须
         onSuccess: data => {
+=======
+          ticket: this.$route.query.ticket,
+        },
+        appKey: "es4b8zmz+2001833218+dehllx", // 必须
+        onSuccess: (data) => {
+>>>>>>> 97c617cc8fa2a51a6a3b976ad2f92b4f20d8794f
           console.log("data", data);
           if (data.data && data.data.success == true) {
-            // this.data = data.data;
+            this.data = data.data;
           } else {
             console.log("用户无数据，不展示");
           }
         },
+<<<<<<< HEAD
         onFail: err => {
+=======
+        onFail: (err) => {
+>>>>>>> 97c617cc8fa2a51a6a3b976ad2f92b4f20d8794f
           console.log(err, "err");
         },
         onFail: err => {
@@ -422,6 +446,7 @@ export default {
     },
     gotoProject(type) {
       this.$router.push({ name: "projectSelect", params: { type: type } });
+<<<<<<< HEAD
     },
     onLogin() {
       // this.loading = true;
@@ -464,6 +489,8 @@ export default {
       if (len <= 0) return num;
       if (!tbl[len]) tbl[len] = new Array(len + 1).join("0");
       return tbl[len] + num;
+=======
+>>>>>>> 97c617cc8fa2a51a6a3b976ad2f92b4f20d8794f
     },
     // 页面跳转
     pageJump() {
@@ -473,6 +500,7 @@ export default {
       // 设置用户信息埋点
       aplus_queue.push({
         action: "aplus.setMetaInfo",
+<<<<<<< HEAD
         arguments: ["_hold", "BLOCK"]
       });
       aplus_queue.push({
@@ -486,6 +514,21 @@ export default {
       aplus_queue.push({
         action: "aplus.setMetaInfo",
         arguments: ["_hold", "START"]
+=======
+        arguments: ["_hold", "BLOCK"],
+      });
+      aplus_queue.push({
+        action: "aplus.setMetaInfo",
+        arguments: ["_user_nick", this.userInfoData.username],
+      });
+      aplus_queue.push({
+        action: "aplus.setMetaInfo",
+        arguments: ["_user_id", Userid],
+      });
+      aplus_queue.push({
+        action: "aplus.setMetaInfo",
+        arguments: ["_hold", "START"],
+>>>>>>> 97c617cc8fa2a51a6a3b976ad2f92b4f20d8794f
       });
     },
     // 基础信息埋点配置
@@ -501,21 +544,37 @@ export default {
       })(window, document, "script", "aplus_queue");
       aplus_queue.push({
         action: "aplus.setMetaInfo",
+<<<<<<< HEAD
         arguments: ["aplus-rhost-v", "alog.zjzwfw.gov.cn"]
       });
       aplus_queue.push({
         action: "aplus.setMetaInfo",
         arguments: ["aplus-rhost-g", "alog.zjzwfw.gov.cn"]
+=======
+        arguments: ["aplus-rhost-v", "alog.zjzwfw.gov.cn"],
+      });
+      aplus_queue.push({
+        action: "aplus.setMetaInfo",
+        arguments: ["aplus-rhost-g", "alog.zjzwfw.gov.cn"],
+>>>>>>> 97c617cc8fa2a51a6a3b976ad2f92b4f20d8794f
       });
       // 这个会落到 app_key 字段上
       aplus_queue.push({
         action: "aplus.setMetaInfo",
+<<<<<<< HEAD
         arguments: ["appId", "60506758"]
+=======
+        arguments: ["appId", "60506758"],
+>>>>>>> 97c617cc8fa2a51a6a3b976ad2f92b4f20d8794f
       });
       // 单页应用 或 “单个页面”需异步补充 PV 日志参数还需进行如下埋点：
       aplus_queue.push({
         action: "aplus.setMetaInfo",
+<<<<<<< HEAD
         arguments: ["aplus-waiting", "MAN"]
+=======
+        arguments: ["aplus-waiting", "MAN"],
+>>>>>>> 97c617cc8fa2a51a6a3b976ad2f92b4f20d8794f
       });
       // 单页应用路由切换后 或 在异步获取到 pv 日志所需的参数后再执行 sendPV：
       aplus_queue.push({
@@ -526,9 +585,15 @@ export default {
           },
           {
             miniAppId: "2001833218", //'应用开发管理平台-应用 ID
+<<<<<<< HEAD
             miniAppName: "房屋征收"
           }
         ]
+=======
+            miniAppName: "房屋征收",
+          },
+        ],
+>>>>>>> 97c617cc8fa2a51a6a3b976ad2f92b4f20d8794f
       });
     }
   }