Merge branch 'xiaowang-social' into test

src/views/modules/volunteer/VoluntaryOrganization/index.vue

@@ -78,7 +78,7 @@
                             @click="handleshowMember(scope.row)">成员管理</el-button>
                         <el-button type="text" style="color:#1C6AFD;" size="small"
                             @click="handleDel(scope.row)">删除</el-button>
-                        <el-button v-if="scope.row.status == 'processing'&&scope.row.ischeck==1" type="text" style="color:#1C6AFD;" size="small"
+                        <el-button v-if="scope.row.status == 'processing'&&scope.row.isCheck == '1'" type="text" style="color:#1C6AFD;" size="small"
                             @click="handleprocessl(scope.row)">审核</el-button>
                     </template>
                 </el-table-column>

src/views/modules/volunteer/VoluntaryOrganization/process.vue

@@ -44,7 +44,7 @@
         <el-form-item label="组织介绍图" v-if="tableData.orgImage">
           <div class="demo-image__preview">
             <el-image style="width: 100px; height: 100px" :src="tableData.orgImage" :preview-src-list="[tableData.orgImage]">
-            </el-image>
+            </el-image> 
             <!-- <img v-if="tableData.orgImage" style="width: 100px; height: 100px" :src="[tableData.orgImage]"> -->
             </img>
           </div>