add

pages_shopping/live/confirmCreateOrder.vue

@@ -173,11 +173,6 @@
 			this.totalNum = Number(options.totalNum) || 0
 			this.type = options.type
 			this.isFirstLoad = true;
-<<<<<<< HEAD
-
-=======
-			
->>>>>>> 8c8ec24aaf25141f3a66af3c1d21e5415ce32117
 			if (options.type == 'win') {
 				this.getKey()
 			}
@@ -291,11 +286,7 @@
 				computedReward(data).then(res => {
 						if (res.code == 200) {
 							console.log("查询创建订单信息>>>>", res.data)
-<<<<<<< HEAD
 							this.orderData = res.data || {}
-=======
-							this.orderData = res.data||{}
->>>>>>> 8c8ec24aaf25141f3a66af3c1d21e5415ce32117
 						} else {
 							uni.showToast({
 								title: res.msg,
@@ -326,33 +317,21 @@
 
 				}
 
-<<<<<<< HEAD
-				return createliveOrder(data).then(res => {
-					if (res.code == 200) {
-						this.orderList = res.order;
-						return res.order;
-=======
 				return createliveOrder(data).then(res => { 
 					if (res.code == 200) {
 						this.orderList = res.order;
 						return res.order; 
->>>>>>> 8c8ec24aaf25141f3a66af3c1d21e5415ce32117
 					} else {
 						uni.showToast({
 							title: res.msg,
 							icon: 'none'
 						});
-<<<<<<< HEAD
-						throw new Error(res.msg);
-=======
 						throw new Error(res.msg); 
->>>>>>> 8c8ec24aaf25141f3a66af3c1d21e5415ce32117
 					}
 				});
 			},
 			// 创建抽奖订单
 			createRewardOrder() {
-<<<<<<< HEAD
 				let data = {
 					cityId: this.cityId,
 					liveId: this.liveId,
@@ -379,33 +358,6 @@
 						throw new Error(res.msg);
 					}
 				});
-=======
-			    let data = {
-			        cityId: this.cityId,
-			        liveId: this.liveId,
-			        orderKey: this.orderKey,
-			        userName: this.address.realName,
-			        userPhone: this.address.phone,
-			        userAddress: this.address.province + ' ' + this.address.city + ' ' + this.address.district + ' ' + this.address.detail,
-			        cartId: "5",
-			        productId: this.productId,
-			        totalNum: this.totalNum,
-			        couponUserId: this.couponUserId
-			    }
-			
-			    return createReward(data).then(res => {
-			        if (res.code == 200) {
-			            this.orderList = res.order || {};
-			            return res.order || {};
-			        } else {
-			            uni.showToast({
-			                title: res.msg,
-			                icon: 'none'
-			            });
-			            throw new Error(res.msg);
-			        }
-			    });
->>>>>>> 8c8ec24aaf25141f3a66af3c1d21e5415ce32117
 			},
 			couponSelect(item) {
 				this.couponText = "-¥" + (item.couponPrice || 0).toFixed(2);
@@ -423,11 +375,8 @@
 				if (this.couponsList.length === 0 || !this.isFirstLoad) {
 					return;
 				}
-<<<<<<< HEAD
 				const availableCoupons = this.couponsList.filter(item =>
-=======
-				const availableCoupons = this.couponsList.filter(item => 
->>>>>>> 8c8ec24aaf25141f3a66af3c1d21e5415ce32117
+
 					item.status === 0 && item.useMinPrice <= (this.orderData.totalPrice || 0)
 				);
 				if (availableCoupons.length === 0) {
@@ -437,11 +386,7 @@
 				const maxCoupon = availableCoupons[0];
 				this.couponText = "-¥" + (maxCoupon.couponPrice || 0).toFixed(2);
 				this.couponUserId = maxCoupon.id;
-<<<<<<< HEAD
 
-=======
-				
->>>>>>> 8c8ec24aaf25141f3a66af3c1d21e5415ce32117
 				console.log('自动选择最大优惠券:', maxCoupon);
 				this.isFirstLoad = false;
 				// 重新计算订单价格
@@ -477,7 +422,6 @@
 			},
 			// 提交订单
 			async submitOrder() {
-<<<<<<< HEAD
 				try {
 					if (this.orderKey == null) {
 						uni.showToast({
@@ -800,328 +744,3 @@
 		line-height: 0.44 * 100rpx;
 		background-color: red;
 	}
-=======
-			    try {
-			        if (this.orderKey == null) {
-			            uni.showToast({
-			                icon: 'none',
-			                title: '订单KEY不存在',
-			            });
-			            return;
-			        }
-			        if (this.address == null) {
-			            uni.showToast({
-			                icon: 'none',
-			                title: '收货地址不能为空',
-			            });
-			            return;
-			        }
-			        let orderList;
-			        if (this.type == "win") {  
-			            orderList = await this.createRewardOrder(); // 中奖订单
-			        } else {
-			            orderList = await this.createLiveOrder(); // 购买订单
-			        }
-			        console.log("orderList>>", orderList)
-			        const orderListStr = encodeURIComponent(JSON.stringify(orderList));
-			        uni.navigateTo({
-			            url: `/pages_shopping/live/paymentOrder?orderList=${orderListStr}&couponUserId=${this.couponUserId}&type=${this.type}`
-			        });
-			    } catch (error) {
-			        console.error('提交订单错误:', error);
-			        uni.showToast({
-			            title: error.message || '提交订单失败',
-			            icon: 'none'
-			        });
-			    }
-			},
-		}
-	}
-</script>
-<style lang="scss">
-	.inner-box {
-		padding: 20rpx 20rpx 140rpx;
-
-		.address-box {
-			margin-bottom: 20rpx;
-			box-sizing: border-box;
-			min-height: 171rpx;
-			background: #FFFFFF;
-			border-radius: 16rpx;
-			background-repeat: no-repeat;
-			background-size: 100% 30rpx;
-			background-position: left bottom;
-			padding: 38rpx 30rpx 36rpx;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-
-			.left {
-				width: 92%;
-
-				.name-box {
-					display: flex;
-					align-items: center;
-
-					.text {
-						font-size: 32rpx;
-						font-family: PingFang SC;
-						font-weight: bold;
-						color: #111111;
-						line-height: 1;
-
-						&.name {
-							margin-right: 30rpx;
-						}
-					}
-				}
-
-				.address {
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #666666;
-					line-height: 42rpx;
-					text-align: left;
-					margin-top: 23rpx;
-				}
-			}
-
-			.arrow-box {
-				width: 12rpx;
-				height: 23rpx;
-				display: flex;
-				align-items: cenetr;
-				justify-content: cenetr;
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-		}
-
-		.price-info {
-			background: #FFFFFF;
-			border-radius: 16rpx;
-
-			&-title {
-				padding: 30rpx 30rpx 20rpx 30rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 30rpx;
-				color: #111;
-			}
-
-			&-unit {
-				font-size: 24rpx;
-			}
-
-			&-num {
-				font-size: 28rpx;
-			}
-		}
-
-		.points {
-			height: 88rpx;
-			padding: 0 30rpx;
-			background: #FFFFFF;
-			border-radius: 16rpx;
-
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-
-			.left {
-				display: flex;
-				align-items: center;
-
-				image {
-					width: 28rpx;
-					height: 28rpx;
-					margin-right: 20rpx;
-				}
-
-				.text {
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #666666;
-				}
-			}
-
-			.right {
-				display: flex;
-				align-items: center;
-
-				.text {
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #111111;
-
-				}
-
-				image {
-					margin-left: 15rpx;
-					width: 14rpx;
-					height: 24rpx;
-				}
-			}
-		}
-	}
-
-
-	.btn-foot {
-		box-sizing: border-box;
-		width: 100%;
-		height: 121rpx;
-		background: #FFFFFF;
-		padding: 16rpx 30rpx 16rpx 60rpx;
-		display: flex;
-		align-items: center;
-		justify-content: flex-end;
-		position: fixed;
-		left: 0;
-		bottom: 0;
-		z-index: 99;
-
-		.right {
-			display: flex;
-			align-items: center;
-
-			.total {
-				display: flex;
-				align-items: flex-end;
-				margin-right: 36rpx;
-
-				.label {
-					font-size: 26rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #999999;
-					line-height: 1.5;
-				}
-
-				.price {
-					display: flex;
-					align-items: flex-end;
-
-					.unit {
-						font-size: 32rpx;
-						font-family: PingFang SC;
-						font-weight: bold;
-						color: #FF6633;
-						line-height: 1.2;
-						margin-right: 10rpx;
-					}
-
-					.num {
-						font-size: 50rpx;
-						font-family: PingFang SC;
-						font-weight: bold;
-						color: #FF6633;
-						line-height: 1;
-					}
-				}
-			}
-
-			.btn {
-				width: 200rpx;
-				height: 88rpx;
-				line-height: 88rpx;
-				text-align: center;
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #FFFFFF;
-				background: #2BC7B9;
-				border-radius: 44rpx;
-			}
-		}
-	}
-
-	.coupon {
-		height: 100%;
-	}
-
-	/*优惠券列表公共*/
-	.coupon-list {}
-
-	.coupon-list .item {
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		width: 100%;
-		height: 1.7 * 100rpx;
-		margin-bottom: 0.16 * 100rpx;
-	}
-
-	.coupon-list .item .money {
-		background-size: 100% 100%;
-		width: 2.4 * 100rpx;
-		height: 100%;
-		color: #fff;
-		font-size: 0.36 * 100rpx;
-		font-weight: bold;
-		text-align: center;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		position: relative;
-
-	}
-
-	.coupon-list .item .money .img {
-		position: absolute;
-		width: 2.4 * 100rpx;
-		height: 100%;
-		color: #fff;
-
-	}
-
-	.coupon-list .item .money .num {
-		font-size: 0.6 * 100rpx;
-	}
-
-	.coupon-list .item .money .pic-num {
-		font-size: 20rpx;
-		z-index: 99;
-	}
-
-
-	.coupon-list .item .text {
-		width: 4.5 * 100rpx;
-		padding: 0 0.17 * 100rpx 0 0.24 * 100rpx;
-		background-color: #fff;
-		box-sizing: border-box;
-	}
-
-	.coupon-list .item .text .condition {
-		font-size: 0.3 * 100rpx;
-		color: #282828;
-		height: 0.93 * 100rpx;
-		line-height: 0.93 * 100rpx;
-		border-bottom: 1px solid #f0f0f0;
-	}
-
-	.coupon-list .item .text .data {
-		font-size: 0.2 * 100rpx;
-		color: #999;
-		height: 0.76 * 100rpx;
-	}
-
-	.coupon-list .item .text .data .bnt {
-		width: 1.36 * 100rpx;
-		height: 0.44 * 100rpx;
-		border-radius: 0.22 * 100rpx;
-		font-size: 0.22 * 100rpx;
-		color: #fff;
-		text-align: center;
-		line-height: 0.44 * 100rpx;
-		background-color: red;
-	}
->>>>>>> 8c8ec24aaf25141f3a66af3c1d21e5415ce32117
-</style>

pages_shopping/live/paymentOrder.vue

@@ -569,568 +569,3 @@
 			}
 		}
 	}
-=======
-<template>
-	<view class="content">
-		<view class="inner">
-			<!-- 时间、价格 -->
-			<view class="time-price">
-				<text class="time">待支付</text>
-				<view class="price-box">
-					<text class="unit">¥</text>
-					<text class="num">{{order ? (Number(order.payMoney) || 0).toFixed(2) : "0.00"}}</text>
-				</view>
-
-			</view>
-			<!-- 支付方式 -->
-			<view class="pay-type">
-				<view class="title">支付方式</view>
-				<radio-group @change="handlePayTypeChange">
-					<view class="item">
-						<view class="left">
-							<image src="/static/images/wecha_pay.png" mode=""></image>
-							<text class="text">微信支付</text>
-						</view>
-						<label>
-							<radio :value="1" :checked="payType === 1" />
-						</label>
-					</view>
-					<!-- #ifdef APP-PLUS||H5 -->
-					<view class="item">
-						<view class="left">
-							<image src="/static/images/zfb.png" mode=""></image>
-							<text class="text">支付宝</text>
-						</view>
-						<label>
-							<radio :value="2" :checked="payType === 2" />
-						</label>
-					</view>
-					<!-- #endif -->
-				</radio-group>
-			</view>
-			<!-- 订单详情查看 -->
-			<view class="order-info">
-				<view class="title">订单信息</view>
-				<view class="item">
-					<text class="label">订单编号</text>
-					<view class="sn-box">
-						<view>
-							<view class="text">{{order.orderCode}}</view>
-						</view>
-					</view>
-				</view>
-				<view class="item">
-					<text class="label">下单时间</text>
-					<text class="text">{{ formattedDate}} </text>
-				</view>
-				<view class="item">
-					<text class="label">订单金额</text>
-					<text class="text"
-						v-if="order!=null">{{order ? (Number(order.totalPrice) || 0).toFixed(2) : "0.00"}}</text>
-				</view>
-				<view class="item">
-					<text class="label">优惠券</text>
-					<text class="text">-¥{{order ? (Number(order.discountMoney) || 0).toFixed(2) : "0.00"}} </text>
-				</view>
-			</view>
-
-		</view>
-		<view class="btn-box">
-			<view class="btn" @click="payOrder()">去支付</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import dayjs from 'dayjs';
-	import {
-		weChatPayment
-	} from '@/api/pay_new'
-	import {
-		zfbPayment,
-		// weChatPayment
-	} from '@/api/pay'
-	import {
-		payConfirmReward,
-	} from '@/api/order'
-	export default {
-		data() {
-			return {
-				type:'',
-				payPrice: null,
-				newOrder: {},
-				payType: 2,
-				order: null,
-				orderId: null,
-				payDelivery: 0,
-				payMoney: 0,
-				config: null,
-				payType: 1,
-				user: null,
-				couponUserId: null
-			}
-		},
-		computed: {
-			formattedDate() {
-				return this.order?.createTime ? dayjs(this.order.createTime).format('YYYY-MM-DD HH:mm:ss') : '';
-			},
-			payLimitTime() {
-				return this.order?.updateTime ?
-					dayjs(this.order.updateTime).add(2, 'day').format('YYYY-MM-DD HH:mm:ss') :
-					'';
-			}
-		},
-		onLoad(options) {
-			// if (options.payPrice) {
-			// 	this.payPrice = options.payPrice;
-			// }
-			if (options.couponUserId) {
-				this.couponUserId = options.couponUserId;
-			}
-			console.log("支付订单是>>", options)
-			this.type = options.type;
-			// this.liveId = options.liveId
-			// this.productId=options.productId
-			// console.log("支付订单",options)
-
-			if (options.orderList) {
-				try {
-					const decoded = decodeURIComponent(options.orderList);
-					this.order = JSON.parse(decoded) || {}; // 默认空对象
-				} catch (e) {
-					console.error('参数解析失败:', e);
-					this.order = {}; // 显式赋默认值
-				}
-			}
-		},
-		// //发送给朋友
-		// onShareAppMessage(res) {
-		// 	const combinationOrderId = this.combinationOrderId ?
-		// 		`&combinationOrderId=${encodeURIComponent(this.combinationOrderId)}` : ''
-		// 	return {
-		// 		title: "帮TA支付",
-		// 		path: '/pages_user/user/otherPaymentOrder?orderId=' + this.orderId + combinationOrderId,
-		// 		imageUrl: '/static/images/logo.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
-		// 	}
-
-		// },
-		methods: {
-			weixinPayOrder() {
-				var data = {
-					orderId: this.order.orderId,
-					payType: 1
-					// payType: this.order.payType
-				};
-
-				var that = this;
-				uni.showLoading();
-				weChatPayment(data).then(
-					res => {
-						if (res.code == 200) {
-							console.log(res);
-
-							if (res.payType == 1 || res.payType == 2) {
-								var result = JSON.parse(res.result);
-								uni.requestPayment({
-									provider: 'wxpay',
-									timeStamp: result.timeStamp,
-									nonceStr: result.nonceStr,
-									package: result.package,
-									signType: result.signType,
-									paySign: result.paySign,
-									success: function(res) {
-										uni.hideLoading();
-
-										uni.redirectTo({
-											url: "./success?order=" + JSON.stringify(that.newOrder)
-										})
-
-
-									},
-									fail: function(err) {
-										uni.showToast({
-											icon: 'none',
-											title: 'fail:' + JSON.stringify(err),
-										});
-										uni.hideLoading();
-									}
-								});
-							}
-
-						} else {
-							uni.showToast({
-								icon: 'none',
-								title: res.msg,
-							});
-						}
-					},
-					rej => {}
-				);
-
-			},
-
-
-
-
-
-
-
-
-
-
-			payOrder() {
-				if (this.type == 'win') {
-					this.toPayConfirmReward()
-				} else {
-					if (this.payType == 1) {
-						console.log("这个order", this.order)
-						const {
-							itemJson,
-							...newOrder
-						} = this.order;
-						this.newOrder = newOrder;
-						console.log("这个newOrder", this.newOrder)
-						this.weixinPayOrder()
-					} else {
-						uni.showToast({
-							title: "暂时无可用支付",
-							icon: 'none'
-						})
-					}
-				}
-			},
-
-			// 选微信支付或者支付宝支付
-			handlePayTypeChange(e) {
-				this.payType = e.detail.value; // 获取选中的 value
-				console.log('当前选中:', this.payType);
-			},
-			toPayConfirmReward() {
-				let data={
-					orderId:this.order.orderId
-				}
-				payConfirmReward(data).then(
-					res => {
-						if (res.code == 200) {
-							uni.showToast({
-								icon: 'none',
-								title: res.msg,
-							});
-						} else {
-							uni.showToast({
-								icon: 'none',
-								title: "请求失败",
-							});
-						}
-					},
-					rej => {}
-				);
-			},
-
-			getUserInfo() {
-				getUserInfo().then(
-					res => {
-						if (res.code == 200) {
-							if (res.user != null) {
-								this.user = res.user;
-							}
-						} else {
-							uni.showToast({
-								icon: 'none',
-								title: "请求失败",
-							});
-						}
-					},
-					rej => {}
-				);
-			},
-			getStoreConfig() {
-				getStoreConfig().then(
-					res => {
-						if (res.code == 200) {
-							this.config = res.data
-							console.log(this.config);
-						}
-					},
-					rej => {}
-				);
-			},
-			payTypeChange(e) {
-				if (this.combinationOrderId) {
-					this.editPayTypeByCombinationId(e.detail.value)
-				} else {
-					this.editPayType(e.detail.value)
-				}
-			},
-			editPayType(payType) {
-				var data = {
-					orderId: this.orderId,
-					payType: payType
-				};
-				var that = this;
-				uni.showLoading();
-				editPayType(data).then(
-					res => {
-						if (res.code == 200) {
-							console.log(res);
-							uni.hideLoading();
-							that.order = res.order;
-							that.order.orderCodes = that.order.orderCode ? [that.order.orderCode] : []
-							that.orderCode = that.order.orderCode
-							// this.payType=this.order.payType
-							this.payMoney = this.order.payMoney;
-							this.payDelivery = this.order.payDelivery;
-						} else {
-							uni.showToast({
-								icon: 'none',
-								title: res.msg,
-							});
-						}
-					},
-					rej => {}
-				);
-
-			},
-
-		}
-	}
-</script>
-
-<style lang="scss">
-	page {
-		height: 100%;
-	}
-
-	.content {
-		height: 100%;
-		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
-
-		.inner {
-			padding: 20upx;
-
-			.time-price {
-				box-sizing: border-box;
-				padding: 50upx 0upx;
-				background: #FFFFFF;
-				border-radius: 16upx;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-
-				.time {
-					font-size: 32upx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #222222;
-					line-height: 1;
-					text-align: center;
-				}
-
-				.desc {
-					margin: 30upx 0upx 15upx;
-					font-size: 26upx;
-					font-family: PingFang SC;
-					color: #999999;
-					line-height: 1;
-					text-align: center;
-				}
-
-				.price-box {
-					display: flex;
-					align-items: flex-end;
-					margin-top: 28upx;
-
-					.unit {
-						font-size: 32upx;
-						font-family: PingFang SC;
-						font-weight: bold;
-						color: #FF6633;
-						line-height: 1.3;
-						margin-right: 10upx;
-					}
-
-					.num {
-						font-size: 56upx;
-						font-family: PingFang SC;
-						font-weight: bold;
-						color: #FF6633;
-						line-height: 1;
-					}
-				}
-			}
-
-			.pay-type {
-				box-sizing: border-box;
-				background: #FFFFFF;
-				border-radius: 16upx;
-				margin-top: 20upx;
-				padding: 40upx 30upx;
-				display: flex;
-				flex-direction: column;
-				justify-content: space-between;
-
-				.title {
-					font-size: 28upx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #999999;
-					line-height: 1;
-					margin-bottom: 10upx;
-				}
-
-				.item {
-					padding: 15upx 0upx;
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-
-					.left {
-						display: flex;
-						align-items: center;
-
-						image {
-							width: 44upx;
-							height: 44upx;
-							margin-right: 20upx;
-						}
-
-						.text {
-							font-size: 30upx;
-							font-family: PingFang SC;
-							font-weight: bold;
-							color: #222222;
-							line-height: 1;
-						}
-					}
-				}
-			}
-
-			.order-info {
-				margin-top: 20upx;
-				background: #FFFFFF;
-				border-radius: 16upx;
-				padding: 40upx 30upx;
-
-				.title {
-					font-size: 30upx;
-					font-family: PingFang SC;
-					font-weight: bold;
-					color: #222222;
-					line-height: 1;
-				}
-
-				.item {
-					margin-top: 40upx;
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-
-					.label {
-						font-size: 26upx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #666666;
-						line-height: 1;
-					}
-
-					.text {
-						font-size: 26upx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #222222;
-						line-height: 32upx;
-					}
-
-					.cont-text {
-						font-size: 26upx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #666666;
-
-						.bold {
-							color: #111111;
-						}
-					}
-
-					.sn-box {
-						display: flex;
-						align-items: center;
-
-						.copy-btn {
-							width: 58upx;
-							height: 32upx;
-							line-height: 32upx;
-							text-align: center;
-							font-size: 22upx;
-							font-weight: 500;
-							color: #222222;
-							background: #F5F5F5;
-							border-radius: 4upx;
-							margin-left: 24upx;
-						}
-					}
-
-				}
-
-				.line {
-					width: 100%;
-					height: 1px;
-					background: #F0F0F0;
-					margin-top: 30upx;
-				}
-			}
-		}
-
-		.btn-box {
-			height: 242upx;
-			background: #FFFFFF;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			flex-direction: column;
-
-			.btn {
-				width: 91.73%;
-				height: 88upx;
-				line-height: 88upx;
-				font-size: 30upx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #FFFFFF;
-				text-align: center;
-				background: #2BC7B9;
-				border-radius: 44upx;
-				margin-bottom: 10rpx;
-			}
-
-			.other-btn {
-				width: 91.73%;
-				height: 88upx;
-				line-height: 88upx;
-				font-size: 30upx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #2BC7B9;
-				border: 1rpx solid #2BC7B9;
-				text-align: center;
-				background: #FFFFFF;
-				border-radius: 44upx;
-				margin-bottom: 10rpx;
-				position: relative;
-
-				.share {
-					display: inline-block;
-					position: absolute;
-					top: 0;
-					left: 0;
-					width: 100%;
-					height: 100%;
-					opacity: 0;
-				}
-			}
-		}
-	}
->>>>>>> 8c8ec24aaf25141f3a66af3c1d21e5415ce32117
-</style>