zyx il y a 1 an
Parent
commit
743617df69
6 fichiers modifiés avec 122 ajouts et 125 suppressions
  1. 2 3
      pages/index/index.vue
  2. 76 97
      pages/money/success.vue
  3. 6 7
      pages/share/share.vue
  4. 29 11
      pages/user/jiance.vue
  5. 9 7
      pages/user/release.vue
  6. BIN
      static/money/success.png

+ 2 - 3
pages/index/index.vue

@@ -347,6 +347,7 @@
 		background: #FFFFFF;
 		border-radius: 10rpx;
 		margin: 25rpx;
+		align-items: stretch;
 		.list-iamg {
 			width: 235rpx;
 			height: 235rpx;
@@ -356,6 +357,7 @@
 			display: flex;
 			flex-direction: column;
 			justify-content: space-between;
+			flex-grow: 1;
 			.list-title {
 				font-size: 32rpx;
 				font-weight: bold;
@@ -452,9 +454,6 @@
 			.comfirm-box {
 				margin-top: 52rpx;
 				display: flex;
-				// margin-bottom: 32rpx;
-
-				// justify-content: space-around;
 				.cancel {
 					display: flex;
 					align-items: center;

+ 76 - 97
pages/money/success.vue

@@ -1,114 +1,93 @@
 <template>
-	<view class="container">
-		<view class="re-succ-box">
-			<image class="re-succ-img" src="../../static/img/success.png"></image>
-			<view class="re-succ-tit">{{type ==2? '挂售成功' : '提交成功'}}</view>
-			<view class="btn-box flex">
-				<view class="re-succ-btn" @click="goBack()">返回首页</view>
-				<view class="go-btn " @click="go()">{{ type == 2? '返回挂售' : '返回支付'}}</view>
-			</view>
+	<view class="content">
+		<!-- <text class="success-icon iconfont iconroundcheck"></text>
+		<text class="tit">支付成功</text> -->
+		<image class="success" src="../../static/money/success.png" mode=""></image>
+		<text class="tit">订单支付成功</text>
+		<view class="btn-group">
+			<!-- <navigator :url="'/pages/order/orderDetail?id='+orderId" open-type="redirect" class="mix-btn">查看订单</navigator> -->
+			<!-- <navigator url="/pages/index/index" open-type="switchTab" class="mix-btn hollow">返回首页</navigator> -->
+			<navigator url="/pages/index/index" open-type="switchTab" class="btn">返回首页</navigator>
 		</view>
 	</view>
 </template>
 
 <script>
-export default {
-	data() {
-		return{
-			type:1,
-		}
-	},
-	onLoad(option) {
-		if(option.type) {
-			this.type = option.type
-		}
-	},
-	methods: {
-		goBack() {
-			uni.switchTab({
-				url: '/pages/index/index'
-			})
-		},
-		go() {
-			let url
-			if(this.type == 1){
-				url = '/pages/order/order?state=1'
-				uni.navigateTo({
-					url: url
-				})
-			}else if(this.type == 2) {
-				url = '/pages/order/order?state=3'
-				uni.switchTab({
-					url
-				})
+	export default {
+		data() {
+			return {
+				orderId:''
 			}
+		},
+		onLoad(opt) {
+			// 保存订单号
+			this.orderId = opt.orderid;
+		},
+		methods: {
 			
 		}
 	}
-}
 </script>
 
-<style lang="scss">
-page {
-	height: 100%;
-}
-.container {
-	height: 100%;
-	background: #FFFFFF;
-	.line-top {
-		width: 750rpx;
-		height: 20rpx;
-		background: #F5F5F5;
-	}
-	.re-succ-box {
-		padding-top: 170rpx;
+<style lang='scss'>
+	.content{
 		display: flex;
 		flex-direction: column;
+		justify-content: center;
 		align-items: center;
-		.re-succ-img {
-			margin-left: -30rpx;
-			width: 362rpx;
-			height: 267rpx;
-			display: block;
-		}
-		.re-succ-tit {
-			margin-top: -26rpx;
-			font-size: 40rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #333333;
-		}
-		.btn-box{
-			width: 750rpx;
-			margin-top: 80rpx;
-			padding: 0 50rpx;
-		}
-		.re-succ-btn {
-			width: 300rpx;
-			height: 80rpx;
-			background: linear-gradient(180deg, #FD4646, #FF3535);
-			border-radius: 40rpx;
-			font-size: 36rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #FFFFFF;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-		}
-		.go-btn {
-			width: 300rpx;
-			height: 80rpx;
-			border: 1px solid #FD4646;
-			border-radius: 40rpx;
-			font-size: 36rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #FD4646;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-		}
 	}
-}
+	
+	.success {
+		width: 302rpx;
+		height: 302rpx;
+		margin-top: 100rpx;
+	}
+	.tit{
+		font-size: 38upx;
+		color: #303133;
+		margin-top: 30rpx;
+	}
+	
+	.btn {
+		margin-top: 80upx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 300upx;
+		height: 80upx;
+		font-size: $font-lg;
+		color: #01A6A8 ;
+		background-color: #f8f8f8;
+		border-radius: 10upx;
+		border: 1px solid #01A6A8;
+	}
+	/* .success-icon{
+		font-size: 160upx;
+		color: #5dbc7c;
+		margin-top: 100upx;
+	}
+	.tit{
+		font-size: 38upx;
+		color: #303133;
+	}
+	.btn-group{
+		padding-top: 100upx;
+	} */
+	/* .mix-btn {
+		margin-top: 30upx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 600upx;
+		height: 80upx;
+		font-size: $font-lg;
+		color: #fff;
+		background-color: $base-color;
+		border-radius: 10upx;
+		&.hollow{
+			background: #fff;
+			color: #303133;
+			border: 1px solid #ccc;
+		}
+	} */
 </style>

+ 6 - 7
pages/share/share.vue

@@ -82,7 +82,7 @@
 		height: 64rpx;
 		position: fixed;
 		bottom: 120rpx;
-		right: 20rpx;
+		right: 0rpx;
 		color: #FFFFFF;
 		font-size: 28rpx;
 		background-color: #FF6F0F;
@@ -91,10 +91,11 @@
 	}
 	
 	.main {
-		margin-top: 20rpx;
+		margin: 20rpx;
 		padding: 35rpx 20rpx 24rpx;
 		background: #ffffff;
-
+		width: 702rpx;
+		border-radius: 30rpx;
 		image {
 			width: 100%;
 			height: 100%;
@@ -121,7 +122,6 @@
 				.main-user-time {
 					margin-top: 14rpx;
 					font-size: 21rpx;
-					font-family: PingFang SC;
 					font-weight: 500;
 					color: #666666;
 				}
@@ -142,17 +142,16 @@
 		.text {
 			word-wrap: break-word;
 			word-break: normal;
-			margin: 20rpx 55rpx 20rpx 55rpx;
+			margin: 20rpx 0rpx;
 			font-size: 28rpx;
 			font-weight: 500;
 			color: #666666;
 		}
 		.fh-im {
-			margin: auto 42rpx;
 			.fh-img {
+				margin: 10rpx 21rpx 0rpx 0rpx ;
 				width: 200rpx;
 				height: 200rpx;
-				padding: 10rpx;
 			}
 		}
 		

+ 29 - 11
pages/user/jiance.vue

@@ -1,12 +1,11 @@
 <template>
 	<view class="container">
-		<view class="jc">
-			<view class="list">
-				<image class="xc" src="../../static/img/xc.png" mode=""></image>
-				<image class="xc" src="../../static/img/xc.png" mode=""></image>
-				<image class="xc" src="../../static/img/xc.png" mode=""></image>
-				<image class="xc" src="../../static/img/xc.png" mode=""></image>
-			</view>
+		<div class="jc" v-for="item in 8" :key="item">
+			<image class="xc" src="../../static/img/xc.png" mode="aspectFit"></image>
+			<checkbox class="xz"></checkbox>
+		</div>
+		<view class="sc" @click="chooseImage">
+			<button>删除</button>
 		</view>
 	</view>
 </template>
@@ -14,29 +13,48 @@
 export default {
 		data() {
 			return {
-				
+				deleteList:[]
 			}
 		},
 		onShow() {
 			
 		},
 		methods: {
-			
+			chooseImage() {
+				
+			}
 		}
 	};
 </script>
 <style lang="scss">
 	.container {
-		min-height: 1500rpx;
+		min-height: 100%;
 		background-color: #fff;
+		position: relative;
+		display: flex;
+		flex-wrap: wrap;
 		.jc {
-			margin-top: 20rpx;
 			background-color: #fff;
+			position: relative;
+			display: flex;
 			.xc {
 				width: 360rpx;
 				height: 477rpx;
 				padding:  20rpx 10rpx 10rpx 20rpx;
 			}
+			.xz {
+				position: absolute;
+				top: 200px;
+				right: 19px;
+				// height: 30px;
+			}
+		}
+		.sc {
+			width: 750rpx;
+			height: 100rpx;
+			position: fixed;
+			bottom: 0rpx;
+			background-color: #fff;
 		}
 	}
 </style>

+ 9 - 7
pages/user/release.vue

@@ -51,7 +51,7 @@
 		data() {
 			return {
 				lists: [
-					{nicheng: 'cccc', time: '202311.21', zf: '4562', content: '风平乐樱桃姜黄复合肽压片糖果套盒,轻松饱腹降'},
+					{nicheng: 'cccc', time: '202311.21', zf: '456212', content: '风平乐樱桃姜黄复合肽压片糖果套盒,轻松饱腹降'},
 					{nicheng: 'bbbb', time: '202311.21', zf: '4562', content: '风平乐樱桃姜黄复合肽压片糖果套盒,轻松饱腹降'},
 					{nicheng: 'aaaa', time: '202311.21', zf: '4562', content: '风平乐樱桃姜黄复合肽压片糖果套盒,轻松饱腹降'}
 				],
@@ -86,10 +86,11 @@
 	}
 	
 	.main {
-		margin-top: 20rpx;
+		margin: 20rpx;
 		padding: 35rpx 20rpx 24rpx;
 		background: #ffffff;
-
+		width: 702rpx;
+		border-radius: 30rpx;
 		image {
 			width: 100%;
 			height: 100%;
@@ -137,22 +138,23 @@
 		.text {
 			word-wrap: break-word;
 			word-break: normal;
-			margin: 20rpx 55rpx 20rpx 55rpx;
+			margin: 20rpx 0rpx;
 			font-size: 28rpx;
 			font-weight: 500;
 			color: #666666;
 		}
 		.fh-im {
-			margin: auto 42rpx;
 			.fh-img {
+				// margin: auto 10rpx;
+				margin: 10rpx 21rpx 0rpx 0rpx ;
 				width: 200rpx;
 				height: 200rpx;
-				padding: 10rpx;
+				// padding: 10rpx;
 			}
 		}
 		.bot {
 			.del {
-				margin-left: 590rpx;
+				margin-left: 540rpx;
 				width: 24rpx;
 				height: 28rpx;
 			}

BIN
static/money/success.png