Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # pages/personCenter/mine/mine.js
This commit is contained in:
commit
95bede1c28
|
@ -8,8 +8,7 @@ Page({
|
||||||
*/
|
*/
|
||||||
data: {
|
data: {
|
||||||
items: [null],
|
items: [null],
|
||||||
cxz1: "",
|
cxz: "",
|
||||||
hello1: "",
|
|
||||||
nickName: "",
|
nickName: "",
|
||||||
userAvatar: "",
|
userAvatar: "",
|
||||||
phoneNumber: "",
|
phoneNumber: "",
|
||||||
|
|
Loading…
Reference in New Issue
Block a user