Merge branch 'feature/change' into 'master'

Feature/change

See merge request !22

src/pages/raffle.wpy

@@ -119,7 +119,7 @@
         <text class="money">{{quantity}}克币</text>
       </view>
       <view class="raffle-chance">中奖概率: {{chance}}</view>
-      <view class="raffle-progress">中奖进度:
+      <view class="raffle-progress">开奖进度:
         <view class="progress">
           <view class="orange" style="{{progressStyle}}"></view>
         </view>
@@ -172,8 +172,8 @@
             that.btnfont = '立即参与';
           });
         }
-        this.btnfont = '提交中...';
         if(detail.encryptedData) {
+          this.btnfont = '提交中...';
           wx.checkSession({
             success () {
               goprize();
@@ -213,7 +213,7 @@
       },
       joinin() {
         if(!this.isCheck) {
-          Notify({message: '请先勾选!', background:'#FF5D15'})
+          Notify({message: '勾选同意后才可以抽奖!', background:'#FF5D15'})
           return;
         }
         if(this.hasPhone) {