Skip to content

S
s_ibanshou
Commit 4f56f160 authored by 汪波's avatar 汪波
Browse files
Options

Merge branch 'master' into dev

parents 7c31c835 441ee3f9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1089 additions and 50 deletions
appdownload/css/style.css
View file @ 4f56f160
@charset "utf-8"; @charset "utf-8";
.dw-head { .dw-head {
height: 485px; height: 485px;
background-color: #fff; background-color: #fff;
...@@ -31,7 +32,6 @@ ...@@ -31,7 +32,6 @@
transform: translateY(-50%); transform: translateY(-50%);
text-align: left; text-align: left;
} }
.banshou-logo { .banshou-logo {
position: fixed; position: fixed;
display: block; display: block;
...@@ -377,4 +377,163 @@ ...@@ -377,4 +377,163 @@
.phone-box { .phone-box {
display: block; display: block;
} }
}
/*---------------------------------------------------新头部*/
.fl {
float: left;
}
.fr {
float: right;
}
.clear {
clear: both;
}
.clearfix{
*zoom: 1;
}
.clearfix:after{
display: block;
clear: both;
overflow: hidden;
visibility: hidden;
height: 0;
content: '';
}
.bl {
display: block;
}
.in-bl {
display: inline-block;
}
.fixed {
position: fixed;
}
.abs {
position: absolute;
}
.rel {
position: relative;
}
/* ----------头部菜单---------- */
.header-menu, .header-menu-seat {
width: 100%;
height: 70px;
}
.header-menu {
z-index: 5;
background: #fff;
border-bottom: 1px solid #ebeef3;
box-shadow: 0 3px 5px rgba(0, 0, 0, 0.05);
}
.h-m-main {
margin: 0 auto;
width: 1200px;
}
.h-m-main img {
height: 32px;
vertical-align: top;
margin-top: 19px;
}
.menu {
margin-left: 60px;
vertical-align: text-bottom;
}
.menu-item,
.header-menu .btn-download {
display: inline-block;
padding: 0 20px;
font-size: 18px;
font-weight: 500;
height: 70px;
line-height: 70px;
border-left: 1px solid #fff;
border-right: 1px solid #fff;
}
.header-menu .btn-download {
margin-right: 0;
padding-right: 0;
}
.menu-item.active {
position: relative;
background-color: #fafafa;
color: #008fd7;
border-left: 1px solid #f1f1f1;
border-right: 1px solid #f1f1f1;
}
.menu-item.active:after {
content: '';
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 2px;
background-color: #2e8ded;
}
.header-menu a {
color: #333;
text-decoration: none;
}
.header-menu a:hover {
color: #008fd7;
}
/*全屏遮罩*/
.mask {
top: 0;
left: 0;
width: 100%;
height: 100%;
z-index: 10;
background: rgba(0,0,0,0.3);
}
/*品牌选择*/
.brands-select {
left: 0;
right: 0;
top: 50%;
margin: -120px auto 0;
padding: 40px 0 0 36px;
width: 485px;
height: 240px;
background: #fff;
border-radius: 10px;
font-size: 16px;
}
.brands-s-title {
margin-bottom: 45px;
font-weight: bold;
font-size: 20px;
}
.brands-s-btn-close {
top: 30px;
right: 40px;
color: #333;
}
.brands-s-list a {
display: inline-block;
margin: 0 5px 20px 0;
min-width: 80px;
} }
\ No newline at end of file
appdownload/index.html
View file @ 4f56f160
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
<!--Font Icon--> <!--Font Icon-->
<link href="//at.alicdn.com/t/font_386523_2cql1vjt51m7vi.css" rel="stylesheet"> <link href="//at.alicdn.com/t/font_386523_2cql1vjt51m7vi.css" rel="stylesheet">
<link href="//at.alicdn.com/t/font_810718_1cddgzx1y8t.css" rel="stylesheet">
<!-- Css --> <!-- Css -->
<link rel="stylesheet" href="css/basic.css"> <link rel="stylesheet" href="css/basic.css">
...@@ -28,26 +29,47 @@ ...@@ -28,26 +29,47 @@
</script> </script>
<body> <body>
<div class="web"> <div class="web">
<!-- 导航 -->
<div class="banshou-logo"> <div class="header-menu fixed">
<div class="warp clearfix"> <div class="h-m-main clearfix">
<img src="img/banshouApp.png"> <a href=""><img src="img/logo.png"/></a>
<div class="menu in-bl">
<div class="download-group clearfix fr" style="margin-top: 5px; display: none" id="downloadBtn"> <a class="menu-item" href="">首页</a>
<a href="https://itunes.apple.com/cn/app/wei-xiu-hui-shi-fu-ban/id1034283227?mt=8" class="dw-btn"><i <a class="menu-item" href="">服务云</a>
class="iconfont icon-ios"></i>iPhone版下载</a> <a class="menu-item" href="">品牌库</a>
<a href="https://pub-cdn.ibanshou.cn/banshou-0315.apk" class="dw-btn"><i <a class="menu-item" href="">门店</a>
class="iconfont icon-android"></i>Android版下载</a> <a class="menu-item" class="menu-item" href="">大学</a>
<a class="menu-item" href="">社区</a>
<a href="#" class="ewm-btn top-need"> </div>
<i class="iconfont icon-erweima"></i> <div class="fr">
<span class="tip"><img src="img/qrcode.png"></span> <div class="download-group clearfix fr" style="margin-top: 10px; display: none" id="downloadBtn">
</a> <a href="https://a.app.qq.com/o/simple.jsp?pkgname=com.wxhkj.weixiuhui" class="dw-btn"><i
class="iconfont icon-ios"></i>iPhone版下载</a>
<a href="https://a.app.qq.com/o/simple.jsp?pkgname=com.wxhkj.weixiuhui" class="dw-btn"><i
class="iconfont icon-android"></i>Android版下载</a>
<a href="#" class="ewm-btn top-need">
<i class="iconfont icon-erweima"></i>
<span class="tip"><img src="img/qrcode.png"></span>
</a>
</div>
</div> </div>
</div> </div>
</div> </div>
<div style="height: 100px;"></div> <div class="header-menu-seat"></div>
<!--品牌选择-->
<div class="mask fixed" id="brands-list" style="display: none;">
<div class="brands-select abs">
<a class="brands-s-btn-close abs" href="javascript:;"><i class="iconfont icon-guanbi"></i></a>
<p class="brands-s-title">选择品牌</p>
<div class="brands-s-list">
<!--{loop $brand_list['subs'] $key $value}-->
<a href="{$value[caturl]}">{$value['catname']}</a>
<!--{/loop}-->
</div>
</div>
</div>
<div class="dw-head"> <div class="dw-head">
<div class="warp clearfix"> <div class="warp clearfix">
...@@ -62,9 +84,9 @@ ...@@ -62,9 +84,9 @@
</p> </p>
<div class="download-group clearfix"> <div class="download-group clearfix">
<a href="https://itunes.apple.com/cn/app/wei-xiu-hui-shi-fu-ban/id1034283227?mt=8" <a href="https://a.app.qq.com/o/simple.jsp?pkgname=com.wxhkj.weixiuhui"
class="dw-btn"><i class="iconfont icon-ios"></i>iPhone版下载</a> class="dw-btn"><i class="iconfont icon-ios"></i>iPhone版下载</a>
<a href="https://pub-cdn.ibanshou.cn/banshou-0131.apk" class="dw-btn"><i <a href="https://a.app.qq.com/o/simple.jsp?pkgname=com.wxhkj.weixiuhui" class="dw-btn"><i
class="iconfont icon-android"></i>Android版下载</a> class="iconfont icon-android"></i>Android版下载</a>
<a href="#" class="ewm-btn"> <a href="#" class="ewm-btn">
...@@ -208,7 +230,7 @@ ...@@ -208,7 +230,7 @@
<script type="application/javascript" src="js/mobile-detect.min.js"></script> <script type="application/javascript" src="js/mobile-detect.min.js"></script>
<script type="application/javascript" src="js/index.js?20180314"></script> <script type="application/javascript" src="js/index.js?20180315"></script>
<script type='text/javascript' src="http://apps.bdimg.com/libs/jquery/2.1.4/jquery.min.js"></script> <script type='text/javascript' src="http://apps.bdimg.com/libs/jquery/2.1.4/jquery.min.js"></script>
<script type='text/javascript'> <script type='text/javascript'>
......
appdownload/js/index.js
View file @ 4f56f160
...@@ -12,13 +12,13 @@ ...@@ -12,13 +12,13 @@
global.onload = function () { global.onload = function () {
var md = new MobileDetect(window.navigator.userAgent); var md = new MobileDetect(window.navigator.userAgent);
var appStoreUrl = 'https://itunes.apple.com/cn/app/wei-xiu-hui-shi-fu-ban/id1034283227?mt=8'; var appStoreUrl = 'https://a.app.qq.com/o/simple.jsp?pkgname=com.wxhkj.weixiuhui';
var yingYongBaoUrl = 'http://a.app.qq.com/o/simple.jsp?pkgname=com.wxhkj.weixiuhui'; var yingYongBaoUrl = 'http://a.app.qq.com/o/simple.jsp?pkgname=com.wxhkj.weixiuhui';
var urgency = false; var urgency = false;
if (urgency) { if (urgency) {
yingYongBaoUrl = 'https://pub-cdn.ibanshou.cn/banshou-0131.apk'; yingYongBaoUrl = 'https://a.app.qq.com/o/simple.jsp?pkgname=com.wxhkj.weixiuhui';
if (inApp()) { if (inApp()) {
$('#app-warn').show(); $('#app-warn').show();
$('#app-close').show(); $('#app-close').show();
......
e/action/inviteRedpack.php
View file @ 4f56f160
...@@ -8,4 +8,5 @@ ...@@ -8,4 +8,5 @@
require(__DIR__ . '/../extend/internalApi/autoload.php'); require(__DIR__ . '/../extend/internalApi/autoload.php');
require(__DIR__ . '/../config/config_ibanshou.php'); require(__DIR__ . '/../config/config_ibanshou.php');
\internalApi\base\Client::config($config['wxh.internal']['client']); \internalApi\base\Client::config($config['wxh.internal']['client']);
echo json_encode(\internalApi\ucenter\MemberRedpack::getFirstRedpack()); $uid = $_GET['uid'];
\ No newline at end of file echo json_encode(\internalApi\ucenter\MemberRedpack::getFirstRedpack($uid));
\ No newline at end of file
e/extend/internalApi/ucenter/MemberRedpack.php
View file @ 4f56f160
...@@ -11,8 +11,8 @@ use internalApi\base\Client; ...@@ -11,8 +11,8 @@ use internalApi\base\Client;
class MemberRedpack extends Client class MemberRedpack extends Client
{ {
public static function getFirstRedpack() public static function getFirstRedpack($userId)
{ {
return self::call('memberRedpack.firstRedpack'); return self::call('memberRedpack.firstRedpack',compact('userId'));
} }
} }
\ No newline at end of file
e/member/cas.php
View file @ 4f56f160
...@@ -25,7 +25,7 @@ if ($mod == 'login') { ...@@ -25,7 +25,7 @@ if ($mod == 'login') {
$member = \internalApi\ucenter\Member::getSyncByWxhuid($phpcas['id']); $member = \internalApi\ucenter\Member::getSyncByWxhuid($phpcas['id']);
if (!$member) { if (!$member) {
printerrortourl('/',"CAS接口错误".json_encode($result['data']), 3); printerrortourl('/',"CAS接口错误".json_encode($member['data'])."wxhid: {$phpcas['id']}", 3);
} }
$cmsmember = $empire->fetch1("select ".eReturnSelectMemberF('*')." from ".eReturnMemberTable()." where ".egetmf('ucid')."={$member['uid']} limit 1"); $cmsmember = $empire->fetch1("select ".eReturnSelectMemberF('*')." from ".eReturnMemberTable()." where ".egetmf('ucid')."={$member['uid']} limit 1");
......
e/member/login/indexloginstatus.php
View file @ 4f56f160
...@@ -4,29 +4,34 @@ require(__DIR__ . "/../../class/db_sql.php"); ...@@ -4,29 +4,34 @@ require(__DIR__ . "/../../class/db_sql.php");
require(__DIR__ . "/../../member/class/user.php"); require(__DIR__ . "/../../member/class/user.php");
require(__DIR__ . "/../../class/q_functions.php"); require(__DIR__ . "/../../class/q_functions.php");
$iscas = getcvar('mlcas'); $iscas = getcvar('mlcas');
if($iscas){ if ($iscas) {
$link=db_connect(); $link = db_connect();
$empire=new mysqlquery(); $empire = new mysqlquery();
$user = islogin(); $user = islogin();
$ucid = $user['ucid']; $ucid = $user['ucid'];
}
?>
<?php
$isShow = false;
if (time() > strtotime('2018-05-01 00:00:00') && time() <= strtotime('2018-05-10 23:59:59')) {
$isShow = true;
} }
?> ?>
<?php if (!$iscas) { ?> <?php if (!$iscas) { ?>
$(function(){
$(".books").attr("href", "/e/member/login"); <?php if ($isShow) { ?>
$("#loginGits").attr("style", "display:block;"); showRedpack();
}); $("#invite-main").attr("style", "display:block;");
<?php }else { ?> <?php } ?>
var zhugeCheckRunHandler = false; <!-- $(".books").attr("href", "/e/member/login");--> $("#loginGits").attr("style", "display:block;");
function zhugeCheckRun(){ <?php } else { ?>
if(!window.zhuge){
zhugeCheckRunHandler = setTimeout(zhugeCheckRun,500); <?php if ($isShow) { ?>
}else{ showRedpack("<?=$ucid?>");$("#invite-main").attr("style", "display:block;");
clearTimeout(zhugeCheckRunHandler); <?php } ?>
window.zhuge.identify("<?=$ucid?>"); var zhugeCheckRunHandler = false; function zhugeCheckRun(){ if(!window.zhuge){ zhugeCheckRunHandler = setTimeout(zhugeCheckRun,500); }else{ clearTimeout(zhugeCheckRunHandler); window.zhuge.identify("<?=$ucid?>"); } } zhugeCheckRun();
}
}
zhugeCheckRun();
<?php } ?> <?php } ?>
bb.html → index_dev.html
View file @ 4f56f160
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
</div> </div>
<div class="enter-img"> <div class="enter-img">
<a href="[!--temp.ucenterurl--]invite-redpack/index"><img src="/skin/default/images/enter.png"></a> <a href="[!--temp.ucenterurl--]invite-redpack/index" id="invite-redpack"><img src="/skin/default/images/enter.png"></a>
</div> </div>
<div class="recommend-info"> <div class="recommend-info">
...@@ -213,8 +213,7 @@ ...@@ -213,8 +213,7 @@
} }
</style> </style>
<div class="red-packet" id="redpack" style="display: none"> <div class="red-packet" id="redpack" style="display: none"></div>
</div>
<script src="[!--news.url--]e/member/login/logincas.php"></script> <script src="[!--news.url--]e/member/login/logincas.php"></script>
<script type='text/javascript' src="[!--news.url--]skin/default/js/swiper.min.js"></script> <script type='text/javascript' src="[!--news.url--]skin/default/js/swiper.min.js"></script>
...@@ -378,7 +377,12 @@ ...@@ -378,7 +377,12 @@
}; };
function inviteRedpack() { function inviteRedpack() {
window.location.href = "[!--temp.ucenterurl--]invite-redpack/index"; if(!/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)){
window.location.href = "http://a.app.qq.com/o/simple.jsp?pkgname=com.wxhkj.weixiuhui&ckey=CK1391535911216";
}else {
window.location.href = "[!--temp.ucenterurl--]invite-redpack/index";
}
} }
$(function () { $(function () {
......
index_prod.html 0 → 100644
View file @ 4f56f160
This diff is collapsed.
aa.html → index_test.html
View file @ 4f56f160
This diff is collapsed.
skin/default/css/style.css
View file @ 4f56f160
...@@ -1021,6 +1021,122 @@ ...@@ -1021,6 +1021,122 @@
vertical-align: top; vertical-align: top;
} }
/*邀请领红包*/
.enter-img {
background: #fff;
}
.enter-img a {
display: inline-block;
width: 100%;
text-align: center;
padding: 15px 0 0;
}
.enter-img img {
width: 100%;
}
.red-packet {
position: fixed;
width: 100%;
height: 100%;
top: 0;
left: 0;
background-color: rgba(0,0,0,.5);
z-index: 11;
}
.red-packet .info {
position: absolute;
left: 50%;
margin-left: -150px;
top: 50%;
width: 300px;
transform:translateY(-50%);
}
.red-packet .info img {
width: 100%;
}
.red-packet .info .text {
position: absolute;
top: 0;
left: 0;
width: 100%;
text-align: center;
color: #fff;
}
.red-packet .info .text h3 {
height: 140px;
line-height: 145px;
}
.red-packet .info .text p {
font-size: 48px;
font-family: arial, sans-serif;
padding: 0 0 20px;
}
.red-packet .info .text b {
font-weight: normal;
font-size: 14px;
font-family: "Helvetica Neue", Helvetica, "Microsoft YaHei", "\5FAE\8F6F\96C5\9ED1", Arial, sans-serif;
}
.red-packet .info .text button {
position: relative;
width: 80px;
height: 80px;
display: inline-block;
border: 0;
margin-left: 7px;
outline: none;
border-radius: 100%;
background-color: #fff259;
color: red;
font-size: 24px;
box-shadow: 0 0 1px 0 rgba(0,0,0,0.3), 0 0 30px 2px rgba(0,0,0,0.15);
}
.red-packet .info .text button:after {
content: '';
position: absolute;
top: 5px;
left: 5px;
width: 70px;
height: 70px;
border-radius: 100%;
border: 2px dotted rgba(0,0,0,.2);
box-sizing: border-box;
}
.red-packet .info .text button span {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 50px;
line-height: 40px;
display: inline-block;
text-align: center;
color: #ec2661;
font-weight: bold;
font-size: 16px;
}
.my-redpacket {
display: block;
margin-top: 10px;
color: #fff;
font-size: 14px;
}
.red-packet .info .close {
position: absolute;
left: 50%;
bottom: -40px;
text-align: center;
display: inline-block;
margin-left: -21px;
width: 40px;
height: 40px;
line-height: 36px;
border: 1px solid #fff;
border-radius: 100%;
font-size: 24px;
color: #fff;
}
/*适配电脑端*/ /*适配电脑端*/
@media screen and (min-width: 900px){ @media screen and (min-width: 900px){
html { html {
......
skin/default/images/enter.png
View replaced file @ 7c31c835 View file @ 4f56f160
skin/default/images/enter.png

141 KB | W: | H:

skin/default/images/enter.png

51.9 KB | W: | H:

skin/default/images/enter.png
skin/default/images/enter.png
skin/default/images/enter.png
skin/default/images/enter.png
  • 2-up
  • Swipe
  • Onion skin
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment