Skip to content

Commit

Permalink
mock测试
Browse files Browse the repository at this point in the history
  • Loading branch information
@zkeyword
zkeyword committed Jan 24, 2017
1 parent 167350e commit 885bc97
Show file tree
Hide file tree
Showing 58 changed files with 2,520 additions and 478 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ module.exports = {
// allow async-await
'generator-star-spacing': 0,
// allow debugger during development
'no-debugger': process.env.NODE_ENV === 'production' ? 4 : 0
// 'no-debugger': process.env.NODE_ENV === 'production' ? 4 : 0
}
}
168 changes: 164 additions & 4 deletions build/mock.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,173 @@ var express = require('express'),
app.use(bodyParser.urlencoded({ extended: false }));
app.use(bodyParser.json());

app.post('/api/login', function (req, res) {
if (req.body.username == 'a' && req.body.password == 'a') {
var data = { }
app.post('/api/auth/login', function (req, res) {
if (req.body.mobile == '1' && req.body.password == '1') {
var data = {
"code": 0,
"msg": "登录成功", //服务端返回的说明
"data": {
"username": "13600000000", // 用户登录名称
"mobile": "13600000000", // 用户手机号
"realname": "", // 用户真实名称
"avatar": "", // 用户头像
"access_token": "524924aa33f0146cc99ad00eb6487937", // 用户新的访问令牌，后面用这个来获取数据
"secret_key": "5eJjYX", // 加密的密钥
"expired_at": 1484734645 // token过期时间
}
}
} else {
var data = { "time": "2016-05-05 16:43:59", "status": 2, "msg": "登录失败" }
var data = {
"code": 99,
"msg": "登录失败"
}
}
res.send(JSON.stringify(data, null, 4));
});






app.post('/api/auth/register', function (req, res) {
var data = {
"code": 0,
"msg": "注册成功",
"data": {
"mobile": "13600000003",
"realname": "张三",
"access_token": "7e3ffd63dc4d246fc25ad67751106022",
"secret_key": "mI9W1h",
"expired_at": 1484757366
}
}

res.send(JSON.stringify(data, null, 4));
});

app.post('/api/common/send_sms', function (req, res) {
var data = {
"code": 0,
"msg": "操作成功",
"data": []
}

res.send(JSON.stringify(data, null, 4));
});

app.post('/api/common/verify_sms', function (req, res) {
var data = {
"code": 0,
"msg": "操作成功",
"data": []
}

res.send(JSON.stringify(data, null, 4));
});

app.get('/api/common/parent_items', function (req, res) {
var data = {
"code": 0,
"msg": "操作成功！",
"data": [
{
"id": 1, // 父亲关系ID,注册完善信息时请用此ID
"member_id": 6, // 父母亲的成员ID，获取配偶列表时请用此ID
"realname": "张辰骏", // 父母亲名称
"name": "张辰骏(爷爷:张晋福)", // 父母亲完整路径名称（选择是请显示这个）
"father_path_items": [],
"mother_path_items": []
},
{
"id": 2,
"member_id": 7,
"realname": "张东骏",
"name": "张东骏(爷爷:张增旭)",
"father_path_items": [],
"mother_path_items": []
},
{
"id": 3,
"member_id": 8,
"realname": "张茗赫",
"name": "张茗赫(爷爷:张增旭)",
"father_path_items": [],
"mother_path_items": []
}
]
}

res.send(JSON.stringify(data, null, 4));
});

app.get('/api/common/spouse_items', function (req, res) {
var data = {
"code": 0,
"msg": "操作成功！",
"data": [
{
"id": 6, // 配偶ID（完善用户注册信息时，请使用此字段）
"name": "高沛菡", // 配偶名称
"kind": 2, // 配偶类型，1-丈夫，2-妻子
"number": 1 // 第几任
}
]
}

res.send(JSON.stringify(data, null, 4));
});

app.get('/api/auth/member_info', function (req, res) {
var data = {
"code": 0,
"msg": "操作成功！",
"data": {
"id": 1, // 会员ID
"username": "13600000000", // 会员登录名称
"sn": "12322212313", // 会员编号
"old_sn": "12322212313", // 会员旧编号
"avatar": "http://zp.songheyi.com/1.jpg", // 会员头像
"mobile": "13600000000", // 会员手机号
"realname": "张增旭", // 会员真实名称
"sex": 0, // 性别，0-未设置，1-男，2-女
"idno": "", // 身份证号
"birthday": 0, // 出生日期
"native_country_id": "", // 籍贯所在国家
"native_province_id": "", // 籍贯所在省份
"native_city_id": "", // 籍贯所在城市
"native_district_id": "", // 籍贯所在地区
"native_place": [], // 籍贯名称（数组形式）
"country_id": "", // 当前所在国家
"province_id": "", // 当前所在省份
"city_id": "", // 当前所在城市
"district_id": "", // 当前所在地区
"region_name": [], // 当前所属区域名称（数组形式）
"family_id": 1, // 所属家族ID
"family_sn": "zhang.fujian", // 所属家族编号
"family_name": "福建张氏", // 所属家族名称
"is_ancestor": 0, // 是否是始祖
"generations": 98, // 世系数
"hierarchies_name": "", // 辈分名称
"rank": 1, // 排行
"marital_status": 0, // 婚姻状况，0-未设置，1-已婚,2-未婚,3-离异,4-丧偶
"son_in_law": 0, // 是否是上门女婿，0-否，1-是
"two_parent": 0, // 是否是双承,0-否,1-是
"huzhu": "", // 户主名称
"living": 0, // 是否健在
"died_at": 0, // 去世时间
"burial_city_id": "", // 墓葬所属城市ID
"burial_district_id": "", // 墓葬所在地区ID
"burial_region_name": "", // 墓葬地区名称（数组形式）
"burial_address": "", // 墓葬详细地址
"status": 1, // 成员状态,1-启用,2-禁用
"audit_status": 1 // 用户审核状态1-待审核,2-审核通过,3-审核不通过
}
}

res.send(JSON.stringify(data, null, 4));
});



module.exports = app;
4 changes: 3 additions & 1 deletion build/webpack.base.conf.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ let webpackConfig = {
'vue$': 'vue/dist/vue.common.js',
'src': path.resolve(__dirname, '../src'),
'assets': path.resolve(__dirname, '../src/assets'),
'components': path.resolve(__dirname, '../src/components')
'components': path.resolve(__dirname, '../src/components'),
'store': path.resolve(__dirname, '../src/store'),
'utils': path.resolve(__dirname, '../src/utils')
}
},
resolveLoader: {
Expand Down
2 changes: 1 addition & 1 deletion index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<title>vue2-demo</title>
</head>
<body>
<div id="app"></div>
<div id="app">加载中...</div>
</body>
</html>
1 change: 1 addition & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
"opn": "^4.0.2",
"ora": "^0.3.0",
"phantomjs-prebuilt": "^2.1.3",
"react-cookie": "^1.0.4",
"selenium-server": "2.53.1",
"semver": "^5.3.0",
"shelljs": "^0.7.4",
Expand Down
38 changes: 31 additions & 7 deletions src/api/index.js
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,39 @@
import axios from 'axios'
export default {
baseInfo(data) {
reset(data) {
return axios
.get('/api/test.json', {
params: data
})
.get('/api/auth/reset_password', data)
},
login(data) {
return axios
.post('/api/login', {
params: data
})
.post('/api/auth/login', data)
},
register(data) {
return axios
.post('/api/auth/register', data)
},
sendSms(data) {
return axios
.post('/api/common/send_sms', data)
},
verifySms(data) {
return axios
.post('/api/common/verify_sms', data)
},
userInfo(data) {
return axios
.post('/api/common/member_info', data)
},
parent(data) {
return axios
.get('/api/common/parent_items', data)
},
spouseList(data) {
return axios
.get('/api/common/spouse_items', data)
},
perfectInfo(data) {
return axios
.get('/api/auth/perfect_info', data)
}
}
98 changes: 97 additions & 1 deletion src/assets/icomoon/demo.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,106 @@
<link rel="stylesheet" href="style.css"></head>
<body>
<div class="bgc1 clearfix">
<h1 class="mhmm mvm"><span class="fgc1">Font Name:</span> icomoon <small class="fgc1">(Glyphs:&nbsp;18)</small></h1>
<h1 class="mhmm mvm"><span class="fgc1">Font Name:</span> icomoon <small class="fgc1">(Glyphs:&nbsp;24)</small></h1>
</div>
<div class="clearfix mhl ptl">
<h1 class="mvm mtn fgc1">Grid Size: Unknown</h1>
<div class="glyph fs1">
<div class="clearfix bshadow0 pbs">
<span class="icon-a1">

</span>
<span class="mls"> icon-a1</span>
</div>
<fieldset class="fs0 size1of1 clearfix hidden-false">
<input type="text" readonly value="e912" class="unit size1of2" />
<input type="text" maxlength="1" readonly value="&#xe912;" class="unitRight size1of2 talign-right" />
</fieldset>
<div class="fs0 bshadow0 clearfix hidden-true">
<span class="unit pvs fgc1">liga: </span>
<input type="text" readonly value="" class="liga unitRight" />
</div>
</div>
<div class="glyph fs1">
<div class="clearfix bshadow0 pbs">
<span class="icon-a2">

</span>
<span class="mls"> icon-a2</span>
</div>
<fieldset class="fs0 size1of1 clearfix hidden-false">
<input type="text" readonly value="e913" class="unit size1of2" />
<input type="text" maxlength="1" readonly value="&#xe913;" class="unitRight size1of2 talign-right" />
</fieldset>
<div class="fs0 bshadow0 clearfix hidden-true">
<span class="unit pvs fgc1">liga: </span>
<input type="text" readonly value="" class="liga unitRight" />
</div>
</div>
<div class="glyph fs1">
<div class="clearfix bshadow0 pbs">
<span class="icon-b1">

</span>
<span class="mls"> icon-b1</span>
</div>
<fieldset class="fs0 size1of1 clearfix hidden-false">
<input type="text" readonly value="e914" class="unit size1of2" />
<input type="text" maxlength="1" readonly value="&#xe914;" class="unitRight size1of2 talign-right" />
</fieldset>
<div class="fs0 bshadow0 clearfix hidden-true">
<span class="unit pvs fgc1">liga: </span>
<input type="text" readonly value="" class="liga unitRight" />
</div>
</div>
<div class="glyph fs1">
<div class="clearfix bshadow0 pbs">
<span class="icon-b2">

</span>
<span class="mls"> icon-b2</span>
</div>
<fieldset class="fs0 size1of1 clearfix hidden-false">
<input type="text" readonly value="e915" class="unit size1of2" />
<input type="text" maxlength="1" readonly value="&#xe915;" class="unitRight size1of2 talign-right" />
</fieldset>
<div class="fs0 bshadow0 clearfix hidden-true">
<span class="unit pvs fgc1">liga: </span>
<input type="text" readonly value="" class="liga unitRight" />
</div>
</div>
<div class="glyph fs1">
<div class="clearfix bshadow0 pbs">
<span class="icon-c1">

</span>
<span class="mls"> icon-c1</span>
</div>
<fieldset class="fs0 size1of1 clearfix hidden-false">
<input type="text" readonly value="e916" class="unit size1of2" />
<input type="text" maxlength="1" readonly value="&#xe916;" class="unitRight size1of2 talign-right" />
</fieldset>
<div class="fs0 bshadow0 clearfix hidden-true">
<span class="unit pvs fgc1">liga: </span>
<input type="text" readonly value="" class="liga unitRight" />
</div>
</div>
<div class="glyph fs1">
<div class="clearfix bshadow0 pbs">
<span class="icon-c2">

</span>
<span class="mls"> icon-c2</span>
</div>
<fieldset class="fs0 size1of1 clearfix hidden-false">
<input type="text" readonly value="e917" class="unit size1of2" />
<input type="text" maxlength="1" readonly value="&#xe917;" class="unitRight size1of2 talign-right" />
</fieldset>
<div class="fs0 bshadow0 clearfix hidden-true">
<span class="unit pvs fgc1">liga: </span>
<input type="text" readonly value="" class="liga unitRight" />
</div>
</div>
<div class="glyph fs1">
<div class="clearfix bshadow0 pbs">
<span class="icon-bianji">
Expand Down
Loading

0 comments on commit 885bc97

Please sign in to comment.