Merge branch 'master' of http://175.178.51.79:3000/Augcl/popularize-front

components/cart/CardList.vue

@@ -0,0 +1,34 @@
+<template>
+   <div class='cardList'>r435345</div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+
+        };
+    },
+    components: {
+
+    },
+    computed: {
+
+    },
+    watch: {
+
+    },
+    created() {
+
+    },
+    mounted() {
+
+    },
+    methods: {
+
+    }
+};
+</script>
+
+<style scoped lang="stylus">
+</style>

pages.json

@@ -30,7 +30,8 @@
 			"path": "pages/index/cart",
 			"style": {
 				"navigationBarTitleText": "",
-				"enablePullDownRefresh": true
+				"navigationStyle": "custom" ,
+				"navigationBarTextStyle": "white"
 			}
 		},
 		{

pages/index/cart.vue

@@ -1,49 +1,80 @@
 <template>
 	<view class="page">
-		<navbar title="我的订单"/>
-
-		
-
+		<view class="head-box"></view>
+		<uv-navbar title="我的订单" bgColor="transparent" height="100rpx"></uv-navbar>
+		<view class="content">
+			<uv-tabs 
+				:scrollable="false"
+				@click= "tabs"
+				:list="list" 
+				lineWidth="40" 
+				:lineColor="`url(${lineBg}) 100% 100%`"
+				:activeStyle="{
+					color: '#FD5C5C',
+					fontWeight: 'bold',
+					transform: 'scale(1.05)'
+				}"
+				:inactiveStyle="{
+					color: '#999',
+					transform: 'scale(1)'
+				}" 
+				itemStyle="padding-left: 15px; padding-right: 15px; height: 44px;"
+			></uv-tabs>
+			<view class="container">
+				<!-- <CardList /> -->
+			</view>
+		</view>
 		<tabber select="cart" />
 	</view>
 </template>
 
 <script>
 	import tabber from '@/components/base/tabbar.vue'
+	// import CardList from '@/components/card/CardList.vue'
 	export default {
-		components: {
+		components:{
 			tabber,
+            // CardList
 		},
 		data() {
 			return {
-				value : 0,
-				checkboxValue : [],
-				options: [
-					{
-						text: '删除',
-						style: {
-							backgroundColor: '#f40'
-						}
-					}, 
+				list: [
+					{ id: 0, name: '全部' },
+					{ id: 1, name: '待参加' },
+					{ id: 2, name: '已完成' },
+					{ id: 3, name: '已取消' },
 				],
-				mixinsListApi : 'getCartPageList',
+				lineBg: require('@/static/image/cart/tabIcon.png')
 			}
-		},
-		computed: {
-			
 		},
 		methods: {
-			
+			tabs(val) {
+				console.log(val);
+			}
 		}
 	}
 </script>
 
+<style lang="scss">
+	page {
+		background-color: #060504;
+	}
+</style>
 <style scoped lang="scss">
 	.page {
-		padding-bottom: 200rpx;
-		/deep/ .uv-swipe-action{
+		.head-box {
+			background: url('@/static/image/nav-bg.png') no-repeat;
+			background-size: 100% 100%;
 			width: 100%;
+			height: 534rpx;
+			position: absolute;
+		}
+		/deep/.uv-navbar__content__title {
+			color: #fff;
+		}
+		.content {
+			color: #fff;
+			padding-top: calc(var(--status-bar-height) + 100rpx);
 		}
 	}
-
 </style>