Merge branch 'master' of http://123.57.226.179:8080/yin_yu820/HS_MZAP

src/views/activityMan/nonReligiousInformation/nonReligiousInformationList.vue

@@ -335,7 +335,7 @@ setup() {
   };
   // 删除
   const Itemdel = () => {
-    new siteInspectionService().delete(ids.value).then((res) => {
+    new nonReligiousInformationService().delete(ids.value).then((res) => {
       index = 0;
       loading.value = true;
       list.value = [];

src/views/activityMan/nonReligiousInformation/nonReligiousInformationView.vue

@@ -253,15 +253,35 @@ export default {
           .then((data) => {
             inputForm.value = data;
 
-            inputForm.value.siteName.name=inputForm.value.siteName.organizationName;
 
-            Categories.value.forEach((item) => {
-              if(item.id==inputForm.value.nonReligiousCategories){
-                inputForm.value.nonReligiousCategoriesname = item.name;   
-              }              
-            });            
+            //附件处理      
+            inputForm.value.annex.split("|").forEach((item) => {
+              if (item.trim().length > 0) {
+                fileList.value.push({
+                  name: decodeURIComponent(
+                    item.substring(item.lastIndexOf("/") + 1)
+                  ),
+                  url: $base + item.replace('程序附件//','程序附件/'),
+                });
+                fileupList.value.push({
+                  name: decodeURIComponent(
+                    item.substring(item.lastIndexOf("/") + 1)
+                  ),
+                  url: item,
+                });
+              }
+            });
+
+
+            //inputForm.value.siteName.name=inputForm.value.siteName.organizationName;
+
+            // Categories.value.forEach((item) => {
+            //   if(item.id==inputForm.value.nonReligiousCategories){
+            //     inputForm.value.nonReligiousCategoriesname = item.name;   
+            //   }              
+            // });            
             
-            contentEditor.value.init(inputForm.value.eventContent);
+            //contentEditor.value.init(inputForm.value.eventContent);
             
             isLoading.value = false;
           });

src/views/activityMan/placeactivity/placeActivityList.vue

@@ -1,42 +1,16 @@
 <template>
-  <van-nav-bar
-    fixed
-    title="场所活动"
-    left-text=""
-    left-arrow
-    @click-left="onClickLeft"
-    @click-right="onClickRight"
-    :style="{ 'background-color': selectColor }"
-  >
+  <van-nav-bar fixed title="场所活动" left-text="" left-arrow @click-left="onClickLeft" @click-right="onClickRight"
+    :style="{ 'background-color': selectColor }">
     <template #right>
       <van-icon name="plus" size="18" />
     </template>
   </van-nav-bar>
   <div class="main">
-    <van-search
-      v-model="searchVal"
-      clearable
-      show-action
-      shape="round"
-      label="活动名称"
-      placeholder="请输入搜索关键词"
-      input-align="center"
-      @search="onSearch"
-      @cancel="onCancel"
-    />
-    <van-tabs
-      v-show="!searchShow"
-      v-model:active="active"
-      title-inactive-color="#bdbdbd"
-      title-active-color="#36a7f3"
-    >
+    <van-search v-model="searchVal" clearable show-action shape="round" label="活动名称" placeholder="请输入搜索关键词"
+      input-align="center" @search="onSearch" @cancel="onCancel" />
+    <van-tabs v-show="!searchShow" v-model:active="active" title-inactive-color="#bdbdbd" title-active-color="#36a7f3">
       <van-tab title="未审核" name="0">
-        <van-list
-          v-model:loading="loading"
-          :finished="finished"
-          finished-text="没有更多了"
-          @load="onLoad"
-        >
+        <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
           <van-swipe-cell v-for="item in list" :key="item">
             <div class="list_item" @click="goInfo(item.id)">
               <div class="item-left">
@@ -47,10 +21,8 @@
               </div>
               <van-cell>
                 <template #title>
-                  <van-text-ellipsis
-                    rows="2"
-                    :content="`${item.reporter.name}申请于${item.placeDel}举办${item.activityName}活动`"
-                  />
+                  <van-text-ellipsis rows="2"
+                    :content="`${item.reporter.name}申请于${item.placeDel}举办${item.activityName}活动`" />
                 </template>
                 <template #label>
                   {{ item.place }}
@@ -58,31 +30,14 @@
               </van-cell>
             </div>
             <template #right>
-              <van-button
-                square
-                type="danger"
-                text="删除"
-                class="button"
-                @click="deleteItem(item.id)"
-              />
-              <van-button
-                square
-                type="primary"
-                text="修改"
-                class="button"
-                @click="updateItem(item)"
-              />
+              <van-button square type="danger" text="删除" class="button" @click="deleteItem(item.id)" />
+              <van-button square type="primary" text="修改" class="button" @click="updateItem(item)" />
             </template>
           </van-swipe-cell>
         </van-list>
       </van-tab>
       <van-tab title="已审核" name="1">
-        <van-list
-          v-model:loading="loading1"
-          :finished="finished1"
-          finished-text="没有更多了"
-          @load="onLoad1"
-        >
+        <van-list v-model:loading="loading1" :finished="finished1" finished-text="没有更多了" @load="onLoad1">
           <van-swipe-cell v-for="item in readList" :key="item">
             <div class="list_item" @click="goInfo(item.id)">
               <div class="item-left">
@@ -93,10 +48,8 @@
               </div>
               <van-cell>
                 <template #title>
-                  <van-text-ellipsis
-                    rows="2"
-                    :content="`${item.reporter.name}申请于${item.placeDel}举办${item.activityName}活动`"
-                  />
+                  <van-text-ellipsis rows="2"
+                    :content="`${item.reporter.name}申请于${item.placeDel}举办${item.activityName}活动`" />
                 </template>
                 <template #label>
                   {{ item.place }}
@@ -108,30 +61,22 @@
       </van-tab>
     </van-tabs>
     <!-- 搜索结果 -->
-    <van-list
-      v-show="searchShow"
-      v-model:loading="loading"
-      :finished="finished"
-      finished-text="没有更多了"
-      @load="onLoad"
-    >
+    <van-list v-show="searchShow" v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
       <van-swipe-cell v-for="item in searchList" :key="item">
         <div class="list_item" @click="goInfo(item.id)">
           <div class="item-left">
             <p v-show="item.activityTime != ''" style="color: #c4c4c4">
               {{ item.activityTime }}
             </p>
-            <p style="color: red">
-              <span v-if="item.assessment == 1">已审核</span>
-              <span v-else>待审核</span>
+            <p>
+              <span v-if="item.assessment == 1" style="color: gray">已审核</span>
+              <span v-else style="color: red">待审核</span>
             </p>
           </div>
           <van-cell>
             <template #title>
-              <van-text-ellipsis
-                rows="2"
-                :content="` ${item.reporter.name}申请于${item.placeDel}举办${item.activityName}活动`"
-              />
+              <van-text-ellipsis rows="2"
+                :content="` ${item.reporter.name}申请于${item.placeDel}举办${item.activityName}活动`" />
             </template>
             <template #label>
               {{ item.place }}