cdn图

src/project/pingchang/AppPhotoReport/AppPhotoReport.vue

@@ -12,21 +12,17 @@
                 <span>{{ item.groupName }}</span>
               </div>
               <div class="photo-item__top--info-item">
-                <label>所属网格</label>
-                <span>{{ item.girdName }}</span>
+                <label>所属地区</label>
+                <span>{{ item.areaName }}</span>
               </div>
             </div>
           </div>
           <div class="photo-item__bottom flex">
             <div class="flex fill">
               <i :class="'status-' + item.eventStatus"></i>
-              <span :class="'status-' + item.eventStatus">{{ item.statusName }}</span>
+              <span :class="'status-' + item.eventStatus">{{ $dict.getLabel('clapEventStatus',item.eventStatus) }}</span>
             </div>
-            <!-- <AiEvaluation :bid="item.id" v-if="item.eventStatus>1">
-              <div class="itemBtn">去评价</div>
-              <div slot="finish" class="finish">已评价</div>
-            </AiEvaluation> -->
-            <div>
+            <div v-if="item.eventStatus>1">
               <div class="itemBtn" @click="toEvaluate">去评价</div>
               <!-- <div slot="finish" class="finish">已评价</div> -->
             </div>
@@ -89,41 +85,17 @@ export default {
 
     getList() {
       if (this.isMore) return
-
-      this.$instance.post(`/app/appclapeventinfo/listByWxApplet`, null, {
+      this.$instance.post(`/app/appclapeventinfopingchang/listByWxApplet`, null, {
         params: {
           current: this.current,
-          size: 15
+          size: 15,
         }
       }).then(res => {
         if (res.code == 0) {
           this.total = res.data.total
-          if (this.current > 1) {
-            this.list = [...this.list, ...res.data.records].map(v => {
-              return {
-                ...v,
-                statusName: this.$dict.getLabel('clapEventStatus', v.eventStatus)
-              }
-            })
-          } else {
-            this.list = res.data.records.map(v => {
-              return {
-                ...v,
-                statusName: this.$dict.getLabel('clapEventStatus', v.eventStatus)
-              }
-            })
-          }
+          this.list = this.current == 1? res.data.records : [...this.list, ...res.data.records]
           uni.hideLoading()
           this.pageShow = true
-          if (res.data.records.length < 15) {
-            this.isMore = true
-
-            return false
-          }
-
-          this.current = this.current + 1
-        } else {
-          uni.hideLoading()
         }
       }).catch(() => {
         uni.hideLoading()
@@ -146,6 +118,7 @@ export default {
   },
 
   onReachBottom() {
+    this.current++
     this.getList()
   }
 }

src/project/pingchang/AppPhotoReport/PhotoDetail.vue

@@ -45,7 +45,7 @@
 
 <script>
 export default {
-  appName: "随手拍详情",
+  appName: "微心愿详情",
   data() {
     return {
       pageShow: false,

src/project/pingchang/AppPhotoReport/PhotoForm.vue

@@ -203,19 +203,19 @@ export default {
         return this.$toast('请输入上报人联系方式')
       }
 
-      // if (!this.form.girdId) {
-      //   return this.$toast('请选择所属网格')
-      // }
+      if (this.form.areaId.substr(this.form.areaId.length - 3, 3) === '000') {
+        return this.$toast('所属地区必须选到村或社区')
+      }
 
       if (this.flag) return
       this.flag = true
 
       this.$loading()
-      this.$instance.post(`/app/appclapeventinfo/addOrUpdate`, {
+      this.$instance.post(`/app/appclapeventinfopingchang/addOrUpdate`, {
         ...this.form,
         openid: this.user.openid,
-        portrait: this.user.avatarUrl,
-        files: this.form.files,
+        // portrait: this.user.avatarUrl,
+        // files: this.form.files,
         groupName: this.dictList.filter(v => v.value === this.form.groupId)[0].label
       }).then(res => {
         this.$hideLoading()