Merge branch 'dev-cz' into dev_zcl

# Conflicts:
#	Public/Sdk/css/ssg/common.css
#	Public/Sdk/images/ssg/blank/blankimg.png
master
zhengchanglong 5 years ago
commit 7863eb1be3

@ -12,123 +12,11 @@
<script src="__JS__/ssg/juicer.min.js" type="text/javascript"></script>
</head>
<style>
.index-box {
background-color: #F5F5F5;
}
.index-box .flexitem {
display: flex;
justify-content: flex-start;
align-items: center;
}
.index-box .title {
display: flex;
height: .9rem;
width: 100%;
justify-content: space-between;
align-items: center;
background-color: #21B1EB;
color: white;
font-size: .28rem;
}
.index-box .title .logout{
margin-left:.29rem;
}
.index-box .title .back div{
margin-left: 5px;
}
.index-box .title img {
width: .3rem;
height: .3rem;
}
.index-box .title .content{
font-size: .32rem;font-weight: 600;
}
.index-box .title .orderbox{
margin-right:.29rem;
}
.index-box .title .orderbox div{
margin-left: 5px;
}
.index-box .borderitem::after {
/* margin-left: .24rem; */
height: 1px;
position: absolute;
z-index: 0;
bottom: 0;
left: 0;
content: "";
width: 100%;
background-image: -webkit-linear-gradient(bottom, #ececec 50%, transparent 0);
background-image: linear-gradient(0deg, #ececec 50%, transparent 0);
}
.index-box .shaddowbox {
background-color: #fff;
border-radius: .24rem;
box-shadow: 0px 0px 6px 0px rgba(89, 40, 8, 0.15);
}
.index-box .allitembox{
padding: .3rem;
}
.index-box .allitembox .title-cell{
font-size: .28rem;color:#292929;position: relative;
}
/* .index-box .allitembox .title-cell >div{
} */
.index-box .allitembox .title-cell .borderitem{
display: flex; justify-content: space-between;align-items:center;padding: 0 .3rem;line-height: .9rem;
}
.index-box .allitembox .aditem .adimg{
height: 2.6rem;justify-content:center;
}
.index-box .allitembox .aditem .adimg img{
width: 6.3rem;height: 2rem;
}
.index-box input {
background-color: #F5F5F5;
}
.index-box .maringtop3rem{
margin-top: .3rem;
}
.index-box .title-name{
font-size: .32rem;
}
.index-box .a9color{
color: #A9A9A9;
}
.index-box .wh3rem{
width: .3rem;height: .3rem;
}
.index-box .inputbox{
color: #A9A9A9;width:calc(100% - 2rem);width:-webkit-calc(100% - 2rem);width:-moz-calc(100% - 2rem);height: .6rem;background-color: #F5F5F5;border-radius: .3rem;
}
.index-box .inputbox img{
width:.4rem;height: .4rem;margin-left: .17rem;
}
.index-box .inputbox input{
border: 0px;height: .6rem;font-size: .24rem;margin-left: .2rem;width:calc(100% - 1rem);width:-webkit-calc(100% - 1rem);width:-moz-calc(100% - 1rem);
}
.index-box .pay-button div{
margin:auto;width:5.6rem;height:1.34rem;background:url('__IMG__/ssg/index/paybt.png') no-repeat top center/cover;color: #fff;text-align: center;line-height: 1.1rem;font-size: .32rem;
}
.index-box .gameitem{
padding-top:.3rem ;justify-content: space-between;
}
.index-box .gameitem .gameimg{
width: .7rem;height: .7rem;
}
.index-box .gamechoose{
width: .3rem;height: .3rem;
}
.index-box .gamenocheck{
background:url('__IMG__/ssg/index/nocheck.png') no-repeat top center/100% 100%;
background:url('__IMG__/ssg/index/nocheck.png') no-repeat top center/100% 100%;
}
.index-box .gamecheck{
background:url('__IMG__/ssg/index/check.png') no-repeat top center/100% 100%;
background:url('__IMG__/ssg/index/check.png') no-repeat top center/100% 100%;
}
</style>
@ -210,7 +98,7 @@
</div>
<div style="margin:auto;width:100%;height:1.34rem;"></div>
<div class="pay-button">
<div>确认支付¥10</div>
<div style="background:url('__IMG__/ssg/index/paybt.png') no-repeat top center/cover;">确认支付¥10</div>
</div>
</body>
<script type="text/template" id="gametpl">

@ -9,109 +9,9 @@
<title>订单列表</title>
<link href="__CSS__/ssg/common.css" rel="stylesheet" type="text/css">
<script src="__JS__/ssg/flexible.min.js" type="text/javascript"></script>
<style>
body {
background-color: #F5F5F5;
}
.flexitem {
display: flex;
justify-content: flex-start;
align-items: center;
}
.borderitem::after {
/* margin-left: .24rem; */
height: 1px;
position: absolute;
z-index: 0;
bottom: 0;
left: 0;
content: "";
width: 100%;
background-image: -webkit-linear-gradient(bottom, #ececec 50%, transparent 0);
background-image: linear-gradient(0deg, #ececec 50%, transparent 0);
}
.shaddowbox {
background-color: #fff;
border-radius: .24rem;
box-shadow: 0px 0px 6px 0px rgba(89, 40, 8, 0.15);
margin-top: .3rem;
}
.title {
display: flex;
height: .9rem;
width: 100%;
justify-content: space-between;
align-items: center;
background-color: #21B1EB;
}
.title img,
.titleright {
width: .3rem;
height: .3rem;
}
.order-search li dl .order-status {
background-image: url("/Public/Mobile/images/ssg/order-status.png");
}
.order-search .no-order {
background-image: url("/Public/Mobile/images/ssg/no-order.png");
margin-top: 1.5rem;
padding-top: 2rem;
text-align: center;
/* background-image: url(/Content/images/no-order.png); */
background-repeat: no-repeat;
background-position: center top;
background-size: 1.6rem 1.6rem;
font-size: 0.28rem;
color: #666;
}
.box-title {
width: 6.9rem;
font-size: .28rem;
color: #292929;
position: relative;
}
.borderitem {
display: flex;
justify-content: space-between;
align-items: center;
padding: 0 .3rem;
line-height: .8rem;
}
.title-cont {
font-size: .24rem;
color: #A9A9A9;
}
.gamebox {
height: 1.8rem;
justify-content: center;
padding: .3rem;
}
.gamebox img {
width: 1.2rem;
height: 1.2rem;
}
.gameboxname {
margin-left: .3rem;
flex-grow: 1;
font-size: .28rem;
color: #292929;
}
</style>
</head>
<body>
<body class="order-box">
<div class="title">
<img class="gologin" src="__IMG__/ssg/back.png" style="margin-left:.24rem;" onclick="javascript:history.go(-1)">
<div style="font-size: .32rem;color: #fff;">订单查询</div>

@ -1,5 +1,5 @@
<!DOCTYPE html>
<html style="font-size: 204.8px;">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="apple-mobile-web-app-capable" content="yes">

@ -9,108 +9,9 @@
<title>订单详情</title>
<link href="__CSS__/ssg/common.css" rel="stylesheet" type="text/css">
<script src="/Public/Mobile/js/ssg/flexible.min.js" type="text/javascript"></script>
<style>
.title{
display: flex;
height: .9rem;
width: 100%;
justify-content: space-between;
align-items: center;
background-color: #21B1EB;
}
.title img,
.titleright {
width: .3rem;
height: .3rem;
}
.vip-download .game-info .game-icon img{
width: 1.1rem;
height: 1.1rem;
}
.vip-download .game-info .game-title{
top: 1.8rem;
}
.vip-download .game-info .game-rule{
top: 2.24rem;
}
.vip-download .game-info .download-button{
bottom:.5rem
}
.vip-download .game-info .download-button a{
margin: 0 auto;
display: block;
width: 2.4rem;
height: 0.6rem;
text-align: center;
line-height: 0.6rem;
background-color: #f7ca02;
border-radius: 0.3rem;
font-size: 0.28rem;
}
.shaddowbox {
background-color: #fff;
border-radius: .16rem;
box-shadow: 0px 0px 6px 0px rgba(89, 40, 8, 0.15);
}
.vip-download .game-gift{
padding: 0 .3rem;
}
.title-3{
height: 0.89rem;
line-height: 0.89rem;
border-bottom-color: #f0f0f0;
border-bottom-width: 1px;
border-bottom-style: solid;
}
.title-3 h2{
font-size: .28rem;
}
.vip-download .game-gift .gift-list li{
padding-bottom: 0.3rem;
/* border-bottom-color: #f0f0f0;
border-bottom-width: 1px;
border-bottom-style: solid; */
}
.vip-download .game-gift .gift-list li .gift-title{
height: .84rem;
line-height:.84rem;
text-align: left;
}
.vip-download .game-gift .gift-list li .gift-title h2{
padding-left: 0.36rem;
background-size: 0.25rem 0.25rem;
font-size: 0.28rem;
}
p,input{
font-size: .24rem;
}
.vip-download .game-gift .gift-list li .gift-code{
margin: 0.16rem 0.1rem 0;
padding-left: 1.3rem;
padding-right: 1rem;
height: 0.6rem;
line-height: 0.6rem;
background-color: #f5f5f5;
border-radius: 0.30rem;
}
.vip-download .game-gift .gift-list li .gift-code a{
width: 1.78rem;
height: 0.6rem;
line-height: 0.6rem;
text-align: center;
background-color: #21B1EB;
border-radius: 0.3rem;
color: #fff;
}
.gift-info{
font-size: .20rem;
}
.vip-download .game-gift .gift-list li .gift-code label{
left: .28rem;
}
</style>
</head>
<body>
<body class="install-box">
<div class="title" >
<img class="gologin" src="__IMG__/ssg/alipay/back.png" style="margin-left:.24rem;" onclick="javascript:history.go(-1)">
<div style="font-size: .32rem;color: #fff;">{$game['game_name']}</div>
@ -155,7 +56,6 @@ p,input{
</div>
</div>
<script src="__JS__/jquery-1.11.1.min.js" type="text/javascript"></script>
<!-- <script src="__JS__/ssg/common.js" type="text/javascript"></script> -->
<script src="__JS__/ssg/clipboard.min.js" type="text/javascript"></script>
</body>
<script>

@ -573,4 +573,216 @@ font-size: .16rem;color: #fff;
}
.rule-box .vip-rule ul li {
padding: 0.1rem 0;
}
/* index */
.index-box {
background-color: #F5F5F5;
}
.index-box .flexitem {
display: flex;
justify-content: flex-start;
align-items: center;
}
.index-box .title {
display: flex;
height: .9rem;
width: 100%;
justify-content: space-between;
align-items: center;
background-color: #21B1EB;
color: white;
font-size: .28rem;
}
.index-box .title .logout{
margin-left:.29rem;
}
.index-box .title .back div{
margin-left: 5px;
}
.index-box .title img {
width: .3rem;
height: .3rem;
}
.index-box .title .content{
font-size: .32rem;font-weight: 600;
}
.index-box .title .orderbox{
margin-right:.29rem;
}
.index-box .title .orderbox div{
margin-left: 5px;
}
.index-box .borderitem::after {
/* margin-left: .24rem; */
height: 1px;
position: absolute;
z-index: 0;
bottom: 0;
left: 0;
content: "";
width: 100%;
background-image: -webkit-linear-gradient(bottom, #ececec 50%, transparent 0);
background-image: linear-gradient(0deg, #ececec 50%, transparent 0);
}
.index-box .shaddowbox {
background-color: #fff;
border-radius: .24rem;
box-shadow: 0px 0px 6px 0px rgba(89, 40, 8, 0.15);
}
.index-box .allitembox{
padding: .3rem;
}
.index-box .allitembox .title-cell{
font-size: .28rem;color:#292929;position: relative;
}
/* .index-box .allitembox .title-cell >div{
} */
.index-box .allitembox .title-cell .borderitem{
display: flex; justify-content: space-between;align-items:center;padding: 0 .3rem;line-height: .9rem;
}
.index-box .allitembox .aditem .adimg{
height: 2.6rem;justify-content:center;
}
.index-box .allitembox .aditem .adimg img{
width: 6.3rem;height: 2rem;
}
.index-box input {
background-color: #F5F5F5;
}
.index-box .maringtop3rem{
margin-top: .3rem;
}
.index-box .title-name{
font-size: .32rem;
}
.index-box .a9color{
color: #A9A9A9;
}
.index-box .wh3rem{
width: .3rem;height: .3rem;
}
.index-box .inputbox{
color: #A9A9A9;width:calc(100% - 2rem);width:-webkit-calc(100% - 2rem);width:-moz-calc(100% - 2rem);height: .6rem;background-color: #F5F5F5;border-radius: .3rem;
}
.index-box .inputbox img{
width:.4rem;height: .4rem;margin-left: .17rem;
}
.index-box .inputbox input{
border: 0px;height: .6rem;font-size: .24rem;margin-left: .2rem;width:calc(100% - 1rem);width:-webkit-calc(100% - 1rem);width:-moz-calc(100% - 1rem);
}
.index-box .pay-button div{
margin:auto;width:5.6rem;height:1.34rem;color: #fff;text-align: center;line-height: 1.1rem;font-size: .32rem;
}
.index-box .gameitem{
padding-top:.3rem ;justify-content: space-between;
}
.index-box .gameitem .gameimg{
width: .7rem;height: .7rem;
}
.index-box .gamechoose{
width: .3rem;height: .3rem;
}
/* order-box */
.order-box {
background-color: #F5F5F5;
}
.order-box .flexitem {
display: flex;
justify-content: flex-start;
align-items: center;
}
.order-box .borderitem::after {
/* margin-left: .24rem; */
height: 1px;
position: absolute;
z-index: 0;
bottom: 0;
left: 0;
content: "";
width: 100%;
background-image: -webkit-linear-gradient(bottom, #ececec 50%, transparent 0);
background-image: linear-gradient(0deg, #ececec 50%, transparent 0);
}
.order-box .shaddowbox {
background-color: #fff;
border-radius: .24rem;
box-shadow: 0px 0px 6px 0px rgba(89, 40, 8, 0.15);
margin-top: .3rem;
}
.order-box .title {
display: flex;
height: .9rem;
width: 100%;
justify-content: space-between;
align-items: center;
background-color: #21B1EB;
}
.order-box .title img,
.order-box .titleright {
width: .3rem;
height: .3rem;
}
.order-box .order-search li dl .order-status {
background-image: url("/Public/Mobile/images/ssg/order-status.png");
}
.order-box .order-search .no-order {
background-image: url("/Public/Mobile/images/ssg/no-order.png");
margin-top: 1.5rem;
padding-top: 2rem;
text-align: center;
/* background-image: url(/Content/images/no-order.png); */
background-repeat: no-repeat;
background-position: center top;
background-size: 1.6rem 1.6rem;
font-size: 0.28rem;
color: #666;
}
.order-box .box-title {
width: 6.9rem;
font-size: .28rem;
color: #292929;
position: relative;
}
.order-box .borderitem {
display: flex;
justify-content: space-between;
align-items: center;
padding: 0 .3rem;
line-height: .8rem;
}
.order-box .title-cont {
font-size: .24rem;
color: #A9A9A9;
}
.order-box .gamebox {
height: 1.8rem;
justify-content: center;
padding: .3rem;
}
.order-box .gamebox img {
width: 1.2rem;
height: 1.2rem;
}
.order-box .gameboxname {
margin-left: .3rem;
flex-grow: 1;
font-size: .28rem;
color: #292929;
}

@ -221,48 +221,99 @@ input::-webkit-input-placeholder, textarea::-webkit-input-placeholder { color: #
.order-search li dl .order-pay { position: absolute; right: 0; top: 50%; margin-top: -0.265rem; width: 0.53rem; height: 0.53rem; background-repeat: no-repeat; background-size: 100%; margin: auto; }
/*# sourceMappingURL=common.css.map */
/* blank-page */
.blank-box{
font-size: .16rem;
color: #292929;
background-color: #fff;
min-height: 100vh;
}
.blank-box .title {
/* install-box */
.install-box .title{
display: flex;
height: .45rem;
height: .9rem;
width: 100%;
justify-content: space-between;
align-items: center;
background-color: #21B1EB;
}
.blank-box .title img,
.blank-box .titleright {
width: .15rem;
height: .15rem;
.install-box .title img,
.install-box .titleright {
width: .3rem;
height: .3rem;
}
.install-box .vip-download .game-info .game-icon img{
width: 1.1rem;
height: 1.1rem;
}
.install-box .vip-download .game-info .game-title{
top: 1.8rem;
}
.install-box .vip-download .game-info .game-rule{
top: 2.24rem;
}
.install-box .vip-download .game-info .download-button{
bottom:.5rem
}
.blank-box .title img{
margin-left:.12rem;
.install-box .vip-download .game-info .download-button a{
margin: 0 auto;
display: block;
width: 2.4rem;
height: 0.6rem;
text-align: center;
line-height: 0.6rem;
background-color: #f7ca02;
border-radius: 0.3rem;
font-size: 0.28rem;
}
.blank-box .titleright {
margin-right:.12rem;
.install-box .shaddowbox {
background-color: #fff;
border-radius: .16rem;
box-shadow: 0px 0px 6px 0px rgba(89, 40, 8, 0.15);
}
.install-box .vip-download .game-gift{
padding: 0 .3rem;
}
.blank-box .title .content{
font-size: .16rem;color: #fff;
.install-box .title-3{
height: 0.89rem;
line-height: 0.89rem;
border-bottom-color: #f0f0f0;
border-bottom-width: 1px;
border-bottom-style: solid;
}
.blank-box .cell-box{
width: 100%;padding:.9rem 0 0;display: flex;justify-content: center
.install-box .title-3 h2{
font-size: .28rem;
}
.blank-box .cell-box img{
width: 2rem;height: 1.75rem;
.install-box .vip-download .game-gift .gift-list li{
padding-bottom: 0.3rem;
}
.blank-box p{
width: 100%;font-size: .16rem;text-align: center;line-height: 1.5;
.install-box .vip-download .game-gift .gift-list li .gift-title{
height: .84rem;
line-height:.84rem;
text-align: left;
}
.install-box .vip-download .game-gift .gift-list li .gift-title h2{
padding-left: 0.36rem;
background-size: 0.25rem 0.25rem;
font-size: 0.28rem;
}
.install-box p,input{
font-size: .24rem;
}
.install-box .vip-download .game-gift .gift-list li .gift-code{
margin: 0.16rem 0.1rem 0;
padding-left: 1.3rem;
padding-right: 1rem;
height: 0.6rem;
line-height: 0.6rem;
background-color: #f5f5f5;
border-radius: 0.30rem;
}
.install-box .vip-download .game-gift .gift-list li .gift-code a{
width: 1.78rem;
height: 0.6rem;
line-height: 0.6rem;
text-align: center;
background-color: #21B1EB;
border-radius: 0.3rem;
color: #fff;
}
.blank-box .resbtn{
width: 100%;padding:.35rem 0 0;display: flex;justify-content: center;
.install-box .gift-info{
font-size: .20rem;
}
.blank-box .resbtn a{
width: 1.1rem;height: .35rem;border-radius: 35px;text-align: center;color: #fff;background-color:#21B1EB;line-height: .35rem;
.install-box .vip-download .game-gift .gift-list li .gift-code label{
left: .28rem;
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 218 KiB

Loading…
Cancel
Save