Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # pages/personCenter/mine/mine.js
This commit is contained in:
commit
92aab2ab7b
|
@ -7,8 +7,8 @@ Page({
|
|||
* 页面的初始数据
|
||||
*/
|
||||
data: {
|
||||
items: [null],
|
||||
yt: "",
|
||||
items: [null, null],
|
||||
cxz: "",
|
||||
nickName: "",
|
||||
userAvatar: "",
|
||||
phoneNumber: "",
|
||||
|
|
Loading…
Reference in New Issue
Block a user