事件上报

src/project/weiyang/AppPatrolReport/Add.vue

@@ -93,8 +93,8 @@ export default {
     this.typeList()
     this.forms.girdId = this.user.girdInfos2G[0].girdId
     this.forms.girdName = this.user.girdInfos2G[0].girdName
-    // this.forms.girdMemberId = this.user.girdMemberId
-    // this.forms.girdMemberName = this.user.name
+    this.forms.girdMemberId = this.user.girdMemberId
+    this.forms.girdMemberName = this.user.name
   },
   onShow() {
     this.forms.name = this.user.name

src/project/weiyang/AppPatrolReport/AppPatrolReport.vue

@@ -13,7 +13,7 @@
       </div>
     </div>
     <div v-if="!isGridMember" class="empty">
-      <img src="./components/img/no-admin.png" alt="">
+      <img src="https://cdn.sinoecare.com/i/2024/07/18/66987e8c5b56b.png" alt="">
       <p>没有网格员权限<br/>无法查看事件上报信息哦~</p>
     </div>
     <List v-if="refresh && isGridMember && component == 'List' " @change="onChange" :params="params" ref="List"  />

src/project/weiyang/AppPatrolReport/Detail.vue

@@ -250,7 +250,7 @@ uni-page-body {
       width: 80px;
       height: 80px;
       line-height: 80px;
-      background: #3975c6;
+      background-color: #4E8EEE;
       border-radius: 50%;
       color: #fff;
       text-align: center;

src/project/weiyang/AppPatrolReport/List.vue

@@ -40,7 +40,7 @@
           <div class="level-type">中风险纠纷</div>
         </div>
       </div>
-      <ai-empty v-if="!datas.length" />
+      <AiEmpty v-if="!datas.length" />
     </div>
     <div class="ai-add" v-if="isAdd" @click="toAdd"></div>
     <!-- <AiAdd @add="toAdd" /> -->
@@ -50,10 +50,8 @@
 
 <script>
 import {mapState} from 'vuex'
-import AiEmpty from '../../../components/AiEmpty/AiEmpty.vue'
 
 export default {
-  components: { AiEmpty },
   customNavigation: true,
   props: {},
   data() {

src/project/weiyang/AppPatrolReport/Map.vue

@@ -1,321 +0,0 @@
-<template>
-  <div class="map">
-    <!-- <div class="build-btn locate" @click="getLocale">
-      <img src="https://cdn.cunwuyun.cn/dvcp/h5/Location2.png" alt=""/>
-      当前<br>位置
-    </div> -->
-    <div class="address-search">
-      <div class="address-search__wrapper">
-        <image src="./components/img/search.png" />
-        <input placeholder-style="color: #98A6B6" placeholder="搜索地点" v-model="address" @input="onChange">
-      </div>
-    </div>
-    <scroll-view scroll-y scroll-into-view="address-item1" v-if="addressList.length">
-      <div class="address-item" :id="'address-item' + index" v-for="(item, index) in addressList" :key="index" @click="chooseAddress(index)">
-        <div class="left">
-          <h2>{{ item.title }}</h2>
-          <p>{{ item.address }}</p>
-        </div>
-        <!-- <div class="right" :class="[currIndex === index ? 'active' : '']"></div> -->
-      </div>
-    </scroll-view>
-    <div class="map-content">
-      <AiTMap :map.sync="map" :lib.sync="lib" :ops="ops" :libraries="['service', 'tools']"/>
-    </div>
-    <div class="footer">
-      <div class="btn" @click="confirm">确认定位</div>
-    </div>
-  </div>
-</template>
-
-<script>
-import {mapState, mapActions} from 'vuex'
-
-export default {
-  data() {
-    return {
-      ops: {},
-      lib: null,
-      map: null,
-      markerLayer: '',
-      isFlag: false,
-      latLng: {lat: '', lng: ''},
-      address: '',
-      addressList: []
-    }
-  },
-  computed: {...mapState(['user'])},
-  mounted() {
-    this.initMap()
-  },
-  onShow() {
-    // document.title = "选择上报位置"
-  },
-  methods: {
-    ...mapActions(['injectJWeixin']),
-    initMap(retryTimes = 0) {  //初始化地图
-      this.$nextTick(() => {
-        let {map} = this
-        if (map) {
-          map.setZoom(15)
-          map.on("click", (evt) => {
-            this.handleMapClick(evt)
-          });
-        } else {
-          if (retryTimes < 10)
-            setTimeout(() => {
-              this.initMap(++retryTimes)
-            }, 500)
-          else console.error("地图渲染失败")
-        }
-      })
-    },
-    onChange () {
-      if (this.timeout) {
-        clearTimeout(this.timeout)
-      }
-      this.timeout = setTimeout(() => {
-        this.currIndex = -1
-        new this.lib.service.Suggestion({
-          pageSize: 20
-        }).getSuggestions({
-          keyword: this.address
-        }).then(res => {
-          this.addressList = []
-          if (res.data.length) {
-            this.addressList = res.data
-          }
-        })
-      }, 500)
-    },
-    getAddress () {
-      new this.lib.service.Search({
-        pageSize: 20
-      }).explore({
-        center: this.latLng,
-        radius: 2000,
-        orderBy: '_distance'
-      }).then(res => {
-        this.addressList = []
-        if (res.data.length) {
-          this.addressList = res.data
-        }
-      })
-    },
-    chooseAddress (index) {
-      this.address = this.addressList[index].address
-      this.latLng = {lat: this.addressList[index].location.lat, lng: this.addressList[index].location.lng}
-      this.addMarker(this.addressList[index].location)
-    },
-    addMarker (position) {
-      if (this.marker) {
-        this.marker.setMap(null)
-        this.marker = null
-      }
-      this.marker = new this.lib.MultiMarker({
-        id: 'marker-layer',
-        map: this.map,
-        styles: {
-          marker: new this.lib.MarkerStyle({
-            width: 30,
-            height: 45,
-            anchor: { x: 10, y: 30 }
-          }),
-        },
-        geometries: [{
-          id: 'marker',
-          styleId: 'marker',
-          position: position,
-          properties: {
-            title: 'marker'
-          }
-        }]
-      })
-      this.easeTo(position)
-    },
-
-    easeTo (position) {
-      this.map.easeTo({
-        center: position,
-        zoom: 17
-      },
-      { duration: 500 })
-    },
-    handleMapClick(evt) {
-      console.log(evt)
-      let {lib: TMap, map} = this
-      if (this.markerLayer) {
-        this.markerLayer.setMap(null);
-      }
-      this.markerLayer = new TMap.MultiMarker({id: 'marker-layer', map});
-      this.markerLayer.add({
-        position: evt.latLng
-      });
-      this.latLng = evt.latLng
-      var geocoder = new TMap.service.Geocoder();
-      geocoder.getAddress({ location: this.latLng }).then((result) => {
-        this.address = result.result.address;
-      });
-    },
-    confirm() {
-      if (!this.latLng.lat) {
-        return this.$u.toast(`未获取到定位信息，无法定位`)
-      }
-
-      uni.$emit('chooseLat', {
-        lat: this.latLng.lat,
-        lng: this.latLng.lng, 
-        address: this.address
-      })
-      uni.navigateBack({
-        delta: 1
-      })
-    },
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-uni-page-body {
-  height: 100%;
-}
-
-.map {
-  height: 100vh;
-
-  .build-btn {
-    width: 80px;
-    height: 160px;
-    background: #FFF;
-    box-shadow: 0 4px 8px 0 rgba(138, 138, 138, 0.5);
-    border-radius: 8px;
-    position: fixed;
-    bottom: 136px;
-    right: 24px;
-    z-index: 99999;
-    padding: 16px 16px 0;
-    box-sizing: border-box;
-    font-size: 24px;
-    font-family: PingFangSC-Medium, PingFang SC;
-    font-weight: 500;
-    color: #666;
-    line-height: 30px;
-
-    &.locate {
-      transform: translateY(calc(-100% - 20px));
-    }
-
-    img {
-      width: 48px;
-      height: 48px;
-      margin-bottom: 8px;
-    }
-  }
-
-  .map-content {
-    width: 100%;
-    height: 100%;
-  }
-
-  .footer {
-    width: 100%;
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    z-index: 99999;
-    display: flex;
-    font-size: 32px;
-    font-family: PingFangSC-Medium, PingFang SC;
-    font-weight: 500;
-    height: 112px;
-    line-height: 112px;
-    text-align: center;
-
-    .click {
-      flex: 1;
-      color: #333;
-      background-color: #fff;
-    }
-
-    .btn {
-      flex: 2;
-      background: #1365DD;
-      color: #FFF;
-    }
-  }
-  .address-search {
-    display: flex;
-    align-items: center;
-    height: 100px;
-    padding: 0 32px;
-
-    .address-search__wrapper {
-      display: flex;
-      align-items: center;
-      width: 100%;
-      height: 72px;
-      padding: 0 32px;
-      background: #F6F7F9;
-      border-radius: 36px;
-
-      image {
-        width: 48px;
-        height: 48px;
-      }
-
-      input {
-        flex: 1;
-        font-size: 26px;
-        color: #333;
-      }
-    }
-  }
-  scroll-view {
-    height: 400px;
-    padding: 0 32px;
-
-    .address-item {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      padding: 32px 0;
-      border-bottom: 1px solid #EEEEEE;
-
-      &:last-child {
-        border: none;
-      }
-
-      .left {
-        flex: 1;
-        margin-right: 20px;
-      }
-
-      .right {
-        flex-shrink: 1;
-        width: 32px;
-        height: 32px;
-        border-radius: 50%;
-        border: 4px solid #CCCCCC;
-        transition: all ease 0.3s;
-
-        &.active {
-          border: 10px solid #1365DD;
-        }
-      }
-
-      h2 {
-        margin-bottom: 20px;
-        color: #222222;
-        font-weight: 600;
-        font-size: 34px;
-      }
-
-      p {
-        line-height: 1.2;
-        color: #999999;
-        font-size: 28px;
-      }
-    }
-  }
-}
-</style>

src/project/weiyang/AppPatrolReport/SelectUser.vue

@@ -17,11 +17,11 @@
                 <img src="./components/img/xzh.png" alt="" class="imgselect" v-if="item.isChecked" @click.stop="girdClick(item, index)" />
                 <img src="./components/img/xz.png" alt="" class="imgselect" v-else @click.stop="girdClick(item, index)" />
               </span> -->
-              <img src="./components/img/gird--select-icon.png" alt="" class="avatras" />
+              <img src="https://cdn.sinoecare.com/i/2024/07/18/66987f1968182.png" alt="" class="avatras" />
             </div>
             <div class="rightes">
               <div class="applicationNames">{{ item.girdName }}</div>
-              <img src="./components/img/right-icon.png" alt="" class="imgs" />
+              <img src="https://cdn.sinoecare.com/i/2024/07/18/66987f19bf532.png" alt="" class="imgs" />
             </div>
           </div>
         </div>
@@ -32,10 +32,10 @@
         <div v-if="userList.length > 0">
           <div class="cards" v-for="(e, index) in userList" :key="index">
             <div class="imges">
-              <img src="./components/img/xzh.png" alt="" class="imgselect" v-if="e.isChecked" @click="userClick(e, index)" />
-              <img src="./components/img/xz.png" alt="" class="imgselect" v-else @click="userClick(e, index)" />
+              <img src="https://cdn.sinoecare.com/i/2024/07/16/6695ddf91113c.png" alt="" class="imgselect" v-if="e.isChecked" @click="userClick(e, index)" />
+              <img src="https://cdn.sinoecare.com/i/2024/07/16/6695ddf890b1e.png" alt="" class="imgselect" v-else @click="userClick(e, index)" />
 
-              <img src="./components/img/tx@2x.png" alt="" class="avatras" />
+              <img src="https://cdn.sinoecare.com/i/2024/07/16/6695df9713aee.png" alt="" class="avatras" />
             </div>
 
             <div class="rights">
@@ -188,7 +188,6 @@ export default {
 <style scoped lang="scss">
 .SelectUser {
   height: 100%;
-  background: #fff;
   .header-content-bg {
     width: 100%;
     position: fixed;
@@ -205,6 +204,10 @@ export default {
 
   .header-middle {
     padding-bottom: 140px;
+    width: calc(100% - 64px);
+    margin: 16px 0 0 32px;
+    background-color: #fff;
+    border-radius: 16px;
     .hint {
       padding: 28px 20px 28px 32px;
       line-height: 56px;

src/project/weiyang/AppPhotoReport/AppPhotoReport.vue

@@ -1,7 +1,11 @@
 <template>
   <div class="photo-list">
+    <u-navbar back-icon-color="#000" title="居民上报" title-color="#000" title-width="300" title-size="32" 
+      :title-bold="true" :background="backgroundNavbar" :is-fixed="true" height="44"></u-navbar>
+    <div class="header-content-bg">
+      <img src="https://cdn.sinoecare.com/i/2024/07/12/6690a1303d423.png" alt="">
+    </div>
     <div class="photo-list__wrapper">
-
       <div class="photo-item" v-for="(item, index) in list" :key="index">
         <u-swipe-action @content-click="$linkTo('./PhotoDetail?id=' + item.id)" :index="item.id"
                         :options="itemOptions" @click="handleDelete">
@@ -44,6 +48,7 @@ import {mapState} from 'vuex'
 export default {
   name: "AppPhotoReport",
   appName: "居民上报",
+  customNavigation: true,
   data() {
     return {
       list: [],
@@ -51,7 +56,11 @@ export default {
       total: 0,
       itemOptions: [
         {text: '删除', style: {backgroundColor: '#f46'}}
-      ]
+      ],
+      backgroundNavbar: {
+        background: 'url(https://cdn.sinoecare.com/i/2024/07/12/6690a1309c7d3.png) no-repeat',
+        backgroundSize: 'cover',
+      },
     }
   },
 
@@ -113,7 +122,16 @@ export default {
 
 <style lang="scss">
 .photo-list {
-  padding: 24px 0 150px 0;
+  // padding: 24px 0 150px 0;
+  .header-content-bg {
+    width: 100%;
+    position: fixed;
+    z-index: -1;
+    img {
+      width: 100%;
+      height: 592px;
+    }
+  }
 
   .photo-item {
     width: 686px;

src/project/weiyang/AppPhotoReport/PhotoDetail.vue

@@ -1,5 +1,10 @@
 <template>
   <div class="photo-detail">
+    <u-navbar back-icon-color="#000" title="事件上报" title-color="#000" title-width="300" title-size="32" 
+      :title-bold="true" :background="backgroundNavbar" :is-fixed="true" height="44"></u-navbar>
+    <div class="header-content-bg">
+      <img src="https://cdn.sinoecare.com/i/2024/07/12/6690a1303d423.png" alt="">
+    </div>
     <AiGroup noBorder>
       <h2>{{ info.content }}</h2>
       <div class="status-name" :class="detailStatus.cls" v-text="detailStatus.label"/>
@@ -57,6 +62,7 @@
 <script>
 export default {
   appName: "居民上报详情",
+  customNavigation: true,
   data() {
     return {
       info: {},
@@ -64,8 +70,12 @@ export default {
       currentTab: 0,
       evaluation: {},
       id: '',
-      showEvaluation: false
-      // tabList: [{name:'办理进度'},{name:'我的评价'}]
+      showEvaluation: false,
+      // tabList: [{name:'办理进度'},{name:'我的评价'}],
+      backgroundNavbar: {
+        background: 'url(https://cdn.sinoecare.com/i/2024/07/12/6690a1309c7d3.png) no-repeat',
+        backgroundSize: 'cover',
+      },
     }
   },
   computed: {
@@ -147,7 +157,15 @@ export default {
   padding: 32px 0 160px;
   margin-bottom: 60px;
   background: #fff;
-
+  .header-content-bg {
+    width: 100%;
+    position: fixed;
+    z-index: -1;
+    img {
+      width: 100%;
+      height: 592px;
+    }
+  }
   h2 {
     width: calc(100% - 32px);
     line-height: 1.3;

src/project/weiyang/AppPhotoReport/PhotoForm.vue

@@ -1,5 +1,10 @@
 <template>
   <div class="album">
+    <u-navbar back-icon-color="#000" title="事件上报" title-color="#000" title-width="300" title-size="32" 
+      :title-bold="true" :background="backgroundNavbar" :is-fixed="true" height="44"></u-navbar>
+    <div class="header-content-bg">
+      <img src="https://cdn.sinoecare.com/i/2024/07/12/6690a1303d423.png" alt="">
+    </div>
     <div class="form-item__group">
       <div class="form-item">
         <div class="form-item__wrapper">
@@ -102,6 +107,7 @@ import {mapActions, mapState} from 'vuex'
 
 export default {
   appName: "上报事件",
+  customNavigation: true,
   data() {
     return {
       form: {
@@ -118,7 +124,11 @@ export default {
         files: []
       },
       dictList: [],
-      flag: false
+      flag: false,
+      backgroundNavbar: {
+        background: 'url(https://cdn.sinoecare.com/i/2024/07/12/6690a1309c7d3.png) no-repeat',
+        backgroundSize: 'cover',
+      },
     }
   },
 
@@ -246,7 +256,15 @@ export default {
 <style lang="scss">
 .album {
   padding-bottom: 140px;
-
+  .header-content-bg {
+    width: 100%;
+    position: fixed;
+    z-index: -1;
+    img {
+      width: 100%;
+      height: 592px;
+    }
+  }
   .form-item__group {
     margin-bottom: 24px;
     background: #fff;

src/project/weiyang/AppPhotoReport/PhotoResult.vue

@@ -1,5 +1,10 @@
 <template>
   <div class="result">
+    <u-navbar back-icon-color="#000" title="事件上报" title-color="#000" title-width="300" title-size="32" 
+      :title-bold="true" :background="backgroundNavbar" :is-fixed="true" height="44"></u-navbar>
+    <div class="header-content-bg">
+      <img src="https://cdn.sinoecare.com/i/2024/07/12/6690a1303d423.png" alt="">
+    </div>
     <image src="/static/img/result.png" />
     <h2>上报成功！</h2>
     <div class="result-btn" hover-class="text-hover" @click="back">前往查看</div>
@@ -9,9 +14,14 @@
 <script>
   export default {
     appName:"上报事件",
+    customNavigation: true,
     data () {
       return {
-        id: ''
+        id: '',
+        backgroundNavbar: {
+          background: 'url(https://cdn.sinoecare.com/i/2024/07/12/6690a1309c7d3.png) no-repeat',
+          backgroundSize: 'cover',
+        },
       }
     },
 
@@ -36,7 +46,15 @@
     box-sizing: border-box;
     text-align: center;
     background: #fff;
-
+    .header-content-bg {
+      width: 100%;
+      position: fixed;
+      z-index: -1;
+      img {
+        width: 100%;
+        height: 592px;
+      }
+    }
     image {
       width: 220px;
       height: 220px;