anyv / xkeasy · 提交

转到一个项目

作者 anyv
提交 9ad551a693a932f596c9f75549bacaa7f7e48fa9 1 个父辈 324fa6fc
1 个管道 的构建 通过 耗费 2 秒

5

内嵌 并排对比
正在显示 7 个修改的文件 包含 78 行增加 和 72 行删除
... ... @@ -192,22 +192,6 @@ class PersonalcenterController extends WeChatBaseController{
}
/**
* 浏览记录
*/
... ...
... ... @@ -16,7 +16,7 @@
<div class="cl_top">
<!-- 分类 -->
<div class="cl_title">
<h1>分类</h1>
<!--<h1>分类</h1>-->
<div class="cl_titleImg">
</div>
... ...
... ... @@ -87,15 +87,18 @@
<div class="in_campusTitle">
<div class="in_campusTitle1">团</div>
<div class="in_campusTitle2">校园团购</div>
</div>
<!-- 小标题 -->
<div class="xiaoyuan_tuangou">
<div class="in_campust2">超值特卖，团购立减100元！</div>
<div class="in_campusTitle3">
更多
更多
<a href="{:url('Index/salesman_goods')}">
<img src="__TMPL__/public/assets/images/8.png" alt="" >
</a>
</div>
</div>
<!-- 小标题 -->
<div class="in_campust2">超值特卖，团购立减100元！</div>
<!-- 商品 -->
<div class="in_cam_shop">
<volist name="data_goods" id="vo">
... ... @@ -136,6 +139,11 @@
<img src="__TMPL__/public/assets/images/12.png" alt="">
</div>
<div class="in_campusTitle2">热门推荐</div>
</div>
<!-- 小标题 -->
<div class="xiaoyuan_tuangou">
<div class="in_campust2">好货上新，火热开抢！</div>
<div class="in_campusTitle3">
更多
<a href="{:url('Index/hot_goods')}">
... ... @@ -143,8 +151,6 @@
</a>
</div>
</div>
<!-- 小标题 -->
<div class="in_campust2">好货上新，火热开抢！</div>
<!-- 商品 -->
<div class="in_hot_shop">
<volist name="data_goods_hot" id="vo">
... ...
... ... @@ -26,8 +26,8 @@
</style>
<body>
<!-- 弹窗 -->
<div class="tx_mask">
<div class="tx_maskCon">
<div class="tx_mask" onclick="$(this).hide()">
<div class="tx_maskCon" onclick="zZFun(this)">
<div class="tx_maskConImg">
<img src="__TMPL__/public/assets/images/70.png" alt="" />
</div>
... ... @@ -50,8 +50,8 @@
</div>
</div>
<div class="tx_maskPhone">
<div class="tx_maskCon">
<div class="tx_maskPhone" onclick="$(this).hide()">
<div class="tx_maskCon" onclick="zZFun(this)">
<div class="tx_maskConImg">
<img src="__TMPL__/public/assets/images/70.png" alt="" />
</div>
... ... @@ -327,7 +327,10 @@
}
}
// 关闭弹窗
function zZFun(e) {
window.event ? (window.event.cancelBubble = true) : e.stopPropagation();
}
</script>
</body>
... ...
... ... @@ -115,18 +115,18 @@
<div class="log_four_ooo">
<div class="log_four_xian_ban">
<div class="log_four_xian_nei">
<input type="text" data-index='0' placeholder="选择班级" name="" id="" value="" />
<input type="text" data-index='0' placeholder="填写起始班级" name="" id="" value="" />
</div>
<div class="log_four_xian_icon">
<img src="__TMPL__/public/assets/images/down.png" alt="" />
</div>
</div>
</div>
<div class="log_four_xian_wife">——</div>
<div class="log_four_xian_wife">~</div>
<div class="log_four_ooo">
<div class="log_four_xian_ban2">
<div class="log_four_xian_nei">
<input type="text" data-index='0' placeholder=" 选择班级" />
<input type="text" data-index='0' placeholder="填写结束班级" />
</div>
<div class="log_four_xian_icon">
<img src="__TMPL__/public/assets/images/down.png" alt="" />
... ... @@ -149,17 +149,17 @@
<div class="log_four_contants_input ">
<div class="log_four_ooo">
<div class="log_four_xian_ban">
<div class="log_four_xian_nei"><input data-index='1' type="text" placeholder="选择班级" name="" id="" value="" /></div>
<div class="log_four_xian_nei"><input data-index='1' type="text" placeholder="填写起始班级" name="" id="" value="" /></div>
<div class="log_four_xian_icon">
<img src="__TMPL__/public/assets/images/down.png" alt="" />
</div>
</div>
</div>
<div class="log_four_xian_wife">——</div>
<div class="log_four_xian_wife">~</div>
<div class="log_four_ooo">
<div class="log_four_xian_ban2">
<div class="log_four_xian_nei">
<input type="text" data-index='1' placeholder=" 选择班级" />
<input type="text" data-index='1' placeholder="填写结束班级" />
</div>
<div class="log_four_xian_icon">
<img src="__TMPL__/public/assets/images/down.png" alt="" />
... ... @@ -182,17 +182,17 @@
<div class="log_four_contants_input ">
<div class="log_four_ooo">
<div class="log_four_xian_ban">
<div class="log_four_xian_nei"><input data-index='2' type="text" placeholder="选择班级" name="" id="" value="" /></div>
<div class="log_four_xian_nei"><input data-index='2' type="text" placeholder="填写起始班级" name="" id="" value="" /></div>
<div class="log_four_xian_icon">
<img src="__TMPL__/public/assets/images/down.png" alt="" />
</div>
</div>
</div>
<div class="log_four_xian_wife">——</div>
<div class="log_four_xian_wife">~</div>
<div class="log_four_ooo">
<div class="log_four_xian_ban2">
<div class="log_four_xian_nei">
<input type="text" data-index='2' placeholder=" 选择班级" />
<input type="text" data-index='2' placeholder="填写结束班级" />
</div>
<div class="log_four_xian_icon">
<img src="__TMPL__/public/assets/images/down.png" alt="" />
... ... @@ -215,17 +215,17 @@
<div class="log_four_contants_input ">
<div class="log_four_ooo">
<div class="log_four_xian_ban">
<div class="log_four_xian_nei"><input data-index='3' type="text" placeholder="选择班级" name="" id="" value="" /></div>
<div class="log_four_xian_nei"><input data-index='3' type="text" placeholder="填写起始班级" name="" id="" value="" /></div>
<div class="log_four_xian_icon">
<img src="__TMPL__/public/assets/images/down.png" alt="" />
</div>
</div>
</div>
<div class="log_four_xian_wife">——</div>
<div class="log_four_xian_wife">~</div>
<div class="log_four_ooo">
<div class="log_four_xian_ban2">
<div class="log_four_xian_nei">
<input type="text" data-index='3' placeholder=" 选择班级" />
<input type="text" data-index='3' placeholder="填写结束班级" />
</div>
<div class="log_four_xian_icon">
<img src="__TMPL__/public/assets/images/down.png" alt="" />
... ... @@ -248,17 +248,17 @@
<div class="log_four_contants_input ">
<div class="log_four_ooo">
<div class="log_four_xian_ban">
<div class="log_four_xian_nei"><input type="text" data-index='4' placeholder="选择班级" name="" id="" value="" /></div>
<div class="log_four_xian_nei"><input type="text" data-index='4' placeholder="填写起始班级" name="" id="" value="" /></div>
<div class="log_four_xian_icon">
<img src="__TMPL__/public/assets/images/down.png" alt="" />
</div>
</div>
</div>
<div class="log_four_xian_wife">——</div>
<div class="log_four_xian_wife">~</div>
<div class="log_four_ooo">
<div class="log_four_xian_ban2">
<div class="log_four_xian_nei">
<input type="text" data-index='4' placeholder=" 选择班级" />
<input type="text" data-index='4' placeholder="填写结束班级" />
</div>
<div class="log_four_xian_icon">
<img src="__TMPL__/public/assets/images/down.png" alt="" />
... ... @@ -281,17 +281,17 @@
<div class="log_four_contants_input ">
<div class="log_four_ooo">
<div class="log_four_xian_ban">
<div class="log_four_xian_nei"><input type="text" data-index='5' placeholder="选择班级" name="" id="" value="" /></div>
<div class="log_four_xian_nei"><input type="text" data-index='5' placeholder="填写起始班级" name="" id="" value="" /></div>
<div class="log_four_xian_icon">
<img src="__TMPL__/public/assets/images/down.png" alt="" />
</div>
</div>
</div>
<div class="log_four_xian_wife">——</div>
<div class="log_four_xian_wife">~</div>
<div class="log_four_ooo">
<div class="log_four_xian_ban2">
<div class="log_four_xian_nei">
<input type="text" data-index='5' placeholder=" 选择班级" />
<input type="text" data-index='5' placeholder="填写结束班级" />
</div>
<div class="log_four_xian_icon">
<img src="__TMPL__/public/assets/images/down.png" alt="" />
... ... @@ -316,17 +316,17 @@
<div class="log_four_contants_input ">
<div class="log_four_ooo">
<div class="log_four_xian_ban">
<div class="log_four_xian_nei"><input type="text" data-index='6' placeholder="选择班级" name="" id="" value="" /></div>
<div class="log_four_xian_nei"><input type="text" data-index='6' placeholder="填写起始班级" name="" id="" value="" /></div>
<div class="log_four_xian_icon">
<img src="__TMPL__/public/assets/images/down.png" alt="" />
</div>
</div>
</div>
<div class="log_four_xian_wife">——</div>
<div class="log_four_xian_wife">~</div>
<div class="log_four_ooo">
<div class="log_four_xian_ban2">
<div class="log_four_xian_nei">
<input type="text" data-index='6' placeholder=" 选择班级" />
<input type="text" data-index='6' placeholder="填写结束班级" />
</div>
<div class="log_four_xian_icon">
<img src="__TMPL__/public/assets/images/down.png" alt="" />
... ... @@ -349,17 +349,17 @@
<div class="log_four_contants_input ">
<div class="log_four_ooo">
<div class="log_four_xian_ban">
<div class="log_four_xian_nei"><input type="text" data-index='7' placeholder="选择班级" name="" id="" value="" /></div>
<div class="log_four_xian_nei"><input type="text" data-index='7' placeholder="填写起始班级" name="" id="" value="" /></div>
<div class="log_four_xian_icon">
<img src="__TMPL__/public/assets/images/down.png" alt="" />
</div>
</div>
</div>
<div class="log_four_xian_wife">——</div>
<div class="log_four_xian_wife">~</div>
<div class="log_four_ooo">
<div class="log_four_xian_ban2">
<div class="log_four_xian_nei">
<input type="text" data-index='7' placeholder=" 选择班级" />
<input type="text" data-index='7' placeholder="填写结束班级" />
</div>
<div class="log_four_xian_icon">
<img src="__TMPL__/public/assets/images/down.png" alt="" />
... ... @@ -382,17 +382,17 @@
<div class="log_four_contants_input ">
<div class="log_four_ooo">
<div class="log_four_xian_ban">
<div class="log_four_xian_nei"><input type="text" data-index='8' placeholder="选择班级" name="" id="" value="" /></div>
<div class="log_four_xian_nei"><input type="text" data-index='8' placeholder="填写起始班级" name="" id="" value="" /></div>
<div class="log_four_xian_icon">
<img src="__TMPL__/public/assets/images/down.png" alt="" />
</div>
</div>
</div>
<div class="log_four_xian_wife">——</div>
<div class="log_four_xian_wife">~</div>
<div class="log_four_ooo">
<div class="log_four_xian_ban2">
<div class="log_four_xian_nei">
<input type="text" placeholder=" 选择班级" data-index='8' />
<input type="text" placeholder="填写结束班级" data-index='8' />
</div>
<div class="log_four_xian_icon">
<img src="__TMPL__/public/assets/images/down.png" alt="" />
... ... @@ -418,17 +418,17 @@
<div class="log_four_contants_input ">
<div class="log_four_ooo">
<div class="log_four_xian_ban">
<div class="log_four_xian_nei"><input type="text" data-index='9' placeholder="选择班级" name="" id="" value="" /></div>
<div class="log_four_xian_nei"><input type="text" data-index='9' placeholder="填写起始班级" name="" id="" value="" /></div>
<div class="log_four_xian_icon">
<img src="__TMPL__/public/assets/images/down.png" alt="" />
</div>
</div>
</div>
<div class="log_four_xian_wife">——</div>
<div class="log_four_xian_wife">~</div>
<div class="log_four_ooo">
<div class="log_four_xian_ban2">
<div class="log_four_xian_nei">
<input type="text" placeholder=" 选择班级" data-index='9' />
<input type="text" placeholder="填写结束班级" data-index='9' />
</div>
<div class="log_four_xian_icon">
<img src="__TMPL__/public/assets/images/down.png" alt="" />
... ... @@ -451,17 +451,17 @@
<div class="log_four_contants_input ">
<div class="log_four_ooo">
<div class="log_four_xian_ban">
<div class="log_four_xian_nei"><input type="text" placeholder="选择班级" name="" id="" value="" data-index='10' /></div>
<div class="log_four_xian_nei"><input type="text" placeholder="填写起始班级" name="" id="" value="" data-index='10' /></div>
<div class="log_four_xian_icon">
<img src="__TMPL__/public/assets/images/down.png" alt="" />
</div>
</div>
</div>
<div class="log_four_xian_wife">——</div>
<div class="log_four_xian_wife">~</div>
<div class="log_four_ooo">
<div class="log_four_xian_ban2">
<div class="log_four_xian_nei">
<input type="text" placeholder=" 选择班级" data-index='10' />
<input type="text" placeholder="填写结束班级" data-index='10' />
</div>
<div class="log_four_xian_icon">
<img src="__TMPL__/public/assets/images/down.png" alt="" />
... ... @@ -484,17 +484,17 @@
<div class="log_four_contants_input ">
<div class="log_four_ooo">
<div class="log_four_xian_ban">
<div class="log_four_xian_nei"><input type="text" placeholder="选择班级" name="" id="" value="" data-index='11' /></div>
<div class="log_four_xian_nei"><input type="text" placeholder="填写起始班级" name="" id="" value="" data-index='11' /></div>
<div class="log_four_xian_icon">
<img src="__TMPL__/public/assets/images/down.png" alt="" />
</div>
</div>
</div>
<div class="log_four_xian_wife">——</div>
<div class="log_four_xian_wife">~</div>
<div class="log_four_ooo">
<div class="log_four_xian_ban2">
<div class="log_four_xian_nei">
<input type="text" placeholder=" 选择班级" data-index='11' />
<input type="text" placeholder="填写结束班级" data-index='11' />
</div>
<div class="log_four_xian_icon">
<img src="__TMPL__/public/assets/images/down.png" alt="" />
... ...
... ... @@ -64,6 +64,7 @@ body {
}
.in_search_no {
margin-left: 0.08rem;
color: white;
font-size: 0.28rem;
}
... ... @@ -128,11 +129,16 @@ body {
background: rgba(214, 0, 0, 1);
border-radius: 0.04rem;
}
.xiaoyuan_tuangou{
display: flex;
display: -webkit-flex;
justify-content: space-between;
align-items: center;
}
.in_campusTitle2 {
color: #333333;
font-weight: bold;
font-size: 0.36rem;
font-size: 0.38rem;
margin-left: 0.16rem;
}
... ... @@ -143,6 +149,7 @@ body {
color: #5C5C5C;
font-size: 0.26rem;
margin-left: auto;
margin-bottom: 0.26rem;
}
.in_campusTitle3 img {
... ... @@ -174,10 +181,11 @@ body {
}
.in_cam_shopName {
height: 0.56rem;
-webkit-line-clamp: 2;
font-size: 0.26rem;
margin-top: 0.1rem;
line-height: 0.28rem;
line-height: 0.32rem;
color: rgba(51, 51, 51, 1);
}
... ... @@ -236,11 +244,13 @@ body {
}
.in_hotName {
height: 0.76rem;
color: #333333;
font-weight: bold;
font-size: 0.26rem;
margin-top: 0.08rem;
-webkit-line-clamp: 2;
line-height: 0.38rem;
}
.in_hotName span {
... ...
... ... @@ -1156,7 +1156,7 @@
opacity: 1;
}
.log_four_xian_nei input{
width: 2.08rem;
width: 2.18rem;
height: 0.36rem;
font-size: 0.26rem;
color: #333;
... ... @@ -1174,12 +1174,15 @@
height: 100%
}
.log_four_xian_wife {
margin: 0 0.12rem;
color: rgba(245, 245, 245, 1)
/*.log_four_xian_wife {*/
/*margin: 0 0.12rem;*/
/*color: rgba(245, 245, 245, 1)*/
/*}*/
.log_four_xian_wife{
margin: 0.14rem;
color: #E6E6E6
}
/* 选择班级列表 */
.log_four_li,
... ... @@ -1459,7 +1462,7 @@
padding: 0.1rem 0.3rem;
font-size: 0.32rem;
font-weight: 400;
color: rgba(204, 204, 204, 1);
color: #333;
opacity: 1;
}
... ...