See999 преди 5 години
родител
ревизия
eb6786ebbe

+ 421 - 386
src/scrm_pages/article/articleList.vue Целия файл

@@ -1,53 +1,70 @@
1 1
 <template>
2 2
   <div class="main-contain">
3 3
     <div class="position">
4
-      <bread-crumb :crumbs='crumbs'></bread-crumb>
5
-      <el-button  style="float:right;" type="primary" size="small" icon="el-icon-circle-plus-outline" @click="AddArticle()">添加文章</el-button>
4
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
5
+      <el-button
6
+        style="float:right;"
7
+        type="primary"
8
+        size="small"
9
+        icon="el-icon-circle-plus-outline"
10
+        @click="AddArticle()"
11
+      >添加文章</el-button>
6 12
     </div>
7 13
     <div class="app-container">
8
-          <div style="margin-bottom: 10px">
9
-            <el-row :gutter="24">
10
-              <el-col :span="8">
11
-                  <el-input style="width: 300px" v-model="listQuery.keyword"  placeholder="请输入您需要搜索的内容"></el-input>
12
-                  <el-button type="primary"  icon="el-icon-search" @click="changeKey()">搜索</el-button>
13
-              </el-col>
14
-            </el-row>
15
-          </div>
16
-          <div class="cell clearfix">
17
-            <label class="title"><span class="name">标签</span>:</label>
18
-             <div class="time">
19
-                <ul class="">
20
-                  <li :class="0==tagType?'active':''" @click="selectsign(0)">全部</li>
21
-                  <li :class="item.id==tagType?'active':''"  v-for="item in tagOptions" :key="item.id" @click="selectsign(item.id)">{{item.name}}</li>
22
-                </ul>
23
-             </div>
24
-          </div>
25
-          <div class="cell clearfix">
26
-            <label class="title"><span class="name">状态:</span></label>
27
-            <div class="time">
28
-              <ul class="">
29
-                 <li :class="{ active: selecting_status == 0 }" @click="changeSelectingStatus(0)">全部</li>
30
-                 <li :class="{ active: selecting_status == 1 }" @click="changeSelectingStatus(1)">已发布</li>
31
-                 <li :class="{ active: selecting_status == 2 }" @click="changeSelectingStatus(2)">草稿箱</li>
32
-                 <li :class="{ active: selecting_status == 3 }" @click="changeSelectingStatus(3)">未通过</li>
33
-              </ul>
34
-            </div>
35
-          </div>
14
+      <div style="margin-bottom: 10px">
15
+        <el-row :gutter="24">
16
+          <el-col :span="24">
17
+            <el-input style="width: 300px" v-model="listQuery.keyword" placeholder="请输入您需要搜索的内容"></el-input>
18
+            <el-button type="primary" icon="el-icon-search" @click="changeKey()">搜索</el-button>
19
+          </el-col>
20
+        </el-row>
21
+      </div>
22
+      <div class="cell clearfix">
23
+        <label class="title">
24
+          <span class="name">标签</span>:
25
+        </label>
26
+        <div class="time">
27
+          <ul class>
28
+            <li :class="0==tagType?'active':''" @click="selectsign(0)">全部</li>
29
+            <li
30
+              :class="item.id==tagType?'active':''"
31
+              v-for="item in tagOptions"
32
+              :key="item.id"
33
+              @click="selectsign(item.id)"
34
+            >{{item.name}}</li>
35
+          </ul>
36
+        </div>
37
+      </div>
38
+      <div class="cell clearfix">
39
+        <label class="title">
40
+          <span class="name">状态:</span>
41
+        </label>
42
+        <div class="time">
43
+          <ul class>
44
+            <li :class="{ active: selecting_status == 0 }" @click="changeSelectingStatus(0)">全部</li>
45
+            <li :class="{ active: selecting_status == 1 }" @click="changeSelectingStatus(1)">已发布</li>
46
+            <li :class="{ active: selecting_status == 2 }" @click="changeSelectingStatus(2)">草稿箱</li>
47
+            <li :class="{ active: selecting_status == 3 }" @click="changeSelectingStatus(3)">未通过</li>
48
+          </ul>
49
+        </div>
50
+      </div>
36 51
 
37
-            <div class="filter-container" style="margin-top: 10px;margin-left: 5px">
38
-              <el-checkbox style="width: 30px" @change="selectAllFunc" v-model="selectAll">全选</el-checkbox>
39
-              <el-button size="small" icon="el-icon-delete" @click="deleteAllArticles()">批量删除</el-button>
40
-            </div>
52
+      <div class="filter-container" style="margin-top: 10px;margin-left: 5px">
53
+        <el-checkbox style="width: 30px" @change="selectAllFunc" v-model="selectAll">全选</el-checkbox>
54
+        <el-button size="small" icon="el-icon-delete" @click="deleteAllArticles()">批量删除</el-button>
55
+      </div>
41 56
 
42 57
       <div class="clearfix">
43 58
         <div class="published-cell" v-for="(article,index) in articsData" :key="article.id">
44
-          <div class="checkbox" >
45
-             <el-checkbox v-model='article.checked' @change="selectProduct"></el-checkbox>
59
+          <div class="checkbox">
60
+            <el-checkbox v-model="article.checked" @change="selectProduct"></el-checkbox>
46 61
           </div>
47 62
 
48 63
           <div class="activity-image-panel">
49
-            <span class="status-text">{{article.article_status ==1 ? '已发布':'' || article.article_status ==2 ? '草稿':'' || article.article_status ==3 ? '未通过':''}}</span>
50
-            <img :src="article.imgs"/>
64
+            <span
65
+              class="status-text"
66
+            >{{article.article_status ==1 ? '已发布':'' || article.article_status ==2 ? '草稿':'' || article.article_status ==3 ? '未通过':''}}</span>
67
+            <img :src="article.imgs" />
51 68
           </div>
52 69
           <div class="activity-info-panel">
53 70
             <h3 class="title">
@@ -55,23 +72,23 @@
55 72
             </h3>
56 73
             <!-- <div class="statistics">
57 74
               阅读:{{article.real_read_num}} 丨 评论:{{article.comment_num}} 丨 点赞:{{article.star_num}}
58
-            </div> -->
75
+            </div>-->
59 76
             <div>
60 77
               <el-tooltip class="item" effect="dark" content="编辑" placement="top">
61 78
                 <el-button
62 79
                   size="mini"
63 80
                   type="primary"
64 81
                   icon="el-icon-edit-outline"
65
-                 @click="editArticles(article.id,article.type)">
66
-                </el-button>
82
+                  @click="editArticles(article.id,article.type)"
83
+                ></el-button>
67 84
               </el-tooltip>
68 85
               <el-tooltip class="item" effect="dark" content="删除" placement="top">
69 86
                 <el-button
70 87
                   size="mini"
71 88
                   type="danger"
72 89
                   icon="el-icon-delete"
73
-                  @click="deleteArticle(article.id,index)">
74
-                </el-button>
90
+                  @click="deleteArticle(article.id,index)"
91
+                ></el-button>
75 92
               </el-tooltip>
76 93
             </div>
77 94
           </div>
@@ -82,380 +99,398 @@
82 99
         </div>
83 100
       </div>
84 101
 
85
-          <el-pagination
86
-            @size-change="handleSizeChange"
87
-            @current-change="handleCurrentChange"
88
-            :page-sizes="[10,20,50,100]"
89
-            :page-size="10"
90
-            background
91
-            style="margin-top:20px;float: right"
92
-            layout="total, sizes, prev, pager, next, jumper"
93
-            :total="total">
94
-          </el-pagination>
102
+      <el-pagination
103
+        @size-change="handleSizeChange"
104
+        @current-change="handleCurrentChange"
105
+        :page-sizes="[10,20,50,100]"
106
+        :page-size="10"
107
+        background
108
+        style="margin-top:20px;float: right"
109
+        layout="total, sizes, prev, pager, next, jumper"
110
+        :total="total"
111
+      ></el-pagination>
95 112
     </div>
96 113
   </div>
97 114
 </template>
98 115
 
99 116
 <script>
100
-  import BreadCrumb from '../components/bread-crumb'
101
-  import { GetAllArticles,deleteArticle,deleteAllArticles,GetAllCategory} from '@/api/act/submitinfo'
102
-  import PublishedCell from "@/scrm_pages/article/components/published_cell"
103
-  import {uParseTime} from "@/utils/tools";
104
-  export default {
105
-    name: 'commentList',
106
-    components:{
107
-      BreadCrumb,
108
-      PublishedCell,
117
+import BreadCrumb from "../components/bread-crumb";
118
+import {
119
+  GetAllArticles,
120
+  deleteArticle,
121
+  deleteAllArticles,
122
+  GetAllCategory
123
+} from "@/api/act/submitinfo";
124
+import PublishedCell from "@/scrm_pages/article/components/published_cell";
125
+import { uParseTime } from "@/utils/tools";
126
+export default {
127
+  name: "commentList",
128
+  components: {
129
+    BreadCrumb,
130
+    PublishedCell
131
+  },
132
+  inject: ["reload"],
133
+  data() {
134
+    return {
135
+      crumbs: [
136
+        { path: false, name: "文章管理" },
137
+        { path: "/articles/articleList", name: "文章列表" }
138
+      ],
139
+      time: "",
140
+      active: true,
141
+      tagType: 0,
142
+      tagOptions: [],
143
+      listQuery: {
144
+        page: 1,
145
+        limit: 10,
146
+        classid: "",
147
+        name: "",
148
+        keyword: ""
149
+      },
150
+      articsData: [],
151
+      total: 0,
152
+      dialogVisible: false,
153
+      checkAllStatus: false,
154
+      selecting_status: "",
155
+      orgName: "",
156
+      statustext: "",
157
+      checked: false,
158
+      selectAll: false,
159
+      selectReply: [],
160
+      startPointX: 0,
161
+      changePointX: 0,
162
+      showIndex: 0
163
+    };
164
+  },
165
+  methods: {
166
+    GetAllArticles() {
167
+      GetAllArticles(
168
+        this.selecting_status,
169
+        this.listQuery.classid,
170
+        this.listQuery.keyword,
171
+        this.listQuery.limit,
172
+        this.listQuery.page
173
+      ).then(response => {
174
+        if (response.data.state === 1) {
175
+          this.articsData = response.data.data.articles;
176
+          this.total = response.data.data.total;
177
+          console.log("文章列表", this.articsData);
178
+          console.log("total", this.total);
179
+          // this.orgName =  response.data.data.OrgName;
180
+          // console.log("机构姓名",this.orgName)
181
+        }
182
+        //  if(typeof(response.data.data.category != 'undefined')){
183
+        //    this.tagOptions = response.data.data.category
184
+        //     console.log("分类列表",this.tagOptions)
185
+        //  }
186
+      });
109 187
     },
110
-    inject:['reload'],
111
-    data(){
112
-      return{
113
-        crumbs: [
114
-          { path: false, name: '文章管理' },
115
-          { path: '/articles/articleList', name: '文章列表' }
116
-        ],
117
-        time: '',
118
-        active: true,
119
-        tagType: 0,
120
-        tagOptions:[],
121
-        listQuery:{
122
-            page:1,
123
-            limit:10,
124
-            classid:'',
125
-            name:'',
126
-            keyword:'',
127
-        },
128
-        articsData:[],
129
-        total:0,
130
-        dialogVisible: false,
131
-        checkAllStatus:false,
132
-        selecting_status:'',
133
-        orgName:'',
134
-        statustext:'',
135
-        checked: false,
136
-        selectAll:false,
137
-        selectReply:[],
138
-       startPointX: 0,
139
-       changePointX: 0,
140
-       showIndex: 0,
141
-      }
188
+    articlecreatetime(time) {
189
+      return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
190
+    },
191
+    selectsign(id) {
192
+      console.log("id", id);
193
+      this.listQuery.classid = id;
194
+      this.listQuery.name = name;
195
+      this.tagType = id;
196
+      this.GetAllArticles();
197
+    },
198
+    handleSizeChange(limit) {
199
+      this.listQuery.limit = limit;
200
+      this.GetAllArticles();
201
+    },
202
+    handleCurrentChange(page) {
203
+      this.listQuery.page = page;
204
+      this.GetAllArticles();
205
+    },
206
+    changeKey() {
207
+      this.GetAllArticles();
208
+    },
209
+    memberAvatar(row) {
210
+      return row.imgs;
211
+    },
212
+    AddArticle() {
213
+      this.$router.push({ path: "/articles/createArticle/:id" });
214
+    },
215
+    changeSelectingStatus(status) {
216
+      console.log("status是多少?", status);
217
+      this.selecting_status = status;
218
+      this.GetAllArticles();
219
+    },
220
+    openDelete(row, index) {
221
+      var id = row.id;
222
+      this.$confirm("确认要删除该信息吗?删除后将无法恢复!", {
223
+        dangerouslyUseHTMLString: true,
224
+        confirmButtonText: "确定",
225
+        cancelButtonText: "取消",
226
+        type: "warning"
227
+      })
228
+        .then(() => {
229
+          var ids = [];
230
+          ids.push(row.id);
231
+          openDelete({ ids: ids })
232
+            .then(response => {
233
+              this.articsData.splice(index, 1);
234
+              this.$message.success("删除成功");
235
+            })
236
+            .catch(e => {});
237
+        })
238
+        .catch(e => {});
142 239
     },
143
-    methods:{
144
-           GetAllArticles(){
145
-              GetAllArticles(this.selecting_status,this.listQuery.classid,this.listQuery.keyword,this.listQuery.limit,this.listQuery.page).then(response=>{
146
-                     if(response.data.state === 1){
147
-                        this.articsData = response.data.data.articles;
148
-                        this.total = response.data.data.total;
149
-                        console.log("文章列表",this.articsData)
150
-                        console.log("total",this.total)
151
-                        // this.orgName =  response.data.data.OrgName;
152
-                        // console.log("机构姓名",this.orgName)
153
-                     }
154
-                    //  if(typeof(response.data.data.category != 'undefined')){
155
-                    //    this.tagOptions = response.data.data.category
156
-                    //     console.log("分类列表",this.tagOptions)
157
-                    //  }
158
-              })
159
-         },
160
-         articlecreatetime(time){
161
-            return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
162
-         },
163
-         selectsign(id){
164
-            console.log("id",id)
165
-            this.listQuery.classid = id;
166
-            this.listQuery.name = name;
167
-            this.tagType = id;
168
-            this.GetAllArticles();
169
-         },
170
-         handleSizeChange(limit) {
171
-          this.listQuery.limit = limit;
172
-          this.GetAllArticles();
173
-        },
174
-         handleCurrentChange(page) {
175
-          this.listQuery.page = page;
176
-          this.GetAllArticles();
177
-        },
178
-        changeKey(){
179
-           this.GetAllArticles();
180
-        },
181
-        memberAvatar(row){
182
-             return row.imgs
183
-        },
184
-        AddArticle(){
185
-           this.$router.push({path:'/articles/createArticle/:id'})
186
-        },
187
-        changeSelectingStatus(status){
188
-          console.log("status是多少?",status)
189
-          this.selecting_status = status;
190
-          this.GetAllArticles();
191
-        },
192
-        openDelete(row,index){
193
-             var  id = row.id;
194
-            this.$confirm('确认要删除该信息吗?删除后将无法恢复!',{
195
-              dangerouslyUseHTMLString:true,
196
-             confirmButtonText: '确定',
197
-             cancelButtonText: '取消',
198
-             type: 'warning'
199
-            }).then(()=>{
200
-                var ids = [];
201
-                ids.push(row.id);
202
-                openDelete({ids:ids}).then(response=>{
203
-                    this.articsData.splice(index,1);
204
-                    this.$message.success("删除成功");
205
-                }).catch(e=>{});
206
-          }).catch(e=>{});
207
-        },
208 240
 
209
-          handleSelectionChange(val){
210
-             this.selectedArticles = val;
211
-         },
212
-           deleteArticle(id,index){
241
+    handleSelectionChange(val) {
242
+      this.selectedArticles = val;
243
+    },
244
+    deleteArticle(id, index) {
245
+      this.$confirm("确定要删除吗?删除后信息将无法恢复!", "删除提示", {
246
+        dangerouslyUseHTMLString: true,
247
+        confirmButtonText: "确定",
248
+        cancelButtonText: "取消",
249
+        type: "warning"
250
+      })
251
+        .then(() => {
252
+          deleteArticle(id)
253
+            .then(response => {
254
+              if (response.data.state == 1) {
255
+                this.articsData.splice(index, 1);
256
+                this.$message.success("删除成功");
257
+              } else {
258
+                this.$message.error(response.msg);
259
+              }
260
+            })
261
+            .catch(e => {});
262
+        })
263
+        .catch(() => {
264
+          return false;
265
+        });
266
+    },
267
+    editArticles(id, articletype) {
268
+      if (articletype == 1) {
269
+        this.$router.push("/articles/editArticle/" + id);
270
+      }
271
+      if (articletype == 2) {
272
+        this.$router.push("/articles/editVido/" + id);
273
+      }
274
+    },
213 275
 
214
-             this.$confirm('确定要删除吗?删除后信息将无法恢复!','删除提示',{
215
-               dangerouslyUseHTMLString:true,
216
-                confirmButtonText: '确定',
217
-                cancelButtonText: '取消',
218
-                type: 'warning'
219
-             }).then(()=>{
220
-                     deleteArticle(id).then(response=>{
221
-                if(response.data.state==1){
222
-                    this.articsData.splice(index,1)
223
-                    this.$message.success("删除成功")
224
-                }else{
225
-                  this.$message.error(response.msg)
226
-                }
227
-              }).catch(e=>{});
228
-             }).catch(() => {
229
-               return false
230
-            });
231
-           },
232
-           editArticles(id,articletype){
233
-               if(articletype == 1){
234
-                  this.$router.push("/articles/editArticle/"+id);
235
-               }
236
-               if(articletype == 2){
237
-                 this.$router.push("/articles/editVido/"+id);
238
-               }
239
-           },
276
+    selectProduct(val) {
277
+      var ids = [];
278
+      for (let i = 0, len = this.articsData.length; i < len; i++) {
279
+        if (!this.articsData[i].checked) {
280
+          this.selectAll = false;
281
+        } else {
282
+          this.selectAll = true;
283
+          this.selectReply = val;
284
+          ids.push(this.articsData[i].id);
285
+          this.selectReply = ids;
286
+        }
287
+      }
288
+      console.log("ids是什么", ids);
289
+    },
290
+    selectAllFunc(val) {
291
+      var ids = [];
292
+      this.articsData.map((item, i) => {
293
+        item.checked = val;
294
+      });
240 295
 
241
-          selectProduct(val){
242
-            var ids =[];
243
-            for(let i=0,len=this.articsData.length;i<len;i++){
244
-                if(!this.articsData[i].checked){
245
-                   this.selectAll = false;
246
-                }else{
247
-                  this.selectAll = true;
248
-                  this.selectReply = val;
249
-                  ids.push(this.articsData[i].id);
250
-                  this.selectReply = ids;
251
-                }
252
-            }
253
-            console.log("ids是什么",ids);
254
-        },
255
-        selectAllFunc(val){
256
-          var ids = [];
257
-           this.articsData.map((item,i)=>{
258
-             item.checked = val;
259
-           })
296
+      for (let i = 0, len = this.articsData.length; i < len; i++) {
297
+        if (!this.articsData[i].checked) {
298
+          this.selectAll = false;
299
+        } else {
300
+          this.selectAll = true;
301
+          this.selectReply = val;
302
+          ids.push(this.articsData[i].id);
303
+          this.selectReply = ids;
304
+        }
305
+      }
306
+      console.log("ids是什么", ids);
307
+    },
260 308
 
261
-            for(let i=0,len=this.articsData.length;i<len;i++){
262
-                if(!this.articsData[i].checked){
263
-                   this.selectAll = false;
264
-                }else{
265
-                  this.selectAll = true;
266
-                  this.selectReply = val;
267
-                  ids.push(this.articsData[i].id);
268
-                  this.selectReply = ids;
269
-                }
270
-            }
271
-            console.log("ids是什么",ids);
272
-        },
309
+    deleteAllArticles() {
310
+      if (this.selectReply.length == 0) {
311
+        this.$message.error("请选择要删除的信息");
312
+        return false;
313
+      }
273 314
 
274
-        deleteAllArticles(){
275
-            if (this.selectReply.length==0) {
276
-            this.$message.error("请选择要删除的信息");
277
-            return false;
315
+      this.$confirm("确认要删除所选的文章吗?", "删除提示", {
316
+        dangerouslyUseHTMLString: true,
317
+        confirmButtonText: "确定",
318
+        cancelButtonText: "取消",
319
+        type: "warning"
320
+      }).then(() => {
321
+        deleteAllArticles().then(response => {
322
+          var ids = [];
323
+          var idMap = {};
324
+          for (let index = 0; index < this.selectReply.length; index++) {
325
+            ids.push(this.selectReply[index]);
326
+            idMap[this.selectReply[index]] = this.selectReply[index];
278 327
           }
279
-
280
-          this.$confirm('确认要删除所选的文章吗?','删除提示',{
281
-             dangerouslyUseHTMLString:true,
282
-             confirmButtonText: '确定',
283
-             cancelButtonText: '取消',
284
-             type: 'warning'
285
-          }).then(()=>{
286
-               deleteAllArticles().then(response=>{
287
-                   var ids = [];
288
-                   var idMap = {};
289
-                  for (let index = 0; index < this.selectReply.length; index++) {
290
-                    ids.push(this.selectReply[index]);
291
-                     idMap[this.selectReply[index]] = this.selectReply[index];
292
-                  }
293
-                   console.log("第二个ids是什么?",ids);
294
-                  deleteAllArticles({ids:ids}).then(response=>{
295
-                       if(response.data.state ==1){
296
-                            for (let index = this.articsData.length-1; index >= 0; index--) {
297
-                              if(this.articsData[index].id in idMap){
298
-                                   this.articsData.splice(index,1)
299
-                              }
300
-                            }
301
-                             this.$message.success("删除成功");
302
-                       }
303
-                  })
304
-               });
305
-          })
306
-        },
307
-        GetAllCategory(){
308
-          GetAllCategory().then(response=>{
309
-            if(response.data.state == 1){
310
-             var categorys = response.data.data.categorys;
311
-             this.tagOptions = response.data.data.categorys;
312
-             console.log("标签是什么",categorys)
328
+          console.log("第二个ids是什么?", ids);
329
+          deleteAllArticles({ ids: ids }).then(response => {
330
+            if (response.data.state == 1) {
331
+              for (
332
+                let index = this.articsData.length - 1;
333
+                index >= 0;
334
+                index--
335
+              ) {
336
+                if (this.articsData[index].id in idMap) {
337
+                  this.articsData.splice(index, 1);
338
+                }
339
+              }
340
+              this.$message.success("删除成功");
313 341
             }
314
-          })
315
-        },
316
-        articleDetail(id,articletype){
317
-        
318
-          if(articletype == 1){
319
-           this.$router.push("/articles/articleDetail/"+id);
320
-          }
321
-          if(articletype == 2){
322
-            this.$router.push("/articles/vidoDetail/"+id);
323
-          }
324
-        }
342
+          });
343
+        });
344
+      });
325 345
     },
326
-    created(){
327
-      this.GetAllArticles();
328
-      this.GetAllCategory();
346
+    GetAllCategory() {
347
+      GetAllCategory().then(response => {
348
+        if (response.data.state == 1) {
349
+          var categorys = response.data.data.categorys;
350
+          this.tagOptions = response.data.data.categorys;
351
+          console.log("标签是什么", categorys);
352
+        }
353
+      });
329 354
     },
330
-
331
-
355
+    articleDetail(id, articletype) {
356
+      if (articletype == 1) {
357
+        this.$router.push("/articles/articleDetail/" + id);
358
+      }
359
+      if (articletype == 2) {
360
+        this.$router.push("/articles/vidoDetail/" + id);
361
+      }
362
+    }
363
+  },
364
+  created() {
365
+    this.GetAllArticles();
366
+    this.GetAllCategory();
332 367
   }
368
+};
333 369
 </script>
334 370
 
335 371
 <style scoped  rel="stylesheet/scss" lang="scss">
336
-    .parent{
337
-        position: relative;
338
-        width: 160px;
339
-        height: 120px;
340
-        left: 20px;
341
-    }
342
-    .parent .text{
343
-        display: inline-block;
344
-        transform: rotate(-45deg);
345
-        padding: 20px;
346
-        color:red;
347
-        position: relative;
348
-        left: -60px;
349
-    }
350
-   .triangle-topleft{
351
-        width: 0;
352
-        height: 0;
353
-        border-top: 70px solid yellow;
354
-        border-right: 70px solid transparent;
355
-        position: relative;
356
-        margin-top: -140px;
357
-    }
358
-
359
-    .published-cell {
360
-    padding: 20px 15px;
361
-    border: none;
362
-    border-bottom: 1px solid #e5e8ea;
363
-    float: left;
364
-    margin: 0;
365
-    width: 100%;
366
-    border-radius: 0;
367
-    position: relative;
372
+.parent {
373
+  position: relative;
374
+  width: 160px;
375
+  height: 120px;
376
+  left: 20px;
377
+}
378
+.parent .text {
379
+  display: inline-block;
380
+  transform: rotate(-45deg);
381
+  padding: 20px;
382
+  color: red;
383
+  position: relative;
384
+  left: -60px;
385
+}
386
+.triangle-topleft {
387
+  width: 0;
388
+  height: 0;
389
+  border-top: 70px solid yellow;
390
+  border-right: 70px solid transparent;
391
+  position: relative;
392
+  margin-top: -140px;
393
+}
368 394
 
369
-    .activity-image-panel {
370
-        width: 155px;
371
-        height: 122px;
372
-        border: 1px #dee2e5 solid;
373
-        display: flex;
374
-        justify-content: center;
375
-        position: relative;
376
-        -webkit-border-radius: 4px;
377
-        -moz-border-radius: 4px;
378
-        border-radius: 4px;
379
-        overflow: hidden;
380
-        float: left;
395
+.published-cell {
396
+  padding: 20px 15px;
397
+  border: none;
398
+  border-bottom: 1px solid #e5e8ea;
399
+  float: left;
400
+  margin: 0;
401
+  width: 100%;
402
+  border-radius: 0;
403
+  position: relative;
381 404
 
382
-        .status-text {
383
-            position: absolute;
384
-            font-size: 12px;
385
-            color: #fff;
386
-            top: 14px;
387
-            left: 3px;
388
-            -webkit-transform: rotate(316deg);
389
-            transform: rotate(316deg);
390
-        }
405
+  .activity-image-panel {
406
+    width: 155px;
407
+    height: 122px;
408
+    border: 1px #dee2e5 solid;
409
+    display: flex;
410
+    justify-content: center;
411
+    position: relative;
412
+    -webkit-border-radius: 4px;
413
+    -moz-border-radius: 4px;
414
+    border-radius: 4px;
415
+    overflow: hidden;
416
+    float: left;
391 417
 
392
-        img {
393
-            width: 100%;
394
-            height: 100%;
395
-            object-fit: cover;
396
-            object-position: center;
397
-        }
418
+    .status-text {
419
+      position: absolute;
420
+      font-size: 12px;
421
+      color: #fff;
422
+      top: 14px;
423
+      left: 3px;
424
+      -webkit-transform: rotate(316deg);
425
+      transform: rotate(316deg);
398 426
     }
399
-    .activity-image-panel::before {
400
-        border-top: 28px solid #5bd18b;
401
-        border-right: 28px solid transparent;
402
-        border-bottom: 28px solid transparent;
403
-        border-left: 28px solid #5bd18b;
404
-        position: absolute;
405
-        top: 0;
406
-        left: 0;
407
-        width: 0;
408
-        height: 0;
409
-        display: block;
410
-        content: "";
427
+
428
+    img {
429
+      width: 100%;
430
+      height: 100%;
431
+      object-fit: cover;
432
+      object-position: center;
411 433
     }
434
+  }
435
+  .activity-image-panel::before {
436
+    border-top: 28px solid #5bd18b;
437
+    border-right: 28px solid transparent;
438
+    border-bottom: 28px solid transparent;
439
+    border-left: 28px solid #5bd18b;
440
+    position: absolute;
441
+    top: 0;
442
+    left: 0;
443
+    width: 0;
444
+    height: 0;
445
+    display: block;
446
+    content: "";
447
+  }
412 448
 
413
-    .activity-info-panel {
414
-        padding: 7px 20px;
415
-        width: 60%;
416
-        float: left;
449
+  .activity-info-panel {
450
+    padding: 7px 20px;
451
+    width: 60%;
452
+    float: left;
417 453
 
418
-        .title {
419
-            padding-bottom: 5px;
420
-            margin-bottom: 15px;
421
-            a {
422
-                color: #495060;
423
-                font-size: 20px;
424
-                max-width: 100%;
425
-                font-weight: 500;
426
-                overflow: hidden;
427
-                white-space: nowrap;
428
-                text-overflow: ellipsis;
429
-                display: inline-block;
430
-            }
431
-        }
454
+    .title {
455
+      padding-bottom: 5px;
456
+      margin-bottom: 15px;
457
+      a {
458
+        color: #495060;
459
+        font-size: 20px;
460
+        max-width: 100%;
461
+        font-weight: 500;
462
+        overflow: hidden;
463
+        white-space: nowrap;
464
+        text-overflow: ellipsis;
465
+        display: inline-block;
466
+      }
467
+    }
432 468
 
433
-        .statistics {
434
-            color: #a8b3ba;
435
-            font-size: 15px;
436
-            justify-content: space-between;
437
-            line-height: 30px;
438
-        }
469
+    .statistics {
470
+      color: #a8b3ba;
471
+      font-size: 15px;
472
+      justify-content: space-between;
473
+      line-height: 30px;
439 474
     }
475
+  }
440 476
 
441
-    .activity-time-panel {
442
-        float: right;
443
-        padding: 7px 0;
477
+  .activity-time-panel {
478
+    float: right;
479
+    padding: 7px 0;
444 480
 
445
-        .time {
446
-            font-size: 15px;
447
-            color: #a8b3ba;
448
-        }
449
-    }
450
-    .center{
451
-        font-size:15px;
452
-        color: #a8b3ba;
453
-    }
454
-    .checkbox{
455
-        float:left;
456
-        position: relative;
457
-        left:-10px;
481
+    .time {
482
+      font-size: 15px;
483
+      color: #a8b3ba;
458 484
     }
485
+  }
486
+  .center {
487
+    font-size: 15px;
488
+    color: #a8b3ba;
489
+  }
490
+  .checkbox {
491
+    float: left;
492
+    position: relative;
493
+    left: -10px;
494
+  }
459 495
 }
460
-
461 496
 </style>

+ 61 - 59
src/scrm_pages/article/article_detail.vue Целия файл

@@ -1,70 +1,72 @@
1 1
 <template>
2
-   <div  class="main-contain">
3
-      <div class="position">
4
-         <bread-crumb :crumbs='crumbs'></bread-crumb>
5
-     </div> 
6
-     <div class="app-container">
7
-          <div class="articlename">
8
-              {{articleform.title}}
9
-          </div>
10
-           <div v-html="articleform.content" class="articlecontent">
11
-
12
-           </div>
13
-     </div>
14
-   </div>
2
+  <div class="main-contain">
3
+    <div class="position">
4
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
5
+    </div>
6
+    <div class="app-container">
7
+      <div class="articlename">{{articleform.title}}</div>
8
+      <div v-html="articleform.content" class="articlecontent"></div>
9
+    </div>
10
+  </div>
15 11
 </template>
16 12
 
17 13
 <script>
18
-    import BreadCrumb from '../components/bread-crumb'
19
-     import { getArticleDetail } from '@/api/act/submitinfo'
20
-    export default {
21
-        name: "article_detail",
22
-         components:{
23
-           BreadCrumb,
24
-      },
25
-      data(){
26
-        return{
27
-            crumbs: [
28
-             { path: false, name: '文章管理' },
29
-             { path: '/articles/articleDetail', name: '文章详情' }
30
-          ],  
31
-          articleform:{
32
-            title:"",
33
-            content:"",
34
-          }
35
-        }  
36
-      },
37
-      methods:{
38
-         getArticleDetail(){
39
-            const id = this.$route.params && this.$route.params.id;
40
-            console.log("文章详情id是什么",id);
41
-           getArticleDetail(id,this.articleform).then(response=>{
42
-               if(response.data.state == 1){
43
-                 var articles =  response.data.data.articles;
44
-                this.articleform =  response.data.data.articles;
45
-                 console.log("articles",articles)
46
-               }
47
-           })
48
-         }
49
-      },
50
-      created(){
51
-        this.getArticleDetail();
14
+import BreadCrumb from "../components/bread-crumb";
15
+import { getArticleDetail } from "@/api/act/submitinfo";
16
+export default {
17
+  name: "article_detail",
18
+  components: {
19
+    BreadCrumb
20
+  },
21
+  data() {
22
+    return {
23
+      crumbs: [
24
+        { path: false, name: "文章管理" },
25
+        { path: "/articles/articleDetail", name: "文章详情" }
26
+      ],
27
+      articleform: {
28
+        title: "",
29
+        content: ""
52 30
       }
31
+    };
32
+  },
33
+  methods: {
34
+    getArticleDetail() {
35
+      const id = this.$route.params && this.$route.params.id;
36
+      console.log("文章详情id是什么", id);
37
+      getArticleDetail(id, this.articleform).then(response => {
38
+        if (response.data.state == 1) {
39
+          var articles = response.data.data.articles;
40
+          this.articleform = response.data.data.articles;
41
+          console.log("articles", articles);
42
+        }
43
+      });
53 44
     }
45
+  },
46
+  created() {
47
+    this.getArticleDetail();
48
+  }
49
+};
54 50
 </script>
55 51
 
56 52
 <style scoped>
57
-    .articlename{
58
-      min-width: 500px;
59
-      height: 50px;
60
-      /* border: solid 1px red; */
61
-      margin-left: 600px;
62
-    }
53
+.articlename {
54
+  min-width: 500px;
55
+  height: 50px;
56
+  /* border: solid 1px red; */
57
+  margin-left: 600px;
58
+  font-weight: 600;
59
+  font-size: 24px;
60
+  margin-top: 30px;
61
+  margin: 0 auto;
62
+  text-align: center;
63
+}
63 64
 
64
-    .articlecontent{
65
-      width: 1000px;
66
-      height: 100%;
67
-      /* border:solid 1px red; */
68
-      /* margin-left: 300px; */
69
-    }
65
+.articlecontent {
66
+  width: 1000px;
67
+  height: 100%;
68
+  margin: 0 auto;
69
+  /* border:solid 1px red; */
70
+  /* margin-left: 300px; */
71
+}
70 72
 </style>

+ 13 - 8
src/scrm_pages/kefu/index.vue Целия файл

@@ -31,9 +31,7 @@
31 31
 
32 32
         <div class="left_content">
33 33
           <div class="conversation-admin">
34
-            <span class="nickname">
35
-              <span></span>
36
-            </span>
34
+            <p class="nickname" v-html="nickName"></p>
37 35
           </div>
38 36
           <div class="message-list-wrap">
39 37
             <div class="message-list-item">
@@ -64,7 +62,7 @@
64 62
                 <span class="face_icon" @click="showEmotionDialog"></span>
65 63
               </div> -->
66 64
               <div class="picture">
67
-                <span class="picture_icon" @click="selectPicClick"></span>
65
+                <img class="picture_icon" src='static/images/ico.png' @click="selectPicClick" />
68 66
               </div>
69 67
             </div>
70 68
             <div id="wl_faces_box" class="wl_faces_box" v-bind:style="{left:'0px', display:facesBoxDisplay}">
@@ -190,6 +188,7 @@ var kgetPrePageC2CHistroyMsgInfoMap = {};
190 188
         selSess:null,
191 189
         message:'',
192 190
         messageBox:[],
191
+        nickName:''
193 192
       }
194 193
     },
195 194
     methods: {
@@ -345,6 +344,8 @@ var kgetPrePageC2CHistroyMsgInfoMap = {};
345 344
           this.$message.error('选择对象还未关联用户,无法进行对话');
346 345
           return false;
347 346
         }
347
+        // console.log(customer)
348
+        this.nickName = customer.name;
348 349
         this.thisCustomer = customer;
349 350
         this.selToID = "User_" + customer.user_id;
350 351
         this.onSelSess(selType, this.selToID);
@@ -915,7 +916,7 @@ var kgetPrePageC2CHistroyMsgInfoMap = {};
915 916
 
916 917
   
917 918
 .app-container{
918
-  height: 750px;  
919
+  height: 540px;  
919 920
 }
920 921
 .customer_plate {
921 922
   width: 100%;
@@ -1030,7 +1031,10 @@ var kgetPrePageC2CHistroyMsgInfoMap = {};
1030 1031
   width: 100%;
1031 1032
 }
1032 1033
 .left_content .conversation-admin .nickname {
1033
-  padding-left: 22px;
1034
+  /* padding-left: 22px; */
1035
+  text-align: center;
1036
+  min-width: 200px;
1037
+  margin:0 auto;
1034 1038
 }
1035 1039
 .client_list ul {
1036 1040
   list-style: none;
@@ -1201,7 +1205,7 @@ var kgetPrePageC2CHistroyMsgInfoMap = {};
1201 1205
 .send_box .inputer_actions .picture_icon {
1202 1206
   width: 28px;
1203 1207
   height: 24px;
1204
-  background: url(http://jk.kuyicloud.com/static/images/ico.png) no-repeat -508px -314px;
1208
+  /* background: url(http://jk.kuyicloud.com/static/images/b.jpg) no-repeat -508px -314px; */
1205 1209
   display: inline-block;
1206 1210
   margin-right: 22px;
1207 1211
   cursor: pointer;
@@ -1249,6 +1253,7 @@ var kgetPrePageC2CHistroyMsgInfoMap = {};
1249 1253
   font-size: 14px;
1250 1254
   line-height: 1.5em;
1251 1255
   border: none;
1256
+  border:1px solid #58a2ec;
1252 1257
   overflow-x: hidden;
1253 1258
   overflow-y: auto;
1254 1259
   border-radius: 0;
@@ -1737,4 +1742,4 @@ and open the template in the editor.
1737 1742
 figure {
1738 1743
   margin: 0;
1739 1744
 }
1740
-</style>
1745
+</style>

+ 1 - 1
src/scrm_pages/members/members.vue Целия файл

@@ -13,7 +13,7 @@
13 13
     <div class="app-container">
14 14
       <div style="margin-bottom: 10px">
15 15
         <el-row :gutter="24">
16
-          <el-col :span="8">
16
+          <el-col :span="24">
17 17
             <el-input style="width: 300px" v-model="listQuery.search" placeholder="请输入您需要搜索的内容"></el-input>
18 18
             <el-button type="primary" icon="el-icon-search" @click="changeKey">搜索</el-button>
19 19
           </el-col>

+ 226 - 189
src/scrm_pages/members/tags.vue Целия файл

@@ -1,225 +1,262 @@
1 1
 <template>
2 2
   <div class="main-contain">
3 3
     <div class="position">
4
-      <bread-crumb :crumbs='crumbs'></bread-crumb>
5
-      <el-button  style="float:right;" type="primary" size="small" icon="el-icon-circle-plus-outline" @click="openCreate">添加标签</el-button>
4
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
5
+      <el-button
6
+        style="float:right;"
7
+        type="primary"
8
+        size="small"
9
+        icon="el-icon-circle-plus-outline"
10
+        @click="openCreate"
11
+      >添加标签</el-button>
6 12
     </div>
7 13
     <div class="app-container">
8
-        <div style="margin-bottom: 10px">
9
-            <el-row :gutter="24">
10
-                <el-col :span="8">
11
-                    <el-input style="width: 300px" v-model="listQuery.search" placeholder="请输入您需要搜索的内容"></el-input>
12
-                    <el-button type="primary"  icon="el-icon-search" @click="changeKey">搜索</el-button>
13
-                </el-col>
14
-            </el-row>
15
-        </div>
16
-        <div class="filter-container" style="margin-top: 10px;margin-left: 5px">
17
-            <el-checkbox style="width: 30px" @change="changeCheck" v-model="checkAllStatus">全选</el-checkbox>
18
-            <el-button size="small" icon="el-icon-delete" @click="openDeleteTags">批量删除</el-button>
19
-        </div>
20
-        <el-table ref="multipleTable"  @selection-change="handleSelectionChange"  :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :data="tagsData" border fit highlight-current-row  style="width: 100%;margin-top: 10px;">
21
-            <el-table-column
22
-                align="center"
23
-                type="selection"
24
-                width="55">
25
-             </el-table-column>
26
-            <el-table-column label="标签" align="center">
27
-                <template slot-scope="scope">
28
-                    {{scope.row.tag_name}}
29
-                </template>
30
-            </el-table-column>
31
-            <el-table-column label="会员数" align="center">
32
-                <template slot-scope="scope">
33
-                <span>{{scope.row.member_count}}</span>
34
-                </template>
35
-            </el-table-column>
36
-            <el-table-column label="操作" align="center">
37
-                <template slot-scope="scope">
38
-                    <el-tooltip class="item" effect="dark" content="编辑" placement="top">
39
-                        <el-button size="mini" type="primary" icon="el-icon-edit-outline" @click="openEdit(scope.row, scope.$index)" ></el-button>
40
-                    </el-tooltip>
41
-                    <el-tooltip class="item" effect="dark" content="删除" placement="top">
42
-                        <el-button size="mini" type="danger" icon="el-icon-delete" @click="openDelete(scope.row, scope.$index)" ></el-button>
43
-                    </el-tooltip>
44
-                </template>
45
-            </el-table-column>
46
-        </el-table>
47
-        <el-pagination
48
-            @size-change="handleSizeChange"
49
-            @current-change="handleCurrentChange"
50
-            :page-sizes="[10,20,50,100]"
51
-            :page-size="10"
52
-            background
53
-            style="margin-top:20px;"
54
-            align="right"
55
-            layout="total, sizes, prev, pager, next, jumper"
56
-            :total="total">
57
-        </el-pagination>
14
+      <div style="margin-bottom: 10px">
15
+        <el-row :gutter="24">
16
+          <el-col :span="24">
17
+            <el-input style="width: 300px" v-model="listQuery.search" placeholder="请输入您需要搜索的内容"></el-input>
18
+            <el-button type="primary" icon="el-icon-search" @click="changeKey">搜索</el-button>
19
+          </el-col>
20
+        </el-row>
21
+      </div>
22
+      <div class="filter-container" style="margin-top: 10px;margin-left: 5px">
23
+        <el-checkbox style="width: 30px" @change="changeCheck" v-model="checkAllStatus">全选</el-checkbox>
24
+        <el-button size="small" icon="el-icon-delete" @click="openDeleteTags">批量删除</el-button>
25
+      </div>
26
+      <el-table
27
+        ref="multipleTable"
28
+        @selection-change="handleSelectionChange"
29
+        :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
30
+        :data="tagsData"
31
+        border
32
+        fit
33
+        highlight-current-row
34
+        style="width: 100%;margin-top: 10px;"
35
+      >
36
+        <el-table-column align="center" type="selection" width="55"></el-table-column>
37
+        <el-table-column label="标签" align="center">
38
+          <template slot-scope="scope">{{scope.row.tag_name}}</template>
39
+        </el-table-column>
40
+        <el-table-column label="会员数" align="center">
41
+          <template slot-scope="scope">
42
+            <span>{{scope.row.member_count}}</span>
43
+          </template>
44
+        </el-table-column>
45
+        <el-table-column label="操作" align="center">
46
+          <template slot-scope="scope">
47
+            <el-tooltip class="item" effect="dark" content="编辑" placement="top">
48
+              <el-button
49
+                size="mini"
50
+                type="primary"
51
+                icon="el-icon-edit-outline"
52
+                @click="openEdit(scope.row, scope.$index)"
53
+              ></el-button>
54
+            </el-tooltip>
55
+            <el-tooltip class="item" effect="dark" content="删除" placement="top">
56
+              <el-button
57
+                size="mini"
58
+                type="danger"
59
+                icon="el-icon-delete"
60
+                @click="openDelete(scope.row, scope.$index)"
61
+              ></el-button>
62
+            </el-tooltip>
63
+          </template>
64
+        </el-table-column>
65
+      </el-table>
66
+      <el-pagination
67
+        @size-change="handleSizeChange"
68
+        @current-change="handleCurrentChange"
69
+        :page-sizes="[10,20,50,100]"
70
+        :page-size="10"
71
+        background
72
+        style="margin-top:20px;"
73
+        align="right"
74
+        layout="total, sizes, prev, pager, next, jumper"
75
+        :total="total"
76
+      ></el-pagination>
58 77
 
59
-        <!--create-tag-form 添加标签-->
60
-        <create-tag-form ref="createTagForm" :tagsData="tagsData" ></create-tag-form>
61
-        <!--edit-tag-form 编辑标签-->
62
-        <edit-tag-form ref="editTagForm" :tagsData="tagsData" :tagIndex="tagIndex" :form="editForm"></edit-tag-form>
78
+      <!--create-tag-form 添加标签-->
79
+      <create-tag-form ref="createTagForm" :tagsData="tagsData"></create-tag-form>
80
+      <!--edit-tag-form 编辑标签-->
81
+      <edit-tag-form ref="editTagForm" :tagsData="tagsData" :tagIndex="tagIndex" :form="editForm"></edit-tag-form>
63 82
     </div>
64 83
   </div>
65 84
 </template>
66 85
 
67 86
 <script>
68
-  import {GetTags,DeleteTags} from "@/api/member/member";
69
-  import BreadCrumb from '../components/bread-crumb';
70
-  import CreateTagForm from "./components/CreateTagForm";
71
-  import EditTagForm from "./components/EditTagForm";
87
+import { GetTags, DeleteTags } from "@/api/member/member";
88
+import BreadCrumb from "../components/bread-crumb";
89
+import CreateTagForm from "./components/CreateTagForm";
90
+import EditTagForm from "./components/EditTagForm";
72 91
 
73
-  export default {
74
-    name: 'memberTagList',
75
-    components:{
76
-      BreadCrumb,
77
-      CreateTagForm,
78
-      EditTagForm,
79
-    },
80
-    data(){
81
-      return{
82
-        crumbs: [
83
-          { path: false, name: '会员管理' },
84
-          { path: false, name: '标签管理' }
85
-        ],
86
-        total:0,
87
-        listQuery:{
88
-            page:1,
89
-            limit:10,
90
-            search:'',
91
-        },
92
-        checkAllStatus:false,
93
-        selectedTags:[],
94
-        tagsData:[],
95
-        tagIndex:-1,
96
-        editForm:{
97
-            id:0,
98
-            tag_name:'',
99
-        },
92
+export default {
93
+  name: "memberTagList",
94
+  components: {
95
+    BreadCrumb,
96
+    CreateTagForm,
97
+    EditTagForm
98
+  },
99
+  data() {
100
+    return {
101
+      crumbs: [
102
+        { path: false, name: "会员管理" },
103
+        { path: false, name: "标签管理" }
104
+      ],
105
+      total: 0,
106
+      listQuery: {
107
+        page: 1,
108
+        limit: 10,
109
+        search: ""
110
+      },
111
+      checkAllStatus: false,
112
+      selectedTags: [],
113
+      tagsData: [],
114
+      tagIndex: -1,
115
+      editForm: {
116
+        id: 0,
117
+        tag_name: ""
100 118
       }
119
+    };
120
+  },
121
+  methods: {
122
+    openCreate: function() {
123
+      this.$refs.createTagForm.open();
101 124
     },
102
-    methods:{
103
-        openCreate:function(){
104
-          this.$refs.createTagForm.open();
105
-        },
106
-        openEdit:function(row,index){
107
-            this.tagIndex = index;
108
-            this.editForm.id = row.id;
109
-            this.editForm.tag_name = row.tag_name;
110
-            this.$refs.editTagForm.open();
111
-        },
112
-        openDeleteTags:function(){
113
-          if (this.selectedTags.length==0) {
114
-            this.$message.error("请选择要删除的标签");
115
-            return false;
116
-          }
125
+    openEdit: function(row, index) {
126
+      this.tagIndex = index;
127
+      this.editForm.id = row.id;
128
+      this.editForm.tag_name = row.tag_name;
129
+      this.$refs.editTagForm.open();
130
+    },
131
+    openDeleteTags: function() {
132
+      if (this.selectedTags.length == 0) {
133
+        this.$message.error("请选择要删除的标签");
134
+        return false;
135
+      }
117 136
 
118
-          this.$confirm('确认要删除所选的标签吗?<br>删除后,标签将无法恢复', '删除提示', {
119
-            dangerouslyUseHTMLString:true,
120
-            confirmButtonText: '确定',
121
-            cancelButtonText: '取消',
122
-            type: 'warning'
123
-          }).then(() => {
124
-            var ids = [];
125
-            var idMap = {};
126
-            for (const index in this.selectedTags) {
127
-              ids.push(this.selectedTags[index].id);
128
-              idMap[this.selectedTags[index].id] = this.selectedTags[index].id;
129
-            }
130
-            DeleteTags({ids:ids}).then(response=>{
137
+      this.$confirm(
138
+        "确认要删除所选的标签吗?<br>删除后,标签将无法恢复",
139
+        "删除提示",
140
+        {
141
+          dangerouslyUseHTMLString: true,
142
+          confirmButtonText: "确定",
143
+          cancelButtonText: "取消",
144
+          type: "warning"
145
+        }
146
+      )
147
+        .then(() => {
148
+          var ids = [];
149
+          var idMap = {};
150
+          for (const index in this.selectedTags) {
151
+            ids.push(this.selectedTags[index].id);
152
+            idMap[this.selectedTags[index].id] = this.selectedTags[index].id;
153
+          }
154
+          DeleteTags({ ids: ids })
155
+            .then(response => {
131 156
               var res = response.data;
132 157
               if (res.state === 1) {
133 158
                 var tagsDataLength = this.tagsData.length;
134
-                for (let index = tagsDataLength-1; index >= 0; index--) {
135
-                  if(this.tagsData[index].id in idMap) {
159
+                for (let index = tagsDataLength - 1; index >= 0; index--) {
160
+                  if (this.tagsData[index].id in idMap) {
136 161
                     this.tagsData.splice(index, 1);
137
-                  }                  
162
+                  }
138 163
                 }
139 164
                 this.$message.success("删除标签成功");
140
-              }else {
165
+              } else {
141 166
                 this.$message.error(res.msg);
142 167
               }
143
-            }).catch(e=>{});
144
-          }).catch(() => {
145
-            return false        
146
-          });
147
-        },
148
-        openDelete:function(row,index){
149
-          this.$confirm('确认要删除该标签吗?<br>删除后,该标签将无法恢复', '删除提示', {
150
-            dangerouslyUseHTMLString:true,
151
-            confirmButtonText: '确定',
152
-            cancelButtonText: '取消',
153
-            type: 'warning'
154
-          }).then(() => {
155
-            var ids = [];
156
-            ids.push(row.id);
157
-            DeleteTags({ids:ids}).then(response=>{
168
+            })
169
+            .catch(e => {});
170
+        })
171
+        .catch(() => {
172
+          return false;
173
+        });
174
+    },
175
+    openDelete: function(row, index) {
176
+      this.$confirm(
177
+        "确认要删除该标签吗?<br>删除后,该标签将无法恢复",
178
+        "删除提示",
179
+        {
180
+          dangerouslyUseHTMLString: true,
181
+          confirmButtonText: "确定",
182
+          cancelButtonText: "取消",
183
+          type: "warning"
184
+        }
185
+      )
186
+        .then(() => {
187
+          var ids = [];
188
+          ids.push(row.id);
189
+          DeleteTags({ ids: ids })
190
+            .then(response => {
158 191
               var res = response.data;
159 192
               if (res.state === 1) {
160 193
                 this.tagsData.splice(index, 1);
161 194
                 this.$message.success("删除标签成功");
162
-              }else {
195
+              } else {
163 196
                 this.$message.error(res.msg);
164 197
               }
165
-            }).catch(e=>{});
166
-          }).catch(() => {
167
-            return false        
168
-          });
169
-        },
170
-        changeCheck:function(){
171
-          this.$refs.multipleTable.clearSelection();
172
-          if (this.checkAllStatus) {
173
-            this.$refs.multipleTable.toggleAllSelection();
174
-          }
175
-        },
176
-        handleSelectionChange:function (val) {
177
-          this.selectedTags = val;
178
-        },
179
-        handleSizeChange(limit) {
180
-            this.listQuery.limit = limit;
181
-            this.GetTags();
182
-        },
183
-        handleCurrentChange(page) {
184
-            this.listQuery.page = page;
185
-            this.GetTags();
186
-        },
187
-        changeKey(){
188
-            this.GetTags();
189
-        },
190
-        GetTags(){
191
-            GetTags(this.listQuery).then(response=>{
192
-                var res = response.data;
193
-                if(res.state===1) {
194
-                    this.tagsData = res.data.tags;
195
-                    this.total = res.data.total;
196
-                }
197
-            }).catch(e=>{})
198
-        }
198
+            })
199
+            .catch(e => {});
200
+        })
201
+        .catch(() => {
202
+          return false;
203
+        });
199 204
     },
200
-    computed:{
201
-        activeTagsData:function(){
202
-        var tags = [];
203
-        
204
-        return tags;
205
-        }
205
+    changeCheck: function() {
206
+      this.$refs.multipleTable.clearSelection();
207
+      if (this.checkAllStatus) {
208
+        this.$refs.multipleTable.toggleAllSelection();
209
+      }
210
+    },
211
+    handleSelectionChange: function(val) {
212
+      this.selectedTags = val;
213
+    },
214
+    handleSizeChange(limit) {
215
+      this.listQuery.limit = limit;
216
+      this.GetTags();
206 217
     },
207
-    created(){
208
-        this.GetTags();
218
+    handleCurrentChange(page) {
219
+      this.listQuery.page = page;
220
+      this.GetTags();
221
+    },
222
+    changeKey() {
223
+      this.GetTags();
224
+    },
225
+    GetTags() {
226
+      GetTags(this.listQuery)
227
+        .then(response => {
228
+          var res = response.data;
229
+          if (res.state === 1) {
230
+            this.tagsData = res.data.tags;
231
+            this.total = res.data.total;
232
+          }
233
+        })
234
+        .catch(e => {});
235
+    }
236
+  },
237
+  computed: {
238
+    activeTagsData: function() {
239
+      var tags = [];
240
+
241
+      return tags;
209 242
     }
243
+  },
244
+  created() {
245
+    this.GetTags();
210 246
   }
247
+};
211 248
 </script>
212 249
 
213 250
 <style scoped>
214
-  /*.app-container .cell.clearfix .time ul li {*/
215
-    /*float: left;*/
216
-    /*list-style: none;*/
217
-    /*cursor: pointer;*/
218
-    /*padding: 6px 20px;*/
219
-    /*color: #606266;*/
220
-    /*border-radius: 4px;*/
221
-    /*margin: 0 8px 0 0;*/
222
-    /*font-size: 14px;*/
223
-    /*text-align: center;*/
224
-  /*}*/
225
-</style>
251
+/*.app-container .cell.clearfix .time ul li {*/
252
+/*float: left;*/
253
+/*list-style: none;*/
254
+/*cursor: pointer;*/
255
+/*padding: 6px 20px;*/
256
+/*color: #606266;*/
257
+/*border-radius: 4px;*/
258
+/*margin: 0 8px 0 0;*/
259
+/*font-size: 14px;*/
260
+/*text-align: center;*/
261
+/*}*/
262
+</style>

+ 12 - 12
src/scrm_pages/site/components/new-feature.vue Целия файл

@@ -57,7 +57,7 @@
57 57
   <el-dialog
58 58
     title="新增轮播图"
59 59
     :visible.sync="dialogVisible"
60
-    width="36%"
60
+    width="58%"
61 61
     center>
62 62
     <el-form ref="rotationform" :model="rotationform" label-width="90px" :rules="rules" >
63 63
       <el-form-item label="模块标题:" required prop="title">
@@ -105,7 +105,7 @@
105 105
    <el-dialog
106 106
      title="添加图片"
107 107
      :visible.sync="addpicVisible"
108
-     width="35%"
108
+     width="40%"
109 109
      center>
110 110
   <el-form ref="picform" :model="picform" label-width="90px" :rules="rules">
111 111
     <el-form-item label="图片编辑:" required prop="imageUrl">
@@ -201,7 +201,7 @@
201 201
   <el-dialog
202 202
     title="新增医院介绍"
203 203
     :visible.sync="two"
204
-      width="50%"
204
+      width="58%"
205 205
      :modal='false'
206 206
      v-dialogDrag
207 207
      :close-on-click-modal="false"
@@ -233,7 +233,7 @@
233 233
   <el-dialog
234 234
     title="新增科室介绍"
235 235
     :visible.sync="three"
236
-    width="50%"
236
+    width="58%"
237 237
     center>
238 238
     <el-form ref="administform" :model="administform" label-width="90px" :rules="rules">
239 239
       <el-form-item label="模块标题:" required prop="title">
@@ -262,7 +262,7 @@
262 262
   <el-dialog
263 263
     title="新增名医介绍"
264 264
     :visible.sync="four"
265
-    width="550px"
265
+    width="58%"
266 266
     center>
267 267
     <el-form ref="doctorform" :model="doctorform" label-width="90px" :rules="rules" >
268 268
       <el-form-item label="模块标题:" required prop="title">
@@ -309,7 +309,7 @@
309 309
    <el-dialog
310 310
       title="新增医生信息"
311 311
       :visible.sync="centerDialogVisible"
312
-      width="50%"
312
+      width="58%"
313 313
       center>
314 314
        <el-form label-width="90px" class="clearfix" :model="eidtDoctorform" ref="eidtDoctorform" :rules="rules">
315 315
           <el-row :span=20>
@@ -443,7 +443,7 @@
443 443
    <el-dialog
444 444
     title="新增科室环境"
445 445
     :visible.sync="five"
446
-    width="550px"
446
+    width="58%"
447 447
      center>
448 448
     <el-form ref="keform" :model="keform" label-width="110px" :rules="rules">
449 449
       <el-form-item label="模块标题: " required prop="title">
@@ -489,7 +489,7 @@
489 489
   <el-dialog
490 490
     title="图片编辑"
491 491
    :visible.sync="officeVisible"
492
-    width="30%"
492
+    width="35%"
493 493
     center>
494 494
      <el-form label-width="90px" :model="officeform" ref="officeform" :rules="rules">
495 495
        <el-form-item label="图片编辑:" required prop="enviroimages" >
@@ -551,7 +551,7 @@
551 551
   <el-dialog
552 552
     title="新增文章列表"
553 553
     :visible.sync="six"
554
-    width="550px"
554
+    width="58%"
555 555
     center>
556 556
     <el-form ref="articeform" :model="articeform" label-width="110px" :rules="rules">
557 557
       <el-form-item label="模块标题:" required  prop="title">
@@ -593,7 +593,7 @@
593 593
    <el-dialog
594 594
     title="新增活动列表"
595 595
     :visible.sync="seven"
596
-    width="550px"
596
+    width="58%"
597 597
     center>
598 598
     <el-form ref="activeform" :model="activeform" label-width="120px" :rules="rules">
599 599
       <el-form-item label="模块标题: " required prop="title">
@@ -618,7 +618,7 @@
618 618
     <el-dialog
619 619
     title="新增魔方导航"
620 620
     :visible.sync="eight"
621
-    width="550px"
621
+    width="58%"
622 622
     center>
623 623
     <el-form ref="marginform" :model="marginform" label-width="90px" :rules="rules" >
624 624
       <el-form-item label="模块标题:" required prop="title">
@@ -665,7 +665,7 @@
665 665
   <el-dialog
666 666
     title="编辑魔方导航"
667 667
     :visible.sync="EditMacDialogVisible"
668
-    width="30%"
668
+    width="35%"
669 669
     center>
670 670
     <el-form label-width="90px" ref="editmacform" :model="editmacform" :rules="rules">
671 671
       <el-form-item label="导航标题:" required prop="margtitle">

+ 13 - 12
src/scrm_pages/site/preview.vue Целия файл

@@ -1398,7 +1398,7 @@
1398 1398
              </el-dialog>
1399 1399
 
1400 1400
               <!-- 手机模拟页面 -->
1401
-               <el-col :span="10" class="text">
1401
+               <el-col :span="9" class="text">
1402 1402
                   <div class="phone">
1403 1403
                    <div class="time">9:42</div>
1404 1404
                    <div class="xinhao"></div>
@@ -5350,7 +5350,7 @@ export default {
5350 5350
         width: 80px;
5351 5351
        height: 20px;
5352 5352
       //  border:solid 1px red;
5353
-       margin-left: 430px;
5353
+       margin-left: 416px;
5354 5354
        margin-top: 510px;
5355 5355
        font-size: 14px;
5356 5356
      }
@@ -5360,7 +5360,7 @@ export default {
5360 5360
          width: 40px;
5361 5361
          height: 40px;
5362 5362
         //  border:solid 1px red;
5363
-         margin-left: 390px;
5363
+         margin-left: 376px;
5364 5364
          margin-top: 500px;
5365 5365
 
5366 5366
      }
@@ -5428,12 +5428,12 @@ export default {
5428 5428
      width: 110px;
5429 5429
      height: 110px;
5430 5430
     //  border: solid 1px red;
5431
-     margin-left: 400px;
5431
+     margin-left: 380px;
5432 5432
      margin-top: 50px;
5433 5433
    }
5434 5434
    .share{
5435 5435
      position: relative;
5436
-     width: 350px;
5436
+     width: 300px;
5437 5437
      height: 720px;
5438 5438
      border: solid 1px black;
5439 5439
     //  margin-left: -10px;
@@ -5444,7 +5444,7 @@ export default {
5444 5444
 
5445 5445
    .share2{
5446 5446
      position: absolute;
5447
-     width: 348px;
5447
+     width: 300px;
5448 5448
      height: 50px;
5449 5449
     //  border: solid 1px red;
5450 5450
      background-color: #333333;
@@ -5453,7 +5453,7 @@ export default {
5453 5453
 
5454 5454
    .share3{
5455 5455
      position: absolute;
5456
-     margin-left: 150px;
5456
+     margin-left: 120px;
5457 5457
      margin-top: 15px;
5458 5458
    }
5459 5459
     .wrapper {
@@ -5658,8 +5658,9 @@ export default {
5658 5658
      height: 40px;
5659 5659
      font-size: 14px;
5660 5660
      color: #FF6600;
5661
+     margin: 0 auto;
5661 5662
      margin-top: 50px;
5662
-     margin-left: 150px;
5663
+    //  margin-left: 150px;
5663 5664
     //  border: solid 1px red;
5664 5665
    }
5665 5666
 
@@ -6190,7 +6191,7 @@ export default {
6190 6191
 
6191 6192
    .navigationone{
6192 6193
      position: relative;
6193
-     width: 330px;
6194
+     width: 280px;
6194 6195
      height: 50px;
6195 6196
      border: solid 1px  rgba(242, 242, 242, 1);
6196 6197
      margin-top: 10px;
@@ -6198,7 +6199,7 @@ export default {
6198 6199
    }
6199 6200
    .navigacontent{
6200 6201
      position: relative;
6201
-     width:348px;
6202
+     width:300px;
6202 6203
      height: 670px;
6203 6204
      border:solid 0.1px rgba(242, 242, 242, 1);
6204 6205
      margin-top: 50px;
@@ -6208,13 +6209,13 @@ export default {
6208 6209
      height: 35px;
6209 6210
     //  border: solid 1px blue;
6210 6211
      margin-top: 7px;
6211
-     margin-left: 20px;
6212
+     margin-left: 10px;
6212 6213
    }
6213 6214
 
6214 6215
    .navithree{
6215 6216
      width:120px;
6216 6217
      height: 30px;
6217
-     margin-left: 60px;
6218
+     margin-left: 45px;
6218 6219
      margin-top: -25px;
6219 6220
      font-size: 14px;
6220 6221
    }

+ 1 - 1
src/scrm_pages/systemsetting/staffmanagement.vue Целия файл

@@ -13,7 +13,7 @@
13 13
     <div class="app-container">
14 14
       <div>
15 15
         <el-row :gutter="24">
16
-          <el-col :span="8">
16
+          <el-col :span="24">
17 17
             <el-input style="width: 300px" v-model="keyword" placeholder="请输入您需要搜索的内容"></el-input>
18 18
             <el-button type="primary" icon="el-icon-search" @click="changeKey()">搜索</el-button>
19 19
           </el-col>