diff --git a/src/manifest.json b/src/manifest.json
index 3e1baee..05118c5 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,117 +1,116 @@
 {
-	"name": "yxx",
-	"appid": "__UNI__77CA6BC",
-	"description": "",
-	"versionName": "1.0.0",
-	"versionCode": "100",
-	"transformPx": false,
-	"app-plus": {
-		/* 5+App特有相关 */
-		"usingComponents": true,
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		"modules": {},
-		/* 模块配置 */
-		"distribute": {
-			/* 应用发布信息 */
-			"android": {
-				/* android打包配置 */
-				"permissions": [
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-				]
-			},
-			"ios": {},
-			/* ios打包配置 */
-			"sdkConfigs": {}
-		}
-	},
-	/* SDK配置 */
-	"quickapp": {},
-	/* 快应用特有相关 */
-	"mp-weixin": {
-		"appid": "wx55b187e6ed92e2ac",
-		"setting": {
-			"urlCheck": true,
-			"minified": true,
-			"es6": true,
-			"postcss": true
-		},
-		"usingComponents": true,
-		"lazyCodeLoading": "requiredComponents",
-		"optimization": {
-			"subPackages": true
-		},
-		"plugins": {
-			"player": {
-				"version": "2.1.1",
-				"provider": "wxa75efa648b60994b"
-			}
-		}
+    "name" : "yxx",
+    "appid" : "__UNI__77CA6BC",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    "app-plus" : {
+        /* 5+App特有相关 */
+        "usingComponents" : true,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        "modules" : {},
+        /* 模块配置 */
+        "distribute" : {
+            /* 应用发布信息 */
+            "android" : {
+                /* android打包配置 */
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            "ios" : {},
+            /* ios打包配置 */
+            "sdkConfigs" : {}
+        }
+    },
+    /* SDK配置 */
+    "quickapp" : {},
+    /* 快应用特有相关 */
+    "mp-weixin" : {
+        "appid" : "wx55b187e6ed92e2ac",
+        "setting" : {
+            "urlCheck" : true,
+            "minified" : true,
+            "es6" : true,
+            "postcss" : true
+        },
+        "usingComponents" : true,
+        "lazyCodeLoading" : "requiredComponents",
+        "optimization" : {
+            "subPackages" : true
+        },
+        "plugins" : {
+            "player" : {
+                "version" : "2.1.1",
+                "provider" : "wxa75efa648b60994b"
+            }
+        }
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "mp-qq" : {
+        "usingComponents" : true
+    },
+    "h5" : {
+        "router" : {
+            "mode" : "hash"
+        },
+        "title" : "艺象心",
+        "devServer" : {
+            "disableHostCheck" : true, // 禁用 Host 检查，默认false
+            "proxy" : {
+                // 与vue中的proxyTable配置大致上一致,此处我同时代理了两个
+                "/pre" : {
+                    // 预发布
+                    "target" : "http://192.168.1.3:8080/h5/api", // 目标接口域名
 
-	},
-	"mp-alipay": {
-		"usingComponents": true
-	},
-	"mp-baidu": {
-		"usingComponents": true
-	},
-	"mp-toutiao": {
-		"usingComponents": true
-	},
-	"mp-qq": {
-		"usingComponents": true
-	},
-	"h5": {
-		"router": {
-			"mode": "hash"
-		},
-		"title": "艺象心",
-		"devServer": {
-			"disableHostCheck": true, // 禁用 Host 检查，默认false
-			"proxy": {
-				// 与vue中的proxyTable配置大致上一致,此处我同时代理了两个
-				"/pre": {
-					// 预发布
-					"target": "http://192.168.1.3:8080/h5/api", // 目标接口域名
-
-					// "target" : "https://yxx.ydool.net/h5/api", // 目标接口域名
-					"changeOrigin": true, // 是否跨域
-					"secure": false, // 设置支持https协议的代理
-					"pathRewrite": {
-						"^/pre": ""
-					} // 此处pathRewrite加第二个参数是因为我的接口最后都有一个/api,在这个地方加/api等价于直接在target后加/api
-				},
-				"/sock": {
-					// 预发布
-					"target": "ws:// 10.0.0.5:8080/webSocket", // 目标接口域名
-					"changeOrigin": true // 是否跨域
-				}
-			}
-		}
-	}
-}
\ No newline at end of file
+                    // "target" : "https://yxx.ydool.net/h5/api", // 目标接口域名
+                    "changeOrigin" : true, // 是否跨域
+                    "secure" : false, // 设置支持https协议的代理
+                    "pathRewrite" : {
+                        "^/pre" : ""
+                    } // 此处pathRewrite加第二个参数是因为我的接口最后都有一个/api,在这个地方加/api等价于直接在target后加/api
+                },
+                "/sock" : {
+                    // 预发布
+                    "target" : "ws:// 10.0.0.5:8080/webSocket", // 目标接口域名
+                    "changeOrigin" : true // 是否跨域
+                }
+            }
+        }
+    }
+}
diff --git a/src/pages.json b/src/pages.json
index 0a2276e..131e54d 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -445,6 +445,20 @@
             "enablePullDownRefresh": false
           }
         },
+		{
+		  "path": "DataSearch/addNew",
+		  "style": {
+		    "navigationBarTitleText": "新建文件夹",
+		    "enablePullDownRefresh": false
+		  }
+		},
+		{
+		  "path": "DataSearch/upload",
+		  "style": {
+		    "navigationBarTitleText": "上传文件",
+		    "enablePullDownRefresh": false
+		  }
+		},
         {
           "path": "enjoy/enjoy",
           "style": {
diff --git a/src/pagesA/activeManage/activeManage.vue b/src/pagesA/activeManage/activeManage.vue
index 1d858b2..24578c2 100644
--- a/src/pagesA/activeManage/activeManage.vue
+++ b/src/pagesA/activeManage/activeManage.vue
@@ -165,7 +165,7 @@
 			<u-empty v-if="list2.length == 0" mode="data" icon="../../static/orderE.png" marginTop="120"></u-empty>
 		</view>
 		<!-- 取消报名-原因 -->
-		<u-popup :show="showB" mode="center" :round="10" @close="closeZ">
+		<u-popup :show="showB" mode="center" :round="10" @close="closeZ" :safeAreaInsetBottom="false">
 			<view style="width: 640rpx;">
 				<view style="padding: 32rpx;">
 					<view style="font-size: 36rpx; font-weight: 800;">
@@ -188,7 +188,7 @@
 			</view>
 		</u-popup>
 		<!-- 取消报名-确认 -->
-		<u-popup :show="showS" mode="center" :round="10" @close="closeS">
+		<u-popup :show="showS" mode="center" :round="10" @close="closeS" :safeAreaInsetBottom="false">
 			<view style="width: 640rpx;">
 				<view style="padding: 32rpx;">
 					<view style="font-size: 32rpx; font-weight: 800;">
@@ -208,7 +208,7 @@
 			</view>
 		</u-popup>
 		<!-- 评分 -->
-		<u-popup :show="showH" mode="center" :round="10" @close="closeH">
+		<u-popup :show="showH" mode="center" :round="10" @close="closeH" :safeAreaInsetBottom="false">
 			<view>
 				<view style="padding: 32rpx;">
 					<u-rate v-model="star" size='36'></u-rate>
diff --git a/src/pagesA/addArtActivity/addArtActivity.vue b/src/pagesA/addArtActivity/addArtActivity.vue
index 9246946..a0b87de 100644
--- a/src/pagesA/addArtActivity/addArtActivity.vue
+++ b/src/pagesA/addArtActivity/addArtActivity.vue
@@ -46,7 +46,7 @@
 				</u--input>
 			</view>
 		</view>
-		<u-popup :show="showType" @close="close" closeOnClickOverlay :round="5" customStyle="padding: 16px;">
+		<u-popup :show="showType" @close="close" closeOnClickOverlay :round="5" customStyle="padding: 16px;" :safeAreaInsetBottom="false">
 			<u-radio-group @change="selectForm1" v-model="hdType" :borderBottom="true" placement="column"
 				iconPlacement="right">
 				<u-radio :customStyle="{marginBottom: '16px' }" v-for="(item, index) in radiolist1" :key="index"
diff --git a/src/pagesA/my/myFollow.vue b/src/pagesA/my/myFollow.vue
index 497d208..e1c9df0 100644
--- a/src/pagesA/my/myFollow.vue
+++ b/src/pagesA/my/myFollow.vue
@@ -36,7 +36,7 @@
 					</view>
 				</view>
 			</view>
-			<u-popup :show="showStar" @close="close" closeOnClickOverlay mode="center" :round="5">
+			<u-popup :show="showStar" @close="close" closeOnClickOverlay mode="center" :round="5" :safeAreaInsetBottom="false">
 				<view style="padding: 100rpx 100rpx 40rpx 100rpx;">
 					 <text>确认取消关注？</text>
 				</view>
diff --git a/src/pagesB/ArtRace/ArtRace.vue b/src/pagesB/ArtRace/ArtRace.vue
index 77b3ccf..501aa67 100644
--- a/src/pagesB/ArtRace/ArtRace.vue
+++ b/src/pagesB/ArtRace/ArtRace.vue
@@ -7,7 +7,7 @@
 			<view class="topTabs">
 				<u-tabs :list="list1" @click="click" lineColor="#99241B"></u-tabs>
 			</view>
-			<view class="art_race_itm" v-for="(v,i) in dataList" :key="i" @click="goRaceDetail(v.id)">
+			<view v-if="dataList.length > 0" class="art_race_itm" v-for="(v,i) in dataList" :key="i" @click="goRaceDetail(v.id)">
 				<image style="width: 100%; height: 296rpx;" :src="v.file" mode=""></image>
 				<view class="art_race_bot">
 					<text class="art_title">{{v.name}}</text>
@@ -17,6 +17,10 @@
 					</view>
 				</view>
 			</view>
+			<view v-else>
+				<u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png">
+				</u-empty>
+			</view>
 		</view>
 	</view>
 </template>
@@ -64,6 +68,7 @@
 				console.log('item', item);
 				this.type = item.value
 				this.pages = 1
+				this.dataList = []
 				this.getData()
 			},
 			getType() {
diff --git a/src/pagesB/MyOrder/MyOrder.vue b/src/pagesB/MyOrder/MyOrder.vue
index 69af412..d87d68f 100644
--- a/src/pagesB/MyOrder/MyOrder.vue
+++ b/src/pagesB/MyOrder/MyOrder.vue
@@ -85,7 +85,7 @@
 				</view>
 			</view>
 
-			<u-popup :show="showStar" @close="close" closeOnClickOverlay mode="center" :round="10">
+			<u-popup :show="showStar" @close="close" closeOnClickOverlay mode="center" :round="10" :safeAreaInsetBottom="false">
 				<view style="padding: 100rpx 100rpx 40rpx 100rpx;">
 					<u-rate count=5 v-model="orStar" size='30'></u-rate>
 				</view>
diff --git a/src/pagesC/ActivitiesDetail/ActivitiesDetail.vue b/src/pagesC/ActivitiesDetail/ActivitiesDetail.vue
index 1f50296..fdd6a90 100644
--- a/src/pagesC/ActivitiesDetail/ActivitiesDetail.vue
+++ b/src/pagesC/ActivitiesDetail/ActivitiesDetail.vue
@@ -119,7 +119,7 @@
 			</view>
 		</view>
 		<!-- 取消报名-原因 -->
-		<u-popup :show="showB" mode="center" :round="10" @close="closeZ">
+		<u-popup :show="showB" mode="center" :round="10" @close="closeZ" :safeAreaInsetBottom="false">
 			<view style="width: 640rpx;">
 				<view style="padding: 32rpx;">
 					<view style="font-size: 36rpx; font-weight: 800;">
@@ -142,7 +142,7 @@
 			</view>
 		</u-popup>
 		<!-- 取消报名-确认 -->
-		<u-popup :show="showS" mode="center" :round="10" @close="closeS">
+		<u-popup :show="showS" mode="center" :round="10" @close="closeS" :safeAreaInsetBottom="false">
 			<view style="width: 640rpx;">
 				<view style="padding: 32rpx;">
 					<view style="font-size: 32rpx; font-weight: 800;">
@@ -162,7 +162,7 @@
 			</view>
 		</u-popup>
 		<!-- 报名-确认 -->
-		<u-popup :show="showH" mode="center" :round="10" @close="closeH">
+		<u-popup :show="showH" mode="center" :round="10" @close="closeH" :safeAreaInsetBottom="false">
 			<view style="width: 640rpx;">
 				<view style="padding: 32rpx;">
 					<view style="font-size: 32rpx; font-weight: 800;">
diff --git a/src/pagesC/DataSearch/DataSearch.vue b/src/pagesC/DataSearch/DataSearch.vue
index 0d9829f..fbd3ed0 100644
--- a/src/pagesC/DataSearch/DataSearch.vue
+++ b/src/pagesC/DataSearch/DataSearch.vue
@@ -1,189 +1,327 @@
 <template>
-	<view>
-
-		<view class="search_box">
-			<u-search height=42 margin="12px 0" searchIconColor="black" bgColor="#f8f8f8" searchIconSize="40rpx"
-				shape="square" :showAction="false" v-model="dataVal" placeholder="请输入资料名称"></u-search>
-			<view class="car_box" v-if="false">
-				<image src="../../static/DataSearch/chexboxs.png" mode=""></image>
-				<text style="font-size: 20rpx;">选择</text>
-			</view>
+	<view class="">
+		<view class="">
+			<u-loading-page :loading="load"></u-loading-page>
 		</view>
-
-
-
-		<view class="itm" v-for="(v,i) in folderList" :key="i">
-			<view class="fileImg">
-				<image src="../../static/DataSearch/Floder.png" mode=""></image>
-			</view>
-			<view class="data_detail_box" @click="GofileDetail(i)">
-
-				<view class="file_title">
-					{{v.folderName}}
+		<view v-if="!load">
+			<view class="search_box">
+				<view style="width: 100rpx; text-align: center;" @click="backTo()">
+					返回
 				</view>
-				<view class="file_time">
-					2021-12-18 17:08
-				</view>
-
-			</view>
-
-			<view class="moreImg" @click="clickDot(i)" style="position: relative;" :ref="'tankuang'+String(i)">
-				<image src="../../static/DataSearch/moreFCUN.png" mode=""></image>
-				<view class="poup_edit_box" v-if="i===dotNum">
-					<view class="poup_edit" @click="editDir">
-						<image style="width: 32rpx;height: 32rpx; margin-right: 4rpx;"
-							src="../../static/DataSearch/dirEdit.png" mode="">
-						</image> 编辑目录
+				<u-search height=42 margin="12px 0" searchIconColor="black" bgColor="#f8f8f8" searchIconSize="40rpx"
+					shape="square" :showAction="false" v-model="dataVal" placeholder="请输入资料名称"></u-search>
+				<view class="car_box " @click="isSelect=false">
+					<view class="dd" v-if="isSelect">
+						<image src="../../static/DataSearch/chexboxs.png" mode=""></image>
 					</view>
-					<view class="poup_del" @click="delDir">
-						<image style="width: 32rpx; height: 32rpx;margin-right: 4rpx;"
-							src="../../static/DataSearch/dirDel.png" mode="">
-						</image> 删除目录
+					<view class="dd" v-if="!isSelect" @click="moreSelected">
+						<checkbox-group @change="allChoose">
+							<label class="wr"
+								style="display: flex; flex-direction: column;align-items: center; justify-content: space-around;">
+								<checkbox value="all" :checked="allChecked?true:false" />
+								<text style="font-size: 15rpx;margin-top: 8rpx;">全选</text>
+							</label>
+						</checkbox-group>
 					</view>
 				</view>
 			</view>
-
-			<view class="moreImg" v-if="false">
-				<image src="../../static/DataSearch/radioImg.png" v-if="false" mode=""></image>
+			<view class="itm" v-for="(v,i) in folderList" :key="i">
+				<view class="fileImg">
+					<image src="../../static/DataSearch/Floder.png" mode=""></image>
+				</view>
+				<view class="data_detail_box" @click="GofileDetail(v.id)">
+					<view class="file_title">
+						{{ v.name }}
+					</view>
+					<view class="file_time">
+						{{ v.createdAt }}
+					</view>
+				</view>
+				<view class="moreImg" @click="clickDot(v.id)" style="position: relative;">
+					<image src="../../static/DataSearch/moreFCUN.png" mode=""></image>
+				</view>
 			</view>
+			<checkbox-group @change="changeCheckbox">
+				<view class="itm" v-for="(item,index) in checkboxData" :key="item.id">
+					<view class="fileImg">
+						<image :src="item.url" mode="" v-if="item.type == 'photo'"></image>
+						<image src="../../static/DataSearch/TxtImg.png" mode="" v-else-if="item.type == 'txt'"></image>
+						<image src="../../static/DataSearch/musicImg.png" mode="" v-else-if="item.type == 'music'">
+						</image>
+						<image src="../../static/DataSearch/other.png" mode="" v-else></image>
+					</view>
+					<view class="data_detail_box">
+						<view class="file_title">
+							<!-- 资料查找 -->
+							{{ item.name }}
+						</view>
+						<view class="file_time">
+							{{ item.createdAt }}
+						</view>
+					</view>
+					<view class="moreImg" v-if="isSelect" @click="delFile(item.id)">
+						<image src="../../static/DataSearch/dirDel.png" mode=""></image>
+					</view>
+					<view class="moreImg" style="width: 32rpx;height: 32rpx;" v-if="!isSelect">
+						<label class="wr">
+							<checkbox :value="item.id" :checked="checkedArr.includes(item.id)" />
+						</label>
+					</view>
+				</view>
+			</checkbox-group>
+			<view class="bottm" @click="show=!show">
+				<image src="../../static/orderHall/addOrder.png" mode=""></image>
+			</view>
+			<!-- 底部对文件的操作栏  -->
+			<view class="bottom_tab" v-if="!isSelect">
+				<view class="bottom_yx">
+					<!-- <view class="bottom_tab_itm" @click="downLoadAll()">
+						<view class="bottom_tab_itm_img">
+							<image src="../../static/DataSearch/dowmSelected.png" mode=""></image>
+						</view>
+						<view class="bottom_tab_itm_txt">
+							下载
+						</view>
+					</view> -->
+					<view class="bottom_tab_itm" @click="delAll()">
+						<view class="bottom_tab_itm_img">
+							<image src="../../static/DataSearch/Deletselected.png" mode=""></image>
+						</view>
+						<view class="bottom_tab_itm_txt">
+							删除
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 底部对文件的操作栏  ed -->
+			<!-- 加号弹出框 -->
+			<u-popup :show="show" closeOnClickOverlay @close="() => show = false" round=5>
+				<view class="tan_con">
+					<view class="tit">
+						新建/上传
+					</view>
+					<view class="up_itm_box">
+						<view class="img_itm" @click="addDir(0)">
+							<view class="img">
+								<image src="../../static/DataSearch/Floder.png" mode=""></image>
+							</view>
+							<view class="Up_tit">
+								新建文件夹
+							</view>
+						</view>
+						<view class="img_itm" @click="addDir(1)">
+							<view class="img">
+								<image src="../../static/DataSearch/UploadImg.png" mode=""></image>
+							</view>
+							<view class="Up_tit">
+								上传文件
+							</view>
+						</view>
+					</view>
+				</view>
+			</u-popup>
+			<!-- 加号 ed -->
+			<!-- 三个点 中 删除目录 的弹出确认删除 -->
+			<u-modal width="550rpx" confirmText="确认删除" confirmColor='#E34D59' :show="showModel" showCancelButton
+				@confirm="confirmModel" @cancel="() => showModel = false">
+				<text style="font-size: 32rpx; font-weight: 600;color: #251B1D;margin: 25rpx 0;">确认删除目录</text>
+			</u-modal>
+			<!-- 三个点ed -->
 		</view>
-
-
-
-
-
-
-
-
-		<view class="bottm" @click="show=!show">
-			<image src="../../static/orderHall/addOrder.png" mode=""></image>
-		</view>
-
-		<!-- 加号弹出框 -->
-
-		<u-popup :show="show" closeOnClickOverlay @close="() => show = false" @open="open" round=5>
-			<view class="tan_con">
-				<view class="tit">
-					上传文件
-				</view>
-				<view class="up_itm_box">
-
-					<view class="img_itm">
-						<view class="img">
-							<image src="../../static/DataSearch/UploadImg.png" mode=""></image>
-						</view>
-						<view class="Up_tit">
-							上传图片
-						</view>
-					</view>
-
-
-					<view class="img_itm">
-						<view class="img">
-							<image src="../../static/DataSearch/uploadDoc.png" mode=""></image>
-						</view>
-						<view class="Up_tit">
-							上传文档
-						</view>
-					</view>
-
-
-
-					<view class="img_itm">
-						<view class="img">
-							<image src="../../static/DataSearch/UploadVideo.png" mode=""></image>
-						</view>
-						<view class="Up_tit">
-							上传视频
-						</view>
-					</view>
-
-					<view class="img_itm">
-						<view class="img">
-							<image src="../../static/DataSearch/UploadMusic.png" mode=""></image>
-						</view>
-						<view class="Up_tit">
-							上传音频
-						</view>
-					</view>
-
-
-
-				</view>
-
-			</view>
-		</u-popup>
-		<!-- 加号 ed -->
-		<!-- 三个点 中 删除目录 的弹出确认删除 -->
-		<u-modal width="550rpx" confirmText="确认删除" confirmColor='#E34D59' :show="showModel" showCancelButton
-			@confirm="confirmModel" @cancel="() => showModel = false">
-			<text style="font-size: 32rpx; font-weight: 600;color: #251B1D;margin: 25rpx 0;">确认删除目录</text>
-		</u-modal>
-
-		<!-- 三个点ed -->
-
-
 	</view>
+
 </template>
 
 <script>
 	export default {
 		data() {
 			return {
+				load: true,
+				isSelect: true,
+				dirIds: '',
 				tempNum: '',
 				dataVal: "",
 				show: false,
+				showDir: false,
+				allChecked: false,
+				listDir: [{
+					name: '删除文件夹'
+				}],
 				dotNum: '',
 				showModel: false,
-				folderList: [{
-					id: 1,
-					folderName: "资料查找"
-				}, {
-					id: 2,
-					folderName: "珍贵资料"
-				}, {
-					id: 3,
-					folderName: "影音文件夹"
-				}, {
-					id: 4,
-					folderName: "怀旧文件夹"
-				}, {
-					id: 5,
-					folderName: "资料查找"
-				}]
-
+				folderList: [],
+				checkboxData: [],
+				pages: 1,
+				size: 20,
+				checkedArr: [], //复选框选中的值
+				parentId: '',
+				oldID: [],
 			};
 		},
+		// onLoad() {
+		// 	this.getList()
+		// },
+		onShow() {
+			this.folderList = []
+			this.checkboxData = []
+			this.getList()
+		},
 		methods: {
+			// 删除文件夹
 			confirmModel() {
-				this.showModel = false;
-				console.log("++++++",this);
-				// this 打印不出来 ref     无法用
+				this.http.request('/information/delete?ids=' + this.dotNum, "POST").then(res => {
+					if (res.code == 200) {
+						this.showModel = false
+						this.pages = 1
+						this.folderList = []
+						this.checkboxData = []
+						this.load = false
+						this.showDir = false
+						this.getList()
+					}
+				}).catch(e => {
+					uni.showToast({
+						title: e.data.message,
+						icon: "none",
+					});
+				})
 			},
 			clickDot(num) {
 				this.dotNum = num
-				this.tempNum = Number(num)
+				this.delDir()
+				// this.showDir = true
 			},
-			editDir() {
-			 
-				uni.showToast({
-					title: "编辑目录"
-				})
-			 
-
-			},
-			delDir() {
-
+			delFile(index) {
+				this.dotNum = index
 				this.showModel = true
 			},
+			selectClick(index) {
+				if (index.name == '编辑文件夹') {
+
+				} else {
+					this.delDir()
+				}
+			},
+			delDir() {
+				this.showModel = true
+			},
+			moreSelected() {
+				this.allSelect = !this.allSelect
+			},
+			// 多选复选框改变事件
+			changeCheckbox(e) {
+				this.checkedArr = e.detail.value;
+				// 如果选择的数组中有值，并且长度等于列表的长度，就是全选
+				if (this.checkedArr.length > 0 && this.checkedArr.length == this.checkboxData.length) {
+					this.allChecked = true;
+				} else {
+					this.allChecked = false;
+				}
+			},
+			// 全选事件
+			allChoose(e) {
+				let chooseItem = e.detail.value;
+				// 全选
+				if (chooseItem[0] == 'all') {
+					this.allChecked = true;
+					for (let item of this.checkboxData) {
+						let itemVal = item.id;
+						if (!this.checkedArr.includes(itemVal)) {
+							this.checkedArr.push(itemVal);
+						}
+					}
+				} else {
+					// 取消全选
+					this.allChecked = false;
+					this.checkedArr = [];
+				}
+			},
+			// 下载
+			// outList() {
+			// 	let urlPath = http.config.baseUrl + '/activityUser/sign_export/' + this.activityId + '/' + this.type
+			// 	const token = uni.getStorageSync('token')
+			// 	if (this.isWx) {
+			// 		wx.downloadFile({
+			// 			url: urlPath, //仅为示例，并非真实的资源
+			// 			header: {
+			// 				'Authorization': "Bearer " + token,
+			// 				'x-token': token
+			// 			},
+			// 			success(res) {
+			// 				// 只要服务器有响应数据，就会把响应内容写入文件并进入 success 回调，业务需要自行判断是否下载到了想要的内容
+			// 				if (res.statusCode === 200) {
+			// 					const filePath = res.tempFilePath;
+			// 					wx.openDocument({
+			// 						filePath: filePath,
+			// 						showMenu: true,
+			// 						success: function(res) {
+			// 							console.log(res, '打开文档成功');
+			// 						}
+			// 					});
+			// 				}
+			// 			}
+			// 		})
+			// 	} else {
+			// 		window.location.href = urlPath
+			// 	}
+			// }
+			delAll() {
+				this.dotNum = this.checkedArr.join(',')
+				this.confirmModel()
+			},
 			GofileDetail(id) {
-
-				uni.navigateTo({
-					url: "/pagesC/folderDetail/folderDetail?id=" + String(id)
+				this.oldID.push(this.parentId)
+				console.log(this.oldID)
+				this.parentId = id
+				this.dirIds = id
+				this.folderList = []
+				this.checkboxData = []
+				this.getList()
+			},
+			backTo(){
+				this.parentId = this.oldID.slice(-1).join(',')
+				this.dirIds = this.oldID.slice(-1).join(',')
+				this.oldID.splice(-1,1)
+				this.folderList = []
+				this.checkboxData = []
+				this.getList()
+			},
+			addDir(val) {
+				if (val == '0') {
+					uni.navigateTo({
+						url: "/pagesC/DataSearch/addNew?id=" + this.parentId
+					})
+				} else if (val == '1') {
+					uni.navigateTo({
+						url: "/pagesC/DataSearch/upload?id=" + this.parentId
+					})
+				}
+			},
+			getList() {
+				let that = this
+				let par = {
+					dirIds: this.dirIds,
+					name: this.dataVal
+				}
+				this.http.request('/information/list', par, "GET").then(res => {
+					if (res.code == 200) {
+						res.data.records.forEach(item => {
+							if (item.type == 'dir') {
+								that.folderList.push(item)
+							} else {
+								that.checkboxData.push(item)
+							}
+						})
+						this.load = false
+					}
+				}).catch(e => {
+					uni.showToast({
+						title: e.data.message,
+						icon: "none",
+					});
 				})
-			}
-
-		} 
+			},
+		}
 	}
 </script>
 
@@ -195,14 +333,19 @@
 
 	.search_box {
 		padding: 32rpx;
-
 		display: flex;
 		align-items: center;
+		box-sizing: border-box;
 
 		.car_box {
-			width: 24px;
-			height: 24px;
-			margin-left: 12px;
+			width: 48rpx;
+			height: 48rpx;
+			margin-left: 24rpx;
+
+			.dd {
+				width: 48rpx;
+				height: 48rpx;
+			}
 		}
 	}
 
@@ -279,6 +422,36 @@
 		overflow: hidden;
 	}
 
+	.bottom_tab {
+		height: 170rpx;
+		// border: 1px solid red;
+
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+
+		.bottom_yx {
+			color: $black;
+			display: flex;
+			justify-content: space-around;
+			background-color: #F7F7F7;
+			height: 170rpx;
+
+			.bottom_tab_itm {
+				display: flex;
+				align-items: center;
+
+				.bottom_tab_itm_img {
+					width: 32rpx;
+					height: 32rpx;
+					margin-right: 8rpx;
+				}
+			}
+		}
+
+	}
+
 
 
 	.tan_con {
@@ -317,4 +490,4 @@
 
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pagesC/DataSearch/addNew.vue b/src/pagesC/DataSearch/addNew.vue
new file mode 100644
index 0000000..7ad4581
--- /dev/null
+++ b/src/pagesC/DataSearch/addNew.vue
@@ -0,0 +1,64 @@
+<template>
+	<view style="margin: 0rpx 48rpx;">
+		<view class="">
+			<u--input placeholder="请输入文件夹名称" clearable v-model="registInfo.name">
+			</u--input>
+		</view>
+		<view style="margin-top: 80rpx;">
+			<u-button text="确认" size="large" color="#99241B"
+				@click="submitNext"></u-button>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				tips: '',
+				registInfo: {
+					name: '',
+					userRole: 'zyz,wyrc',
+					parentId: '',
+					isExtent: '',
+					dirIds: '/',
+				}
+			};
+		},
+		onLoad(op) {
+			this.registInfo.parentId = op.id
+			if(op.id){
+				this.registInfo.dirIds =  op.id
+			}else{
+				this.registInfo.dirIds = '/'
+			}
+		},
+		methods: {
+			submitNext() {
+				let data = {
+					name: this.registInfo.name,
+					userRole: this.registInfo.userRole,
+					parentId: this.registInfo.parentId,
+					dirIds: this.registInfo.dirIds,
+				}
+				this.http.request('/information/add', data, "POST").then(res => {
+					if (res.code == 200) {
+						uni.navigateBack()
+					}
+				}).catch(e => {
+					uni.showToast({
+						title: e.data.message,
+						icon: "none",
+					});
+				})
+			}
+		},
+	}
+</script>
+
+<style lang="scss">
+	.data_itm {
+		margin: 30rpx 0px;
+	}
+</style>
\ No newline at end of file
diff --git a/src/pagesC/DataSearch/upload.vue b/src/pagesC/DataSearch/upload.vue
new file mode 100644
index 0000000..9ddc879
--- /dev/null
+++ b/src/pagesC/DataSearch/upload.vue
@@ -0,0 +1,246 @@
+<template>
+	<view class="">
+		<view class="form_line">
+			<view class="form_left">
+				名称
+			</view>
+			<view class="form_right">
+				<u--input placeholder="请输入名称" v-model="name" clearable border="none" inputAlign="right"
+					style="color: #251B1D;">
+				</u--input>
+			</view>
+		</view>
+		<view class="form_line">
+			<view class="form_left">
+				类型
+			</view>
+			<view class="form_right">
+				<u--input placeholder="请输入类型" v-model="text2" clearable border="none" inputAlign="right"
+					style="color: #251B1D;">
+				</u--input>
+			</view>
+		</view>
+		<view class="gap">
+			文件上传
+		</view>
+		<u-upload v-if="isWx" class="upload" width="172rpx" height="172rpx" :fileList="fileList3" accept="all"
+			@afterRead="afterRead" @delete="deletePic" name="3" multiple :maxCount="1">
+			<image style="width: 172rpx;height: 172rpx;" src="../../static/improveData/jia.png"></image>
+		</u-upload>
+		<u-upload v-else class="upload" width="172rpx" height="172rpx" :fileList="fileList3" accept="file"
+			@afterRead="afterRead" @delete="deletePic" name="3" multiple :maxCount="1">
+			<image style="width: 172rpx;height: 172rpx;" src="../../static/improveData/jia.png"></image>
+		</u-upload>
+		
+		<view class="operation" @click="next">
+			发布
+		</view>
+	</view>
+</template>
+
+<script>
+	import http from '../../request/interface.js'
+	export default {
+		data() {
+			return {
+				id: '',
+				name: '',
+				text2: '',
+				fileList3: [],
+				ok: true,
+				isWx: true,
+			}
+		},
+		onLoad(op){
+			if(op.id){
+				this.id =  op.id
+			}else{
+				this.id = '/'
+			}
+		},
+		onReady() {
+			
+			// #ifdef MP-WEIXIN
+			this.isWx = true
+			// #endif
+		
+			// #ifndef MP-WEIXIN
+			//除了小程序
+			this.isWx = false
+			// #endif
+		},
+		methods: {
+			// 删除图片
+			deletePic(event) {
+				this[`fileList${event.name}`].splice(event.index, 1)
+			},
+			// 新增图片
+			async afterRead(event) {
+				// 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
+				let lists = [].concat(event.file)
+				let fileListLen = this[`fileList${event.name}`].length
+				lists.map((item) => {
+					this[`fileList${event.name}`].push({
+						...item,
+						status: 'uploading',
+						message: '上传中'
+					})
+				})
+				for (let i = 0; i < lists.length; i++) {
+					const result = await this.uploadFilePromise(lists[i].url)
+					let item = this[`fileList${event.name}`][fileListLen]
+					this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
+						status: 'success',
+						message: '',
+						url: result
+					}))
+					fileListLen++
+				}
+			},
+			uploadFilePromise(url) {
+				let token = uni.getStorageSync('token');
+				return new Promise((resolve, reject) => {
+					let a = uni.uploadFile({
+						url: http.config.baseUrl + '/file/uploadUnlimited',
+						filePath: url,
+						name: 'file',
+						formData: {
+							user: 'test'
+						},
+						header: {
+							"X-Token": token
+						},
+						success: (res) => {
+							if (JSON.parse(res.data).code == 200) {
+								setTimeout(() => {
+									resolve(JSON.parse(res.data).data.path)
+								}, 1000)
+							} else {
+								uni.showToast({
+									title: JSON.parse(res.data).message,
+									icon: "none",
+								});
+								this.fileList3.pop()
+							}
+						}
+					});
+				})
+			},
+			next() {
+				this.ok = true
+				if(this.name == ''){
+					uni.showToast({
+						title: '请输入名称',
+						icon: "none",
+					});
+					this.ok = false
+					return
+				}
+				if(this.text2 == ''){
+					uni.showToast({
+						title: '请输入类型',
+						icon: "none",
+					});
+					this.ok = false
+					return
+				}
+				if(this.fileList3.length == 0){
+					uni.showToast({
+						title: '请上传文件',
+						icon: "none",
+					});
+					this.ok = false
+					return
+				}
+				if(this.ok){
+					let image = []
+					this.fileList3.forEach(function(item) {
+						image.push(item.url)
+					})
+					let data = image.join(',')
+					this.http.request('/information/upload?dirIds=' + this.id + '&type=' + this.text2 + '&name=' + this.name + '&url=' + data , {}, "POST").then(res => {
+						if (res.code == 200) {
+							uni.navigateBack()
+						}
+					}).catch(e => {
+						uni.showToast({
+							title: e.data.message,
+							icon: "none",
+						});
+					})
+				}
+			}
+
+		}
+	}
+</script>
+
+<style>
+	
+</style>
+
+<style lang="scss" scoped>
+	/deep/ .uni-icons{
+		display: none;
+	}
+	/deep/ .uni-date-x{
+		text-align: right;
+		padding: 0;
+	}
+	.form_line {
+		width: 686rpx;
+		padding: 0 32rpx;
+		display: flex;
+		align-items: center;
+		font-size: 32rpx;
+		justify-content: space-between;
+		height: 104rpx;
+		border-bottom: 1rpx solid #dadbde;
+
+		.form_right {
+			width: 450rpx;
+		}
+	}
+
+	.form_box {
+		width: 686rpx;
+		padding: 0 32rpx;
+		display: flex;
+		align-items: center;
+		font-size: 32rpx;
+		justify-content: space-between;
+		height: 104rpx;
+	}
+
+	.text_box {
+		width: 686rpx;
+		padding: 0 32rpx;
+	}
+
+	.gap {
+		color: #AFADB0;
+		background: #F5F5F5;
+		opacity: 1;
+		padding: 10rpx 32rpx;
+		font-size: 32rpx;
+	}
+	::v-deep .u-upload__wrap {
+		 padding: 32rpx;
+	}
+
+	.upload {
+		padding: 32rpx;
+	}
+
+	.operation {
+		width: 654rpx;
+		height: 96rpx;
+		margin: 32rpx 48rpx 48rpx;
+		text-align: center;
+		line-height: 96rpx;
+		background-color: #99241B;
+		color: #fff;
+		font-size: 36rpx;
+		font-weight: 600;
+	}
+</style>
diff --git a/src/pagesC/folderDetail/folderDetail.vue b/src/pagesC/folderDetail/folderDetail.vue
index ffa8381..7561187 100644
--- a/src/pagesC/folderDetail/folderDetail.vue
+++ b/src/pagesC/folderDetail/folderDetail.vue
@@ -1,8 +1,6 @@
 <template>
 	<view>
-
 		<view class="search_box">
-
 			<u-search height=42 margin="12px 0" searchIconColor="black" bgColor="#f8f8f8" searchIconSize="40rpx"
 				shape="square" :showAction="false" v-model="dataVal" placeholder="请输入资料名称"></u-search>
 			<view class="car_box " @click="isSelect=false">
@@ -11,26 +9,21 @@
 					<text style="font-size: 20rpx;">选择</text>
 				</view>
 				<view class="dd" v-if="!isSelect" @click="moreSelected">
-
 					<checkbox-group @change="allChoose">
 						<label class="wr" style="display: flex; flex-direction: column;align-items: center; justify-content: space-around;">
 							<checkbox  value="all" :checked="allChecked?true:false" />
 							<text style="font-size: 15rpx;margin-top: 8rpx;">全选</text>
 						</label>
 					</checkbox-group>
-
 				</view>
 			</view>
 		</view>
-
-
 		<checkbox-group @change="changeCheckbox">
 			<view class="itm" v-for="(item,index) in checkboxData" :key="item.value">
 				<view class="fileImg">
 					<image src="../../static/DataSearch/musicImg.png" mode=""></image>
 				</view>
 				<view class="data_detail_box">
-
 					<view class="file_title">
 						<!-- 资料查找 -->
 						{{item.label}}
@@ -38,27 +31,19 @@
 					<view class="file_time">
 						2021-12-18 17:08 220KB
 					</view>
-
 				</view>
-
 				<view class="moreImg" v-if="isSelect" @click="delFile(index)">
 					<image src="../../static/DataSearch/dirDel.png" mode=""></image>
 				</view>
-
 				<view class="moreImg" style="width: 32rpx;height: 32rpx;" v-if="!isSelect">
-
 					<label class="wr">
 						<checkbox :value="String(item.value)" :checked="checkedArr.includes(String(item.value))" />
 					</label>
 				</view>
-
 			</view>
 		</checkbox-group>
-
-
 		<!-- 底部对文件的操作栏  -->
 		<view class="bottom_tab" v-if="!isSelect">
-
 			<view class="bottom_wx" v-if="checkedArr.length > 0 ? false: true">
 				<view class="bottom_tab_itm">
 					<view class="bottom_tab_itm_img">
@@ -68,8 +53,6 @@
 						下载
 					</view>
 				</view>
-
-
 				<view class="bottom_tab_itm">
 					<view class="bottom_tab_itm_img">
 						<image src="../../static/DataSearch/share.png" mode=""></image>
@@ -78,7 +61,6 @@
 						分享
 					</view>
 				</view>
-
 				<view class="bottom_tab_itm">
 					<view class="bottom_tab_itm_img">
 						<image src="../../static/DataSearch/Delet.png" mode=""></image>
@@ -88,8 +70,6 @@
 					</view>
 				</view>
 			</view>
-
-
 			<view class="bottom_yx" v-if="checkedArr.length > 0">
 				<view class="bottom_tab_itm">
 					<view class="bottom_tab_itm_img">
@@ -99,17 +79,7 @@
 						下载
 					</view>
 				</view>
-
-
-				<view class="bottom_tab_itm">
-					<view class="bottom_tab_itm_img">
-						<image src="../../static/DataSearch/shareSelected.png" mode=""></image>
-					</view>
-					<view class="bottom_tab_itm_txt">
-						分享
-					</view>
-				</view>
-
+				
 				<view class="bottom_tab_itm">
 					<view class="bottom_tab_itm_img">
 						<image src="../../static/DataSearch/Deletselected.png" mode=""></image>
@@ -121,17 +91,10 @@
 			</view>
 		</view>
 		<!-- 底部对文件的操作栏  ed -->
-
-
-
-
-
 		<view class="bottm" @click="zhanKai">
 			<image src="../../static/orderHall/addOrder.png" mode=""></image>
 		</view>
-
 		<!-- 弹出框   加号的弹出框-->
-
 		<u-popup :show="show" closeOnClickOverlay @close="() => show = false" @open="open" round=5>
 			<view class="tan_con">
 				<view class="tit">
@@ -147,8 +110,6 @@
 							上传图片
 						</view>
 					</view>
-
-
 					<view class="img_itm">
 						<view class="img">
 							<image src="../../static/DataSearch/uploadDoc.png" mode=""></image>
@@ -157,7 +118,6 @@
 							上传文档
 						</view>
 					</view>
-
 					<view class="img_itm">
 						<view class="img">
 							<image src="../../static/DataSearch/UploadVideo.png" mode=""></image>
@@ -166,7 +126,6 @@
 							上传视频
 						</view>
 					</view>
-
 					<view class="img_itm">
 						<view class="img">
 							<image src="../../static/DataSearch/UploadMusic.png" mode=""></image>
@@ -184,9 +143,7 @@
 			@confirm="fileOprModelConfirm" @cancel="() => showModel = false">
 			<text style="font-size: 32rpx; font-weight: 600;color: #251B1D;margin: 25rpx 0;">确认删除文件</text>
 		</u-modal>
-
 		<!-- 三个点ed -->
-
 	</view>
 </template>
 
diff --git a/src/pagesD/xskz/index.vue b/src/pagesD/xskz/index.vue
index 7202d84..5188421 100644
--- a/src/pagesD/xskz/index.vue
+++ b/src/pagesD/xskz/index.vue
@@ -1,248 +1,277 @@
 <template>
-  <!-- 文艺下乡 -->
-  <view class="wyxx">
-    <!-- <view class="tabTitle">
-      <view :class="tabC == '0' ? 'tabsC' : 'tabs'" @click="toTab('0')">
-        <view> 分类 </view>
-        <view class="line"></view>
-      </view>
-      <view :class="tabC == '1' ? 'tabsC' : 'tabs'" @click="toTab('1')">
-        <view> 分类1 </view>
-        <view class="line"></view>
-      </view>
-      <view :class="tabC == '2' ? 'tabsC' : 'tabs'" @click="toTab('2')">
-        <view> 分类2 </view>
-        <view class="line"></view>
-      </view>
-      <view :class="tabC == '3' ? 'tabsC' : 'tabs'" @click="toTab('3')">
-        <view> 分类3 </view>
-        <view class="line"></view>
-      </view>
-      <view :class="tabC == '4' ? 'tabsC' : 'tabs'" @click="toTab('4')">
-        <view> 分类4 </view>
-        <view class="line"></view>
-      </view>
-    </view> -->
-    <view class="forms">
-      <view
-        class="teamBox"
-        v-for="item in list"
-        :key="item.id"
-        @click="skip({ id: item.id })"
-      >
-        <view class="teamBox-top">
-          <view class="content">
-            <view class="content-title">
-              <text>{{ item.name }}</text>
-            </view>
-            <image
-              class="team-image"
-              src="https://cdn.uviewui.com/uview/album/1.jpg"
-              mode="scaleToFill"
-            />
-          </view>
-          <view class="mask">
-            <view class="mask-play">
-              <image src="../../static/play.png"></image>
-            </view>
-          </view>
-        </view>
-        <view class="teamBox-bottom">
-          <view class="interactive">
-            <image src="../../static/play-1.png" mode=""></image>
-            <view class="title">{{ item.views }}</view>
-          </view>
-          <view class="interactive">
-            <image src="../../static/workDetail/heart1.png" mode=""></image>
-            <view class="title">{{ item.likes }}</view>
-          </view>
-          <view class="interactive">
-            <image src="../../static/workDetail/star1.png" mode=""></image>
-            <view class="title">{{ item.collections }}</view>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
+	<view class="wyxx">
+		<view class="forms">
+			<view class="teamBox" v-for="item in list" :key="item.id">
+				<view class="teamBox-top">
+					<video id="myVideo" :src="item.file" @error="videoErrorCallback"
+						style="width: 750rpx;height: 500rpx;" controls></video>
+				</view>
+				<view class="teamBox-bottom">
+					<view class="interactive">
+						<image src="../../static/play-1.png" mode=""></image>
+						<view class="title">{{ item.views }}</view>
+					</view>
+					<view class="interactive">
+						<image src="../../static/workDetail/heart2.png" class="bot_img" v-if="item.isGreat"
+							@click="clickHeart()">
+						</image>
+						<image src="../../static/workDetail/heart1.png" class="bot_img" v-else @click="clickHeart(item.isGreat,item.id)">
+						</image>
+						<view class="title" @click="clickHeart(item.isGreat,item.id)">
+							{{item.likes}}
+						</view>
+					</view>
+					<view class="interactive">
+						<image src="../../static/workDetail/star2.png" class="bot_img" v-if="item.isColl"
+							@click="clickStar()"></image>
+						<image src="../../static/workDetail/star1.png" class="bot_img" v-else @click="clickStar(item.isColl,item.id)">
+						</image>
+						<view class="title" @click="clickStar(item.isColl,item.id)">
+							{{item.collections}}
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-export default {
-  data() {
-    return {
-      // tabC: "0",
-      videoList: [
-        {
-          title:
-            "美丽科学美丽科学美丽科学美丽科学美丽科学美丽科学美丽科学美丽科学美丽科学美丽科学美丽科学美丽科学美丽科学美丽科学",
-          playback: "40.123",
-          like: "8.112.490",
-          collect: "8.112.490",
-          // video: "../../static/a1.mp4",
-          play: true,
-        },
-      ],
-      list: [],
-      query: {
-        total: 1,
-        page: 1,
-        size: 20,
-      },
-    };
-  },
-  onShow() {
-    // this.getData();
-    this.get();
-  },
-  mounted() {},
-  methods: {
-    toTab(val) {
-      this.tabC = val;
-      // this.getData()
-    },
-    get() {
-      this.http
-        .request("/exhibition/list", this.query, "GET")
-        .then((res) => {
-          if (res.code == 200) {
-            this.list = res.data.records;
-            this.query.total = res.data.total;
-            this.query.page = res.data.current;
-            this.query.size = res.data.size;
-          }
-        })
-        .catch((err) => {
-          uni.showToast({
-            title: e.data.message,
-            icon: "none",
-          });
-        });
-    },
-    skip(query = {}) {
-      uni.navigateTo({
-        // 稍后改为  订单管理的页面
-        url: "/pagesD/xskz/details",
-      });
-    },
-    playMask(obj) {
-      // this.videoList[index].play = false;
-      // var video = document.getElementById("video");
-      // //   暂停播放
-      // video.addEventListener("pause", function (e) {
-      //   console.log("暂停播放");
-      //   console.log(e);
-      // });
-      // // 15、ended：播放结束
-      // video.addEventListener("ended", function (e) {
-      //   console.log("视频播放完了");
-      //   console.log(e);
-      // });
-    },
-  },
-};
+	export default {
+		data() {
+			return {
+				// tabC: "0",
+				list: [],
+				query: {
+					page: 1,
+					size: 20,
+				},
+			};
+		},
+		onShow() {
+			// this.getData();
+			this.get();
+		},
+		mounted() {},
+		methods: {
+			toTab(val) {
+				this.tabC = val;
+				// this.getData()
+			},
+			//点赞、取消点赞
+			clickHeart(val0,val1) {
+				console.log(val1)
+				if (val0) {
+					this.http.request('/worksGreat/delGreat?type=3&workId=' + val1, "POST").then(res => {
+						if (res.code == 200) {
+							this.get()
+						}
+					}).catch(e => {
+						uni.showToast({
+							title: e.data.message,
+							icon: "none",
+						});
+					})
+				} else {
+					this.http.request('/worksGreat/addGreat?type=3&workId=' + val1, "POST").then(res => {
+						if (res.code == 200) {
+							this.get()
+						}
+					}).catch(e => {
+						uni.showToast({
+							title: e.data.message,
+							icon: "none",
+						});
+					})
+				}
+			},
+			//收藏、取消收藏
+			clickStar(val0,val1) {
+				if (val0) {
+					this.http.request('/worksCollection/delCollection?workId=' + val1 + '&type=3', "POST").then(res => {
+						if (res.code == 200) {
+							this.get()
+						}
+					}).catch(e => {
+						uni.showToast({
+							title: e.data.message,
+							icon: "none",
+						});
+					})
+				} else {
+					this.http.request('/worksCollection/addCollection?workId=' + val1 + '&type=3', "POST").then(res => {
+						if (res.code == 200) {
+							this.get()
+						}
+					}).catch(e => {
+						uni.showToast({
+							title: e.data.message,
+							icon: "none",
+						});
+					})
+				}
+			},
+			get() {
+				this.http
+					.request("/exhibition/list", this.query, "GET")
+					.then((res) => {
+						if (res.code == 200) {
+							this.list = res.data.records;
+							this.query.page = res.data.current;
+							this.query.size = res.data.size;
+						}
+					})
+					.catch((err) => {
+						uni.showToast({
+							title: e.data.message,
+							icon: "none",
+						});
+					});
+			},
+			skip(query = {}) {
+				uni.navigateTo({
+					// 稍后改为  订单管理的页面
+					url: "/pagesD/xskz/details",
+				});
+			},
+			videoErrorCallback: function(e) {
+				console.log(e.target.errMsg)
+				uni.showModal({
+					content: e.target.errMsg,
+					showCancel: false
+				})
+			},
+			playMask(obj) {
+				// this.videoList[index].play = false;
+				// var video = document.getElementById("video");
+				// //   暂停播放
+				// video.addEventListener("pause", function (e) {
+				//   console.log("暂停播放");
+				//   console.log(e);
+				// });
+				// // 15、ended：播放结束
+				// video.addEventListener("ended", function (e) {
+				//   console.log("视频播放完了");
+				//   console.log(e);
+				// });
+			},
+		},
+	};
 </script>
 
 <style lang="scss">
-.wyxx {
-  background-color: #fefefe;
-}
+	.wyxx {
+		background-color: #fefefe;
+	}
 
-.tabTitle {
-  display: flex;
-  width: 100%;
-  background: #ffffff;
+	.tabTitle {
+		display: flex;
+		width: 100%;
+		background: #ffffff;
 
-  .tabs {
-    width: 33.3%;
-    text-align: center;
-    padding: 32rpx 0 0rpx;
-    font-size: 28rpx;
-    font-weight: 400;
-    color: #333333;
+		.tabs {
+			width: 33.3%;
+			text-align: center;
+			padding: 32rpx 0 0rpx;
+			font-size: 28rpx;
+			font-weight: 400;
+			color: #333333;
 
-    .line {
-      width: 36rpx;
-      height: 4rpx;
-      margin: 10rpx auto 8rpx;
-    }
-  }
+			.line {
+				width: 36rpx;
+				height: 4rpx;
+				margin: 10rpx auto 8rpx;
+			}
+		}
 
-  .tabsC {
-    width: 33.3%;
-    text-align: center;
-    padding: 32rpx 0 0;
-    font-size: 28rpx;
-    font-weight: 600;
-    color: #000;
+		.tabsC {
+			width: 33.3%;
+			text-align: center;
+			padding: 32rpx 0 0;
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #000;
 
-    .line {
-      width: 44rpx;
-      height: 4rpx;
-      margin: 10rpx auto 8rpx;
-      background-color: #a02521;
-    }
-  }
-}
+			.line {
+				width: 44rpx;
+				height: 4rpx;
+				margin: 10rpx auto 8rpx;
+				background-color: #a02521;
+			}
+		}
+	}
 
-.forms {
-  margin: 40rpx auto 0rpx;
-  .teamBox {
-    .teamBox-top {
-      position: relative;
-      .content {
-        position: relative;
-        z-index: 4;
-        .content-title {
-          position: absolute;
-          z-index: 10;
-          padding: 18rpx;
-          text {
-            color: #fff;
-            max-width: 500rpx;
-            overflow: hidden; /* 超出一行文字自动隐藏 */
-            text-overflow: ellipsis; /*文字隐藏后添加省略号*/
-            white-space: nowrap;
-          }
-        }
-        .team-image {
-          width: 100%;
-          height: 400rpx;
-        }
-      }
-      .mask {
-        position: absolute;
-        top: 0;
-        left: 0;
-        right: 0;
-        bottom: 0;
-        z-index: 12;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        .mask-play {
-          image {
-            width: 60rpx;
-            height: 60rpx;
-          }
-        }
-      }
-    }
-    .teamBox-bottom {
-      display: flex;
-      justify-content: space-between;
-      padding: 15rpx 32rpx;
-      background-color: #fff;
-      box-sizing: border-box;
-      .interactive {
-        display: flex;
-        align-items: center;
-        image {
-          width: 30rpx;
-          height: 30rpx;
-          margin-right: 12rpx;
-        }
-      }
-    }
-  }
-}
-</style>
+	.forms {
+		margin: 40rpx auto 0rpx;
+
+		.teamBox {
+			.teamBox-top {
+				position: relative;
+
+				.content {
+					position: relative;
+					z-index: 4;
+
+					.content-title {
+						position: absolute;
+						z-index: 10;
+						padding: 18rpx;
+
+						text {
+							color: #fff;
+							max-width: 500rpx;
+							overflow: hidden;
+							/* 超出一行文字自动隐藏 */
+							text-overflow: ellipsis;
+							/*文字隐藏后添加省略号*/
+							white-space: nowrap;
+						}
+					}
+
+					.team-image {
+						width: 100%;
+						height: 400rpx;
+					}
+				}
+
+				.mask {
+					position: absolute;
+					top: 0;
+					left: 0;
+					right: 0;
+					bottom: 0;
+					z-index: 12;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+
+					.mask-play {
+						image {
+							width: 60rpx;
+							height: 60rpx;
+						}
+					}
+				}
+			}
+
+			.teamBox-bottom {
+				display: flex;
+				justify-content: space-between;
+				padding: 15rpx 32rpx;
+				background-color: #fff;
+				box-sizing: border-box;
+
+				.interactive {
+					display: flex;
+					align-items: center;
+
+					image {
+						width: 30rpx;
+						height: 30rpx;
+						margin-right: 12rpx;
+					}
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/src/pagesD/xxgl/index.vue b/src/pagesD/xxgl/index.vue
index d3f1a59..3ea70bd 100644
--- a/src/pagesD/xxgl/index.vue
+++ b/src/pagesD/xxgl/index.vue
@@ -1,88 +1,57 @@
 <template>
-  <view>
-    <view
-      v-if="isAdmin || isVillageAdmin"
-      class="tabss"
-      style="
+	<view>
+		<view v-if="isAdmin || isVillageAdmin" class="tabss" style="
         display: flex;
         justify-content: space-between;
         align-items: center;
         background-color: #ffffff;
-      "
-    >
-      <view
-        @click="clickTab(1)"
-        :class="{ acttiveSty: tabNum == 1 }"
-        style="flex: 1; text-align: center; height: 40px; line-height: 40px"
-      >
-        <text>已发布</text>
-      </view>
-      <view
-        style="flex: 1; text-align: center"
-        :class="{ acttiveSty: tabNum == 2 }"
-        @click="clickTab(2)"
-      >
-        <text>已接单</text>
-      </view>
-    </view>
-    <view class="main">
-      <view v-if="tabNum == 1">
-        <view class="art_act_itm" v-for="(item, i) in issueList" :key="i">
-          <image
-            :src="onPhoto(item.photos)"
-            alt="图片加载错误"
-            mode=""
-            @click="goActDeat(item.id, 1)"
-          ></image>
-          <view class="bottom_part" style="padding: 0 12px">
-            <view
-              class="ddd"
-              style="
+      ">
+			<view @click="clickTab(1)" :class="{ acttiveSty: tabNum == 1 }"
+				style="flex: 1; text-align: center; height: 40px; line-height: 40px">
+				<text>已发布</text>
+			</view>
+			<view style="flex: 1; text-align: center" :class="{ acttiveSty: tabNum == 2 }" @click="clickTab(2)">
+				<text>已接单</text>
+			</view>
+		</view>
+		<view class="main">
+			<view v-if="tabNum == 1">
+				<view class="art_act_itm" v-for="(item, i) in issueList" :key="i">
+					<image :src="onPhoto(item.photos)" alt="图片加载错误" mode="" @click="goActDeat(item.id, 1)"></image>
+					<view class="bottom_part" style="padding: 0 12px">
+						<view class="ddd" style="
                 display: flex;
                 justify-content: space-between;
                 align-items: center;
-              "
-            >
-              <view class="title">
-                {{ item.title }}
-              </view>
-              <view class="tag_sta_end" v-if="item.state == '2'"> 已完成 </view>
-              <!-- <view class="tag_sta_fail" v-if="item.state == '4'">
+              ">
+							<view class="title">
+								{{ item.title }}
+							</view>
+							<view class="tag_sta_end" v-if="item.state == '2'"> 已完成 </view>
+							<!-- <view class="tag_sta_fail" v-if="item.state == '4'">
                 未接单
               </view> -->
-              <!-- <view
+							<!-- <view
                 class="tag_sta_going"
                 v-if="item.state == '1' || item.state == '0'"
               >
                 进行中
               </view> -->
-              <view class="tag_sta_end" v-if="item.state == '1'"> 待评价 </view>
-              <view class="tag_sta_end" v-if="item.state == '0'">
-                待上传图片
-              </view>
-            </view>
-            <view class="act_time">
-              活动时间： {{ onDate(item.startTime) }} -
-              {{ onDate(item.endTime) }}
-            </view>
-            <view
-              class="but_box"
-              style="margin-top: 20rpx"
-              v-if="!(item.state == '4')"
-            >
-              <view
-                style="width: 236rpx; margin: 0 10rpx"
-                v-if="!(item.state == '0')"
-              >
-                <u-button
-                  icon="photo-fill"
-                  shape="circle"
-                  text="已传图片"
-                  @click="touploadedimg(item.id)"
-                >
-                </u-button>
-              </view>
-              <!-- <view
+							<view class="tag_sta_end" v-if="item.state == '1'"> 待评价 </view>
+							<view class="tag_sta_end" v-if="item.state == '0'">
+								待上传图片
+							</view>
+						</view>
+						<view class="act_time">
+							活动时间： {{ onDate(item.startTime) }} -
+							{{ onDate(item.endTime) }}
+						</view>
+						<view class="but_box" style="margin-top: 20rpx" v-if="!(item.state == '4')">
+							<view style="width: 236rpx; margin: 0 10rpx" v-if="!(item.state == '0')">
+								<u-button icon="photo-fill" shape="circle" text="已传图片" @click="touploadedimg(item.id)">
+								</u-button>
+							</view>
+							<!-- <view
                 style="width: 236rpx; margin: 0 10rpx"
                 v-if="item.state == '1'"
                 @click="done(item.id)"
@@ -93,7 +62,7 @@
                   text="确认完成"
                 ></u-button>
               </view> -->
-              <!-- <view
+							<!-- <view
                 style="width: 236rpx; margin: 0 10rpx"
                 @click="undone(item.id)"
                 v-if="item.state != '2' && item.state != '3'"
@@ -104,94 +73,60 @@
                   text="未完成"
                 ></u-button>
               </view> -->
-              <view
-                style="width: 236rpx; margin: 0 10rpx"
-                v-if="item.state == '0'"
-              >
-                <u-button
-                  icon="photo-fill"
-                  shape="circle"
-                  color="#99241B"
-                  plain
-                  text="图片上传"
-                  @click="toUpimgPage(item.id)"
-                ></u-button>
-              </view>
-              <view
-                style="width: 190rpx; margin: 0 10rpx"
-                v-if="item.state == '1'"
-              >
-                <u-button
-                  plain
-                  color="#99241B"
-                  shape="circle"
-                  text="评价"
-                  @click="pingjia(item.id)"
-                >
-                </u-button>
-              </view>
-              <view
-                style="width: 190rpx; margin: 0 10rpx"
-                v-if="item.state == '2'"
-              >
-                <!-- <view style="width: 190rpx;margin: 0 10rpx; "  > -->
-                <u-button
-                  shape="circle"
-                  text="已评价"
-                  @click="toEvlauedpg(item.evaluate)"
-                ></u-button>
-              </view>
-            </view>
-            <view
-              style="
+							<view style="width: 236rpx; margin: 0 10rpx" v-if="item.state == '0'">
+								<u-button icon="photo-fill" shape="circle" color="#99241B" plain text="图片上传"
+									@click="toUpimgPage(item.id)"></u-button>
+							</view>
+							<view style="width: 190rpx; margin: 0 10rpx" v-if="item.state == '1'">
+								<u-button plain color="#99241B" shape="circle" text="评价" @click="pingjia(item.id)">
+								</u-button>
+							</view>
+							<view style="width: 190rpx; margin: 0 10rpx" v-if="item.state == '2'">
+								<!-- <view style="width: 190rpx;margin: 0 10rpx; "  > -->
+								<u-button shape="circle" text="已评价" @click="toEvlauedpg(item.evaluate)"></u-button>
+							</view>
+						</view>
+						<view style="
                 margin-top: 50rpx;
                 text-align: center;
                 width: 100%;
                 font-size: 36rpx;
                 font-weight: 600;
-              "
-              v-if="item.state == '4'"
-            >
-              活动已逾期
-            </view>
-          </view>
-        </view>
-        <view v-if="!(issueList.length > 0)">
-          <u-empty
-            mode="list"
-            icon="http://cdn.uviewui.com/uview/empty/list.png"
-          >
-          </u-empty>
-        </view>
-      </view>
+              " v-if="item.state == '4'">
+							活动已逾期
+						</view>
+					</view>
+				</view>
+				<view v-if="!(issueList.length > 0)">
+					<u-empty mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png">
+					</u-empty>
+				</view>
+			</view>
 
-      <view v-if="tabNum == 2">
-        <view class="art_act_itm" v-for="(item, i) in receivingList" :key="i">
-          <image @click="goActDeat(item.id)" :src="item.photos" mode=""></image>
-          <view class="bottom_part" style="padding: 0 12px">
-            <view
-              class="ddd"
-              style="
+			<view v-if="tabNum == 2">
+				<view class="art_act_itm" v-for="(item, i) in receivingList" :key="i">
+					<image @click="goActDeat(item.id)" :src="item.photos" mode=""></image>
+					<view class="bottom_part" style="padding: 0 12px">
+						<view class="ddd" style="
                 display: flex;
                 justify-content: space-between;
                 align-items: center;
-              "
-            >
-              <view class="title">
-                {{ item.title }}
-              </view>
-              <view class="tag_sta" v-if="item.state == '0'">  待上传图片 </view>
-              <view class="tag_sta_end" v-if="item.state == '2'"> 已完成 </view>
-              <view class="tag_sta_going" v-if="item.state == '1'">
-                进行中
-              </view>
-            </view>
-            <view class="act_time">
-              活动时间： {{ onDate(item.startTime) }} -
-              {{ onDate(item.endTime) }}
-            </view>
-            <view class="but_box" style="margin-top: 20rpx">
-              <!-- <view
+              ">
+							<view class="title">
+								{{ item.title }}
+							</view>
+							<view class="tag_sta" v-if="item.state == '0'"> 待上传图片 </view>
+							<view class="tag_sta_end" v-if="item.state == '2'"> 已完成 </view>
+							<view class="tag_sta_going" v-if="item.state == '1'">
+								进行中
+							</view>
+						</view>
+						<view class="act_time">
+							活动时间： {{ onDate(item.startTime) }} -
+							{{ onDate(item.endTime) }}
+						</view>
+						<view class="but_box" style="margin-top: 20rpx">
+							<!-- <view
                 style="width: 236rpx; margin: 0 10rpx"
                 v-if="item.state == '0'"
               >
@@ -201,37 +136,26 @@
                   @click="cancleBM(item.id)"
                 ></u-button>
               </view> -->
-              <view
-                style="width: 236rpx; margin: 0 10rpx"
-                v-if="item.state == '2'"
-              >
-                <u-button
-                  shape="circle"
-                  text="收到的评价"
-                  @click="toEvlauedpg(item.evaluate)"
-                ></u-button>
-              </view>
-            </view>
-          </view>
-        </view>
-        <view v-if="!(receivingList.length > 0)">
-          <u-empty
-            mode="list"
-            icon="http://cdn.uviewui.com/uview/empty/list.png"
-          >
-          </u-empty>
-        </view>
-      </view>
-    </view>
-    <u-popup :show="showS" @close="closeS" mode="center" :round="10">
-      <view style="width: 640rpx">
-        <view style="padding: 32rpx">
-          <view style="font-size: 32rpx; font-weight: 800">
-            确认接单者未完成或已逾期？
-          </view>
-        </view>
-        <view
-          style="
+							<view style="width: 236rpx; margin: 0 10rpx" v-if="item.state == '2'">
+								<u-button shape="circle" text="收到的评价" @click="toEvlauedpg(item.evaluate)"></u-button>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view v-if="!(receivingList.length > 0)">
+					<u-empty mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png">
+					</u-empty>
+				</view>
+			</view>
+		</view>
+		<u-popup :show="showS" @close="closeS" mode="center" :round="10" :safeAreaInsetBottom="false">
+			<view style="width: 640rpx">
+				<view style="padding: 32rpx">
+					<view style="font-size: 32rpx; font-weight: 800">
+						确认接单者未完成或已逾期？
+					</view>
+				</view>
+				<view style="
             display: flex;
             border-top: 2rpx solid #e7e7e7;
             height: 112rpx;
@@ -239,480 +163,433 @@
             line-height: 112rpx;
             font-size: 32rpx;
             font-weight: 600;
-          "
-        >
-          <view
-            style="
+          ">
+					<view style="
               width: 319rpx;
               border-right: 1rpx solid #e7e7e7;
               text-align: center;
-            "
-            @click="closeS"
-          >
-            取消
-          </view>
-          <view
-            style="
+            " @click="closeS">
+						取消
+					</view>
+					<view style="
               width: 319rpx;
               border-right: 1rpx solid #e7e7e7;
               text-align: center;
               color: #3f84fd;
-            "
-            @click="sureS"
-          >
-            确定
-          </view>
-        </view>
-      </view>
-    </u-popup>
-    <!-- 评价 -->
-    <u-modal
-      :show="show"
-      title="评价"
-      @close="close()"
-      :closeOnClickOverlay="true"
-    >
-      <view class="pinContent">
-        <textarea
-          :disabled="id == ''"
-          cols="30"
-          rows="10"
-          v-model="evaluate"
-          placeholder="请输入评价..."
-        ></textarea>
-      </view>
-      <view
-        slot="confirmButton"
-        style="display: flex; justify-content: center; align-items: center"
-      >
-        <view style="width: 400rpx">
-          <u-button
-            v-if="id != ''"
-            color="#99241B"
-            shape="circle"
-            text="提交"
-            @click="onSubmit()"
-          ></u-button>
-          <u-button
-            v-else
-            color="#99241B"
-            shape="circle"
-            text="确认"
-            @click="show = false"
-          ></u-button>
-        </view>
-      </view>
-    </u-modal>
-    <u-modal
-      :show="showShoudao"
-      @close="closeRecive()"
-      title="收到的评价"
-      :closeOnClickOverlay="true"
-    >
-      <u-rate count="5" v-model="starsvalue" readonly></u-rate>
-      <view
-        slot="confirmButton"
-        style="display: flex; justify-content: center; align-items: center"
-      >
-        <view style="width: 400rpx">
-          <u-button
-            color="#99241B"
-            shape="circle"
-            text="确定"
-            @click="showShoudao = false"
-          ></u-button>
-        </view>
-      </view>
-    </u-modal>
-  </view>
+            " @click="sureS">
+						确定
+					</view>
+				</view>
+			</view>
+		</u-popup>
+		<!-- 评价 -->
+		<u-modal :show="show" title="评价" @close="close()" :closeOnClickOverlay="true">
+			<view class="pinContent">
+				<textarea :disabled="id == ''" cols="30" rows="10" v-model="evaluate" placeholder="请输入评价..."></textarea>
+			</view>
+			<view slot="confirmButton" style="display: flex; justify-content: center; align-items: center">
+				<view style="width: 400rpx">
+					<u-button v-if="id != ''" color="#99241B" shape="circle" text="提交" @click="onSubmit()"></u-button>
+					<u-button v-else color="#99241B" shape="circle" text="确认" @click="show = false"></u-button>
+				</view>
+			</view>
+		</u-modal>
+		<u-modal :show="showShoudao" @close="closeRecive()" title="收到的评价" :closeOnClickOverlay="true">
+			<u-rate count="5" v-model="starsvalue" readonly></u-rate>
+			<view slot="confirmButton" style="display: flex; justify-content: center; align-items: center">
+				<view style="width: 400rpx">
+					<u-button color="#99241B" shape="circle" text="确定" @click="showShoudao = false"></u-button>
+				</view>
+			</view>
+		</u-modal>
+	</view>
 </template>
 
 <script>
-export default {
-  data() {
-    return {
-      showShoudao: false,
-      show: false,
-      showS: false,
-      count: 4,
-      value: 2,
-      rate2: 2,
-      total: 0,
-      score: [
-        {
-          name: "jack",
-          star: 0,
-        },
-      ],
-      starvalue: 0,
-      orderList: [],
-      tabNum: 1,
-      pingjiaobj: {},
-      baomingpingjia: [],
-      starsvalue: 0,
-      page: 1,
-      size: 20,
-      current: null,
-      isAdmin: null, //管理员
-      isVillageAdmin: null, //村管理
-      issueList: [],
-      receivingList: [],
-      evaluate: "",
-      id: "",
-    };
-  },
-  onShow() {
-    this.isAdmin = uni.getStorageSync("isAdmin");
-    this.isVillageAdmin = uni.getStorageSync("isVillageAdmin");
-    this.tabNum = this.isAdmin ? 1 : this.isVillageAdmin ? 2 : null;
-    this.clickTab(this.tabNum);
-  },
-  // 下拉刷新
-  onPullDownRefresh() {
-    this.clickTab(this.tabNum);
-    setTimeout(function () {
-      uni.stopPullDownRefresh();
-    }, 1000);
-  },
-  //上拉
-  onReachBottom() {
-    if (this.current > this.page) {
-      this.page++;
-      this.moreOrder();
-    }
-  },
-  methods: {
-    clickTab(num) {
-      this.orderList = [];
-      this.tabNum = num;
-      this.page = 1;
-      if (num == 1) {
-        this.myPosts();
-      } else if (num == 2) {
-        this.myArtCountryside();
-      }
-    },
-    myArtCountryside() {
-      let obj = {
-        page: this.page,
-        size: this.size,
-      };
-      this.http
-        .request("/artCountryside/myArtCountryside", obj, "GET")
-        .then((res) => {
-          if (res.code == 200) {
-            this.receivingList = [...this.receivingList, ...res.data.records];
-            this.page = res.data.current;
-            this.current = res.data.current;
-          }
-        })
-        .catch((err) => {
-          uni.showToast({
-            title: e.data.message,
-            icon: "none",
-          });
-        });
-    },
-    myPosts() {
-      let obj = {
-        page: this.page,
-        size: this.size,
-      };
-      this.http
-        .request("/artCountryside/myPosts", obj, "GET")
-        .then((res) => {
-          if (res.code == 200) {
-            this.issueList = [...this.issueList, ...res.data.records];
-            this.page = res.data.current;
-            this.current = res.data.current;
-          }
-        })
-        .catch((err) => {
-          uni.showToast({
-            title: e.data.message,
-            icon: "none",
-          });
-        });
-    },
-    onDate(time) {
-      let date = new Date(time);
-      return date.toLocaleString();
-    },
-    onPhoto(photo) {
-      let src = "";
-      if (photo) {
-        let list = photo.split(",");
-        src = list[0];
-      }
-      return src;
-    },
-    toUpimgPage(id) {
-      uni.navigateTo({
-        url: `/pagesD/xxgl/upload?id=${id}`,
-      });
-    },
-    touploadedimg(id) {
-      uni.navigateTo({
-        url: `/pagesD/xxgl/uploadShow?id=${id}`,
-      });
-    },
-    close() {
-      this.show = false;
-    },
-    closeRecive() {
-      this.showShoudao = false;
-    },
-    undone(val) {
-      this.undoneId = val;
-      this.showS = true;
-    },
-    closeS() {
-      this.showS = false;
-    },
-    pingjia(id) {
-      this.id = id;
-      this.show = true;
-    },
-    onSubmit() {
-      if (this.id == "") {
-        this.show = false;
-        return;
-      }
-      this.http
-        .request(
-          `/artCountryside/evaluate?id=${this.id}&evaluate=${this.evaluate}`,
-          {},
-          "POST"
-        )
-        .then((res) => {
-          if (res.code == 200) {
-            uni.showToast({
-              title: "评价成功",
-            });
-            this.show = false;
-            this.moreOrder(true);
-            this.id = "";
-            this.evaluate = "";
-          } else {
-            uni.showToast({
-              title: err.data.message,
-              icon: "none",
-            });
-          }
-        })
-        .catch((err) => {
-          uni.showToast({
-            title: err.data.message,
-            icon: "none",
-          });
-        });
-    },
-    moreOrder(page = null) {
-      if (page) {
-        this.page = 1;
-      }
-      if (this.tabNum == 1) {
-        this.myPosts();
-      } else if (this.tabNum == 2) {
-        this.myArtCountryside();
-      }
-    },
-    // receiveevlaue(id) {
-    //   this.showShoudao = true;
-    //   this.http
-    //     .request("/hallUser/sdpj?id=" + id, {}, "POST")
-    //     .then((res) => {
-    //       if (res.code == 200) {
-    //         this.starsvalue = res.data.evaluate;
-    //         this.showShoudao = true;
-    //       }
-    //     })
-    //     .catch((e) => {
-    //       uni.showToast({
-    //         title: e.data.message,
-    //         icon: "none",
-    //       });
-    //     });
-    // },
-    // done(id) {
-    //   this.http
-    //     .request("/hallUser/complete?id=" + id, {}, "POST")
-    //     .then((res) => {
-    //       if (res.code == 200) {
-    //         this.clickTab(1);
-    //       }
-    //     })
-    //     .catch((e) => {
-    //       uni.showToast({
-    //         title: e.data.message,
-    //         icon: "none",
-    //       });
-    //     });
-    // },
-    // 评价
+	export default {
+		data() {
+			return {
+				showShoudao: false,
+				show: false,
+				showS: false,
+				count: 4,
+				value: 2,
+				rate2: 2,
+				total: 0,
+				score: [{
+					name: "jack",
+					star: 0,
+				}, ],
+				starvalue: 0,
+				orderList: [],
+				tabNum: 1,
+				pingjiaobj: {},
+				baomingpingjia: [],
+				starsvalue: 0,
+				page: 1,
+				size: 20,
+				current: null,
+				isAdmin: null, //管理员
+				isVillageAdmin: null, //村管理
+				issueList: [],
+				receivingList: [],
+				evaluate: "",
+				id: "",
+			};
+		},
+		onShow() {
+			this.isAdmin = uni.getStorageSync("isAdmin");
+			this.isVillageAdmin = uni.getStorageSync("isVillageAdmin");
+			this.tabNum = this.isAdmin ? 1 : this.isVillageAdmin ? 2 : null;
+			this.clickTab(this.tabNum);
+		},
+		// 下拉刷新
+		onPullDownRefresh() {
+			this.clickTab(this.tabNum);
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		//上拉
+		onReachBottom() {
+			if (this.current > this.page) {
+				this.page++;
+				this.moreOrder();
+			}
+		},
+		methods: {
+			clickTab(num) {
+				this.receivingList = [];
+				this.issueList = [];
+				this.tabNum = num;
+				this.page = 1;
+				if (num == 1) {
+					this.myPosts();
+				} else if (num == 2) {
+					this.myArtCountryside();
+				}
+			},
+			myArtCountryside() {
+				let obj = {
+					page: this.page,
+					size: this.size,
+				};
+				this.http
+					.request("/artCountryside/myArtCountryside", obj, "GET")
+					.then((res) => {
+						if (res.code == 200) {
+							this.receivingList = [...this.receivingList, ...res.data.records];
+							this.page = res.data.current;
+							this.current = res.data.current;
+						}
+					})
+					.catch((err) => {
+						uni.showToast({
+							title: e.data.message,
+							icon: "none",
+						});
+					});
+			},
+			myPosts() {
+				let obj = {
+					page: this.page,
+					size: this.size,
+				};
+				this.http
+					.request("/artCountryside/myPosts", obj, "GET")
+					.then((res) => {
+						if (res.code == 200) {
+							this.issueList = [...this.issueList, ...res.data.records];
+							this.page = res.data.current;
+							this.current = res.data.current;
+						}
+					})
+					.catch((err) => {
+						uni.showToast({
+							title: e.data.message,
+							icon: "none",
+						});
+					});
+			},
+			onDate(time) {
+				let date = new Date(time);
+				return date.toLocaleString();
+			},
+			onPhoto(photo) {
+				let src = "";
+				if (photo) {
+					let list = photo.split(",");
+					src = list[0];
+				}
+				return src;
+			},
+			toUpimgPage(id) {
+				uni.navigateTo({
+					url: `/pagesD/xxgl/upload?id=${id}`,
+				});
+			},
+			touploadedimg(id) {
+				uni.navigateTo({
+					url: `/pagesD/xxgl/uploadShow?id=${id}`,
+				});
+			},
+			close() {
+				this.show = false;
+			},
+			closeRecive() {
+				this.showShoudao = false;
+			},
+			undone(val) {
+				this.undoneId = val;
+				this.showS = true;
+			},
+			closeS() {
+				this.showS = false;
+			},
+			pingjia(id) {
+				this.id = id;
+				this.show = true;
+			},
+			onSubmit() {
+				if (this.id == "") {
+					this.show = false;
+					return;
+				}
+				this.http
+					.request(
+						`/artCountryside/evaluate?id=${this.id}&evaluate=${this.evaluate}`, {},
+						"POST"
+					)
+					.then((res) => {
+						if (res.code == 200) {
+							uni.showToast({
+								title: "评价成功",
+							});
+							this.show = false;
+							this.moreOrder(true);
+							this.id = "";
+							this.evaluate = "";
+						} else {
+							uni.showToast({
+								title: err.data.message,
+								icon: "none",
+							});
+						}
+					})
+					.catch((err) => {
+						uni.showToast({
+							title: err.data.message,
+							icon: "none",
+						});
+					});
+			},
+			moreOrder(page = null) {
+				if (page) {
+					this.page = 1;
+				}
+				if (this.tabNum == 1) {
+					this.myPosts();
+				} else if (this.tabNum == 2) {
+					this.myArtCountryside();
+				}
+			},
+			// receiveevlaue(id) {
+			//   this.showShoudao = true;
+			//   this.http
+			//     .request("/hallUser/sdpj?id=" + id, {}, "POST")
+			//     .then((res) => {
+			//       if (res.code == 200) {
+			//         this.starsvalue = res.data.evaluate;
+			//         this.showShoudao = true;
+			//       }
+			//     })
+			//     .catch((e) => {
+			//       uni.showToast({
+			//         title: e.data.message,
+			//         icon: "none",
+			//       });
+			//     });
+			// },
+			// done(id) {
+			//   this.http
+			//     .request("/hallUser/complete?id=" + id, {}, "POST")
+			//     .then((res) => {
+			//       if (res.code == 200) {
+			//         this.clickTab(1);
+			//       }
+			//     })
+			//     .catch((e) => {
+			//       uni.showToast({
+			//         title: e.data.message,
+			//         icon: "none",
+			//       });
+			//     });
+			// },
+			// 评价
 
-    // cancleBM(id) {
-    //   let that = this;
-    //   this.http
-    //     .request("/hallUser/qxSingUp?hallId=" + id, {}, "POST")
-    //     .then((res) => {
-    //       if (res.code == 200) {
-    //         this.clickTab(2);
-    //         uni.showToast({
-    //           title: "成功",
-    //           icon: "none",
-    //         });
-    //       }
-    //     })
-    //     .catch((e) => {
-    //       uni.showToast({
-    //         title: e.data.message,
-    //         icon: "none",
-    //       });
-    //     });
-    // },
+			// cancleBM(id) {
+			//   let that = this;
+			//   this.http
+			//     .request("/hallUser/qxSingUp?hallId=" + id, {}, "POST")
+			//     .then((res) => {
+			//       if (res.code == 200) {
+			//         this.clickTab(2);
+			//         uni.showToast({
+			//           title: "成功",
+			//           icon: "none",
+			//         });
+			//       }
+			//     })
+			//     .catch((e) => {
+			//       uni.showToast({
+			//         title: e.data.message,
+			//         icon: "none",
+			//       });
+			//     });
+			// },
 
-    // goActDeat(id, typEnum) {
-    //   if (typEnum) {
-    //     uni.navigateTo({
-    //       url: `/pagesB/orderHall/orderHallDetails?id=${id}&isCheck=${typEnum}`,
-    //     });
-    //   } else {
-    //     uni.navigateTo({
-    //       url: `/pagesB/orderHall/orderHallDetails?id=${id}`,
-    //     });
-    //   }
-    // },
+			// goActDeat(id, typEnum) {
+			//   if (typEnum) {
+			//     uni.navigateTo({
+			//       url: `/pagesB/orderHall/orderHallDetails?id=${id}&isCheck=${typEnum}`,
+			//     });
+			//   } else {
+			//     uni.navigateTo({
+			//       url: `/pagesB/orderHall/orderHallDetails?id=${id}`,
+			//     });
+			//   }
+			// },
 
-    toEvlauedpg(value) {
-      this.show = true;
-      this.evaluate = value;
-    },
+			toEvlauedpg(value) {
+				this.show = true;
+				this.evaluate = value;
+			},
 
-    // sureS() {
-    //   this.http
-    //     .request("/hallUser/undone?id=" + this.undoneId, {}, "POST")
-    //     .then((res) => {
-    //       if (res.code == 200) {
-    //         this.clickTab(this.tabNum);
-    //         this.showS = false;
-    //       }
-    //     })
-    //     .catch((e) => {
-    //       uni.showToast({
-    //         title: e.data.message,
-    //         icon: "none",
-    //       });
-    //     });
-    // },
-  },
-};
+			// sureS() {
+			//   this.http
+			//     .request("/hallUser/undone?id=" + this.undoneId, {}, "POST")
+			//     .then((res) => {
+			//       if (res.code == 200) {
+			//         this.clickTab(this.tabNum);
+			//         this.showS = false;
+			//       }
+			//     })
+			//     .catch((e) => {
+			//       uni.showToast({
+			//         title: e.data.message,
+			//         icon: "none",
+			//       });
+			//     });
+			// },
+		},
+	};
 </script>
 
 <style lang="scss">
-page {
-  /* width: calc(100% - 64rpx);
+	page {
+		/* width: calc(100% - 64rpx);
 		margin: 0rpx 32rpx; */
-  background-color: #f5f5f5 !important;
-}
+		background-color: #f5f5f5 !important;
+	}
 
-.main {
-  padding: 0rpx 32rpx;
-}
+	.main {
+		padding: 0rpx 32rpx;
+	}
 
-image {
-  width: 100%;
-  height: 60%;
-}
+	image {
+		width: 100%;
+		height: 60%;
+	}
 
-.acttiveSty {
-  color: #9a2720;
-  font-weight: 700;
-}
+	.acttiveSty {
+		color: #9a2720;
+		font-weight: 700;
+	}
 
-.but_box {
-  display: flex;
-  justify-content: flex-end;
-  align-items: center;
-}
+	.but_box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+	}
 
-.tag_sta {
-  width: 160rpx;
-  height: 48rpx;
-  background: #f9f2f2;
-  border-radius: 8rpx;
-  line-height: 48rpx;
-  color: #99241b;
-  text-align: center;
-  font-size: 24rpx;
-}
+	.tag_sta {
+		width: 160rpx;
+		height: 48rpx;
+		background: #f9f2f2;
+		border-radius: 8rpx;
+		line-height: 48rpx;
+		color: #99241b;
+		text-align: center;
+		font-size: 24rpx;
+	}
 
-.tag_sta_going {
-  width: 100rpx;
-  height: 48rpx;
-  background: rgba(238, 73, 60, 0.09);
-  border-radius: 8rpx;
-  line-height: 48rpx;
-  color: #ee493c;
-  text-align: center;
-  font-size: 24rpx;
-}
+	.tag_sta_going {
+		width: 100rpx;
+		height: 48rpx;
+		background: rgba(238, 73, 60, 0.09);
+		border-radius: 8rpx;
+		line-height: 48rpx;
+		color: #ee493c;
+		text-align: center;
+		font-size: 24rpx;
+	}
 
-.tag_sta_end {
-  width: 160rpx;
-  height: 48rpx;
-  background: #fff4ed;
-  border-radius: 8rpx;
-  line-height: 48rpx;
-  color: #ff6600;
-  text-align: center;
-  font-size: 24rpx;
-}
+	.tag_sta_end {
+		width: 160rpx;
+		height: 48rpx;
+		background: #fff4ed;
+		border-radius: 8rpx;
+		line-height: 48rpx;
+		color: #ff6600;
+		text-align: center;
+		font-size: 24rpx;
+	}
 
-.tag_sta_fail {
-  width: 100rpx;
-  height: 48rpx;
-  background: #f5f5f5;
-  border-radius: 8rpx;
-  line-height: 48rpx;
-  color: #7a7a7a;
-  text-align: center;
-  font-size: 24rpx;
-}
+	.tag_sta_fail {
+		width: 100rpx;
+		height: 48rpx;
+		background: #f5f5f5;
+		border-radius: 8rpx;
+		line-height: 48rpx;
+		color: #7a7a7a;
+		text-align: center;
+		font-size: 24rpx;
+	}
 
-.act_time {
-  margin: 26rpx 0;
-  height: 34rpx;
-  font-size: 24rpx;
-  font-family: PingFangSC-Regular, PingFang SC;
-  font-weight: 400;
-  color: #afadb0;
-  line-height: 34rpx;
-}
+	.act_time {
+		margin: 26rpx 0;
+		height: 34rpx;
+		font-size: 24rpx;
+		font-family: PingFangSC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #afadb0;
+		line-height: 34rpx;
+	}
 
-.art_act_itm {
-  margin-top: 24rpx;
-  height: 628rpx;
-  border-radius: 8px;
-  border: 2rpx solid transparnt;
-  position: relative;
-  border-radius: 20rpx;
-  overflow: hidden;
-  background-color: #ffffff;
+	.art_act_itm {
+		margin-top: 24rpx;
+		height: 628rpx;
+		border-radius: 8px;
+		border: 2rpx solid transparnt;
+		position: relative;
+		border-radius: 20rpx;
+		overflow: hidden;
+		background-color: #ffffff;
 
-  .title {
-    width: 580rpx;
-    color: #000000;
-    font-size: 32rpx;
-    font-weight: 600;
-    color: #251b1d;
-  }
-}
+		.title {
+			width: 580rpx;
+			color: #000000;
+			font-size: 32rpx;
+			font-weight: 600;
+			color: #251b1d;
+		}
+	}
 
-.pinContent {
-  margin-top: 16rpx;
-  textarea {
-    margin: 12rpx;
-  }
-}
-</style>
+	.pinContent {
+		margin-top: 16rpx;
+
+		textarea {
+			margin: 12rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/src/request/interface.js b/src/request/interface.js
index 695165f..e83fe7c 100644
--- a/src/request/interface.js
+++ b/src/request/interface.js
@@ -5,10 +5,10 @@
 
 export default {
 	config: {
-		baseUrl: "http://192.168.1.3:8080/h5/api",  //俞燕红-小程序不能配跨域
+		// baseUrl: "http://192.168.1.3:8080/h5/api",  //俞燕红-小程序不能配跨域
 		// baseUrl: "/pre",  //俞燕红-跨域
 		// baseUrl: "https://yxx.ydool.net/h5/api", //线上
-		// baseUrl: "/h5/api", //h5 
+		baseUrl: "/h5/api", //h5 
 		header: {
 			'Content-Type': 'application/json;charset=UTF-8',
 			// 'Content-Type':'application/x-www-form-urlencoded'
diff --git a/src/static/DataSearch/other.png b/src/static/DataSearch/other.png
new file mode 100644
index 0000000..4b9c13f
Binary files /dev/null and b/src/static/DataSearch/other.png differ