Merge branch 'master' into 'master'

Master See merge request !3

Merge branch 'master' into 'master'
Master See merge request !3
Adam
2 parents 026545fd85 373265dfe5
Showing 2 changed files Show diff stats
.gitignore
src/pages/index/index.vue
@@ -21,3 +21,4 @@ yarn-error.log*
 *.njsproj
 *.sln
 *.sw*
+yarn.lock
@@ -58,7 +58,7 @@
 </template>
  
 <script>
-	import UniDrawer from "@/components/Uni-drawer/Uni-drawer.vue";
+	import UniDrawer from "@/components/uni-drawer/uni-drawer.vue";
 	import HMfilterDropdown  from "../../components/HM-filterDropdown/HM-filterDropdown.vue";
 	import data from '@/common/data.js';//筛选菜单数据
 	export default {
...	...	@@ -58,7 +58,7 @@
58	58	</template>
59	59
60	60	<script>
61		- import UniDrawer from "@/components/Uni-drawer/Uni-drawer.vue";
	61	+ import UniDrawer from "@/components/uni-drawer/uni-drawer.vue";
62	62	import HMfilterDropdown from "../../components/HM-filterDropdown/HM-filterDropdown.vue";
63	63	import data from '@/common/data.js';//筛选菜单数据
64	64	export default {
...	...