From 46fee771214e1ed976ed490b3fd1ae8b5383673e Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 21 四月 2026 16:29:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/unpackage/dist/dev/mp-weixin/pages/settings/settings.js | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/small-program/unpackage/dist/dev/mp-weixin/pages/settings/settings.js b/small-program/unpackage/dist/dev/mp-weixin/pages/settings/settings.js
index dd74f25..e656e0f 100644
--- a/small-program/unpackage/dist/dev/mp-weixin/pages/settings/settings.js
+++ b/small-program/unpackage/dist/dev/mp-weixin/pages/settings/settings.js
@@ -100,6 +100,9 @@
var components
try {
components = {
+ uIcon: function () {
+ return Promise.all(/*! import() | node-modules/uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-icon/u-icon.vue */ 334))
+ },
uPopup: function () {
return Promise.all(/*! import() | node-modules/uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-popup/u-popup.vue */ 352))
},
@@ -195,26 +198,26 @@
return {
show: false,
form: {
- nickname: '',
+ nickName: '',
name: '',
- phone: '',
+ telephone: '',
phone1: '',
- imgFullUrl: '',
- imgurl: ''
+ fullCoverImage: '',
+ coverImage: ''
}
};
},
onLoad: function onLoad() {
var _this = this;
- this.form.nickname = this.userInfo.nickname;
+ this.form.nickName = this.userInfo.nickName;
this.form.name = this.userInfo.name;
- this.form.phone = this.userInfo.phone;
- this.form.phone1 = this.returnPhone(this.userInfo.phone);
- this.form.imgFullUrl = this.userInfo.imgFullUrl;
- this.form.imgurl = this.userInfo.imgurl;
+ this.form.telephone = this.userInfo.telephone;
+ this.form.phone1 = this.returnPhone(this.userInfo.telephone);
+ this.form.fullCoverImage = this.userInfo.fullCoverImage;
+ this.form.coverImage = this.userInfo.coverImage;
uni.$on('phone', function () {
- _this.form.phone = _this.userInfo.phone;
- _this.form.phone1 = _this.returnPhone(_this.userInfo.phone);
+ _this.form.telephone = _this.userInfo.telephone;
+ _this.form.phone1 = _this.returnPhone(_this.userInfo.telephone);
});
},
methods: {
@@ -241,7 +244,7 @@
getAvatar: function getAvatar(e) {
var that = this;
uni.uploadFile({
- url: "".concat(this.$baseUrl, "public/upload"),
+ url: "".concat(this.$baseUrl, "/web/public/upload"),
filePath: e.detail.avatarUrl,
name: 'file',
fileType: 'image',
@@ -253,8 +256,8 @@
},
success: function success(uploadFileRes) {
var result = JSON.parse(uploadFileRes.data);
- that.form.imgurl = result.data.imgaddr;
- that.form.imgFullUrl = result.data.url;
+ that.form.coverImage = result.data.imgaddr;
+ that.form.fullCoverImage = result.data.url;
that.updateUserInfo();
}
});
@@ -278,7 +281,7 @@
switch (_context.prev = _context.next) {
case 0:
_context.next = 2;
- return _this3.$u.api.getUserInfo();
+ return _this3.$u.api.getMemberInfo();
case 2:
res = _context.sent;
if (!(res.code === 200)) {
@@ -289,7 +292,7 @@
return _this3.$store.commit('setUserInfo', res.data);
case 6:
_context.next = 8;
- return _this3.$store.commit('setOpenId', res.data.openId);
+ return _this3.$store.commit('setOpenid', res.data.openId);
case 8:
case "end":
return _context.stop();
@@ -303,8 +306,7 @@
var _this4 = this;
this.$u.api.logOut().then(function (res) {
if (res.code === 200) {
- _this4.$store.commit('clear');
- uni.$emit('loginOut');
+ _this4.$store.commit('empty');
uni.switchTab({
url: '/pages/index/index'
});
--
Gitblit v1.9.3