gx

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,34 +192,34 @@
             "navigationBarTitleText": "已传图片",
             "enablePullDownRefresh": false
           }
-
         }
       ]
     },
     {
       "root": "pagesB/",
-			"pages": [{
+      "pages": [
+        {
           "path": "ArtRace/ArtRace",
           "style": {
             "navigationBarTitleText": "文艺比赛",
             "enablePullDownRefresh": false
           }
-
+        },
-				}, {
+        {
           "path": "ArtRace/ArtRaceDetail",
           "style": {
             "enablePullDownRefresh": false,
             "navigationStyle": "custom"
           }
-
+        },
-				}, {
+        {
           "path": "ArtRace/ThrowWork",
           "style": {
             "navigationBarTitleText": "投稿",
             "enablePullDownRefresh": false
           }
-
+        },
-				}, {
+        {
           "path": "ConfirmOrder/ConfirmOrder",
           "style": {
             "navigationBarTitleText": "确认订单",
@@ -234,7 +227,8 @@
           }
         }
         //虚拟物品-线上交易
-				, {
+        ,
+        {
           "path": "ConfirmOrder/fictitiousOrder",
           "style": {
             "navigationBarTitleText": "确认订单",
@@ -242,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": "订单详情",
@@ -277,7 +273,6 @@
             "navigationBarTitleText": "我的积分",
             "enablePullDownRefresh": false,
             "navigationStyle": "custom"
-
           }
         },
         // 积分明细
@@ -312,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
           }
-
         }
       ]
     },
@@ -412,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",
@@ -456,18 +452,18 @@
             "enablePullDownRefresh": true,
             "onReachBottomDistance": 20
           }
-				}, {
+        },
+        {
           "path": "famousArts/famousArts",
           "style": {
             "enablePullDownRefresh": false
           }
-
+        },
-				}, {
+        {
           "path": "folderDetail/folderDetail",
           "style": {
             "enablePullDownRefresh": false
           }
-
         },
         {
           "path": "literHelp/literHelp",
@@ -475,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",
@@ -536,14 +533,13 @@
             "enablePullDownRefresh": false,
             "navigationStyle": "custom"
           }
-
+        },
-				}, {
+        {
           "path": "SelectId/SelectId",
           "style": {
             "enablePullDownRefresh": false,
             "navigationStyle": "custom"
           }
-
         },
         {
           "path": "shop/Shop",
@@ -552,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
           }
-
         }
       ]
     },
@@ -619,13 +614,14 @@
         }
       ]
     }
-
   ],
   "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/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>
             <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>
             <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: `/pagesB/orderHall/addOrder`
+      })
+    },
+    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: 120rpx;
-          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/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>