Merge remote-tracking branch 'origin/dev' into dev

src/apps/AppIntegralAudit/detail.vue

@@ -9,7 +9,7 @@
         <div class="time">2020-05-06 13:45</div>
         <div class="address">
           <img src="./img/address.png" alt="">
-          <div>新港镇三联村</div>
+          <span>新港镇三联村</span>
         </div>
       </div>
       <div class="detail-text">

src/components/AiOpenData.vue

@@ -1,5 +1,5 @@
 <template>
-  <div :type="type" :openid="oid"/>
+  <div :type="type" :openid="oid" v-text="oid"/>
 </template>
 
 <script>

src/components/pages/selectGird.vue

@@ -219,7 +219,7 @@ export default {
         .imges {
           display: flex;
           align-items: center;
-          // width: 200px;
+          width: 158px;
           .imgselect {
             width: 48px;
             height: 48px;

src/saas/AppConflictMediation/Content.vue

@@ -3,7 +3,12 @@
     <div class="contents">
       <u-form :model="forms" ref="uForm" label-width="auto" :border-bottom="false">
         <u-form-item label="转交给" prop="status" required :border-bottom="false" right-icon="arrow-right" class="first-form" v-if="status == 4">
-          <u-input v-model="forms.name" placeholder="请选择转交对象" @click="toSelectUser" disabled />
+          <!-- <u-input v-model="forms.name" placeholder="请选择转交对象" @click="toSelectUser" disabled /> -->
+          <div @click="toSelectUser" style="width: 100%; text-align: right;">
+            <span v-if="!forms.name" style="color:#999;">请选择</span>
+            <AiOpenData v-if="forms.name" type="userName" :openid="forms.name" style="display:inline-block;"/>
+          </div>
+          
         </u-form-item>
         <u-form-item label="事件分类" prop="groupName" required :border-bottom="false" right-icon="arrow-right" v-if="status != 2">
 
@@ -57,7 +62,8 @@ export default {
       myList: [],
       id: '',
       selectUser: {},
-      titleList: ['', '转交事件', '我已办结']
+      titleList: ['', '', '事件处理', '', '事件转交'],
+
     }
   },
   onLoad(option) {

src/saas/AppConflictMediation/List.vue

@@ -165,6 +165,7 @@ export default {
             this.staticName[2].value = res.data['已办数']
             this.staticName[3].value = res.data['今日办结']
           })
+          this.$forceUpdate()
         }
       })
     },

src/saas/AppConflictMediation/SelectUser.vue

@@ -252,13 +252,12 @@ export default {
         .rightes {
           width: calc(100% - 160px);
           display: flex;
-          justify-content: space-between;
           align-items: center;
           margin-left: 32px;
           border-bottom: 1px solid #e4e5e6;
 
           .applicationNames {
-            max-width: calc(100% - 80px);
+            width: 460px;
             font-size: 36px;
             font-weight: 500;
             color: #333333;

src/saas/AppConflictMediation/add.vue

@@ -120,7 +120,7 @@
 import { mapState } from 'vuex'
 
 export default {
-  appName: '矛盾调解',
+  appName: '新增事件',
   data() {
     return {
       isShowType: false,
@@ -151,6 +151,10 @@ export default {
     ...mapState(['user']),
   },
 
+  onShow() {
+    document.title = '新增事件'
+  },
+
   onLoad() {
     this.getDict()
     this.form.phone = this.user.phone
@@ -259,6 +263,7 @@ export default {
           this.flag = false
           if (res.code == 0) {
             uni.$emit('update')
+            this.$forceUpdate()
             setTimeout(() => {
               uni.navigateBack()
             }, 600)
@@ -412,5 +417,9 @@ export default {
     text-align: center;
     color: #ffffff;
   }
+  ::v-deep AiUploader {
+    width: 80px;
+    height: 80px;
+  }
 }
 </style>