瀏覽代碼

修改上朵bug

wangxiaoming 7 年之前
父節點
當前提交
be058b5fc6

+ 8 - 7
tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/useIntegralMapper.xml

@@ -234,13 +234,13 @@
     <!--待入账积分列表查询-->
     <select id="listAdminStayIntegral" parameterType="StayIntegral" resultType="StayIntegral">
         SELECT
-        i.*, u.user_nickname,
-        u.user_name,
-        u.user_integral,
-        u.user_surplus_integral,
-        u.user_use_integral,
-        u.user_stay_integral,
-        ui.integral_remarks
+            i.*, u.user_nickname,
+            u.user_name,
+            u.user_integral,
+            u.user_surplus_integral,
+            u.user_use_integral,
+            u.user_stay_integral,
+            ui.integral_remarks
         FROM
         tb_iamberry_stay_integral i
         LEFT JOIN tb_iamberry_user_userinfo u ON i.user_openid = u.user_openid
@@ -268,6 +268,7 @@
                 AND  i.stay_number &gt;= #{changeIntegralMin}
             </if>
         </where>
+        ORDER BY stay_recorded_time DESC
     </select>
 
     <!--修改待入账积分状态-->

+ 3 - 2
tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/integralRecord/listIntegral.jsp

@@ -35,7 +35,7 @@
         class="Hui-iconfont">&#xe68f;</i></a>
 </nav>
 <div class="pd-20">
-    <form action="${pageContext.request.contextPath }/admin/userIntegral/listIntegral" method="post">
+    <form action="${pageContext.request.contextPath }/admin/userIntegral/listIntegral" method="post" style="margin-bottom: 20px;text-align: center;">
 
         <input name="userName" id="userName" value="${userName }" placeholder="会员姓名搜索" style="width: 150px" class="input-text" type="text">
         <input name="userNickName" id="userNickName" value="${userNickName }" placeholder="微信昵称搜索" style="width: 150px" class="input-text" type="text">
@@ -44,12 +44,13 @@
         <button name="" id="submitBtn" onclick="return dataCheck();" class="btn btn-success" type="submit">
             <i class="Hui-iconfont"></i> 搜索
         </button>
+
     </form>
     <form id="goodsform" >
         <table class="table table-border table-bordered table-bg">
             <thead>
             <tr>
-                <th scope="col" colspan="7">积分列表</th>
+                <th scope="col" colspan="7">积分记录列表</th>
             </tr>
             <tr class="text-c">
                 <th width="150">变动积分</th>

+ 22 - 26
tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/integralRecord/listStayIntegral.jsp

@@ -35,34 +35,32 @@
         class="Hui-iconfont">&#xe68f;</i></a>
 </nav>
 <div class="pd-20">
-    <form action="${pageContext.request.contextPath }/admin/userIntegral/listStayIntegral" method="post">
+    <form action="${pageContext.request.contextPath }/admin/userIntegral/listStayIntegral" method="post" style="margin-bottom: 20px;text-align: center;">
+
+        <span class="select-box" style="width: 150px;height: 31px;">
+            <select id="integralRemarks" name="integralRemarks" class="select" >
+                <option value="" >待入积分类型</option>
+                <option value="首次注册会员赠送" ${integralRemarks=='首次注册会员赠送'?'selected':''}>首次注册会员赠送</option>
+                <option value="微信商城下单赠送" ${integralRemarks=='微信商城下单赠送'?'selected':''}>微信商城下单赠送</option>
+                <option value="扫描产品唯一码赠送" ${integralRemarks=='扫描产品唯一码赠送'?'selected':''}>扫描产品唯一码赠送</option>
+            </select>
+        </span>
+
+         <span class="select-box" style="width: 150px;height: 31px;">
+            <select id="stayStatus" name="stayStatus" class="select" >
+                <option value="" >待入积分状态</option>
+                <option value="1" ${stayStatus=='1'?'selected':''}>待入账</option>
+                <option value="2" ${stayStatus=='2'?'selected':''}>已入账</option>
+                <option value="3" ${stayStatus=='3'?'selected':''}>订单取消/退货,撤回</option>
+                <option value="4" ${stayStatus=='4'?'selected':''}>取消</option>
+            </select>
+        </span>
 
-        <div class="formControls col-2">
-			 <span class="select-box">
-				<select id="integralRemarks" name="integralRemarks" class="select">
-					<option value="" >待入积分类型</option>
-					<option value="首次注册会员赠送" ${integralRemarks=='首次注册会员赠送'?'selected':''}>首次注册会员赠送</option>
-					<option value="微信商城下单赠送" ${integralRemarks=='微信商城下单赠送'?'selected':''}>微信商城下单赠送</option>
-					<option value="扫描产品唯一码赠送" ${integralRemarks=='扫描产品唯一码赠送'?'selected':''}>扫描产品唯一码赠送</option>
-				</select>
-			</span>
-        </div>
-        <div class="formControls col-2">
-			 <span class="select-box">
-				<select id="stayStatus" name="stayStatus" class="select">
-					<option value="" >待入积分状态</option>
-					<option value="1" ${stayStatus=='1'?'selected':''}>待入账</option>
-					<option value="2" ${stayStatus=='2'?'selected':''}>已入账</option>
-					<option value="3" ${stayStatus=='3'?'selected':''}>订单取消/退货,撤回</option>
-					<option value="4" ${stayStatus=='4'?'selected':''}>取消</option>
-				</select>
-			</span>
-        </div>
         <input name="userName" id="userName" value="${userName }" placeholder="会员姓名搜索" style="width: 150px" class="input-text" type="text">
 
         <input name="userNickName" id="userNickName" value="${userNickName }" placeholder="微信昵称搜索" style="width: 150px" class="input-text" type="text">
 
-        <input  id="beginDate" value="<fmt:formatDate value="${stayRecordedTime}" pattern="yyyy-MM-dd"/>" name="stayRecordedTime" class="input-text Wdate" placeholder="请选择入账日期" style="width: 150px;" type="text" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',maxDate:'2020-10-01'})" readonly><br>
+        <input  id="beginDate" value="<fmt:formatDate value="${stayRecordedTime}" pattern="yyyy-MM-dd"/>" name="stayRecordedTime" class="input-text Wdate" placeholder="请选择入账日期" style="width: 150px;" type="text" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',maxDate:'2020-10-01'})" readonly>
         <input name="changeIntegralMin" id="changeIntegralMin" value="${changeIntegralMin }" placeholder="变动积分数量" style="width: 150px" class="input-text" type="text" onkeyup="value=value.replace(/[^\d]/g,'')">-
         <input name="changeIntegralMax" id="changeIntegralMax" value="${changeIntegralMax }" placeholder="变动积分数量" style="width: 150px" class="input-text" type="text" onkeyup="value=value.replace(/[^\d]/g,'')">
 
@@ -74,7 +72,7 @@
         <table class="table table-border table-bordered table-bg">
             <thead>
             <tr>
-                <th scope="col" colspan="11">积分列表</th>
+                <th scope="col" colspan="11">待入账积分列表</th>
             </tr>
             <tr class="text-c">
                 <th width="150">变动积分</th>
@@ -86,7 +84,6 @@
                 <th width="100">会员累计积分</th>
                 <th width="100">待入账总积分</th>
                 <th width="100">会员可用积分</th>
-                <th width="100">系统记录时间</th>
                 <th width="100">操作</th>
             </tr>
             </thead>
@@ -121,7 +118,6 @@
                 <td>${infolist.userIntegral}</td>
                 <td>${infolist.userStayIntegral}</td>
                 <td>${infolist.userSurplusIntegral}</td>
-                <td><fmt:formatDate value="${infolist.stayCreateTime }" pattern="yyyy-MM-dd"/></td>
                 <td>
                     <c:if test="${infolist.stayStatus == 1 }">
                         <a id="updateId${infolist.stayId}" onclick="updateStatus(${infolist.stayId},4);">取消入账</a>

+ 45 - 35
tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/order/orderList.jsp

@@ -33,14 +33,7 @@
 		<form action="" method="post" class="form form-horizontal" id="form-admin-add">
 		<div class="layui-layer-title" id="sendOrderDivTitle" style="cursor: move;" move="ok">确认发货</div>
 		<br>
-		<div class="row cl">
-			<label class="form-label col-3"><span class="c-red"></span>&nbsp;&nbsp;物流编号:</label>
-			<div class="formControls col-5">
-				<input type="text" id="order-post-num-id" class="input-text" value="" placeholder="请输入物流编号" name="postNum" datatype="*2-16" nullmsg="用户名不能为空">
-			</div>
-			<div class="col-4"> </div>
-		</div>
-		<br>
+
 		<div class="row cl">
 			<label class="form-label col-3"><span class="c-red"></span>&nbsp;&nbsp;物流公司:</label>
 			<div class="formControls col-5"> <span class="select-box" style="width:150px;">
@@ -65,6 +58,15 @@
 				</span> </div>
 		</div>
 		<br>
+		<div class="row cl">
+			<label class="form-label col-3"><span class="c-red"></span>&nbsp;&nbsp;物流编号:</label>
+			<div class="formControls col-5">
+				<input type="text" id="order-post-num-id" class="input-text" value="" placeholder="请输入物流编号" name="postNum" datatype="*2-16" nullmsg="用户名不能为空">
+			</div>
+			<div class="col-4"> </div>
+		</div>
+		<br>
+
 		<div class="col-9 col-offset-3">
 	        <input class="btn btn-danger" onclick="return submitSendOrder()" type="submit" value="&nbsp;&nbsp;提交&nbsp;&nbsp;">
 	      </div>
@@ -123,37 +125,45 @@
 	</div>
 
 	<!-- 后台备注 -->
-	<div class="layui-layer layui-anim layui-layer-iframe" id="layui-remark" times="4" showtime="0" contype="string" style="display:none;z-index: 19891018; width: 400px; height: 260px; position: absolute; top: 100px; left: 379px;">
+	<div class="layui-layer layui-anim layui-layer-iframe" id="layui-remark" times="4" showtime="0" contype="string" style="display:none;z-index: 19891018; width: 600px; height: 400px; position: absolute; top: 100px; left: 379px;">
 		<form action="" method="post" class="form form-horizontal" id="form-admin-remark">
 		<div class="layui-layer-title" id="sendOrderNote" style="cursor: move;" move="ok">订单备注</div>
-		<br>
-		<div class="row cl">
-			<label class="form-label col-3"><span class="c-red">*</span>&nbsp;&nbsp;备注信息:</label>
-			<div class="formControls col-5">
-				<input type="text" class="input-text" value="" placeholder="请输入备注信息" id="remarkInfoInput" name="postNum" datatype="*2-16" nullmsg="用户名不能为空">(不超过100字)
+			<br>
+			<div class="row cl">
+				<label class="form-label col-3"><span class="c-red">*</span>&nbsp;&nbsp;备注颜色:</label>
+				<div class="formControls col-5"> <span class="select-box" style="width:150px;">
+					<select class="select" id="adminRemarkColor" size="1">
+						<option value="1" class="optionclass" id="optionclass1">红色</option>
+						<option value="2" class="optionclass" id="optionclass2">黄色</option>
+						<option value="3" class="optionclass" id="optionclass3">绿色</option>
+					</select>
+					</span>
+				</div>
 			</div>
-			<div class="col-4"> </div>
-		</div>
-		<br>
-		<div class="row cl">
-			<label class="form-label col-3"><span class="c-red">*</span>&nbsp;&nbsp;备注颜色:</label>
-			<div class="formControls col-5"> <span class="select-box" style="width:150px;">
-				<select class="select" id="adminRemarkColor" size="1">
-					<option value="1" class="optionclass" id="optionclass1">红色</option>
-					<option value="2" class="optionclass" id="optionclass2">黄色</option>
-					<option value="3" class="optionclass" id="optionclass3">绿色</option>
-				</select>
-				</span> </div>
-		</div>
-		<br>
-		<div class="col-9 col-offset-3">
-	        <input class="btn btn-danger" type="button" onclick="remrakSumbit()" value="&nbsp;&nbsp;提交&nbsp;&nbsp;">
-	      </div>
+
+			<br>
+			<div class="row cl">
+				<label class="form-label col-3"><span class="c-red">*</span>&nbsp;&nbsp;备注信息:</label>
+				<div class="formControls col-5">
+					 <textarea name="postNum" id="remarkInfoInput" cols="" rows="" class="textarea" style="width: 380px;height: 150px;"
+							   placeholder="订单备注,最多支持100字符" onKeyUp="$.Huitextarealength(this,100)" ></textarea>
+				</div>
+				<div class="col-4"> </div>
+			</div>
+			<br>
+
+			<div class="col-9 col-offset-3">
+	        	<input class="btn btn-danger" type="button" onclick="remrakSumbit()" value="&nbsp;&nbsp;提交&nbsp;&nbsp;">
+	      	</div>
+
 	    </form>
+
 		<span class="layui-layer-setwin">
 			<a class="layui-layer-ico layui-layer-close layui-layer-close1" onclick="exitWindowsDiv(this)" href="javascript:;"></a>
 		</span>
 	</div>
+
+
 	<nav class="breadcrumb">
 		<i class="Hui-iconfont">&#xe67f;</i> 
 		首页 <span class="c-gray en">&gt;</span>
@@ -276,11 +286,11 @@
 									</c:choose>
 								</td>
 								<td width="150"><fmt:formatDate value="${order.salesCreateDate }" pattern="MM-dd HH:mm" /></td>
-								<c:if test="${fn:length(order.salesAdminRemark)>'3'}">  
-	                   				<td title="${order.salesAdminRemark }" id="${order.salesOrderid }AdminRemark">${fn:substring(order.salesAdminRemark,0,3)}...</td>  
+								<c:if test="${fn:length(order.salesAdminRemark)>'5'}">
+	                   				<td title="${order.salesAdminRemark }" id="${order.salesOrderid }AdminRemark" style="text-align: center;">${fn:substring(order.salesAdminRemark,0,5)}...</td>
 				            	</c:if>  
-				          		<c:if test="${fn:length(order.salesAdminRemark)<='3'}">  
-				             		<td title="${order.salesAdminRemark }" id="${order.salesOrderid }AdminRemark">${order.salesAdminRemark}</td>  
+				          		<c:if test="${fn:length(order.salesAdminRemark)<='5'}">
+				             		<td title="${order.salesAdminRemark }" id="${order.salesOrderid }AdminRemark" style="text-align: center;">${order.salesAdminRemark}</td>
 				          		</c:if>
 								<td width="50">
 									<c:choose>

+ 35 - 13
tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/product/addProduct.jsp

@@ -25,14 +25,14 @@
 	<form action="${pageContext.request.contextPath }/admin/product/add" class="form form-horizontal" id="form-addGoods" method="POST" enctype="multipart/form-data">
 		<div class="row cl">
 			<label class="form-label col-2"><span class="c-red">*</span>产品名称:</label>
-			<div class="formControls col-4">
+			<div class="formControls col-3">
 				<input id="productName" name="productName" type="text" class="input-text" value="" placeholder="" >
 			</div>
 		</div>
 
 		<div class="row cl">
 			<label class="form-label col-2"><span class="c-red">*</span>产品类型:</label>
-			<div class="formControls col-2">
+			<div class="formControls col-3">
 				<span class="select-box">
 					<select id="typeId" name="productType.typeId" class="select">
 						<c:forEach items="${typeList}" var="type" varStatus="status">
@@ -57,6 +57,7 @@
 						<th width="100">销售价(元)</th>
 						<th width="100">69码</th>
 						<th width="100">PTS产品</th>
+						<th width="100">操作</th>
 					</tr>
 					</thead>
 					<tbody id="colorTableId">
@@ -86,17 +87,17 @@
 				<div  class="row cl">
 					<label class="form-label col-2 colorName"><span class="c-red">*</span>颜色名称:</label>
 					<div class="formControls col-3">
-						<input type="text" name="colorName" id="colorName" placeholder="" value="" class="input-text" style="width:150px;">
+						<input type="text" name="colorName" id="colorName" placeholder="" value="" class="input-text" style="">
 					</div>
 					<label class="form-label col-2 colorName"><span class="c-red">*</span>颜色简述:</label>
-					<div class="formControls col-1">
-						<input type="text" name="colorPresent" id="colorPresent" placeholder="" value="" class="input-text" style="width:150px;">
+					<div class="formControls col-3">
+						<input type="text" name="colorPresent" id="colorPresent" placeholder="" value="" class="input-text" style="">
 					</div>
 				</div>
 				<div  class="row cl">
 					<label class="form-label col-2 colorName"><span class="c-red">*</span>颜色状态:</label>
 					<div class="formControls col-3">
-						<select id="colorStatus" name="colorStatus" class="select">
+						<select id="colorStatus" name="colorStatus" class="select" style="height: 31px;">
 							<option value="1">在售</option>
 							<option value="2">停止销售</option>
 							<option value="3">删除</option>
@@ -106,23 +107,23 @@
 				<div  class="row cl">
 					<label class="form-label col-2 colorName"><span class="c-red">*</span>市场价:</label>
 					<div class="formControls col-3">
-						<input type="text" name="colorPrice" id="colorPrice" placeholder="" value="" class="input-text" style="width:150px;">
+						<input type="text" name="colorPrice" id="colorPrice" placeholder="" value="" class="input-text" style="">
 					</div>
 					<label class="form-label col-2 colorName"><span class="c-red">*</span>销售价:</label>
-					<div class="formControls col-1">
-						<input type="text" name="colorDiscount" id="colorDiscount" placeholder="" value="" class="input-text" style="width:150px;">
+					<div class="formControls col-3">
+						<input type="text" name="colorDiscount" id="colorDiscount" placeholder="" value="" class="input-text" style="">
 					</div>
 				</div>
 				<div  class="row cl">
 					<label class="form-label col-2 colorName"><span class="c-red">*</span>产品69码:</label>
 					<div class="formControls col-3">
-						<input type="text" name="color69Code" id="color69Code" placeholder="" value="" class="input-text" style="width:150px;">
+						<input type="text" name="color69Code" id="color69Code" placeholder="" value="" class="input-text" style="">
 					</div>
 				</div>
 				<div  class="row cl">
 					<label class="form-label col-2 colorName"><span class="c-red">*</span>PTS产品:</label>
 					<div class="formControls col-3">
-						<select id="ptsProductid" name="ptsProductid" class="select">
+						<select id="ptsProductid" name="ptsProductid" class="select" style="height: 31px;">
 							<c:forEach items="${toothInfo}" var="toothInfo">
 								<option value="${toothInfo.produceId}">${toothInfo.produceName }</option>
 							</c:forEach>
@@ -162,6 +163,8 @@
 			</div>
 		</div>
 
+
+
 		<div class="row cl">
 			<div class="col-10 col-offset-2">
 				<!-- <button onClick="return admin_addGoods();" class="btn btn-primary radius" type="submit"><i class="Hui-iconfont">&#xe632;</i> 保存</button> -->
@@ -404,16 +407,30 @@ function checkProduct(){
     var productName = $("#productName").val();
     if(productName == '' || productName == null){
         layer.msg("产品名称不能为空",{icon: 2,time:2000});
-        return;
+        return false;
     }
 
+    /*至少一种颜色*/
+    var colorHtml = $("#colorTableId").find("tr").html();
+    if(colorHtml == null || colorHtml == ""){
+        layer.msg("至少需要添加一种颜色",{icon: 2,time:2000});
+        return false;
+    }
 
 	//产品banner图名称验证
     var productBannerImg = $("#productBannerImg").val();
     if(productBannerImg == null || productBannerImg == ''){
         layer.msg("产品banner图不能为空",{icon: 2,time:2000});
-        return;
+        return false;
     }
+
+    /*产品图文必填*/
+    var desc = $("#productsInfoProductdesc").val();
+    if(desc == null || desc == ""){
+        layer.msg("产品图文不能为空",{icon: 2,time:2000});
+        return false;
+	}
+
 	/*//原价乘100 取整
 	$.each(colorPrice,function(n,index){
 		$(this).val(Math.round($(this).val() * 100));
@@ -576,10 +593,15 @@ function addColorTable(){
         '<td>'+$("#colorDiscount").val()+'</td>'+
         '<td>'+$("#color69Code").val()+'</td>'+
         '<td>'+ptsProductid+'</td>'+
+        '<td><a href="javascript:viod(0)" onclick="delColor(this)" style="color: #00d;">删除</a></td>'+
         '</tr>';
 		$("#colorTableId").append(colorTable);
 }
 
+function delColor(node){
+	$(node).parent().parent().remove();
+}
+
 
 </script>
 </body>