diff --git a/WebContent/WEB-INF/jsp/pc/activity/activityList.jsp b/WebContent/WEB-INF/jsp/pc/activity/activityList.jsp index 96411d5..6c714c2 100644 --- a/WebContent/WEB-INF/jsp/pc/activity/activityList.jsp +++ b/WebContent/WEB-INF/jsp/pc/activity/activityList.jsp @@ -93,8 +93,8 @@ - - + + + \ No newline at end of file diff --git a/WebContent/WEB-INF/jsp/pc/goods/goodsList.jsp b/WebContent/WEB-INF/jsp/pc/goods/goodsList.jsp index cffe882..6b441ab 100644 --- a/WebContent/WEB-INF/jsp/pc/goods/goodsList.jsp +++ b/WebContent/WEB-INF/jsp/pc/goods/goodsList.jsp @@ -36,8 +36,10 @@ 商品主图 商品标题 商品副标题 - 所属商家 - 商家店铺号 + 原价 + 现价 + 商家名称 + 商家地址 操作 @@ -84,8 +86,10 @@ '' + '' + data.rows[i].name + '' + '' + data.rows[i].description + '' + - '' + data.rows[i].sellerId + '' + - '' + data.rows[i].sellerId + '' + + '' + data.rows[i].primePrice + '' + + '' + data.rows[i].price + '' + + '' + data.rows[i].sellerName + '' + + '' + data.rows[i].sellerAddress + '' + '' + '修改' + '删除' + @@ -163,7 +167,7 @@ layer.confirm('您确定要删除该爆款商品吗？', { btn: ['确定', '取消'] }, function(index, layero) { - $.post("/zzhnc/goods/update", { + $.post("/zzhnc/goods/delete", { id: id }, function(data) { console.log(data) diff --git a/WebContent/WEB-INF/res/js/me.js b/WebContent/WEB-INF/res/js/me.js index 7810dc2..a16ffb9 100644 --- a/WebContent/WEB-INF/res/js/me.js +++ b/WebContent/WEB-INF/res/js/me.js @@ -1,48 +1,51 @@ // 转时间 - function toTime_G(v){ - if(v==null||v==""){ - return ""; - }else{ - var time = new Date(v) - var year = time.getFullYear() - var mon = time.getMonth() + 1; - var day = time.getDate(); - var hour = time.getHours(); - var min = time.getMinutes(); - if(mon < 10) mon = "0"+mon - if(day < 10) day = "0"+day - if(hour < 10) hour = "0"+hour - if(min < 10) min = "0"+min - return year+"-"+mon+"-"+day + " " + hour + ":" +min - } - - } - //获取Url参数 - function getUrl_G(name) { - var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i"); - var r = window.location.search.substr(1).match(reg); - if (r != null) return unescape(r[2]); return null; +function toTime_G(v) { + if(v == null || v == "") { + return ""; + } else { + var time = new Date(v) + var year = time.getFullYear() + var mon = time.getMonth() + 1; + var day = time.getDate(); + var hour = time.getHours(); + var min = time.getMinutes(); + if(mon < 10) mon = "0" + mon + if(day < 10) day = "0" + day + if(hour < 10) hour = "0" + hour + if(min < 10) min = "0" + min + return year + "-" + mon + "-" + day + " " + hour + ":" + min } - //限制字数，英文一个字节，中文两个字节 - function strlen(str) { - var len = 0; - for(var i = 0; i < str.length; i++) { - var c = str.charCodeAt(i); - //单字节加1 - if((c >= 0x0001 && c <= 0x007e) || (0xff60 <= c && c <= 0xff9f)) { - len++; - } else { - len += 2; - } +} + +//获取Url参数 +function getUrl_G(name) { + var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i"); + var r = window.location.search.substr(1).match(reg); + if(r != null) return unescape(r[2]); + return null; +} + +//限制字数，英文一个字节，中文两个字节 +function strlen(str) { + var len = 0; + for(var i = 0; i < str.length; i++) { + var c = str.charCodeAt(i); + //单字节加1 + if((c >= 0x0001 && c <= 0x007e) || (0xff60 <= c && c <= 0xff9f)) { + len++; + } else { + len += 2; } - return len; } - function toNull_G(){ - $("table td").each(function(){ - var v = $(this).html() - if( v== "" || v == null || v== "null" || v == undefined || v == "undefined"){ - v = "" - $(this).html(v) - } - }) - } \ No newline at end of file + return len; +} + +function toNull_G() { + $("table td").each(function() { + var v = $(this).html() + if(v == "" || v == null || v == "null" || v == undefined || v == "undefined") { + v = "" + $(this).html(v) + } + }) +} \ No newline at end of file