update:更新

FrontCode2/sunshine_levy/src/views/index.vue

@@ -314,33 +314,20 @@ 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,
@@ -362,17 +349,10 @@ export default {
         dataType: "JSON",
         type: "GET",
         data: {
-<<<<<<< HEAD
+          ticket: this.$route.query.ticket
-          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;
@@ -380,11 +360,7 @@ export default {
             console.log("用户无数据，不展示");
           }
         },
-<<<<<<< HEAD
         onFail: err => {
-=======
-        onFail: (err) => {
->>>>>>> 97c617cc8fa2a51a6a3b976ad2f92b4f20d8794f
           console.log(err, "err");
         },
         onFail: err => {
@@ -446,7 +422,6 @@ export default {
     },
     gotoProject(type) {
       this.$router.push({ name: "projectSelect", params: { type: type } });
-<<<<<<< HEAD
     },
     onLogin() {
       // this.loading = true;
@@ -489,8 +464,6 @@ export default {
       if (len <= 0) return num;
       if (!tbl[len]) tbl[len] = new Array(len + 1).join("0");
       return tbl[len] + num;
-=======
->>>>>>> 97c617cc8fa2a51a6a3b976ad2f92b4f20d8794f
     },
     // 页面跳转
     pageJump() {
@@ -500,7 +473,6 @@ export default {
       // 设置用户信息埋点
       aplus_queue.push({
         action: "aplus.setMetaInfo",
-<<<<<<< HEAD
         arguments: ["_hold", "BLOCK"]
       });
       aplus_queue.push({
@@ -514,21 +486,6 @@ 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
       });
     },
     // 基础信息埋点配置
@@ -544,37 +501,21 @@ 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({
@@ -585,15 +526,9 @@ export default {
           },
           {
             miniAppId: "2001833218", //'应用开发管理平台-应用 ID
-<<<<<<< HEAD
             miniAppName: "房屋征收"
           }
         ]
-=======
-            miniAppName: "房屋征收",
-          },
-        ],
->>>>>>> 97c617cc8fa2a51a6a3b976ad2f92b4f20d8794f
       });
     }
   }