Authored by 石坚

blk样式bug修改

/**
* [个人中心]yoho
* [个人中心]有货
* @author: jiangmin
* @date: 2016/07/11
*/
... ... @@ -36,7 +36,7 @@ const getDate = (time)=> {
};
/**
* yoho币页面加载
* 有货币页面加载
*/
const index = (req, res, next) => {
let uid = req.user.uid;
... ... @@ -67,12 +67,12 @@ const index = (req, res, next) => {
page: 'currency',
isMe: true,
content: {
nav: mcHandler.getMeCrumb('我的YOHO币'),
navigation: mcHandler.getSideMenu('我的YOHO币'),
nav: mcHandler.getMeCrumb('我的有货币'),
navigation: mcHandler.getSideMenu('我的有货币'),
banner: thumb,
currency: true,
tabs: result[0].list.tabs,
title: '我的YOHO币',
title: '我的有货币',
currentYear: new Date().getFullYear(),
data: result[0].list.coinList,
paginationOpts: result[0].list.paginationOpts,
... ...
/**
* [个人中心]YOHO
* [个人中心]有货
* @author: jiangmin
* @date: 2016/07/11
*/
... ... @@ -10,7 +10,7 @@ const api = global.yoho.API;
const camelCase = global.yoho.camelCase;
/**
* yoho币列表数据
* 有货币列表数据
* @param uid
* @param page
* @param queryType
... ... @@ -87,7 +87,7 @@ const yohoCoinList = (uid, page, queryType, beginTime) => {
};
/**
* yoho币总数
* 有货币总数
* @returns {*}
*/
const yohoCoinTotal = (uid)=> {
... ... @@ -105,7 +105,7 @@ const yohoCoinTotal = (uid)=> {
};
/**
* 获取yoho币相关数据
* 获取有货币相关数据
* @param uid
* @param page
* @param queryType
... ...
... ... @@ -57,7 +57,7 @@ const navigation = [
},
{
link: url('/me/currency'),
name: '我的YOHO币'
name: '我的有货币'
},
{
link: url('/me/setting'),
... ...
... ... @@ -56,7 +56,7 @@ router.post('/address/default', auth, address.setDefaultAddress);
router.get('/address/list', address.getAddressList); // 获取地址列表
router.get('/address/areas/:areaId', address.getAddressData);
// 个人中心首页/YOHO
// 个人中心首页/有货
router.get('/currency', auth, currency.index);
// 个人中心首页/个人设置
... ...
... ... @@ -60,7 +60,7 @@
{{> message}}
{{/if}}
{{!-- 我的YOHO币 --}}
{{!-- 我的有货币 --}}
{{#if currency}}
{{> currency}}
{{/if}}
... ...
... ... @@ -5,7 +5,7 @@
</div>
<div class="inline-block total-yohocoin">
<div class="current-yohocoin">目前可用YOHO币:<span class="blue">{{num.yohocoin_num}}</span></div>
<div class="current-yohocoin">目前可用有货币:<span class="blue">{{num.yohocoin_num}}</span></div>
<div class="left-yohocoin">{{currentYear}}年12月31日即将过期:<span class="blue">{{num.nearExpCoinNum}}</span></div>
</div>
</div>
... ...
... ... @@ -88,7 +88,7 @@ const index = uid => {
* @param number uid user id
* @param number $deliveryWay 配送方式,1表示普通快递,2表示顺丰速运
* @param int $paymentType 支付方式,1表示在线支付,2表示货到付款
* @param number $yohoCoin 使用的YOHO币数量
* @param number $yohoCoin 使用的有货币数量
* */
const _computeApi = (uid, deliveryWay, paymentType, yohoCoin) => api.get('', {
method: 'app.Shopping.compute',
... ... @@ -110,7 +110,7 @@ const compute = (uid, yohoCoin) => {
let coin;
// YOHO币稀释
// 有货币稀释
if (yohoCoin) {
coin = yohoCoin / 100;
}
... ...
... ... @@ -20,7 +20,7 @@
<a href="{{../siteUrl}}/me">{{userName}}</a>
<a href="{{../siteUrl}}/passport/logout">[退出]</a>
{{^}}
<a href="{{../siteUrl}}/passport/login">登录</a> |
<a href="{{../siteUrl}}/passport/login">登录</a> |
<a href="{{../siteUrl}}/passport/reg">注册</a>
{{/if}}
</li>
... ... @@ -46,7 +46,7 @@
</a>
<div class="mini-bag-box sub-wrapper bag-empty">
<div class="bag-goods">
<dl class="mini-goods-list"></dl>
<div class="mini-goods-list-wrap nano"><div class="nano-content"><dl class="mini-goods-list"></dl></div></div>
<div class="go-bag-btn">
<a href="{{../siteUrl}}/shopping/cart">去购物车结算</a>
</div>
... ...
... ... @@ -15,6 +15,9 @@ var $searchWrap = $('.search-wrapper'),
var goodsTpl = require('../../tpl/common/bag-goods.hbs');
require('yoho-jquery-nanoscroller');
var delayer;
function handelProduct(data) {
... ... @@ -63,6 +66,7 @@ function refreshBag() {
$bagGoodsList.empty();
$miniBag.addClass('bag-empty');
}
$('.nano').nanoScroller({disableResize: true});
}
}
... ...
/**
* [个人中心]YOHO
* [个人中心]有货
* @author: jiangmin
* @date: 2016/07/11
*/
... ...
... ... @@ -19,7 +19,7 @@ var $applyBtn = $('#apply-btn');
var orderCode = $('#order-code').val() || 0,
specialReason = $refundTable.data() || {},
payInfo = { // 退款信息
type: $refundType.find('.type-item.cur').data('id') // 1--原卡返回 2--银行卡 3--支付宝 4--yoho
type: $refundType.find('.type-item.cur').data('id') // 1--原卡返回 2--银行卡 3--支付宝 4--有货
};
var imgBoxTpl = require('../../tpl/me/thumbnail.hbs');
... ...
... ... @@ -172,7 +172,7 @@
background: #fff;
}
.mini-goods-list {
.mini-goods-list-wrap {
width: 340px;
max-height: 350px;
display: block;
... ... @@ -235,6 +235,9 @@
.del-good-btn {
cursor: pointer;
color: #999;
&:hover{
color: #1b1b1b;
}
}
}
}
... ...