From e39dda2f25df9680e66c9e0dd3a606149e21bcc5 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 22 四月 2026 20:06:37 +0800
Subject: [PATCH] 代码生成

---
 small-program/unpackage/dist/dev/mp-weixin/pages/settings/settings.js |   42 ++++++++++++++++++++++++------------------
 1 files changed, 24 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..52a72ff 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
@@ -1,3 +1,6 @@
+<<<<<<< HEAD
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/settings/settings"],{224:function(e,n,t){"use strict";(function(e,n){var r=t(4);t(30);r(t(25));var o=r(t(225));e.__webpack_require_UNI_MP_PLUGIN__=t,n(o.default)}).call(this,t(1)["default"],t(2)["createPage"])},225:function(e,n,t){"use strict";t.r(n);var r=t(226),o=t(228);for(var u in o)["default"].indexOf(u)<0&&function(e){t.d(n,e,(function(){return o[e]}))}(u);t(231);var i,a=t(41),s=Object(a["default"])(o["default"],r["render"],r["staticRenderFns"],!1,null,"57211de6",null,!1,r["components"],i);s.options.__file="pages/settings/settings.vue",n["default"]=s.exports},226:function(e,n,t){"use strict";t.r(n);var r=t(227);t.d(n,"render",(function(){return r["render"]})),t.d(n,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(n,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(n,"components",(function(){return r["components"]}))},227:function(e,n,t){"use strict";var r;t.r(n),t.d(n,"render",(function(){return o})),t.d(n,"staticRenderFns",(function(){return i})),t.d(n,"recyclableRender",(function(){return u})),t.d(n,"components",(function(){return r}));try{r={uIcon:function(){return Promise.all([t.e("common/vendor"),t.e("node-modules/uview-ui/components/u-icon/u-icon")]).then(t.bind(null,367))},uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("node-modules/uview-ui/components/u-popup/u-popup")]).then(t.bind(null,399))}}}catch(a){if(-1===a.message.indexOf("Cannot find module")||-1===a.message.indexOf(".vue"))throw a;console.error(a.message),console.error("1. 鎺掓煡缁勪欢鍚嶇О鎷煎啓鏄惁姝g‘"),console.error("2. 鎺掓煡缁勪欢鏄惁绗﹀悎 easycom 瑙勮寖锛屾枃妗o細https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"),console.error("3. 鑻ョ粍浠朵笉绗﹀悎 easycom 瑙勮寖锛岄渶鎵嬪姩寮曞叆锛屽苟鍦� components 涓敞鍐岃缁勪欢")}var o=function(){var e=this,n=e.$createElement,t=(e._self._c,e.returnPhone(e.form.phone));e._isMounted||(e.e0=function(n){e.show=!0},e.e1=function(n){e.show=!1}),e.$mp.data=Object.assign({},{$root:{m0:t}})},u=!1,i=[];o._withStripped=!0},228:function(e,n,t){"use strict";t.r(n);var r=t(229),o=t.n(r);for(var u in r)["default"].indexOf(u)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(u);n["default"]=o.a},229:function(e,n,t){"use strict";(function(e){var r=t(4);Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o=r(t(34)),u=r(t(36)),i=r(t(11)),a=t(37),s=t(230);function c(e,n){var t=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);n&&(r=r.filter((function(n){return Object.getOwnPropertyDescriptor(e,n).enumerable}))),t.push.apply(t,r)}return t}function f(e){for(var n=1;n<arguments.length;n++){var t=null!=arguments[n]?arguments[n]:{};n%2?c(Object(t),!0).forEach((function(n){(0,i.default)(e,n,t[n])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(t)):c(Object(t)).forEach((function(n){Object.defineProperty(e,n,Object.getOwnPropertyDescriptor(t,n))}))}return e}var d={computed:f({},(0,a.mapState)(["userInfo","token"])),data:function(){return{show:!1,form:{nickName:"",name:"",telephone:"",phone1:"",fullCoverImage:"",coverImage:""}}},onLoad:function(){var n=this;this.form.nickName=this.userInfo.nickName,this.form.name=this.userInfo.name,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,e.$on("phone",(function(){n.form.telephone=n.userInfo.telephone,n.form.phone1=n.returnPhone(n.userInfo.telephone)}))},methods:{jumpxy:function(){e.navigateTo({url:"/pages/agreement-description/agreement-description"})},returnPhone:function(e){return(0,s.formatPhoneStar)(e)},jumpPhone:function(){this.show=!1,e.navigateTo({url:"/pages/change-binding/change-binding"})},jumpAddr:function(){e.navigateTo({url:"/pages/address/address"})},getAvatar:function(n){var t=this;e.uploadFile({url:"".concat(this.$baseUrl,"/web/public/upload"),filePath:n.detail.avatarUrl,name:"file",fileType:"image",header:{token:this.token},formData:{folder:"member"},success:function(e){var n=JSON.parse(e.data);t.form.coverImage=n.data.imgaddr,t.form.fullCoverImage=n.data.url,t.updateUserInfo()}})},updateUserInfo:function(){var e=this;this.$u.api.updateMember(this.form).then((function(n){200===n.code&&e.setUserInfo()}))},setUserInfo:function(){var e=this;return(0,u.default)(o.default.mark((function n(){var t;return o.default.wrap((function(n){while(1)switch(n.prev=n.next){case 0:return n.next=2,e.$u.api.getMemberInfo();case 2:if(t=n.sent,200!==t.code){n.next=8;break}return n.next=6,e.$store.commit("setUserInfo",t.data);case 6:return n.next=8,e.$store.commit("setOpenid",t.data.openId);case 8:case"end":return n.stop()}}),n)})))()},tuichu:function(){var n=this;this.$u.api.logOut().then((function(t){200===t.code&&(n.$store.commit("empty"),e.switchTab({url:"/pages/index/index"}))}))}}};n.default=d}).call(this,t(2)["default"])},231:function(e,n,t){"use strict";t.r(n);var r=t(232),o=t.n(r);for(var u in r)["default"].indexOf(u)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(u);n["default"]=o.a},232:function(e,n,t){}},[[224,"common/runtime","common/vendor"]]]);
+=======
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pages/settings/settings"],{
 
 /***/ 220:
@@ -100,6 +103,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 +201,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 +247,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 +259,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 +284,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 +295,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 +309,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'
           });
@@ -348,4 +353,5 @@
 /***/ })
 
 },[[220,"common/runtime","common/vendor"]]]);
+>>>>>>> 50573d8f1149d7020c38afb695116cb2953a3d43
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/settings/settings.js.map
\ No newline at end of file

--
Gitblit v1.9.3