From c4961c2c9f83682012fa2e4585f6d5cb191a1ab5 Mon Sep 17 00:00:00 2001 From: guoguoyaa Date: Tue, 8 Mar 2022 12:19:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mindspore/package-meeting/reserve/reserve.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mindspore/package-meeting/reserve/reserve.js b/src/mindspore/package-meeting/reserve/reserve.js index 6e850c6..bea736d 100644 --- a/src/mindspore/package-meeting/reserve/reserve.js +++ b/src/mindspore/package-meeting/reserve/reserve.js @@ -216,7 +216,8 @@ Page({ that.setData({ msgListAll: list, permission:['Tech','MSG','SIG'], - msgList:tempList + msgList:tempList, + msgCityList:list }); }); remoteMethods.getSigList('',function (list) { @@ -230,7 +231,7 @@ Page({ }); }) }else{ - remoteMethods.getUserGroup(2, function (data) { + remoteMethods.getUserGroup(appSession.getUserInfoByKey('userId'), function (data) { let permissionTemp=[] { // if (data && data.length) { -- Gitee From 874cac8da233fd22b779832d2f0a2f11c65ef25d Mon Sep 17 00:00:00 2001 From: guoguoyaa Date: Wed, 9 Mar 2022 17:31:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E6=B7=BB=E5=8A=A0=E5=9F=8E=E5=B8=82=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mindspore/config/services-config.js | 5 +- src/mindspore/package-meeting/sig/msg-list.js | 68 +++++++++++++++- .../package-meeting/sig/msg-list.wxml | 14 ++++ .../package-meeting/sig/msg-list.wxss | 78 +++++++++++++++++++ 4 files changed, 163 insertions(+), 2 deletions(-) diff --git a/src/mindspore/config/services-config.js b/src/mindspore/config/services-config.js index 2fe02cd..648783a 100644 --- a/src/mindspore/config/services-config.js +++ b/src/mindspore/config/services-config.js @@ -206,7 +206,10 @@ var commonServiceConfig = { GET_SIGNUP_INFO: '/ticket/{id}/', // 活动签到 - SIGN:'/sign/' + SIGN:'/sign/', + + //添加城市 + ADDCITY:'/city/' }; let servicesConfig = _.deepExtend(true, commonServiceConfig); diff --git a/src/mindspore/package-meeting/sig/msg-list.js b/src/mindspore/package-meeting/sig/msg-list.js index d8ba322..ee1025b 100644 --- a/src/mindspore/package-meeting/sig/msg-list.js +++ b/src/mindspore/package-meeting/sig/msg-list.js @@ -13,6 +13,17 @@ let remoteMethods = { }, }); }, + addCity: function (postData, _callback) { + appAjax.postJson({ + autoShowWait: true, + type: 'POST', + service: 'ADDCITY', + data: postData, + success: function (ret) { + _callback && _callback(ret); + }, + }); + }, }; Page({ @@ -42,6 +53,8 @@ Page({ group_type:2 }, ], + addCityPopShow:false, + cityName:'' }, /** @@ -78,6 +91,59 @@ Page({ }); }); }, - + AddMember:function(){ + this.setData( + { + addCityPopShow:true + } + ) + }, + addCityConfirm:function(){ + let that=this + let postData = { + name: this.data.cityName, + }; + remoteMethods.addCity(postData, function (data) { + if (data&&data.id) { + that.setData({ + isShowMes: true, + cityName:'' + }); + remoteMethods.getMsgList('', function (list) { + that.setData({ + list: list, + }); + }); + wx.showToast({ + title: '添加成功', + duration: 2000, + }); + } else { + wx.showToast({ + title: '操作失败', + icon: 'none', + duration: 2000, + }); + } + }); + this.setData( + { + addCityPopShow:false + } + ) + }, + addCityCancel:function(){ + this.setData( + { + addCityPopShow:false, + cityName:'' + } + ) + }, + onInput:function(e){ + this.setData({ + cityName: e.detail.value + }) + } }) \ No newline at end of file diff --git a/src/mindspore/package-meeting/sig/msg-list.wxml b/src/mindspore/package-meeting/sig/msg-list.wxml index 1b3801e..bcdd4cd 100644 --- a/src/mindspore/package-meeting/sig/msg-list.wxml +++ b/src/mindspore/package-meeting/sig/msg-list.wxml @@ -11,5 +11,19 @@ + + + 添加城市 + + + + 添加城市 + + + + + + + \ No newline at end of file diff --git a/src/mindspore/package-meeting/sig/msg-list.wxss b/src/mindspore/package-meeting/sig/msg-list.wxss index 2715993..506d0db 100644 --- a/src/mindspore/package-meeting/sig/msg-list.wxss +++ b/src/mindspore/package-meeting/sig/msg-list.wxss @@ -42,6 +42,20 @@ padding: 0 30rpx; margin-bottom: 20rpx; } +.container .msg-list .items { + height: 108rpx; + background-color: #fff; + font-size: 34rpx; + color: #323233; + border-radius: 8rpx; + display: flex; + justify-content: center; + align-items: center; + box-shadow: 0px 5px 15px 0px rgba(225, 230, 238, 1); + padding: 0 30rpx; + margin-bottom: 20rpx; + border: 1px dashed #40ADFF; +} .container .msg-list .item text { line-height: 48rpx; @@ -51,4 +65,68 @@ flex-shrink: 1; width: 31rpx; height: 31rpx; +} + +.container .city-pop-wrapper { + padding: 0 30rpx; +} + +.container .city-pop-wrapper .title { + margin: 30rpx 0 40rpx 0; + color: #222; + font-size: 36rpx; +} +/* .container .city-pop-wrapper .input-city{ + height: 120rpx; + background-color: rgba(159,168,177,0.13); + margin:60rpx 0; +} */ +.container .city-pop-wrapper .btn-wrapper { + display: flex; + align-items: center; + justify-content: space-between; + height: 90rpx; + font-size: 36rpx; + margin: 60rpx 0; +} +.container .city-pop-wrapper .btn-wrapper .confirm { + height: 100%; + width: 320rpx; + text-align: center; + line-height: 90rpx; + color: #fff; + background-color: #40ADFF; +} + +.container .city-pop-wrapper .btn-wrapper .cancel { + height: 100%; + width: 320rpx; + text-align: center; + line-height: 90rpx; + color: #40ADFF; + background-color: #fff; + border: 1px solid #40ADFF; +} +.container .input-city { + height: 108rpx; + color: #333; + line-height: 45rpx; + font-size: 28rpx; + font-weight: 400rpx; + padding-left: 30rpx; + background-color: rgba(159,168,177,0.13); + margin-top: 40rpx; + margin-bottom: 108rpx; +} +.items image { + margin-right: 11rpx; + width: 20rpx; + height: 20rpx; + position: relative; + top: 2rpx; +} +.items .add_text{ + color: #6D7278; + font-size: 36rpx; + line-height: 36rpx; } \ No newline at end of file -- Gitee