Merge branch 'master' into change0706

pages/meetingDetailSigned/meetingDetailSigned.wxml

@@ -576,7 +576,8 @@
 	<!-- 签到信息end -->
 
 	<!-- 开票邮寄信息 begin -->
-	<view class="basic-info" style="margin-top: 10px;" wx:if="{{singInPersonInfo.checkResult !== 0 }}">
+  <!-- wx:if="{{singInPersonInfo.checkResult !== 0 }}" -->
+	<view class="basic-info" style="margin-top: 10px;" >
 		<view class="title">
 			<text>到账信息</text>
 		</view>
@@ -586,8 +587,8 @@
 		</view>
 		<text class="no-data" style="height: 50px;" wx:if="{{!form.paymentRecord}}">暂无到账记录！</text>
 	</view>
-
-	<view class="basic-info" style="margin-top: 10px;" wx:if="{{singInPersonInfo.checkResult !== 0 }}">
+<!-- wx:if="{{ singInPersonInfo.checkResult !== 0 }}" -->
+	<view class="basic-info" style="margin-top: 10px;" >
 		<view class="title">
 			<text>开票邮寄信息</text>
 		</view>

pages/scanSign/scanSign.js

@@ -122,7 +122,7 @@ Page({
     // 这里是 微信扫码进入的逻辑
 
     // 微信扫码 判断是否登录
-    if(options.q || true) {
+    if(options.q) {
       let url = decodeURIComponent(options.q)
       let meetingId = url.split('=')[1]
       // 登录过的就直接签到 否则跳转登录页

pages/scanSign/scanSign.wxml

@@ -48,12 +48,12 @@
 <view class="imageBox" wx:if="{{src}}">
   <image src="{{src}}" ></image>
 </view>
-<view class="scanSign" wx:if="{{isSigned == '1' && !form.checkIn && form.canCheckIn == 1}}">
+<view class="scanSign" wx:if="{{isSigned == '1' && !form.checkIn}}">
   <text bindtap="sureSign">提交</text>
 </view>
-<view class="scanSign" wx:if="{{isSigned == '1' && !form.checkIn && form.canCheckIn == 0}}">
+<!-- <view class="scanSign" wx:if="{{isSigned == '1' && !form.checkIn && form.canCheckIn == 0}}">
   <text style="background-color: #bbb;">提交</text>
-</view>
+</view> -->
 <!-- 已报名信息显示的内容end -->
 
 <!-- 未报名显示的内容start -->