暂存

VUECODE/smart-property-manage/src/store/modules/community.js

@@ -175,9 +175,9 @@ const community = {
     UserCommunity({ commit }, data) {
       return new Promise((resolve, reject) => {
         userCommunity(data).then(response => {
-          const data = response.data
-          commit('SET_LIST', data)
-          resolve()
+          // const data = response.data
+          // commit('SET_LIST', data)
+          resolve(response)
         }).catch(error => {
           reject(error)
         })

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

@@ -50,7 +50,7 @@
             <div v-else class="select-community" >
               <el-select v-model="loginForm.communityId" placeholder="请选择小区">
                 <el-option
-                  v-for="item in communityList"
+                  v-for="item in communityArr"
                   :key="item.id"
                   :label="item.communityName"
                   :value="item.id"/>
@@ -99,6 +99,7 @@ export default {
       isSelectDiv: false,
       isSelectCommunity: false, // 是否显示 社区选项
       isLoginButton: false, // 默认按钮为不可点击
+      communityArr: [], // 小区集合
       loginForm: {
         username: '',
         password: '',
@@ -142,6 +143,7 @@ export default {
               // this.$router.push({ path: this.redirect || '/index' })
               this.$router.push({ name: 'index' })
             } else {
+              this.$message.error(res.message)
               this.loading = false
             }
           }).catch(() => {
@@ -171,6 +173,8 @@ export default {
             }
             this.codeNum--
           }, 1000)
+        } else {
+          this.$message.error(res.message)
         }
       }).catch(() => {
         console.log('error sendcode')
@@ -183,8 +187,16 @@ export default {
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      this.UserCommunity(this.loginForm).then(() => {
-        loading.close()
+      this.UserCommunity(this.loginForm).then((res) => {
+        if (res.code === '0') {
+          this.communityArr = res.data
+          this.loading = false
+          loading.close()
+        } else {
+          loading.close()
+          this.$message.error(res.message)
+          this.loading = false
+        }
         this.checkPhoneAndCode()
       }).catch(() => {
         // 提示 当前手机号未绑定任何社区
@@ -200,7 +212,7 @@ export default {
     },
     checkPhoneAndCode() { // 失去焦点的时候获取 获取用户的管理的小区
       console.log('失去焦点')
-      const communitys = this.communityList
+      const communitys = this.communityArr
       console.log('接收到的数据:', communitys)
       console.log('大小:', communitys.length)
       if (communitys.length === 0) {

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

@@ -103,15 +103,9 @@ export default {
   },
   methods: {
     submitForm(formName) {
-      // 加载框
-      const loading = this.$loading({
-        lock: true,
-        text: 'Loading',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      })
       this.$refs[formName].validate((valid) => {
         if (valid) {
+<<<<<<< HEAD
           if (this.ruleForm.activityContent.length <= 0 && this.ruleForm.contentImg.length <= 0) {
             this.$message.error('活动内容描述 和 活动配图至少要存在一个!')
             return false
@@ -131,16 +125,25 @@ export default {
           }).catch(() => {
             console.log('error AddActivity')
           })
+=======
+          this.addActivity(1)
+>>>>>>> 811d58fffdd904260ce7cd3cb075fe3a2e992007
         } else {
           console.log('error submit!!')
           return false
         }
       })
-      // 关闭加载框
-      loading.close()
     },
     resetForm(formName) {
-      this.$refs[formName].resetFields()
+      // this.$refs[formName].resetFields()
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.addActivity(2)
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
     },
     handleAvatarSuccess(res, file) { // 轮播图上传回调
       this.ruleForm.activityCarouselImg = res.data[0]
@@ -177,6 +180,34 @@ export default {
     sortHandleChange(value) { // 权重值
       this.ruleForm.sort = value
       console.log(value)
+    },
+    addActivity(status) { // 添加活动
+      // 加载框
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      if (this.ruleForm.activityContent.length <= 0 && this.ruleForm.contentImg.length <= 0) {
+        this.$message.error('活动内容描述 和 活动配图至少要存在一个!')
+        return false
+      }
+      this.ruleForm.status = status // 发布状态  1 是已发布   2 是草稿
+      this.$store.dispatch('AddActivity', this.ruleForm).then((res) => {
+        if (res.code === '0') {
+          this.$message({
+            message: res.message,
+            type: 'success'
+          })
+          this.$router.push({ name: 'activity-index' })
+          loading.close()
+          return
+        }
+        this.$message.error(res.message)
+      }).catch(() => {
+        console.log('error AddActivity')
+      })
     }
   }
 }

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

@@ -33,20 +33,29 @@
           <img :src="dialogImageUrl" width="100%" alt="">
         </el-dialog>
       </el-form-item>
-      <el-form-item label="报名人数上限" prop="signUpMax">
-        <el-input v-model="ruleForm.signUpMax" placeholder="填写0则不限制报名人数"/>
+      <el-form-item prop="signUpMax">
+        <div style="display: flex;">
+          <span style="width: 140px;">报名人数上限</span>
+          <el-input v-model="ruleForm.signUpMax" placeholder="填写0则不限制报名人数"/>
+        </div>
       </el-form-item>
-      <el-form-item label="报名截止时间" prop="registrationEndTime">
-        <el-date-picker
-          v-model="ruleForm.registrationEndTime"
-          value-format="yyyy-MM-dd"
-          type="date"
-          placeholder="选择日期"/>
+      <el-form-item prop="registrationEndTime">
+        <div style="display: flex;">
+          <span style="width: 120px;">报名截止时间</span>
+          <el-date-picker
+            v-model="ruleForm.registrationEndTime"
+            value-format="timestamp"
+            type="date"
+            placeholder="选择日期"/>
+        </div>
       </el-form-item>
-      <el-form-item label="权重值" prop="sort">
-        <el-input-number v-model="ruleForm.sort" :min="1" :max="10" label="权重值" @change="sortHandleChange"/>
+      <el-form-item prop="sort">
+        <div style="display: flex; justify-content: flex-start;">
+          <span style="width: 120px;">权重值</span>
+          <el-input-number v-model="ruleForm.sort" :min="1" :max="10" label="权重值" @change="sortHandleChange"/>
+        </div>
       </el-form-item>
-      <el-form-item>
+      <el-form-item style="display: flex; justify-content: center;">
         <el-button @click="resetForm('ruleForm')">存为草稿</el-button>
         <el-button type="primary" @click="submitForm('ruleForm')">发布</el-button>
       </el-form-item>
@@ -60,7 +69,6 @@ export default {
   data() {
     return {
       ruleForm: {
-        id: '',
         activityTitle: '',
         activityCarouselImg: '', // 轮播图
         activityContent: '', // 活动内容详细
@@ -71,6 +79,8 @@ export default {
         status: '' // 状态 0 是已作废 1 是已发布   2 是草稿 3 是已修改
       },
       imageUrl: '', // 轮播图预览
+      dialogVisible: false, // 活动配图, 默认不显示 (以单张为单位)
+      dialogImageUrl: '', // 活动配图, 图片链接 (以单张为单位)
       rules: {
         activityTitle: [
           { required: true, message: '请输入活动名称', trigger: 'blur' },
@@ -107,7 +117,7 @@ export default {
             return false
           }
           this.ruleForm.status = 1 // 发布状态
-          this.$store.dispatch('UpdateActivity', this.ruleForm).then((res) => {
+          this.$store.dispatch('AddActivity', this.ruleForm).then((res) => {
             if (res.code === '0') {
               this.$message({
                 message: res.message,
@@ -118,16 +128,16 @@ export default {
               return
             }
             this.$message.error(res.message)
-            loading.close()
           }).catch(() => {
-            console.log('error UpdateActivity')
+            console.log('error AddActivity')
           })
         } else {
           console.log('error submit!!')
-          loading.close()
           return false
         }
       })
+      // 关闭加载框
+      loading.close()
     },
     resetForm(formName) {
       this.$refs[formName].resetFields()
@@ -167,9 +177,6 @@ export default {
     sortHandleChange(value) { // 权重值
       this.ruleForm.sort = value
       console.log(value)
-    },
-    getById() { // 根据 id 查询活动详情
-
     }
   }
 }