update

pages/selfCenter/collection.vue

@@ -89,11 +89,7 @@ export default {
     };
   },
   onLoad() {
-<<<<<<< HEAD
     this.getCollection();
-=======
-    // this.getCollection();
->>>>>>> 6e0b786a98bea8e321f5aa2e2b0df0209b180b83
   },
   methods: {
     toDetail(index) {
@@ -106,11 +102,7 @@ export default {
         url: "/pages/policy/policy_deatil?id=" + id,
       });
     },
-<<<<<<< HEAD
     getCollection() {
-=======
-  /*   getCollection() {
->>>>>>> 6e0b786a98bea8e321f5aa2e2b0df0209b180b83
       let md5Sign = md5(
         "method=" +
           "user" +
@@ -141,7 +133,6 @@ export default {
         success: (res) => {
           console.log(res);
           if (res.data.code === 200) {
-<<<<<<< HEAD
             let list = res.data.data.list;
             this.policyData = list.map((item) => {
               let ob = {
@@ -154,19 +145,13 @@ export default {
               ob.id = item.id;
               return ob;
             });
-=======
->>>>>>> 6e0b786a98bea8e321f5aa2e2b0df0209b180b83
           }
         },
         fail: () => {
           console.log("连接失败");
         },
       });
-<<<<<<< HEAD
     },
-=======
-    }, */
->>>>>>> 6e0b786a98bea8e321f5aa2e2b0df0209b180b83
   },
 };
 </script>
@@ -364,4 +349,4 @@ export default {
     }
   }
 }
-</style>
+</style>