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

yz3456

2024-03-26 eaafe26cb6aa070b002037ede1c7de74b6b5600b

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

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

@@ -119,7 +119,7 @@
                    alt=""
                    style="width: 35px; height: 35px;"
                    fit="cover"
                    v-if="!scope.row.url "
                    v-if="scope.row.url"
                  >
                  <img
                    class="el-upload-list__item-thumbnail"
@@ -127,7 +127,7 @@
                    alt=""
                    style="width: 35px; height: 35px;"
                    fit="cover"
                    v-if="scope.row.url "
                    v-if="!scope.row.url"
                  >
                </template>
              </el-table-column>
@@ -770,6 +770,7 @@

      listTravelPrice(this.queryParams).then(response => {
        this.travelpriceList = response.data.data;
        //alert(this.travelpriceList.url)
        console.log("0000")
        console.log(this.travelpriceList)
        this.total = response.data.total;
@@ -781,6 +782,7 @@
        const promises = [];
        for (const item of this.travelpriceList) {
          const promise = listTravelBase({ cid: item.id }).then(result => {
              console.log(result.data)
            travelBaseMap[item.id] = result.data;
          });
          promises.push(promise);

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

@@ -302,15 +302,24 @@
            let pth = paths[i].substr(paths[i].length - 4, paths[i].length)

            if (_this.fot.includes(pth) === true)
            {
                if(paths[i].includes("https"))
                _this.fileList.push({name:paths[i],url: paths[i]})
                else
              _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
              }
            else {
              // alert(paths[i])
              if(paths[i].includes("https"))
              _this.fileListOther.push({name:paths[i],url: paths[i]})
              else{
              let nms = paths[i].split("\/")
              let nm = nms[nms.length - 1]
              _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
            }
          }
        }
        }
        this.loading = false;
      });
    }