Merge branch 'master' of https://gitee.com/longyears/langye-web-start

1

src/views/activity/index.vue

@@ -23,8 +23,8 @@
 
     <xy-table :list="list" :table-item="table" @delete="deleteitem"
       @editor="(row)=>{$refs['addActivity'].id = row.id;$refs['addActivity'].isShow = true;$refs['addActivity'].type = 'editor'}">
-      <template v-slot:btns v-if="type==0">
+      <template v-slot:btns >
-
+          <button >1212</button>
       </template>
     </xy-table>
 

src/views/login/index.vue

@@ -169,7 +169,7 @@
 
         &:-webkit-autofill {
           box-shadow: 0 0 0px 1000px $bg inset !important;
-          -webkit-text-fill-color: $cursor !important;
+          //-webkit-text-fill-color: $cursor !important;
         }
       }
     }