浏览代码

修复bug

Memory_LG 1 周之前
父节点
当前提交
d08a0bd4a1

+ 2 - 9
qmjszx-admin/src/main/resources/templates/system/site/add.html

@@ -118,17 +118,10 @@
         var inputName = event.currentTarget.id;
         var inputName = event.currentTarget.id;
         var existingValue = $("input[name='" + inputName + "']").val();
         var existingValue = $("input[name='" + inputName + "']").val();
         var fullUrl = data.response.url; // 获取完整的URL
         var fullUrl = data.response.url; // 获取完整的URL
-        var urlObject = new URL(fullUrl);
-        var relativePath = urlObject.pathname; // 获取路径部分
-        // var newBaseUrl = "http://192.168.4.27"; // 新的基URL
-        var newBaseUrl = "http://localhost"; // 新的基URL
-        var absoluteUrl = newBaseUrl + relativePath; // 拼接完整的URL
-
-        // 如果已经存在值,则在后面加上逗号分隔的新值
         if (existingValue) {
         if (existingValue) {
-            $("input[name='" + inputName + "']").val(existingValue + ',' + absoluteUrl);
+            $("input[name='" + inputName + "']").val(existingValue + ',' + fullUrl);
         } else {
         } else {
-            $("input[name='" + inputName + "']").val(absoluteUrl);
+            $("input[name='" + inputName + "']").val(fullUrl);
         }
         }
     }).on('fileremoved', function (event, key, jqXHR, pd) {
     }).on('fileremoved', function (event, key, jqXHR, pd) {
         var inputName = event.currentTarget.id;
         var inputName = event.currentTarget.id;

+ 2 - 9
qmjszx-admin/src/main/resources/templates/system/site/edit.html

@@ -132,17 +132,10 @@
             var inputName = event.currentTarget.id;
             var inputName = event.currentTarget.id;
             var existingValue = $("input[name='" + inputName + "']").val();
             var existingValue = $("input[name='" + inputName + "']").val();
             var fullUrl = data.response.url; // 获取完整的URL
             var fullUrl = data.response.url; // 获取完整的URL
-            var urlObject = new URL(fullUrl);
-            var relativePath = urlObject.pathname; // 获取路径部分
-            // var newBaseUrl = "http://192.168.4.27"; // 新的基URL
-            var newBaseUrl = "http://localhost"; // 新的基URL
-            var absoluteUrl = newBaseUrl + relativePath; // 拼接完整的URL
-
-            // 如果已经存在值,则在后面加上逗号分隔的新值
             if (existingValue) {
             if (existingValue) {
-                $("input[name='" + inputName + "']").val(existingValue + ',' + absoluteUrl);
+                $("input[name='" + inputName + "']").val(existingValue + ',' + fullUrl);
             } else {
             } else {
-                $("input[name='" + inputName + "']").val(absoluteUrl);
+                $("input[name='" + inputName + "']").val(fullUrl);
             }
             }
         }).on('fileremoved', function (event, id, index) {
         }).on('fileremoved', function (event, id, index) {
             var inputName = event.currentTarget.id;
             var inputName = event.currentTarget.id;

+ 2 - 8
qmjszx-admin/src/main/resources/templates/system/venue/add.html

@@ -108,17 +108,11 @@
             var inputName = event.currentTarget.id;
             var inputName = event.currentTarget.id;
             var existingValue = $("input[name='" + inputName + "']").val();
             var existingValue = $("input[name='" + inputName + "']").val();
             var fullUrl = data.response.url; // 获取完整的URL
             var fullUrl = data.response.url; // 获取完整的URL
-            var urlObject = new URL(fullUrl);
-            var relativePath = urlObject.pathname; // 获取路径部分
-            // var newBaseUrl = "http://192.168.4.27"; // 新的基URL
-            var newBaseUrl = "http://localhost"; // 新的基URL
-            var absoluteUrl = newBaseUrl + relativePath; // 拼接完整的URL
 
 
-            // 如果已经存在值,则在后面加上逗号分隔的新值
             if (existingValue) {
             if (existingValue) {
-                $("input[name='" + inputName + "']").val(existingValue + ',' + absoluteUrl);
+                $("input[name='" + inputName + "']").val(existingValue + ',' + fullUrl);
             } else {
             } else {
-                $("input[name='" + inputName + "']").val(absoluteUrl);
+                $("input[name='" + inputName + "']").val(fullUrl);
             }
             }
         }).on('fileremoved', function (event, key, jqXHR, pd) {
         }).on('fileremoved', function (event, key, jqXHR, pd) {
             var inputName = event.currentTarget.id;
             var inputName = event.currentTarget.id;

+ 2 - 9
qmjszx-admin/src/main/resources/templates/system/venue/edit.html

@@ -119,17 +119,10 @@
             var inputName = event.currentTarget.id;
             var inputName = event.currentTarget.id;
             var existingValue = $("input[name='" + inputName + "']").val();
             var existingValue = $("input[name='" + inputName + "']").val();
             var fullUrl = data.response.url; // 获取完整的URL
             var fullUrl = data.response.url; // 获取完整的URL
-            var urlObject = new URL(fullUrl);
-            var relativePath = urlObject.pathname; // 获取路径部分
-            // var newBaseUrl = "http://192.168.4.27"; // 新的基URL
-            var newBaseUrl = "http://localhost"; // 新的基URL
-            var absoluteUrl = newBaseUrl + relativePath; // 拼接完整的URL
-
-            // 如果已经存在值,则在后面加上逗号分隔的新值
             if (existingValue) {
             if (existingValue) {
-                $("input[name='" + inputName + "']").val(existingValue + ',' + absoluteUrl);
+                $("input[name='" + inputName + "']").val(existingValue + ',' + fullUrl);
             } else {
             } else {
-                $("input[name='" + inputName + "']").val(absoluteUrl);
+                $("input[name='" + inputName + "']").val(fullUrl);
             }
             }
         }).on('fileremoved', function (event, id, index) {
         }).on('fileremoved', function (event, id, index) {
             var inputName = event.currentTarget.id;
             var inputName = event.currentTarget.id;

+ 2 - 0
qmjszx-business/src/main/java/beilv/usermembershipcard/domain/UserMembershipCard.java

@@ -81,6 +81,8 @@ public class UserMembershipCard extends BaseEntity {
     //卡种类型
     //卡种类型
     private String cardTypeLable;
     private String cardTypeLable;
 
 
+    private String notes;
+
     /**
     /**
      * 购卡	1
      * 购卡	1
      * 退卡	2
      * 退卡	2

+ 5 - 2
qmjszx-business/src/main/resources/mapper/card/UserMembershipCardMapper.xml

@@ -17,10 +17,11 @@
         <result property="updateTime" column="update_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="userName" column="username"/>
         <result property="userName" column="username"/>
         <result property="mobile" column="mobile"/>
         <result property="mobile" column="mobile"/>
-        <result property="cardName" column="cardName"/>
         <result property="state" column="state"/>
         <result property="state" column="state"/>
         <result property="cardType" column="card_type"/>
         <result property="cardType" column="card_type"/>
         <result property="cardInfoId" column="card_info_id"/>
         <result property="cardInfoId" column="card_info_id"/>
+        <result property="cardName" column="card_name"/>
+        <result property="notes" column="notes"/>
     </resultMap>
     </resultMap>
 
 
     <sql id="selectUserMembershipCardVo">
     <sql id="selectUserMembershipCardVo">
@@ -48,7 +49,9 @@
         a.state,
         a.state,
         a.card_info_id,
         a.card_info_id,
         c.total_number,
         c.total_number,
-        c.type card_type
+        c.type card_type,
+        c.name card_name,
+        c.notes
         FROM
         FROM
         user_membership_card a
         user_membership_card a
         inner join sys_member b on a.user_id = b.id
         inner join sys_member b on a.user_id = b.id