Merge branch 'shenzi'

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

@@ -30,7 +30,7 @@
 					<th>标题</th>
 					<th>类型</th>
 					<th>更新时间</th>
-					<th>操作</th>
+					<th style="min-width: 98px;">操作</th>
 				</tr>
 			</thead>
 

WebContent/WEB-INF/jsp/pc/autoresponse/autoresponse.jsp

@@ -28,9 +28,9 @@
 			<thead>
 				<tr>
 					<th>No</th>
-					<th>关键字</th>
+					<th style="min-width: 80px;">关键字</th>
 					<th>回复内容</th>
-					<th>操作</th>
+					<th style="min-width: 98px;">操作</th>
 				</tr>
 			</thead>
 			<tbody id="tablelist">
@@ -93,7 +93,7 @@
 						for(var i = 0; i < data.rows.length; i++) {
 							str += '<tr data-id=' + data.rows[i].id + '>' +
 								'<td>' + ((data.page - 1) * data.pageSize + i + 1) + '</td>' +
-								'<td style="text-align:left;">' + data.rows[i].keywords + '</td>' +
+								'<td>' + data.rows[i].keywords + '</td>' +
 								'<td style="text-align:left;">' + data.rows[i].contents + '</td>' +
 								'<td>' +
 								'<a href="#" class="layui-btn layui-btn-sm updataBtn">修改</a>' +

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

@@ -27,16 +27,16 @@
 			<thead>
 				<tr>
 					<th>No</th>
-					<th>商品主图</th>
-					<th>商品名称</th>
-					<th>商品类别</th>
+					<th style="min-width: 56px;">商品主图</th>
+					<th style="min-width: 56px;">商品名称</th>
+					<th style="min-width: 56px;">商品类别</th>
 					<th>原价</th>
 					<th>现价</th>
-					<th>商家名称</th>
-					<th>商家地址</th>
+					<th style="min-width: 56px;">商家名称</th>
+					<th style="min-width: 56px;">商家地址</th>
 					<th>商家电话</th>
-					<th>是否首页显示</th>
-					<th>操作</th>
+					<th style="min-width: 84px;">是否首页显示</th>
+					<th style="min-width: 98px;">操作</th>
 				</tr>
 			</thead>
 

WebContent/WEB-INF/jsp/pc/report/fans.jsp

@@ -28,8 +28,8 @@
 					<th>头像昵称</th>
 					<th>地区</th>
 					<th>小程序 openid</th>
-					<th>创建时间</th>
-					<th>上次登录时间</th>
+					<th style="min-width: 84px;">创建时间</th>
+					<th style="min-width: 84px;">上次登录时间</th>
 				</tr>
 			</thead>
 			<tbody id="fanslist">

WebContent/WEB-INF/jsp/pc/report/prize.jsp

@@ -54,7 +54,7 @@
 					<th>中奖人员</th>
 					<th>红包</th>
 					<th>礼品</th>
-					<th>时间 </th>
+					<th style="min-width: 84px;">时间 </th>
 				</tr>
 			</thead>
 			<tbody id="tablelist">