From 42461b438640606e7aca4a7907dfc342c9ef68e7 Mon Sep 17 00:00:00 2001 From: max <373170631@qq.com> Date: Wed, 6 Jul 2022 18:09:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E7=9B=B8=E5=85=B3=EF=BC=8C?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 2 +- pages/index/activeDetail/activeDetail.wxml | 4 +-- pages/index/myjoin/myjoin.js | 32 +++++++---------- pages/index/myjoin/myjoin.wxml | 12 ++++--- pages/index/myjoin/myjoin.wxss | 5 ++- pages/index/order/order.js | 8 ++++- pages/index/order/order.wxml | 4 +-- pages/index/order/order.wxss | 5 ++- pages/release/addactive/addactive.js | 24 ++++++------- pages/release/addactive/addactive.wxml | 40 ++++++++++++---------- project.config.json | 8 ++--- project.private.config.json | 24 ++++++++++--- 12 files changed, 97 insertions(+), 71 deletions(-) diff --git a/app.json b/app.json index b3af4c9..6039f85 100644 --- a/app.json +++ b/app.json @@ -110,4 +110,4 @@ "selectedColor": "#F7C30C" }, "sitemapLocation": "sitemap.json" -} \ No newline at end of file +} diff --git a/pages/index/activeDetail/activeDetail.wxml b/pages/index/activeDetail/activeDetail.wxml index 4976345..9e38ac7 100644 --- a/pages/index/activeDetail/activeDetail.wxml +++ b/pages/index/activeDetail/activeDetail.wxml @@ -120,7 +120,7 @@ {{item.activityName}} {{item.startRegisterTime+'至'+item.endRegisterTime}} - 报名：{{item.totalRegister}}人 + 报名：{{item.totalRegister || '0'}}人 @@ -141,4 +141,4 @@ 我要报名 - \ No newline at end of file + diff --git a/pages/index/myjoin/myjoin.js b/pages/index/myjoin/myjoin.js index 0278906..5234321 100644 --- a/pages/index/myjoin/myjoin.js +++ b/pages/index/myjoin/myjoin.js @@ -22,7 +22,6 @@ Page({ * 页面的初始数据 */ data: { - Agreement:'http://api.tuleduo.cn/privacy_agreement.html', genderdata: '', joiner: [{ clubId: '', @@ -43,6 +42,14 @@ Page({ info: {}, checked: false }, + xieyi(e){ + this.setData({checked: e.detail.value.length > 0}) + }, + seexcieyi(){ + wx.navigateTo({ + url: '/pages/xieyi/xieyi?path=' + decodeURIComponent('http://api.tuleduo.cn/privacy_agreement.html'), + }); + }, history: function () { wx.navigateTo({ url: '../history/history' @@ -53,7 +60,7 @@ Page({ */ onLoad: function (options) { var that = this; - //console.log(options); + console.log(options); that.setData({ clubId: options.clubId, activityId: options.acId, @@ -61,23 +68,12 @@ Page({ }) that.init(); }, - xieyi(e){ - this.setData({ - checked: e.detail.value.length > 0 - }); - }, init: function () { let that = this; this.setData({ 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; @@ -91,7 +87,7 @@ Page({ if(info.details.length==1){ } } - + console.log(info.details) }, addItem: function (e) { @@ -198,7 +194,7 @@ Page({ if(item.gender==undefined||item.idcard==undefined||item.nickname==undefined||item.phone==undefined||item.realname==undefined||item.gender==''||item.nickname==''||item.realname==''){ isfl=true } - }); + }); } catch (error) {} if(phoneCardErr) return; if(isfl){ @@ -226,7 +222,7 @@ Page({ let stroe = wx.getStorageSync('stroe') console.log(stroe); stroe.splice(0,0,...postData) - + let obj = {} stroe = stroe.reduce((arr, item) => { obj[item.idcard] ? "" : obj[item.idcard] = true && arr.push(item) @@ -244,8 +240,6 @@ Page({ postData[i].cost = that.data.price; } postData = JSON.stringify(postData); - - console.log(postData); let lastData = { req: postData @@ -338,4 +332,4 @@ Page({ onShareAppMessage: function () { } -}) \ No newline at end of file +}) diff --git a/pages/index/myjoin/myjoin.wxml b/pages/index/myjoin/myjoin.wxml index fbceaed..60c9ed6 100644 --- a/pages/index/myjoin/myjoin.wxml +++ b/pages/index/myjoin/myjoin.wxml @@ -9,12 +9,12 @@ @@ -74,12 +74,14 @@ - - 我已阅读并同意《**活动报名协议》 + + 《活动报名协议》 合计：￥{{price*info.details.length}} 我要报名 - \ No newline at end of file + diff --git a/pages/index/myjoin/myjoin.wxss b/pages/index/myjoin/myjoin.wxss index 4d766bc..3f20245 100644 --- a/pages/index/myjoin/myjoin.wxss +++ b/pages/index/myjoin/myjoin.wxss @@ -29,4 +29,7 @@ checkbox{transform:scale(0.6);} .bottom .price{width:60%;padding-left:5%;font-size:24rpx;} .bottom .price text{color:#F66A01;font-size:50rpx;} .bottom .price text text{font-size:24rpx;} -.bottom .join{width:35%;text-align: center;color:#fff;background: #F66A01;} \ No newline at end of file +.bottom .join{width:35%;text-align: center;color:#fff;background: #F66A01;} +.xy{ + color: blue; +} diff --git a/pages/index/order/order.js b/pages/index/order/order.js index ed0b36b..f76d109 100644 --- a/pages/index/order/order.js +++ b/pages/index/order/order.js @@ -14,6 +14,12 @@ Page({ orderId:'', theOrderDetail: {} }, + toxypage(){ + wx.navigateTo({ + url: '/pages/xieyi/xieyi?path=' + encodeURIComponent('http://api.tuleduo.cn/pay_privacy_agreement.html'), + }); + return false; + }, /** * 生命周期函数--监听页面加载 @@ -253,4 +259,4 @@ Page({ onShareAppMessage: function () { } -}) \ No newline at end of file +}) diff --git a/pages/index/order/order.wxml b/pages/index/order/order.wxml index f76a4d0..26d62d8 100644 --- a/pages/index/order/order.wxml +++ b/pages/index/order/order.wxml @@ -72,11 +72,11 @@ 确定支付 - \ No newline at end of file + diff --git a/pages/index/order/order.wxss b/pages/index/order/order.wxss index 4c70033..5c64ad7 100644 --- a/pages/index/order/order.wxss +++ b/pages/index/order/order.wxss @@ -26,4 +26,7 @@ radio,checkbox{transform:scale(0.6);} .xieyi-class{ display: flex; align-items: center; - } \ No newline at end of file + } + .xy{ + color: blue !important; + } diff --git a/pages/release/addactive/addactive.js b/pages/release/addactive/addactive.js index 89a8af7..d1d53ab 100644 --- a/pages/release/addactive/addactive.js +++ b/pages/release/addactive/addactive.js @@ -6,7 +6,7 @@ var util = require('../../../utils/util.js'); Page({ /** - * 页面的初始数据 + * 页面的初始数据 */ data: { Agreement:'http://api.tuleduo.cn/privacy_agreement.html', @@ -25,7 +25,7 @@ Page({ dateTimeFour:'', dateTimeArrayFour:'', startTFour:'', - year: new Date().getFullYear(), + year: new Date().getFullYear(), clubId: '', endRegisterTime: '2021-06-01', startTime: util.getNowDate(new Date()), @@ -294,8 +294,8 @@ Page({ /** * 生命周期函数--监听页面加载 */ - //获取时间日期 - + //获取时间日期 + changeDateTime(e) { this.setData({ dateTime: e.detail.value @@ -426,15 +426,15 @@ console.log(startT); }) }, //查看协议 - seexcieyi: function (e) { + seexcieyi: function () { + wx.navigateTo({ + url: '/pages/xieyi/xieyi?path=' + encodeURIComponent('http://api.tuleduo.cn/pay_privacy_agreement.html'), + }) // 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 () { @@ -568,7 +568,7 @@ uploadfront: function (e) { uploaderListfront: uploaderListfront, uploaderNum: uploaderListfront.length, }) - + for(var i=0;i 报名时间 - {{startT}} 至 - {{startTTwo}} @@ -35,7 +35,7 @@ 活动时间 - {{startTThree}} @@ -43,7 +43,7 @@ 至 - {{startTFour}} @@ -194,8 +194,8 @@ 是否显示报名列表 - - + + @@ -203,8 +203,8 @@ 是否显示主办方信息 - - + + @@ -226,8 +226,8 @@ 小程序通知 - - + + @@ -235,8 +235,8 @@ 短信通知 - - + + @@ -244,8 +244,8 @@ 报名后自动加入俱乐部 - - + + @@ -255,8 +255,10 @@ + @@ -277,7 +279,7 @@ --> - + - \ No newline at end of file + --> diff --git a/project.config.json b/project.config.json index 231b232..913cf2d 100644 --- a/project.config.json +++ b/project.config.json @@ -23,9 +23,9 @@ "uploadWithSourceMap": true, "compileHotReLoad": false, "lazyloadPlaceholderEnable": false, - "useMultiFrameRuntime": true, - "useApiHook": true, - "useApiHostProcess": true, + "useMultiFrameRuntime": false, + "useApiHook": false, + "useApiHostProcess": false, "babelSetting": { "ignore": [], "disablePlugins": [], @@ -103,4 +103,4 @@ ] } } -} \ No newline at end of file +} diff --git a/project.private.config.json b/project.private.config.json index 6c8b563..3842492 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -2,7 +2,18 @@ "setting": { "compileHotReLoad": true }, + "projectname": "bml_travel_applets", + "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", "condition": { + "plugin": { + "list": [] + }, + "game": { + "list": [] + }, + "gamePlugin": { + "list": [] + }, "miniprogram": { "list": [ { @@ -346,10 +357,15 @@ "pathName": "pages/release/quan/quan", "query": "", "scene": null + }, + { + "name": "", + "pathName": "pages/release/addactive/addactive", + "query": "", + "scene": null, + "launchMode": "default" } ] } - }, - "projectname": "bml_travel_applets", - "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html" -} \ No newline at end of file + } +}