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

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/code/ICode.java

@@ -32,8 +32,10 @@ public interface ICode {
         String phoneCode = (String) AppkeyCache.getCache(phone);
         if ("1234".equals(code)) {
 
-        }else if (StringUtils.isBlank(phoneCode) || !phoneCode.equals(code)) {
+        }else if (StringUtils.isBlank(phoneCode)) {
             throw new WisdomException("请输入验证码!");
+        } else if (!phoneCode.equals(code)) {
+            throw new WisdomException("验证码错误!");
         }
         // 设置验证码为null字符
         // AppkeyCache.setCache(phone,"null");

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java

@@ -129,7 +129,7 @@ public class SocialController extends BaseController {
                                            @RequestParam("activityId") Integer activityId,
                                            HttpSession session) {
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId = userElement.getId();
+        Integer userId = userElement.getUserVerifyId();
 
         ResponseBean responseBean = new ResponseBean();
         if (!check(communityId)) {

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpActivityMapper.java

@@ -38,4 +38,6 @@ public interface TpActivityMapper {
      * @return
      */
     List<TpActivity> selecttpActivity(@Param("id") Integer id, @Param("communityId") Integer communityId);
+
+    TpActivity selectActivity(@Param("activityId") Integer activityId);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpActivitySignInMapper.java

@@ -24,4 +24,5 @@ public interface TpActivitySignInMapper {
      *
      */
     TpActivitySignIn selectSing(@Param("activityId") Integer activityId,@Param("userID") Integer userID);
+
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpActivitySignupMapper.java

@@ -1,6 +1,7 @@
 package com.community.huiju.dao;
 
 
+import com.community.huiju.model.TpActivitySignIn;
 import com.community.huiju.model.TpActivitySignup;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpActivity.java

@@ -42,7 +42,17 @@ public class TpActivity {
     private Date updateDate;
     
     private String userName;
-    
+
+    private String signInCode;
+
+    public String getSignInCode() {
+        return signInCode;
+    }
+
+    public void setSignInCode(String signInCode) {
+        this.signInCode = signInCode;
+    }
+
     /**
      * 报名状态
      */

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java

@@ -648,6 +648,32 @@ public class SocialServiceImpl implements SocialServiceI {
     public ResponseBean tpActivitySignInAdd(String paramets, UserElement userElement) {
         ResponseBean responseBean = new ResponseBean();
         Integer activityId = JSONObject.parseObject(paramets).getInteger("activityId");
+        // 校验扫码签到
+        TpActivity tpActivity = tpActivityMapper.selectByPrimaryKey(activityId,userElement.getCommunityId());
+        /*当前用户扫的是否是本小区的码*/
+        TpActivity activity = tpActivityMapper.selectActivity(activityId);
+        if (null!=activity && (!userElement.getCommunityId().equals(activity.getCommunityId()))){
+            responseBean.addError("活动不属于当前登录小区，请在个人中心切换小区");
+            return responseBean;
+        }
+        /*查看当前用户是否报名*/
+         TpActivitySignup signIn= tpActivitySignupMapper.selectTpActivetitySignByUserId(activityId,userElement.getCommunityId(),userElement.getUserVerifyId());
+        if (signIn == null){
+            responseBean.addError("请先报名");
+            return responseBean;
+        }
+        /*活动不需要签到*/
+
+        if (null!=tpActivity && "2".equals(tpActivity.getSignInCode())){
+            responseBean.addError("活动已不能签到");
+            return responseBean;
+        }
+        /*活动作废*/
+        if (null!=tpActivity && "0".equals(tpActivity.getStatus())){
+            responseBean.addError("活动已被作废");
+            return responseBean;
+        }
+
         TpActivitySignIn tpActivitySignIn = new TpActivitySignIn();
         tpActivitySignIn.setActivityId(activityId);
         tpActivitySignIn.setCommunityId(userElement.getCommunityId());
@@ -790,7 +816,7 @@ public class SocialServiceImpl implements SocialServiceI {
         TpActivitySignup tpActivitySignup = new TpActivitySignup();
         tpActivitySignup.setActivityId(tpActivity.getId());
         tpActivitySignup.setCommunityId(communityId);
-        tpActivitySignup.setTaUserId(userElement.getId());
+        tpActivitySignup.setTaUserId(userElement.getUserVerifyId());
         tpActivitySignup.setSignUpTime(new Date());
         tpActivitySignup.setRemark(remark);
 

CODE/smart-community/app-api/src/main/resources/mapper/TpActivityMapper.xml

@@ -21,12 +21,14 @@
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
     <result column="update_user" property="updateUser" jdbcType="INTEGER" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+    <result column="sign_in_code" property="signInCode" jdbcType="VARCHAR" />
+
   </resultMap>
   <sql id="Base_Column_List" >
     id, community_id, activity_title, activity_carousel_img, activity_content, sort, 
     sign_up_count, sign_up_max, view_count, registration_start_time, registration_end_time, 
     activity_start_time, activity_end_time, status, create_user, create_date, update_user, 
-    update_date
+    update_date,sign_in_code
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap">
     select
@@ -45,14 +47,14 @@
       registration_start_time, registration_end_time, 
       activity_start_time, activity_end_time, 
       status, create_user, create_date, 
-      update_user, update_date)
+      update_user, update_date,sign_in_code,sign_in_code,sign_in_code)
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{activityTitle,jdbcType=VARCHAR}, 
       #{activityCarouselImg,jdbcType=VARCHAR}, #{activityContent,jdbcType=LONGVARCHAR}, #{sort,jdbcType=INTEGER},
       #{signUpCount,jdbcType=INTEGER}, #{signUpMax,jdbcType=INTEGER}, #{viewCount,jdbcType=INTEGER}, 
       #{registrationStartTime,jdbcType=TIMESTAMP}, #{registrationEndTime,jdbcType=TIMESTAMP}, 
       #{activityStartTime,jdbcType=TIMESTAMP}, #{activityEndTime,jdbcType=TIMESTAMP}, 
       #{status,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
-      #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP})
+      #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP},#{signInCode,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TpActivity" >
     insert into tp_activity
@@ -111,6 +113,9 @@
       <if test="updateDate != null" >
         update_date,
       </if>
+      <if test="signInCode != null" >
+        sign_in_code
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -167,6 +172,9 @@
       <if test="updateDate != null" >
         #{updateDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="signInCode != null" >
+        #{signInCode,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpActivity" >
@@ -223,6 +231,9 @@
       <if test="updateDate != null" >
         update_date = #{updateDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="signInCode != null" >
+        sign_in_code = #{signInCode,jdbcType=VARCHAR}
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -244,7 +255,8 @@
       create_user = #{createUser,jdbcType=INTEGER},
       create_date = #{createDate,jdbcType=TIMESTAMP},
       update_user = #{updateUser,jdbcType=INTEGER},
-      update_date = #{updateDate,jdbcType=TIMESTAMP}
+      update_date = #{updateDate,jdbcType=TIMESTAMP},
+      sign_in_code = #{signInCode,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
@@ -290,4 +302,7 @@
     AND tr.community_id =#{communityId}
     order by a.create_date desc
   </select>
+  <select id="selectActivity" resultMap="BaseResultMap">
+    select * from tp_activity where id = #{activityId}
+  </select>
 </mapper>

CODE/smart-community/app-api/src/main/resources/mapper/TpActivitySignInMapper.xml

@@ -149,4 +149,14 @@
     and ta_user_id = #{userID,jdbcType=INTEGER}
   </select>
 
+  <select id="toSignUp" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from
+    tp_activity_sign_in
+    where
+    activity_id = #{activityId,jdbcType=INTEGER}
+    and ta_user_id = #{userVerifyId,jdbcType=INTEGER}
+    and community_id = #{communityId,jdbcType=INTEGER}
+  </select>
 </mapper>

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

@@ -61,7 +61,7 @@ public class IndexCountServiceImpl implements IndexCountServiceI {
 		//获取收费组总缴费统计
 		List<TpBillInvoiceCount> billInvoiceCountList = indexCountMapper.getBillInvoiceCountList(communityId);
 		
-		//获取月租车总续费统计
+			//获取月租车总续费统计
 		List<TaUserLicenseCount> taUserLicenseCountList = indexCountMapper.getUserLicenseCountList(communityId);
 		
 		//获取临时车总缴费统计

VUECODE/smart-operate-manage/src/views/login/index.vue

@@ -6,7 +6,7 @@
         :model="loginForm"
         :rules="loginRules"
         class="login-form"
-        auto-complete="on"
+        auto-complete="off"
         label-position="left"
       >
         <div class="logo">
@@ -23,7 +23,7 @@
             v-model="loginForm.username"
             name="username"
             type="text"
-            auto-complete="on"
+            auto-complete="off"
             placeholder="请输入手机号"
           />
         </el-form-item>

VUECODE/smart-property-manage/src/views/grogshop/configindex.vue

@@ -48,7 +48,7 @@
       <el-form-item label="酒店地址" prop="hotelAddress">
         <el-input v-model="listData.hotelAddress"/>
       </el-form-item>
-      <el-form-item label="地图定位">
+      <el-form-item label="地图定位" prop="hotelLatitude">
         <span  style="font-size:14px;color:#C0C0C0">在地图上搜索选择酒店位置确定坐标值，供APP端用户导航</span>
         <span>高德坐标</span>
         <el-input placeholder="经度" v-model="listData.hotelLongitude" style="width: 100px;" />
@@ -124,17 +124,20 @@ export default {
           { required: true, message: '请输入联系电话', trigger: 'blur' }
         ],
         appIndexImg: [
-          { required: true, message: 'app列表展示图', trigger: 'blur' }
+          { required: true, message: '请上传app列表展示图', trigger: 'blur' }
         ],
         hotelName: [
-          { required: true, message: '酒店名称', trigger: 'blur' }
+          { required: true, message: '请输入酒店名称', trigger: 'blur' }
         ],
         hotelLatitude: [
           { required: true, message: '请输入坐标', trigger: 'blur' }
         ],
         hotelIntroduction: [
-          { required: true, message: '酒店介绍不能为空', trigger: 'change' }
+          { required: true, message: '请输入酒店介绍', trigger: 'change' }
         ],
+        appCarouselImg: [
+          { required: true, message: '请上传酒店banner图', trigger: 'blur' }
+        ]
       }
     }
   },

VUECODE/smart-property-manage/src/views/grogshop/grogshopRoomAdd.vue

@@ -1,29 +1,29 @@
 <template>
   <div id="root">
-    <el-form ref="ruleForm" :model="ruleForm"  :rules="rules" label-width="100px" class="demo-ruleForm">
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="demo-ruleForm">
       <el-form-item label="房型名称" prop="roomName">
         <el-input v-model="ruleForm.roomName" placeholder="房型名称"/>
       </el-form-item>
-       <!-- <el-form-item label="房型号" prop="roomNo">
+      <!-- <el-form-item label="房型号" prop="roomNo">
         <el-input v-model="ruleForm.roomNo" placeholder="房型号"/>
       </el-form-item> -->
-     <el-form-item class="filter-item" label="房型短描述" prop="remark" >
+      <el-form-item class="filter-item" label="房型短描述" prop="remark" >
         <el-input v-model.trim="ruleForm.remark" placeholder="房型推荐语等"/>
       </el-form-item>
       <el-form-item label="房型价格" prop="price">
         <el-input v-model="ruleForm.price" placeholder="单位元" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
       </el-form-item>
-      <el-form-item class="filter-item"  label="上架状态" prop="roomStatus">
+      <el-form-item class="filter-item" label="上架状态" prop="roomStatus">
         <el-select v-model="ruleForm.roomStatus" placeholder="上架">
-         <el-option label="上架" value="1"/>
-         <el-option label="下架" value="2"/>
+          <el-option label="上架" value="1"/>
+          <el-option label="下架" value="2"/>
         </el-select>
       </el-form-item>
       <el-form-item label="权重" prop="sort">
         <el-input v-model="ruleForm.sort" placeholder="不小于0的整数" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
-      </el-form-item>  
+      </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="submitForm()">保存</el-button>
+        <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button>
       </el-form-item>
     </el-form>
   </div>
@@ -34,12 +34,12 @@ export default {
   data() {
     return {
       ruleForm: {
-            price: '',
-           remark: '',
-         roomName: '',
-       roomStatus: '',
-             sort: '1',
-           roomNo: ''
+        price: '',
+        remark: '',
+        roomName: '',
+        roomStatus: '1',
+        sort: '1',
+        roomNo: ''
       },
       rules: {
         roomName: [
@@ -53,42 +53,49 @@ export default {
         ],
         roomStatus: [
           { required: true, message: '请选择状态', trigger: 'blur' }
-        ],         
+        ]
       }
     }
   },
   mounted() {
   },
   methods: {
-    submitForm(){
-      if(this.ruleForm.roomName ===''){
-        this.$message.error('请输入房型名称');
-        return
-      }
-      if(this.ruleForm.price ===''){
-        this.$message.error('请输入房型价格');
-        return
-      }
-      if(this.ruleForm.roomStatus === ''){
-        this.ruleForm.roomStatus = '1'
-      }
-    
-      this.$store.dispatch('HotelRoomAdd', this.ruleForm).then((res) => {
-        if(res.code === '1'){
-          this.$message.error(res.message);
-        }else{
-        this.$router.push({ name: 'grogshop-grogshopRoom' })
-         this.$message({
-          message: '新增房型成功',
-          type: 'success'
-         })
+    submitForm(ruleForm) {
+      this.$refs[ruleForm].validate((valid) => {
+        if (valid) {
+          if (this.ruleForm.roomName === '') {
+            this.$message.error('请输入房型名称')
+            return
+          }
+          if (this.ruleForm.price === '') {
+            this.$message.error('请输入房型价格')
+            return
+          }
+          if (this.ruleForm.roomStatus === '') {
+            this.ruleForm.roomStatus = '1'
+          }
+
+          this.$store.dispatch('HotelRoomAdd', this.ruleForm).then((res) => {
+            if (res.code === '1') {
+              this.$message.error(res.message)
+            } else {
+              this.$router.push({ name: 'grogshop-grogshopRoom' })
+              this.$message({
+                message: '新增房型成功',
+                type: 'success'
+              })
+            }
+          }).catch(() => {
+            console.log('error HotelRoom')
+          })
+        } else {
+          console.log('error submit!!')
+          return false
         }
-      }).catch(() => {
-        console.log('error HotelRoom')
       })
     }
-   }
   }
+}
 </script>
 
 <style scoped>

VUECODE/smart-property-manage/src/views/grogshop/grogshopRoomEdit.vue

@@ -7,23 +7,23 @@
       <!-- <el-form-item label="房型号" >
         <el-input v-model="ruleForm.roomNo" placeholder="房型号"/>
       </el-form-item> -->
-     <el-form-item class="filter-item" label="房型短描述" prop="remark" >
+      <el-form-item class="filter-item" label="房型短描述" prop="remark" >
         <el-input v-model.trim="ruleForm.remark" placeholder="房型推荐语等"/>
       </el-form-item>
       <el-form-item label="房型价格" prop="price">
         <el-input v-model="ruleForm.price" placeholder="单位元" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
       </el-form-item>
-      <el-form-item class="filter-item"  label="上架状态" prop="roomStatus">
+      <el-form-item class="filter-item" label="上架状态" prop="roomStatus">
         <el-select v-model="ruleForm.roomStatus" placeholder="上架">
-         <el-option label="上架" value="1"/>
-         <el-option label="下架" value="2"/>
+          <el-option label="上架" value="1"/>
+          <el-option label="下架" value="2"/>
         </el-select>
       </el-form-item>
       <el-form-item label="权重" prop="sort">
         <el-input v-model="ruleForm.sort" placeholder="不小于0的整数" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
-      </el-form-item>  
+      </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="submitForm()">保存</el-button>
+        <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button>
       </el-form-item>
     </el-form>
   </div>
@@ -34,13 +34,13 @@ export default {
   data() {
     return {
       ruleForm: {
-            id:'',
-            price: '',
-           remark: '',
-         roomName: '',
-       roomStatus: '',
-             sort: '',
-           roomNo: ''
+        id: '',
+        price: '',
+        remark: '',
+        roomName: '',
+        roomStatus: '1',
+        sort: '',
+        roomNo: ''
       },
       rules: {
         roomName: [
@@ -54,7 +54,7 @@ export default {
         ],
         roomStatus: [
           { required: true, message: '请选择状态', trigger: 'blur' }
-        ],         
+        ]
       }
     }
   },
@@ -62,51 +62,57 @@ export default {
     this.getRoom(this.$route.query.id)
   },
   methods: {
-    submitForm(){
-      // if(this.ruleForm.roomNo ===''){
-      //   this.$message.error('请输入房型号');
-      //   return
-      // }
-      // if(this.ruleForm.roomName ===''){
-      //   this.$message.error('请输入房型名称');
-      //   return
-      // }
-      // if(this.ruleForm.price ===''){
-      //   this.$message.error('房型价格');
-      //   return
-      // }
-    
-      this.$store.dispatch('HotelRoomEdit', this.ruleForm).then((res) => {
-        if(res.code === '1'){
-          this.$message.error(res.message);
-        }else{
-        this.$router.push({ name: 'grogshop-grogshopRoom' })
-         this.$message({
-          message: '修改房型成功',
-          type: 'success'
-         })
+    submitForm(ruleForm) {
+      this.$refs[ruleForm].validate((valid) => {
+        if (valid) {
+          this.$store.dispatch('HotelRoomEdit', this.ruleForm).then((res) => {
+            // if (this.ruleForm.roomNo === '') {
+            //   this.$message.error('请输入房型号')
+            //   return
+            // }
+            // if (this.ruleForm.roomName === '') {
+            //   this.$message.error('请输入房型名称')
+            //   return
+            // }
+            // if (this.ruleForm.price === '') {
+            //   this.$message.error('房型价格')
+            //   return
+            // }
+            if (res.code === '1') {
+              this.$message.error(res.message)
+            } else {
+              this.$router.push({ name: 'grogshop-grogshopRoom' })
+              this.$message({
+                message: '修改房型成功',
+                type: 'success'
+              })
+            }
+          }).catch(() => {
+            console.log('error HotelRoom')
+          })
+        } else {
+          console.log('error submit!!')
+          return false
         }
-      }).catch(() => {
-        console.log('error HotelRoom')
       })
     },
-    getRoom(id){
-      console.log('id',id)
+    getRoom(id) {
+      console.log('id', id)
       this.ruleForm.id = id
-      console.log('this.ruleForm.id',this.ruleForm.id)
+      console.log('this.ruleForm.id', this.ruleForm.id)
       this.$store.dispatch('GetRoomId', this.ruleForm).then((res) => {
-      this.ruleForm.roomName = res.data.roomName
-      this.ruleForm.roomNo = res.data.roomNo
-      this.ruleForm.roomStatus = res.data.roomStatus
-      this.ruleForm.sort = res.data.sort
-      this.ruleForm.remark = res.data.remark
-      this.ruleForm.price = res.data.price
+        this.ruleForm.roomName = res.data.roomName
+        this.ruleForm.roomNo = res.data.roomNo
+        this.ruleForm.roomStatus = res.data.roomStatus
+        this.ruleForm.sort = res.data.sort
+        this.ruleForm.remark = res.data.remark
+        this.ruleForm.price = res.data.price
       }).catch(() => {
         console.log('error GetRoomId')
       })
     }
-   }
   }
+}
 </script>
 
 <style scoped>

VUECODE/smart-property-manage/src/views/login/index.vue

@@ -6,7 +6,7 @@
         :model="loginForm"
         :rules="loginRules"
         class="login-form"
-        auto-complete="on"
+        auto-complete="off"
         label-position="left"
       >
         <div class="logo">
@@ -23,7 +23,7 @@
             v-model="loginForm.username"
             name="username"
             type="text"
-            auto-complete="on"
+            auto-complete="off"
             placeholder="请输入手机号"
           />
         </el-form-item>
@@ -295,9 +295,10 @@ $light_gray: #eee;
       color: $light_gray;
       height: 47px;
       &:-webkit-autofill {
-        -webkit-box-shadow: 0 0 0px 1000px $bg inset !important;
-        -webkit-text-fill-color: #fff !important;
-      }
+         // -webkit-box-shadow: 0 0 0px 1000px $bg inset !important;
+         -webkit-box-shadow: 0 0 0px 1000px #1C223A inset !important;
+         -webkit-text-fill-color: #fff !important;
+       }
     }
   }
   .el-form-item {

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

@@ -5,6 +5,7 @@
         <el-input v-model="ruleForm.activityTitle" placeholder="20字以内" style="width: 620px;"/>
       </el-form-item>
       <el-form-item label="活动轮播图" prop="activityCarouselImg">
+        <span style="color: darkgray;">轮播图为横幅位展示图片，不会显示在活动详情页</span>
         <div >
           <el-upload
             :show-file-list="false"
@@ -42,7 +43,7 @@
       </el-form-item> -->
       <el-form-item label="报名人数上限" prop="signUpMax">
         <div style="display: flex; width: 620px; justify-content: flex-end;">
-          <el-input v-model="ruleForm.signUpMax" style="width: 220px;" placeholder="填写0则不限制报名人数"/>
+          <el-input v-model="ruleForm.signUpMax" style="width: 220px;" placeholder="填写0则不限制报名人数" oninput="value=value.replace(/[^\d]/g,'')"/>
         </div>
       </el-form-item>
       <el-form-item label="报名截止时间" prop="registrationEndTime">
@@ -106,13 +107,13 @@ export default {
           { min: 1, max: 20, message: '长度在 20 个字符以内', trigger: 'blur' }
         ],
         activityContent: [
-          { required: true, message: '活动详细描述', trigger: 'blur' }
+          { required: true, message: '请输入活动详细描述', trigger: 'blur' }
         ],
         signUpMax: [
           { required: true, message: '请输入报名人数上限', trigger: 'blur' }
         ],
         registrationEndTime: [
-          { type: 'date', required: true, message: '报名截止时间', trigger: 'change' }
+          { type: 'date', required: true, message: '请选择报名截止时间', trigger: 'change' }
         ],
         sort: [
           { required: true, message: '请输入权重值', trigger: 'change' }

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

@@ -5,6 +5,7 @@
         <el-input v-model="ruleForm.activityTitle" placeholder="15字以内"/>
       </el-form-item>
       <el-form-item label="活动轮播图" prop="activityCarouselImg">
+        <span style="color: darkgray;">轮播图为横幅位展示图片，不会显示在活动详情页</span>
         <div >
           <div style="width: 500px;">
             <el-upload
@@ -45,7 +46,7 @@
       </el-form-item> -->
       <el-form-item label="报名人数上限" prop="signUpMax">
         <div style="display: flex; width: 620px; justify-content: flex-end;">
-          <el-input v-model="ruleForm.signUpMax" style="width: 220px;" placeholder="填写0则不限制报名人数"/>
+          <el-input v-model="ruleForm.signUpMax" style="width: 220px;" placeholder="填写0则不限制报名人数" oninput="value=value.replace(/[^\d]/g,'')"/>
         </div>
       </el-form-item>
       <el-form-item label="报名截止时间" prop="registrationEndTime">
@@ -111,13 +112,13 @@ export default {
           { min: 1, max: 15, message: '长度在 15 个字符以内', trigger: 'blur' }
         ],
         activityContent: [
-          { required: true, message: '活动详细描述', trigger: 'blur' }
+          { required: true, message: '请输入活动详细描述', trigger: 'blur' }
         ],
         signUpMax: [
           { required: true, message: '请输入报名人数上限', trigger: 'blur' }
         ],
         registrationEndTime: [
-          { type: 'date', required: true, message: '报名截止时间', trigger: 'change' }
+          { type: 'date', required: true, message: '请选择报名截止时间', trigger: 'change' }
         ],
         sort: [
           { required: true, message: '请输入权重值', trigger: 'change' }

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

@@ -1,14 +1,54 @@
 <template>
   <div id="root">
-    <div>活动标题&nbsp;&nbsp;<span style="padding-left:4%">{{ ruleForm.activityTitle }}</span></div>
-    <div >
-        <div class="activityTile" style="transform:translateY(250%);">活动轮播图</div>
-        <div  style="width: 500px;padding-left:14.3%;">
-    <img :src="ruleForm.activityCarouselImg" width="150" height="150">
-    </div>
-    </div>
-    <span style="transform:translateY(200%)">活动详情描述&nbsp;&nbsp;</span>
-    <div style="padding-left:14.3%" v-html="ruleForm.activityContent"></div>
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-position="left" label-width="180px" class="ruleForm">
+      <el-form-item label="活动标题">
+        <span>{{ ruleForm.activityTitle }}</span>
+      </el-form-item>
+      <el-form-item label="活动轮播图">
+        <span style="color: darkgray;">轮播图为横幅位展示图片，不会显示在活动详情页</span>
+        <div>
+          <div style="width: 500px;">
+            <img :src="ruleForm.activityCarouselImg" width="150" height="150">
+          </div>
+        </div>
+      </el-form-item>
+      <el-form-item label="活动详情描述">
+        <div v-html="ruleForm.activityContent"/>
+      </el-form-item>
+      <el-form-item label="是否需要报名人扫码签到">
+        <el-radio v-model="ruleForm.signInCode" disabled label="1" style="font-weight:bold;font-size:12px;">需要</el-radio>
+        <el-radio v-model="ruleForm.signInCode" disabled label="2" style="font-weight:bold;font-size:12px;">不需要</el-radio>
+        <span style="padding-left:20%"><el-button type="primary" @click="singn">查看签到名单</el-button></span>
+      </el-form-item>
+      <span>
+        <div style="width: 500px; margin-top: 20px;">
+          <span style="color: darkgray;">选择扫码签到，活动发布后点击活动详情可以下载二维码图片，打印图片放置到活动现场，参加活动的用户即可扫码签到，方便统计活动实际参与人数。</span>
+        </div>
+        <div v-if="ruleForm.activityCode !=null" style="padding-left:30%;">
+          <div><img :src="qrcode" width="200" height="200" ></div>
+          <a :href="qrcode" download="qrcode.jpg" style="color:#00BFFF;padding-left:15%">点击下载</a>
+        </div>
+      </span>
+      <el-form-item label="报名截止时间">
+        <span class="activityTile">{{ formatDate(ruleForm.registrationEndTime) }}</span>
+      </el-form-item>
+      <div class="progress">
+        <div class="text-progress">
+          <span class="people-number">已报名人数 {{ ruleForm.signUpCount }}</span>
+          <div class="outer-layer"/>
+          <div ref="innerDiv" :style="{ backgroundColor: 'aquamarine', height: '6px', width: innerW + 'px', position: 'relative', marginTop: '-4px' }"/> <!-- class="inner-layer" -->
+        </div>
+        <div class="circular"/>
+        <div class="people-limit">限制{{ ruleForm.signUpMax }}人</div>
+        <el-button type="primary" style="float: left;" @click="lockSignUp">查看报名名单</el-button>
+      </div>
+      <el-form-item label="权重值">
+        <span>{{ ruleForm.sort }}</span>
+      </el-form-item>
+      <div style="width: 500px;">
+        <span style="color: darkgray;">权重值越大，在活动列表中排序越靠前，权重相同时按发布时间排序</span>
+      </div>
+    </el-form>
     <!-- <div>
         <div>
         <div style="transform:translateY(20%);">活动配图</div>
@@ -17,30 +57,7 @@
         </div>
         </div>
     </div> -->
-    <span>
-    <div style="display: flex;">
-          <span class="activityTile" style="width: 200px;transform:translateY(70%);">是否需要报名人扫码签到</span>
-          <el-radio v-model="ruleForm.signInCode" disabled label="1" style="padding-left:4%;font-weight:bold;font-size:12px;transform:translateY(70%);">需要</el-radio>
-          <el-radio v-model="ruleForm.signInCode" disabled label="2" style="padding-left:8%;font-weight:bold;font-size:12px;transform:translateY(70%);">不需要</el-radio> 
-          <span style="padding-left:20%"><el-button type="primary" style="float:left;transform:translateY(30%)" @click="singn">查看签到名单</el-button></span> 
-    </div>
-    <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>
-    </span>
-    <div class="progress">
-      <div class="text-progress">
-        <span class="people-number">已报名人数 {{ ruleForm.signUpCount }}</span>
-        <div class="outer-layer"/>
-        <div ref="innerDiv" :style="{ backgroundColor: 'aquamarine', height: '6px', width: innerW + 'px', position: 'relative', marginTop: '-4px' }"/> <!-- class="inner-layer" -->
-      </div>
-      <div class="circular"/>
-      <div class="people-limit">限制{{ ruleForm.signUpMax }}人</div>
-      <el-button type="primary" style="float: left;" @click="lockSignUp">查看报名名单</el-button>
-    </div>
-    <span class="activityTile">报名截止时间：{{ formatDate(ruleForm.registrationEndTime) }}</span>
-    <span class="activityTile" style="transform:translateY(150%);">权重值&emsp;&emsp;&emsp;&emsp;{{ ruleForm.sort }}</span>
+
     <div class="bom-button">
       <el-button v-if="isEdi" type="primary" style="width: 100px;" @click="ediActivity">修改</el-button>
     </div>
@@ -48,9 +65,9 @@
 </template>
 
 <script>
-import html2canvas from 'html2canvas';
-import QRCode from 'qrcode';
-import Wangeditor from '@/components/Wangeditor';
+import html2canvas from 'html2canvas'
+import QRCode from 'qrcode'
+import Wangeditor from '@/components/Wangeditor'
 export default {
   name: 'Index',
   components: { Wangeditor },
@@ -75,7 +92,7 @@ export default {
       ownerDocument: '',
       isEdi: true, // 显示修改按钮
       innerW: 0, // 进度条
-      qrcode: '',
+      qrcode: ''
     }
   },
   mounted() {
@@ -87,10 +104,10 @@ export default {
       this.$store.dispatch('ActivityById', this.ruleForm.id).then((res) => {
         const resData = res.data
         this.ruleForm = resData.info
-        this.codeIMG =resData.info.activityCode
+        this.codeIMG = resData.info.activityCode
         this.ruleForm.contentImg = resData.contentImg
 
-        QRCode.toDataURL(this.codeIMG, (err, url)=> {
+        QRCode.toDataURL(this.codeIMG, (err, url) => {
           this.qrcode = url
         })
         if (this.ruleForm.status === '0') {
@@ -115,59 +132,58 @@ export default {
     lockSignUp() { // 查看活动报名
       this.$router.push({ name: 'signUp-info', query: { id: this.ruleForm.id }})
     },
-    //跳转签到页面
-    singn(){
+    // 跳转签到页面
+    singn() {
       this.$router.push({ name: 'activity-signIn-index', query: { id: this.ruleForm.id }})
     },
     // 下载图片
-//      downloadCodeImg(){
-//       var a = document.createElement('a')
-//       a.download = this.ruleForm.activityCode
-//        // 设置图片地址
-//       a.href = this.ruleForm.activityCode
-//       a.click();
-//     }
-   downloadCodeImg(){
-  var alink = document.createElement("a");
-  alink.href = this.ruleForm.activityCode;
-  alink.download = "pic"; //图片名
-  alink.click();
-  },
+    //      downloadCodeImg(){
+    //       var a = document.createElement('a')
+    //       a.download = this.ruleForm.activityCode
+    //        // 设置图片地址
+    //       a.href = this.ruleForm.activityCode
+    //       a.click();
+    //     }
+    downloadCodeImg() {
+      var alink = document.createElement('a')
+      alink.href = this.ruleForm.activityCode
+      alink.download = 'pic' // 图片名
+      alink.click()
+    },
 
-   dataURLToBlob(dataurl) {//ie 图片转格式
-          var arr = dataurl.split(','), mime = arr[0].match(/:(.*?);/)[1],
-            bstr = atob(arr[1]), n = bstr.length, u8arr = new Uint8Array(n);
+    dataURLToBlob(dataurl) { // ie 图片转格式
+      var arr = dataurl.split(','), mime = arr[0].match(/:(.*?);/)[1],
+        bstr = atob(arr[1]), n = bstr.length, u8arr = new Uint8Array(n)
+      while (n--) {
+        u8arr[n] = bstr.charCodeAt(n)
+      }
+      return new Blob([u8arr], { type: mime })
+    },
+
+    downloadResult() {
+      html2canvas(document.getElementById('mymap')).then(canvas => {
+        this.imgmap = canvas.toDataURL()
+        console.log(999, this.imgmap)
+        if (window.navigator.msSaveOrOpenBlob) {
+          var bstr = atob(this.imgmap.split(',')[1])
+          var n = bstr.length
+          var u8arr = new Uint8Array(n)
           while (n--) {
-            u8arr[n] = bstr.charCodeAt(n);
+            u8arr[n] = bstr.charCodeAt(n)
           }
-          return new Blob([u8arr], {type: mime})
-        },
-        
-        downloadResult() {
-          html2canvas(document.getElementById('mymap')).then(canvas => {
-				this.imgmap = canvas.toDataURL()
-				console.log(999, this.imgmap)
-				if (window.navigator.msSaveOrOpenBlob) {
-					var bstr = atob(this.imgmap.split(',')[1])
-					var n = bstr.length
-					var u8arr = new Uint8Array(n)
-					while (n--) {
-						u8arr[n] = bstr.charCodeAt(n)
-					}
-					var blob = new Blob([u8arr])
-					window.navigator.msSaveOrOpenBlob(blob, 'chart-download' + '.' + 'png')
-				} else {
-					// 这里就按照chrome等新版浏览器来处理
-					const a = document.createElement('a')
-					a.href = this.imgmap
-					a.setAttribute('download', 'chart-download')
-					a.click()
-				}
- 
-			});
+          var blob = new Blob([u8arr])
+          window.navigator.msSaveOrOpenBlob(blob, 'chart-download' + '.' + 'png')
+        } else {
+          // 这里就按照chrome等新版浏览器来处理
+          const a = document.createElement('a')
+          a.href = this.imgmap
+          a.setAttribute('download', 'chart-download')
+          a.click()
         }
-}
+      })
+    }
   }
+}
 </script>
 
 <style scoped>

VUECODE/smart-property-manage/src/views/social/announcement/add.vue

@@ -83,7 +83,7 @@ export default {
           { min: 1, max: 20, message: '长度在 20 个字符以内', trigger: 'blur' }
         ],
         announcementContent: [
-          { required: true, message: '公告内容描述', trigger: 'blur' }
+          { required: true, message: '请输入公告内容描述', trigger: 'blur' }
         ],
         sort: [
           { required: true, message: '请输入权重值', trigger: 'change' }

VUECODE/smart-property-manage/src/views/social/announcement/details.vue

@@ -1,24 +1,21 @@
 <template>
   <div id="root">
     <el-form ref="form" label-width="100px" label-position="left">
-      <el-form-item>
-        <div>公告标题&nbsp;&nbsp;<span style="width: 80%;padding-left:3.5%;">{{ ruleForm.announcementTitle }} </span></div>
+      <el-form-item label="公告标题">
+        <span style="width: 80%;">{{ ruleForm.announcementTitle }} </span>
         <!-- <span class="activityTile">{{ ruleForm.announcementTitle }}</span> -->
       </el-form-item>
-      <el-form-item>
-        <div style="transform:translateY(90%);">公告轮播图&nbsp;&nbsp;&nbsp;&nbsp;<span style="color: #99a9bf;">轮播图为横幅位展示图片，不会显示在公告详情页</span></div>
-        
+      <el-form-item label="公告轮播图">
+        <span style="color: #99a9bf;">轮播图为横幅位展示图片，不会显示在公告详情页</span>
         <br>
-        <img :src="ruleForm.announcementCarouselImg"  width="320" height="150" style="padding-left:18%;transform:translateY(20%)">
+        <img :src="ruleForm.announcementCarouselImg" width="320" height="150">
       </el-form-item>
-      <el-form-item>
-         <div>
-        <div style="transform:translateY(135%)">公告内容&nbsp;&nbsp;</div>
-        <div style="padding-left:18.3%" v-html=" ruleForm.announcementContent"></div>
-         </div>
-       
+      <el-form-item label="公告内容">
+        <div v-html=" ruleForm.announcementContent"/>
+      </el-form-item>
+      <el-form-item label="权重值">
+        <span>{{ ruleForm.sort }}</span>
       </el-form-item>
-        <div style="padding-left:17%;transform:translateY(-20%)">权重值&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<el-input-number v-model="ruleForm.sort"/></div>
     </el-form>
     <div class="bom-button">
       <el-button v-if="isEdi" type="primary" style="width: 150px;" @click="edi">修改</el-button>

VUECODE/smart-property-manage/src/views/social/announcement/edit.vue

@@ -81,7 +81,7 @@ export default {
           { min: 1, max: 20, message: '长度在 20 个字符以内', trigger: 'blur' }
         ],
         announcementContent: [
-          { required: true, message: '公告内容描述', trigger: 'blur' }
+          { required: true, message: '请输入公告内容描述', trigger: 'blur' }
         ],
         sort: [
           { required: true, message: '请输入权重值', trigger: 'change' }

VUECODE/smart-property-manage/src/views/ticket/details.vue

@@ -73,7 +73,7 @@
       </table>  -->
       </div>
 
-      <div style="padding-left:200px;">
+      <div style="padding-left:82px;">
         <template >
           <img v-for="sr in listQuery.contentImageUrl" :src="sr" preview width="200" height="200" style="margin:5px;">
           <!-- <img v-for="sr in listQuery.contentImageUrl" :src="sr" preview="ss" preview-text="ss" width="200" height="200"> -->
@@ -154,15 +154,15 @@
             <el-button type="primary" style="margin-left: 90%;transform:translateY(-340%);" @click="submitContent">提交</el-button>
           </div>
         </div>
-        <div v-if="listQuery.status==='3'" style="margin-left: -5px;">
+        <div v-if="listQuery.status==='3' || listQuery.status==='0'" style="margin-left: -5px;">
           <div>
             <span style="font-size: 16px;color: rgb(96, 98, 102);font-weight: bold;">流程操作</span>
           </div>
           <br>
-          <div>
+          <div v-if="listQuery.status==='3'">
             <textarea id="message_textarea" v-model="listQuery.relationContent" placeholder="处理完了?在此填写处理结果，发送给户主让TA给好评~" class="textarea-inherit" rows="4"/>
           </div>
-          <div style="margin-top: 10px;">
+          <div  v-if="listQuery.status==='3'" style="margin-top: 10px;">
             <el-form-item label="图片附件">
               <el-upload
                 :limit="8"

VUECODE/smart-property-manage/src/views/ticket/index.vue

@@ -43,7 +43,7 @@
       :data="listData"
       border
       tooltip-effect="dark"
-      style="width: 100%; margin-top: 20px;"
+      style="width: 100%; margin-top: 30px;"
       @selection-change="handleSelectionChange">
       <el-table-column prop="id" label="编号" align="center"/>
       <el-table-column prop="type" label="类型" align="center">