Skip to content

杨炀 / ztx_wx_gzt

Go to a project
Toggle navigation
Toggle navigation pinning
259aafe0 by 张猛
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	personal/addVip_per.vue
2 parents b9106935 3e1407b4
Inline Side-by-side
Showing 3 changed files with 24 additions and 98 deletions
level/paymentDetail.vue
...@@ -588,6 +588,7 @@ const handleSubmit = async () => { ...@@ -588,6 +588,7 @@ const handleSubmit = async () => {
588 padding: 20rpx 30rpx; 588 padding: 20rpx 30rpx;
589 background: #fff; 589 background: #fff;
590 box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.05); 590 box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.05);
591 z-index: 99;
591 592
592 .total-info { 593 .total-info {
593 flex: 1; 594 flex: 1;
......
personal/addVip_per.vue
...@@ -80,54 +80,17 @@ ...@@ -80,54 +80,17 @@
80 </view> 80 </view>
81 <view class="fixed-agreeline"> 81 <view class="fixed-agreeline">
82 <view class="agreeline"> 82 <view class="agreeline">
83 <image v-if="agree" :src="config.baseUrl_api+'/fs/static/login/xz_dwn@2x.png'" 83 <checkbox-group @change="onAgreeChange">
84 @click="changeAgree(agree)"></image> 84 <label class="agree-label">
85 <image v-else :src="config.baseUrl_api+'/fs/static/login/xz@2x.png'" @click="changeAgree(agree)"> 85 <checkbox :checked="agree" color="#C40F18" value="1" />
86 </image> 86 <text class="agree-text">我已阅读并同意</text>
87 <view>我已阅读 87 <text class="notice-link" @click.stop="showNotice(1)">《注册须知》</text>
88 <text @click="openpopup">《入会须知》</text> 88 <text class="notice-link" @click.stop="showNotice(2)">《入会须知》</text>
89 </view> 89 </label>
90 </view> 90 </checkbox-group>
91 </view>
92 <view class="fixedBottom">
93 <button class="btn-red" @click="goSubmit">确 定</button>
94 </view>
95
96 <!-- 会员须知 -->
97 <uni-popup ref="popup" :disable-scroll="true" :mask-click="false" animation background-color="#fff"
98 type="bottom">
99 <view class="tt">注册须知</view>
100 <view class="tt">入会须知</view>
101 <view class="popBody">
102 _{{ baseFormData.name }}_欢迎您申请成为中国跆拳道协会（以下简称中国跆协）会员，请确保本次申请是经过您本人或监护人授权同意后的自愿行为，请您务必仔细阅读本入会须知。
103 <br/>
104 一、中国跆协会员分为个人会员和单位会员。
105 <br/>
106 二、成为本协会会员条件：遵守中国跆协章程和协会各项规章制度及相关决议，按期交纳会费，积极支持和参与中国跆拳道事业发展的社会各届人士或地方跆拳道协会、俱乐部、培训机构等，均可自愿申请成为中国跆协会员。<br/>
107 三、个人会员为在中国工作和生活的跆拳道爱好者，16 周岁以下应有监护人协助申请，会员须为中国公民。<br/>
108 四、会员入会需向所在区域内中国跆协单位会员提出入会申请，并按程序报中国跆协批准，按规定交纳会费。<br/>
109 五、会员享有《中国跆拳道协会会员管理办法》规定的会员权利。
110 <br/>
111 六、会员应履行《中国跆拳道协会会员管理办法》规定的会员义务。
112 <br/>
113 七、凡中国跆协会员，须按照《中国跆拳道协会会员会费标准（2021 版）》按时交纳年度会费。<br/>
114 八、会员行为违反《中国跆拳道协会会员管理办法》中规定的，按照相关处罚规定进行处理。<br/>
115 九、其它会员相关内容请查看《中国跆拳道协会章程》《中国跆拳道协会会员管理办法》。<br/>
116
117 <button class="btn-red" @click="closepopup">我已阅读</button>
118 </view>
119 </uni-popup>
120
121 <uni-popup ref="infoConfirm" :disable-scroll="true" :mask-click="false" type="center">
122 <view class="tt">确认信息</view>
123 <view class="popBody">
124 <view>
125
126 </view> 91 </view>
127
128 <button class="btn-red" @click="closepopup">已确认</button>
129 </view> 92 </view>
130 </uni-popup> 93 <view class="fixedBottom"><button class="btn-red" @click="goSubmit">确 定</button></view>
131 94
132 </view> 95 </view>
133 </template> 96 </template>
...@@ -752,20 +715,24 @@ function getUserInfo() { ...@@ -752,20 +715,24 @@ function getUserInfo() {
752 } 715 }
753 716
754 .agreeline { 717 .agreeline {
755 padding: 20rpx 40rpx; 718 padding: 20rpx 30rpx;
756 box-sizing: border-box; 719 box-sizing: border-box;
720 }
721
722 .agree-label {
757 display: flex; 723 display: flex;
758 font-size: 30rpx; 724 align-items: center;
725 flex-wrap: wrap;
726 font-size: 24rpx;
727 }
759 728
760 text { 729 .agree-text {
761 color: #014A9F; 730 color: #666;
762 } 731 margin-left: 10rpx;
732 }
763 733
764 image { 734 .notice-link {
765 width: 40rpx; 735 color: #007AFF;
766 height: 40rpx;
767 margin-right: 20rpx;
768 }
769 } 736 }
770 737
771 .upCard { 738 .upCard {
......
personal/home.vue
...@@ -102,48 +102,6 @@ ...@@ -102,48 +102,6 @@
102 </view> 102 </view>
103 <uni-icons color="#999" size="20" type="arrowright"></uni-icons> 103 <uni-icons color="#999" size="20" type="arrowright"></uni-icons>
104 </view> 104 </view>
105 <!-- <view class="query-item" @click="goToWebView(1)">
106 <view class="query-item-left">
107 <image :src="config.baseUrl_api + '/fs/static/user_icon03@2x.png'" class="query-item-icon"></image>
108 <text class="query-item-text">单位会员查询</text>
109 </view>
110 <uni-icons type="arrowright" size="20" color="#999"></uni-icons>
111 </view>
112 <view class="query-item" @click="goToWebView(2)">
113 <view class="query-item-left">
114 <image :src="config.baseUrl_api + '/fs/static/user_icon03@2x.png'" class="query-item-icon"></image>
115 <text class="query-item-text">个人会员查询</text>
116 </view>
117 <uni-icons type="arrowright" size="20" color="#999"></uni-icons>
118 </view>
119 <view class="query-item" @click="goToWebView(3)">
120 <view class="query-item-left">
121 <image :src="config.baseUrl_api + '/fs/static/user_icon02@2x.png'" class="query-item-icon"></image>
122 <text class="query-item-text">旧版级位证书查询</text>
123 </view>
124 <uni-icons type="arrowright" size="20" color="#999"></uni-icons>
125 </view> -->
126 <!-- <view class="query-item" @click="goToWebView(4)">
127 <view class="query-item-left">
128 <image :src="config.baseUrl_api + '/fs/static/user_icon02@2x.png'" class="query-item-icon"></image>
129 <text class="query-item-text">新版级位证书查询</text>
130 </view>
131 <uni-icons type="arrowright" size="20" color="#999"></uni-icons>
132 </view> -->
133 <!-- <view class="query-item" @click="goToWebView(5)">
134 <view class="query-item-left">
135 <image :src="config.baseUrl_api + '/fs/static/user_icon02@2x.png'" class="query-item-icon"></image>
136 <text class="query-item-text">级位记录查询</text>
137 </view>
138 <uni-icons type="arrowright" size="20" color="#999"></uni-icons>
139 </view> -->
140 <!-- <view class="query-item" @click="goToWebView(6)">
141 <view class="query-item-left">
142 <image :src="config.baseUrl_api + '/fs/static/user_icon02@2x.png'" class="query-item-icon"></image>
143 <text class="query-item-text">国际段位证书查询</text>
144 </view>
145 <uni-icons type="arrowright" size="20" color="#999"></uni-icons>
146 </view> -->
147 <view class="query-item" @click="goToRecord(1)"> 105 <view class="query-item" @click="goToRecord(1)">
148 <view class="query-item-left"> 106 <view class="query-item-left">
149 <image :src="config.baseUrl_api + '/fs/static/user_icon02@2x.png'" class="query-item-icon"></image> 107 <image :src="config.baseUrl_api + '/fs/static/user_icon02@2x.png'" class="query-item-icon"></image>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!