Merge branch '2.0.0' of http://git.ycjcjy.com/fuxingfan/smartCommunity into 2.0.0

CODE/smart-community/operate-api/src/main/java/com/community/huiju/dao/TpUserMapper.java

@@ -23,7 +23,7 @@ public interface TpUserMapper {
 
     int updateByPrimaryKey(TpUser record);
     
-    TpUser selectByTel(@Param("id") Integer id,@Param("loginName") String loginName);
+    TpUser selectByTel(@Param("communityId") Integer communityId,@Param("loginName") String loginName);
     
     int updateByTel(@Param("id") Integer id,@Param("loginName") String loginName,@Param("userName") String userName,@Param("oldTel") String oldTel);
 	

CODE/smart-community/operate-api/src/main/resources/mapper/TpUserMapper.xml

@@ -196,6 +196,7 @@
   <select id="selectByTel" resultMap="BaseResultMap">
       select <include refid="Base_Column_List" /> from tp_user
       where login_name = #{loginName,jdbcType=VARCHAR}
+      and community_id = #{communityId}
       and status = 1
   </select>
 

VUECODE/smart-property-manage/src/views/social/activity/info/index.vue

@@ -25,7 +25,7 @@
           <el-radio v-model="ruleForm.signInCode" label="2" style="padding-left:8%;font-weight:bold;font-size:12px;transform:translateY(30%);">不需要</el-radio> 
           <span style="padding-left:20%"><el-button type="primary" style="float:left;" @click="singn">查看签到名单</el-button></span> 
     </div>
-    <div style="padding-left:30%;">
+    <div style="padding-left:30%;" v-if="ruleForm.signInCode=='1'">
         <div><img :src="qrcode" width="200" height="200" ></div>
         <a :href="qrcode" download="qrcode.jpg"  style="color:#00BFFF;padding-left:15%">点击下载</a>
     </div>
@@ -177,15 +177,11 @@ export default {
   margin-top: 50px;
   margin-left: auto;
   margin-right: auto;
-  font-size: 1px;
+  font-size: 13px;
 
 }
-.activityTile{
-  font-size: 14px;
-}
 .activityContext{
   margin-bottom: 20px;
-  font-size: 20px;
   justify-items: center;
 }
 .progress {