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 @@
<view class="other-right">
<view class="other-name">{{item.activityName}}</view>
<view class="other-time">{{item.startRegisterTime+'至'+item.endRegisterTime}}</view>
- <view class="other-people"><text>报名：{{item.totalRegister}}人</text></view>
+ <view class="other-people"><text>报名：{{item.totalRegister || '0'}}人</text></view>
</view>
</view>
</block>
@@ -141,4 +141,4 @@
<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
+</view>
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 @@
<!-- <view class="list">
<view class="title">费用</view>
￥{{price}}
-
+
</view>
<view class="list">
<view class="title">保险</view>
由主办方统一购买
-
+
</view> -->
<!-- 昵称 -->
<view class="list">
@@ -74,12 +74,14 @@
</view>
<view class="agree">
<checkbox-group bindchange="xieyi">
- <checkbox name="box_check" checked="{{checked}}"></checkbox>
- 我已阅读并同意<text bindtap='seexcieyi' data-webview="{{Agreement}}">《**活动报名协议》</text>
+ <label>
+ <checkbox name="box_check" checked="{{checked}}"></checkbox>我已阅读并同意
+ </label>
+ <text class="xy" bindtap='seexcieyi'>《活动报名协议》</text>
</checkbox-group>
</view>
</view>
<view class="bottom">
<view class="price">合计：<text><text>￥</text>{{price*info.details.length}}</text></view>
<view class="join" bindtap="toOrder">我要报名</view>
-</view>
\ No newline at end of file
+</view>
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 @@
<checkbox-group bindchange="checkboxChange">
<label class="xieyi-class">
<checkbox checked="{{checked}}" name="box_check" value="{{checked}}" bind></checkbox>
- 我并同意<text bindtap='seexcieyi' data-webview="{{Agreement}}">《报名了服务协议》</text>，并确认活动真实性，同意支付报名
+ 我同意<text class="xy" catchtap="toxypage">《服务协议》</text>，并确认活动真实性，同意支付报名
</label>
</checkbox-group>
</view>
<view class="bottom" bindtap="topay">
确定支付
</view>
-</view>
\ No newline at end of file
+</view>
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<tempFilePaths.length;i++){
wx.uploadFile({
url: Api.uploadImg(),
@@ -649,7 +649,7 @@ uploadfront: function (e) {
};
if(!this.data.checked){
wx.showToast({
- title: '请先阅读并同意服务协议',
+ title: '请先阅读并同意协议',
icon: 'none',
duration: 1500
})
@@ -834,4 +834,4 @@ uploadfront: function (e) {
onShareAppMessage: function () {
}
-})
\ No newline at end of file
+})
diff --git a/pages/release/addactive/addactive.wxml b/pages/release/addactive/addactive.wxml
index 7c5be06..8bed725 100644
--- a/pages/release/addactive/addactive.wxml
+++ b/pages/release/addactive/addactive.wxml
@@ -15,14 +15,14 @@
<view class="list">
<view class="title">报名时间</view>
<view class="time">
- <picker mode="multiSelector" value="{{startT}}" bindchange="changeDateTime"
+ <picker mode="multiSelector" value="{{startT}}" bindchange="changeDateTime"
range="{{dateTimeArray}}">
<view class="picker">
{{startT}}
</view>
</picker>
至
- <picker mode="multiSelector" value="{{startTTwo}}" bindchange="changeDateTimeTwo"
+ <picker mode="multiSelector" value="{{startTTwo}}" bindchange="changeDateTimeTwo"
range="{{dateTimeArrayTwo}}">
<view class="picker">
{{startTTwo}}
@@ -35,7 +35,7 @@
<view class="title">活动时间</view>
<view class="time">
- <picker mode="multiSelector" value="{{startTThree}}" bindchange="changeDateTimeThree"
+ <picker mode="multiSelector" value="{{startTThree}}" bindchange="changeDateTimeThree"
range="{{dateTimeArrayTwo}}">
<view class="picker">
{{startTThree}}
@@ -43,7 +43,7 @@
</picker>
至
- <picker mode="multiSelector" value="{{startTFour}}" bindchange="changeDateTimeFour"
+ <picker mode="multiSelector" value="{{startTFour}}" bindchange="changeDateTimeFour"
range="{{dateTimeArrayFour}}">
<view class="picker">
{{startTFour}}
@@ -194,8 +194,8 @@
<text>是否显示报名列表</text>
<view class="authright">
<radio-group name="isShowRegister" bindchange="showregisterChange" >
- <label><radio value="0" checked="true" color="#FFCB12"/>不显示</label>
- <label><radio value="1" color="#FFCB12"/>显示</label>
+ <label><radio value="0" color="#FFCB12"/>不显示</label>
+ <label><radio value="1" checked="true" color="#FFCB12"/>显示</label>
</radio-group>
</view>
</view>
@@ -203,8 +203,8 @@
<text>是否显示主办方信息</text>
<view class="authright">
<radio-group name="isShowSponsor" bindchange="sponsorChange" >
- <label><radio value="0" checked="true" color="#FFCB12"/>不显示</label>
- <label><radio value="1" color="#FFCB12"/>显示</label>
+ <label><radio value="0" color="#FFCB12"/>不显示</label>
+ <label><radio value="1" checked="true" color="#FFCB12"/>显示</label>
</radio-group>
</view>
</view>
@@ -226,8 +226,8 @@
<text>小程序通知</text>
<view class="authright">
<radio-group name="isAppletNotify" bindchange="appleChange" >
- <label><radio value="0" checked="true" color="#FFCB12"/>不通知</label>
- <label><radio value="1" color="#FFCB12"/>通知</label>
+ <label><radio value="0" color="#FFCB12"/>不通知</label>
+ <label><radio value="1" checked="true" color="#FFCB12"/>通知</label>
</radio-group>
</view>
</view>
@@ -235,8 +235,8 @@
<text>短信通知</text>
<view class="authright">
<radio-group name="isSmsNotify" bindchange="smsChange" >
- <label><radio value="0" checked="true" color="#FFCB12"/>不通知</label>
- <label><radio value="1" color="#FFCB12"/>通知</label>
+ <label><radio value="0" color="#FFCB12"/>不通知</label>
+ <label><radio value="1" checked="true" color="#FFCB12"/>通知</label>
</radio-group>
</view>
</view>
@@ -244,8 +244,8 @@
<text>报名后自动加入俱乐部</text>
<view class="authright">
<radio-group name="isJoin" bindchange="isJoinChange" >
- <label><radio value="0" checked="true" color="#FFCB12"/>不通知</label>
- <label><radio value="1" color="#FFCB12"/>通知</label>
+ <label><radio value="0" color="#FFCB12"/>不自动加入</label>
+ <label><radio value="1" checked="true" color="#FFCB12"/>自动加入</label>
</radio-group>
</view>
</view>
@@ -255,8 +255,10 @@
</view>
<view class="agree">
<checkbox-group bindchange="xieyi">
+ <label>
<checkbox name="box_check" value="{{checked}}"></checkbox>
- 我已阅读并同意<text bindtap='seexcieyi' data-webview="{{Agreement}}">《报名了服务协议》</text>
+ 我已阅读并同意<text catchtap='seexcieyi'>《服务协议》</text>
+ </label>
</checkbox-group>
</view>
</view>
@@ -277,7 +279,7 @@
</scroll-view> -->
<!-- 模态框 -->
-<modal hidden="{{hidden}}" title="退款设置" confirm-text="确定" cancel-text="取消"
+<modal hidden="{{hidden}}" title="退款设置" confirm-text="确定" cancel-text="取消"
bindcancel="cancel" bindconfirm="confirm">
<view class="content">
<radio-group bindchange="backChange">
@@ -299,9 +301,9 @@
</picker>
</view>
</view>
- </modal>
+ </modal>
- <!-- <modal hidden="{{taghidden}}" title="创建新报名项" confirm-text="添加" cancel-text="取消"
+ <!-- <modal hidden="{{taghidden}}" title="创建新报名项" confirm-text="添加" cancel-text="取消"
bindcancel="tagcancel" bindconfirm="tagconfirm">
<input type="text" bindinput="addtags"/>
- </modal> -->
\ No newline at end of file
+ </modal> -->
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
+ }
+}