Browse Source

Merge branch 'test' of git.echepei.com:sailun/sailun-tbr-web into test

caojunjie 4 years ago
parent
commit
e64e20fd15

+ 7 - 1
pages.json

@@ -92,6 +92,11 @@
 					"navigationBarTitleText": "积分商城"
 				}
 			}, {
+				"path": "shopping/integral_mall_confirmorder",
+				"style": {
+					"navigationBarTitleText": "订单确认"
+				}
+			}, {
 				"path": "shopping/inline_shop",
 				"style": {
 					"navigationStyle": "custom", // 隐藏系统导航栏
@@ -106,7 +111,8 @@
 			,{
 			    "path" : "my-stock/my-stock",
 			    "style" : {
-					"navigationBarTitleText": "我的库存"
+					"navigationStyle": "custom", // 隐藏系统导航栏
+					"navigationBarTextStyle": "white"
 				}
 			}
 		]

+ 78 - 5
pages/home/my-stock/my-stock.vue

@@ -1,6 +1,26 @@
 <template>
-	<view>
+	<view >
 		<!-- 我的库存 -->
+		<view class="content-top">
+			<u-navbar :background="background" back-icon-color="#ffffff" is-fixed>
+				<u-search placeholder="请输入轮胎规格" :show-action="false" v-model="keyword" style="margin-right: 26rpx;" @change="handleSearch"></u-search>
+			</u-navbar>
+			<u-tabs ref="tabs" :list="list" bg-color="#0094FE" active-color="#ffffff" inactive-color="#ffffff" font-size="30" :current="current" @change="handleFilterBrand"></u-tabs>
+		</view>
+		<view class="content-center">
+			<view class="list-row u-flex list-title">
+				<view class="list-left">轮胎规格</view>
+				<view class="list-right">库存</view>
+			</view>
+			<view class="list-row u-flex">
+				<view class="list-left">赛轮 12R22.5 152/149K 18PR S838</view>
+				<view class="list-right">160</view>
+			</view>
+			<view class="list-row u-flex">
+				<view class="list-left">赛轮 12R22.5 152/149K 18PR S838</view>
+				<view class="list-right">160</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -8,15 +28,68 @@
 	export default {
 		data() {
 			return {
-				
+				background: {
+					backgroundColor: "#0291FD",
+				},
+				keyword: "",
+				current: 0,
+				list: [{
+					name: "全部"
+				},{
+					name: "黑骑士"
+				},{
+					name: "路极"
+				},{
+					name: "黑盾"
+				},{
+					name: "赛轮"
+				}]
 			}
 		},
 		methods: {
-			
+			handleSearch: function(v){
+				console.log(v)
+			},
+			handleFilterBrand: function(v2){
+				this.current = v2
+				console.log(arguments);
+				console.log(v2)
+			}
 		}
 	}
 </script>
 
-<style>
-
+<style lang="scss" scoped>
+	.content-top{
+		background-color: #0094FE;
+		padding-bottom: 119rpx;
+	}
+	.content-center{
+		width: 712rpx;
+		margin: -106rpx auto 0 auto;
+		border-radius: 20rpx;
+		background-color: #FFFFFF;
+		height: 335rpx;
+		padding: 26rpx;
+		.list-row{
+			justify-content: space-between;
+			border-bottom: 1px solid #E8E8E8;
+			padding: 32rpx 0;
+			.list-right{
+				color: #149EE2;
+				text-decoration: underline;
+			}
+		}
+		.list-row.list-title{
+			padding-top: 0;
+			font-weight: 600;
+			.list-right{
+				color: #4D4D4D;
+				font-weight: 400;
+				text-decoration: none;
+			}
+		}
+		
+	}
+	
 </style>

+ 15 - 1
pages/home/shopping/integral_mall.vue

@@ -25,13 +25,14 @@
 							<view class="price">
 								{{ item.price }}积分
 							</view>
-							<view class="exchange">立即兑换</view>
+							<view class="exchange">加入购物车</view>
 						</view>
 					</view>
 				</view>
 			</view>
 			<u-loadmore :status="loadStatus" bgColor="#f2f2f2"></u-loadmore>
 		</view>
+		<view id="shopping-car"><u-icon :custom-style="iconCustomStyleCarFixed" size="48" name="car" color="#9999999"></u-icon><u-badge :offset="[-8,-8]" :count="goodsCounts" type="error"></u-badge></view>
 		<u-popup v-model="showFilterPopup" mode="right" width="60%">
 			<view class="filter-title">分类</view>
 			<block v-for="(item,index) in tabbar" :key="index">
@@ -71,6 +72,13 @@
 				}],
 				keyword: "",
 				inputCustomStyle: {},
+				iconCustomStyleCarFixed: {
+					background: "#ffffff",
+					padding: "16rpx",
+					borderRadius: "50%",
+					boxShadow: "0px 1px 12px 0px rgba(116, 116, 116, 0.6)"
+				},
+				goodsCounts: 100,
 				showFilterPopup: false,
 				tabbar: [{
 					"name": "品牌",
@@ -370,4 +378,10 @@
 			}
 		}
 	}
+	#shopping-car{
+		position: fixed;
+		z-index: 9999;
+		right: 26rpx;
+		bottom: 300rpx;
+	}
 </style>

+ 384 - 0
pages/home/shopping/integral_mall_confirmorder.vue

@@ -0,0 +1,384 @@
+<template>
+	<view>
+		<!-- 确认订单 -->
+		<view class="content-top">
+			<view class="addressInfo" >
+				<view class="top">
+					<view class="name">{{ addressInfo.name }}</view>
+					<view class="phone">{{ addressInfo.phone }}</view>
+				<!-- 	<view class="tag">
+						<text v-for="(item, index) in addressInfo.tag" :key="index" :class="{red:item.tagText=='默认'}">{{ item.tagText }}</text>
+					</view> -->
+				</view>
+				<view class="bottom">
+					{{addressInfo.site}}
+					<u-icon name="edit-pen" :size="40" color="#999999" @click="handleSelecAddress"></u-icon>
+				</view>
+			</view>
+		</view>
+		<view class="content-center">
+			<view class="order">
+				<view class="item" v-for="(item, index) in list" :key="index">
+					<view class="left"><image :src="item.image" mode="aspectFill"></image></view>
+					<view class="content">
+						<view class="title u-line-2">{{ item.title }}</view>
+						<view class="type">{{ item.type }}</view>
+						<!-- <view class="delivery-time">发货时间 {{ item.deliveryTime }}</view> -->
+						<view class="price-row">
+							<view class="count-text">
+								数量
+							</view>
+							<view class="count">
+								×{{ item.count }}
+							</view>
+						</view>
+						<view class="price">
+							{{ item.price }}积分
+						</view>
+						
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="navigation">
+			<view class="left">
+				<view class="item">
+					<view class="total">合计:<text style="color: #ff7900;">2条</text></view>
+				</view>
+			</view>
+			<view class="right">
+				<view class="buy btn u-line-1" @click="handleSubmit">立即兑换</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				addressInfo: {
+					id: 1,
+					name: '游学中华',
+					phone: '18323455233',
+					tag: [
+						{
+							tagText: '默认'
+						},
+						{
+							tagText: '家'
+						}
+					],
+					site: '广东省深圳市宝安区 自由路66号'
+				},
+				list: [{
+						price: 35,
+						title: '175/70R14 88T XL SH08 BGSL',
+						count: '100',
+						image: 'https://img12.360buyimg.com/n7/jfs/t16642/126/2693663818/450163/6879e8ce/5b06d93bN6305bd94.png',
+					},
+					{
+						price: 75,
+						title: '175/70R14 88T XL SH08 BGSL',
+						count: '100',
+						image: 'https://img12.360buyimg.com/n7/jfs/t1/47645/22/6120/140457/5d3d17deEec9f8e8d/3687ff03ca89b48c.jpg',
+					},
+					{
+						price: 385,
+						title: '175/70R14 88T XL SH08 BGSL',
+						count: '100',
+						image: 'https://img11.360buyimg.com/n7/jfs/t1/88990/24/4208/105799/5de4c6e9E24bc09d0/f810effb14c9c13a.jpg',
+					},
+					{
+						price: 784,
+						title: '175/70R14 88T XL SH08 BGSL',
+						count: '100',
+						image: 'https://img12.360buyimg.com/n7/jfs/t1/93698/23/4500/114562/5de713dfEfc997085/e8deaa979909851d.jpg',
+					},
+					{
+						price: 7891,
+						title: '175/70R14 88T XL SH08 BGSL',
+						count: '100',
+						image: 'https://img11.360buyimg.com/n7/jfs/t16642/126/2693663818/450163/6879e8ce/5b06d93bN6305bd94.png',
+					},
+					{
+						price: 2341,
+						count: '100',
+						title: '175/70R14 88T XL SH08 BGSL',
+						image: 'https://img10.360buyimg.com/n7/jfs/t1/68753/35/2229/118427/5d089fb7Ee5b93887/2e3bbc7fec247fdc.jpg',
+					},
+					{
+						price: 661,
+						count: '100',
+						title: '175/70R14 88T XL SH08 BGSL',
+						image: 'https://img10.360buyimg.com/n7/jfs/t1/68753/35/2229/118427/5d089fb7Ee5b93887/2e3bbc7fec247fdc.jpg',
+					},
+					{
+						price: 1654,
+						title: '175/70R14 88T XL SH08 BGSL',
+						count: '100',
+						image: 'https://img10.360buyimg.com/n7/jfs/t1/68753/35/2229/118427/5d089fb7Ee5b93887/2e3bbc7fec247fdc.jpg',
+					},
+					{
+						price: 1678,
+						title: '175/70R14 88T XL SH08 BGSL',
+						count: '100',
+						image: 'https://img10.360buyimg.com/n7/jfs/t1/68753/35/2229/118427/5d089fb7Ee5b93887/2e3bbc7fec247fdc.jpg',
+					},
+					{
+						price: 924,
+						title: '175/70R14 88T XL SH08 BGSL',
+						count: '100',
+						image: 'https://img10.360buyimg.com/n7/jfs/t1/68753/35/2229/118427/5d089fb7Ee5b93887/2e3bbc7fec247fdc.jpg',
+					},
+					{
+						price: 8243,
+						title: '175/70R14 88T XL SH08 BGSL',
+						count: '100',
+						image: 'https://img10.360buyimg.com/n7/jfs/t1/68753/35/2229/118427/5d089fb7Ee5b93887/2e3bbc7fec247fdc.jpg',
+					},
+				]
+			}
+		},
+		methods: {
+			handleSubmit: function(){
+				
+			},
+			handleSelecAddress: function(){
+				uni.navigateTo({
+					url: "/pages/me/address"
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content-top{
+		background-color: #0094FE;
+		padding-bottom: 119rpx;
+		.addressInfo {
+			padding: 40rpx 20rpx;
+			background-color: #FFFFFF;
+			width: 712rpx;
+			margin: 0 auto;
+			border-radius: 20rpx;
+			.top {
+				display: flex;
+				font-weight: bold;
+				font-size: 34rpx;
+				.phone {
+					margin-left: 60rpx;
+				}
+				.tag {
+					display: flex;
+					font-weight: normal;
+					align-items: center;
+					text {
+						display: block;
+						width: 60rpx;
+						height: 34rpx;
+						line-height: 34rpx;
+						color: #ffffff;
+						font-size: 20rpx;
+						border-radius: 6rpx;
+						text-align: center;
+						margin-left: 30rpx;
+						background-color:rgb(49, 145, 253);
+					}
+					.red{
+						background-color:red
+					}
+				}
+			}
+			.bottom {
+				display: flex;
+				margin-top: 20rpx;
+				font-size: 28rpx;
+				justify-content: space-between;
+				color: #999999;
+			}
+		}
+	}
+	.content-center{
+		width: 712rpx;
+		margin: -106rpx auto 0 auto;
+		border-radius: 20rpx;
+		background-color: #FFFFFF;
+		padding: 26rpx;
+		.order {
+			background-color: #ffffff;
+			// margin: 20rpx auto;
+			border-radius: 20rpx;
+			box-sizing: border-box;
+			padding: 20rpx;
+			font-size: 28rpx;
+			.top {
+				display: flex;
+				justify-content: space-between;
+				.left {
+					display: flex;
+					align-items: center;
+					.store {
+						margin: 0 10rpx;
+						font-size: 32rpx;
+						font-weight: bold;
+					}
+				}
+				.right {
+					color: $u-type-warning-dark;
+				}
+			}
+			.item {
+				display: flex;
+				margin: 20rpx 0 0;
+				.left {
+					margin-right: 20rpx;
+					image {
+						width: 200rpx;
+						height: 200rpx;
+						border-radius: 10rpx;
+					}
+				}
+				.content {
+					.title {
+						font-size: 28rpx;
+						line-height: 50rpx;
+					}
+					.type {
+						margin: 10rpx 0;
+						font-size: 24rpx;
+						color: $u-tips-color;
+					}
+					.delivery-time {
+						color: #e5d001;
+						font-size: 24rpx;
+					}
+					.price-row{
+						display: flex;
+						justify-content: space-between;
+						margin: 10rpx 0;
+						font-size: 26rpx;
+						.price{
+							color: #FF0000;
+						}
+						.exchange{
+							background: #0094FE;
+							color: #FFFFFF;
+							padding: 4rpx 16rpx;
+							line-height: 1.5;
+						},
+						.count-text{
+							color: #999999;
+							font-size: 18rpx;
+						}
+						.count{
+							color: #999999;
+							font-size: 18rpx;
+						}
+					}
+				}
+				.right {
+					margin-left: 10rpx;
+					padding-top: 20rpx;
+					text-align: right;
+					.decimal {
+						font-size: 24rpx;
+						margin-top: 4rpx;
+					}
+					.number {
+						color: $u-tips-color;
+						font-size: 24rpx;
+					}
+				}
+			}
+			.total {
+				margin-top: 20rpx;
+				text-align: right;
+				font-size: 24rpx;
+				.total-price {
+					font-size: 32rpx;
+				}
+			}
+			.bottom {
+				display: flex;
+				margin-top: 40rpx;
+				padding: 0 10rpx;
+				justify-content: space-between;
+				align-items: center;
+				.btn {
+					line-height: 52rpx;
+					width: 160rpx;
+					border-radius: 26rpx;
+					border: 2rpx solid $u-border-color;
+					font-size: 26rpx;
+					text-align: center;
+					color: $u-type-info-dark;
+				}
+				.evaluate {
+					color: $u-type-warning-dark;
+					border-color: $u-type-warning-dark;
+				}
+			}
+		}
+	}
+.navigation {
+		display: flex;
+		width: 100%;
+		justify-content: space-between;
+		margin-top: 100rpx;
+		border: solid 2rpx #f2f2f2;
+		background-color: #ffffff;
+		padding: 16rpx 0;
+		position: fixed;
+		bottom: 0;
+		z-index: 100;
+		.left {
+			display: flex;
+			// font-size: 20rpx;
+
+			.item {
+				margin: 0 30rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				.total{
+					font: 34rpx;
+				}	
+				&.car {
+					text-align: center;
+					position: relative;
+
+					.car-num {
+						position: absolute;
+						top: -10rpx;
+						right: -10rpx;
+					}
+				}
+			}
+		}
+
+		.right {
+			display: flex;
+			font-size: 28rpx;
+			align-items: center;
+
+			.btn {
+				line-height: 66rpx;
+				padding: 0 30rpx;
+				border-radius: 36rpx;
+				color: #ffffff;
+			}
+
+			.cart {
+				background-color: #ed3f14;
+				margin-right: 30rpx;
+			}
+
+			.buy {
+				margin: 0 16rpx;
+				background-color: #ff7900;
+			}
+		}
+	}
+</style>