Merge branch 'shenzi'

# Conflicts:
#	WebContent/WEB-INF/jsp/pc/activity/activityList.jsp

WebContent/WEB-INF/jsp/pc/activity/activityEdit.jsp

@@ -62,7 +62,7 @@
 					</div>
 				</div>
 				<div class="layui-form-item">
-					<label class="layui-form-label">文章内容</label>
+					<label class="layui-form-label"><i class="redrequired">*</i>文章内容</label>
 					<div class="layui-input-block" style="margin-left: 130px;"> 
 						<!-- 加载编辑器的容器 -->
 						<script id="container" name="content" type="text/plain">
@@ -121,7 +121,7 @@
 							})
 							$("[name=type]").val(data.data.type);
 							$("[name=imgurl]").val(data.data.imgurl);
-							$(".mainpictrue").attr("src", data.data.imgurl).css("margin-top", "15px");
+							$(".mainpictrue").attr("src", data.data.imgurl).css("margin", "15px 0");
 							form.render();
 						}
 					})
@@ -140,7 +140,7 @@
 						console.log(data)
 						if(data.code == 0) {
 							$("[name=imgurl]").val(data.data.imgurl);
-							$(".mainpictrue").attr("src", data.data.imgurl).css("margin-top", "15px");
+							$(".mainpictrue").attr("src", data.data.imgurl).css("margin", "15px 0");
 						} else {
 							return layer.msg('上传失败');
 						}
@@ -211,7 +211,7 @@
 					$("[name=content]").val("");
 					$("[name=type]").val("");
 					$("[name=imgurl]").val("");
-					$(".mainpictrue").attr("src", "").css("margin-top", "0");
+					$(".mainpictrue").attr("src", "").css("margin", "0");
 					form.render();
 				})
 

WebContent/WEB-INF/jsp/pc/goods/goodsEdit.jsp

@@ -24,10 +24,23 @@
 					<label class="layui-form-label"><i class="redrequired">*</i>上传主图</label>
 					<div class="layui-input-inline" style="width: 400px;">
 						<div class="layui-upload">
-							<button type="button" class="layui-btn" id="upload">上传主图</button>
+							<button type="button" class="layui-btn" id="uploadImg">上传主图</button>
 							<span class="layui-form-mid layui-word-aux">建议尺寸：200*200</span>
 							<div class="layui-upload-list">
-								<img class="layui-upload-img mainpictrue" src="">
+								<img class="layui-upload-img imgPic" src="">
+								<input type="text" style="display:none;" name="imageUrl" lay-verify="required">
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="layui-form-item">
+					<label class="layui-form-label"><i class="redrequired">*</i>上传详情图</label>
+					<div class="layui-input-inline" style="width: 400px;">
+						<div class="layui-upload">
+							<button type="button" class="layui-btn" id="uploadBanner">上传详情图</button>
+							<span class="layui-form-mid layui-word-aux">建议尺寸：750*440</span>
+							<div class="layui-upload-list">
+								<img class="layui-upload-img bannerPic" src="">
 								<input type="text" style="display:none;" name="bannerUrl" lay-verify="required">
 							</div>
 						</div>
@@ -80,9 +93,9 @@
 					</div>
 				</div>
 				<div class="layui-form-item">
-					<label class="layui-form-label"><i class="redrequired">*</i>商家电话</label>
+					<label class="layui-form-label">商家电话</label>
 					<div class="layui-input-inline" style="width: 400px;">
-						<input type="text" lay-verify="required" name="sellerPhone" placeholder="商家电话" class="layui-input">
+						<input type="text" lay-verify="phone" name="sellerPhone" placeholder="商家电话" class="layui-input">
 					</div>
 				</div>
 				<div class="layui-form-item">
@@ -122,7 +135,9 @@
 								var data = data.data.rows[0];
 								$("[name=name]").val(data.name);
 								$("[name=description]").val(data.description);
-								$(".mainpictrue").attr("src", data.bannerUrl).css("margin-top", "15px");
+								$(".imgPic").attr("src", data.imageUrl).css("margin", "15px 0");
+								$("[name=imageUrl]").val(data.imageUrl);
+								$(".bannerPic").attr("src", data.bannerUrl).css("margin", "15px 0");
 								$("[name=bannerUrl]").val(data.bannerUrl);
 								$("[name=categoryName]").val(data.categoryName);
 								$("[name=primePrice]").val(data.primePrice);
@@ -156,14 +171,29 @@
 
 				//上传操作
 				upload.render({
-					elem: '#upload',
+					elem: '#uploadImg',
+					url: '/zzhnc/upload/UploadImg',
+					done: function(data) {
+						console.log(data)
+						if(data.code == 0) {
+							layer.msg("上传成功");
+							$("[name=imageUrl]").val(data.data.imgurl);
+							$(".imgPic").attr("src", data.data.imgurl).css("margin", "15px 0");
+						} else {
+							layer.msg('上传失败');
+						}
+					}
+				});
+				
+				upload.render({
+					elem: '#uploadBanner',
 					url: '/zzhnc/upload/UploadImg',
 					done: function(data) {
 						console.log(data)
 						if(data.code == 0) {
 							layer.msg("上传成功");
 							$("[name=bannerUrl]").val(data.data.imgurl);
-							$(".mainpictrue").attr("src", data.data.imgurl).css("margin-top", "15px");
+							$(".bannerPic").attr("src", data.data.imgurl).css("margin", "15px 0");
 						} else {
 							layer.msg('上传失败');
 						}
@@ -183,8 +213,8 @@
 						id: parseInt(goodsid, 10),
 						name: data.field.name,
 						description: data.field.description,
+						imgUrl: $("[name=imgUrl]").val(),
 						bannerUrl: $("[name=bannerUrl]").val(),
-						imgUrl: $("[name=bannerUrl]").val(),
 						categoryName: $("[name=categoryName]").val(),
 						isHome: isHome,
 						isHot: isHot,
@@ -216,8 +246,10 @@
 				$(".resetBtn").on("click", function() {
 					$("[name=name]").val("");
 					$("[name=description]").val("");
+					$("[name=imgUrl]").val("");
+					$(".imgPic").attr("src", "").css("margin", "0");
 					$("[name=bannerUrl]").val("");
-					$(".mainpictrue").attr("src", "").css("margin-top", "0");
+					$(".bannerPic").attr("src", "").css("margin", "0");
 					$("[name=categoryName]").val("");
 					$("[name=isHome]").val("on");
 					$("[name=isHot]").val("on");

WebContent/WEB-INF/res/css/basic.css

@@ -145,7 +145,7 @@
 	margin-right: 5px;
 }
 
-#upload {
+#uploadImg, #uploadBanner {
 	float: left;
 	margin-right: 10px;
 }
@@ -154,6 +154,9 @@
 	text-align: center;
 }
 
+.layui-form-select dl{
+	z-index: 1000;
+}
 
 /*-----------公共样式 end-----------*/