Merge branch 'feature' of http://120.46.222.128:10021/elink-star/epmet-work-pc into xiaowang-social

src/views/modules/volunteer/Dynamicmanagement/info.vue

@@ -25,9 +25,9 @@
              <el-form-item label="封面图片" label-width="150px" prop="flieList">
                          <template>
                             <div class="demo-image__preview">
-                                    <el-image style="width: 100px; height: 100px" :src="formData.coverImg"
+                                    <img style="width: 100px; height: 100px" :src="formData.coverImg"
                                         :preview-src-list="formData.coverImg">
-                                    </el-image>
+                                    </img>
                                 </div>
                          </template>
              </el-form-item>
@@ -43,18 +43,18 @@
           <el-col :span="24">
           <el-form-item  label="置顶 
           " disabled="false" style="display: block" prop="peopleCount" label-width="150px">
-              <el-switch v-model="formData.online" :active-value=1 :inactive-value=0
+              <el-switch v-model="formData.online" :active-value=1 :inactive-value=0 disabled="false"
                 ></el-switch>
             </el-form-item>
         </el-col>
           </el-row></el-form>
        </div>
-       <div class="div_btn">
+       <!-- <div class="div_btn">
           <el-button size="small" @click="handleCancle">取 消</el-button>
           <el-button size="small"  type="primary" 
              @click="handleComfirm">确 定</el-button>
  
-       </div>
+       </div> -->
     </div>
  </template>
  

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

@@ -75,9 +75,9 @@
                                 <!-- <upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList"  :file-list="formData.fileList"
                                  @file-removed="removedImg"></upload-image> -->
                                 <div class="demo-image__preview">
-                                    <el-image style="width: 100px; height: 100px" :src="formData.orgImage"
+                                    <img style="width: 100px; height: 100px" :src="formData.orgImage"
                                         :preview-src-list="srcList">
-                                    </el-image>
+                                    </img>
                                 </div>
                             </template>
                         </el-form-item>
@@ -101,9 +101,9 @@
                     <el-form-item label="品牌展示图" label-width="150px" prop="VolunteerPic">
                         <template>
                             <div class="demo-image__preview">
-                                    <el-image style="width: 100px; height: 100px" :src="formData.brandImg"
+                                    <img v-if="formData.brandImg" style="width: 100px; height: 100px" :src="formData.brandImg"
                                         :preview-src-list="srcList">
-                                    </el-image>
+                                    </img>
                                 </div>
                         </template>
                     </el-form-item>

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

@@ -35,8 +35,8 @@
         </el-form-item>
         <el-form-item label="附件">
           <div class="demo-image__preview">
-            <el-image style="width: 100px; height: 100px" :src="tableData.orgImage">
-            </el-image>
+            <img v-if="tableData.orgImage" style="width: 100px; height: 100px" :src="tableData.orgImage">
+            </img>
           </div>
           <!-- {{ tableData.address}} -->
         </el-form-item>
@@ -48,8 +48,8 @@
         </el-form-item>
         <el-form-item label="品牌展示图">
           <div class="demo-image__preview">
-            <el-image style="width: 100px; height: 100px" :src="tableData.brandImg">
-            </el-image>
+            <img v-if="tableData.brandImg" style="width: 100px; height: 100px" :src="tableData.brandImg">
+          </img>
           </div>
           <!-- {{ tableData.address}} -->
         </el-form-item>

src/views/modules/volunteer/VolunteerProjects/add.vue

@@ -755,7 +755,6 @@
     computed: {
         dataRule() {
             return {
- 
                 projectTitle: [
                     { required: true, message: '名称不能为空', trigger: 'blur' }
                 ],

src/views/modules/volunteer/VolunteerProjects/info.vue

@@ -42,8 +42,9 @@
             <el-col :span="12">
              <el-form-item label="项目展示图" label-width="150px" prop="fileList">
                          <template>
-                             <upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList"  :disabled="true"
-                                 @file-removed="removedImg"></upload-image>
+                            <img style="width: 100px; height: 100px" :src="formData.attachments[0].url" alt="">
+                             <!-- <upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList"  :disabled="true"
+                                 @file-removed="removedImg"></upload-image> -->
                          </template>
              </el-form-item>
           </el-col>