Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yohoblk-wap
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
ccbikai
9 years ago
Commit
4a408e73a4498e282e5d263fb135076c1d9f1e52
1 parent
d19681b3
去除测试 UID
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
32 deletions
apps/home/controllers/order.js
public/js/common/intercept-click.js
public/vue/component/product/filter.vue
public/vue/component/product/filter.vue.bk
apps/home/controllers/order.js
View file @
4a408e7
...
...
@@ -7,7 +7,6 @@
const
orderModel
=
require
(
'../models/order'
);
const
notLoginCode
=
400
;
const
notLoginTip
=
'抱歉,您暂未登录!'
;
const
testUid
=
8039837
;
// 8039836; //8050882;// 测试uid
const
isBLK
=
1
;
const
order
=
{
...
...
@@ -24,8 +23,6 @@ const order = {
let
orderCode
=
req
.
query
.
orderCode
;
let
uid
=
req
.
user
.
uid
;
uid
=
testUid
;
// 测试uid
if
(
!
uid
&&
req
.
xhr
)
{
return
res
.
json
({
code
:
notLoginCode
,
...
...
@@ -40,12 +37,11 @@ const order = {
});
},
getOrderData
:
(
req
,
res
)
=>
{
let
uid
=
req
.
query
.
id
;
let
uid
=
req
.
user
.
u
id
;
let
page
=
req
.
query
.
page
;
let
type
=
req
.
query
.
type
;
let
limit
=
req
.
query
.
limit
;
uid
=
testUid
;
if
(
!
uid
&&
req
.
xhr
)
{
return
res
.
json
({
code
:
notLoginCode
,
...
...
@@ -68,8 +64,6 @@ const order = {
let
orderCode
=
req
.
query
.
orderCode
;
let
uid
=
req
.
user
.
uid
;
uid
=
testUid
;
// 测试uid
if
(
!
uid
&&
req
.
xhr
)
{
return
res
.
json
({
code
:
notLoginCode
,
...
...
@@ -102,8 +96,6 @@ const order = {
let
orderCode
=
req
.
body
.
orderCode
;
let
uid
=
req
.
user
.
uid
;
uid
=
testUid
;
// 测试uid
if
(
!
uid
&&
req
.
xhr
)
{
return
res
.
json
({
code
:
notLoginCode
,
...
...
@@ -118,8 +110,6 @@ const order = {
coin
:
(
req
,
res
,
next
)
=>
{
let
uid
=
req
.
user
.
id
;
uid
=
testUid
;
orderModel
.
getCoins
(
uid
).
then
(
result
=>
{
res
.
render
(
'coin'
,
{
module
:
'home'
,
...
...
@@ -140,7 +130,6 @@ const order = {
let
page
=
req
.
query
.
page
;
let
limit
=
req
.
query
.
limit
;
uid
=
testUid
;
if
(
!
uid
&&
req
.
xhr
)
{
return
res
.
json
({
code
:
notLoginCode
,
...
...
public/js/common/intercept-click.js
View file @
4a408e7
...
...
@@ -203,6 +203,11 @@ module.exports = (url) => {
return
yoho
.
goTab
({
index
:
1
});
}
// 首页
if
(
/
\/
$/
.
test
(
path
))
{
return
yoho
.
goTab
({
index
:
0
});
}
yoho
.
goNewPage
({
header
:
matchHeader
(
url
),
url
:
/^
(
https
?
:
)?\/\/
/i
.
test
(
url
)
?
url
:
origin
+
url
...
...
public/vue/component/product/filter.vue
View file @
4a408e7
<template>
<div class="filter-box">
<div class="filter" :class="{ 'filter-open': isVisible}">
<div class="filter" :class="{ 'filter-open': isVisible}">
<div class="filter-actions">
<a href="javascript:;" class="filter-action" @click="clearVals">清空</a>
<button class="button button-small filter-action" @click="okAction">确定</button>
...
...
@@ -144,49 +144,49 @@
transform: translate3d(0, 0, 0);
}
}
.filter-actions {
font-size: 34px;
text-align: right;
padding: 45px 0;
}
.filter-action {
font-size: inherit;
margin-left: 40px;
}
.filter-actions,
.filter-cate {
border-bottom: 1px solid $grey;
}
.filter-cates {
list-style: none;
margin: 0;
padding: 0;
}
.filter-cate .icon-right {
margin-left: 24px;
}
.filter-cate,
.icon-right {
height: 118px;
line-height: 118px;
}
.filter-cate-label {
font-size: 36px;
font-weight: bold;
}
.filter-cate-val {
float: right;
font-size: 28px;
}
.filter-cate-val,
.filter-cate .icon {
color: $grey;
...
...
public/vue/component/product/filter.vue.bk
View file @
4a408e7
<template>
<div class="filter" :class="{ 'filter-open': isVisible}">
<div class="filter" :class="{ 'filter-open': isVisible}">
<div class="filter-actions">
<a href="javascript:;" class="filter-action" @click="clearVals">清空</a>
<button class="button button-small filter-action" @click="okAction">确定</button>
...
...
@@ -143,49 +143,49 @@
transform: translate3d(0, 0, 0);
}
}
.filter-actions {
font-size: 34px;
text-align: right;
padding: 45px 0;
}
.filter-action {
font-size: inherit;
margin-left: 40px;
}
.filter-actions,
.filter-cate {
border-bottom: 1px solid $grey;
}
.filter-cates {
list-style: none;
margin: 0;
padding: 0;
}
.filter-cate .icon-right {
margin-left: 24px;
}
.filter-cate,
.icon-right {
height: 118px;
line-height: 118px;
}
.filter-cate-label {
font-size: 36px;
font-weight: bold;
}
.filter-cate-val {
float: right;
font-size: 28px;
}
.filter-cate-val,
.filter-cate .icon {
color: $grey;
...
...
Please
register
or
login
to post a comment