wkw 3 weeks ago
parent
commit
61c3ae168f
4 changed files with 6 additions and 6 deletions
  1. 1 1
      pages/mine/mine.wxml
  2. 2 2
      pages/register/register.js
  3. 2 2
      pages/register/register.wxml
  4. 1 1
      pages/rules/rules.js

+ 1 - 1
pages/mine/mine.wxml

@@ -3,7 +3,7 @@
   <view class="mine">
     <view class="user-box">
       <button class="avatar-wrapper" open-type="chooseAvatar"   bind:chooseavatar="onChooseAvatar">
-        <van-image lazy-load round width="144rpx" height="144rpx" fit="cover" src="{{userInfo.avatar || baseUrl + '/static/image/cat.jpeg'}}" />
+        <van-image lazy-load round width="144rpx" height="144rpx" fit="cover" src="{{userInfo.avatar || baseUrl + '/static/image/cat.png'}}" />
       </button>
       <view class="user-text mt28">{{userInfo.nickname || '游客'}}</view>
       <view class="user-text user-number" wx:if="{{userInfo.competitionNo}}">报名号:{{userInfo.competitionNo}}</view>

+ 2 - 2
pages/register/register.js

@@ -240,8 +240,8 @@ Page({
     const dataInfo = app.globalData.programConfig;   
     this.setData({
       showAgreementModal: true,
-      agreementContent: type == 'rules'?dataInfo.rules : type == 'liability'?dataInfo.disclaimer : dataInfo.privacy_policy,
-      agreementTitle:type == 'rules'?'活动规则': type == 'liability'?'免责协议' : '隐私政策'
+      agreementContent: type == 'liability'?dataInfo.disclaimer : dataInfo.privacy_policy,
+      agreementTitle:type == 'liability'?'活动须知' : '隐私政策'
     });
   },
   closeAgreementModal() {

+ 2 - 2
pages/register/register.wxml

@@ -137,8 +137,8 @@
         已读并承诺遵守
       </van-checkbox>
       <view>
-        <text class="rules" data-type="rules" bindtap="showAgreement">《活动规则》</text>
-        <text class="rules" data-type="liability" bindtap="showAgreement">《免责协议》</text>
+        <!-- <text class="rules" data-type="rules" bindtap="showAgreement">《活动须知》</text> -->
+        <text class="rules" data-type="liability" bindtap="showAgreement">《活动须知》</text>
         <text class="rules" data-type="privacy" bindtap="showAgreement">《隐私政策》</text>
       </view>
     </view>

+ 1 - 1
pages/rules/rules.js

@@ -7,7 +7,7 @@ Page({
   onLoad(options) {
     const dataInfo = app.globalData.programConfig;
     this.setData({
-      headerText: options.type == 0?'活动规则':'免责声明',
+      headerText: options.type == 0?'活动规则':'活动须知',
       rulesText:options.type == 0?dataInfo.rules:dataInfo.disclaimer
     })
   },