modified: pages/basketballGym/index.js

modified:   pages/basketballGym/index.wxml
modified:   pages/currentEnter/index.wxml
modified:   pages/loginIndex/index.js
modified:   pages/loginIndex/index.wxml
modified:   pages/loginIndex/index.wxss
modified:   pages/myEnters/index.wxml
modified:   utils/api.js
modified:   utils/util.js

pages/basketballGym/index.wxml

@@ -79,30 +79,17 @@
 </view>
 
 <view class='in-step-popup' catchtouchmove='unMove' wx:if="{{flg == 0}}">
-  <view class='body'>
+  <view class='medium-body body'>
     <view class='top'>
       <view class='title'>
         <image src='../../images/24@3x.png'></image>
-        <text>请向门禁读头出示本二维码</text>
+        <text>开门成功</text>
       </view>
       <image src='../../images/23@3x.png' bindtap='closeInStep'></image>
     </view>
     <view class='center'>
-      <view class='item'>
-        <view wx:if="{{barcodeTimeOut}}" class='step'>二维码超时</view>
-        <view wx:else class='step'>扫码开门</view>
-        <view class='barcode'>
-          <view wx:if="{{barcodeTimeOut}}" class="timeout" bindtap="reloadBarcode">
-            <image src="../../images/reload.png" style="width: 160px; height: 178px;"></image>
-            <text>点击刷新</text>
-          </view>
-          <canvas wx:else class="barcode-canvas" style="width: 200px; height: 200px;" canvas-id="myQrcode"></canvas>
-          <!--          <canvas type="2d" class='title' canvas-id="myQrcode" style="width: 400rpx; height: 400rpx"></canvas>-->
-        </view>
-      </view>
-      <image src='../../images/22@3x.png'></image>
-      <view class='item'>
-        <view class='message'>如有问题，请联系管理员</view>
+      <view class='item' style='margin-top: 20rpx;'>
+        <view class='step' style='font-size: 56rpx; color: #ffda2e; font-weight: bold; letter-spacing: 4rpx;'>{{welcomeMsg}}</view>
       </view>
     </view>
   </view>