SpaceOfCheng
/
admin
Watch 3
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 2 Activity
Browse Source

Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/admin into dev

zjxpcyc 6 years ago
parent
0c8403262e 660d32d08d
commit
5d28c2ab9d
24 changed files with 49 additions and 73 deletions
Split View Show Diff Stats
  1. 1
    1
      dist/index.html
  2. 1
    1
      src/components/breadCrumb/index.vue
  3. 1
    1
      src/pages/system/cardAndCouponManager/couponManager/edit.vue
  4. 3
    3
      src/pages/system/caseManager/caseInfo/pplConcerned/editPPLConcerned/index.vue
  5. 3
    3
      src/pages/system/caseManager/keyManager/index.vue
  6. 2
    2
      src/pages/system/caseManager/tagManager/add.vue
  7. 2
    2
      src/pages/system/caseManager/tagManager/edit.vue
  8. 2
    3
      src/pages/system/cmsManager/bannerManager/add.vue
  9. 2
    3
      src/pages/system/cmsManager/bannerManager/edit.vue
  10. 2
    3
      src/pages/system/cmsManager/indexMsg/add.vue
  11. 2
    3
      src/pages/system/cmsManager/indexMsg/edit.vue
  12. 2
    3
      src/pages/system/cmsManager/newsManager/add.vue
  13. 2
    3
      src/pages/system/cmsManager/newsManager/edit.vue
  14. 0
    27
      src/pages/system/courseManager/courseList/add.vue
  15. 1
    1
      src/pages/system/courseManager/courseList/index.vue
  16. 2
    2
      src/pages/system/dataStatistics/goodsOrderList/index.vue
  17. 1
    2
      src/pages/system/index.vue
  18. 3
    3
      src/pages/system/marketingActivities/addActivities/index.vue
  19. 3
    1
      src/store/app.js
  20. 4
    1
      src/store/cms/case.js
  21. 1
    1
      src/store/cms/index.js
  22. 3
    1
      src/store/course/course.js
  23. 4
    1
      src/style/main.css
  24. 2
    2
      src/util/api.js

+ 1
- 1
dist/index.html View File 

@@ -1 +1 @@
1 
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><title>城的空间后台管理系统</title><link href=./static/css/app.ddd3e8ee05b5a16ce2dc1b46b188c78d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.340c2242190d5ca52316.js></script><script type=text/javascript src=./static/js/app.b7544dd4ce21aa7a1107.js></script></body></html>
1 
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><title>城的空间后台管理系统</title><link href=./static/css/app.a03d347a86013325bcec60d2b4f33068.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.992319e39e0ff64940a3.js></script><script type=text/javascript src=./static/js/app.ec917e5733982a532bde.js></script></body></html>

+ 1
- 1
src/components/breadCrumb/index.vue View File 

@@ -3,7 +3,7 @@
3 3 
     <span>当前页面路径：</span>
4 4 
     <el-breadcrumb separator="/">
5 5 
       <el-breadcrumb-item v-for="(item,index) in list" :key="index">
6 
-        <router-link v-if="index==0" :to="{name:'',query:{}}">{{item.MenuName}}</router-link>
6 
+        <router-link v-if="index==0" :to="{name:item.Url,query:{}}">{{item.MenuName}}</router-link>
7 7 
         <router-link v-if="index!=0" :to="{name:item.Url,query:{}}">{{item.MenuName}}</router-link>
8 8 
       </el-breadcrumb-item>
9 9 
     </el-breadcrumb>

+ 1
- 1
src/pages/system/cardAndCouponManager/couponManager/edit.vue View File 

@@ -619,7 +619,7 @@ export default {
619 619 
           caseid: this.couponInfo.CaseId
620 620 
         }).then((res) => {
621 621 
           this.courseList = []
622 
-          for (var n = 0; n < res.list.length; n++) {
622 
+          for (var n = 0; n < (res.list || []).length; n++) {
623 623 
             this.courseList.push({ ...res.list[n], BeginDate: this.toolClass.dateFormat(res.list[n].BeginDate), EndDate: this.toolClass.dateFormat(res.list[n].EndDate) })
624 624 
           }
625 625 
           this.total = res.pagenum

+ 3
- 3
src/pages/system/caseManager/caseInfo/pplConcerned/editPPLConcerned/index.vue View File 

@@ -3,7 +3,7 @@
3 3 
     <form class="mainForm">
4 4 
       <ul>
5 5 
         <li class="flex-h">
6 
-          <span>用户类型：</span>
6 
+          <span>用户类型：<em>*</em></span>
7 7 
           <div class="flex-item">
8 8 
             <el-select v-model="postData.UserType" placeholder="请选择">
9 9 
               <el-option

@@ -16,7 +16,7 @@
16 16 
           </div>
17 17 
         </li>
18 18 
         <li class="flex-h">
19 
-          <span>用户姓名：</span>
19 
+          <span>用户姓名：<em>*</em></span>
20 20 
           <div class="flex-item">
21 21 
             <div style="width:50%">
22 22 
               <el-input

@@ -29,7 +29,7 @@
29 29 
           </div>
30 30 
         </li>
31 31 
         <li class="flex-h">
32 
-          <span>手机号码：</span>
32 
+          <span>手机号码：<em>*</em></span>
33 33 
           <div class="flex-item">
34 34 
             <div style="width:50%">
35 35 
               <el-input

+ 3
- 3
src/pages/system/caseManager/keyManager/index.vue View File 

@@ -196,9 +196,9 @@ export default {
196 196 
       this.getList()
197 197 
     },
198 198 
     getList () { // 获取列表
199 
-      if (this.postData.caseid === '') {
200 
-        this.postData.caseid = this.cases[0].CaseId
201 
-      }
199 
+      // if (this.postData.caseid === '') {
200 
+      //   this.postData.caseid = this.cases[0].CaseId
201 
+      // }
202 202 
       this.$ajax(this.$api.caseManager.getKeyList.url, {
203 203 
         method: this.$api.caseManager.getKeyList.method,
204 204 
         queryData: { ...this.postData, caseid: this.CaseId, num: this.lockNum }

+ 2
- 2
src/pages/system/caseManager/tagManager/add.vue View File 

@@ -3,7 +3,7 @@
3 3 
     <form class="mainForm">
4 4 
       <ul>
5 5 
         <li class="flex-h">
6 
-          <span>标签名称：</span>
6 
+          <span>标签名称：<em>*</em></span>
7 7 
           <div class="flex-item">
8 8 
             <div style="width:50%">
9 9 
               <el-input

@@ -15,7 +15,7 @@
15 15 
           </div>
16 16 
         </li>
17 17 
         <li class="flex-h">
18 
-          <!-- <span>选择案场：</span> -->
18 
+          <span>拥有案场权限：<em>*</em></span>
19 19 
           <div class="flex-item">
20 20 
             <div>
21 21 
               <el-checkbox-group v-model="checkedList" @change="handleCheckedCitiesChange">

+ 2
- 2
src/pages/system/caseManager/tagManager/edit.vue View File 

@@ -3,7 +3,7 @@
3 3 
     <form class="mainForm">
4 4 
       <ul>
5 5 
         <li class="flex-h">
6 
-          <span>标签名称：</span>
6 
+          <span>标签名称：<em>*</em></span>
7 7 
           <div class="flex-item">
8 8 
             <div style="width:50%">
9 9 
               <el-input

@@ -15,7 +15,7 @@
15 15 
           </div>
16 16 
         </li>
17 17 
         <li class="flex-h">
18 
-          <!-- <span>选择案场：</span> -->
18 
+          <span>拥有案场权限：<em>*</em></span>
19 19 
           <div class="flex-item">
20 20 
             <div>
21 21 
               <el-checkbox-group v-model="checkedList" @change="handleCheckedCitiesChange">

+ 2
- 3
src/pages/system/cmsManager/bannerManager/add.vue View File 

@@ -164,9 +164,8 @@ export default {
164 164 
           })
165 165 
           return false
166 166 
         } else {
167 
-          var strRegex = '^((https|http|ftp|rtsp|mms)://)?[a-z0-9A-Z]{3}\.[a-z0-9A-Z][a-z0-9A-Z]{0,61}?[a-z0-9A-Z]\.com|net|cn|cc (:s[0-9]{1-4})?/$'  // eslint-disable-line
168 
-          var re = new RegExp(strRegex)
169 
-          if (!re.test(this.postData.ForwardUrl)) {
167 
+          var strRegex = /^(ftp|https?)\:\/\/([\w\_\-]+)\.([\w\-]+[\.]?)*[\w]+\.[a-zA-Z]{2,10}(.*)/  // eslint-disable-line
168 
+          if (this.postData.ForwardUrl.match(strRegex) === null) {
170 169 
             this.$message({
171 170 
               message: '链接地址格式不正确',
172 171 
               type: 'error',

+ 2
- 3
src/pages/system/cmsManager/bannerManager/edit.vue View File 

@@ -153,9 +153,8 @@ export default {
153 153 
           })
154 154 
           return false
155 155 
         } else {
156 
-         var strRegex = '^((https|http|ftp|rtsp|mms)://)?[a-z0-9A-Z]{3}\.[a-z0-9A-Z][a-z0-9A-Z]{0,61}?[a-z0-9A-Z]\.com|net|cn|cc (:s[0-9]{1-4})?/$'  // eslint-disable-line
157 
-          var re = new RegExp(strRegex)
158 
-          if (!re.test(this.postData.ForwardUrl)) {
156 
+          var strRegex = /^(ftp|https?)\:\/\/([\w\_\-]+)\.([\w\-]+[\.]?)*[\w]+\.[a-zA-Z]{2,10}(.*)/  // eslint-disable-line
157 
+          if (this.postData.ForwardUrl.match(strRegex) === null) {
159 158 
             this.$message({
160 159 
               message: '链接地址格式不正确',
161 160 
               type: 'error',

+ 2
- 3
src/pages/system/cmsManager/indexMsg/add.vue View File 

@@ -109,9 +109,8 @@ export default {
109 109 
         //   })
110 110 
         //   return false
111 111 
         // }
112 
-        var strRegex = '^((https|http|ftp|rtsp|mms)://)?[a-z0-9A-Z]{3}\.[a-z0-9A-Z][a-z0-9A-Z]{0,61}?[a-z0-9A-Z]\.com|net|cn|cc (:s[0-9]{1-4})?/$'  // eslint-disable-line
113 
-        var re = new RegExp(strRegex)
114 
-        if (!re.test(this.postData.InfoUrl)) {
112 
+        var strRegex = /^(ftp|https?)\:\/\/([\w\_\-]+)\.([\w\-]+[\.]?)*[\w]+\.[a-zA-Z]{2,10}(.*)/  // eslint-disable-line
113 
+        if (this.postData.InfoUrl.match(strRegex) === null) {
115 114 
           this.$message({
116 115 
             message: '链接地址格式不正确',
117 116 
             type: 'error',

+ 2
- 3
src/pages/system/cmsManager/indexMsg/edit.vue View File 

@@ -105,9 +105,8 @@ export default {
105 105 
         //   })
106 106 
         //   return false
107 107 
         // }
108 
-        var strRegex = '^((https|http|ftp|rtsp|mms)://)?[a-z0-9A-Z]{3}\.[a-z0-9A-Z][a-z0-9A-Z]{0,61}?[a-z0-9A-Z]\.com|net|cn|cc (:s[0-9]{1-4})?/$'  // eslint-disable-line
109 
-        var re = new RegExp(strRegex)
110 
-        if (!re.test(this.postData.InfoUrl)) {
108 
+        var strRegex = /^(ftp|https?)\:\/\/([\w\_\-]+)\.([\w\-]+[\.]?)*[\w]+\.[a-zA-Z]{2,10}(.*)/  // eslint-disable-line
109 
+        if (this.postData.InfoUrl.match(strRegex) === null) {
111 110 
           this.$message({
112 111 
             message: '链接地址格式不正确',
113 112 
             type: 'error',

+ 2
- 3
src/pages/system/cmsManager/newsManager/add.vue View File 

@@ -169,9 +169,8 @@ export default {
169 169 
           //   })
170 170 
           //   return false
171 171 
           // }
172 
-          var strRegex = '^((https|http|ftp|rtsp|mms)://)?[a-z0-9A-Z]{3}\.[a-z0-9A-Z][a-z0-9A-Z]{0,61}?[a-z0-9A-Z]\.com|net|cn|cc (:s[0-9]{1-4})?/$'  // eslint-disable-line
173 
-          var re = new RegExp(strRegex)
174 
-          if (!re.test(this.postData.ForwardUrl)) {
172 
+          var strRegex = /^(ftp|https?)\:\/\/([\w\_\-]+)\.([\w\-]+[\.]?)*[\w]+\.[a-zA-Z]{2,10}(.*)/  // eslint-disable-line
173 
+          if (this.postData.ForwardUrl.match(strRegex) === null) {
175 174 
             this.$message({
176 175 
               message: '链接地址格式不正确',
177 176 
               type: 'error',

+ 2
- 3
src/pages/system/cmsManager/newsManager/edit.vue View File 

@@ -160,9 +160,8 @@ export default {
160 160 
           //   })
161 161 
           //   return false
162 162 
           // }
163 
-          var strRegex = '^((https|http|ftp|rtsp|mms)://)?[a-z0-9A-Z]{3}\.[a-z0-9A-Z][a-z0-9A-Z]{0,61}?[a-z0-9A-Z]\.com|net|cn|cc (:s[0-9]{1-4})?/$'  // eslint-disable-line
164 
-          var re = new RegExp(strRegex)
165 
-          if (!re.test(this.postData.ForwardUrl)) {
163 
+          var strRegex = /^(ftp|https?)\:\/\/([\w\_\-]+)\.([\w\-]+[\.]?)*[\w]+\.[a-zA-Z]{2,10}(.*)/  // eslint-disable-line
164 
+          if (this.postData.ForwardUrl.match(strRegex) === null) {
166 165 
             this.$message({
167 166 
               message: '链接地址格式不正确',
168 167 
               type: 'error',

+ 0
- 27
src/pages/system/courseManager/courseList/add.vue View File 

@@ -219,33 +219,6 @@ export default {
219 219 
   name: '',
220 220 
   data () {
221 221 
     return {
222 
-      // pickerOptions: {
223 
-      //   shortcuts: [{
224 
-      //     text: '最近一周',
225 
-      //     onClick (picker) {
226 
-      //       const end = new Date()
227 
-      //       const start = new Date()
228 
-      //       start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
229 
-      //       picker.$emit('pick', [start, end])
230 
-      //     }
231 
-      //   }, {
232 
-      //     text: '最近一个月',
233 
-      //     onClick (picker) {
234 
-      //       const end = new Date()
235 
-      //       const start = new Date()
236 
-      //       start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
237 
-      //       picker.$emit('pick', [start, end])
238 
-      //     }
239 
-      //   }, {
240 
-      //     text: '最近三个月',
241 
-      //     onClick (picker) {
242 
-      //       const end = new Date()
243 
-      //       const start = new Date()
244 
-      //       start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
245 
-      //       picker.$emit('pick', [start, end])
246 
-      //     }
247 
-      //   }]
248 
-      // },
249 222 
     }
250 223 
   },
251 224 
   computed: {

+ 1
- 1
src/pages/system/courseManager/courseList/index.vue View File 

@@ -245,7 +245,7 @@ export default {
245 245 
       centerDialogVisible: false, // 课程详情弹窗显隐
246 246 
       total: 0,
247 247 
       postData: { // 表格搜索条件
248 
-        caseid: '', // 案场id
248 
+        caseid: 'all', // 案场id
249 249 
         page: 1, // 当前页码
250 250 
         pagesize: 10, // 请求数据量
251 251 
         typeid: '', // 课程类型

+ 2
- 2
src/pages/system/dataStatistics/goodsOrderList/index.vue View File 

@@ -76,7 +76,7 @@
76 76 
           </div>
77 77 
         </td>
78 78 
         <td v-if="index%2 !== 0" colspan="4" class="noborder">
79 
-          <span v-for="(subItem,subIndex) in returnListItem(goodsOrderList, index).Details" :key="subIndex">{{subItem.GoodsName}}（{{subItem.SpecName}}）</span>
79 
+          <span v-for="(subItem,subIndex) in returnListItem(goodsOrderList, index).Details" :key="subIndex">{{subItem.GoodsName}}<span v-if="subItem.SpecName">（{{subItem.SpecName}}）</span></span>
80 80 
         </td>
81 81 
         <td v-if="index%2 !== 0" colspan="1" class="noborder">
82 82 
           <span v-for="(subItem,subIndex) in returnListItem(goodsOrderList, index).Details" :key="subIndex">x{{subItem.Number}}</span>

@@ -236,7 +236,7 @@ export default {
236 236 
       this.getGoodsOrderList(this.postData).then((res) => {
237 237 
         // console.log(JSON.stringify(res))
238 238 
         this.postData.page = res.page
239 
-        this.total = res.total
239 
+        this.total = res.pagenum
240 240 
       })
241 241 
     },
242 242 
     printPdf (cl) {

+ 1
- 2
src/pages/system/index.vue View File 

@@ -79,8 +79,7 @@ export default {
79 79 
     siderBar,
80 80 
   },
81 81 
   created () {
82 
-    this.updateSystemInfo()
83 
-    this.updateBread({ routerData, Url: this.$route.name })
82 
+    this.updateSystemInfo().then(() => this.updateBread({ routerData, Url: this.$route.name }))
84 83 
   },
85 84 
   methods: {
86 85 
     submitPasswd () { // 修改密码

+ 3
- 3
src/pages/system/marketingActivities/addActivities/index.vue View File 

@@ -95,7 +95,7 @@ export default {
95 95 
       activityName: '', // 活动名称
96 96 
       activityType: this.regValue, // 活动类型
97 97 
       resourceDesc: '', // 存储JSON (赠券类型,赠送数量,活动描述)
98 
-      giftNum: 0, // 赠送数量
98 
+      giftNum: '', // 赠送数量
99 99 
       desc: '', // 活动描述
100 100 
       giftList: [] // 赠券卡券数据体
101 101 
     }
 
@@ -149,10 +149,10 @@ export default {
149 149 
         })
150 150 
         return false
151 151 
       }
152 
-      if (this.giftNum === 0) {
152 
+      if (this.giftNum - 0 < 1 && (this.giftNum - 0) % 1 !== 0) {
153 153 
         this.$message({
154 154 
           type: 'error',
155 
-          message: '赠券数量不能为0'
155 
+          message: '赠券数量须为大于0正整数'
156 156 
         })
157 157 
         return false
158 158 
       }

+ 3
- 1
src/store/app.js View File 

@@ -85,13 +85,15 @@ export default {
85 85 
       // 扁平 routerData
86 86 
       // 同时构造出 含有 title 的 parent 数据
87 87 
       const routeList = flatten([], routerData[1].children, state.menusRaw)
88 
-      // console.log(state, routerData[1].children, routeList)
88 
+      // console.log(routerData[1].children, state.menusRaw)
89 89
90 90 
       // 过滤出与 name 相同的 route 节点
91 91 
       const currentRoute = routeList.filter(x => x.Url === Url)[0]
92 
+      // console.log(currentRoute)
92 93
93 94 
       // 获取 面包屑
94 95 
       if (currentRoute) state.breadcrumb = currentRoute.parent.slice(1).concat(currentRoute)
96 
+      // console.log(state.breadcrumb)
95 97 
     }
96 98 
   },
97 99 
   actions: {

+ 4
- 1
src/store/cms/case.js View File 

@@ -47,7 +47,10 @@ export default {
47 47 
       })
48 48 
     },
49 49 
     SetNull ({ commit }) {
50 
-      commit('init', {})
50 
+      commit('init', {
51 
+        IsAllCourse: 1,
52 
+        Status: 0,
53 
+      })
51 54 
     },
52 55 
     UpdateInfo ({ commit }, payload) {
53 56 
       commit('init', payload)

+ 1
- 1
src/store/cms/index.js View File 

@@ -21,7 +21,7 @@ export default {
21 21 
         ajax(api.cms.location.url, {
22 22 
           method: api.cms.location.method,
23 23 
           queryData: {
24 
-            issys: payload && payload.issys ? payload.issys : 0
24 
+            ...payload,
25 25 
           }
26 26 
         }).then(res => {
27 27 
           commit('init', res)

+ 3
- 1
src/store/course/course.js View File 

@@ -6,7 +6,9 @@ export default {
6 6 
   state: {
7 7 
     courseList: [],
8 8 
     courseLister: [],
9 
-    courseInfo: {},
9 
+    courseInfo: {
10 
+      IsSelect: 0,
11 
+    },
10 12 
     courseImgs: [],
11 13 
   },
12 14 
   mutations: {

+ 4
- 1
src/style/main.css View File 

@@ -404,7 +404,10 @@ select:focus {
404 404 
   text-overflow: initial !important;
405 405 
 }
406 406
407 
-
407 
+.el-breadcrumb__item:last-child .el-breadcrumb__inner a{
408 
+  font-weight: 700 !important;
409 
+  color: #ccc;
410 
+}
408 411
409 412
410 413

+ 2
- 2
src/util/api.js View File 

@@ -1,5 +1,5 @@
1 
-const baseUrl = '/api-v2'
2 
-// const baseUrl = '/api'
1 
+// const baseUrl = '/api-v2'
2 
+const baseUrl = '/api'
3 3 
 const common = '/common/:org'
4 4 
 const guest = '/guest/:org'
5 5