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