wangxiaogang 3 gadi atpakaļ
vecāks
revīzija
8df77a3459

+ 2 - 0
README.md

@@ -12,6 +12,8 @@ vuex
 安装
 =======
 
+=======
+>>>>>>> master
 剑鱼后台管理 vue+iview
 
 ### 依赖

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
qmx_page/css/app.adcbb760.css


+ 1 - 1
qmx_page/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>管理后台</title><link href=/css/app.d0a7be33.css rel=preload as=style><link href=/css/chunk-vendors.146ef057.css rel=preload as=style><link href=/js/app.20f49c42.js rel=preload as=script><link href=/js/chunk-vendors.dbdfae2e.js rel=preload as=script><link href=/css/chunk-vendors.146ef057.css rel=stylesheet><link href=/css/app.d0a7be33.css rel=stylesheet></head><body><noscript><strong>We're sorry but doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=loading><div class=spinner><div class=rect1></div><div class=rect2></div><div class=rect3></div><div class=rect4></div><div class=rect5></div></div></div><div id=app></div><script src=/js/chunk-vendors.dbdfae2e.js></script><script src=/js/app.20f49c42.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>管理后台</title><link href=/css/app.adcbb760.css rel=preload as=style><link href=/css/chunk-vendors.146ef057.css rel=preload as=style><link href=/js/app.a3710b3c.js rel=preload as=script><link href=/js/chunk-vendors.dbdfae2e.js rel=preload as=script><link href=/css/chunk-vendors.146ef057.css rel=stylesheet><link href=/css/app.adcbb760.css rel=stylesheet></head><body><noscript><strong>We're sorry but doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=loading><div class=spinner><div class=rect1></div><div class=rect2></div><div class=rect3></div><div class=rect4></div><div class=rect5></div></div></div><div id=app></div><script src=/js/chunk-vendors.dbdfae2e.js></script><script src=/js/app.a3710b3c.js></script></body></html>

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
qmx_page/js/app.20f49c42.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
qmx_page/js/app.a3710b3c.js


+ 16 - 16
src/views/dataManage/msgManage/sendingMsg.vue

@@ -6,10 +6,10 @@
         convertlab用户分组同步
         <Button type="primary" size="small" @click="refreshed" style="margin-left: 40px">刷新分组</Button>
         <div v-show="groupData.length" style="border-bottom: 1px solid #e9e9e9;padding-bottom:6px;margin-bottom:6px;">
-            <Checkbox
+            <!-- <Checkbox
                 :indeterminate="indeterminate"
                 :value="checkAll"
-                @click.prevent.native="handleCheckAll">全选</Checkbox>
+                @click.prevent.native="handleCheckAll">全选</Checkbox> -->
         </div>
         <CheckboxGroup v-model="send.userGroupName" @on-change="checkGroup" v-show="groupData.length">
           <Checkbox v-for="item in groupData" :key="item.id" :label="item.name">
@@ -206,22 +206,22 @@ export default {
       this.$refs[name].validate((valid) => {
         if (valid) {
           this.isDis = true
-          this.$request('/message/messageSave').data(obj).success((res) => {
-            if (res.status == 'success') {
-              setTimeout(() => {
-                this.isDis = false
-              }, 1000)
-              this.inited()
-              this.$refs[name].resetFields()
-              if (rout) {
-                this.$Message.success('修改成功!')
-                this.$router.push('/dataManage/msgManage/sentList')
-              } else {
-                this.$Message.success('发送成功!')
-              }
+          setTimeout(() => {
+            this.inited()
+            this.$refs[name].resetFields()
+            if (rout) {
+              this.$Message.success('修改成功!')
+              this.$router.push('/dataManage/msgManage/sentList')
             } else {
-              this.$Message.warning('发送失败!')
+              this.$Message.success('发送成功!')
             }
+          }, 600)
+          setTimeout(() => {
+            this.isDis = false
+          }, 1000)
+          
+          this.$request('/message/messageSave').data(obj).success((res) => {
+            if (res.status == 'success') {}
           }).error(() => {
               this.isDis = false
           }).post()

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels