From b0a49dc67deee0586be7a903e043368cb410b5a1 Mon Sep 17 00:00:00 2001 From: hot777zz <912275990@qq.com> Date: Wed, 15 Nov 2023 16:19:22 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=A2=81=E8=88=AA=EF=BC=9A=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E9=A1=B5=E9=9D=A2=E8=AF=B7=E6=B1=82=E5=92=8C=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 171 +++++++++--------- pages/my/my.vue | 19 +- .../publishTransfer/publishTransfer.vue | 36 ++-- service/request.js | 8 +- 4 files changed, 128 insertions(+), 106 deletions(-) diff --git a/manifest.json b/manifest.json index a87efa3..75a64ce 100644 --- a/manifest.json +++ b/manifest.json @@ -1,82 +1,91 @@ { - "name": "city-store-transfer", - "appid": "__UNI__F3EA0D6", - "description": "", - "versionName": "1.0.0", - "versionCode": "100", - "transformPx": false, - /* 5+App特有相关 */ - "app-plus": { - "usingComponents": true, - "nvueStyleCompiler": "uni-app", - "compilerVersion": 3, - "splashscreen": { - "alwaysShowBeforeRender": true, - "waiting": true, - "autoclose": true, - "delay": 0 - }, - /* 模块配置 */ - "modules": {}, - /* 应用发布信息 */ - "distribute": { - /* android打包配置 */ - "android": { - "permissions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - /* ios打包配置 */ - "ios": {}, - /* SDK配置 */ - "sdkConfigs": {} - } - }, - /* 快应用特有相关 */ - "quickapp": {}, - /* 小程序特有相关 */ - "mp-weixin": { - "appid": "wxda178d12ae834c45", - "setting": { - "urlCheck": false - }, - "usingComponents": true, - "permission": { - // 获取当前的地理位置、速度 配置 - "scope.userLocation": { - "desc": "你的位置信息将用于小程序位置接口的效果展示" - }, - "scope.userFuzzyLocation": { - "desc": "你的位置信息将用于小程序位置的效果展示" - } - }, - "requiredPrivateInfos": ["choosePoi", "chooseAddress", "getFuzzyLocation"] - }, - "mp-alipay": { - "usingComponents": true - }, - "mp-baidu": { - "usingComponents": true - }, - "mp-toutiao": { - "usingComponents": true - }, - "uniStatistics": { - "enable": false - }, - "vueVersion": "2" -} \ No newline at end of file + "name" : "city-store-transfer", + "appid" : "__UNI__F3EA0D6", + "description" : "", + "versionName" : "1.0.0", + "versionCode" : "100", + "transformPx" : false, + /* 5+App特有相关 */ + "app-plus" : { + "usingComponents" : true, + "nvueStyleCompiler" : "uni-app", + "compilerVersion" : 3, + "splashscreen" : { + "alwaysShowBeforeRender" : true, + "waiting" : true, + "autoclose" : true, + "delay" : 0 + }, + /* 模块配置 */ + "modules" : { + "OAuth" : {} + }, + /* 应用发布信息 */ + "distribute" : { + /* android打包配置 */ + "android" : { + "permissions" : [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ] + }, + /* ios打包配置 */ + "ios" : {}, + /* SDK配置 */ + "sdkConfigs" : { + "oauth" : { + "weixin" : { + "appid" : "wxda178d12ae834c45", + "UniversalLinks" : "" + } + } + } + } + }, + /* 快应用特有相关 */ + "quickapp" : {}, + /* 小程序特有相关 */ + "mp-weixin" : { + "appid" : "wxda178d12ae834c45", + "setting" : { + "urlCheck" : false + }, + "usingComponents" : true, + "permission" : { + // 获取当前的地理位置、速度 配置 + "scope.userLocation" : { + "desc" : "你的位置信息将用于小程序位置接口的效果展示" + }, + "scope.userFuzzyLocation" : { + "desc" : "你的位置信息将用于小程序位置的效果展示" + } + }, + "requiredPrivateInfos" : [ "choosePoi", "chooseAddress", "getFuzzyLocation" ] + }, + "mp-alipay" : { + "usingComponents" : true + }, + "mp-baidu" : { + "usingComponents" : true + }, + "mp-toutiao" : { + "usingComponents" : true + }, + "uniStatistics" : { + "enable" : false + }, + "vueVersion" : "2" +} diff --git a/pages/my/my.vue b/pages/my/my.vue index fa59bd8..0a100fb 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -5,7 +5,7 @@ - + {{username}} @@ -30,12 +30,14 @@ data() { return { src: 'https://cdn.uviewui.com/uview/album/2.jpg', - account:'123456', - username:'用户名', + account:'', + username:'未登录', + code:'' } }, onLoad() { - // this.getInfo() + + }, methods: { topublished(title){ @@ -52,13 +54,8 @@ uni.navigateTo({ url:'/pages/Partnerships/Partnerships' }) - } - //---------页面调用接口示例------------ - // getInfo() { - // this.$api.getUserInfo().then(res => { - // console.log('userInfo', res); - // }) - // } + }, + } } diff --git a/pages/publish/publishTransfer/publishTransfer.vue b/pages/publish/publishTransfer/publishTransfer.vue index 3bac623..16bd2b8 100644 --- a/pages/publish/publishTransfer/publishTransfer.vue +++ b/pages/publish/publishTransfer/publishTransfer.vue @@ -2,7 +2,7 @@ - + 发布房源图片({{ShopInfomation.count}}/5) @@ -10,7 +10,8 @@ - 请选择所属区域 + 请选择所属区域 + {{form.region}} @@ -20,14 +21,16 @@ - 请选择行业类型 + 请选择行业类型 + {{form.trade}} - 请选择行业业态 + 请选择行业业态 + {{form.karma}} @@ -62,13 +65,7 @@ export default { data() { return { - ShopInfomation:{ - city:'', - area:'', - count:0, - - }, - + action:'http://spsp.feashow.cn/api/upload/image/', form:{ title:'', region:'', @@ -121,13 +118,21 @@ console.log("失败信息:" + JSON.stringify(errors)) // uni.$u.toast('校验失败') }) - } + }, + getTradeInfo(){ + this.$api.getTradeInfo().then(res=>{ + console.log(res); + }) + } + }, onReady() { this.$refs.uForm.setRules(this.rules) }, - + onLoad() { + this.getTradeInfo() + } } @@ -170,6 +175,11 @@ font-weight:1px; color: #c1c4c7; } + .checkedtext{ + margin-top: 5rpx; + font-size: 30rpx; + font-weight:1px; + } .picker{ display: flex; diff --git a/service/request.js b/service/request.js index a50f3c3..5853c6c 100644 --- a/service/request.js +++ b/service/request.js @@ -1,4 +1,4 @@ -const serverHost = ''//http://xx.xxx.xx +const serverHost = 'http://spsp.feashow.cn/api'//http://xx.xxx.xx const service = { get(url, data) { @@ -174,6 +174,12 @@ const apiService = { resolve(service.putWithFormData(url, data)) }) }, + getTradeInfo(data){ + const url = `/home/classlist?pid=0/` + return new Promise((resolve,reject) =>{ + resolve(service.post(url, data)) + }) + } } export { apiService, From 88e2d6542bbdc33807af4cd6c2b11433cfdc4d84 Mon Sep 17 00:00:00 2001 From: hot777zz <912275990@qq.com> Date: Wed, 15 Nov 2023 23:16:26 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=A2=81=E8=88=AA=EF=BC=9A=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 11 ++++++- pages/my/edit/edit.vue | 66 ++++++++++++++++++++++++++++++++++++++++++ pages/my/my.vue | 12 +++++++- service/request.js | 6 ++++ 4 files changed, 93 insertions(+), 2 deletions(-) create mode 100644 pages/my/edit/edit.vue diff --git a/pages.json b/pages.json index 0840704..db52186 100644 --- a/pages.json +++ b/pages.json @@ -163,7 +163,16 @@ "enablePullDownRefresh": false } } - ], + ,{ + "path" : "pages/my/edit/edit", + "style" : + { + "navigationBarTitleText": "修改个人信息", + "enablePullDownRefresh": false + } + + } + ], "tabBar": { "color": "#CCCCCC", "borderStyle": "white", diff --git a/pages/my/edit/edit.vue b/pages/my/edit/edit.vue new file mode 100644 index 0000000..91a2580 --- /dev/null +++ b/pages/my/edit/edit.vue @@ -0,0 +1,66 @@ + + + + + diff --git a/pages/my/my.vue b/pages/my/my.vue index 343daf8..37331f3 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -7,7 +7,8 @@ {{username}} - + + @@ -85,6 +86,11 @@ uni.navigateTo({ url: '/pages/Partnerships/Partnerships' }) + }, + toEdit(){ + uni.navigateTo({ + url:'/pages/my/edit/edit' + }) } //---------页面调用接口示例------------ // getInfo() { @@ -127,6 +133,10 @@ .account { font-size: 15px; font-weight: 1rpx; + display: flex; + } + .edit-icon{ + } } diff --git a/service/request.js b/service/request.js index dd9939f..628d36b 100644 --- a/service/request.js +++ b/service/request.js @@ -201,6 +201,12 @@ const apiService = { return new Promise((resolve, reject) => { resolve(service.get(url)) }) + }, + editPersonInfo(data){ + const url = `/center/userupdate` + return new Promise((resolve,reject) => { + resolve(service.post(url,data)) + }) } } export { From 9f449b67664aca4a67d9a2cc5f83aa096653f569 Mon Sep 17 00:00:00 2001 From: hot777zz <912275990@qq.com> Date: Wed, 15 Nov 2023 23:37:28 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=A2=81=E8=88=AA=EF=BC=9A=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E5=B1=95=E7=A4=BA=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/my/my.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pages/my/my.vue b/pages/my/my.vue index f06f4e7..bbb5e5d 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -43,8 +43,8 @@ data() { return { src: 'https://cdn.uviewui.com/uview/album/2.jpg', - account: '123456', - username: '用户名', + account: '', + username: '', isLoad: true } }, @@ -54,6 +54,8 @@ return } this.isLoad = true + this.$data.account = wx.getStorageSync('account') + this.$data.username = wx.getStorageSync('nickname') }, methods: { reOnLoad() { From 1c9a23f61041c532cdbda7b3ca2709ee7bc7d7c1 Mon Sep 17 00:00:00 2001 From: hot777zz <912275990@qq.com> Date: Wed, 15 Nov 2023 23:58:27 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=A2=81=E8=88=AA=EF=BC=9A=E8=A7=A3?= =?UTF-8?q?=E5=86=B3request=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/request.js | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/service/request.js b/service/request.js index d6094e0..7686aca 100644 --- a/service/request.js +++ b/service/request.js @@ -1,8 +1,4 @@ -<<<<<<< HEAD -const serverHost = 'http://spsp.feashow.cn/api'//http://xx.xxx.xx -======= const serverHost = 'https://spsp.feashow.com/api/' //http://xx.xxx.xx ->>>>>>> remotes/origin/master const service = { get(url, data) { @@ -187,12 +183,6 @@ const apiService = { resolve(service.putWithFormData(url, data)) }) }, -<<<<<<< HEAD - getTradeInfo(data){ - const url = `/home/classlist?pid=0/` - return new Promise((resolve,reject) =>{ - resolve(service.post(url, data)) -======= // 获取轮播图 getBanner() { const url = `/home/banner` @@ -211,7 +201,6 @@ const apiService = { const url = `/home/stat` return new Promise((resolve, reject) => { resolve(service.get(url)) ->>>>>>> remotes/origin/master }) }, editPersonInfo(data){ From 5b05eb8eba2b4efcbe3bbc19f3ea5233ec623a4e Mon Sep 17 00:00:00 2001 From: hot777zz <912275990@qq.com> Date: Wed, 15 Nov 2023 23:59:52 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=A2=81=E8=88=AA=EF=BC=9A=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E5=8F=91=E5=B8=83=E9=A1=B5=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../publishTransfer/publishTransfer.vue | 109 +----------------- 1 file changed, 1 insertion(+), 108 deletions(-) diff --git a/pages/publish/publishTransfer/publishTransfer.vue b/pages/publish/publishTransfer/publishTransfer.vue index 9d8ee4d..de83147 100644 --- a/pages/publish/publishTransfer/publishTransfer.vue +++ b/pages/publish/publishTransfer/publishTransfer.vue @@ -2,64 +2,9 @@ - + 发布房源图片({{ShopInfomation.count}}/5) -<<<<<<< HEAD - - - - - - 请选择所属区域 - {{form.region}} - - - - - - - - - - 请选择行业类型 - {{form.trade}} - - - - - - - 请选择行业业态 - {{form.karma}} - - - - - - - - - - - - - - - - - - - - - - - - - - 发布 - -======= 发布 ->>>>>>> remotes/origin/master @@ -124,21 +68,6 @@ export default { data() { return { -<<<<<<< HEAD - action:'http://spsp.feashow.cn/api/upload/image/', - form:{ - title:'', - region:'', - place:'', - trade:'', - karma:'', - size:'', - rent:'', - sell:'', - name:'', - call:'', - introduce:'' -======= regionColumns: [JSON.parse(uni.getStorageSync('regionList'))] || [], ShopInfomation: { city: '', @@ -159,7 +88,6 @@ name: '', call: '', introduce: '' ->>>>>>> remotes/origin/master }, columns: [ @@ -196,30 +124,6 @@ this.show1 = false }, submit() { -<<<<<<< HEAD - this.$refs.uForm.validate().then(res => { - console.log("提交表单信息:" + JSON.stringify(this.form)) - uni.$u.toast('发布成功') - // 调用服务端入表接口W - }).catch(errors => { - console.log("失败信息:" + JSON.stringify(errors)) - // uni.$u.toast('校验失败') - }) - }, - getTradeInfo(){ - this.$api.getTradeInfo().then(res=>{ - console.log(res); - }) - } - - }, - - onReady() { - this.$refs.uForm.setRules(this.rules) - }, - onLoad() { - this.getTradeInfo() -======= this.$refs.uForm.validate().then(res => { console.log("提交表单信息:" + JSON.stringify(this.form)) uni.$u.toast('发布成功') @@ -251,7 +155,6 @@ }, onReady() { this.$refs.uForm.setRules(this.rules) ->>>>>>> remotes/origin/master } } @@ -300,18 +203,8 @@ font-weight: 1px; color: #c1c4c7; } -<<<<<<< HEAD - .checkedtext{ - margin-top: 5rpx; - font-size: 30rpx; - font-weight:1px; - } - - .picker{ -======= .picker { ->>>>>>> remotes/origin/master display: flex; justify-content: space-between; }