lhl 3 years ago
parent
commit
127bedab10
5 changed files with 270 additions and 24 deletions
  1. 1 1
      pages/product/product.vue
  2. 192 7
      pages/received/index.vue
  3. 77 16
      pages/shoping/list.vue
  4. BIN
      static/img/x.png
  5. BIN
      static/img/yue.png

+ 1 - 1
pages/product/product.vue

@@ -163,7 +163,7 @@
 				<view class="a-t">
 					<image :src="actionImage"></image>
 					<view class="right">
-						<view class="good-name clamp">{{goodsObjact.store_name}}999999999999999999999999999999999999</view>
+						<view class="good-name clamp">{{goodsObjact.store_name}}</view>
 						<text class="price">¥{{ actionPrice }}</text>
 						<!-- <text class="stock">库存:{{ goodsObjact.stock }}件</text> -->
 						<!-- <view class="selected" v-if="goodsType == 0">

+ 192 - 7
pages/received/index.vue

@@ -28,9 +28,21 @@
 					></tki-qrcodes>
 					<!-- <view class="setMoney" @click="openApp">
 						设置金额
-					</view> -->
-				</view>
-			</view>
+					</view> -->
+					<view class="setType flex" v-if="actionInd == 0" @click="showChooseType">
+							<image src="../../static/icon/jf.png" mode="" class="type-logo"></image>
+							<view class="type-wrapper">
+								<view class="type-tit">积分</view>
+								<view class="type-info">使用积分支付</view>
+							</view>
+							<view class="sele-wrap">
+								<image src="../../static/img/back.png" mode="" class="selecte-ic"></image>
+							</view>
+							
+						</view>
+					</view>
+			</view>
+			
 		</view>
 		<view class="bottomTab flex">
 			<view class="item1" @click="clickItem(0)" :class="{ action: actionInd == 0 }">
@@ -63,6 +75,42 @@
 			></uni-popup-dialog>
 		</uniPopup>
 		<uniPopup ref="popup2" type="message"><uni-popup-message type="success" message="支付成功" :duration="2000"></uni-popup-message></uniPopup>
+		<uniPopup ref="popupPay" type="bottom">
+			<view class="popup-box">
+				<view class="popup-pay">
+					<view class="paybox-top flex">
+						<view class="type">选择支付方式</view>
+						<view class="image" @click="close"><image src="../../static/img/x.png" mode="aspectFill"></image></view>
+					</view>
+					<view class="paybox-main flex">
+						<view class="zftype flex">
+							<image src="../../static/img/yue.png" mode="aspectFill"></image>
+							<view class="zf">余额支付</view>
+						</view>
+						<label class="radio" @click="changePayType(1)">
+							<radio style="transform:scale(0.7)" class="rad" value="" :checked="payType == 1" color="#5dbc7c"></radio>
+						</label>
+					</view>
+					<view class="paybox-main flex">
+						<view class="zftype flex">
+							<image src="../../static/icon/jf.png" mode="aspectFill"></image>
+							<view class="zf">积分支付</view>
+						</view>
+						<label class="radio1" @click="changePayType(2)"><radio style="transform:scale(0.7)" value="" :checked="payType == 2" color="#5dbc7c"></radio></label>
+					</view>
+					<view class="paybox-main flex">
+						<view class="zftype flex">
+							<image src="../../static/icon/xfq.png" mode="aspectFill"></image>
+							<view class="zf">消费券支付</view>
+						</view>
+						<label class="radio1" @click="changePayType(3)"><radio style="transform:scale(0.7)" value="" :checked="payType == 3" color="#5dbc7c"></radio></label>
+					</view>
+					<view class="paybtn">
+						确定切换
+					</view>
+				</view>
+			</view>
+		</uniPopup>
 	</view>
 </template>
 
@@ -118,7 +166,8 @@ export default {
 			getMoneyList: null, //收款记录倒计时倒计时
 			showSqr: true,
 			code: '', //保存扫码code
-			indexNum: 0 //默认没有商品
+			indexNum: 0, //默认没有商品
+			payType: 0,
 		};
 	},
 
@@ -420,6 +469,12 @@ export default {
 		},
 		openApp() {
 			let weixinObj = require('jweixin-module');
+		},
+		showChooseType() {
+			this.$refs.popupPay.open()
+		},
+		changePayType(index) {
+			this.payType = index
 		}
 	}
 };
@@ -476,13 +531,42 @@ $btHeight: 100rpx;
 }
 .erwema {
 	width: 686rpx;
-	height: 817rpx;
+	// height: 817rpx;
+	height: 900rpx;
 	background-color: #ffffff;
 	padding-top: 100rpx;
 	display: flex;
 	justify-content: center;
 	align-items: center;
-	margin: 0rpx auto;
+	margin: 0rpx auto;
+	.setType {
+		height: 130rpx;
+		justify-content: flex-start;
+		.type-wrapper {
+			text-align: left;
+			flex-grow: 1;
+		}
+		.type-logo {
+			width: 56rpx;
+			height: 54rpx;
+			flex-shrink: 0;
+			margin-right: 10rpx;
+		}
+		.sele-wrap {
+			width: 50rpx;
+			height: 100%;
+			flex-shrink: 0;
+			display: flex;
+			align-items: center;
+			.selecte-ic {
+				
+				justify-items: flex-end;
+				width: 13rpx;
+				height: 36rpx;
+				transform: rotate(-90deg);
+			}
+		}
+	}
 	.qrbox {
 		width: 500rpx;
 		text-align: center;
@@ -497,7 +581,8 @@ $btHeight: 100rpx;
 			font-size: $font-base;
 			color: $base-color;
 			margin-top: 20rpx;
-		}
+		}
+		
 	}
 }
 /deep/ .qrbox .img {
@@ -533,5 +618,105 @@ $btHeight: 100rpx;
 			opacity: 1;
 		}
 	}
+}
+.popup-box {
+	position: relative;
+	z-index: 100;
+	width: 100%;
+	height: auto;
+	background: #ffffff;
+	.popup-pay {
+		position: relative;
+		justify-content: space-between;
+		// padding: 0rpx 25rpx 32rpx 25rpx;
+		.paybox-top {
+			padding-top: 38rpx;
+			padding-left: 32rpx;
+			width: 100%;
+			.type {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+			}
+			.image {
+				padding-right: 24rpx;
+				padding-bottom: 10rpx;
+				image {
+					width: 16rpx;
+					height: 16rpx;
+				}
+			}
+		}
+		.paybox-main {
+			padding-left: 40rpx;
+			width: 100%;
+			margin-top: 54rpx;
+			margin-bottom: 54rpx;
+			.zftype {
+				padding-left: 5rpx;
+				image {
+					width: 38rpx;
+					height: 40rpx;
+				}
+				.zf {
+					padding-left: 18rpx;
+					font-size: 28rpx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #3f454b;
+				}
+			}
+		}
+		.paybtn {
+			width: 750rpx;
+			line-height: 93rpx;
+			background: #75BA82;
+
+			font-size: 32rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #FFFFFF;
+			text-align: center;
+		}
+	}
+	.buttom {
+		position: relative;
+		z-index: 100;
+		width: 100%;
+		height: 113rpx;
+		padding-top: 20rpx;
+		align-items: center;
+		.heji {
+			height: 100%;
+			width: 50%;
+			padding-left: 23rpx;
+			padding-top: 20rpx;
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #3f454b;
+			text {
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #ff0000;
+				.money {
+					font-size: 36rpx;
+				}
+			}
+		}
+		.zhifu {
+			width: 50%;
+			height: 92rpx;
+			background: #5dbc7c;
+			text-align: center;
+			line-height: 92rpx;
+			font-size: 32rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #ffffff;
+		}
+	}
 }
 </style>

+ 77 - 16
pages/shoping/list.vue

@@ -1,11 +1,23 @@
 <template>
 	<view class="content">
-		<view class="varHeight"></view>
+		<view class="varHeight"></view>
+		<view class="jg" style="height: 20rpx;"></view>
 		<block :key="ind" v-for="(lss, ind) in list">
-			<view class="goodsList-item flex" v-if="lss.show" @click="navProduct(lss)">
-				<image :src="lss.logo" lazy-load mode="scaleToFill"></image>
-				<view class="goodsList-content">
-					<view class="title clamp">
+			<view class="goodsList-item" v-if="lss.show" @click="navProduct(lss)">
+				<view class="info-top flex">
+					<image :src="lss.logo" lazy-load mode="scaleToFill"></image>
+					<view class="store-name clamp2">
+						{{lss.title}}
+					</view>
+				</view>
+				<view class="tag">
+					门店
+				</view>
+				<view class="goodsList-content">
+					<view class="info-tit">地区:<text class="info-val">{{lss.address}}</text></view>
+					<view class="info-tit">电话:<text class="info-val">{{lss.tel }}</text></view>
+					<view class="info-tit">地址:<text class="info-val">{{lss.detailed_address}}</text></view>
+					<!-- <view class="title clamp">
 						<text>{{ lss.title }}</text>
 					</view>
 					<view class="slider flex">
@@ -18,10 +30,11 @@
 							</view>
 						</view>
 						<view class="cart seckill-action">进入店铺</view>
-					</view>
+					</view> -->
 				</view>
 			</view>
-		</block>
+		</block>
+		<view class="jg" style="height: 20rpx;"></view>
 	</view>
 </template>
 <script>
@@ -102,14 +115,50 @@ page,
 }
 $slider-color: #fe9398; //滑块左侧颜色
 .goodsList-item {
-	background-color: #ffffff;
-	padding: 30rpx;
-	border-bottom: 1px solid $border-color-light;
+	// background-color: #ffffff;
+	// padding: 30rpx;
+	// border-bottom: 1px solid $border-color-light;
+	margin: 0 auto 20rpx;
+	width: 710rpx;
+	height: 231rpx;
+	padding: 25rpx 20rpx;
+	background: #FFFFFF;
+	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+	border-radius: 10rpx;
+	position: relative;
+	.tag {
+		width: 60rpx;
+		line-height: 40rpx;
+		background: #FF6F0F;
+		border-radius: 5rpx;
+		font-size: 24rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #FFFFFF;
+		text-align: center;
+		position: absolute;
+		top: 25rpx;
+		right: 20rpx;
+	}
+	.info-top {
+		justify-content: flex-start;
+		.store-name {
+			max-width: 500rpx;
+			font-size: 32rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #333333;
+			padding-left: 11rpx;
+		}
+	}
 	image {
 		flex-shrink: 0;
-		border-radius: $border-radius-sm;
-		height: 180rpx;
-		width: 180rpx;
+		// border-radius: $border-radius-sm;
+		// height: 180rpx;
+		// width: 180rpx;
+		width: 65rpx;
+		height: 65rpx;
+		border-radius: 50%;
 	}
 	.slider {
 		margin-top: 15rpx;
@@ -132,10 +181,22 @@ $slider-color: #fe9398; //滑块左侧颜色
 		}
 	}
 	.goodsList-content {
-		margin-left: 20rpx;
+		// margin-left: 20rpx;
 		flex-grow: 1;
-		height: 180rpx;
-		position: relative;
+		// height: 180rpx;
+		position: relative;
+		padding-top: 20rpx;
+		.info-tit {
+			line-height: 1.5;
+			font-size: 24rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #333333;
+			.info-val {
+				font-weight: 500;
+				
+			}
+		}
 		.title {
 			font-size: $font-base;
 			color: $font-color-dark;

BIN
static/img/x.png


BIN
static/img/yue.png