Merge branch 'feature/20230904_1454_invite' of...

Merge branch 'feature/20230904_1454_invite' of http://gitlab.wanwudezhi.work/quanku/qk_admin into feature/20230904_1454_invite

src/views/user/addInvite.vue

@@ -19,11 +19,11 @@
             @change="handleDateChange" />
         </el-form-item>
 
-        <el-form-item label="使用人数" prop="enabledNum">
+        <el-form-item label="可邀请人数" prop="enabledNum">
           <el-input v-model="inviteInfo.enabledNum" style="width: 400px" placeholder="请输入使用人数" type="number"/>
         </el-form-item>
 
-        <el-form-item label="可邀请人数" prop="applicant">
+        <el-form-item label="邀请人" prop="applicant">
           <el-cascader
             :options="userList"
             :clearable="true"
@@ -39,6 +39,7 @@
             v-model="inviteInfo.remark"
             :rows="6"
             type="textarea"
+            maxlength="50"
             placeholder="请输入备注"/>
         </el-form-item>
       </el-form>
@@ -69,7 +70,7 @@ export default {
           onClick(picker) {
             const end = new Date()
             const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            end.setTime(end.getTime() + 3600 * 1000 * 24 * 7)
             picker.$emit('pick', [start, end])
           }
         }, {
@@ -77,7 +78,7 @@ export default {
           onClick(picker) {
             const end = new Date()
             const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            end.setTime(end.getTime() + 3600 * 1000 * 24 * 30)
             picker.$emit('pick', [start, end])
           }
         }, {
@@ -85,7 +86,7 @@ export default {
           onClick(picker) {
             const end = new Date()
             const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            end.setTime(end.getTime() + 3600 * 1000 * 24 * 90)
             picker.$emit('pick', [start, end])
           }
         }]

src/views/user/inviteList.vue

@@ -97,22 +97,28 @@ export default {
       this.$router.push({ path: '/user/inviteInfo', query: { id: row.code }})
     },
     handleSetEnable(row) {
-      const params = {
-        code: row.code
-      }
-      setInvalid(params).then(response => {
-        this.list = this.list.filter((item) => {
-          if (item.code === row.code) {
-            item.state = 6
-            item.stateName = '已失效'
+      this.$confirm('你确定要把邀请码设置失效吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const params = {
+          code: row.code
+        }
+        setInvalid(params).then(response => {
+          this.list = this.list.filter((item) => {
+            if (item.code === row.code) {
+              item.state = 6
+              item.stateName = '已失效'
+              return item
+            }
             return item
-          }
-          return item
+          })
+          this.$notify.success({
+            message: '设置失效成功'
+          })
+        }).catch((e) => {
         })
-        this.$notify.success({
-          message: '设置失效成功'
-        })
-      }).catch((e) => {
       })
     },
     /**