2312970463@qq.com %!s(int64=3) %!d(string=hai) anos
pai
achega
1528e9aa35

+ 2 - 1
pages/money/pay.vue

@@ -77,7 +77,8 @@ export default {
 				orderkey: this.orderKey,
 				couponId: prepage.couponChecked.id, //优惠券编号
 				addressId: prepage.addressData.id, //地址编号
-				useIntegral: prepage.checkedPoints ? 1 : 0
+				useIntegral: prepage.checkedPoints ? 1 : 0,
+				is_drop: 1
 			}).then(({ data }) => {
 				// 获取支付金额
 				this.money = data.result.pay_price;

+ 2 - 1
pages/order/createOrder.vue

@@ -284,7 +284,8 @@ export default {
 				orderkey: this.orderKey,
 				useIntegral: this.checkedPoints ? 1 : 0, //是否积分抵扣
 				couponId: this.couponChecked.id, //优惠券编号
-				addressId: this.addressData.id //地址编号
+				addressId: this.addressData.id ,//地址编号
+				is_drop: 1
 			})
 				.then(({ data }) => {
 					console.log(data,'111');

+ 2 - 1
pages/product/product.vue

@@ -443,7 +443,8 @@ export default {
 				cartNum: obj.goodsNumber, //商品数量
 				new: 1,
 				productId: obj.goodsid, //商品编号
-				uniqueId: obj.uniqueId
+				uniqueId: obj.uniqueId,
+				is_drop: 1
 			};
 
 			if (obj.type == 2) {

+ 101 - 5
pages/store/apply.vue

@@ -12,9 +12,46 @@
 					<text class="hx"></text><text>累计业绩达到12W可申请成为店长</text><text class="hx"></text>
 				</view>
 			</view>
-			<view class="item"><view class="item-top">特权一</view></view>
-			<view class="item"><view class="item-top">特权一</view></view>
-			<view class="item"><view class="item-top">特权一</view></view>
+			<view class="item">
+				<view class="item-top">特权一</view>
+				<view class="item-tit">
+					享受六折拿货价
+					<view class="line"></view>
+				</view>
+				<view class="item-info">
+					<view class="info-y"></view>
+					<view class="info">所有商品享受六折的拿货价</view>
+				</view>
+			</view>
+			<view class="item">
+				<view class="item-top">特权二</view>
+				<view class="item-tit">
+					销售奖励
+					<view class="line"></view>
+				</view>
+				<view class="item-info">
+					<view class="info-y"></view>
+					<view class="info">推广更多会员享受更多销售奖励</view>
+				</view>
+			</view>
+			<view class="item">
+				<view class="item-top">特权三</view>
+				<view class="item-tit">
+					区代业绩奖励
+					<view class="line"></view>
+				</view>
+				<view class="item-info">
+					<view class="info-y"></view>
+					<view class="info">推广更多店长将有资格成为区代,享受更多业绩奖励</view>
+				</view>
+			</view>
+			<view class="more">
+				<image src="../../static/icon/i-left.png" mode=""></image>
+				<view class="more-tit">
+					更多店长特权持续开放中,敬请期待
+				</view>
+				<image src="../../static/icon/i-right.png" mode=""></image>
+			</view>
 			<view class="btn" @click="changeStep">立即申请成为店长</view>
 		</template>
 		<template v-if="isStep == 2">
@@ -192,9 +229,10 @@ export default {
 .item {
 	margin: 44rpx auto;
 	width: 674rpx;
-	height: 176rpx;
+	// height: 176rpx;
 	box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.2);
 	border-radius: 10rpx;
+	padding-bottom: 40rpx;
 	.item-top {
 		width: 85rpx;
 		line-height: 36rpx;
@@ -206,9 +244,49 @@ export default {
 		font-weight: 400;
 		color: #975f4a;
 	}
+	.item-tit {
+		display: inline-block;
+		padding: 0 10rpx;
+		font-size: 26rpx;
+		font-family: Source Han Sans CN;
+		font-weight: 500;
+		color: #202020;
+		margin-left: 68rpx;
+		margin-top: 20rpx;
+		.line {
+			// width: 197rpx;
+			margin-top: -10rpx;
+			height: 15rpx;
+			background: #FFF0C5;
+		}
+	}
+	.item-info {
+		display: flex;
+		align-items: flex-start;
+		padding-left: 68rpx;
+		padding-top: 15rpx;
+		// align-items: center;
+		font-size: 21rpx;
+		font-family: Source Han Sans CN;
+		font-weight: 400;
+		color: #6F6F6F;
+		line-height: 40rpx;
+		.info-y {
+			width: 24rpx;
+			height: 24rpx;
+			background: #343238;
+			border-radius: 50%;
+			margin-right: 14rpx;
+			margin-top: 8rpx;
+			flex-shrink: 0;
+		}
+		.info {
+			padding-right: 20rpx;
+		}
+	}
 }
 .btn {
-	margin: 0 auto;
+	margin: 20rpx auto;
 	width: 606rpx;
 	height: 80rpx;
 	background: linear-gradient(-23deg, #ffe7be, #fed591);
@@ -316,4 +394,22 @@ export default {
 		
 	}
 }
+.more {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 21rpx;
+	font-family: Source Han Sans CN;
+	font-weight: 400;
+	color: #6F6F6F;
+	height: 40rpx;
+	line-height: 40rpx;
+	image {
+		height: 15rpx;
+		width: 40rpx;
+	}
+	view {
+		padding: 0 8rpx;
+	}
+}
 </style>

BIN=BIN
static/icon/i-left.png


BIN=BIN
static/icon/i-right.png