同步

component/public/severcard.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view class="fixed-card" :style="openleft?{}:{right:`-34vw`}" v-if="qcobj.startTime">
+		<view class="fixed-card" :style="openleft?{}:{right:`-34vw`}" >
 			<view class="fixed-card-left">
 				<image class="card-left-img" 
 					:src="qcobj?.previewFile? serverUrl + qcobj?.previewFile: `/static/index/newindex/wendu/2.png`" mode="aspectFill"/>

pages/NursingNew/component/leftcontent/leftcontent.vue

@@ -160,10 +160,10 @@
 			width: 6vw;
 			display: flex;
 			flex-direction: column;
-			height: 60vh;
+			height: 66vh;
-			padding: 4vh 0 ;
+			padding: 4vh 0 3vh;
 			position: relative;
-			margin-top: -5vh;
+			margin-top: -2vh;
 			
 			.iconst{
 				width: 6vw;
@@ -197,7 +197,7 @@
 			width: 6vw;
 			display: flex;
 			flex-direction: column;
-			height: 52vh;
+			height: 57vh;
 			// background-color: red;
 			.act{
 				background: RGBA(228, 229, 231, 1);
@@ -218,6 +218,7 @@
 				position: relative;
 				justify-content: space-between;
 				padding: 0.3vw 0.2vw;
+				margin-top: 0.4vw;
 				.tm{
 					width: 100%;
 					height: 100%;

pages/NursingNew/component/leftcontent/serveswipe.vue

@@ -1,24 +1,24 @@
 <template>
 	<view>
 		<view class="swipeservwe">
-			<view class="btn les" @click="swip(-1)">
+			<view class="btn les" @click="swip(-1)" v-if="plsbuy.length>1">
-				<image class="pao-img" :src="`/static/index/newindex/states/ris.png`" style="transform: rotate(180deg);"/>
+				<image class="pao-img" :src="`/static/index/newindex/states/ris.png`"
+					style="transform: rotate(180deg);" />
 			</view>
-			<view class="btn ris" @click="swip(1)">
+			<view class="btn ris" @click="swip(1)" v-if="plsbuy.length>1">
 				<image class="pao-img" :src="`/static/index/newindex/states/ris.png`" />
 			</view>
-			<view class="bots">
+			<view class="bots" v-if="plsbuy.length>1">
 				<view v-for="(v,i) in plsbuy" :key='i' :class="current==i?'dot':''"></view>
 			</view>
-			<swiper class="swiper" :circular="true" :indicator-dots="false"
+			<swiper class="swiper" :circular="true" :indicator-dots="false" easing-function="easeInOutCubic"
-			easing-function="easeInOutCubic"
 				:autoplay="autoplay" :interval="3000" :duration="500" :current="current" @change="change">
 				<swiper-item v-for="(indexmessage,i) in plsbuy" :key="i" class="swper">
 					<view class="photo-father">
 						<!-- {filter: `grayscale(60%)`} -->
 						<view class="juzhong" :style="indexmessage?.startTime?{}:''">
-					 		<donghua :width="`1300rpx`" :height="`900rpx`" :links="blueArray" :playing="photoplay" :loop="true"
+							<donghua :width="`1300rpx`" :height="`900rpx`" :links="blueArray" :playing="photoplay"
-					 			:interval="120" />
+								:loop="true" :interval="120" />
 						</view>
 						<view class="timedjs">
 							<text>服务倒计时</text>
@@ -27,10 +27,9 @@
 						<view class="weight-time">
 							<view>
 								{{ indexmessage?.startTime.slice(11, 16)  }}
-								<text style="font-size: 1.4vw;font-weight: 400;">|&nbsp; 30分钟</text>
+								<text style="font-size: 1.5vw;font-weight: 400;">|&nbsp; 30分钟</text>
-							</view>
-					 		<view style="height: 5vw;" >
 							</view>
+							<view style="height: 4vw;"> </view>
 							<view class="pao-father">
 								<image class="pao-img" :src="`/static/index/newindex/states/pao.png`" />
 								<view style="z-index: 1;" v-if="topbuttontarget==0">
@@ -42,7 +41,7 @@
 							<image :src="`/static/zlb.png`" :style=" 'width: 450rpx' " mode="aspectFill" />
 						</view>
 						<view class="cardbox" v-if="indexmessage.izPackage=='Y'&&indexmessage?.izStart=='Y'">
-							<scroll-view scroll-y="true"  class="scrollcard">
+							<scroll-view scroll-y="true" class="scrollcard" @touchmove.stop>
 								<view class="itemcard" v-for="(v,i) in zlarr" :key='i' :class="v.flag?'act':''" @click="zldex(v)">
 									<image :src="!v.flag?`/static/index/newindex/states/xs.png`:'/static/index/newindex/states/xsz.png'" />
 									<text>强直屈曲洗手</text>
@@ -55,9 +54,9 @@
 						</view>
 						<!-- https://www.focusnu.com/nursingunit101/sys/common/static/temp/1_1760592730764.png -->
 						<view class="big-img" v-if="indexmessage.izPackage=='N' ">
-							<image  :style="!indexmessage?.previewFile?'width: 450rpx':'width: 650rpx'"
+							<image :style="!indexmessage?.previewFile?'width: 450rpx':' '"
 								:src="indexmessage?.previewFile? serverUrl + indexmessage?.previewFile: `/static/index/newindex/wendu/2.png`"
-								 mode="aspectFill"/>
+								mode="heightFix" />
 							<!-- <image :src="`/static/zhiniaoku.png`"
 								 :style="!indexmessage?.previewFile?'width: 450rpx':'width: 650rpx'"
 								 	 mode="aspectFill"/> -->
@@ -69,49 +68,61 @@
 							<view class="server-name">
 								{{ indexmessage?.directiveName }}
 							</view>
-							<view style="width: 6.5vw;height: 2vw;margin-left: 1vw;position: relative;" v-if="indexmessage?.categoryName">
+							<view style="width: 6.5vw;height: 2vw;margin-left: 1vw;position: relative;"
+								v-if="indexmessage?.categoryName">
 								<image src="/static/index/newindex/wendu/bgc.png" mode="aspectFill"
-								style="width: 100%;height: 100%;position: relative;z-index: 0; margin-top: 0.4vw;"></image>
+									style="width: 100%;height: 100%;position: relative;z-index: 0; margin-top: 0.4vw;">
+								</image>
 								<view class="bgc-font"
 									style="top: 0;left: 0;padding-left:0.65vw;width: 100%;height: 100%;z-index: 2;position: absolute;line-height:2.9vw;font-size: 1.1vw;">
 									{{indexmessage?.categoryName }}
 								</view>
 							</view>
 						</view>
-						
-						
 						<view style="display: flex;margin-top: 40rpx;">
 							<view style="width: 240rpx;height: 90rpx;margin-right: 40rpx;">
-					 			<view :class="indexmessage?.izStart=='N'?'start-button':'end-button'"  @click="start(indexmessage)">
+								<view :class="indexmessage?.izStart=='N'?'start-button':'end-button'"
+									@click="start(indexmessage)">
 									开始服务
 								</view>
 							</view>
 							<view style="width: 240rpx;height: 90rpx;">
-					 			<view :class="(indexmessage?.izStart=='Y'&& indexmessage?.izFinish=='N')?'start-button':'end-button'"    @click="end(indexmessage)">
+								<view
+									:class="(indexmessage?.izStart=='Y'&& indexmessage?.izFinish=='N')?'start-button':'end-button'"
+									@click="end(indexmessage)">
 									结束服务
 								</view>
 							</view>
 						</view>
 
 						<view class="left-menu">
-							<view  style="margin: 30rpx 0;" @click="errmsgclk(0,1)">
+							<view style="margin: 30rpx 0;" @click="errmsgclk(0,1,indexmessage)">
-								<view class="left-ball" :style="indexmessage?.serviceContent!=''?'background-color: #fff;':'background-color:RGBA(228, 229, 231, 1);'">
+								<view class="left-ball"
-									<image class="left-menu-img" :src="'/static/index/newindex/leftmenu/left'+0+'.png'" />
+									:style="indexmessage?.serviceContent!=''?' ':'opacity: 0.5'">
+									<image class="left-menu-img"
+										:src="'/static/index/newindex/leftmenu/left'+0+'.png'" />
 								</view>
 							</view>
-							<view  style="margin: 30rpx 0;" @click="errmsgclk(1,1)">
+							<view style="margin: 30rpx 0;" @click="errmsgclk(1,1,indexmessage)">
-								<view class="left-ball" :style="indexmessage?.mp3File!=''?'background-color: #fff;':'background-color:RGBA(228, 229, 231, 1);'">
+								<view class="left-ball"
-									<image class="left-menu-img" :src="'/static/index/newindex/leftmenu/left'+1+'.png'" />
+									:style="indexmessage?.mp3File!=''?' ':'opacity: 0.5'">
+									<image class="left-menu-img"
+										:src="'/static/index/newindex/leftmenu/left'+1+'.png'" />
 								</view>
 							</view>
-							<view style="margin: 30rpx 0;" @click="errmsgclk(2,1)">
+							<view style="margin: 30rpx 0;" @click="errmsgclk(2,1,indexmessage)" >
-								<view class="left-ball" :style="indexmessage?.mp4File!=''?'background-color: #fff;':'background-color:RGBA(228, 229, 231, 1);'">
+								<view class="left-ball"
-									<image class="left-menu-img" :src="'/static/index/newindex/leftmenu/left'+2+'.png'" />
+									:style="indexmessage?.mp4File!=''?' ':'opacity: 0.5'">
+									<image class="left-menu-img"
+										:src="'/static/index/newindex/leftmenu/left'+2+'.png'" />
 								</view>
 							</view>
-							<view v-for="(item,index) in [3,4]" :key="index" style="margin: 30rpx 0;" @click="errmsgclk(item,2)">
+							<view v-for="(item,index) in [3,4]" :key="index" style="margin: 30rpx 0;"
-								<view class="left-ball"  :style="indexmessage?.izStart=='Y'?'background-color: #fff;':'background-color:RGBA(228, 229, 231, 1);'">
+								@click="errmsgclk(item,2,indexmessage)">
-									<image class="left-menu-img" :src="'/static/index/newindex/leftmenu/left'+item+'.png'" />
+								<view class="left-ball"
+									:style="indexmessage?.izStart=='Y'?' ':'opacity: 0.5'">
+									<image class="left-menu-img"
+										:src="'/static/index/newindex/leftmenu/left'+item+'.png'" />
 								</view>
 							</view>
 						</view>
@@ -120,17 +131,18 @@
 							<view class="zhezhao-bottom"></view>
 							<image class="top-img" :src="`/static/index/newindex/rightmenu/top.png`" />
 							<view scroll-y="true" class="right-scroll">
-								<view style="height: 20rpx;"> </view>
+								<!-- <view style="height: 1.4vw;"> </view> -->
 
-								<view style="margin: 20rpx 0;width: 110rpx;margin-left: 20rpx;" @click="zhixing(1)">
+								<view style="margin:1.5vw 0;width: 110rpx;margin-left: 20rpx;" @click="zhixing(1,indexmessage)">
-									<view class="white-circle" :style="indexmessage?.izStart=='Y'?'background-color:RGBA(228, 229, 231, 1)' : ''">
+									<view class="white-circle"
+										:style="indexmessage?.izStart=='Y'?'opacity: 0.7' : ''">
 										<image class="right-menu-img" :src="'/static/index/newindex/rightmenu/1.png'" />
 										<view class="right-menu-name">
 											转单执行
 										</view>
 									</view>
 								</view>
-								<view style="margin: 20rpx 0;width: 110rpx;margin-left: 20rpx;" @click="zhixing(2)">
+								<view style="margin:1.5vw 0;width: 110rpx;margin-left: 20rpx;" @click="zhixing(2,indexmessage)">
 									<view class="white-circle">
 										<image class="right-menu-img" :src="'/static/index/newindex/rightmenu/2.png'" />
 										<view class="right-menu-name">
@@ -138,9 +150,7 @@
 										</view>
 									</view>
 								</view>
-								<view style="height: 30rpx;">
+								<view style="height: 2.9vw;"> </view>
-						
-								</view>
 							</view>
 							<image class="top-img" :src="`/static/index/newindex/rightmenu/bottom.png`" />
 						</view>
@@ -164,7 +174,7 @@
 						style="border: 1px solid #f8f8f8;width: 16vw;margin: 0 0.8vw;;height: 17vw;border-radius: 1.1vw;background: #f8f8f8;display: flex;flex-direction: column;align-items: center;"
 						:style="v.flag?'border: 1px solid #0385FA;background: #fff !important;':''">
 						<image style="width: 9vw;height: 9vw;border-radius: 50%;margin: 1vw auto;"
-						 		:src="v.headPath?serverUrl+v.headPath:'/static/shouye/xd.png'" />
+							:src="v.headPath?serverpicUrl+v.headPath:'/static/shouye/xd.png'" />
 						<view class="name-weight">
 							{{v.name }}
 						</view>
@@ -188,6 +198,70 @@
 				<view v-if="!flag" class="huibt">确定</view>
 			</view> -->
 		</view>
+
+		<view class="mengban" v-if="topbuttontarget>0" @click="topbuttontarget=0"></view>
+		<view class="photowall" v-show="topbuttontarget>0" :style="donghuaopo?{opacity:1}:{opacity:0}">
+			<view class="photowall-title">
+				<view class="photowall-name">
+					{{ topbuttontarget==1?`照片`:`录像` }}
+				</view>
+			</view>
+			<scroll-view scroll-y="true" class="photowall-other" scroll-with-animation enable-flex
+				v-if="topbuttontarget>0">
+				<view class="photowall-other">
+					<view class="photowall-other-one" v-for="(item,index) in ilanarr" :key="index"
+						@click="previewImage(item,index,ilanarr)">
+						<view v-if="topbuttontarget==1"
+							style="width: 100%;height: 70%;border-radius: 30rpx;position: relative;">
+							<image style="width: 100%;height: 100%;border-radius: 30rpx;"
+								:src="item?serverpicUrl + item:'/static/ceshiyaoshan.png'" mode="aspectFill"
+								:lazy-load="true" />
+							<view @click.stop="open=1;del(item,index)" class="del" v-if="topbuttontarget>0&&(listobj.izStart=='Y'&& listobj.izFinish=='N')">
+								<image src="/static/index/warehouse/procurement/x.png" mode="aspectFill" style="width: 1.4vw;
+						height: 1.4vw;"></image>
+							</view>
+						</view>
+						<view v-if="topbuttontarget==2"
+							style="width: 100%;height: 70%;border-radius: 30rpx ;position: relative;">
+							<video style="width: 100%;height: 100%;border-radius: 30rpx;" :id="'myVideo'+index"
+								:src="servervideoUrl+item" direction="180" mode="aspectFill"></video>
+							<view @click.stop="ilanarr.splice(index,1)"
+								v-if="topbuttontarget>0&&(listobj.izStart=='Y'&& listobj.izFinish=='N')" class="shanchu">
+								<image src="/static/index/warehouse/procurement/x.png" mode="aspectFill" style="width: 1.4vw;
+						height: 1.4vw;"></image>
+							</view>
+						</view> 
+					</view>
+					<view class="photowall-other-one"
+						v-if="topbuttontarget>0&&(listobj.izStart=='Y'&& listobj.izFinish=='N')">
+						<view class="uplods" @click="uplod(1)">
+							<image style="width: 70rpx;height: 70rpx;margin-bottom: 5rpx;"
+								src="/static/index/warehouse/procurement/picking/addphoto.png" />
+							<view style="color: #78B1EB;">
+								点击上传{{topbuttontarget==1?'图片':'录像'}}
+							</view>
+						</view>
+					</view>
+					<!-- <view class="noarray" v-if="!ilanarr.length">
+					<image class="noarray-img" src="/static/index/warehouse/procurement/picking/noarray.png"
+						mode="aspectFill" />
+					<view class="noarray-font">
+						暂无照片
+					</view>
+				</view> -->
+				</view>
+			</scroll-view>
+			<view style="position: absolute;right: 2vw;bottom: 0.8vw;height: 4vw;"
+				v-if="topbuttontarget>0&&(listobj.izStart=='Y'&& listobj.izFinish=='N')">
+				<view class="subnt" @click="submit">确定</view>
+
+			</view>
+		</view>
+		<tanchuang :show="open==1" font="是否删除此图片" @back="open = 0" @right="del1()"> </tanchuang>
+
+
+
+		<severcard ref="severcards" style="display: none;"></severcard>
 	</view>
 </template>
 
@@ -241,7 +315,7 @@
 	})
 	const zdxzdex = ref(0)
 	const zdxzarr = ref(0)
-	const zhixing = (e)=>{
+	const zhixing = (e,indexmessage) => {
 		if (indexmessage.value?.izStart == 'Y' && e == 1) {
 			uni.showToast({
 				title: '服务中不能转单！',
@@ -250,20 +324,112 @@
 			return
 		}
 		queryEmpList({ id: uni.getStorageSync('userInfo').id }).then(res => {
+			console.log(res)
 			zdxzarr.value = res.result;
 			zdxzarr.value.forEach(item => {
 				item.flag = false
+				console.log(item.headPath)
 			})
 			zdxzdex.value = e;
 		})
 	}
 	const plsbuy = ref([])
+	const flag = ref(false)
+	const zdwu = (e,k)=>{
+		if(zdxzdex.value==1){
+			 e.flag = !e.flag;
+			 zdxzarr.value.forEach((item,i)=>{
+				 if(i!=k){
+					 item.flag = false
+				 }
+			 })
+			 flag.value = e.flag
+		}
+		if(zdxzdex.value==2){
+			 e.flag = !e.flag;
+			 let arr = [];
+			 zdxzarr.value.forEach((item,i)=>{
+				 if(item.flag){
+					 arr.push(1)
+				 }
+			 })
+			 if(arr.length==0){
+				 flag.value = false;
+			 }else{
+				 flag.value = true;
+			 }
+		}
+	}
+	const zhixingsub = ()=>{
+		zxzd.value = zdxzdex.value
+		if(zdxzdex.value==1){
+			  zdcont.value = "确认转单执行？"
+		}
+		if(zdxzdex.value==2){
+			  zdcont.value = "确认协助执行？"
+		}
+	}
+	const zxzd = ref(0);
+	const zdcont = ref('');
+	const tijiaozx = ()=>{
+		if(zxzd.value == 1){
+			let s = {}
+			zdxzarr.value.forEach((item,i)=>{
+				 if(item.flag){
+					 s = item;
+				 }
+			})
+			let obj = {
+				mainId:indexmessage.value.mainId,
+				employeeId:s.id,
+				employeeName:s.name,
+				beforeBy:indexmessage.value.employeeId,
+				beforeByName:indexmessage.value.employeeName
+			}
+			let nuId = uni.getStorageSync('nuId');
+			transferOrder(obj).then(res=>{
+				if(res.success){
+					firstgetqueryCgdList(nuId);
+					flag.value = false;
+					zxzd.value = 0;
+					zdxzdex.value = 0;
+				}
+			})
+		}
+		if(zxzd.value == 2){
+			let userinfo = uni.getStorageSync('userInfo')
+			let id = userinfo.id+',';
+			let name = userinfo.realname+',';
+			zdxzarr.value.forEach((item,i)=>{
+				 if(item.flag){
+					 id+=item.id+','
+					 name+=item.name+','
+				 }
+			})
+			id = id.slice(0, -1);
+			name = name.slice(0, -1);
+			let obj = {
+				mainId:indexmessage.value.mainId,
+				optIds:id,
+				optNames:name,
+				beforeBy:indexmessage.value.employeeId,
+				beforeByName:indexmessage.value.employeeName
+			}
+			assistOrder(obj).then(res=>{
+				if(res.success){
+					firstgetqueryCgdList(form.nuId)
+					// clickLeftMenu(0,{id:indexmessage.value.mainId})
+					flag.value = false;
+					zxzd.value = 0;
+					zdxzdex.value = 0;
+				}
+			})
+		}
+	}
 	// const indexmessage = ref({});
 	const firstgetqueryCgdList = (nuId) => {
 		form.nuId = nuId;
 		queryOrderList(form).then(res => { 
-			console.log(form)
-			console.log(res.result.records)
 			if (res.result.records.length > 0) {
 				plsbuy.value = res.result.records
 				// indexmessage.value = res.result.records[0]
@@ -320,6 +486,14 @@
 		videoContext.value = uni.createVideoContext('myVideo' + i);
 		videoContext.value.play()
 	}
+	const pici = ref(0);
+	const del = (v,i) =>{
+		pici.value = i;
+	}
+	const del1=()=>{
+		ilanarr.value.splice(pici.value,1);
+		open.value = 0
+	}
 	const sxdupld = (e) => {
 		let now = new Date();
 		let year = now.getFullYear();
@@ -384,16 +558,33 @@
 			});
 		}
 	}
+	const severcards = ref<InstanceType<typeof ChildComponent>>()
+	const start = (v) => {
+		if (v.izStart != 'N') { return }
+		startOrder({ id: v.id }).then(res => {
+			console.log(res)
+			if (res.success) {
+				v.izStart = "Y";
+				severcards.value.firstgetqueryCgdList()
+			} else {
+
+
+			}
+		})
+	}
+	const endobj = ref({})
 	const end = (v) => {
-		if(indexmessage.value.izStart=='Y'&& indexmessage.value.izFinish=='N'){
+		if (v.izStart == 'Y' && v.izFinish == 'N') {
+			endobj.value = v;
 			open.value = 3;
 		}
 	}
 	const ends = () => {
 
-			endOrder({id:indexmessage.value.id}).then(res=>{
+		endOrder({ id: endobj.value.id }).then(res => {
 			if (res.success) {
 				open.value = 0;
+				endobj.value = {};
 				// severcards.value.firstgetqueryCgdList()
 				firstgetqueryCgdList(uni.getStorageSync('nuId'))
 			} else {
@@ -404,21 +595,21 @@
 	}
 	const errmsg = ref('')
 	const openerror = ref(false);
-	const errmsgclk = (e,k)=>{
+	const errmsgclk = (e, k, indexmessage) => {
 		if (k == 1) {
 			if (indexmessage.value?.izStart == 'Y') {
 				switch (e) {
 					case 0:
-					if(indexmessage.value?.serviceContent==''){return}
+						if (indexmessage?.serviceContent == '') { return }
-						errmsg.value = indexmessage.value?.serviceContent
+						errmsg.value = indexmessage?.serviceContent
 						break;
 					case 1:
-					if(indexmessage.value?.mp3File==''){return}
+						if (indexmessage?.mp3File == '') { return }
-					errmsg.value = indexmessage.value?.mp3File
+						errmsg.value = indexmessage?.mp3File
 						break;
 					case 2:
-					if(indexmessage.value?.mp4File==''){return}
+						if (indexmessage?.mp4File == '') { return }
-					errmsg.value = indexmessage.value?.mp4File
+						errmsg.value = indexmessage?.mp4File
 						break;
 
 					default:
@@ -427,14 +618,14 @@
 				openerror.value = true;
 			}
 		} else {
-			if(indexmessage.value?.izStart=='Y'){
+			if (indexmessage?.izStart == 'Y') {
 
 				switch (e) {
 					case 3:
-					ysptp(indexmessage.value,0,1)
+						ysptp(indexmessage, 0, 1)
 						break;
 					case 4:
-					ysptp(indexmessage.value,0,2)
+						ysptp(indexmessage, 0, 2)
 						break;
 
 					default:
@@ -455,14 +646,15 @@
 		} else if (r == 3 && v.tplinkPath) {
 			ilanarr.value = v.tplinkPath.split(",");
 			ilanarr.value = ilanarr.value.filter(item => item !== '');
-		}
+		} else {
-		else{
 			ilanarr.value = [];
 		}
 
 		listobj.value = v;
 		topbuttontarget.value = r;
 		donghuaopo.value = true;
+		console.log(listobj.value)
+		console.log(topbuttontarget.value)
 	}
 	const fwzlindex = ref(0);
 	const fwzldex = ref(-1);
@@ -507,19 +699,81 @@
 </script>
 
 <style scoped lang="less">
+	.shanchu{
+		width: 1.6vw;
+		height: 1.6vw;
+		z-index: 20;
+		position: absolute;
+		right: -1vw;
+		top: -0.7vw;
+		background: red;
+		display: flex;
+		justify-content: center;
+		border-radius: 50%;
+		align-items: center;
+	}
+	.del{
+		width: 1.6vw;
+		height: 1.6vw;
+		z-index: 20;
+		position: absolute;
+		right: -1vw;
+		top: -0.7vw;
+		background: red;
+		display: flex;
+		justify-content: center;
+		border-radius: 50%;
+		align-items: center;
+	}
+	.uplods {
+		width: 100%;
+		height: 71%;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		position: absolute;
+		top: 0vw;
+		left: 0;
+		background-color: #fafdff;
+		border: 1rpx solid #78B1EB;
+		border-radius: 30rpx;
+	}
+
+	.subnt {
+		width: 8.2vw;
+		height: 3.3vw;
+		background: #EDEDEF;
+		border-radius: 1.6vw;
+		font-weight: 400;
+		font-size: 1.6vw;
+		color: #888888;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border: 1px solid #EDEDEF;
+		background: linear-gradient(0deg, #CAE0F9, #E9F4FF);
+		border: 1px solid rgba(3, 133, 250, 0.34);
+		color: #0385FA;
+	}
+
 	.swipeservwe {
-		width: 65vw;
+		width: 65.35vw;
-		height: 70vh;
+		height: 46.5vw;
 		position: relative;
-		background-color: #F2F3F8;
+		background-color: #fff;
+		border-radius: 16px;
+		margin-top: 0.5vw;
+		padding: 3vw 0 0;
 		.bots {
 			width: 60%;
 			position: absolute;
 			height: 30rpx;
-			bottom: 0;
+			bottom: 2.2vw;
 			left: 20%;
 			display: flex;
 			justify-content: center;
+
 			view {
 				width: 1.3vw;
 				height: 0.6vw;
@@ -527,10 +781,12 @@
 				border-radius: 0.2vw;
 				margin: 0.7vw;
 			}
+
 			.dot {
 				background: #0193F4;
 			}
 		}
+
 		.btn {
 			width: 2.4vw;
 			height: 2.4vw;
@@ -542,20 +798,25 @@
 			justify-content: center;
 			align-items: center;
 			z-index: 99;
+
 			image {
-				width: 80%;
+				width: 60%;
-				height: 80%;
+				height: 60%;
 			}
 		}
+
 		.les {
-			left: 0;
+			left: 1.5vw;
 		}
+
 		.ris {
-			right: 0;
+			right: 1.5vw;
 		}
+
 		.swiper {
 			width: 100%;
 			height: 100%;
+
 			.swper {
 				width: 100%;
 				height: 100%;
@@ -563,6 +824,7 @@
 			}
 		}
 	}
+
 	.lanbt {
 		width: 8.2vw;
 		height: 3.3vw;
@@ -579,6 +841,7 @@
 		border: 1px solid rgba(3, 133, 250, 0.34);
 		color: #0385FA;
 	}
+
 	.huibt {
 		width: 8.2vw;
 		height: 3.3vw;
@@ -614,6 +877,7 @@
 			display: flex;
 			flex-direction: column;
 			align-items: center;
+
 			>text {
 				font-weight: 400;
 				font-size: 1.3vw;
@@ -621,6 +885,7 @@
 			}
 		}
 	}
+
 	.juzhong {
 		position: absolute;
 		top: 0%;
@@ -628,13 +893,15 @@
 		transform: translate(-50%, -20%);
 		z-index: -1;
 	}
+
 	.cardbox {
 		width: 40vw;
-		height:34vh;
+		height: 30vh;
 		position: relative;
 		top: -5vh;
 		z-index: 55;
 		left: 2vw;
+
 		.shadow {
 			width: 100%;
 			height: 5.5vw;
@@ -646,25 +913,28 @@
 			background: linear-gradient(to bottom, RGBA(239, 240, 244, 1), RGBA(239, 240, 244, 1));
 			z-index: 55;
 		}
+
 		.scrollcard {
 			width: 42vw;
-			height:35vh;
+			height: 30vh;
 			position: relative;
 
 			.itemcard {
 				width: 11.2vw;
 				height: 8vw;
-					background: #F8F8F8;
+				background: rgba(255,255,255,0.5);
 				border-radius: 1.6vw;
 				margin: 1.2vw 1.5vw 0 0vw;
 				display: inline-block;
-					border: 2px solid #F8F8F8;
+				border: 2px solid #DCDCDC;
 				text-align: center;
+
 				image {
 					width: 3.3vw;
 					height: 3.3vw;
 					margin: 0.8vw auto 0vw;
 				}
+
 				text {
 					display: block;
 					text-align: center;
@@ -676,6 +946,7 @@
 					text-overflow: ellipsis;
 					overflow: hidden;
 				}
+
 				view {
 					text-align: center;
 					font-weight: 400;
@@ -685,15 +956,19 @@
 				}
 
 			}
+
 			.act {
-					background: #fff;
+				background: rgba(255,255,255,0.6);
-					border: 2px dashed rgba(1,125,233,0.43);
+				border: 2px dashed #0089FE;
-					text,view{
+
+				text,
+				view {
 					color: #017DE9;
 				}
 			}
 		}
 	}
+
 	.weight-time {
 		font-weight: 800;
 		font-size: 70rpx;
@@ -703,9 +978,10 @@
 	}
 
 	.big-img {
-		height: 550rpx;
+		height: 500rpx;
 		z-index: 100;
 		margin-top: -100rpx;
+
 		image {
 			width: 100%;
 			height: 100%;
@@ -795,8 +1071,8 @@
 
 	.left-menu {
 		position: absolute;
-		top: 45%;
+		top: 40%;
-		left: 100rpx;
+		left:6vw;
 		transform: translateY(-50%);
 	}
 
@@ -813,6 +1089,7 @@
 		display: flex;
 		justify-content: center;
 		align-items: center;
+		background:  #F1F2F3;
 
 
 		.left-menu-img {
@@ -823,8 +1100,8 @@
 
 	.right-menu {
 		position: absolute;
-		top: 45%;
+		top: 40%;
-		right: 80rpx;
+		right: 6vw;
 		transform: translateY(-50%);
 		display: flex;
 		flex-direction: column;
@@ -832,8 +1109,8 @@
 		width: 140rpx;
 
 		.top-img {
-			width: 140rpx;
+			width: 4.9vw;
-			height: 110rpx;
+			height:4.9vw;
 			padding: 0 50rpx;
 		}
 
@@ -845,7 +1122,7 @@
 		.white-circle {
 			height: 170rpx;
 			border-radius: 60rpx;
-			background-color: #fff;
+			background: #F7F7F9;
 			display: flex;
 			justify-content: center;
 			align-items: center;
@@ -1079,6 +1356,7 @@
 		height: 4vh;
 		display: flex;
 		justify-content: center;
+
 		.bottom-tags {
 			background-color: #E7F1FF;
 			color: #0084FA;
@@ -1108,11 +1386,13 @@
 		align-items: center;
 		transition: all 0.5s ease;
 		padding: 0 0 0 1.5vw;
+
 		.fixed-card-left {
 			display: flex;
 			flex-direction: column;
 			align-items: center;
 			margin-right: 1.2vw;
+
 			.card-left-img {
 				width: 12vw;
 				height: 8vw;
@@ -1143,6 +1423,7 @@
 			font-size: 1.5vw;
 			width: 18.5vw;
 			justify-content: space-around;
+
 			.button-left {
 				width: 8.5vw;
 				height: 3.3vw;
@@ -1218,6 +1499,7 @@
 		color: #888888;
 		font-size: 25rpx;
 	}
+
 	.mengban {
 		width: 100vw;
 		height: 100vh;
@@ -1227,6 +1509,7 @@
 		z-index: 100;
 		background: RGBA(239, 240, 244, 0.55);
 	}
+
 	.photowall {
 		position: fixed;
 		top: 54%;
@@ -1240,6 +1523,7 @@
 		z-index: 9990;
 		box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.1);
 		padding: 0 90rpx;
+
 		.photowall-title {
 			margin-top: 50rpx;
 			display: flex;
@@ -1268,6 +1552,7 @@
 			display: flex;
 			margin-top: 20rpx;
 			flex-wrap: wrap;
+
 			.photowall-other-one {
 				width: 22vw;
 				height: 430rpx;
@@ -1276,6 +1561,7 @@
 				border-radius: 30rpx;
 				display: flex;
 				position: relative;
+
 				video {
 					width: 100%;
 					height: 100%;
@@ -1283,16 +1569,19 @@
 			}
 		}
 	}
+
 	.guodu {
 		transition: .4s;
 		-webkit-transform-style: preserve-3d;
 		-webkit-overflow-scrolling: touch;
 	}
+
 	.jsh0 {
 		height: 0vw !important;
 		padding: 0 2vw !important;
 		top: 9.4vw !important;
 	}
+
 	.jszl {
 		width: 64.5vw;
 		height: 44vw;
@@ -1305,6 +1594,7 @@
 		z-index: 200;
 		padding: 2vw;
 		overflow: hidden;
+
 		.submit {
 			width: 100%;
 			height: 3.2vw;
@@ -1312,10 +1602,12 @@
 			padding-right: 2vw;
 			display: flex;
 			justify-content: flex-end;
+
 			view {
 				display: flex;
 				justify-content: center;
 				align-items: center;
+
 				&:nth-child(1) {
 					width: 7.1vw;
 					height: 3.2vw;
@@ -1326,6 +1618,7 @@
 					font-size: 1.4vw;
 					color: #555555;
 				}
+
 				&:nth-child(2) {
 					width: 7.1vw;
 					height: 3.2vw;
@@ -1339,6 +1632,7 @@
 				}
 			}
 		}
+
 		.scrol {
 			width: 110%;
 			height: 29.5vw;
@@ -1354,11 +1648,13 @@
 				display: inline-block;
 				border: 1px solid #F8F8F8;
 				text-align: center;
+
 				image {
 					width: 2vw;
 					height: 2vw;
 					margin: 1.4vw auto 0vw;
 				}
+
 				text {
 					display: block;
 					text-align: center;
@@ -1367,6 +1663,7 @@
 					color: #333333;
 					width: 100%;
 				}
+
 				view {
 					text-align: center;
 					font-weight: 400;
@@ -1375,20 +1672,24 @@
 					width: 100%;
 				}
 			}
+
 			.act {
 				background: #F2F8FF;
 				border: 1px solid rgba(1, 125, 233, 0.43);
+
 				text {
 					color: #017DE9;
 				}
 			}
 		}
+
 		.spiw {
 			width: 14vw;
 			height: 2vw;
 			display: flex;
 			justify-content: space-around;
 			margin-top: 2.5vw;
+
 			view {
 				font-weight: 400;
 				font-size: 1.3vw;
@@ -1396,10 +1697,12 @@
 				position: relative;
 				line-height: 1.5vw;
 			}
+
 			.act {
 				color: #222222 !important;
 				font-weight: 500;
 			}
+
 			.act::after {
 				width: 50%;
 				height: 0.2vw;
@@ -1411,6 +1714,7 @@
 				left: 25%;
 			}
 		}
+
 		.tittop {
 			height: 2vw;
 			font-weight: 400;
@@ -1418,6 +1722,7 @@
 			color: #333333;
 			display: flex;
 			align-items: center;
+
 			view {
 				width: 0.4vw;
 				height: 1.2vw;