From 47869ed41d8a0d329f770f1654b3794ba601d098 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期日, 21 九月 2025 10:59:23 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/travel/travelInfo.vue | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/ruoyi-ui/src/views/travel/travelInfo.vue b/ruoyi-ui/src/views/travel/travelInfo.vue
index 154b539..94ae0bb 100644
--- a/ruoyi-ui/src/views/travel/travelInfo.vue
+++ b/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;
}
--
Gitblit v1.9.1