Merge remote-tracking branch 'origin/master'

linwenling

2023-08-08 49bf04d7865d999463a024b82a6cd7608bb89507

 ruoyi-ui/src/views/wish/wishInfo.vue

@@ -58,7 +58,7 @@
            </el-cow>
            <el-cow >
              <el-form-item label="是否依旧有效" prop="isEffective" label-width="100px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-select v-model="formData.isEffective" placeholder="请选择是否依旧有效" clearable :style="{width: '100%'}"  >
                <el-select v-model="formData.isEffective" placeholder="请选择是否依旧有效" clearable :style="{width: '100%'}"  :disabled="dsb">
                  <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
                  ></el-option>
                </el-select>
@@ -91,14 +91,14 @@
            >
            <span class="el-upload-list__item-actions" >
            <span
              v-if="isShow"

              class="el-upload-list__item-preview"
              @click="handlePictureCardPreview(file)"
            >
              <i class="el-icon-zoom-in"></i>
            </span>
            <span
              v-if="isShow"

              class="el-upload-list__item-delete"
              @click="handleDownload(file.url)"
            >
@@ -140,14 +140,14 @@
              fit="cover"
            >
            <span class="el-upload-list__item-actions">
                    <span v-if="isShow"
                    <span
                          class="el-upload-list__item-preview"
                          @click="handleFileCardPreview(file)"
                    >
                      <i class="el-icon-zoom-in"></i>
                    </span>
                    <span
                      v-if="isShow"

                      class="el-upload-list__item-delete"
                      @click="handleDownload(file.url)"
                    >
@@ -288,7 +288,7 @@
    else{
      document.title = "百年心愿详细信息";
      this.$route.meta.title = "百年心愿详细信息";//列表的名称
      this.isShow=true
      this.isShow=false
    }

    let _this = this