From 2d2612fb3a80478ca340884886d8ec9e8914aa09 Mon Sep 17 00:00:00 2001 From: eternity <chenyoungcheng@163.com> Date: Wed, 6 Jul 2022 16:18:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=8F=E8=AE=AE=E5=8F=8A?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 219 +++++++++++---------- pages/club/club.js | 9 +- pages/club/clubDetail/clubDetail.js | 5 +- pages/club/manage/manage.js | 5 + pages/club/manage/manage.wxml | 4 +- pages/index/activeDetail/activeDetail.js | 6 +- pages/index/activeDetail/activeDetail.wxml | 4 +- pages/index/activeDetail/activeDetail.wxss | 2 +- pages/index/myjoin/myjoin.js | 7 + pages/index/myjoin/myjoin.wxml | 2 +- pages/index/order/order.js | 7 + pages/index/order/order.wxml | 2 +- pages/release/addactive/addactive.js | 29 +-- pages/release/addactive/addactive.wxml | 6 +- pages/webview/webview.js | 68 +++++++ pages/webview/webview.json | 3 + pages/webview/webview.wxml | 2 + pages/webview/webview.wxss | 1 + utils/common.js | 6 +- utils/request.js | 8 +- 20 files changed, 243 insertions(+), 152 deletions(-) create mode 100644 pages/webview/webview.js create mode 100644 pages/webview/webview.json create mode 100644 pages/webview/webview.wxml create mode 100644 pages/webview/webview.wxss diff --git a/app.json b/app.json index 900bb53..b3af4c9 100644 --- a/app.json +++ b/app.json @@ -1,112 +1,113 @@ { - "pages": [ - "pages/index/index", - "pages/picker/picker", - "pages/login", - "pages/logs/logs", - "pages/club/club", - "pages/message/message", - "pages/rank/rank", - "pages/center/center", - "pages/index/search/search", - "pages/index/club/club", - "pages/index/active/active", - "pages/index/activeing/activeing", - "pages/index/rank/rank", - "pages/index/activeDetail/activeDetail", - "pages/index/join/join", - "pages/index/teamJoin/teamJoin", - "pages/index/myjoin/myjoin", - "pages/index/history/history", - "pages/index/editjoin/editjoin", - "pages/message/clubmessage/clubmessage", - "pages/message/sysmessage/sysmessage", - "pages/message/activemessage/activemessage", - "pages/message/hostmessage/hostmessage", - "pages/center/cash/cash", - "pages/center/cashok/cashok", - "pages/center/cashlist/cashlist", - "pages/center/coupon/coupon", - "pages/club/mark/mark", - "pages/club/createClub/createClub", - "pages/club/clubDetail/clubDetail", - "pages/club/manage/manage", - "pages/club/clubgroups/clubgroups", - "pages/club/clublist/clublist", - "pages/club/popname/popname", - "pages/club/removesb/removesb", - "pages/club/deputy/deputy", - "pages/club/account/account", - "pages/club/setadmin/setadmin", - "pages/club/album/album", - "pages/club/albumdetail/albumdetail", - "pages/release/release", - "pages/release/addactive/addactive", - "pages/release/addrequired/addrequired", - "pages/release/manageac/manageac", - "pages/release/manageIndex/manageIndex", - "pages/release/messageset/messageset", - "pages/release/signIndex/signIndex", - "pages/release/updateactive/updateactive", - "pages/release/addjoiner/addjoiner", - "pages/release/activeSign/activeSign", - "pages/club/clubTag/clubTag", - "pages/release/scave/scave", - "pages/center/info/info", - "pages/center/order/order", - "pages/center/orderdetail/orderdetail", - "pages/release/extend/extend", - "pages/release/census/census", - "pages/release/map/map", - "pages/release/sendmessage/sendmessage", - "pages/index/order/order", - "pages/center/advice/advice", - "pages/index/activeList/activeList", - "pages/release/quan/quan", - "pages/release/addCoupon/addcoupon", - "pages/index/payOK/payok" + "pages": [ + "pages/index/index", + "pages/picker/picker", + "pages/login", + "pages/logs/logs", + "pages/club/club", + "pages/message/message", + "pages/webview/webview", + "pages/rank/rank", + "pages/center/center", + "pages/index/search/search", + "pages/index/club/club", + "pages/index/active/active", + "pages/index/activeing/activeing", + "pages/index/rank/rank", + "pages/index/activeDetail/activeDetail", + "pages/index/join/join", + "pages/index/teamJoin/teamJoin", + "pages/index/myjoin/myjoin", + "pages/index/history/history", + "pages/index/editjoin/editjoin", + "pages/message/clubmessage/clubmessage", + "pages/message/sysmessage/sysmessage", + "pages/message/activemessage/activemessage", + "pages/message/hostmessage/hostmessage", + "pages/center/cash/cash", + "pages/center/cashok/cashok", + "pages/center/cashlist/cashlist", + "pages/center/coupon/coupon", + "pages/club/mark/mark", + "pages/club/createClub/createClub", + "pages/club/clubDetail/clubDetail", + "pages/club/manage/manage", + "pages/club/clubgroups/clubgroups", + "pages/club/clublist/clublist", + "pages/club/popname/popname", + "pages/club/removesb/removesb", + "pages/club/deputy/deputy", + "pages/club/account/account", + "pages/club/setadmin/setadmin", + "pages/club/album/album", + "pages/club/albumdetail/albumdetail", + "pages/release/release", + "pages/release/addactive/addactive", + "pages/release/addrequired/addrequired", + "pages/release/manageac/manageac", + "pages/release/manageIndex/manageIndex", + "pages/release/messageset/messageset", + "pages/release/signIndex/signIndex", + "pages/release/updateactive/updateactive", + "pages/release/addjoiner/addjoiner", + "pages/release/activeSign/activeSign", + "pages/club/clubTag/clubTag", + "pages/release/scave/scave", + "pages/center/info/info", + "pages/center/order/order", + "pages/center/orderdetail/orderdetail", + "pages/release/extend/extend", + "pages/release/census/census", + "pages/release/map/map", + "pages/release/sendmessage/sendmessage", + "pages/index/order/order", + "pages/center/advice/advice", + "pages/index/activeList/activeList", + "pages/release/quan/quan", + "pages/release/addCoupon/addcoupon", + "pages/index/payOK/payok" + ], + "window": { + "backgroundTextStyle": "light", + "navigationBarBackgroundColor": "#FFCB12", + "navigationBarTitleText": "报名了", + "navigationBarTextStyle": "black" + }, + "tabBar": { + "list": [ + { + "pagePath": "pages/index/index", + "iconPath": "/images/star.png", + "selectedIconPath": "/images/stars.png", + "text": "活动" + }, + { + "pagePath": "pages/club/club", + "iconPath": "/images/ju.png", + "selectedIconPath": "/images/jus.png", + "text": "俱乐部" + }, + { + "pagePath": "pages/release/release", + "iconPath": "/images/pai.png", + "selectedIconPath": "/images/pais.png", + "text": "发布" + }, + { + "pagePath": "pages/message/message", + "iconPath": "/images/mes.png", + "selectedIconPath": "/images/mess.png", + "text": "消息" + }, + { + "pagePath": "pages/center/center", + "iconPath": "/images/cen.png", + "selectedIconPath": "/images/cens.png", + "text": "个人中心" + } ], - "window": { - "backgroundTextStyle": "light", - "navigationBarBackgroundColor": "#FFCB12", - "navigationBarTitleText": "报名了", - "navigationBarTextStyle": "black" - }, - "tabBar": { - "list": [ - { - "pagePath": "pages/index/index", - "iconPath": "/images/star.png", - "selectedIconPath": "/images/stars.png", - "text": "活动" - }, - { - "pagePath": "pages/club/club", - "iconPath": "/images/ju.png", - "selectedIconPath": "/images/jus.png", - "text": "俱乐部" - }, - { - "pagePath": "pages/release/release", - "iconPath": "/images/pai.png", - "selectedIconPath": "/images/pais.png", - "text": "发布" - }, - { - "pagePath": "pages/message/message", - "iconPath": "/images/mes.png", - "selectedIconPath": "/images/mess.png", - "text": "消息" - }, - { - "pagePath": "pages/center/center", - "iconPath": "/images/cen.png", - "selectedIconPath": "/images/cens.png", - "text": "个人中心" - } - ], - "color": "#808080", - "selectedColor": "#F7C30C" - }, - "sitemapLocation": "sitemap.json" + "color": "#808080", + "selectedColor": "#F7C30C" + }, + "sitemapLocation": "sitemap.json" } \ No newline at end of file diff --git a/pages/club/club.js b/pages/club/club.js index 3879039..b9ac1eb 100644 --- a/pages/club/club.js +++ b/pages/club/club.js @@ -125,8 +125,9 @@ Page({ }; re.request(Api.getMyJoinClubList(), '', header).then((res) => { let datas = res.data.data; + console.log(datas) for(var i=0;i<datas.length;i++){ - datas[i].clubLogo = imgUrl + datas[i].clubLogo; + datas[i].clubLogo = datas[i].clubLogo; } that.setData({ myjoinList:datas @@ -142,9 +143,9 @@ Page({ }; re.request(Api.getMyManageClubList(), '', header).then((res) => { let datas = res.data.data; - for(var i=0;i<datas.length;i++){ - datas[i].clubLogo = imgUrl + datas[i].clubLogo; - } + // for(var i=0;i<datas.length;i++){ + // datas[i].clubLogo = imgUrl + datas[i].clubLogo; + // } that.setData({ myjoinList:datas }) diff --git a/pages/club/clubDetail/clubDetail.js b/pages/club/clubDetail/clubDetail.js index e7508f5..b0dcc48 100644 --- a/pages/club/clubDetail/clubDetail.js +++ b/pages/club/clubDetail/clubDetail.js @@ -36,7 +36,8 @@ jlbchengyuan(){ }) }, tomanage:function(e){ - let valData = JSON.stringify(this.data.company);//console.log('company-data:', this.data.company); + let valData = JSON.stringify(this.data.company); + console.log('company-data:', this.data.company); wx.navigateTo({ url: '../manage/manage?val='+valData+'' }) @@ -97,7 +98,7 @@ toactiveDetail:function(e){ }; re.request(Api.getclubDetail(), postData, header).then((res) => { let datas = res.data.data; - datas.clubLogo = imgUrl + datas.clubLogo; + datas.clubLogo = datas.clubLogo; datas.clubBgimg = imgUrl + datas.clubBgimg; switch (datas.isJoin) { case 'false': diff --git a/pages/club/manage/manage.js b/pages/club/manage/manage.js index 2ee9941..d90b2ab 100644 --- a/pages/club/manage/manage.js +++ b/pages/club/manage/manage.js @@ -84,6 +84,11 @@ Page({ */ onLoad: function (options) { let queryval = JSON.parse(options.val) + if(this.uploaderList === undefined) { + this.uploaderList = [] + } + this.uploaderList.push(queryval.clubBgimg); + console.log( this.uploaderList) this.setData({ company:queryval, }) diff --git a/pages/club/manage/manage.wxml b/pages/club/manage/manage.wxml index a430005..4929e8c 100644 --- a/pages/club/manage/manage.wxml +++ b/pages/club/manage/manage.wxml @@ -67,14 +67,14 @@ <text>移除成员</text> <image src="../../../images/back.png" class="back"></image> </view> - <view class="formlist" bindtap="setDeputy" wx:if="{{jurisdiction==1}}"> + <!-- <view class="formlist" bindtap="setDeputy" wx:if="{{jurisdiction==1}}"> <text>设置副会长</text> <image src="../../../images/back.png" class="back"></image> </view> <view class="formlist" bindtap="tosetadmin" wx:if="{{jurisdiction<=2}}"> <text>设置管理员</text> <image src="../../../images/back.png" class="back"></image> - </view> + </view> --> <view class="formlist" wx:if="{{jurisdiction<=3}}"> <text>俱乐部收款账户</text> <picker bindchange="accountChange" value="{{acctindex}}" range-key="name" range="{{accts}}" diff --git a/pages/index/activeDetail/activeDetail.js b/pages/index/activeDetail/activeDetail.js index 2e24bd7..24d9bca 100644 --- a/pages/index/activeDetail/activeDetail.js +++ b/pages/index/activeDetail/activeDetail.js @@ -136,8 +136,8 @@ tojion:function(){ }; re.request(Api.getclubInfo(), postData, header).then((res) => { let datas = res.data.data; - console.log(datas); - datas.clubLogo = imgUrl + datas.clubLogo; + // console.log(datas); + // datas.clubLogo = imgUrl + datas.clubLogo; that.setData({ company:datas }) @@ -201,7 +201,7 @@ tojion:function(){ }; re.request(Api.addClub(), postData, header).then((res) => { wx.showToast({ - title: '请求已发送', + title: '加入成功', icon: 'none', duration: 1000 }) diff --git a/pages/index/activeDetail/activeDetail.wxml b/pages/index/activeDetail/activeDetail.wxml index b5b1a0d..4976345 100644 --- a/pages/index/activeDetail/activeDetail.wxml +++ b/pages/index/activeDetail/activeDetail.wxml @@ -138,7 +138,7 @@ <view>在线咨询</view> </button> --> </view> - <view class="bottom-right" bindtap="tojion" wx:if="{{detail.isJoin == 0}}">我要报名</view> - <view class="bottom-right" wx:if="{{detail.isJoin == 1}}">已报名</view> + <view class="bottom-right" bindtap="tojion">我要报名</view> + <!-- <view class="bottom-right" wx:if="{{detail.isJoin == 1}}">已报名</view> --> </view> </view> \ No newline at end of file diff --git a/pages/index/activeDetail/activeDetail.wxss b/pages/index/activeDetail/activeDetail.wxss index d5fa54e..51a8727 100644 --- a/pages/index/activeDetail/activeDetail.wxss +++ b/pages/index/activeDetail/activeDetail.wxss @@ -423,7 +423,7 @@ #online { background-color: #00000000; color: #000; - padding: 0; + padding: 0 30rpx; margin: 0; margin-left: 50rpx; } diff --git a/pages/index/myjoin/myjoin.js b/pages/index/myjoin/myjoin.js index 860f480..0278906 100644 --- a/pages/index/myjoin/myjoin.js +++ b/pages/index/myjoin/myjoin.js @@ -22,6 +22,7 @@ Page({ * 页面的初始数据 */ data: { + Agreement:'http://api.tuleduo.cn/privacy_agreement.html', genderdata: '', joiner: [{ clubId: '', @@ -71,6 +72,12 @@ Page({ info: new Info(), }); }, + seexcieyi:function(e){ + var webview= e.target.dataset.webview + wx.navigateTo({ + url: '/pages/webview/webview?webview='+webview, + }) + }, deteleItem : function(e){ var that = this; let info = this.data.info; diff --git a/pages/index/myjoin/myjoin.wxml b/pages/index/myjoin/myjoin.wxml index 341645e..fbceaed 100644 --- a/pages/index/myjoin/myjoin.wxml +++ b/pages/index/myjoin/myjoin.wxml @@ -75,7 +75,7 @@ <view class="agree"> <checkbox-group bindchange="xieyi"> <checkbox name="box_check" checked="{{checked}}"></checkbox> - 我已阅读并同意<text bindtap='seexcieyi'>《**活动报名协议》</text> + 我已阅读并同意<text bindtap='seexcieyi' data-webview="{{Agreement}}">《**活动报名协议》</text> </checkbox-group> </view> </view> diff --git a/pages/index/order/order.js b/pages/index/order/order.js index d613638..ed0b36b 100644 --- a/pages/index/order/order.js +++ b/pages/index/order/order.js @@ -6,6 +6,7 @@ Page({ * 页面的初始数据 */ data: { + Agreement:'http://api.tuleduo.cn/privacy_agreement.html', groups:[], checked:false, id:'', @@ -26,6 +27,12 @@ Page({ that.getOrderPeople(options.id); // that.getOrderDetail(options.id); }, + seexcieyi:function(e){ + var webview= e.target.dataset.webview + wx.navigateTo({ + url: '/pages/webview/webview?webview='+webview, + }) + }, backChange:function(e){ var that = this; that.setData({ diff --git a/pages/index/order/order.wxml b/pages/index/order/order.wxml index c7f1c05..f76a4d0 100644 --- a/pages/index/order/order.wxml +++ b/pages/index/order/order.wxml @@ -72,7 +72,7 @@ <checkbox-group bindchange="checkboxChange"> <label class="xieyi-class"> <checkbox checked="{{checked}}" name="box_check" value="{{checked}}" bind></checkbox> - 我同意《XXX服务协议》,并确认活动真实性,同意支付报名 + 我并同意<text bindtap='seexcieyi' data-webview="{{Agreement}}">《报名了服务协议》</text>,并确认活动真实性,同意支付报名 </label> </checkbox-group> </view> diff --git a/pages/release/addactive/addactive.js b/pages/release/addactive/addactive.js index 1b24fd9..89a8af7 100644 --- a/pages/release/addactive/addactive.js +++ b/pages/release/addactive/addactive.js @@ -9,7 +9,7 @@ Page({ * 页面的初始数据 */ data: { - + Agreement:'http://api.tuleduo.cn/privacy_agreement.html', dateTime:'', dateTimeArray:'', startT:'', @@ -426,12 +426,15 @@ console.log(startT); }) }, //查看协议 - seexcieyi: function () { - var that = this; - that.setData({ - flag: false + seexcieyi: function (e) { + // var that = this; + // that.setData({ + // flag: false + // }) + var webview= e.target.dataset.webview + wx.navigateTo({ + url: '/pages/webview/webview?webview='+webview, }) - that.self(); }, //看完协议了 know: function () { @@ -440,17 +443,6 @@ console.log(startT); flag: true }) }, - self: function () { - var that = this; - var header = {}; - var postData = { - type: 2 - }; - // re.request(Api.getAgreement(), postData, header).then((res) => { - // var ftext = res.data.data[0].content; - // WxParse.wxParse('ftext', 'html', ftext, that, 5); - // }) - }, // 删除图片 clearImg: function (e) { var nowList = []; //新数据 @@ -657,7 +649,7 @@ uploadfront: function (e) { }; if(!this.data.checked){ wx.showToast({ - title: '请先阅读并同意此协议', + title: '请先阅读并同意服务协议', icon: 'none', duration: 1500 }) @@ -820,7 +812,6 @@ uploadfront: function (e) { * 生命周期函数--监听页面卸载 */ onUnload: function () { - }, /** diff --git a/pages/release/addactive/addactive.wxml b/pages/release/addactive/addactive.wxml index 51e36c2..7c5be06 100644 --- a/pages/release/addactive/addactive.wxml +++ b/pages/release/addactive/addactive.wxml @@ -256,7 +256,7 @@ <view class="agree"> <checkbox-group bindchange="xieyi"> <checkbox name="box_check" value="{{checked}}"></checkbox> - 我已阅读并同意<text bindtap='seexcieyi'>《****服务协议》</text> + 我已阅读并同意<text bindtap='seexcieyi' data-webview="{{Agreement}}">《报名了服务协议》</text> </checkbox-group> </view> </view> @@ -264,7 +264,7 @@ </view> <!-- 用户协议 --> -<scroll-view class="modal-box" scroll-y="true" hidden="{{flag}}"> +<!-- <scroll-view class="modal-box" scroll-y="true" hidden="{{flag}}"> <view class="modal-content"></view> <view class='modal'> <view class="choice "> @@ -274,7 +274,7 @@ <button class="knowBtn" bindtap='know'>我知道了</button> </view> </view> -</scroll-view> +</scroll-view> --> <!-- 模态框 --> <modal hidden="{{hidden}}" title="退款设置" confirm-text="确定" cancel-text="取消" diff --git a/pages/webview/webview.js b/pages/webview/webview.js new file mode 100644 index 0000000..e353435 --- /dev/null +++ b/pages/webview/webview.js @@ -0,0 +1,68 @@ +// pages/webview/webview.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + var webview=options.webview; + this.setData({ + path: webview + }) + }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/webview/webview.json b/pages/webview/webview.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/webview/webview.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/webview/webview.wxml b/pages/webview/webview.wxml new file mode 100644 index 0000000..b7f5935 --- /dev/null +++ b/pages/webview/webview.wxml @@ -0,0 +1,2 @@ +<!--pages/webview/webview.wxml--> +<web-view src="{{path}}"></web-view> diff --git a/pages/webview/webview.wxss b/pages/webview/webview.wxss new file mode 100644 index 0000000..229fba5 --- /dev/null +++ b/pages/webview/webview.wxss @@ -0,0 +1 @@ +/* pages/webview/webview.wxss */ \ No newline at end of file diff --git a/utils/common.js b/utils/common.js index bcd2583..727345c 100644 --- a/utils/common.js +++ b/utils/common.js @@ -97,11 +97,11 @@ var HOST_URI = 'https://api.tuleduo.cn'; let API_nicknameadd='/open/club/nickname/add'//新增个性化称号 let API_nicknameedit='/open/club/nickname/edit'//修改个性化称号 let API_memberremoveLikeList='/open/club/member/removeLikeList' //模糊查询 - let API_memberList='/open/club/member/setList'//成员列表 - let API_Setmember='/open/club/member/edit'//成员列表 + let API_Setmember='/open/club/member/edit'//成员列表 let API_getClubMessagePage= '/open/massage/club/pages' //俱乐部消息 -let API_getSystemMessagePage= '/open/massage/system/pages' //系统消息 + let API_getSystemMessagePage= '/open/massage/system/pages' //系统消息 + function SetMember(){ return HOST_URI + API_Setmember; } diff --git a/utils/request.js b/utils/request.js index a0d667b..1245b58 100644 --- a/utils/request.js +++ b/utils/request.js @@ -29,12 +29,16 @@ export function request(url,data,header){ app.getPower(); } }else if(res.data.code == '500'){ - wx.showToast({ - title:'网络错误', + title:res.data.msg, icon: 'none', duration: 1000 }) + // wx.showToast({ + // title:'网络错误', + // icon: 'none', + // duration: 1000 + // }) }else if(res.data.code == '412'){ wx.showToast({