Merge branch 'master' of http://140.143.224.240:8100/hooloo/mp/user

components/tabBar/tabBar.vue

@@ -7,28 +7,27 @@
 
 <script>
 export default {
-    data() {
-        return{
+  data() {
+    return {
 
-        }
-    },
-    props:['selectedTabbar'],
-		computed:{
-			list(){
-				// tabbar List
-				return this.$store.state.list;
-			}
-		},
-    methods:{
+    }
+  },
+  props: ['selectedTabbar'],
+  computed: {
+    list() {
+      // tabbar List
+      return this.$store.state.list;
+    }
+  },
+  methods: {
     //点击tab
     beforeSwitch(index) {
-        uni.switchTab({url:this.list[index].pagePath});
-        return true;
-    }
+      uni.switchTab({ url: this.list[index].pagePath });
+      return true;
     }
+  }
 }
 </script>
 
 <style>
-
 </style>
\ No newline at end of file

package-lock.json

 {
-  "name": "hooloo",
-  "lockfileVersion": 2,
   "requires": true,
-  "packages": {
-    "": {
-      "dependencies": {
-        "uview-ui": "^2.0.31"
-      }
-    },
-    "node_modules/uview-ui": {
-      "version": "2.0.31",
-      "resolved": "https://registry.npmmirror.com/uview-ui/-/uview-ui-2.0.31.tgz",
-      "integrity": "sha512-I/0fGuvtiKHH/mBb864SGYk+SJ7WaF32tsBgYgeBOsxlUp+Th+Ac2tgz2cTvsQJl6eZYWsKZ3ixiSXCAcxZ8Sw==",
-      "engines": {
-        "HBuilderX": "^3.1.0"
-      }
-    }
-  },
+  "lockfileVersion": 1,
   "dependencies": {
     "uview-ui": {
       "version": "2.0.31",

pages/mine/mine.vue

 <template>
 	<view>
+		<view class="menu-banner">
+			<view class="log">
+				<image class="logImg" src="/static/imgs/hooloo.png"></image>
+				<view class="logText">未 来 咖 啡</view>
+			</view>
+			<image src="../../static/imgs/banner.png"></image>
+
+		</view>
 		<tabBar :selectedTabbar="selectedTabbar"></tabBar>
 	</view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				selectedTabbar:2,//选中的tab
-			}
-		},
-		computed:{
-			
-		},
-		methods: {
+export default {
+	data() {
+		return {
+			selectedTabbar: 2,//选中的tab
 		}
+	},
+	computed: {
+
+	},
+	methods: {
 	}
+}
 </script>
 
-<style>
+<style lang="scss" scoped>
+.menu-box {}
+
+.menu-banner {
+	height: 376rpx;
+	position: relative;
+
+	.log {
+		position: absolute;
+
+		top: 100rpx;
+		left: 30rpx;
+
+		.logImg {
+			width: 312rpx;
+			height: 72rpx;
+		}
+
+		.logText {
+			font-size: 42rpx;
+			font-family: PingFangSC-Medium, PingFang SC;
+			font-weight: 600;
+			color: #FFFFFF;
+
+		}
+	}
+
+	image {
+		width: 100%;
+		height: 376rpx;
+
+
+	}
 
-</style>
+}
+</style>
\ No newline at end of file