Merge branch 'master' of git.zdool.com:xs/yyx/h5

src/manifest.json

@@ -1,26 +1,26 @@
 {
-    "name" : "yxx",
+	"name": "yxx",
-    "appid" : "__UNI__77CA6BC",
+	"appid": "__UNI__77CA6BC",
-    "description" : "",
+	"description": "",
-    "versionName" : "1.0.0",
+	"versionName": "1.0.0",
-    "versionCode" : "100",
+	"versionCode": "100",
-    "transformPx" : false,
+	"transformPx": false,
-    "app-plus" : {
+	"app-plus": {
 		/* 5+App特有相关 */
-        "usingComponents" : true,
+		"usingComponents": true,
-        "splashscreen" : {
+		"splashscreen": {
-            "alwaysShowBeforeRender" : true,
+			"alwaysShowBeforeRender": true,
-            "waiting" : true,
+			"waiting": true,
-            "autoclose" : true,
+			"autoclose": true,
-            "delay" : 0
+			"delay": 0
 		},
-        "modules" : {},
+		"modules": {},
 		/* 模块配置 */
-        "distribute" : {
+		"distribute": {
 			/* 应用发布信息 */
-            "android" : {
+			"android": {
 				/* android打包配置 */
-                "permissions" : [
+				"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\"/>",
@@ -45,64 +45,71 @@
 					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
 				]
 			},
-            "ios" : {},
+			"ios": {},
 			/* ios打包配置 */
-            "sdkConfigs" : {}
+			"sdkConfigs": {}
 		}
 	},
 	/* SDK配置 */
-    "quickapp" : {},
+	"quickapp": {},
 	/* 快应用特有相关 */
-    "mp-weixin" : {
+	"mp-weixin": {
-        "appid" : "wx55b187e6ed92e2ac",
+		"appid": "wx55b187e6ed92e2ac",
-        "setting" : {
+		"setting": {
-            "urlCheck" : true,
+			"urlCheck": true,
-            "minified" : true,
+			"minified": true,
-            "es6" : true,
+			"es6": true,
-            "postcss" : true
+			"postcss": true
 		},
-        "usingComponents" : true,
+		"usingComponents": true,
-        "lazyCodeLoading" : "requiredComponents",
+		"lazyCodeLoading": "requiredComponents",
-        "optimization" : {
+		"optimization": {
-            "subPackages" : true
+			"subPackages": true
+		},
+		"plugins": {
+			"player": {
+				"version": "2.1.1",
+				"provider": "wxa75efa648b60994b"
 			}
+		}
+
 	},
-    "mp-alipay" : {
+	"mp-alipay": {
-        "usingComponents" : true
+		"usingComponents": true
 	},
-    "mp-baidu" : {
+	"mp-baidu": {
-        "usingComponents" : true
+		"usingComponents": true
 	},
-    "mp-toutiao" : {
+	"mp-toutiao": {
-        "usingComponents" : true
+		"usingComponents": true
 	},
-    "mp-qq" : {
+	"mp-qq": {
-        "usingComponents" : true
+		"usingComponents": true
 	},
-    "h5" : {
+	"h5": {
-        "router" : {
+		"router": {
-            "mode" : "hash"
+			"mode": "hash"
 		},
-        "title" : "艺象心",
+		"title": "艺象心",
-        "devServer" : {
+		"devServer": {
-            "disableHostCheck" : true, // 禁用 Host 检查，默认false
+			"disableHostCheck": true, // 禁用 Host 检查，默认false
-            "proxy" : {
+			"proxy": {
 				// 与vue中的proxyTable配置大致上一致,此处我同时代理了两个
-                "/pre" : {
+				"/pre": {
 					// 预发布
-                    "target" : "http://192.168.1.3:8080/h5/api", // 目标接口域名
+					"target": "http://192.168.1.3:8080/h5/api", // 目标接口域名
 
 					// "target" : "https://yxx.ydool.net/h5/api", // 目标接口域名
-                    "changeOrigin" : true, // 是否跨域
+					"changeOrigin": true, // 是否跨域
-                    "secure" : false, // 设置支持https协议的代理
+					"secure": false, // 设置支持https协议的代理
-                    "pathRewrite" : {
+					"pathRewrite": {
-                        "^/pre" : ""
+						"^/pre": ""
 					} // 此处pathRewrite加第二个参数是因为我的接口最后都有一个/api,在这个地方加/api等价于直接在target后加/api
 				},
-                "/sock" : {
+				"/sock": {
 					// 预发布
-                    "target" : "ws:// 10.0.0.5:8080/webSocket", // 目标接口域名
+					"target": "ws:// 10.0.0.5:8080/webSocket", // 目标接口域名
-                    "changeOrigin" : true // 是否跨域
+					"changeOrigin": true // 是否跨域
 				}
 			}
 		}

src/pages.json

@@ -9,18 +9,20 @@
         "enablePullDownRefresh": false,
         "navigationStyle": "custom"
       }
-		}, {
+    },
+    {
       "path": "pages/pageHome/pdfView",
       "style": {
         "navigationBarTitleText": "文件浏览",
         "enablePullDownRefresh": false
       }
-
     }
   ],
-	"subPackages": [{
+  "subPackages": [
+    {
       "root": "pagesA/",
-			"pages": [{
+      "pages": [
+        {
           "path": "msg/msg",
           "style": {
             "enablePullDownRefresh": true,
@@ -49,7 +51,6 @@
             "navigationBarTitleText": "修改地址",
             "enablePullDownRefresh": false
           }
-
         },
         {
           "path": "activeManage/activeManage",
@@ -58,7 +59,6 @@
             "enablePullDownRefresh": true,
             "onReachBottomDistance": 20
           }
-
         },
         {
           "path": "activeManage/signIn",
@@ -66,7 +66,6 @@
             "navigationBarTitleText": "签到管理",
             "enablePullDownRefresh": false
           }
-
         },
         {
           "path": "activeManage/examine",
@@ -74,7 +73,6 @@
             "navigationBarTitleText": "审核管理",
             "enablePullDownRefresh": false
           }
-
         },
         {
           "path": "activeManage/examineList",
@@ -83,7 +81,6 @@
             "enablePullDownRefresh": true,
             "onReachBottomDistance": 20
           }
-
         },
         {
           "path": "activeManage/toGm",
@@ -91,7 +88,6 @@
             "navigationBarTitleText": "申请冠名",
             "enablePullDownRefresh": false
           }
-
         },
         {
           "path": "activeManage/qdList",
@@ -99,7 +95,6 @@
             "navigationBarTitleText": "签到详情",
             "enablePullDownRefresh": false
           }
-
         },
         // 我的页面
         {
@@ -176,7 +171,6 @@
             "enablePullDownRefresh": true,
             "onReachBottomDistance": 20
           }
-
         },
         {
           "path": "my/imgUpload",
@@ -184,14 +178,13 @@
             "navigationBarTitleText": "图片上传",
             "enablePullDownRefresh": false
           }
-
+        },
-				}, {
+        {
           "path": "my/evaluated",
           "style": {
             "navigationBarTitleText": "已评价",
             "enablePullDownRefresh": false
           }
-
         },
         {
           "path": "my/uploadedImgShow",
@@ -199,35 +192,34 @@
             "navigationBarTitleText": "已传图片",
             "enablePullDownRefresh": false
           }
-
         }
       ]
     },
     {
       "root": "pagesB/",
-			"pages": [{
+      "pages": [
+        {
           "path": "ArtRace/ArtRace",
           "style": {
             "navigationBarTitleText": "文艺比赛",
-						"enablePullDownRefresh": true,
+            "enablePullDownRefresh": false
-						"onReachBottomDistance": 20
           }
-
+        },
-				}, {
+        {
           "path": "ArtRace/ArtRaceDetail",
           "style": {
             "enablePullDownRefresh": false,
             "navigationStyle": "custom"
           }
-
+        },
-				}, {
+        {
           "path": "ArtRace/ThrowWork",
           "style": {
             "navigationBarTitleText": "投稿",
             "enablePullDownRefresh": false
           }
-
+        },
-				}, {
+        {
           "path": "ConfirmOrder/ConfirmOrder",
           "style": {
             "navigationBarTitleText": "确认订单",
@@ -235,7 +227,8 @@
           }
         }
         //虚拟物品-线上交易
-				, {
+        ,
+        {
           "path": "ConfirmOrder/fictitiousOrder",
           "style": {
             "navigationBarTitleText": "确认订单",
@@ -243,21 +236,23 @@
           }
         }
         //虚拟物品-购买详情
-				, {
+        ,
+        {
           "path": "ConfirmOrder/purchaseDetail",
           "style": {
             "navigationBarTitleText": "购买详情",
             "enablePullDownRefresh": false
           }
-				}, {
+        },
+        {
           "path": "MyOrder/MyOrder",
           "style": {
             "navigationStyle": "custom",
             "enablePullDownRefresh": true,
             "onReachBottomDistance": 20
           }
-
+        },
-				}, {
+        {
           "path": "MyOrder/detail",
           "style": {
             "navigationBarTitleText": "订单详情",
@@ -278,7 +273,6 @@
             "navigationBarTitleText": "我的积分",
             "enablePullDownRefresh": false,
             "navigationStyle": "custom"
-
           }
         },
         // 积分明细
@@ -313,84 +307,85 @@
           }
         }
         // 文艺作品
-				, {
+        ,
+        {
           "path": "ArtWorks/ArtWorks",
           "style": {
             "navigationBarTitleText": "文艺作品",
             "enablePullDownRefresh": true,
             "onReachBottomDistance": 20
           }
-
+        },
-				}, {
+        {
           "path": "ArtWorks/artWorkDetail",
           "style": {
             "navigationBarTitleText": "作品详情",
             "enablePullDownRefresh": false
           }
-
+        },
-				}, {
+        {
           "path": "ArtWorks/webView",
           "style": {
             "navigationBarTitleText": "文件浏览",
             "enablePullDownRefresh": false
           }
-
+        },
-				}, {
+        {
           "path": "improveData/improveData",
           "style": {
             "navigationBarTitleText": "完善资料",
             "enablePullDownRefresh": false
           }
-
+        },
-				}, {
+        {
           "path": "PersonalCenter/PersonalCenter",
           "style": {
             "navigationBarTitleText": "个人中心",
             "enablePullDownRefresh": false
           }
-
+        },
-				}, {
+        {
           "path": "PersonalCenter/ReEditSingleInfo",
           "style": {
             "navigationBarTitleText": "信息修改",
             "enablePullDownRefresh": false
           }
-
+        },
-				}, {
+        {
           "path": "PersonalCenter/changePasw",
           "style": {
             "navigationBarTitleText": "修改密码",
             "enablePullDownRefresh": false
           }
-
+        },
-				}, {
+        {
           "path": "PublishWorks/PublishWorks",
           "style": {
             "navigationBarTitleText": "发布作品",
             "enablePullDownRefresh": false
           }
-
+        },
-				}, {
+        {
           "path": "PublishWorks/PublishWorksNext",
           "style": {
             "navigationBarTitleText": "发布作品",
             "enablePullDownRefresh": false
           }
-
+        },
-				}, {
+        {
           "path": "literFamily/literFamily",
           "style": {
             "navigationStyle": "custom",
             "enablePullDownRefresh": true,
             "onReachBottomDistance": 20
           }
-				}, {
+        },
+        {
           "path": "literFamily/ActJianDetail",
           "style": {
             "navigationBarTitleText": "活动剪影详情",
             "enablePullDownRefresh": false
           }
-
         }
       ]
     },
@@ -413,35 +408,35 @@
           }
         }
         // 动态详情
-				, {
+        ,
+        {
           "path": "activity/activityDetail",
           "style": {
             "navigationBarTitleText": "动态详情",
             "enablePullDownRefresh": false
           }
-
         } // 文艺活动
-				, {
+        ,
+        {
           "path": "ArtActivities/ArtActivities",
           "style": {
             "navigationBarTitleText": "文艺活动",
             "enablePullDownRefresh": false
           }
-
+        },
-				}, {
+        {
           "path": "AwardWinningWork/AwardWinningWork",
           "style": {
             "navigationBarTitleText": "艺起战疫获奖作品",
             "enablePullDownRefresh": false
           }
-
+        },
-				}, {
+        {
           "path": "DataSearch/DataSearch",
           "style": {
             "navigationBarTitleText": "资料查找",
             "enablePullDownRefresh": false
           }
-
         },
         {
           "path": "enjoy/enjoy",
@@ -457,18 +452,18 @@
             "enablePullDownRefresh": true,
             "onReachBottomDistance": 20
           }
-				}, {
+        },
+        {
           "path": "famousArts/famousArts",
           "style": {
             "enablePullDownRefresh": false
           }
-
+        },
-				}, {
+        {
           "path": "folderDetail/folderDetail",
           "style": {
             "enablePullDownRefresh": false
           }
-
         },
         {
           "path": "literHelp/literHelp",
@@ -476,31 +471,32 @@
             "enablePullDownRefresh": false,
             "navigationStyle": "custom"
           }
-				}, {
+        },
+        {
           "path": "Login/Login",
           "style": {
             "enablePullDownRefresh": false,
             "navigationStyle": "custom"
           }
-
+        },
-				}, {
+        {
           "path": "Login/Register",
           "style": {
             "enablePullDownRefresh": false
           }
-
+        },
-				}, {
+        {
           "path": "Login/setPas",
           "style": {
             "navigationBarTitleText": "绑定账号",
             "enablePullDownRefresh": false
           }
-				}, {
+        },
+        {
           "path": "Login/RemeberPW",
           "style": {
             "enablePullDownRefresh": false
           }
-
         },
         {
           "path": "Login/binding",
@@ -537,14 +533,13 @@
             "enablePullDownRefresh": false,
             "navigationStyle": "custom"
           }
-
+        },
-				}, {
+        {
           "path": "SelectId/SelectId",
           "style": {
             "enablePullDownRefresh": false,
             "navigationStyle": "custom"
           }
-
         },
         {
           "path": "shop/Shop",
@@ -553,41 +548,40 @@
             "enablePullDownRefresh": true,
             "onReachBottomDistance": 20
           }
-
+        },
-				}, {
+        {
           "path": "ShoppingCart/ShoppingCart",
           "style": {
             "navigationBarTitleText": "购物车",
             "enablePullDownRefresh": true,
             "onReachBottomDistance": 20
           }
-
         }
         // 政策速通
-				, {
+        ,
+        {
           "path": "PolicyExpress/PolicyExpress",
           "style": {
             "navigationBarTitleText": "政策速通",
             "enablePullDownRefresh": true,
             "onReachBottomDistance": 20
           }
-
         }
         // 政策速通详情
-				, {
+        ,
+        {
           "path": "PolicyExpress/PolicyExpressDetail",
           "style": {
             "navigationBarTitleText": "详情",
             "enablePullDownRefresh": false
           }
-
+        },
-				}, {
+        {
           "path": "PingJiaList/PingJiaList",
           "style": {
             "navigationBarTitleText": "评价列表",
             "enablePullDownRefresh": false
           }
-
         }
       ]
     },
@@ -610,6 +604,14 @@
             "enablePullDownRefresh": false
           }
         },
+        // 文艺下乡:下乡计划新增
+        {
+          "path": "wyxx/addindex",
+          "style": {
+            "navigationBarTitleText": "文艺下乡新增",
+            "enablePullDownRefresh": false
+          }
+        },
         // 线上看展
         {
           "path": "xskz/index",
@@ -617,16 +619,26 @@
             "navigationBarTitleText": "线上看展",
             "enablePullDownRefresh": false
           }
+        },
+        // 线上看展
+        {
+          "path": "xskz/details",
+          "style": {
+            "navigationBarTitleText": "线上看展-详情",
+            "enablePullDownRefresh": false
           }
-			]
         }
 		
+      ]
+    }
   ],
   "preloadRule": {
     "pages/pageHome/pageHome": {
       "network": "all",
       "packages": [
-				"pagesA/", "pagesB/", "pagesC/"
+        "pagesA/",
+        "pagesB/",
+        "pagesC/"
       ]
     }
   },

src/pagesA/my/My.vue

@@ -4,7 +4,7 @@
       <u-loading-page :loading="load"></u-loading-page>
     </view>
     <view v-if="load == false">
-		    <view class="top" :style="{'height':titleHeight+'px'}">
+      <view class="top" :style="{ 'height': titleHeight + 'px' }">
         <image class="bg" src="../../static/MyBg.png" mode=""></image>
         <view class="avator_box" @click="GoPersonalCenter">
           <view class="tou">
@@ -12,12 +12,12 @@
           </view>
           <view class="user_name">
             <view class="user_name_de">
-		                    {{userName}}
+              {{ userName }}
               <view class="sf_textA" v-if="yhsf == '文艺工作者'">
-								<image src="../../static/sfFws.png" ></image>
+                <image src="../../static/sfFws.png"></image>
               </view>
               <view class="sf_textB" v-if="yhsf == '文艺爱好者'">
-								<image src="../../static/sfRc.png" ></image>
+                <image src="../../static/sfRc.png"></image>
               </view>
             </view>
           </view>
@@ -31,7 +31,7 @@
         <view class="fans_box">
           <view class="fans_itm" @click="toFollow()">
             <view class="nums">
-		                    {{care}}
+              {{ care }}
             </view>
             <view class="itms_name">
               关注
@@ -39,7 +39,7 @@
           </view>
           <view class="fans_itm" @click="toCol()">
             <view class="nums">
-		                    {{colNum}}
+              {{ colNum }}
             </view>
             <view class="itms_name">
               收藏
@@ -47,7 +47,7 @@
           </view>
           <view class="fans_itm" @click="toFans()">
             <view class="nums">
-		                    {{fans}}
+              {{ fans }}
             </view>
             <view class="itms_name">
               粉丝
@@ -108,6 +108,16 @@
               <image src="../../static/rightArrow.png" mode=""></image>
             </view>
           </view>
+
+          <view class="content_bott_itm" >
+            <!-- @click="" -->
+            <view class="content_bott_wods">
+              下乡管理
+            </view>
+            <view class="content_bott_arrow">
+              <image src="../../static/rightArrow.png" mode=""></image>
+            </view>
+          </view>
           <!-- <view class="content_bott_itm" @click="toAddress()">
 					    <view class="content_bott_wods">
 					        收货地址
@@ -143,24 +153,24 @@
 </template>
 
 <script>
-    export default {
+export default {
-        data() {
+  data () {
     return {
       load: true,
       image: '',
-				userName:'',
+      userName: '',
-				userId:'',
+      userId: '',
       point: '',
       colNum: '',
-				fans:'',
+      fans: '',
-				care:'',
+      care: '',
       yhsf: '',
       isUnread: false,
       statusHeight: 0,
       titleHeight: 90,
     };
   },
-		onReady() {
+  onReady () {
     const systemMsg = uni.getSystemInfoSync();
     this.statusHeight = systemMsg.statusBarHeight
     // #ifdef MP-WEIXIN
@@ -168,12 +178,12 @@
     this.titleHeight = 90 + menuButtonInfo.height + (menuButtonInfo.top - systemMsg.statusBarHeight) * 2
     // #endif
   },
-		onShow() {
+  onShow () {
     this.getUserInfo()
   },
   methods: {
     //用户信息
-			getUserInfo(){
+    getUserInfo () {
       let _this = this
       this.http.request('/user/userInfo', {}, "GET").then(res => {
         if (res.code == 200) {
@@ -193,12 +203,12 @@
       })
     },
     //收藏数
-			getCol(){
+    getCol () {
       this.http.request('/worksCollection', {}, "GET").then(res => {
         if (res.code == 200) {
-						if(res.data.length == 0){
+          if (res.data.length == 0) {
             this.colNum = 0
-						}else {
+          } else {
             this.colNum = res.data.total
           }
           this.getCare()
@@ -211,12 +221,12 @@
       })
     },
     //关注数
-			getCare(){
+    getCare () {
       this.http.request('/userFollow/myFollow', {}, "GET").then(res => {
         if (res.code == 200) {
-						if(res.data.length == 0){
+          if (res.data.length == 0) {
             this.care = 0
-						}else {
+          } else {
             this.care = res.data.total
           }
           this.getFans()
@@ -229,12 +239,12 @@
       })
     },
     //粉丝数
-			getFans(){
+    getFans () {
       this.http.request('/userFollow/myFans', {}, "GET").then(res => {
         if (res.code == 200) {
-						if(res.data.length == 0){
+          if (res.data.length == 0) {
             this.fans = 0
-						}else {
+          } else {
             this.fans = res.data.total
           }
           this.load = false
@@ -247,13 +257,13 @@
       })
     },
     //未读
-			getTalkList() {
+    getTalkList () {
       let _this = this
       this.http.request('/chat/lists', {}, "GET").then(res => {
         if (res.code == 200) {
-						if(res.data.length > 0){
+          if (res.data.length > 0) {
-							res.data.forEach(function(item) {
+            res.data.forEach(function (item) {
-								if(item.unread > 0)
+              if (item.unread > 0)
                 _this.isUnread = true
             })
           }
@@ -266,96 +276,96 @@
       })
     },
     //跳转积分
-            gopointsPg() {
+    gopointsPg () {
       uni.navigateTo({
         url: "/pagesB/MyPoints/MyPoints"
       })
     },
     //我的交易
-            goOrderDetails() {
+    goOrderDetails () {
       uni.navigateTo({
         url: "/pagesB/MyOrder/MyOrder"
       })
     },
     //修改个人信息
-            GoPersonalCenter() {
+    GoPersonalCenter () {
       uni.navigateTo({
         url: "/pagesB/PersonalCenter/PersonalCenter"
       })
     },
     //我的收藏
-			toCol(){
+    toCol () {
       uni.navigateTo({
         url: "/pagesA/my/myCollection"
       })
     },
     //我的关注
-			toFollow(){
+    toFollow () {
       uni.navigateTo({
         url: "/pagesA/my/myFollow?tab=0"
       })
     },
     //我的粉丝
-			toFans(){
+    toFans () {
       uni.navigateTo({
         url: "/pagesA/my/myFollow?tab=1"
       })
     },
     //我的作品
-			toWork(){
+    toWork () {
       uni.navigateTo({
         url: "/pagesA/my/myWoekList",
       })
     },
     //点单管理
-			toOrderControl(){
+    toOrderControl () {
       uni.navigateTo({
         // 稍后改为  订单管理的页面
         url: "OrderActControl",
       })
     },
     //收货地址
-			toAddress(){
+    toAddress () {
       uni.navigateTo({
         url: "/pagesA/ReceivingAddress/ReceivingAddress",
       })
     },
     //设置
-			toSz(){
+    toSz () {
       uni.navigateTo({
         url: "/pagesA/my/logOut"
       })
     },
     //作品管理
-			tohdM(){
+    tohdM () {
       uni.navigateTo({
         url: "/pagesA/activeManage/activeManage",
       })
     },
     // 消息
-			myNews(){
+    myNews () {
 
       uni.navigateTo({
         url: "/pagesA/msg/msg"
       })
     }
   }
-    }
+}
 </script>
 
 <style>
-	page {
+page {
   background-color: #F4F5F7;
-	}
+}
 </style>
 
 <style lang="scss" scoped>
-    image {
+image {
   width: 100%;
   height: 100%;
-    }
+}
 
-    .top {
+.top {
   height: 180rpx;
   border: 1px solid transparent;
   position: relative;
@@ -388,16 +398,19 @@
         color: #251B1D;
         font-size: 40rpx;
         font-weight: 600;
+
         .sf_textA {
           width: 146rpx;
           height: 48rpx;
           margin-top: 12rpx;
         }
+
         .sf_textB {
           width: 166rpx;
           height: 48rpx;
           margin-top: 12rpx;
         }
+
         .sf_textC {
           width: 186rpx;
           height: 48rpx;
@@ -419,10 +432,10 @@
     }
   }
 
-    }
+}
 
 
-    .content_area {
+.content_area {
   padding: 0 32rpx;
   margin-bottom: 120rpx;
   margin-top: 20rpx;
@@ -516,5 +529,5 @@
       }
     }
   }
-    }
+}
 </style>

src/pagesB/orderHall/orderHall.vue

@@ -5,15 +5,15 @@
     </view>
     <view class="page" v-if="load == false">
       <view class="nav">
-				<view class="list" v-for="(item,index) in list" :key="index" @click="onNav(item.code,index)">
+        <view class="list" v-for="(item, index) in list" :key="index" @click="onNav(item.code, index)">
-					<view :class="['text',action == index?'on':'']">{{item.text}}</view>
+          <view :class="['text', action == index ? 'on' : '']">{{ item.text }}</view>
         </view>
       </view>
       <view class="addIcon" @click="toAddOrder">
         <image src="../../static/orderHall/addOrder.png"></image>
       </view>
       <view class="main" v-if="mainList.length > 0">
-				<view class="mainList" v-for="(item,i) in mainList" :key="i">
+        <view class="mainList" v-for="(item, i) in mainList" :key="i">
           <view class="mainListImg" @click="toDetail(item.id)">
             <img class='img' :src="item.enclosure" alt="">
             <view class="imgTags" v-if="item.isBaoming">
@@ -29,18 +29,18 @@
             </view>
           </view>
           <view class="text">
-						<view class="text1">{{item.title}}</view>
+            <view class="text1">{{ item.title }}</view>
-						<view class="text2">{{item.content}}</view>
+            <view class="text2">{{ item.content }}</view>
             <view class="text3">
               <img class='mainListTime' src="../../static/orderHall/mainListTime.png" alt="">
-							<view class="time">截止时间：{{item.deadline}}</view>
+              <view class="time">截止时间：{{ item.deadline }}</view>
             </view>
           </view>
         </view>
 
       </view>
       <view v-else>
-				<u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" >
+        <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png">
         </u-empty>
       </view>
     </view>
@@ -48,10 +48,10 @@
 </template>
 
 <script>
-	export default {
+export default {
-		data() {
+  data () {
     return {
-				load:true,
+      load: true,
       list: [{
         text: '全部',
         code: ''
@@ -81,27 +81,27 @@
     }
   },
   // 下拉刷新
-		onPullDownRefresh() {
+  onPullDownRefresh () {
     this.pages = 1
     this.mainList = []
     this.getData()
-			setTimeout(function() {
+    setTimeout(function () {
       uni.stopPullDownRefresh();
     }, 1000);
   },
   //上拉
-		onReachBottom() {
+  onReachBottom () {
     this.pages++
     this.getData();
   },
-		onShow() {
+  onShow () {
     this.pages = 1
     this.load = true
     this.mainList = []
     this.getData()
   },
   methods: {
-			getData() {
+    getData () {
       let _this = this
       this.http.request('/hall/list', {
         page: this.pages,
@@ -109,8 +109,8 @@
         type: this.type,
       }, "GET").then(res => {
         if (res.code == 200) {
-						if(res.data.records.length > 0){
+          if (res.data.records.length > 0) {
-							res.data.records.forEach(function(item){
+            res.data.records.forEach(function (item) {
               if (item.enclosure) {
                 let fileArr = item.enclosure.split(',')
                 let gs = fileArr[0].substr(fileArr[0].lastIndexOf(".") + 1)
@@ -123,7 +123,7 @@
               }
               _this.mainList.push(item)
             })
-						}else{
+          } else {
             this.pages--
           }
           this.load = false
@@ -135,7 +135,7 @@
         });
       })
     },
-			onNav(val, index) {
+    onNav (val, index) {
       this.action = index
       this.type = val
       this.pages = 1
@@ -143,33 +143,35 @@
       this.mainList = []
       this.getData()
     },
-			toDetail(val){
+    toDetail (val) {
       uni.navigateTo({
         url: `/pagesB/orderHall/orderHallDetails?id=` + val
       })
     },
-			toAddOrder(){
+    toAddOrder () {
       uni.navigateTo({
         url: `/pagesB/orderHall/addOrder`
       })
     }
   }
-	}
+}
 </script>
 
 <style lang="scss" scoped>
-	page{
+page {
   background-color: #f8f8f8;
-	}
+}
-	image{
+
+image {
   width: 100%;
   height: 100%;
-	}
+}
-	.on {
-		font-weight: 600;
-	}
 
-	.page {
+.on {
+  font-weight: 600;
+}
+
+.page {
   .nav {
     display: flex;
 
@@ -212,11 +214,13 @@
       .mainListImg {
         height: 400rpx;
         position: relative;
+
         .img {
           width: 100%;
           height: 100%;
         }
-					.imgTags{
+
+        .imgTags {
           position: absolute;
           right: 0;
           bottom: 0;
@@ -261,7 +265,7 @@
     }
   }
 
-		.addIcon{
+  .addIcon {
     position: fixed;
     right: 24rpx;
     bottom: 242rpx;
@@ -270,5 +274,5 @@
     border-radius: 50%;
     z-index: 999;
   }
-	}
+}
 </style>

src/pagesD/jgsz/index.vue

@@ -15,26 +15,12 @@
         <view class="line"></view>
       </view>
     </view>
-    <view class="forms" v-if="tabC == '0'" >
+    <view class="forms" v-if="tabC == '0'">
-      <view class="teamBox" v-for="(item, index) in 6">
+      <view class="teamBox" v-for="(item, index) in 2" :key="index">
         <view class="teamBox-right">
+          <view class="item-image">
             <image src="../../static/txIcon.png" mode=""></image>
           </view>
-        <view class="teamBox-left">
-          <view class="teamMinbox-top">
-            <view class="title">张三</view>
-            <view class="street">会长</view>
-          </view>
-          <view class="teamMinbox-bottom">
-            xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队
-          </view>
-        </view>
-      </view>
-    </view>
-    <view class="forms" v-if="tabC == '1'" >
-      <view class="teamBox" v-for="(item, index) in 2">
-        <view class="teamBox-right">
-          <image src="../../static/txIcon.png" mode=""></image>
         </view>
         <view class="teamBox-left">
           <view class="teamMinbox-top">
@@ -47,11 +33,37 @@
         </view>
       </view>
     </view>
-    <view class="forms" v-if="tabC == '2'" >
+    <view class="forms" v-if="tabC == '1'">
-      <view class="teamBox" v-for="(item, index) in 3">
+      <view
+        class="teamBox"
+        v-for="item in list"
+        :key="item.id"
+        @click="onInfo(item.id)"
+      >
         <view class="teamBox-right">
+          <view class="item-image">
+            {{ item.userName }}
+            <!-- <image src="../../static/txIcon.png" mode=""></image> -->
+          </view>
+        </view>
+        <view class="teamBox-left">
+          <view class="teamMinbox-top">
+            <view class="title">{{ item.userName }}</view>
+            <view class="street">{{ item.identity }}</view>
+          </view>
+          <view class="teamMinbox-bottom">
+            {{ item.introduce }}
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="forms" v-if="tabC == '2'">
+      <view class="teamBox" v-for="(item, index) in 3" :key="index">
+        <view class="teamBox-right">
+          <view class="item-image">
             <image src="../../static/txIcon.png" mode=""></image>
           </view>
+        </view>
         <view class="teamBox-left">
           <view class="teamMinbox-top">
             <view class="title">xx团队</view>
@@ -71,15 +83,44 @@ export default {
   data() {
     return {
       tabC: "0",
+      list: [],
     };
   },
   onShow() {
-    // this.getData();
+    this.get();
   },
   methods: {
+    get() {
+      this.http
+        .request("/organPerson/list", {}, "GET")
+        .then((res) => {
+          if (res.code == 200) {
+            this.list = res.data.records;
+          }
+        })
+        .catch((err) => {
+          uni.showToast({
+            title: e.data.message,
+            icon: "none",
+          });
+        });
+    },
     toTab(val) {
       this.tabC = val;
-      // this.getData()
+    },
+    onInfo(obj) {
+      this.http
+        .request("/organPerson/details", { id: obj }, "GET")
+        .then((res) => {
+          if (res.code == 200) {
+          }
+        })
+        .catch((err) => {
+          uni.showToast({
+            title: e.data.message,
+            icon: "none",
+          });
+        });
     },
   },
 };
@@ -140,12 +181,28 @@ export default {
     display: flex;
     .teamBox-right {
       margin-right: 20rpx;
+      width: 159rpx;
+      height: 159rpx;
+      .item-image {
+        width: 159rpx;
+        height: 159rpx; 
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background: rgba(152, 149, 149, 0.5);
+        color: rgb(240, 239, 239);
+        font-style: 64rpx;
+        font-weight: bolder;
+        border-radius: 50%;
+        overflow: hidden;
         image {
-        width: 180rpx;
+          width: 159rpx;
-        height: 130rpx;
+          height: 159rpx;
+          border-radius: 50%;
           background-size: contain;
         }
       }
+    }
     .teamBox-left {
       //   width: 400rpx;
       .teamMinbox-top {
@@ -166,7 +223,7 @@ export default {
           color: #a02521;
           margin-left: 18rpx;
           padding: 2rpx 20rpx;
-          max-width:120rpx;
+          max-width: 120rpx;
           overflow: hidden; /* 超出一行文字自动隐藏 */
           text-overflow: ellipsis; /*文字隐藏后添加省略号*/
           white-space: nowrap;

src/pagesD/wyxx/addindex.vue

@@ -0,0 +1,441 @@
+<template>
+  <view class="box">
+    <view class="form_line">
+      <view class="form_left">
+        标题
+      </view>
+      <view class="form_right">
+        <u--input placeholder="请输入名称" v-model="title" 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" @click="showType = true">
+        <u--input placeholder="请选择" clearable border="none" inputAlign="right" style="color: #251B1D;"
+          suffixIcon="arrow-right" readonly v-model="programs" disabledColor="#ffffff">
+        </u--input>
+      </view>
+    </view>
+    <u-popup :show="showType" @close="close" closeOnClickOverlay :round="5" customStyle="padding: 16px;">
+      <u-radio-group @change="selectForm1" v-model="programs" :borderBottom="true" placement="column"
+        iconPlacement="right">
+        <u-radio :customStyle="{ marginBottom: '16px' }" v-for="(item, index) in program" :key="index" :label="item.name"
+          labelSize="28rpx" labelColor="#231F1C" :name="item.id" activeColor="#99241B ">
+        </u-radio>
+        <u-button class="custom-style" style="background-color:#99241B ; color: #FFFFFF; margin-top: 32rpx;"
+          type="default" @click="showType = false">确认</u-button>
+      </u-radio-group>
+    </u-popup>
+
+    <view class="form_line">
+      <view class="form_left">
+        团队
+      </view>
+      <view class="form_right" @click="showTypes = true">
+        <u--input placeholder="请选择" clearable border="none" inputAlign="right" style="color: #251B1D;"
+          suffixIcon="arrow-right" readonly v-model="teams" disabledColor="#ffffff">
+        </u--input>
+      </view>
+    </view>
+    <u-popup :show="showTypes" @close="close" closeOnClickOverlay :round="5" customStyle="padding: 16px;">
+      <u-radio-group @change="selectForm1" v-model="teams" :borderBottom="true" placement="column" iconPlacement="right">
+        <u-radio :customStyle="{ marginBottom: '16px' }" v-for="(item, index) in team" :key="index" :label="item.name"
+          labelSize="28rpx" labelColor="#231F1C" :name="item.id" activeColor="#99241B ">
+        </u-radio>
+        <u-button class="custom-style" style="background-color:#99241B ; color: #FFFFFF; margin-top: 32rpx;"
+          type="default" @click="showTypes = false">确认</u-button>
+      </u-radio-group>
+    </u-popup>
+
+    <view class="form_line">
+      <view class="form_left">
+        开始时间
+      </view>
+      <view class="form_right">
+        <uni-datetime-picker type="datetime" v-model="wTime" :border="false" :clearIcon="false" />
+        <!-- <u--input placeholder="请选择" clearable border="none" inputAlign="right" style="color: #251B1D;"
+					suffixIcon="calendar" readonly v-model="wTime" disabledColor="#ffffff">
+				</u--input> -->
+      </view>
+    </view>
+    <view class="form_line">
+      <view class="form_left">
+        截止时间
+      </view>
+      <view class="form_right">
+        <uni-datetime-picker type="datetime" v-model="eTime" :border="false" :clearIcon="false" />
+        <!-- <u--input placeholder="请选择" clearable border="none" inputAlign="right" style="color: #251B1D;"
+					suffixIcon="calendar" readonly v-model="eTime" disabledColor="#ffffff">
+				</u--input> -->
+      </view>
+    </view>
+    <view class="operation" @click="next">
+      发布
+    </view>
+  </view>
+</template>
+
+<script>
+import http from '../../request/interface.js'
+export default {
+  data () {
+    return {
+      title: '',
+      typeId: '',
+      showType: false,
+      type: '',
+      radiolist1: [],
+      text1: '',
+      text2: '',
+      showTime: false,
+      timeTab: 0,
+      eTime: '',
+      wTime: '',
+      timeValue: Number(new Date()),
+      showUser: false,
+      userType: '',
+      userTypeValue: 'wyrc,zyz',
+      radiovalue2: [],
+      radiolist2: [],
+      morePer: true,
+      perNumber: 1,
+      fileList3: [],
+      ok: true,
+      team: [],
+      teams: '',
+      program: [],
+      programs: '',
+      showTypes: false
+    }
+  },
+  onShow () {
+
+  },
+  async onLoad () {
+    await this.getCurrentTime()
+    await this.teamandprogram()
+  },
+  methods: {
+    getCurrentTime () {
+      //获取当前时间并打印
+      let yy = new Date().getFullYear();
+      let mm = new Date().getMonth() + 1;
+      let dd = new Date().getDate();
+      let gettime = yy + '-' + mm + '-' + dd;
+      this.eTime = gettime
+      this.wTime = gettime
+    },
+    // 订单类型
+    // getTypeList () {
+    //   this.http.request('/hallType/list', {}, "GET").then(res => {
+    //     if (res.code == 200) {
+    //       this.radiolist1 = res.data.records
+    //     }
+    //   }).catch(e => {
+    //     uni.showToast({
+    //       title: e.data.message,
+    //       icon: "none",
+    //     });
+    //   })
+    // },
+    // 用户类型
+    // getUserList () {
+    //   this.http.request('/hall/yhlx', {}, "GET").then(res => {
+    //     if (res.code == 200) {
+    //       this.radiolist2 = res.data
+    //     }
+    //   }).catch(e => {
+    //     uni.showToast({
+    //       title: e.data.message,
+    //       icon: "none",
+    //     });
+    //   })
+    // },
+    close () {
+      this.showType = false
+      this.showTime = false
+      this.showUser = false
+    },
+    selectForm1 (form) {
+      let _this = this
+      this.radiolist1.forEach(function (item) {
+        if (item.name == form) {
+          _this.typeId = item.code
+        }
+      })
+    },
+    chooseTime (val) {
+      this.showTime = true
+      this.timeTab = val
+    },
+    sureTime (e) {
+      if (this.timeTab == 0) {
+        this.eTime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM')
+      } else {
+        this.wTime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM')
+      }
+      this.showTime = false
+    },
+    // selectForm2 () {
+    //   let _this = this
+    //   let code = []
+    //   this.radiolist2.forEach(function (item) {
+    //     _this.radiovalue2.forEach(function (ele) {
+    //       if (item.label == ele) {
+    //         code.push(item.value)
+    //       }
+    //     })
+    //   })
+    //   this.userTypeValue = code.join(',')
+    //   this.userType = this.radiovalue2.join(',')
+    //   this.showUser = false
+    // },
+    changeTrue (e) {
+      console.log('change', e);
+    },
+    valChange (e) {
+      console.log('当前值为: ' + e.value)
+    },
+    // 删除图片
+    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/upload',
+    //       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.title == '') {
+        uni.showToast({
+          title: '请输入名称',
+          icon: "none",
+        });
+        this.ok = false
+        return
+      }
+      if (this.teams == '') {
+        uni.showToast({
+          title: '请选择团队',
+          icon: "none",
+        });
+        this.ok = false
+        return
+      }
+      if (this.programs == '') {
+        uni.showToast({
+          title: '请选择团队',
+          icon: "none",
+        });
+        this.ok = false
+        return
+      }
+      if (this.eTime == '') {
+        uni.showToast({
+          title: '请选择截止日期',
+          icon: "none",
+        });
+        this.ok = false
+        return
+      }
+      if (this.wTime == '') {
+        uni.showToast({
+          title: '请选择开始日期',
+          icon: "none",
+        });
+        this.ok = false
+        return
+      }
+      if (this.eTime.length < 12) {
+        uni.showToast({
+          title: '请选择截止时间',
+          icon: "none",
+        });
+        this.ok = false
+        return
+      }
+      if (this.wTime.length < 12) {
+        uni.showToast({
+          title: '请选择活动时间',
+          icon: "none",
+        });
+        this.ok = false
+        return
+      }
+      if (this.ok) {
+
+        this.http.request('/artCountryside/add', {
+          title: this.title,
+          showId: this.programs,
+          teams: this.teams,
+          endTime: this.eTime,
+          startTime: this.wTime,
+        }, "POST").then(res => {
+          if (res.code == 200) {
+            uni.navigateBack()
+          }
+        }).catch(e => {
+          uni.showToast({
+            title: e.data.message,
+            icon: "none",
+          });
+        })
+      }
+    },
+    teamandprogram () {
+      this.http.request('/artTeam/list', {}, 'GET').then(res => {
+        if (res.code === 200) {
+          this.team = []
+          this.program = []
+          res.data.records.forEach((item, index) => {
+            if (item.type == 'team') {
+              this.team.push(item)
+            } else {
+              this.program.push(item)
+            }
+          });
+        } else {
+          uni.showToast({
+            title: res.data.message,
+            icon: "error",
+          });
+        }
+      }).catch(err => {
+
+      })
+    }
+
+  }
+}
+</script>
+
+<style></style>
+
+<style lang="scss" scoped>
+.box {
+  width: 100%;
+  height: 100%;
+  overflow-y: auto;
+  position: relative;
+}
+
+/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;
+  position: absolute;
+  bottom: 0rpx;
+}
+</style>

src/pagesD/wyxx/index.vue

@@ -15,52 +15,72 @@
         <view class="line"></view>
       </view>
     </view>
-    <view class="forms" v-if="tabC == '0'" >
+    <view class="forms" v-if="tabC == '0'">
-      <view class="teamBox" v-for="(item, index) in 6">
+      <view v-if="team.length > 0">
+        <view class="teamBox" v-for="(item, index) in team">
           <view class="teamBox-right">
-          <image src="../../static/txIcon.png" mode=""></image>
+            <image :src="item.file" mode=""></image>
           </view>
           <view class="teamBox-left">
             <view class="teamMinbox-top">
-            <view class="title">xx团队</view>
+              <view class="title">{{ item.name }}</view>
-            <view class="street">丹东街道</view>
+              <view class="street">{{ item.villageName }}</view>
             </view>
             <view class="teamMinbox-bottom">
-            xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队
+              {{ item.introduce }}
             </view>
           </view>
         </view>
       </view>
-    <view class="forms" v-if="tabC == '1'" >
+      <view v-else>
-      <view class="teamBox" v-for="(item, index) in 2">
+        <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png">
+        </u-empty>
+      </view>
+    </view>
+    <view class="forms" v-if="tabC == '1'">
+      <view v-if="program.length > 0">
+        <view class="teamBox" v-for="(item, index) in program">
           <view class="teamBox-right">
-          <image src="../../static/txIcon.png" mode=""></image>
+            <image :src="item.file" mode=""></image>
           </view>
           <view class="teamBox-left">
             <view class="teamMinbox-top">
-            <view class="title">xx团队</view>
+              <view class="title">{{ item.name }}</view>
-            <view class="street">丹东街道</view>
+              <view class="street">{{ item.villageName }}</view>
             </view>
             <view class="teamMinbox-bottom">
-            xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队
+              {{ item.introduce }}
             </view>
           </view>
         </view>
       </view>
-    <view class="forms" v-if="tabC == '2'" >
+      <view v-else>
-      <view class="teamBox" v-for="(item, index) in 3">
+        <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png">
-        <view class="teamBox-right">
+        </u-empty>
-          <image src="../../static/txIcon.png" mode=""></image>
-        </view>
-        <view class="teamBox-left">
-          <view class="teamMinbox-top">
-            <view class="title">xx团队</view>
-            <view class="street">丹东街道</view>
-          </view>
-          <view class="teamMinbox-bottom">
-            xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队xx团队
       </view>
     </view>
+    <view class="forms" v-if="tabC == '2'">
+      <view class="addIcon" @click="toAddOrder">
+        <image src="../../static/orderHall/addOrder.png"></image>
+      </view>
+      <view class="main" v-if="mainList.length > 0">
+        <view class="mainList" v-for="(item, i) in mainList" :key="i">
+          <view class="mainListImg" @click="toDetail(item.id)">
+            <img class='img' :src="item.enclosure" alt="">
+          </view>
+          <view class="text">
+            <view class="text1">{{ item.title }}</view>
+            <view class="text2">{{ item.content }}</view>
+            <view class="text3">
+              <img class='mainListTime' src="../../static/orderHall/mainListTime.png" alt="">
+              <view class="time">截止时间：{{ item.deadline }}</view>
+            </view>
+          </view>
+        </view>
+      </view>
+      <view v-else>
+        <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png">
+        </u-empty>
       </view>
     </view>
   </view>
@@ -68,24 +88,76 @@
 
 <script>
 export default {
-  data() {
+  data () {
     return {
       tabC: "0",
+      mainList: [],
+      villageId: '',
+      team: [],
+      program: []
     };
   },
-  onShow() {
+  onShow () {
     // this.getData();
   },
   methods: {
-    toTab(val) {
+    toTab (val) {
       this.tabC = val;
-      // this.getData()
     },
+    RuralDevelopmentPlanlist () {
+      let data = {
+        villageId: this.villageId
+      }
+      this.http.request(`/artCountryside/list`, data, 'GET').then(res => {
+        if (res.code === 200) {
+          console.log(res.data.records);
+          this.mainList = res.data.records
+        } else {
+          uni.showToast({
+            title: res.data.message,
+            icon: "error",
+          });
+        }
+      }).catch(err => {
+
+      })
+    },
+    toAddOrder () {
+      uni.navigateTo({
+        url: `/pagesD/wyxx/addindex`
+      })
+    },
+    teamandprogram () {
+      this.http.request('/artTeam/list', {}, 'GET').then(res => {
+        if (res.code === 200) {
+          this.team = []
+          this.program = []
+          res.data.records.forEach((item, index) => {
+            if (item.type == 'team') {
+              this.team.push(item)
+            } else {
+              this.program.push(item)
+            }
+          });
+        } else {
+          uni.showToast({
+            title: res.data.message,
+            icon: "error",
+          });
+        }
+      }).catch(err => {
+
+      })
+    }
+  },
+  async mounted () {
+    await this.teamandprogram()
+    await this.RuralDevelopmentPlanlist()
   },
 };
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .wyxx {
   background-color: #fefefe;
 }
@@ -132,33 +204,42 @@ export default {
   //   height: 40rpx;
   //   background-color: skyblue;
   margin: 40rpx auto 0rpx;
+
   .teamBox {
     height: 140rpx;
     padding: 18rpx 10rpx;
     background-color: #fff;
     margin-bottom: 20rpx;
     display: flex;
+
     .teamBox-right {
       margin-right: 20rpx;
+
       image {
         width: 180rpx;
         height: 130rpx;
         background-size: contain;
       }
     }
+
     .teamBox-left {
+
       //   width: 400rpx;
       .teamMinbox-top {
         display: flex;
         margin-bottom: 16rpx;
+
         .title {
           font-weight: 600;
           font-size: 32rpx;
           max-width: 160rpx;
-          overflow: hidden; /* 超出一行文字自动隐藏 */
+          overflow: hidden;
-          text-overflow: ellipsis; /*文字隐藏后添加省略号*/
+          /* 超出一行文字自动隐藏 */
+          text-overflow: ellipsis;
+          /*文字隐藏后添加省略号*/
           white-space: nowrap;
         }
+
         .street {
           height: 40rpx;
           border-radius: 30rpx;
@@ -166,12 +247,15 @@ export default {
           color: #a02521;
           margin-left: 18rpx;
           padding: 2rpx 20rpx;
-          max-width:120rpx;
+          max-width: 130rpx;
-          overflow: hidden; /* 超出一行文字自动隐藏 */
+          overflow: hidden;
-          text-overflow: ellipsis; /*文字隐藏后添加省略号*/
+          /* 超出一行文字自动隐藏 */
+          text-overflow: ellipsis;
+          /*文字隐藏后添加省略号*/
           white-space: nowrap;
         }
       }
+
       .teamMinbox-bottom {
         font-size: 28rpx;
         overflow: hidden;
@@ -183,4 +267,82 @@ export default {
     }
   }
 }
+
+image {
+  width: 100%;
+  height: 100%;
+}
+
+.main {
+  padding: 32rpx;
+  // background-color: #F4F5F7;
+
+  .mainList {
+    margin-bottom: 32rpx;
+    border-radius: 16rpx;
+    overflow: hidden;
+
+    .mainListImg {
+      height: 400rpx;
+      position: relative;
+
+      .img {
+        width: 100%;
+        height: 100%;
+      }
+
+      .imgTags {
+        position: absolute;
+        right: 0;
+        bottom: 0;
+      }
+    }
+
+    .text {
+      padding: 32rpx;
+      background-color: #FFF;
+
+      .text1 {
+        font-size: 32rpx;
+        font-weight: 600;
+        color: #251B1D;
+        margin-bottom: 5rpx;
+      }
+
+      .text2 {
+        font-size: 28rpx;
+        font-weight: 400;
+        color: #989898;
+      }
+
+      .text3 {
+        display: flex;
+        margin-top: 16rpx;
+
+        .mainListTime {
+          width: 26rpx;
+          height: 26rpx;
+          margin-top: 4rpx;
+          margin-right: 8rpx;
+        }
+
+        .time {
+          font-size: 24rpx;
+          font-weight: 400;
+          color: #989898;
+        }
+      }
+    }
+  }
+}
+
+.addIcon {
+  position: fixed;
+  right: 24rpx;
+  bottom: 242rpx;
+  width: 104rpx;
+  height: 104rpx;
+  border-radius: 50%;
+  z-index: 999;
+}
 </style>

src/pagesD/xskz/details.vue

@@ -0,0 +1,31 @@
+<template>
+  <view>
+    <player-component
+      playerid="tvp"
+      id="tvp-id"
+      vid="13881752490784308944"
+    ></player-component>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      store: null,
+      player: null,
+    };
+  },
+  onShow() {
+    this.store = requirePlugin("player");
+    this.player = this.store.get("tvp");
+    console.log(this.store);
+    console.log(this.player);
+  },
+  mounted() {},
+  methods: {},
+};
+</script>
+
+<style>
+</style>

src/pagesD/xskz/index.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 文艺下乡 -->
   <view class="wyxx">
-    <view class="tabTitle">
+    <!-- <view class="tabTitle">
       <view :class="tabC == '0' ? 'tabsC' : 'tabs'" @click="toTab('0')">
         <view> 分类 </view>
         <view class="line"></view>
@@ -22,36 +22,27 @@
         <view> 分类4 </view>
         <view class="line"></view>
       </view>
-    </view>
+    </view> -->
-    <view class="forms" v-if="tabC == '0'">
+    <view class="forms">
-      <view class="teamBox" v-for="(item, index) in videoList">
+      <view class="teamBox" v-for="(item, index) in list" :key="item.id">
         <view class="teamBox-top">
-         <!-- <video
+          <image class="team-image" :src="item.linkPath" mode="scaleToFill" />
-            id="video"
+          <view class="mask">
-            style="width: 100%; height: 100%"
-            object-fit="cover"
-            controls
-            :src="item.video"
-            poster="../../static/orderE.png"
-          >
-          </video> -->
-          <view class="mask" @click="playMask(index)" v-if="item.play">
-            <text>{{ item.title }}</text>
             <image src="../../static/play.png"></image>
           </view>
         </view>
         <view class="teamBox-bottom">
           <view class="interactive">
-            <image src="../../static/play.png" mode=""></image>
+            <image src="../../static/play-1.png" mode=""></image>
-            <view class="title">{{ item.playback }}</view>
+            <view class="title">{{ item.views }}</view>
           </view>
           <view class="interactive">
             <image src="../../static/workDetail/heart1.png" mode=""></image>
-            <view class="title">{{ item.like }}</view>
+            <view class="title">{{ item.likes }}</view>
           </view>
           <view class="interactive">
             <image src="../../static/workDetail/star1.png" mode=""></image>
-            <view class="title">{{ item.collect }}</view>
+            <view class="title">{{ item.collections }}</view>
           </view>
         </view>
       </view>
@@ -63,7 +54,7 @@
 export default {
   data() {
     return {
-      tabC: "0",
+      // tabC: "0",
       videoList: [
         {
           title:
@@ -74,12 +65,18 @@ export default {
           // video: "../../static/a1.mp4",
           play: true,
         },
-       
       ],
+      list: [],
+      query: {
+        total: 1,
+        page: 1,
+        size: 20,
+      },
     };
   },
   onShow() {
     // this.getData();
+    this.get();
   },
   mounted() {},
   methods: {
@@ -87,21 +84,38 @@ export default {
       this.tabC = val;
       // this.getData()
     },
-    playMask(index) {
+    get() {
-      this.videoList[index].play = false;
+      this.http
-
+        .request("/exhibition/list", this.query, "GET")
-      var video = document.getElementById("video");
+        .then((res) => {
-      //   暂停播放
+          if (res.code == 200) {
-      video.addEventListener("pause", function (e) {
+            this.list = res.data.records;
-        console.log("暂停播放");
+            this.query.total = res.data.total;
-        console.log(e);
+            this.query.page = res.data.current;
+            this.query.size = res.data.size;
+          }
+        })
+        .catch((err) => {
+          uni.showToast({
+            title: e.data.message,
+            icon: "none",
           });
-      // 15、ended：播放结束
-      video.addEventListener("ended", function (e) {
-        console.log("视频播放完了");
-        console.log(e);
         });
     },
+    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>
@@ -153,17 +167,18 @@ export default {
   margin: 40rpx auto 0rpx;
   .teamBox {
     .teamBox-top {
-      height: 400rpx;
       position: relative;
-      //   video {
+
-      //     position: relative;
+      .team-image {
-      //   }
+        width: 100%;
+        height: 400rpx;
+        border: 2px solid red;
+      }
       .mask {
         position: absolute;
         top: 0;
         width: 100%;
         height: 100%;
-        background-color: rgba(0, 0, 0, 0.1);
         z-index: 99;
         text {
           //   position: absolute;

src/pagesD/xxgl/index.vue

@@ -0,0 +1,663 @@
+<template>
+  <view>
+    <view 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 class="art_act_itm" v-for="(item, i) in orderList" :key="i" v-if="tabNum == 1">
+        <!-- <image src="../../static/icon12.jpg" mode=""></image> -->
+        <image :src="item.enclosure" 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 == "3"'>
+              已完成
+            </view>
+            <view class="tag_sta_fail" v-if='item.state == "4"'>
+              未接单
+            </view>
+            <view class="tag_sta_going" v-if='item.state == "1" || item.state == "0"'>
+              进行中
+            </view>
+            <view class="tag_sta_end" v-if='item.state == "2"'>
+              待评价
+            </view>
+          </view>
+          <view class="act_time">
+            活动时间： {{ item.createdAt }}
+          </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.images)">
+              </u-button>
+            </view>
+            <view style="width: 236rpx; margin: 0 10rpx;" v-if='item.state == "1"' @click="done(item.id)">
+              <u-button color="#99241B" shape="circle" text="确认完成"></u-button>
+            </view>
+            <view style="width: 236rpx; margin: 0 10rpx;" @click="undone(item.id)"
+              v-if='item.state != "2" && item.state != "3"'>
+              <u-button color="#99241B" shape="circle" 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 == "2"'>
+              <u-button plain color="#99241B" shape="circle" text="评价" @click="pingjia(i, item.id)">
+              </u-button>
+            </view>
+            <view style="width: 190rpx;margin: 0 10rpx; " v-if='item.state == "3"'>
+              <!-- <view style="width: 190rpx;margin: 0 10rpx; "  > -->
+              <u-button shape="circle" text="已评价" @click="toEvlauedpg(item.id)"></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 class="art_act_itm" v-for="(item, i) in orderList" :key="i" v-if="tabNum == 2">
+        <image @click="goActDeat(item.id)" :src="item.enclosure" 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">
+            活动时间： {{ item.createdAt }}
+          </view>
+          <view class="but_box" style="margin-top: 20rpx;">
+            <view style="width: 236rpx;margin: 0 10rpx; " v-if='item.state == "0"'>
+              <u-button shape="circle" text="取消报名" @click="cancleBM(item.id)"></u-button>
+            </view>
+            <view style="width: 236rpx;margin: 0 10rpx; " v-if='item.state == "3"'>
+              <u-button shape="circle" text="收到的评价" @click="receiveevlaue(item.id)"></u-button>
+            </view>
+          </view>
+        </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="display: flex; border-top:2rpx solid #E7E7E7;height: 112rpx;width: 640rpx;line-height: 112rpx; font-size: 32rpx;font-weight: 600;">
+          <view style="width: 319rpx; border-right:1rpx solid #E7E7E7; text-align: center;" @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" @close="close()" :closeOnClickOverlay="true">
+      <view class="pinContent">
+        <view class="pinContent_itm" v-for='(v, i) in baomingpingjia' :key="i">
+          <view class="pinContent_avator">
+            <!-- <image class="pinContent_avator_img" src="../../static/MyBg.png" mode=""></image> -->
+            <image class="pinContent_avator_img" :src="v.image" mode=""></image>
+            <view class="pinContent_Time">
+              <text style="font-size: 24rpx; font-weight: 600;">{{ v.userName }}</text>
+            </view>
+          </view>
+          <view class="pinContent_rate">
+            <u-rate count=5 v-model="v.evaluate"></u-rate>
+          </view>
+        </view>
+      </view>
+      <view slot="confirmButton" style="display: flex; justify-content: center; align-items: center;">
+        <view style="width: 400rpx;">
+          <u-button color="#99241B" shape="circle" text="提交" @click="subEvalue(baomingpingjia)"></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 v-if="!(orderList.length > 0)">
+      <u-empty mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png">
+      </u-empty>
+    </view>
+  </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,
+    };
+  },
+  onShow () {
+    this.clickTab(this.tabNum)
+  },
+  // 下拉刷新
+  onPullDownRefresh () {
+    this.clickTab(this.tabNum)
+    setTimeout(function () {
+      uni.stopPullDownRefresh();
+    }, 1000);
+  },
+  //上拉
+  onReachBottom () {
+    this.page++
+    this.moreOrder();
+  },
+  methods: {
+    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",
+        });
+      })
+    },
+    pingjia (num, id) {
+      this.show = true
+      this.pingjiaobj = this.orderList[num]
+      let that = this
+      this.http.request('/hallUser/pjList?hallId=' + id, {}, "GET").then(res => {
+        if (res.code == 200) {
+          console.log("reg", res.data)
+          this.baomingpingjia = res.data
+        }
+      }).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",
+        });
+      })
+    },
+    clickTab (num) {
+      this.orderList = []
+      this.tabNum = num
+      this.page = 1
+      if (num == 1) {
+        let that = this
+        this.http.request('/hallUser/ddgl', { page: this.page, size: this.size }, "GET").then(res => {
+          if (res.code == 200) {
+            if (res.data.records.length > 0) {
+              res.data.records.forEach(function (item) {
+                if (item.enclosure) {
+                  let fileArr = item.enclosure.split(',')
+                  let gs = fileArr[0].substr(fileArr[0].lastIndexOf(".") + 1)
+                  if (gs == 'jpg' || gs == 'jpeg' || gs == 'png' || gs == 'bmp' || gs ==
+                    'gif' || gs == 'tif' || gs == 'tiff') {
+                    item.enclosure = fileArr[0]
+                  } else if (gs == 'pdf') {
+                    item.enclosure = '../../static/fileImg/pdfB.png'
+                  }
+                }
+                that.orderList.push(item)
+              })
+            } else if (res.data.records.length == 0) {
+              this.page--
+            }
+          }
+        }).catch(e => {
+          uni.showToast({
+            title: e.data.message,
+            icon: "none",
+          });
+        })
+      } else if (num == 2) {
+        let that = this
+        this.http.request('/hallUser/myHall', { page: this.page, size: this.size }, "GET").then(res => {
+          if (res.data.records.length > 0) {
+            res.data.records.forEach(function (item) {
+              if (item.enclosure) {
+                let fileArr = item.enclosure.split(',')
+                let gs = fileArr[0].substr(fileArr[0].lastIndexOf(".") + 1)
+                if (gs == 'jpg' || gs == 'jpeg' || gs == 'png' || gs == 'bmp' || gs ==
+                  'gif' || gs == 'tif' || gs == 'tiff') {
+                  item.enclosure = fileArr[0]
+                } else if (gs == 'pdf') {
+                  item.enclosure = '../../static/fileImg/pdfB.png'
+                }
+              }
+              that.orderList.push(item)
+            })
+          } else if (res.data.records.length == 0) {
+            this.page--
+          }
+        }).catch(e => {
+          uni.showToast({
+            title: e.data.message,
+            icon: "none",
+          });
+        })
+      } else if (num == 3) {
+        let that = this
+        this.http.request('/hallUser/myHall?state=2', { page: this.page, size: this.size }, "GET").then(res => {
+          if (res.data.records.length > 0) {
+            res.data.records.forEach(function (item) {
+              if (item.enclosure) {
+                let fileArr = item.enclosure.split(',')
+                let gs = fileArr[0].substr(fileArr[0].lastIndexOf(".") + 1)
+                if (gs == 'jpg' || gs == 'jpeg' || gs == 'png' || gs == 'bmp' || gs ==
+                  'gif' || gs == 'tif' || gs == 'tiff') {
+                  item.enclosure = fileArr[0]
+                } else if (gs == 'pdf') {
+                  item.enclosure = '../../static/fileImg/pdfB.png'
+                }
+              }
+              that.orderList.push(item)
+            })
+          } else if (res.data.records.length == 0) {
+            this.page--
+          }
+        }).catch(e => {
+          uni.showToast({
+            title: e.data.message,
+            icon: "none",
+          });
+        })
+      }
+    },
+    moreOrder () {
+      if (this.tabNum == 1) {
+        let that = this
+        this.http.request('/hallUser/ddgl', { page: this.page, size: this.size }, "GET").then(res => {
+          if (res.code == 200) {
+            if (res.data.records.length > 0) {
+              res.data.records.forEach(function (item) {
+                if (item.enclosure) {
+                  let fileArr = item.enclosure.split(',')
+                  let gs = fileArr[0].substr(fileArr[0].lastIndexOf(".") + 1)
+                  if (gs == 'jpg' || gs == 'jpeg' || gs == 'png' || gs == 'bmp' || gs ==
+                    'gif' || gs == 'tif' || gs == 'tiff') {
+                    item.enclosure = fileArr[0]
+                  } else if (gs == 'pdf') {
+                    item.enclosure = '../../static/fileImg/pdfB.png'
+                  }
+                }
+                that.orderList.push(item)
+              })
+            } else if (res.data.records.length == 0) {
+              this.page--
+            }
+          }
+        }).catch(e => {
+          uni.showToast({
+            title: e.data.message,
+            icon: "none",
+          });
+        })
+      } else if (this.tabNum == 2) {
+        let that = this
+        this.http.request('/hallUser/myHall', { page: this.page, size: this.size }, "GET").then(res => {
+          if (res.code == 200) {
+            if (res.data.records.length > 0) {
+              res.data.records.forEach(function (item) {
+                if (item.enclosure) {
+                  let fileArr = item.enclosure.split(',')
+                  let gs = fileArr[0].substr(fileArr[0].lastIndexOf(".") + 1)
+                  if (gs == 'jpg' || gs == 'jpeg' || gs == 'png' || gs == 'bmp' || gs ==
+                    'gif' || gs == 'tif' || gs == 'tiff') {
+                    item.enclosure = fileArr[0]
+                  } else if (gs == 'pdf') {
+                    item.enclosure = '../../static/fileImg/pdfB.png'
+                  }
+                }
+                that.orderList.push(item)
+              })
+            } else if (res.data.records.length == 0) {
+              this.page--
+            }
+          }
+        }).catch(e => {
+          uni.showToast({
+            title: e.data.message,
+            icon: "none",
+          });
+        })
+      } else if (this.tabNum == 3) {
+        let that = this
+        this.http.request('/hallUser/myHall?state=2', { page: this.page, size: this.size }, "GET").then(res => {
+          if (res.code == 200) {
+            if (res.data.records.length > 0) {
+              res.data.records.forEach(function (item) {
+                if (item.enclosure) {
+                  let fileArr = item.enclosure.split(',')
+                  let gs = fileArr[0].substr(fileArr[0].lastIndexOf(".") + 1)
+                  if (gs == 'jpg' || gs == 'jpeg' || gs == 'png' || gs == 'bmp' || gs ==
+                    'gif' || gs == 'tif' || gs == 'tiff') {
+                    item.enclosure = fileArr[0]
+                  } else if (gs == 'pdf') {
+                    item.enclosure = '../../static/fileImg/pdfB.png'
+                  }
+                }
+                that.orderList.push(item)
+              })
+            } else if (res.data.records.length == 0) {
+              this.page--
+            }
+          }
+        }).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}`
+        })
+      }
+
+    },
+    toUpimgPage (id) {
+      this.http.request('/hallUser/pjList?hallId=' + id, {}, "GET").then(res => {
+        if (res.code == 200) {
+          console.log("reg", res.data)
+          if (res.data.length > 0) {
+            uni.navigateTo({
+              url: `/pagesA/my/imgUpload?id=` + id
+            })
+          } else {
+            uni.showToast({
+              title: "无人接单",
+              icon: "none",
+            });
+          }
+        }
+      }).catch(e => {
+        uni.showToast({
+          title: e.data.message,
+          icon: "none",
+        });
+      })
+
+    },
+    touploadedimg (imgstr) {
+      uni.navigateTo({
+        url: '/pagesA/my/uploadedImgShow?imgstring=' + imgstr
+      })
+    },
+    subEvalue (item) {
+      let that = this
+      let arr = []
+      this.baomingpingjia.forEach(function (em, i) {
+        arr.push({
+          evaluate: em.evaluate,
+          hallId: em.hallId,
+          userId: em.userId
+        })
+      })
+      that.http.request('/hallUser/evaluate',
+        arr, "POST").then(res => {
+          if (res.code == 200) {
+            that.clickTab(1)
+            console.log("testdata", res)
+          }
+        }).catch(e => {
+          uni.showToast({
+            title: e.data.message,
+            icon: "none",
+          });
+        })
+
+      this.show = false
+      console.log(this.score)
+      // 提交评价
+    },
+    toEvlauedpg (id) {
+      uni.navigateTo({
+        url: `/pagesA/my/evaluated?id=` + id
+      })
+    },
+    close () {
+      this.show = false
+    },
+    closeRecive () {
+      this.showShoudao = false
+    },
+    undone (val) {
+      this.undoneId = val
+      this.showS = true
+    },
+    closeS () {
+      this.showS = false
+    },
+    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);
+		margin: 0rpx 32rpx; */
+  background-color: #F5F5F5 !important;
+}
+
+.main {
+  padding: 0rpx 32rpx;
+}
+
+image {
+  width: 100%;
+  height: 60%;
+}
+
+.acttiveSty {
+  color: #9A2720;
+  font-weight: 700;
+}
+
+.but_box {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+}
+
+.tag_sta {
+  width: 100rpx;
+  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.0900);
+  border-radius: 8rpx;
+  line-height: 48rpx;
+  color: #EE493C;
+  text-align: center;
+  font-size: 24rpx;
+}
+
+.tag_sta_end {
+  width: 100rpx;
+  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;
+}
+
+.act_time {
+  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;
+
+  .title {
+    width: 580rpx;
+    color: #000000;
+    font-size: 32rpx;
+    font-weight: 600;
+    color: #251B1D;
+  }
+}
+
+.pinContent {
+  margin-top: 16rpx;
+
+  .pinContent_itm {
+    width: 500rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+
+    .pinContent_avator {
+      display: flex;
+      align-items: center;
+
+      .pinContent_avator_img {
+        width: 68rpx;
+        height: 68rpx;
+        margin-right: 16rpx;
+        margin: 24rpx 16rpx 24rpx 0rpx;
+        border-radius: 50%;
+        overflow: hidden;
+      }
+
+      .pinContent_Time {
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+      }
+    }
+  }
+}
+</style>