Merge branch '2.0.0' of http://git.ycjcjy.com/fuxingfan/smartCommunity into 2.0.0

CODE/smart-community/operate-api/src/main/resources/mapper/TaFeedbackMapper.xml

@@ -192,6 +192,6 @@
         and handle_status like CONCAT('%', #{handleStatus,jdbcType=VARCHAR}, '%')
       </if>
     </where>
-    ORDER BY create_date desc
+    ORDER BY handle_status =2 DESC,handle_status = 3 DESC, handle_status = 1 DESC,create_date DESC
   </select>
 </mapper>

VUECODE/smart-property-manage/src/views/social/transaction/index.vue

@@ -15,7 +15,7 @@
         <el-select v-model="listQuery.status" placeholder="请选择">
          <el-option label="选择状态" value="" />
          <el-option label="议事大厅" value="0"/>
-         <el-option label="友令互助" value="1"/>
+         <el-option label="友邻互助" value="1"/>
          <el-option label="二手租赁" value="2"/>
          <el-option label="其他" value="3"/>
         </el-select>
@@ -45,7 +45,7 @@
        <el-table-column prop="type" label="话题类型" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.type=='0'">议事大厅</span>
-            <span v-if="scope.row.type=='1'">友令互助</span>
+            <span v-if="scope.row.type=='1'">友邻互助</span>
             <span v-if="scope.row.type=='2'">二手租赁</span>
             <span v-if="scope.row.type=='3'">其他</span>
             </template>

VUECODE/smart-property-manage/src/views/social/transaction/transactionAdd.vue

@@ -5,7 +5,7 @@
     <el-form-item class="filter-item" label="话题类型" prop="type">
       <el-select v-model="ruleForm.type" placeholder="请选择">
          <el-option label="议事大厅(投诉，建议，表扬，社区明星评比，业委员会选举，组织活动等)" value="0"/>
-         <el-option label="友令互助(借物，宠物寄养，搭伙用餐，搭手帮忙，邻里提醒，组织春游等)" value="1"/>
+         <el-option label="友邻互助(借物，宠物寄养，搭伙用餐，搭手帮忙，邻里提醒，组织春游等)" value="1"/>
          <!-- -1包括，二手，租赁，求购 -->
          <el-option label="二手租赁(咸鱼太贵，快递费太贵，想租个车位？小区里面就能买卖)" value="2"/>
          <el-option label="其他(还有其他的？畅所欲言吧)" value="3"/>

VUECODE/smart-property-manage/src/views/social/transaction/transactionDetails.vue

@@ -3,7 +3,7 @@
     <el-form ref="form" label-width="100px" label-position="left">
       <el-form-item label="话题类型">
          <span v-if="ruleForm.type==='0'">{{'议事大厅'}}</span>
-         <span v-if="ruleForm.type==='1'">{{'邻里互助'}}</span>
+         <span v-if="ruleForm.type==='1'">{{'友邻互助'}}</span>
          <span v-if="ruleForm.type==='2'">{{'二手/租赁'}}</span>
          <span v-if="ruleForm.type==='3'">{{'其他话题'}}</span>
       </el-form-item>

VUECODE/smart-property-manage/src/views/social/transaction/transactionEdit.vue

@@ -5,7 +5,7 @@
         <el-select v-model="ruleForm.type" placeholder="请选择">
          <el-option label="选择状态" value="" />
          <el-option label="议事大厅" value="0"/>
-         <el-option label="友令互助" value="1"/>
+         <el-option label="友邻互助" value="1"/>
          <!-- -1包括，二手，租赁，求购 -->
          <el-option label="二手租赁" value="2"/>
          <el-option label="其他" value="3"/>