Merge branch 'bug_fix' into feature

src/api/event.js

@@ -41,7 +41,7 @@ export function collects(data) {
 // 事件评价
 export function updateEvent(data) {
   return request({
-    url: `/governance/officialAccountEventList/updateEvent`,
+    url: `/governance/icEventOld/comment`,
     method: 'post',
     message: '事件评价中...',
     data

src/api/home.js

@@ -34,6 +34,13 @@ export function icEventOldDiscuss(data) {
       data
     })
   }
+    // 【社区讯息】详情
+  export function communityPublicityDetail(id) {
+      return request({
+        url: `/actual/base/communityPublicity/${id}`,
+        method: 'get',
+      })
+  }
 //议事赞成/反对
 export function handelClicsupport(data) {
   return request({

src/components/registerDialog/index.vue

@@ -1,8 +1,8 @@
 <template>
-    <van-dialog v-model="show" show-cancel-button confirm-button-text="确定"  @confirm="$router.push('/register')" @cancel="$emit('close')">
+    <van-dialog v-model="show" show-cancel-button confirm-button-text="确定"  @confirm="$router.push({path:`${path}`,query:{flag:registerFlag}})" @cancel="$emit('close')">
         <div class="tip">
             <h3>温馨提示</h3>
-            <p>请您先进行手号注册。</p>
+            <p>{{content}}</p>
         </div>
     </van-dialog>
 </template>
@@ -18,6 +18,20 @@ export default {
 
     mounted() {
 
+    },
+    props:{
+        content:{
+            type:String,
+            default:'请您先进行手机号注册。'
+        },
+        path:{
+             type:String,
+             default:'/register'
+        },
+        registerFlag:{
+             type:String,
+             default:'register'
+        }
     }
 }
 </script>

src/views/appealDetail/index.vue

@@ -16,7 +16,7 @@
       <div class="address">详细地址：{{ detail.address }}</div>
     </div>
 
-    <div class="block container">
+    <div class="block container" v-if="detail.status === 'closed_case'">
       <div class="title">满意度评价</div>
       <div class="btns flex flex-mean">
         <!-- <van-button
@@ -215,23 +215,30 @@ export default {
       detail: {},
       process: [],
       btns:['perfect','good','bad'],
-      btnFlag:'perfect'
+      btnFlag:null
     }
   },
   mounted() {
-    this.detail = this.$route.query
+    this.detail = this.$route.query;
+    if(this.detail.satisfaction){
+      this.btnFlag = this.detail.satisfaction
+    }
     this.getProcess()
     console.log(this.detail)
   },
   methods: {
     setEvaluate(val) {
+      if(this.btnFlag){
+        this.$toast('请勿重复评价!')
+        return false
+      }
       if (this.detail.pageType === 'event') {
         this.btnFlag = val;
         updateEvent({
-          id: this.detail.id,
-          satisfaction: val
+          icEventId: this.detail.icEventId,
+          satisfaction: val,
         }).then(() => {
-          this.evaluate = val
+          this.evaluate = val;
           this.$toast.success('评价成功')
         })
       }

src/views/communityPublicity/detail.vue

@@ -38,19 +38,21 @@
 
 
 import { setConfig } from '@/utils/jweixin'
-import {communityPublicityGiveLike } from '@/api/home';
+import {communityPublicityGiveLike,communityPublicityDetail } from '@/api/home';
 import Share from "@/components/Share"
 export default {
     data() {
         return {
             info: {},
             showShare:false,
-            phone:""
+            phone:"",
+            detailId:null
         };
     },
     created() {
         if (this.$route.query) {
-            this.info = JSON.parse(this.$route.query.item);
+            this.detailId = this.$route.query.id;
+            this.communityPublicityDetail();
         }
     },
     mounted() {
@@ -58,6 +60,12 @@ export default {
         this.share()
     },
     methods: {
+        async communityPublicityDetail(){
+            let res = await communityPublicityDetail(this.detailId)
+            if(res.code === 0){
+                this.info = res.data
+            }
+        },
         handleNumber(value){
             console.log(value,"wl kgnsl, ");
             this.phone=value
@@ -81,14 +89,14 @@ export default {
                     wx.updateAppMessageShareData({
                         title: than.info.title || '讯息详情',
                         desc: '',
-                        link: `https://epmet-preview.elinkservice.cn/epmet-wx-pa/#/communityPublicityDetail?item=${encodeURIComponent(JSON.stringify(than.info))}&appId=${than.$store.state.app.appId}`,
+                        link: `https://epmet-preview.elinkservice.cn/epmet-wx-pa/#/communityPublicityDetail?id=${than.detailId}&appId=${than.$store.state.app.appId}`,
                         imgUrl: than.info.coverPic || 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20240710/617f7fb327064d89892823b81b11cd70.png',
                         success: function () {}
                     })
                     wx.updateTimelineShareData({
                         title: than.info.title,
                         desc: '',
-                        link: `https://epmet-preview.elinkservice.cn/epmet-wx-pa/#/communityPublicityDetail?item=${encodeURIComponent(JSON.stringify(than.info))}&appId=${than.$store.state.app.appId}`,
+                        link: `https://epmet-preview.elinkservice.cn/epmet-wx-pa/#/communityPublicityDetail?item=${than.detailId}&appId=${than.$store.state.app.appId}`,
                         imgUrl: than.info.coverPic || 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20240710/617f7fb327064d89892823b81b11cd70.png',
                         success: function () {}
                     })

src/views/communityPublicity/index.vue

@@ -70,7 +70,7 @@ export default {
     },
     methods: {
         toDetail(item){
-            this.$router.push({name:'communityPublicityDetail',query:{item:JSON.stringify(item)}})
+            this.$router.push({name:'communityPublicityDetail',query:{id:item.id}})
         },
         handleSearch(){
             this.PublicityList = [];

src/views/event/index.vue

@@ -114,15 +114,13 @@ export default {
     this.geolocation = new qq.maps.Geolocation(mapKey, 'myapp')
     // 获取定位
     this.getMyLocation()
-    this.phone = this.$store.state.app.userInfo.phone
+    this.phone = this.$store.state.app.userInfo.mobile;
     this.agencyId = this.$store.state.app.agencyId;
-
   },
   methods: {
     handleNumber(value){
-            console.log(value,"wl kgnsl, ");
-            this.phone=value
-        },
+            this.phone = value;
+    },
     // 获取当前位置
     getMyLocation() {
       this.geolocation.getLocation(this.showPosition, this.errorPosition) //开启定位

src/views/home/index.vue

@@ -3,7 +3,7 @@
         <div class="blueBg"></div>
         <div class="content">
             <div class="flex flex-end">
-                <div class="flex flex-center2 white" @click="$router.push('/selectAgency')">
+                <div class="flex flex-center2 white" >
                     <img src="@/assets/images/icons/home.png" class="img_17 m-right10" alt="">
                     <span>{{ this.$store.state.app.userInfo.agencyName || '--' }}</span>
                 </div>
@@ -104,7 +104,7 @@
                     <van-tabs v-model="tagActive" style="width: 100%;" @change="handelChangeTags">
                         <van-tab v-for="item in tagList" :key="item.id" :title="item.tagName">
                             <div class="flex flex-y flex1 flex-end" v-if="PublicityList.length !== 0" >
-                                <div class="activity_content flex flex-y" v-for="(item, index) in PublicityList" :key="index"  @click="$router.push({name:'communityPublicityDetail',query:{item:JSON.stringify(item)}})">
+                                <div class="activity_content flex flex-y" v-for="(item, index) in PublicityList" :key="index"  @click="$router.push({name:'communityPublicityDetail',query:{id:item.id}})">
                                     <div class="flex  flex1 ">
                                         <span class="van-multi-ellipsis--l2 flex1" style="line-height: 28px;" >
                                             {{ item.title }}
@@ -130,7 +130,7 @@
                 </div>
             </div>
         </div>
-        <register-dialog v-if="showRegister" @close="showRegister = false"></register-dialog>
+        <register-dialog v-if="showRegister" @close="showRegister = false" :registerFlag="registerFlag" :content="tipContent"></register-dialog>
     </div>
 </template>
 
@@ -179,7 +179,9 @@ export default {
             PublicityList:[],
             PublicityListImg:[],
             messageText:'没有新的消息！',
-            day:null
+            day:null,
+            tipContent:null,
+            registerFlag:null
         };
     },
     created() {
@@ -328,11 +330,22 @@ export default {
             }
         },
         handelClickJump(path,item) {
-            if (path === 'event') {
-                if (this.$store.state.app.userInfo.mobile) {
-                    this.$router.push({ path: `/${path}` });
-                } else {
-                    this.showRegister = true;
+            if (path === 'event' || path === 'Enjoyableservices') {
+                if(path === 'event'){
+                    if (this.$store.state.app.userInfo.mobile) {
+                        this.$router.push({ path: `/${path}` });
+                    } else {
+                        this.showRegister = true;
+                    }
+                }
+                if(path === 'Enjoyableservices'){
+                    if (this.$store.state.app.userInfo.idNum) {
+                        this.$router.push({ path: `/${path}` });
+                    } else {
+                        this.tipContent = '请您先进行实名认证。'
+                        this.registerFlag = 'real';
+                        this.showRegister = true;
+                    }
                 }
             } else {
                 this.$router.push({ path: `/${path}`,query:{id:item.id} })

src/views/mine/mySatisfaction/index.vue

@@ -2,6 +2,15 @@
     <div class='container'>
         <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="inspRecord" class="card"
             :offset="50" style="padding: 0;">
+            
+            <div class="flex1 flex flex-y activity_content flex-center" v-if="currentMonth">
+                        <div class="title" style="color: #333333;">
+                            暂未创建{{month}}月自评问卷
+                        </div>
+                        <div class="font-size14 m-top13 gray m-top12">
+                            
+                        </div>
+            </div>
             <div class="activity_content flex flex-center2" v-for="(item, index) in list" :key="index" @click="handelClickJump(item.questionnaireUrl)">
                     <div class="flex1 flex flex-y">
                         <div class="title" style="color: #333333;">
@@ -34,11 +43,14 @@ export default {
             finished: false,
             loading: true,
             showRegister: false,
+            currentMonth:false,
+            month:null
         };
     },
     created() {
         this.agencyId = this.$store.state.app.agencyId;
         this.inspRecord();
+        
     },
     methods: {
         async inspRecord() {
@@ -49,12 +61,18 @@ export default {
             let res = await inspRecord(parm)
             if (res.code === 0) {
                 this.loading = false;
+                const now = new Date();
+                this.month = now.getMonth() + 1;
+                if(res.data.list.findIndex(item=>item.monthName == month) == -1){
+                    this.currentMonth = true;
+                }
                 if (!res.data || res.data.list.length < this.pageSize) {
                     this.finished = true;
                 }
                 this.list = this.list.concat(res.data.list);
             }
         },
+        
         handelClickJump(path) {
             window.open(path)
         }

src/views/register/index.vue

@@ -16,7 +16,7 @@
       <van-tab title="实名认证">
         <div class="block container">
           <van-field v-model="realName" label="真实姓名" placeholder="请输入" required />
-          <van-field v-model="idCard" label="身份证号" placeholder="请输入" required/>
+          <van-field v-model="idNum" label="身份证号" placeholder="请输入" required/>
           <van-field v-model="phone" label="手机号" placeholder="请输入" required />
           <van-field v-model="smsCode" label="验证码" placeholder="请输入" required>
             <template #button>
@@ -48,7 +48,7 @@ export default {
       gender: '',
       userId: '',
       active:0,
-      idCard:null,
+      idNum:null,
       realName:null,
     }
   },
@@ -64,9 +64,12 @@ export default {
 
     },
     init() {
-      this.type = this.$route.params.type ? this.$route.params.type : ''
-      this.userInfo = this.$store.state.app.userInfo
-      this.gender = this.userInfo.gender
+      console.log(this.$route.query);
+      this.active = this.$route.query.flag === "real"?1 : 0
+      this.userInfo = this.$store.state.app.userInfo;
+      this.phone = this.$store.state.app.userInfo.mobile;
+      this.idNum = this.$store.state.app.userInfo.idNum;
+      this.gender = this.userInfo.gender;
       this.realName = this.userInfo.realName || this.userInfo.nickname
     },
     submit() {
@@ -77,7 +80,7 @@ export default {
         realName: this.realName,
         appId: this.$store.state.app.appId,
         gender: this.gender,
-        idNum:this.idCard
+        idNum:this.idNum
       }
       if (!params.mobile) {
         this.$toast.fail('请输入手机号')

src/views/selectAgency/index.vue

@@ -48,7 +48,7 @@ export default {
             this.district = null;
             this.autoFlag = false;
             this.selfCity = [];
-            this.getAgency();
+            this.getAgency(true);
         },
         signWX() {
             let _this = this
@@ -99,7 +99,7 @@ export default {
             let parm ={
                 organizationName: this.district
             }
-            if(!this.autoFlag){
+            if(!this.autoFlag && type){
                 parm.pid = 0
             }
             let res = await getAllOrgTreeList(parm)