diff --git a/pages/center/Piabodata/Employeesstatistics.vue b/pages/center/Piabodata/Employeesstatistics.vue
index ca2eb17..041f38e 100644
--- a/pages/center/Piabodata/Employeesstatistics.vue
+++ b/pages/center/Piabodata/Employeesstatistics.vue
@@ -24,26 +24,6 @@
 					<view class="text1-2">{{newlisttabinfo1.total}}</view>
 					<view class="text1-1">合计接待次数</view>
 				</view>
-<<<<<<< HEAD
-				<view class="sanbox1" style="width: 40%;">
-					<view class="text1-1">顾问</view>
-					<view class="text1-2">{{newlisttabinfo1.count}}人</view>
-				</view>
-				<view class="sanbox1" style="width: 25%;">
-					<view class="text1-1">人均接待量</view>
-					<view class="text1-2">{{newlisttabinfo1.avg}}次</view>
-				</view>
-			</view>
-
-			<view class="jindu" style="height: 360rpx;overflow: auto;">
-				<view v-if="newlisttabinfo1.result.length!=0" class="jindu-box"
-					v-for="(item,index) in newlisttabinfo1.result" :key="index">
-					<view class="jindu-boxche" v-if="item.zxl != 0">
-						<view class="jindu-name" v-if="item.name">{{item.name.substring(0,4)}}</view>
-						<view style="width: 440rpx;margin-left: 10rpx;">
-							<u-line-progress height="24" :show-percent="false" active-color="#FBA448"
-								:percent="item.zxl1"></u-line-progress>
-=======
 				<view  class="sanbox1" >
 					<view class="text1-2">{{newlisttabinfo1.count}}</view>
 					<view class="text1-1">顾问人数</view>
@@ -68,7 +48,6 @@
 							<view class="color2" v-if="index==1" :style="'width:'+ item.zxl||0 + '%'" ></view>
 							<view class="color3" v-if="index==2" :style="'width:'+ item.zxl||0 + '%'" ></view>
 							<view class="color4" v-if="index>2" :style="'width:'+ item.zxl||0 + '%'" ></view>
->>>>>>> 142fe40c9bd7bb5931fb58af05a7f99bc705e816
 						</view>
 						<view class="jindu-zxl" >{{item.zxl==null?0:item.zxl}}次</view>
 					</view>
@@ -82,17 +61,6 @@
 		<view style="width: 100%;height: 20rpx;background: #FAFAFA;"></view>
 		<view class="single">
 			<view class="title">
-<<<<<<< HEAD
-				<view class="title1" style="flex: 1;">销讲执行率排行（TOP10）</view>
-			</view>
-			<view class="hejisan">
-				<view class="sanbox1" style="width: 40%;">
-					<view class="text1-1">顾问</view>
-					<view class="text1-2">{{newlisttabinfo3.count}}人</view>
-				</view>
-				<view class="sanbox1" style="width: 25%;">
-					<view class="text1-1">人均执行率</view>
-=======
 				<view class="title1"  style="flex: 1;">平均执行率排行（TOP10）</view>
 			</view>
 			<view class="hejisan">
@@ -101,21 +69,10 @@
 					<view class="text1-1">顾问人数</view>
 				</view>
 				<view  class="sanbox1" style="width: 25%;">
->>>>>>> 142fe40c9bd7bb5931fb58af05a7f99bc705e816
 					<view class="text1-2">{{newlisttabinfo3.avg}}%</view>
 					<view class="text1-1">人均执行率</view>
 				</view>
 			</view>
-<<<<<<< HEAD
-			<view class="jindu" style="height: 360rpx;overflow: auto;">
-				<view v-if="newlisttabinfo3.result.length!=0" class="jindu-box"
-					v-for="(item,index) in newlisttabinfo3.result" :key="index">
-					<view class="jindu-boxche" v-if="item.zxl != 0">
-						<view class="jindu-name" v-if="item.name">{{item.name.substring(0,4)}}</view>
-						<view style="width: 440rpx;margin-left: 10rpx;">
-							<u-line-progress height="24" :show-percent="false" active-color="#FBA448"
-								:percent="item.zxl1"></u-line-progress>
-=======
 			<view class="jindu" style="margin-top: 20rpx;min-height: 300rpx;">
 				<view v-if="newlisttabinfo3.result.length" class="jindu-box" v-for="(item,index) in newlisttabinfo3.result" :key="index">
 					<view class="jindu-boxche">
@@ -134,7 +91,6 @@
 							<view class="color2" v-if="index==1" :style="'width:'+ item.zxl||0 + '%'" ></view>
 							<view class="color3" v-if="index==2" :style="'width:'+ item.zxl||0 + '%'" ></view>
 							<view class="color4" v-if="index>2" :style="'width:'+ item.zxl||0 + '%'" ></view>
->>>>>>> 142fe40c9bd7bb5931fb58af05a7f99bc705e816
 						</view>
 						<view class="jindu-zxl">{{item.zxl==null?0:item.zxl}}%</view>
 					</view>
@@ -144,11 +100,6 @@
 				</view>
 			</view>
 		</view>
-<<<<<<< HEAD
-
-
-=======
->>>>>>> 142fe40c9bd7bb5931fb58af05a7f99bc705e816
 		<view style="width: 100%;height: 20rpx;background: #FAFAFA;"></view>
 		<view class="single">
 			<view class="title">
@@ -159,25 +110,6 @@
 					<view class="text1-2">{{newlisttabinfo2.total}}</view>
 					<view class="text1-1">合计时长/分钟</view>
 				</view>
-<<<<<<< HEAD
-				<view class="sanbox1" style="width: 40%;">
-					<view class="text1-1">顾问</view>
-					<view class="text1-2">{{newlisttabinfo2.count}}人</view>
-				</view>
-				<view class="sanbox1" style="width: 25%;">
-					<view class="text1-1">人均录音时长</view>
-					<view class="text1-2">{{newlisttabinfo2.avg}}分钟</view>
-				</view>
-			</view>
-			<view class="jindu" style="height: 360rpx;overflow: auto;">
-				<view v-if="newlisttabinfo2.result.length!=0" class="jindu-box"
-					v-for="(item,index) in newlisttabinfo2.result" :key="index">
-					<view class="jindu-boxche" v-if="item.zxl != 0">
-						<view class="jindu-name" v-if="item.name">{{item.name.substring(0,4)}}</view>
-						<view style="width: 440rpx;margin-left: 10rpx;">
-							<u-line-progress height="24" :show-percent="false" active-color="#FBA448"
-								:percent="item.zxl1"></u-line-progress>
-=======
 				<view  class="sanbox1">
 					<view class="text1-2">{{newlisttabinfo2.count}}</view>
 					<view class="text1-1">顾问人数</view>
@@ -201,7 +133,6 @@
 							<view class="color2" v-if="index==1" :style="'width:'+ item.zxl||0 + '%'" ></view>
 							<view class="color3" v-if="index==2" :style="'width:'+ item.zxl||0 + '%'" ></view>
 							<view class="color4" v-if="index>2" :style="'width:'+ item.zxl||0 + '%'" ></view>
->>>>>>> 142fe40c9bd7bb5931fb58af05a7f99bc705e816
 						</view>
 						<!-- <view class="jindu-name" v-if="item.name">{{item.name.substring(0,4)}}</view>
 						<view class="progress-cus">
@@ -226,34 +157,15 @@
 					<view class="text1-2">{{newlisttabinfo4.total}}</view>
 					<view class="text1-1">合计次数</view>
 				</view>
-<<<<<<< HEAD
-				<view class="sanbox1" style="width: 40%;">
-					<view class="text1-1">顾问</view>
-=======
 				<view  class="sanbox1">
->>>>>>> 142fe40c9bd7bb5931fb58af05a7f99bc705e816
 					<view class="text1-2">{{newlisttabinfo4.count}}人</view>
 					<view class="text1-1">顾问人数</view>
 				</view>
-<<<<<<< HEAD
-				<view class="sanbox1" style="width: 25%;">
-=======
 				<view  class="sanbox1">
 					<view class="text1-2">{{newlisttabinfo4.avg}}</view>
->>>>>>> 142fe40c9bd7bb5931fb58af05a7f99bc705e816
 					<view class="text1-1">人均违禁次数</view>
 				</view>
 			</view>
-<<<<<<< HEAD
-			<view class="jindu" style="height: 360rpx;overflow: auto;">
-				<view v-if="newlisttabinfo4.result.length!=0" class="jindu-box"
-					v-for="(item,index) in newlisttabinfo4.result" :key="index">
-					<view class="jindu-boxche" v-if="item.zxl != 0">
-						<view class="jindu-name" v-if="item.name">{{item.name.substring(0,4)}}</view>
-						<view style="width: 440rpx;margin-left: 10rpx;">
-							<u-line-progress height="24" :show-percent="false" active-color="#FBA448"
-								:percent="item.zxl1"></u-line-progress>
-=======
 			<view class="jindu" style="margin-top: 20rpx;min-height: 300rpx">
 				<view v-if="newlisttabinfo4.result.length" class="jindu-box" v-for="(item,index) in newlisttabinfo4.result" :key="index">
 					<view class="jindu-boxche">
@@ -268,7 +180,6 @@
 							<view class="color2" v-if="index==1" :style="'width:'+ item.zxl||0 + '%'" ></view>
 							<view class="color3" v-if="index==2" :style="'width:'+ item.zxl||0 + '%'" ></view>
 							<view class="color4" v-if="index>2" :style="'width:'+ item.zxl||0 + '%'" ></view>
->>>>>>> 142fe40c9bd7bb5931fb58af05a7f99bc705e816
 						</view>
 						<view class="jindu-zxl" >{{item.zxl==null?0:item.zxl}}次</view>
 					</view>
@@ -501,14 +412,8 @@
 				if (index == 3) {
 					this.totalTimeShow = true;
 				} else {
-<<<<<<< HEAD
-					this.activeTotal = index;
-					this.lastEndDate = '';
-					this.lastStartDate = '';
-=======
 					this.lastEndDate='';
 					this.lastStartDate='';
->>>>>>> 142fe40c9bd7bb5931fb58af05a7f99bc705e816
 					this.init()
 				}
 			},
@@ -562,12 +467,7 @@
 		margin: 0 auto;
 		display: flex;
 		padding-top: 20rpx;
-<<<<<<< HEAD
-		padding-bottom: 20rpx;
 
-		.text1-1 {
-			color: #666666;
-=======
 		padding-bottom:20rpx;
 		.sanbox1{
 			flex: 1;
@@ -601,7 +501,6 @@
 			font-weight: 400;
 			color: #333333;
 			line-height: 32rpx;
->>>>>>> 142fe40c9bd7bb5931fb58af05a7f99bc705e816
 		}
 
 		.text1-2 {
diff --git a/pages/index/customer.vue b/pages/index/customer.vue
index 69532f0..4b48042 100644
--- a/pages/index/customer.vue
+++ b/pages/index/customer.vue
@@ -148,14 +148,6 @@
 		</image>
 		<image class="add2" @click="reshCustom()" src="https://static.quhouse.com/zhikong_xcx_img/refresh.png" mode="">
 		</image>
-
-		<!-- 底部导航栏 -->
-<<<<<<< HEAD
-<!-- 		<u-tabbar :mid-button="true" activeColor="#1296db" inactiveColor="#999999" v-model="current" :list="tabbarList">
-=======
-		<!-- <u-tabbar :mid-button="false" activeColor="#1296db" inactiveColor="#999999" v-model="current" :list="tabbarList">
->>>>>>> 142fe40c9bd7bb5931fb58af05a7f99bc705e816
-		</u-tabbar> -->
 	</view>
 </template>
 
@@ -183,13 +175,6 @@
 				},
 			};
 		},
-<<<<<<< HEAD
-		onLoad() {},
-=======
-		onLoad() {
-			// uni.hideTabBar();
-		},
->>>>>>> 142fe40c9bd7bb5931fb58af05a7f99bc705e816
 		computed: {
 			timestamp() {
 				return (e) => {
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 2a4ab7a..851c466 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -56,15 +56,8 @@
 	export default {
 		data() {
 			return {
-<<<<<<< HEAD
 				username: '',//用户名
 				password: '',//密码
-=======
-				// username: '13388881113',//用户名-测试 13388881113  1234567
-				// password: '1234567',//密码
-				username: '13033782199',//用户名-生产   13033782199   654321
-				password: '654321',//密码
->>>>>>> 142fe40c9bd7bb5931fb58af05a7f99bc705e816
 				passwordType: true,
 				agreeChecked: true
 			};
diff --git a/pages/mine/registerForm.vue b/pages/mine/registerForm.vue
index b1283ca..c3ed227 100644
--- a/pages/mine/registerForm.vue
+++ b/pages/mine/registerForm.vue
@@ -1,558 +1,3 @@
-<<<<<<< HEAD
-<template>
-	<view class="cented-box">
-		<!-- 背景图 -->
-		<image class="bg-img" src="@/static/images/screenCode/screen_bg.png" mode=""></image>
-		<!-- 头部 -->
-		<view class="header">
-			<view class="lside">
-				<text class="text top">访客入场</text>
-				<text class="text">登记表</text>
-			</view>
-			<view class="rside">
-				<image src="@/static/images/screenCode/screen_note.png" mode=""></image>
-			</view>
-		</view>
-
-		<!-- 表单 -->
-		<view class="container">
-			<view class="chented">
-				<view class="title">
-					<view class="titletext">客户姓名</view>
-					<view class="titletext2">
-						<input maxlength="10" class="titletext-input" style="color: #333333;" v-model="parames.name"
-							placeholder-class="titletext-input" placeholder-style="color:#B2B2B2;" type="text"
-							placeholder="请输入客户姓名（必填）" />
-					</view>
-					<view class="titleimg"></view>
-				</view>
-			</view>
-
-			<view class="chented">
-				<view class="title">
-					<view class="titletext">客户性别</view>
-					<!-- <view class="titletext2 displayclick"
-						style="display: flex;align-items: center;padding-left: 10rpx;">
-						<view class="sexRadio" @click="changeSex(1)" :class="{active:parames.sex == 1}">男士</view>
-						<view class="sexRadio" @click="changeSex(2)" :class="{active:parames.sex == 2}">女士</view>
-					</view> -->
-					<u-radio-group v-model="parames.sex">
-						<view style="display: flex;align-items: center;">
-							<u-radio :name="1" shape="circle">男士</u-radio>
-							<u-radio :name="2" shape="circle">女士</u-radio>
-						</view>
-					</u-radio-group>
-				</view>
-
-				<view class="title">
-					<view class="titletext">到访人数</view>
-					<view class="titletext2" style="display: flex;align-items: center;justify-content: space-around;">
-						<view class="num" v-for="i in 4" :key="i" :class="{active:parames.howMany == i+1}"
-							@click="changeHowMany(i+1)">
-							{{i + 1}}
-						</view>
-					</view>
-				</view>
-				<!-- 				<view class="title" @click="Buildingselection()">
-					<view class="titletext">到访途径</view>
-					<view class="titletext2"
-						style="font-size: 30rpx;font-weight: 400;color: #B2B2B2;line-height: 110rpx;padding-left: 10rpx;">
-						<text v-if="parames.sourceName" style="color: #333333;">{{parames.sourceName}}</text>
-						<text v-else>请选择客户来源</text>
-					</view>
-					<view class="titleimg">
-						<image class="titleimg1" src="../../static/images/arrow.png" mode=""></image>
-					</view>
-				</view> -->
-			</view>
-
-			<button class="clive" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber"
-				v-if="verifyPass">提交</button>
-			<view class="clive" @click="save" v-else>提交</view>
-
-			<view class="dengji">
-				<view class="d-lside">
-					入场登记
-				</view>
-				<view class="d-rside">
-					<view class="top">
-						<text class="t-time">{{$u.timeFormat(new Date(), 'hh:MM:ss')}}</text>
-						<text class="date">{{$u.timeFormat(new Date(), 'yyyy/mm/dd')}}</text>
-					</view>
-					<view class="address" style="font-size: 36rpx;">{{pname}}</view>
-				</view>
-			</view>
-
-
-			<view class="bottoms">
-				<u-checkbox v-model="parames.checked">我已阅读并同意</u-checkbox>
-				<text class="books" @click="openModel">《{{tit}}》</text>
-			</view>
-		</view>
-		<u-modal class="aaa" v-model="modelShow" :title="tit" width="720rpx" :mask-close-able="true"
-			:show-confirm-button="false">
-			<view class="bbb">
-				<u-icon class="close" @click="readOk" name="close-circle" color="#CCCCCC" size="60"></u-icon>
-			</view>
-
-			<view class="slot-content" style="padding:0 20rpx;height: 800rpx;overflow-y: auto;">
-				<view class="cont">
-					<scroll-view style="height: 800rpx;" scroll-y="true">
-						<rich-text :nodes="content"></rich-text>
-					</scroll-view>
-				</view>
-			</view>
-		</u-modal>
-
-
-		<view class="tips">
-			疫情防控 人人有责
-		</view>
-
-		<u-select :mask-close-able="false" v-model="Showhiddenunits" mode="single-column" :list="list" @cancel="cancel"
-			@confirm="confirm"></u-select>
-	</view>
-</template>
-
-<script>
-	var app = getApp();
-	var config = require("@/config");
-	let domain = require("@/utils/domain")
-	export default {
-		data() {
-			return {
-				Showhiddenunits: false,
-				list: [{
-						label: '自然到访',
-						value: '自然到访'
-					},
-					{
-						label: '渠道推荐',
-						value: '渠道推荐'
-					},
-				],
-				parames: {
-					name: '',
-					sex: 1,
-					// sourceName: "自然到访",
-					howMany: 1,
-					projectId: '',
-					phone: '',
-					projectId: '',
-					projectName: 'xxx',
-					version: "",
-					checked: true,
-				},
-				pname: "",
-				daitiReceptionobj: {},
-				verifyPass: false,
-				qrCodeUrl: '',
-				// 是否同意隐私协议
-				content: "",
-				modelShow: false,
-				tit: "",
-			};
-		},
-		onLoad(options) {
-			console.log(options)
-			const sceneStr = decodeURIComponent(options.scene);
-			this.parames.projectId = sceneStr
-			this.initFetch()
-		},
-		watch: {
-			parames: {
-				deep: true,
-				handler(newV) {
-					if (newV.checked) {
-						if (newV.name.length != 0) {
-							this.verifyPass = true;
-						} else {
-							this.verifyPass = false;
-						}
-					} else {
-						this.verifyPass = false;
-					}
-					// if (newV.name.length == 0) {
-					// 	this.verifyPass = false;
-					// } else {
-					// 	this.verifyPass = true;
-					// }
-				}
-			}
-		},
-
-		methods: {
-			initFetch() {
-				let appid = uni.getAccountInfoSync().miniProgram.appId;
-				uni.request({
-					url: config.service.privacyAgr,
-					method: "GET",
-					data: {
-						id: appid,
-						projectId: this.parames.projectId
-					},
-					header: {
-						'content-type': 'application/json',
-						'Authorization': 'Bearer ' + uni.getStorageSync('weapp_session_login_data').token
-					},
-					success: (res) => {
-						this.content = res.data.data.content
-						this.tit = res.data.data.title
-						this.parames.version = res.data.data.version
-						this.pname = res.data.data.projectName
-					}
-				})
-			},
-			openModel() {
-				this.modelShow = true;
-			},
-			readOk() {
-				this.parames.checked = true;
-				this.modelShow = false;
-			},
-			save() {
-				if (this.parames.checked == false) {
-					uni.showToast({
-						icon: "none",
-						title: "请阅读并同意用户隐私协议"
-					})
-					return;
-				} else {
-					if (this.parames.name.length == 0) {
-						uni.showToast({
-							icon: "none",
-							title: "姓名不能为空"
-						})
-						return;
-					}
-
-				}
-			},
-			getPhoneNumber(e) {
-				this.qrCodeUrl = domain.baseUrl
-				if (e.detail.errMsg == "getPhoneNumber:ok") {
-					let data = {
-						code: e.detail.code,
-						appid: uni.getAccountInfoSync().miniProgram.appId,
-					}
-					uni.request({
-						url: this.qrCodeUrl + '/code/loginSessionKey',
-						method: "GET",
-						data,
-						success: (res) => {
-							console.log(res.data.data)
-							let phoneNum = JSON.parse(res.data.data).phone_info.phoneNumber
-							this.parames.phone = phoneNum
-							if (this.parames.phone != null && this.parames.phone != "") {
-								if (this.parames.name.length > 8) {
-									uni.showToast({
-										icon: "none",
-										title: "不能超过8个汉字"
-									})
-								} else {
-									uni.request({
-										url: this.qrCodeUrl + '/customer/codeAdd',
-										method: "POST",
-										data: this.parames,
-										header: {
-											'content-type': 'application/json',
-											'Authorization': 'Bearer ' + uni.getStorageSync(
-												'weapp_session_login_data').token
-										},
-										success: (addres) => {
-											if (addres.data.code == 10000) {
-												uni.reLaunch({
-													url: '/pages/mine/registerResult'
-												})
-											} else {
-												uni.showToast({
-													icon: "none",
-													title: addres.data.message
-												})
-											}
-										}
-									})
-
-								}
-							}
-
-						}
-					})
-				} else {
-					return;
-				}
-			},
-			changeSex(sex) {
-				this.parames.sex = sex;
-			},
-			changeHowMany(num) {
-				this.parames.howMany = num;
-			},
-
-			Buildingselection() {
-				this.Showhiddenunits = true;
-			},
-			cancel() {
-				this.Showhiddenunits = false;
-			},
-			confirm(e) {
-				this.parames.sourceName = e[0].value;
-				this.Showhiddenunits = false;
-			},
-
-		}
-	};
-</script>
-<style lang="scss" scoped>
-	/deep/ .u-model-title {
-		padding-top: 0px !important;
-		padding: 48rpx 0 24rpx !important;
-	}
-
-	.aaa {
-		position: relative;
-
-		.bbb {
-			position: absolute;
-			top: 8rpx;
-			right: 8rpx;
-		}
-	}
-
-	.cented-box {
-		position: relative;
-		padding: 0 0 50rpx 0;
-		width: 100vw;
-		min-height: calc(100vh - var(--window-top));
-		display: flex;
-		flex-direction: column;
-
-		.bg-img {
-			width: 100%;
-			height: 100%;
-			z-index: -1;
-			position: absolute;
-		}
-
-		.header {
-			margin: 0 0 40rpx 0;
-			width: 100%;
-			display: flex;
-
-			.lside {
-				flex: 1;
-				display: flex;
-				flex-direction: column;
-				justify-content: center;
-				align-items: center;
-
-				.text {
-					color: #fff;
-					font-size: 100rpx;
-					font-weight: 800;
-				}
-
-				.top {
-					font-size: 76rpx;
-				}
-			}
-
-			.rside {
-				flex: 1;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-
-				image {
-					width: 306rpx;
-					height: 302rpx;
-				}
-			}
-
-		}
-
-		.container {
-			position: relative;
-			margin: 0 auto;
-			width: 670rpx;
-			height: 900rpx;
-			background: #fff;
-			border-radius: 16rpx;
-
-
-			.chented {
-				padding: 0 30rpx;
-				width: 100%;
-
-				.title {
-					width: 100%;
-					height: 110rpx;
-					border-bottom: 1rpx solid #E0E0E0;
-					display: flex;
-					align-items: center;
-
-					.titletext {
-						width: 21%;
-						font-size: 30rpx;
-						font-weight: 400;
-						color: #333333;
-					}
-
-					.titletext2 {
-						width: 71%;
-					}
-
-					.titletext-input {
-						width: 100%;
-						height: 110rpx;
-						font-size: 30rpx;
-						font-weight: 400;
-						color: #B2B2B2;
-						line-height: 110rpx;
-						padding-left: 10rpx;
-					}
-
-					.titleimg {
-						width: 8%;
-						text-align: right;
-
-						.titleimg1 {
-							width: 16rpx;
-							height: 36rpx;
-						}
-					}
-				}
-			}
-
-			.clive {
-				margin: 100rpx auto 0;
-				width: 610rpx;
-				height: 88rpx;
-				background: #2671E2;
-				text-align: center;
-				line-height: 88rpx;
-				color: #FFFFFF;
-				border-radius: 8rpx;
-				font-size: 32rpx;
-			}
-
-			.dengji {
-				margin: 60rpx 0 0 0;
-				padding: 0 30rpx;
-				width: 100%;
-				display: flex;
-
-				.d-lside {
-					padding: 0 20rpx;
-					height: 88rpx;
-					display: flex;
-					align-items: center;
-					border-right: 1rpx solid #E0E0E0;
-					font-size: 36rpx;
-					font-weight: 500;
-				}
-
-				.d-rside {
-					padding: 0 20rpx;
-					height: 88rpx;
-					display: flex;
-					flex-direction: column;
-
-					.top {
-						display: flex;
-						align-items: baseline;
-						font-size: 24rpx;
-						color: #333330;
-
-						.t-time {
-							margin-right: 20rpx;
-							font-size: 36rpx;
-							font-weight: 500;
-							color: #333331;
-						}
-					}
-
-
-				}
-			}
-
-
-			.bottoms {
-				position: absolute;
-				bottom: 30rpx;
-				padding: 0 30rpx;
-				width: 100%;
-
-				.books {
-					margin-left: -24rpx;
-					color: #2671E2;
-					font-size: 30rpx;
-				}
-			}
-		}
-
-		.tips {
-			margin: 40rpx 0 0 0;
-			width: 100%;
-			text-align: center;
-			color: #fff;
-			font-size: 30rpx;
-		}
-	}
-
-	.sexRadio {
-		color: #BFBFBF;
-		border: 1rpx solid #BFBFBF;
-		font-size: 24upx;
-		width: 120rpx;
-		height: 60rpx;
-		text-align: center;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-
-		&:last-child {
-			margin-left: 20rpx;
-		}
-
-		&.active {
-			background: #2B6FFF;
-			color: #fff;
-			border-color: #2B6FFF;
-		}
-	}
-
-	.num {
-		width: 74rpx;
-		height: 74rpx;
-		border-radius: 8rpx;
-		background: rgba(43, 110, 253, 0.1);
-		color: #2B6EFD;
-		font-size: 32rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-
-		&.active {
-			background: #2B6EFD;
-			color: #FFFFFF;
-		}
-	}
-
-	.Pinspeak {
-		width: 100%;
-		height: 92rpx;
-		border-bottom: 1rpx solid #E0E0E0;
-		font-size: 32rpx;
-		font-weight: bold;
-		color: #333333;
-		text-indent: 30rpx;
-		line-height: 92rpx;
-		background: #FFFFFF;
-		margin-top: 20rpx;
-		padding-left: 10rpx;
-	}
-=======
 <template>
 	<view class="cented-box">
 		<view class="chented" style="margin-bottom: 26rpx;">
@@ -877,5 +322,4 @@
 		border-radius: 8rpx;
 		font-size: 32rpx;
 	}
->>>>>>> 142fe40c9bd7bb5931fb58af05a7f99bc705e816
 </style>