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

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/ActivityController.java

@@ -80,7 +80,7 @@ public class ActivityController extends BaseController {
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
             @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "id活动编号;activityTitle活动标题;" +
                     "activityCarouselImg轮播图;activityContent活动详情;contentImg活动内容配图;signUpMax活动人数上限;" +
-                    "registrationEndTime报名活动结束时间;sort权重;status状态 0 是已作废 1 是已发布   2 是草稿，signInCode:1是需要二维码，2是不需要")
+                    "registrationEndTime报名活动结束时间;sort权重;status状态 0 是已作废 1 是已发布   2 是草稿，radio:1是需要二维码，2是不需要")
     })
     @RequestMapping(value = "/activity/update", method = RequestMethod.PUT)
     public ResponseBean updateActivity(@RequestBody String parameter, HttpSession session) {

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpActivityServiceImpl.java

@@ -291,6 +291,13 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
         String [] contentImgArray = jsonArray.toArray(new String[]{});
         //是否需要签到二维码1:需要2不需要
         int radio= jsonObject.getIntValue("radio");
+        if(radio==2){
+            tpActivity.setSignInCode("2");
+                QueryWrapper<TdImages> tdImages= new QueryWrapper<>();
+                tdImages.eq("uuid",tpActivity.getId())
+                        .eq("type","activityCode");
+            tdImagesMapper.delete(tdImages);
+        }
 
         TpActivity selectTpActivity = tpActivityMapper.selectById(tpActivity.getId());
         if (null == selectTpActivity) {
@@ -347,7 +354,7 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
                 TdImages tdImages= new TdImages();
                 tdImages.setImageUrl(qrCodePerproties.getUrl() + tpActivity.getId());
                 tdImages.setUuid(tpActivity.getId());
-                tdImages.setType(Constant.ACTIVITY);
+                tdImages.setType("activityCode");
                 tdImages.setCreateUser(userElement.getId());
                 tdImages.setCreateTime(LocalDateTime.now());
                 tdImagesMapper.insert(tdImages);

VUECODE/smart-property-manage/src/api/activity.js

@@ -48,7 +48,8 @@ export function updateActivity(data) {
       signUpMax: data.signUpMax, //  活动人数上限
       registrationEndTime: data.registrationEndTime, // 报名活动结束时间
       sort: data.sort, // 权重
-      status: data.status // 状态 0 是已作废 1 是已发布   2 是草稿 3 是已修改
+      status: data.status, // 状态 0 是已作废 1 是已发布   2 是草稿 3 是已修改
+      radio: data.signInCode
     }
   })
 }

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

@@ -80,7 +80,7 @@
         </el-form-item>
         <div>
          <div> <hr style="height:1px;border:none;border-top:1px solid #FF8888;margin-right:100%"  width="100%"/></div>     
-         <div style="transform:translateY(120%);"><span style="font-size: 8px; color: #606266;">关联本小区其他房屋</span></div> 
+         <div style="transform:translateY(120%);"><span style="font-size:0.7vw; color: #606266;">关联本小区其他房屋</span></div> 
          <el-form-item>
           <table >
             <tr style="transform:translateY(-10%);">

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

@@ -1,6 +1,6 @@
 <template>
   <div id="root">
-    <div>公告标题&nbsp;&nbsp;<span class="activityTile">{{ ruleForm.activityTitle }}</span></div>
+    <div>活动标题&nbsp;&nbsp;<span class="activityTile">{{ ruleForm.activityTitle }}</span></div>
     <div >
         <div class="activityTile" style="transform:translateY(250%);">活动轮播图</div>
         <div  style="width: 500px;padding-left:20%;">
@@ -10,9 +10,9 @@
     <div class="activityContext">
       <div class="activityTile"><span style="position:relative;top:-1px">活动详细描述&nbsp;&nbsp;</span>{{ ruleForm.activityContent }}</div>
     </div>
-    <div class="activityContextImg">
-        <div >
-        <div class="activityTile" style="transform:translateY(250%);">活动轮播图</div>
+    <div>
+        <div>
+        <div style="transform:translateY(20%);">活动配图</div>
         <div  style="width: 500px;padding-left:20%;">
       <img v-for="item in ruleForm.contentImg" :src="item" width="80" height="80" />
         </div>
@@ -20,12 +20,12 @@
     </div>
     <span>
     <div style="display: flex;">
-          <span class="activityTile" style="width: 200px;transform:translateY(25%);">是否需要报名人扫码签到</span>
-          <el-radio v-model="ruleForm.signInCode" label="1" style="padding-left:4%;font-weight:bold;font-size:12px;transform:translateY(30%);">需要</el-radio>
-          <el-radio v-model="ruleForm.signInCode" label="2" style="padding-left:8%;font-weight:bold;font-size:12px;transform:translateY(30%);">不需要</el-radio> 
+          <span class="activityTile" style="width: 200px;transform:translateY(50%);">是否需要报名人扫码签到</span>
+          <el-radio v-model="ruleForm.signInCode" label="1" style="padding-left:4%;font-weight:bold;font-size:12px;transform:translateY(50%);">需要</el-radio>
+          <el-radio v-model="ruleForm.signInCode" label="2" style="padding-left:8%;font-weight:bold;font-size:12px;transform:translateY(50%);">不需要</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%;" v-if="ruleForm.signInCode=='1'">
+    <div style="padding-left:30%;" v-if="ruleForm.activityCode !=null">
         <div><img :src="qrcode" width="200" height="200" ></div>
         <a :href="qrcode" download="qrcode.jpg"  style="color:#00BFFF;padding-left:15%">点击下载</a>
     </div>
@@ -58,6 +58,7 @@ export default {
     return {
       asOfdate: '2018/10/10 23:59:59',
       ruleForm: {
+        signInCode: '',
         activityCode: '',
         id: '',
         activityTitle: '',