lz-insurance

src/views/entitlement/list.vue

@@ -254,18 +254,6 @@
             console.log('--arr', arr);
             that.entitlementList = arr;
           } else {
-<<<<<<< HEAD
-            // that.entitlementList = [];
-            // that.$router.push(
-            //   {
-            //     path:  '/sz-public',
-            //     query: {
-            //       projectEquityNo: projectEquityNo,
-            //       externalOrderNo: externalOrderNo
-            //     },
-            //   }
-            // );
-=======
             that.entitlementList = [];
             that.$router.replace(
               {
@@ -276,7 +264,6 @@
                 },
               }
             );
->>>>>>> 2213039 (lz-insurance)
           }
           that.$loading.hide();
         }

src/views/sz-public/index.vue

@@ -161,22 +161,12 @@
   </script>
 <style lang="scss" scoped>
   .insurance-sz{
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 400f112 (lz-insurance)
     // height:  1772px;
     // display: flex;
     // justify-content: center;
     // align-items: center;
     padding-bottom: 70px;
     height: 712px;
-<<<<<<< HEAD
-=======
-    height: 100vh;
->>>>>>> 33a93f3 (lz-insurance)
-=======
->>>>>>> 400f112 (lz-insurance)
     background: #fff;
     .bottom{
       position: fixed;