diff --git a/src/pages/pageHome/pageHome.vue b/src/pages/pageHome/pageHome.vue
index 2235277..215686a 100644
--- a/src/pages/pageHome/pageHome.vue
+++ b/src/pages/pageHome/pageHome.vue
@@ -10,7 +10,7 @@
 				<image src="../../static/icon11.png" mode="" class="appname"></image>
 			</view>
 			<!-- 轮播图 -->
-			<u-swiper :list="list" keyName="imagePath" indicator indicatorMode="line" circular @click="goSwiDetail"></u-swiper>
+			<u-swiper :list="list" keyName="imagePath" indicator indicatorMode="line" circular @click="goSwiDetail" imgMode="aspectFit"></u-swiper>
 			<!-- 功能菜单 -->
 			<view class="menus">
 				<u-grid :border="false" col="4">
@@ -62,7 +62,7 @@
 					最精彩的文艺活动
 				</view>
 				<view class="scrollEle">
-					<u-swiper :list="list2" keyName="image" showTitle :autoplay="false" circular @click="goActDeat">
+					<u-swiper :list="list2" keyName="image" showTitle :autoplay="false" circular @click="goActDeat" imgMode="aspectFit">
 					</u-swiper>
 				</view>
 			</view>
@@ -137,7 +137,8 @@
 				</view> -->
 			</view>
 			<u-gap height="12"></u-gap>
-			<u-modal :show="isUnread" content='您有一条未读消息' :closeOnClickOverlay="true" @confirm="toMsg()" @close="isUnread=false"></u-modal>
+			<u-modal :show="isUnread" content='您有一条未读消息' :closeOnClickOverlay="true" @confirm="toMsg()" @close="isUnread=false" confirmColor="#99241B" confirmText="前往查看"></u-modal>
+			<u-modal :show="isUnsh" content='您有未审核活动申请' :closeOnClickOverlay="true" @confirm="toActiveManage()" @close="isUnsh=false" confirmColor="#99241B" confirmText="前往查看"></u-modal>
 			<view class="not">
 				<view class="notice">
 					本服务由象山县文学艺术界联合会提供
@@ -161,6 +162,7 @@
 			return {
 				load: true,
 				isUnread: false,
+				isUnsh: false,
 				artValue: '',
 				statusHeight: 0,
 				titleHeight: 50,
@@ -365,6 +367,7 @@
 					if (res.code == 200) {
 						this.background = res.data[0].imagePath
 						this.getTalkList()
+						this.getUnshList()
 						this.load = false
 					}
 				}).catch(e => {
@@ -395,6 +398,23 @@
 						});
 					});
 			},
+			//未审核
+			getUnshList() {
+				let _this = this;
+				this.http
+					.request("/activity/cancelCount", {}, "GET")
+					.then((res) => {
+						if (res.code == 200) {
+							if (res.data > 0) this.isUnsh = true;
+						}
+					})
+					.catch((e) => {
+						uni.showToast({
+							title: e.data.message,
+							icon: "none",
+						});
+					});
+			},
 			navigateToFun(url) {
 				uni.navigateTo({
 					url
@@ -454,6 +474,11 @@
 					url: "/pagesA/msg/msg",
 				})
 			},
+			toActiveManage(){
+				uni.navigateTo({
+					url: "/pagesA/activeManage/activeManage",
+				})
+			},
 			famouserDetaol(val) {
 				uni.navigateTo({
 					url: "/pagesC/famousArts/famousArts?id=" + val
diff --git a/src/pagesA/activeManage/activeManage.vue b/src/pagesA/activeManage/activeManage.vue
index 46cc087..9b31f15 100644
--- a/src/pagesA/activeManage/activeManage.vue
+++ b/src/pagesA/activeManage/activeManage.vue
@@ -5,7 +5,7 @@
 		</view>
 		<view v-if="load == false">
 			<view class="tabs" v-if="isAdmin">
-				<view class="tabBox" >
+				<view class="tabBox">
 					<view class="textBox" @click="toFB()">
 						我发布的
 					</view>
@@ -50,7 +50,11 @@
 					<view class="btn_w" @click="toQd(v.id)">
 						签到管理
 					</view>
+
 					<view class="btn_r" @click="toSh(v.id)">
+						<view class="box">
+							<u-badge max="99" :value="v.qxBmCount" :showZero="true"></u-badge>
+						</view>
 						审核管理
 					</view>
 				</view>
@@ -275,7 +279,7 @@
 			}
 		},
 		onShow() {
-			
+
 		},
 		// 下拉刷新
 		onPullDownRefresh() {
@@ -285,7 +289,7 @@
 				this.getFB()
 			} else if (this.tab == 1) {
 				this.getData()
-			}else if (this.tab == 2) {
+			} else if (this.tab == 2) {
 				this.getZZ()
 			}
 			setTimeout(function() {
@@ -299,7 +303,7 @@
 				this.getFB()
 			} else if (this.tab == 1) {
 				this.getData()
-			}else if (this.tab == 2) {
+			} else if (this.tab == 2) {
 				this.getZZ()
 			}
 		},
@@ -625,6 +629,17 @@
 				font-weight: 500;
 				float: right;
 				margin-left: 20rpx;
+				position: relative;
+
+				.box {
+					width: auto;
+					height: 15px;
+					background-color: #909193;
+					border-radius: 15px;
+					position: absolute;
+					top: 0;
+					right: 0;
+				}
 			}
 
 			.btn_w {
diff --git a/src/pagesA/activeManage/signIn.vue b/src/pagesA/activeManage/signIn.vue
index 6e2b707..2db90a0 100644
--- a/src/pagesA/activeManage/signIn.vue
+++ b/src/pagesA/activeManage/signIn.vue
@@ -5,7 +5,7 @@
 		</view>
 		<view v-if="load == false">
 			<view class="top_swiper">
-				<u-swiper :list="img" indicator indicatorMode="line" circular height="200"></u-swiper>
+				<u-swiper :list="img" indicator indicatorMode="line" circular height="200" imgMode="aspectFit"></u-swiper>
 			</view>
 			<view class="top_title">
 				标题
@@ -73,9 +73,7 @@
 		},
 		methods: {
 			getData() {
-				this.http.request('/activity/details', {
-					id: this.id
-				}, "GET").then(res => {
+				this.http.request('/activity/details/' + this.id, {}, "GET").then(res => {
 					this.serveList = res.data
 					this.img = res.data.images.split(',')
 				}).catch(e => {
diff --git a/src/pagesA/addArtActivity/addArtActivity.vue b/src/pagesA/addArtActivity/addArtActivity.vue
index 046bf1c..703d627 100644
--- a/src/pagesA/addArtActivity/addArtActivity.vue
+++ b/src/pagesA/addArtActivity/addArtActivity.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="">
+	<view style="padding-bottom: 30rpx;">
 		<view class="form_line">
 			<view class="form_left">
 				活动名称
diff --git a/src/pagesA/my/My.vue b/src/pagesA/my/My.vue
index 98b599c..53e9b6f 100644
--- a/src/pagesA/my/My.vue
+++ b/src/pagesA/my/My.vue
@@ -195,7 +195,7 @@
 							this.userId = res.data.id;
 							this.yhsf = res.data.yhsf;
 							this.point = res.data.point;
-							if(this.yhsf == '文艺工作者' && res.data.association.name){
+							if(this.yhsf == '文艺工作者' && res.data.association){
 								this.association = res.data.association.name
 							}
 							this.getCol();
diff --git a/src/pagesA/my/editWorkNext.vue b/src/pagesA/my/editWorkNext.vue
index 53d1819..b3cf184 100644
--- a/src/pagesA/my/editWorkNext.vue
+++ b/src/pagesA/my/editWorkNext.vue
@@ -125,13 +125,18 @@
 					<view class="popText">2、处罚规则：第一次删文并警告、第二次封号7天、第三次封号15天、第四次封号30天、第五次永久封号。</view>
 					<view class="popText">3、艺象心平台支持并鼓励有价值的原创作品，坚决打击和反对抄袭等侵权行为。如果发现有抄袭等侵权情况，可以通过以下“侵权投诉”流程进行举报（联系管理电话：65712324）。</view>
 					<view class="popBtns">
-						<u-button text="取消" throttleTime=1000 color="#99241B" @click="close()" :plain="true">
-						</u-button>
-						<u-button v-if="disPopSure" throttleTime=1000 color="#99241B" @click="popSure()" :disabled="true">
-							{{ codeData.second }}秒后可确认
-						</u-button>
-						<u-button v-else text="确定" throttleTime=1000 color="#99241B" @click="popSure()">
-						</u-button>
+						<view class="popB">
+							<u-button text="取消" throttleTime=1000 color="#99241B" @click="close()" :plain="true">
+							</u-button>
+						</view>
+						<view class="popB">
+							<u-button v-if="disPopSure" throttleTime=1000 color="#99241B" @click="popSure()" :disabled="true">
+								{{ codeData.second }}秒后可确认
+							</u-button>
+							<u-button v-else text="确定" throttleTime=1000 color="#99241B" @click="popSure()">
+							</u-button>
+						</view>
+						
 					</view>
 				</view>
 			</u-popup>
@@ -543,6 +548,9 @@
 			margin-top: 32rpx;
 			display: flex;
 			justify-content: space-between;
+			.popB {
+				width: 48%;
+			}
 		}
 	
 	}
diff --git a/src/pagesA/my/myWorkDetail.vue b/src/pagesA/my/myWorkDetail.vue
index 288e425..f756866 100644
--- a/src/pagesA/my/myWorkDetail.vue
+++ b/src/pagesA/my/myWorkDetail.vue
@@ -5,15 +5,15 @@
 		</view>
 		<view class="workDetail" v-if="load == false">
 			<!-- 封面图片 -->
-			<view style="width: 100%;">
+			<!-- <view style="width: 100%;">
 				<image style="width: 100%;" :src="cover" mode="widthFix"></image>
-			</view>
+			</view> -->
 			<!-- 轮播图 -->
-			<!-- <u-swiper v-if="list.length > 0" :list="list" :autoplay="true" @change="e => currentNum = e.current" indicatorStyle="right: 20px">
-				<view slot="indicator" class="indicator-num">
+			<u-swiper v-if="list.length > 0" :list="list" :autoplay="true" @change="e => currentNum = e.current" indicatorStyle="right: 20px">
+				<view slot="indicator" class="indicator-num" imgMode="aspectFit">
 					<text class="indicator-num__text">{{ currentNum + 1 }}/{{ list.length }}</text>
 				</view>
-			</u-swiper> -->
+			</u-swiper>
 			<!-- 作品名称 -->
 			<view class="work_name">
 				{{detailData.name}}
@@ -69,7 +69,7 @@
 				</view>
 			</view>
 			<!-- 其他图片 -->
-			<image v-if="list.length > 0" v-for="item in list" :src="item" mode="widthFix" alt="" class="decTmgs"></image>
+			<!-- <image v-if="list.length > 0" v-for="item in list" :src="item" mode="widthFix" alt="" class="decTmgs"></image> -->
 			<!-- 附带文件 -->
 			<view class="file_box" v-for="(item,index) in list2" :key="index" @click="downLoad(item.url)">
 				<view class="file_box_left">
@@ -152,10 +152,10 @@
 								} 
 							})
 						}
-						if(this.list.length > 0){
-							this.cover = this.list[0]
-							this.list.splice(0,1)
-						}
+						// if(this.list.length > 0){
+						// 	this.cover = this.list[0]
+						// 	this.list.splice(0,1)
+						// }
 						this.detailData = res.data
 						_this.load = false
 					}
diff --git a/src/pagesB/ArtRace/ArtRaceDetail.vue b/src/pagesB/ArtRace/ArtRaceDetail.vue
index 7e6705e..27f1661 100644
--- a/src/pagesB/ArtRace/ArtRaceDetail.vue
+++ b/src/pagesB/ArtRace/ArtRaceDetail.vue
@@ -9,7 +9,7 @@
 			</view>
 			<view class="pageImg">
 				<u-swiper v-if="list.length > 0" :list="list" :autoplay="true" @change="e => currentNum = e.current"
-					indicatorStyle="right: 20px" height='440rpx'>
+					indicatorStyle="right: 20px" height='440rpx' imgMode="aspectFit">
 					<view slot="indicator" class="indicator-num">
 						<text class="indicator-num__text">{{ currentNum + 1 }}/{{ list.length }}</text>
 					</view>
diff --git a/src/pagesB/ArtRace/raceWork.vue b/src/pagesB/ArtRace/raceWork.vue
index ef0142b..4af884a 100644
--- a/src/pagesB/ArtRace/raceWork.vue
+++ b/src/pagesB/ArtRace/raceWork.vue
@@ -9,7 +9,7 @@
 			</view>
 			<view class="pageImg">
 				<u-swiper v-if="list.length > 0" :list="list" :autoplay="true" @change="e => currentNum = e.current"
-					indicatorStyle="right: 20px" height='440rpx'>
+					indicatorStyle="right: 20px" height='440rpx' imgMode="aspectFit">
 					<view slot="indicator" class="indicator-num">
 						<text class="indicator-num__text">{{ currentNum + 1 }}/{{ list.length }}</text>
 					</view>
diff --git a/src/pagesB/ArtWorks/artWorkDetail.vue b/src/pagesB/ArtWorks/artWorkDetail.vue
index c48de05..7155fc6 100644
--- a/src/pagesB/ArtWorks/artWorkDetail.vue
+++ b/src/pagesB/ArtWorks/artWorkDetail.vue
@@ -5,22 +5,22 @@
 		</view>
 		<view class="workDetail" v-if="load == false">
 			<!-- 封面图片 -->
-			<view style="width: 100%;">
+			<!-- <view style="width: 100%;">
 				<image style="width: 100%;" :src="cover" mode="widthFix"></image>
-			</view>
+			</view> -->
 			
 			<!-- 轮播图 -->
-			<!-- <u-swiper v-if="list.length > 0" :list="list" :autoplay="true" @change="e => currentNum = e.current" indicatorStyle="right: 20px" height="200">
-				<view slot="indicator" class="indicator-num">
+			<u-swiper v-if="list.length > 0" :list="list" :autoplay="true" @change="e => currentNum = e.current" indicatorStyle="right: 20px" height="200">
+				<view slot="indicator" class="indicator-num" imgMode="aspectFit">
 					<text class="indicator-num__text">{{ currentNum + 1 }}/{{ list.length }}</text>
 				</view>
-			</u-swiper> -->
+			</u-swiper>
 			<!-- 作品名称 -->
 			<view class="work_name">
 				{{detailData.name}}
 			</view>
 			<view class="img_box">
-				<view v-if="detailData.user" class=" puber" @click="toUser(detailData.user.id,detailData.user.images,detailData.user.userName,detailData.isFollow)">
+				<view class=" puber" @click="toUser(detailData.user.id,detailData.user.images,detailData.user.userName,detailData.isFollow)">
 					<view class="avtor">
 						<image :src="detailData.user.images" mode="" style="width: 100%; height: 100%;"></image>
 					</view>
@@ -31,15 +31,8 @@
 						<view class="">
 							发布于{{detailData.releaseDate}}
 						</view>
-					</view>
-				</view>
-				<view v-else class=" puber">
-					<view class="autor">
-						<view style="font-size: 14px; color: #251B1D;">
-							{{ detailData.userNames }}
-						</view>
 						<view class="">
-							发布于{{detailData.releaseDate}}
+							作者：{{detailData.userNames}}
 						</view>
 					</view>
 				</view>
@@ -97,7 +90,7 @@
 				3、艺象心平台支持并鼓励有价值的原创作品，坚决打击和反对抄袭等侵权行为。如果发现有抄袭等侵权情况，可以通过以下“侵权投诉”流程进行举报（联系管理电话：65712324）。
 			</view>
 			<!-- 其他图片 -->
-			<image v-if="list.length > 0" v-for="item in list" :src="item" mode="widthFix" alt="" class="decTmgs"></image>
+			<!-- <image v-if="list.length > 0" v-for="item in list" :src="item" mode="widthFix" alt="" class="decTmgs"></image> -->
 			<!-- 附带文件 -->
 			<view class="file_box" v-for="(item,index) in list2" :key="index" @click="downLoad(item.url)">
 				<view class="file_box_left">
@@ -200,10 +193,10 @@
 								} 
 							})
 						}
-						if(this.list.length > 0){
-							_this.cover = this.list[0]
-							this.list.splice(0,1)
-						}
+						// if(this.list.length > 0){
+						// 	_this.cover = this.list[0]
+						// 	this.list.splice(0,1)
+						// }
 						this.detailData = res.data
 						this.isFollow = this.detailData.isFollow
 						if(this.detailData.user){
diff --git a/src/pagesB/PersonalCenter/ReEditSingleInfo.vue b/src/pagesB/PersonalCenter/ReEditSingleInfo.vue
index 75986f0..148b1ea 100644
--- a/src/pagesB/PersonalCenter/ReEditSingleInfo.vue
+++ b/src/pagesB/PersonalCenter/ReEditSingleInfo.vue
@@ -243,7 +243,7 @@
 			}
 			// 请求 协会 内容
 			if (this.Edkey == '所属协会') {
-				this.http.request('/association/list', {isShow:true}, "GET").then((res) => {
+				this.http.request('/association/list', {isShow:'1'}, "GET").then((res) => {
 
 					res.data.map((v, i) => {
 						return this.xiehuiObj[v.name] = v.id
diff --git a/src/pagesB/PublishWorks/PublishWorksNext.vue b/src/pagesB/PublishWorks/PublishWorksNext.vue
index adaff3b..7ce5b4d 100644
--- a/src/pagesB/PublishWorks/PublishWorksNext.vue
+++ b/src/pagesB/PublishWorks/PublishWorksNext.vue
@@ -99,7 +99,7 @@
 				<button type="default" class="apply" @click="cfmPub()">确认发布</button>
 			</view>
 			<u-popup :show="showMz" @close="close" mode="center" closeOnClickOverlay :round="5"
-				customStyle="padding: 16px;">
+				customStyle="padding: 16px;" :safeAreaInsetBottom="false">
 				<view class="popClass">
 					<view class="popTitle">
 						象山县“艺象心”平台文艺作品管理规定
@@ -128,14 +128,18 @@
 					<view class="popText">
 						3、艺象心平台支持并鼓励有价值的原创作品，坚决打击和反对抄袭等侵权行为。如果发现有抄袭等侵权情况，可以通过以下“侵权投诉”流程进行举报（联系管理电话：65712324）。</view>
 					<view class="popBtns">
-						<u-button text="取消" throttleTime=1000 color="#99241B" @click="close()" :plain="true">
-						</u-button>
-						<u-button v-if="disPopSure" throttleTime=1000 color="#99241B" @click="popSure()"
-							:disabled="true">
-							{{ codeData.second }}秒后可确认
-						</u-button>
-						<u-button v-else text="确定" throttleTime=1000 color="#99241B" @click="popSure()">
-						</u-button>
+						<view class="popB">
+							<u-button text="取消" throttleTime=1000 color="#99241B" @click="close()" :plain="true">
+							</u-button>
+						</view>
+						<view class="popB">
+							<u-button v-if="disPopSure" throttleTime=1000 color="#99241B" @click="popSure()"
+								:disabled="true">
+								{{ codeData.second }}秒后可确认
+							</u-button>
+							<u-button v-else text="确定" throttleTime=1000 color="#99241B" @click="popSure()">
+							</u-button>
+						</view>
 					</view>
 				</view>
 			</u-popup>
@@ -523,6 +527,9 @@
 			margin-top: 32rpx;
 			display: flex;
 			justify-content: space-between;
+			.popB {
+				width: 48%;
+			}
 		}
 
 	}
diff --git a/src/pagesB/improveData/improveData.vue b/src/pagesB/improveData/improveData.vue
index d38724d..a602fd1 100644
--- a/src/pagesB/improveData/improveData.vue
+++ b/src/pagesB/improveData/improveData.vue
@@ -479,7 +479,7 @@
 		onReady() {
 			this.$refs.form1.setRules(this.rules);
 
-			this.http.request('/association/list', {isShow:true}, "GET").then((res) => {
+			this.http.request('/association/list', {isShow:'1'}, "GET").then((res) => {
 				res.data.map((v, i) => {
 					return this.xiehuiObj[v.name] = v.id
 				})
diff --git a/src/pagesB/literFamily/actJianList.vue b/src/pagesB/literFamily/actJianList.vue
index 4fb16c6..49803be 100644
--- a/src/pagesB/literFamily/actJianList.vue
+++ b/src/pagesB/literFamily/actJianList.vue
@@ -66,7 +66,7 @@
 		},
 		methods: {
 			getXh() {
-				this.http.request('/association/list', {}, "GET").then(res => {
+				this.http.request('/association/list', {isShow:'0,1'}, "GET").then(res => {
 					if (res.code == 200) {
 						this.list1 = res.data
 						this.list1.unshift({id:'',name: '全部'})
diff --git a/src/pagesB/literFamily/literFamily.vue b/src/pagesB/literFamily/literFamily.vue
index 009f1ab..fb06266 100644
--- a/src/pagesB/literFamily/literFamily.vue
+++ b/src/pagesB/literFamily/literFamily.vue
@@ -13,7 +13,7 @@
                     </view>
                 </view>
             </view>
-            <u-swiper :list="list" indicator indicatorMode="dot" circular height="240"></u-swiper>
+            <u-swiper :list="list" indicator indicatorMode="dot" circular height="240" imgMode="aspectFit"></u-swiper>
             <view class="layout">
 				<!-- 文创展厅(功能不明，先隐藏) -->
                 <view class="activityColumn">
diff --git a/src/pagesB/orderHall/orderHallDetails.vue b/src/pagesB/orderHall/orderHallDetails.vue
index 8c1b643..34af8e1 100644
--- a/src/pagesB/orderHall/orderHallDetails.vue
+++ b/src/pagesB/orderHall/orderHallDetails.vue
@@ -9,7 +9,7 @@
 			</view>
 			<view class="pageImg">
 				<u-swiper v-if="list.length > 0" :list="list" :autoplay="true" @change="e => currentNum = e.current"
-					indicatorStyle="right: 20px" height='440rpx'>
+					indicatorStyle="right: 20px" height='440rpx' imgMode="aspectFit">
 					<view slot="indicator" class="indicator-num">
 						<text class="indicator-num__text">{{ currentNum + 1 }}/{{ list.length }}</text>
 					</view>
diff --git a/src/pagesC/ActivitiesDetail/ActivitiesDetail.vue b/src/pagesC/ActivitiesDetail/ActivitiesDetail.vue
index a849493..33e90b0 100644
--- a/src/pagesC/ActivitiesDetail/ActivitiesDetail.vue
+++ b/src/pagesC/ActivitiesDetail/ActivitiesDetail.vue
@@ -2,7 +2,7 @@
 	<view>
 		<view class="help_bg_box">
 			<view class=" bg_img_box">
-				<u-swiper :list="img" indicator indicatorMode="line" circular height="200"></u-swiper>
+				<u-swiper :list="img" indicator indicatorMode="line" circular height="200" imgMode="aspectFit"></u-swiper>
 			</view>
 		</view>
 		<view class="header">
diff --git a/src/pagesC/AwardWinningWork/AwardWinningWork.vue b/src/pagesC/AwardWinningWork/AwardWinningWork.vue
index 97be298..8b729c8 100644
--- a/src/pagesC/AwardWinningWork/AwardWinningWork.vue
+++ b/src/pagesC/AwardWinningWork/AwardWinningWork.vue
@@ -58,7 +58,7 @@
 		},
 		methods: {
 			getXh() {
-				this.http.request('/association/list', {}, "GET").then(res => {
+				this.http.request('/association/list', {isShow:'0,1'}, "GET").then(res => {
 					if (res.code == 200) {
 						this.list1 = res.data
 						this.list1.unshift({id:'',name: '全部'})
diff --git a/src/pagesC/Login/Login.vue b/src/pagesC/Login/Login.vue
index f79c415..2679c1c 100644
--- a/src/pagesC/Login/Login.vue
+++ b/src/pagesC/Login/Login.vue
@@ -15,13 +15,17 @@
 					</view>
 
 					<view class="tab_op">
-						<view :class="tab == 0?'choosed':'unchoosed'" @click="pwdLog()">
-							密码登录
-						</view>
-						<view class="whiteBox"></view>
 						<view :class="tab == 1?'choosed':'unchoosed'" @click="codeLog()">
 							验证码登录
 						</view>
+						<view class="whiteBox"></view>
+						<view :class="tab == 0?'choosed':'unchoosed'" @click="pwdLog()">
+							密码登录
+						</view>
+						<!-- <view class="whiteBox"></view>
+						<view :class="tab == 1?'choosed':'unchoosed'" @click="codeLog()">
+							验证码登录
+						</view> -->
 					</view>
 					<u-form-item prop="number" ref="item1" class="data_itm" v-if="tab == 0">
 						<u--input placeholder="请输入手机号" border="bottom" clearable v-model="userInfo.number"></u--input>
@@ -62,10 +66,10 @@
 					<u-button text="登录" size="large" throttleTime=1000 color="#99241B" @click="login()">
 					</u-button>
 					<u-gap height="12"></u-gap>
-					<u-button v-if="isWx" text="手机号快捷登录" size="large" throttleTime=1000 color="#99241B"
+					<u-button v-if="isWx" text="微信手机号快捷登录" size="large" throttleTime=1000 color="#99241B"
 						open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" :plain="true">
 					</u-button>
-					<view class="other_op">
+					<view class="other_op" v-if="tab == '0'">
 						<text @click="goRemeber">忘记密码？</text>
 					</view>
 				</view>
@@ -121,7 +125,7 @@
 						trigger: ['blur']
 					}],
 				},
-				tab: 0,
+				tab: 1,
 				load: false,
 				show: false,
 				wxDate: {
diff --git a/src/pagesC/OrderDetail/OrderDetail.vue b/src/pagesC/OrderDetail/OrderDetail.vue
index 74e35e0..8929b7a 100644
--- a/src/pagesC/OrderDetail/OrderDetail.vue
+++ b/src/pagesC/OrderDetail/OrderDetail.vue
@@ -10,7 +10,7 @@
 						:duration="duration">
 						<swiper-item v-for="(v,i) in img" :key="i">
 							<view class="swiper_box">
-								<image class="swiper_img" :src='img[i]' mode="aspectFill"></image>
+								<image class="swiper_img" :src='img[i]' mode="aspectFit"></image>
 							</view>
 						</swiper-item>
 					</swiper>
@@ -514,13 +514,13 @@
 		}
 
 		swiper {
-			height: 500rpx;
+			height: 600rpx;
 
 			.swiper_box {
 				position: relative;
 				overflow: hidden;
 				width: 100%;
-				height: 500rpx;
+				height: 600rpx;
 
 				.swiper_img {
 					width: 100%;
diff --git a/src/pagesC/SelectId/SelectId.vue b/src/pagesC/SelectId/SelectId.vue
index 6b8f133..231f7b6 100644
--- a/src/pagesC/SelectId/SelectId.vue
+++ b/src/pagesC/SelectId/SelectId.vue
@@ -75,8 +75,27 @@
 			next() {
 				console.log("下一步");
 				if (this.id || this.id == 0) {
-					uni.navigateTo({
-						url: `/pagesB/improveData/improveData?id=` + this.id
+					// uni.navigateTo({
+					// 	url: `/pagesB/improveData/improveData?id=` + this.id
+					// })
+					let data = {
+						userType: this.id
+					}
+					this.http.request('/auth/init', data, "POST").then(res => {
+						if (res.code == 200) {
+							uni.navigateTo({
+								url: '/pages/pageHome/pageHome'
+							})
+							uni.showToast({
+								title: "提交成功",
+								icon: "none",
+							});
+						}
+					}).catch(e => {
+						uni.showToast({
+							title: e.data.message,
+							icon: "none",
+						});
 					})
 				} else {
 					uni.showToast({
diff --git a/src/pagesC/shop/Shop.vue b/src/pagesC/shop/Shop.vue
index 8ca18b9..3a75a8f 100644
--- a/src/pagesC/shop/Shop.vue
+++ b/src/pagesC/shop/Shop.vue
@@ -85,8 +85,8 @@
 					</scroll-view>
 				</view>
 			</view>
-			<u-gap height="50" bgColor="#fff" v-if="typesOf == '1'"></u-gap>
-			<tabbar tabbarId='4' v-if="typesOf == '1'"></tabbar>
+			<u-gap height="50" bgColor="#fff"></u-gap>
+			<tabbar tabbarId='4'></tabbar>
 		</view>
 	</view>
 
diff --git a/src/pagesD/wyxx/artProgram.vue b/src/pagesD/wyxx/artProgram.vue
index 33941d5..d08ab48 100644
--- a/src/pagesD/wyxx/artProgram.vue
+++ b/src/pagesD/wyxx/artProgram.vue
@@ -6,7 +6,7 @@
 		<view class="page" v-if="load == false">
 			<view class="pageImg" v-if="list.length > 0">
 				<u-swiper v-if="list.length > 0" :list="list" :autoplay="true" @change="(e) => (currentNum = e.current)"
-					indicatorStyle="right: 20px" height="440rpx">
+					indicatorStyle="right: 20px" height="440rpx" imgMode="aspectFit">
 					<view slot="indicator" class="indicator-num">
 						<text class="indicator-num__text">{{ currentNum + 1 }}/{{ list.length }}</text>
 					</view>
diff --git a/src/pagesD/wyxx/artTeam.vue b/src/pagesD/wyxx/artTeam.vue
index 222d9d3..b9628f4 100644
--- a/src/pagesD/wyxx/artTeam.vue
+++ b/src/pagesD/wyxx/artTeam.vue
@@ -6,7 +6,7 @@
 		<view class="page" v-if="load == false">
 			<view class="pageImg" v-if="list.length > 0">
 				<u-swiper v-if="list.length > 0" :list="list" :autoplay="true" @change="(e) => (currentNum = e.current)"
-					indicatorStyle="right: 20px" height="440rpx">
+					indicatorStyle="right: 20px" height="440rpx" imgMode="aspectFit">
 					<view slot="indicator" class="indicator-num">
 						<text class="indicator-num__text">{{ currentNum + 1 }}/{{ list.length }}</text>
 					</view>
diff --git a/src/pagesD/xskz/details.vue b/src/pagesD/xskz/details.vue
index da6692c..853bcd5 100644
--- a/src/pagesD/xskz/details.vue
+++ b/src/pagesD/xskz/details.vue
@@ -17,6 +17,32 @@
 		<view v-else class="teamBox-top" @click="toDetail()">
 			<image :src="cover" mode="" style="width: 750rpx;height: 500rpx;"></image>
 		</view>
+		<view class="detsilBox">
+			<view class="teamBox-title">
+				{{ name }}
+			</view>
+			<view class="teamBox-bottom">
+				<view class="interactive">
+					<image src="../../static/play-1.png" mode=""></image>
+					<view class="title">{{ views }}</view>
+				</view>
+				<view class="interactive">
+					<image src="../../static/workDetail/heart2.png" class="bot_img" v-if="isGreat"
+						@click="clickHeart(isGreat, id)">
+					</image>
+					<image src="../../static/workDetail/heart1.png" class="bot_img" v-else
+						@click="clickHeart(isGreat, id)">
+					</image>
+					<view class="title" @click="clickHeart(isGreat, id)">
+						{{ likes }}
+					</view>
+				</view>
+			</view>
+			<view class="contbox">
+				<u-parse :content="introduce"></u-parse>
+			</view>
+			
+		</view>
 	</view>
 </template>
 
@@ -31,7 +57,12 @@
 				file: '',
 				linkPath: '',
 				isWx: false,
-				cover: ''
+				cover: '',
+				name: '',
+				views: '',
+				isGreat: '',
+				likes: '',
+				introduce: ''
 			};
 		},
 		onReady() {
@@ -67,6 +98,11 @@
 						if (res.code == 200) {
 							this.type = res.data.type
 							this.cover = res.data.cover
+							this.name = res.data.name
+							this.views = res.data.views
+							this.isGreat = res.data.isGreat
+							this.likes = res.data.likes
+							this.introduce = res.data.introduce
 							if (this.type == 'locality') {
 								this.file = res.data.file
 								// this.getvideo(res.data.id)
@@ -108,10 +144,71 @@
 			},
 			toDetail() {
 				window.open(this.linkPath)
-			}
+			},
+			//点赞、取消点赞
+			clickHeart(val0, val1) {
+				if (val0) {
+					this.isGreat = false
+					this.http.request('/worksGreat/delGreat?type=3&workId=' + val1, "POST").then(res => {
+						if (res.code == 200) {
+							this.likes--
+						}
+					}).catch(e => {
+						uni.showToast({
+							title: e.data.message,
+							icon: "none",
+						});
+					})
+				} else {
+					this.isGreat = true
+					this.http.request('/worksGreat/addGreat?type=3&workId=' + val1, "POST").then(res => {
+						if (res.code == 200) {
+							this.likes++
+						}
+					}).catch(e => {
+						uni.showToast({
+							title: e.data.message,
+							icon: "none",
+						});
+					})
+				}
+			},
 		},
 	};
 </script>
 
-<style>
+<style lang="scss" scoped>
+	.detsilBox{
+		margin: 0 auto 40rpx;
+		padding-top: 40rpx;
+		.teamBox-title{
+			font-size: 32rpx;
+			width: 686rpx;
+			margin: 0 32rpx 10rpx;
+			font-weight: bold
+		}
+		.teamBox-bottom {
+			display: flex;
+			padding: 16rpx 32rpx 32rpx;
+			background-color: #fff;
+			box-sizing: border-box;
+		
+			.interactive {
+				display: flex;
+				align-items: center;
+				padding: 10rpx 20rpx;
+				margin-right: 20rpx;
+		
+				image {
+					width: 30rpx;
+					height: 30rpx;
+					margin-right: 12rpx;
+				}
+			}
+		}
+		.contbox{
+			width: 686rpx;
+			margin: 0 32rpx 10rpx;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/src/pagesD/xskz/index.vue b/src/pagesD/xskz/index.vue
index e64f250..24f757e 100644
--- a/src/pagesD/xskz/index.vue
+++ b/src/pagesD/xskz/index.vue
@@ -1,5 +1,9 @@
 <template>
 	<view class="wyxx">
+		<view class="topBox">
+			<u-search placeholder="请输入展映名称" v-model="keyword" :showAction="false" @search="onSearch"></u-search>
+			<u-tabs :list="list1"  lineColor="#99241B" @click="click"></u-tabs>
+		</view>
 		<view class="forms">
 			<view class="teamBox" v-for="(item,index) in list" :key="item.id">
 				<view class="teamBox-title">
@@ -36,6 +40,8 @@
 					</view> -->
 				</view>
 			</view>
+			<u-empty v-if="list.length < 1" mode="data" icon="../../static/orderE.png" marginTop="120">
+			</u-empty>
 		</view>
 		<u-loading-page class="loading" loading-text="加载中" :loading="loadings"></u-loading-page>
 	</view>
@@ -51,14 +57,18 @@
 				size: 10,
 				loadings: true,
 				// 请求状态识别变量
-				requestStatus: false
+				requestStatus: false,
+				list1: [],
+				associationId: '',
+				keyword: '',
 			};
 		},
 		onLoad() {
 			// this.getData();
 			// this.list = []
 			// this.pages = 1
-			this.get();
+			this.get()
+			this.getXh()
 		},
 		onPullDownRefresh() {
 			this.pages = 1
@@ -73,11 +83,35 @@
 			this.pages++
 			this.get();
 		},
-		mounted() {
-			const store = requirePlugin('player')
-			console.log(store);
-		},
+		// mounted() {
+		// 	const store = requirePlugin('player')
+		// 	console.log(store);
+		// },
 		methods: {
+			getXh() {
+				this.http.request('/association/list', {}, "GET").then(res => {
+					if (res.code == 200) {
+						this.list1 = res.data
+						this.list1.unshift({id:'',name: '全部'})
+					}
+				}).catch(e => {
+					uni.showToast({
+						title: e.data.message,
+						icon: "none",
+					});
+				})
+			},
+			click(item) {
+				this.associationId = item.id
+				this.pages = 1
+				this.list = []
+				this.get()
+			},
+			onSearch() {
+				this.pages = 1
+				this.list = []
+				this.get()
+			},
 			toTab(val) {
 				this.tabC = val;
 				// this.getData()
@@ -154,6 +188,8 @@
 					.request("/exhibition/list", {
 						page: this.pages,
 						size: this.size,
+						associationId: this.associationId,
+						name: this.keyword
 					}, "GET")
 					.then((res) => {
 						if (res.code == 200) {
@@ -214,6 +250,10 @@
 <style lang="scss">
 	.wyxx {
 		background-color: #fefefe;
+		.topBox{
+			width: 686rpx;
+			margin: 0 32rpx;
+		}
 	}
 	.loading {
 		width: 100%;
diff --git a/src/request/interface.js b/src/request/interface.js
index 2083cfe..71dd932 100644
--- a/src/request/interface.js
+++ b/src/request/interface.js
@@ -79,12 +79,12 @@ export default {
 								uni.setStorageSync('token', response.data.data.tokenValue)
 							}
 							uni.showToast({
-								title: '信息未完善',
+								title: '新用户登录，请选择身份',
 								icon: 'none',
 							});
 							setTimeout(() => {
 								uni.navigateTo({
-									url: '/pagesC/Login/binding'
+									url: '/pagesC/SelectId/SelectId'
 								})
 							}, 1200)
 						} else {