firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge branch 'master' of github.com:gnuboard/yc5

Browse Source
This commit is contained in:
thisgun
2020-03-30 15:02:11 +09:00
parent bd7cc14f75 6e0cff2871
commit 625bdc0a6f
6 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
css/default_shop.css
View File

@ -438,7 +438,7 @@ box-shadow:inset 0 1px 1px rgba(0, 0, 0, .075)}
/* 자료 없는 목록 */ /* 자료 없는 목록 */
.empty_table {padding:50px 0 !important;text-align:center;color:#777 !important} .empty_table {padding:50px 0 !important;text-align:center;color:#777 !important}
.empty_list, .empty_li {padding:20px 0 !important;text-align:center;color:#777 !important} .empty_list, .empty_li {padding:20px 0 !important;text-align:center !important;color:#777 !important}
/* 필수입력 */ /* 필수입력 */
.required, textarea.required {background-image:url('../img/require.png') !important;background-repeat:no-repeat !important;background-position:right top !important} .required, textarea.required {background-image:url('../img/require.png') !important;background-repeat:no-repeat !important;background-position:right top !important}

14
js/common.js
View File

@ -539,6 +539,15 @@ var win_poll = function(href) {
new_win.focus(); new_win.focus();
} }
/**
* 쿠폰
**/
var win_coupon = function(href) {
var new_win = window.open(href, "win_coupon", "left=100,top=100,width=700, height=600, scrollbars=1");
new_win.focus();
}
/** /**
* 스크린리더 미사용자를 위한 스크립트 - 지운아빠 2013-04-22 * 스크린리더 미사용자를 위한 스크립트 - 지운아빠 2013-04-22
* alt 값만 갖는 그래픽 링크에 마우스오버 시 title 값 부여, 마우스아웃 시 title 값 제거 * alt 값만 갖는 그래픽 링크에 마우스오버 시 title 값 부여, 마우스아웃 시 title 값 제거
@ -632,6 +641,11 @@ $(function(){
}); });
*/ */
$(".win_coupon").click(function() {
win_coupon(this.href);
return false;
});
// 사이드뷰 // 사이드뷰
var sv_hide = false; var sv_hide = false;
$(".sv_member, .sv_guest").click(function() { $(".sv_member, .sv_guest").click(function() {

20
mobile/shop/mypage.php
View File

@ -31,10 +31,14 @@ $cp_count = get_shop_member_coupon_count($member['mb_id'], true);
</ul> </ul>
</div> </div>
<ul class="my_pocou"> <ul class="my_pocou">
<li class="my_cou">보유쿠폰<a href="<?php echo G5_SHOP_URL; ?>/coupon.php" target="_blank" class="win_coupon"><?php echo number_format($cp_count); ?></a></li> <li class="my_cou">
<li class="my_point">보유포인트 보유쿠폰
<a href="<?php echo G5_BBS_URL; ?>/point.php" target="_blank" class="win_point"><?php echo number_format($member['mb_point']); ?>점</a></li> <a href="<?php echo G5_SHOP_URL; ?>/coupon.php" target="_blank" class="win_coupon"><?php echo number_format($cp_count); ?></a>
</li>
<li class="my_point">
보유포인트
<a href="<?php echo G5_BBS_URL; ?>/point.php" target="_blank" class="win_point"><?php echo number_format($member['mb_point']); ?>점</a>
</li>
</ul> </ul>
<div class="my_info"> <div class="my_info">
<div class="my_info_wr"> <div class="my_info_wr">
@ -125,14 +129,6 @@ $cp_count = get_shop_member_coupon_count($member['mb_id'], true);
</div> </div>
<script> <script>
$(function() {
$(".win_coupon").click(function() {
var new_win = window.open($(this).attr("href"), "win_coupon", "left=100,top=100,width=700, height=600, scrollbars=1");
new_win.focus();
return false;
});
});
function member_leave() function member_leave()
{ {
return confirm('정말 회원에서 탈퇴 하시겠습니까?') return confirm('정말 회원에서 탈퇴 하시겠습니까?')

8
shop/mypage.php
View File

@ -146,14 +146,6 @@ for($k=0; $cp=sql_fetch_array($res); $k++) {
</div> </div>
<script> <script>
$(function() {
$(".win_coupon").click(function() {
var new_win = window.open($(this).attr("href"), "win_coupon", "left=100,top=100,width=700, height=600, scrollbars=1");
new_win.focus();
return false;
});
});
function member_leave() function member_leave()
{ {
return confirm('정말 회원에서 탈퇴 하시겠습니까?') return confirm('정말 회원에서 탈퇴 하시겠습니까?')

2
theme/basic/css/default_shop.css
View File

@ -438,7 +438,7 @@ box-shadow:inset 0 1px 1px rgba(0, 0, 0, .075)}
/* 자료 없는 목록 */ /* 자료 없는 목록 */
.empty_table {padding:50px 0 !important;text-align:center;color:#777 !important} .empty_table {padding:50px 0 !important;text-align:center;color:#777 !important}
.empty_list, .empty_li {padding:20px 0 !important;text-align:center;color:#777 !important} .empty_list, .empty_li {padding:20px 0 !important;text-align:center !important;color:#777 !important}
/* 필수입력 */ /* 필수입력 */
.required, textarea.required {background-image:url('../img/require.png') !important;background-repeat:no-repeat !important;background-position:right top !important} .required, textarea.required {background-image:url('../img/require.png') !important;background-repeat:no-repeat !important;background-position:right top !important}

8
theme/basic/shop/mypage.php
View File

@ -162,14 +162,6 @@ for($k=0; $cp=sql_fetch_array($res); $k++) {
</div> </div>
<script> <script>
$(function() {
$(".win_coupon").click(function() {
var new_win = window.open($(this).attr("href"), "win_coupon", "left=100,top=100,width=700, height=600, scrollbars=1");
new_win.focus();
return false;
});
});
function member_leave() function member_leave()
{ {
return confirm('정말 회원에서 탈퇴 하시겠습니까?') return confirm('정말 회원에서 탈퇴 하시겠습니까?')