From a2b4eab4e34bcbdd2be9f65c2624900d2e483565 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 16 十月 2023 14:31:44 +0800
Subject: [PATCH] 门票管理
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_edit.html | 3 +
cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js | 23 +++++++++--
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java | 13 +++++-
cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_edit.html | 37 +++++++++++++-----
4 files changed, 57 insertions(+), 19 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
index a1cbbd4..4a72ddc 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
@@ -573,11 +573,18 @@
PointMercharsVo pointMercharsVo = pointMercharsClient.queryPointMerchaseDetailOfId(id);
System.out.println("pointMercharsVo:"+pointMercharsVo);
String[] split = pointMercharsVo.getPics().split(",");
- List<String> list = Arrays.asList(split);
+ StringBuilder concatenatedString = new StringBuilder();
+ for (String element : split) {
+ concatenatedString.append(element).append(",");
+ }
+ // 去除末尾的逗号
+ if (concatenatedString.length() > 0) {
+ concatenatedString.setLength(concatenatedString.length() - 1);
+ }
+ String result = concatenatedString.toString();
model.addAttribute("id",id);
model.addAttribute("item",pointMercharsVo);
- model.addAttribute("pictures",list);
- System.out.println(list);
+ model.addAttribute("pictures",result);
return PREFIX + "TGoods_edit.html";
}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_edit.html
index 0d43e8b..515ff7f 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_edit.html
@@ -53,25 +53,21 @@
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-3 control-label">商品图片(请上传不超过五张图片): </label>
- <div class="col-sm-2" style="width: 100%;margin-left: 24%;margin-top: 1%">
- <div class="avatar-uploader" style="display: flex;">
- @for(im in pictures){
- <div style="margin-right: 16px;position: relative">
- <img height="100px" width="100px" src="${im}">
- <i class="el-icon-delete" onclick="delImg(this)" style="color: red;font-size: 18px;position: absolute;left: 0;right: 0;top: 0;bottom: 0"></i>
- </div>
- @}
+ <div class="col-sm-2" style="width: 100%;margin-left: 11%;margin-top: 1%">
<el-upload
:limit="5"
class="avatar-uploader"
action="/tCouponManage/uploadPic"
list-type="picture-card"
- accept=".jpg,.jpeg,.png,.JPG,.JPEG"
+ accept="."
+ :file-list="imageUrl2"
:on-success="handleAvatarSuccess"
:on-remove="handleRemove">
<i class="el-icon-plus"></i>
</el-upload>
- </div>
+ <el-dialog :visible.sync="dialogVisible">
+ <img width="100%" :src="imageUrl2" alt="">
+ </el-dialog>
</div>
</div>
@@ -126,16 +122,20 @@
<link rel="stylesheet" href="${ctxPath}/js/elementui/index.css">
<script src="${ctxPath}/modular/system/tGoods/tGoods_info.js"></script>
<script>
+ let id = "${pictures}"
+ let obj = []
var vue2 = new Vue({
el: '#app',
data: {
autoUpload: true,//自动上传
imageUrl1: '',//模型数据，用于上传图片完成后图片预览
+ imageUrl2: [],
dialogVisible: false
},
methods: {
handleAvatarSuccess(res, file) {
- TGoodsInfoDlg.goodsPicArray.push(file.response);
+ file.url =file.response
+ TGoodsInfoDlg.goodsPicArray.push(file);
},
beforeAvatarUpload(file) {
const isLt2M = file.size / 1024 / 1024 < 10;
@@ -149,8 +149,23 @@
return item.uid != file.uid;
});
},
+ changeImg(){
+ var i = id.split(",")
+ for (let j = 0; j <i.length; j++) {
+ let obj={
+ fileName:i[j],
+ uuid:i[j],
+ url:i[j],
+ response:i[j],
+ }
+ this.imageUrl2.push(obj)
+ }
+ },
},
created() {
+ this.changeImg()
+ TGoodsInfoDlg.goodsPicArray = this.imageUrl2
+ console.log(TGoodsInfoDlg.goodsPicArray)
},
});
</script>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_edit.html
index 735ca1a..bd601b6 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_edit.html
@@ -251,7 +251,8 @@
<script>
let id = "${list.imgs}"
let obj = []
-
+ console.log("看看")
+ console.log(id)
var vue2 = new Vue({
el: '#app1',
props: {
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js
index 80a09d1..fa5f676 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js
@@ -815,10 +815,25 @@
TGoodsInfoDlg.editSubmit = function() {
let cover = $("#cover").val();
let goodsId = $("#goodsId").val();
- var productImages = "";
- if (TGoodsInfoDlg.goodsPicArray.length > 0){
- productImages = TGoodsInfoDlg.goodsPicArray.join(',');
+ var goodImgs = TGoodsInfoDlg.goodsPicArray;
+
+ if(goodImgs.length==0){
+ Feng.info("请上传实景图")
+ return;
}
+ var imgOne ="";
+ console.log(goodImgs)
+ console.log(goodImgs.length)
+ for (let i = 0; i <goodImgs.length; i++) {
+ console.log(goodImgs[i].response,11)
+ if(i==goodImgs.length-1){
+ imgOne += (goodImgs[i].response)
+ }else {
+ imgOne+=(goodImgs[i].response+",")
+ }
+ }
+ console.log("结果图片")
+ console.log(imgOne)
let quantityIssued = $("#quantityIssued").val();
let pickUpQuantity = $("#pickUpQuantity").val();
let editor = jQuery.trim(TGoodsInfoDlg.editor.getContent());
@@ -858,7 +873,7 @@
ajax.set("pickUpQuantity",pickUpQuantity);
ajax.set("redemptionInstructions",editor);
ajax.set("cover",cover);
- ajax.set("productImages",productImages);
+ ajax.set("productImages",imgOne);
ajax.set("sort",sort);
ajax.start();
}
--
Gitblit v1.7.1