Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

fei

2025-09-21 47869ed41d8a0d329f770f1654b3794ba601d098

 ruoyi-ui/src/views/travel/travelInfo.vue

@@ -22,8 +22,8 @@
          <el-input v-model="formData.address" placeholder="请输入地点" clearable :style="{width: '100%'}" :disabled="dsb">
          </el-input>
        </el-form-item>
        <el-form-item label="建筑" prop="scenic">
          <el-input v-model="formData.scenic" placeholder="请输入建筑" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
        <el-form-item label="标题" prop="scenic">
          <el-input v-model="formData.scenic" placeholder="请输入标题" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
        </el-form-item>


@@ -36,8 +36,12 @@
          </el-input>
        </el-form-item>
        <el-form-item label="住宿费用" prop="stay">
        <el-input v-model="formData.stay" placeholder="请输入地点" type="number" clearable :style="{width: '100%'}" :disabled="dsb">
        <el-input v-model="formData.stay" placeholder="请输入住宿费用" type="number" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="购物费用" prop="shop">
      <el-input v-model="formData.shop" placeholder="请输入购物费用" type="number" clearable :style="{width: '100%'}" :disabled="dsb">
      </el-input>
      </el-form-item>
        <el-form-item label="餐费" prop="eat">
        <el-input v-model="formData.eat" placeholder="请输入地点"  type="number" clearable :style="{width: '100%'}" :disabled="dsb">
@@ -77,9 +81,9 @@
          multiple



          :limit="100"
        ref="upload"
                      :show-file-list="true"
        :show-file-list="true"
        :http-request="requestUpload"
               :file-list="fileList"
             :on-change="handleChange"
@@ -167,7 +171,7 @@
            ></video>
            <img v-else
                 class="el-upload-list__item-thumbnail"
                 src="../../assets/401_images/401.gif"
                 src="../../assets/images/deviceLis.png"
                 alt=""
                 style="width: 147px; height: 147px"
                 fit="cover">
@@ -330,7 +334,7 @@
      if(paths[i]!="") {

          let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
      //   alert(pth)
         // alert(pth)
          if (_this.fot.includes(pth) === true)
         {
            if(paths[i].includes("https"))
@@ -582,17 +586,20 @@
    //自定义上传方法
        handleChange(file, fileList1) {
           //定义一个全局数组uploadFileList来做存储

console.log(file)
         // this.uploadFileList.push(file.raw);
          console.log("=========5555=========")
          console.log(file.raw)
         this.uploadFileList.push(file.raw);
          this.fileList.push({name:file.name,url:file.url,res:true})
       //  alert(23)
        },
       //自定义上传方法
       handleChange1(file, fileListOther12) {
              //定义一个全局数组uploadFileList来做存储

            // this.uploadFileList.push(file.raw);

           this.uploadFileList1.push(file.raw);
            this.fileListOther.push({name:file.name,url:file.url,res:true})
             console.log("=========5555=========")
@@ -622,6 +629,7 @@
          uploadPic(formData).then(response => {
          _this.uploadFileList1 = []
            _this.formData.url = _this.formData.url+","+response.fileNames

              updateTravelBase(_this.formData).then(response => {
                this.$modal.msgSuccess("文档上传成功");
                // this.open = false;
@@ -670,6 +678,9 @@
       //   alert(response.fileNames)
              _this.formData.url = _this.formData.url+","+response.fileNames
          _this.uploadFileList = []
        alert(response.urls)
              alert(_this.formData.url)
              alert(response.fileNames)
             // alert(87)
              updateTravelBase(_this.formData).then(response => {
                _this.$modal.msgSuccess("图片上传成功");
@@ -714,6 +725,14 @@
</script>

<style scoped>
   .el-table__row.statistics-warning-row {
     background: #E0EEFE;

   }
   .el-table__row.statistics-warning-row1 {
     background: #FFEFF2;

   }
.app-container{
  background-color: #FEF7FC;
}