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

xcx

许成详 6 years ago
parent
5b9fe5d262
commit
9aa66f0f1c
13 changed files with 63 additions and 42 deletions
Unified View Show Diff Stats
  1. 2
    2
      config/index.js
  2. 1
    1
      dist/index.html
  3. 1
    1
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  4. 2
    13
      src/pages/system/cardAndCouponManager/cardManager/edit.vue
  5. 8
    7
      src/pages/system/cardAndCouponManager/couponManager/edit.vue
  6. 21
    13
      src/pages/system/caseManager/keyManager/index.vue
  7. 1
    1
      src/pages/system/cmsManager/bannerManager/add.vue
  8. 1
    1
      src/pages/system/cmsManager/bannerManager/edit.vue
  9. 3
    1
      src/pages/system/dashboard/index.vue
  10. 1
    1
      src/pages/system/verificationManager/phoneVerification/verificationList/index.vue
  11. 1
    1
      src/pages/system/verificationManager/qrcodeVerification/verificationList/index.vue
  12. 17
    0
      src/store/course/course.js
  13. 4
    0
      src/util/api.js

+ 2
- 2
config/index.js View File

12 
     proxyTable: {
 12 
     proxyTable: {
13 
       '/api': {
 13 
       '/api': {
14 
         // target: 'https://dp.huiju360.com.cn/hj_operations',
 14 
         // target: 'https://dp.huiju360.com.cn/hj_operations',
15 
-        // target: 'http://192.168.0.62:8080', //wf
15 
+        target: 'http://192.168.0.62:8080', //wf
16 
         // target: 'http://127.0.0.1:8080',
16 
         // target: 'http://127.0.0.1:8080',
17 
-        target: 'http://localhost:8080', //wf
17 
+        // target: 'http://localhost:8080', //wf
18 
         // target: 'http://192.168.0.11', //ys
 18 
         // target: 'http://192.168.0.11', //ys
19 
         // target: 'http://192.168.0.125:8080', //hyq
 19 
         // target: 'http://192.168.0.125:8080', //hyq
20 
         // target: 'http://dev.ycjcjy.com/', //frp
 20 
         // target: 'http://dev.ycjcjy.com/', //frp

+ 1
- 1
dist/index.html View File

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.3a28dbe108f6c677184da1640ee30ce6.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.04dcff85bd566e5cd631.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.a850e1bbc151e0cbebd3056e3c62c6e5.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.796889f82dfcb1df1494.js></script></body></html>

+ 1
- 1
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map View File

1 
-{"version":3,"sources":["webpack:///webpack/bootstrap 93603b774f6cc31b9ae9"],"names":["parentJsonpFunction","window","chunkIds","moreModules","executeModules","moduleId","chunkId","result","i","resolves","length","installedChunks","push","Object","prototype","hasOwnProperty","call","modules","shift","__webpack_require__","s","installedModules","2","exports","module","l","m","c","d","name","getter","o","defineProperty","configurable","enumerable","get","n","__esModule","object","property","p","oe","err","console","error"],"mappings":"aACA,IAAAA,EAAAC,OAAA,aACAA,OAAA,sBAAAC,EAAAC,EAAAC,GAIA,IADA,IAAAC,EAAAC,EAAAC,EAAAC,EAAA,EAAAC,KACQD,EAAAN,EAAAQ,OAAoBF,IAC5BF,EAAAJ,EAAAM,GACAG,EAAAL,IACAG,EAAAG,KAAAD,EAAAL,GAAA,IAEAK,EAAAL,GAAA,EAEA,IAAAD,KAAAF,EACAU,OAAAC,UAAAC,eAAAC,KAAAb,EAAAE,KACAY,EAAAZ,GAAAF,EAAAE,IAIA,IADAL,KAAAE,EAAAC,EAAAC,GACAK,EAAAC,QACAD,EAAAS,OAAAT,GAEA,GAAAL,EACA,IAAAI,EAAA,EAAYA,EAAAJ,EAAAM,OAA2BF,IACvCD,EAAAY,IAAAC,EAAAhB,EAAAI,IAGA,OAAAD,GAIA,IAAAc,KAGAV,GACAW,EAAA,GAIA,SAAAH,EAAAd,GAGA,GAAAgB,EAAAhB,GACA,OAAAgB,EAAAhB,GAAAkB,QAGA,IAAAC,EAAAH,EAAAhB,IACAG,EAAAH,EACAoB,GAAA,EACAF,YAUA,OANAN,EAAAZ,GAAAW,KAAAQ,EAAAD,QAAAC,IAAAD,QAAAJ,GAGAK,EAAAC,GAAA,EAGAD,EAAAD,QAKAJ,EAAAO,EAAAT,EAGAE,EAAAQ,EAAAN,EAGAF,EAAAS,EAAA,SAAAL,EAAAM,EAAAC,GACAX,EAAAY,EAAAR,EAAAM,IACAhB,OAAAmB,eAAAT,EAAAM,GACAI,cAAA,EACAC,YAAA,EACAC,IAAAL,KAMAX,EAAAiB,EAAA,SAAAZ,GACA,IAAAM,EAAAN,KAAAa,WACA,WAA2B,OAAAb,EAAA,SAC3B,WAAiC,OAAAA,GAEjC,OADAL,EAAAS,EAAAE,EAAA,IAAAA,GACAA,GAIAX,EAAAY,EAAA,SAAAO,EAAAC,GAAsD,OAAA1B,OAAAC,UAAAC,eAAAC,KAAAsB,EAAAC,IAGtDpB,EAAAqB,EAAA,KAGArB,EAAAsB,GAAA,SAAAC,GAA8D,MAApBC,QAAAC,MAAAF,GAAoBA","file":"static/js/manifest.3ad1d5771e9b13dbdad2.js","sourcesContent":[" \t// install a JSONP callback for chunk loading\n \tvar parentJsonpFunction = window[\"webpackJsonp\"];\n \twindow[\"webpackJsonp\"] = function webpackJsonpCallback(chunkIds, moreModules, executeModules) {\n \t\t// add \"moreModules\" to the modules object,\n \t\t// then flag all \"chunkIds\" as loaded and fire callback\n \t\tvar moduleId, chunkId, i = 0, resolves = [], result;\n \t\tfor(;i < chunkIds.length; i++) {\n \t\t\tchunkId = chunkIds[i];\n \t\t\tif(installedChunks[chunkId]) {\n \t\t\t\tresolves.push(installedChunks[chunkId][0]);\n \t\t\t}\n \t\t\tinstalledChunks[chunkId] = 0;\n \t\t}\n \t\tfor(moduleId in moreModules) {\n \t\t\tif(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {\n \t\t\t\tmodules[moduleId] = moreModules[moduleId];\n \t\t\t}\n \t\t}\n \t\tif(parentJsonpFunction) parentJsonpFunction(chunkIds, moreModules, executeModules);\n \t\twhile(resolves.length) {\n \t\t\tresolves.shift()();\n \t\t}\n \t\tif(executeModules) {\n \t\t\tfor(i=0; i < executeModules.length; i++) {\n \t\t\t\tresult = __webpack_require__(__webpack_require__.s = executeModules[i]);\n \t\t\t}\n \t\t}\n \t\treturn result;\n \t};\n\n \t// The module cache\n \tvar installedModules = {};\n\n \t// objects to store loaded and loading chunks\n \tvar installedChunks = {\n \t\t2: 0\n \t};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"./\";\n\n \t// on error function for async loading\n \t__webpack_require__.oe = function(err) { console.error(err); throw err; };\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 93603b774f6cc31b9ae9"],"sourceRoot":""}
1 
+{"version":3,"sources":["webpack:///webpack/bootstrap 54812fbeda491d145170"],"names":["parentJsonpFunction","window","chunkIds","moreModules","executeModules","moduleId","chunkId","result","i","resolves","length","installedChunks","push","Object","prototype","hasOwnProperty","call","modules","shift","__webpack_require__","s","installedModules","2","exports","module","l","m","c","d","name","getter","o","defineProperty","configurable","enumerable","get","n","__esModule","object","property","p","oe","err","console","error"],"mappings":"aACA,IAAAA,EAAAC,OAAA,aACAA,OAAA,sBAAAC,EAAAC,EAAAC,GAIA,IADA,IAAAC,EAAAC,EAAAC,EAAAC,EAAA,EAAAC,KACQD,EAAAN,EAAAQ,OAAoBF,IAC5BF,EAAAJ,EAAAM,GACAG,EAAAL,IACAG,EAAAG,KAAAD,EAAAL,GAAA,IAEAK,EAAAL,GAAA,EAEA,IAAAD,KAAAF,EACAU,OAAAC,UAAAC,eAAAC,KAAAb,EAAAE,KACAY,EAAAZ,GAAAF,EAAAE,IAIA,IADAL,KAAAE,EAAAC,EAAAC,GACAK,EAAAC,QACAD,EAAAS,OAAAT,GAEA,GAAAL,EACA,IAAAI,EAAA,EAAYA,EAAAJ,EAAAM,OAA2BF,IACvCD,EAAAY,IAAAC,EAAAhB,EAAAI,IAGA,OAAAD,GAIA,IAAAc,KAGAV,GACAW,EAAA,GAIA,SAAAH,EAAAd,GAGA,GAAAgB,EAAAhB,GACA,OAAAgB,EAAAhB,GAAAkB,QAGA,IAAAC,EAAAH,EAAAhB,IACAG,EAAAH,EACAoB,GAAA,EACAF,YAUA,OANAN,EAAAZ,GAAAW,KAAAQ,EAAAD,QAAAC,IAAAD,QAAAJ,GAGAK,EAAAC,GAAA,EAGAD,EAAAD,QAKAJ,EAAAO,EAAAT,EAGAE,EAAAQ,EAAAN,EAGAF,EAAAS,EAAA,SAAAL,EAAAM,EAAAC,GACAX,EAAAY,EAAAR,EAAAM,IACAhB,OAAAmB,eAAAT,EAAAM,GACAI,cAAA,EACAC,YAAA,EACAC,IAAAL,KAMAX,EAAAiB,EAAA,SAAAZ,GACA,IAAAM,EAAAN,KAAAa,WACA,WAA2B,OAAAb,EAAA,SAC3B,WAAiC,OAAAA,GAEjC,OADAL,EAAAS,EAAAE,EAAA,IAAAA,GACAA,GAIAX,EAAAY,EAAA,SAAAO,EAAAC,GAAsD,OAAA1B,OAAAC,UAAAC,eAAAC,KAAAsB,EAAAC,IAGtDpB,EAAAqB,EAAA,KAGArB,EAAAsB,GAAA,SAAAC,GAA8D,MAApBC,QAAAC,MAAAF,GAAoBA","file":"static/js/manifest.3ad1d5771e9b13dbdad2.js","sourcesContent":[" \t// install a JSONP callback for chunk loading\n \tvar parentJsonpFunction = window[\"webpackJsonp\"];\n \twindow[\"webpackJsonp\"] = function webpackJsonpCallback(chunkIds, moreModules, executeModules) {\n \t\t// add \"moreModules\" to the modules object,\n \t\t// then flag all \"chunkIds\" as loaded and fire callback\n \t\tvar moduleId, chunkId, i = 0, resolves = [], result;\n \t\tfor(;i < chunkIds.length; i++) {\n \t\t\tchunkId = chunkIds[i];\n \t\t\tif(installedChunks[chunkId]) {\n \t\t\t\tresolves.push(installedChunks[chunkId][0]);\n \t\t\t}\n \t\t\tinstalledChunks[chunkId] = 0;\n \t\t}\n \t\tfor(moduleId in moreModules) {\n \t\t\tif(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {\n \t\t\t\tmodules[moduleId] = moreModules[moduleId];\n \t\t\t}\n \t\t}\n \t\tif(parentJsonpFunction) parentJsonpFunction(chunkIds, moreModules, executeModules);\n \t\twhile(resolves.length) {\n \t\t\tresolves.shift()();\n \t\t}\n \t\tif(executeModules) {\n \t\t\tfor(i=0; i < executeModules.length; i++) {\n \t\t\t\tresult = __webpack_require__(__webpack_require__.s = executeModules[i]);\n \t\t\t}\n \t\t}\n \t\treturn result;\n \t};\n\n \t// The module cache\n \tvar installedModules = {};\n\n \t// objects to store loaded and loading chunks\n \tvar installedChunks = {\n \t\t2: 0\n \t};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"./\";\n\n \t// on error function for async loading\n \t__webpack_require__.oe = function(err) { console.error(err); throw err; };\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 54812fbeda491d145170"],"sourceRoot":""}

+ 2
- 13
src/pages/system/cardAndCouponManager/cardManager/edit.vue View File

284 
       defaultCaseId: x => x.app.cases.default,
284 
       defaultCaseId: x => x.app.cases.default,
285 
       OrgId: x => x.app.user.OrgId,
285 
       OrgId: x => x.app.user.OrgId,
286 
     }),
286 
     }),
287 
-    // pickerOptions () {
288 
-    //   const courseId = this.cardInfo.Targets[0].TargetId
289 
-    //   const couse = (this.courseList || []).filter(x => x.CourseId === courseId)[0] || {}
290 
-    //   const beginDate = new Date(couse.BeginDate).getTime()
291 
-    //   const endDate = new Date(couse.EndDate).getTime()
292 
-    //   return {
293 
-    //     disabledDate (time) {
294 
-    //       return time.getTime() < beginDate || time.getTime() > endDate
295 
-    //     }
296 
-    //   }
297 
-    // },
298 
     CaseId: {
287 
     CaseId: {
299 
       get () {
288 
       get () {
300 
         return this.postData.caseid || this.defaultCaseId
289 
         return this.postData.caseid || this.defaultCaseId
311 
       'editCard',
300 
       'editCard',
312 
     ]),
301 
     ]),
313 
     ...mapCourseActions([
302 
     ...mapCourseActions([
314 
-      'GetCourseList',
303 
+      'getCourseLister',
315 
     ]),
304 
     ]),
316 
     ...mapChannelActions([
305 
     ...mapChannelActions([
317 
       'GetChannelListList',
306 
       'GetChannelListList',
322 
         page: 1,
311 
         page: 1,
323 
         pagesize: 10000
312 
         pagesize: 10000
324 
       })
313 
       })
325 
-      this.GetCourseList({
314 
+      this.getCourseLister({
326 
         caseid: this.cardInfo.CaseId,
315 
         caseid: this.cardInfo.CaseId,
327 
         page: 1,
316 
         page: 1,
328 
         pagesize: 10000
317 
         pagesize: 10000

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

307 
         <div v-if="couponInfo.CouponType === 'course'">
307 
         <div v-if="couponInfo.CouponType === 'course'">
308 
           <el-table
308 
           <el-table
309 
             ref="multipleTable"
309 
             ref="multipleTable"
310 
-            :data="courseList.list"
310 
+            :data="courseList"
311 
             tooltip-effect="dark"
311 
             tooltip-effect="dark"
312 
             style="width: 100%"
312 
             style="width: 100%"
313 
             @selection-change="handleCourseChange">
313 
             @selection-change="handleCourseChange">
316 
             </el-table-column>
316 
             </el-table-column>
317 
             <el-table-column
317 
             <el-table-column
318 
               prop="CourseName"
318 
               prop="CourseName"
319 
-              label="商品名称">
319 
+              label="课程名称">
320 
             </el-table-column>
320 
             </el-table-column>
321 
             <el-table-column
321 
             <el-table-column
322 
               prop="BeginDate"
322 
               prop="BeginDate"
333 
               </template>
333 
               </template>
334 
             </el-table-column>
334 
             </el-table-column>
335 
             <el-table-column
335 
             <el-table-column
336 
-              prop="CourseType"
336 
+              prop="LocationId"
337 
               label="类别">
337 
               label="类别">
338 
             </el-table-column>
338 
             </el-table-column>
339 
             <el-table-column
339 
             <el-table-column
453 
       goodsTypes: x => x.goodsTypes.list,
453 
       goodsTypes: x => x.goodsTypes.list,
454 
     }),
454 
     }),
455 
     ...mapCourseState({
455 
     ...mapCourseState({
456 
-      courseList: x => x.courseList,
456 
+      courseList: x => x.courseLister,
457 
     }),
457 
     }),
458 
     CaseId: {
458 
     CaseId: {
459 
       get () {
459 
       get () {
478 
       'GetChannelListList',
478 
       'GetChannelListList',
479 
     ]),
479 
     ]),
480 
     ...mapCourseActions([
480 
     ...mapCourseActions([
481 
-      'GetCourseList',
481 
+      'getCourseLister',
482 
     ]),
482 
     ]),
483 
     returnGoodsType (val) {
483 
     returnGoodsType (val) {
484 
       for (var n = 0; n < this.goodsTypes.length; n++) {
484 
       for (var n = 0; n < this.goodsTypes.length; n++) {
578 
           this.centerDialogVisible = true
578 
           this.centerDialogVisible = true
579 
         })
579 
         })
580 
       } else if (this.couponInfo.CouponType === 'course') {
580 
       } else if (this.couponInfo.CouponType === 'course') {
581 
-        this.GetCourseList({
581 
+        this.getCourseLister({
582 
           ...this.postData,
582 
           ...this.postData,
583 
           caseid: this.couponInfo.CaseId
583 
           caseid: this.couponInfo.CaseId
584 
         }).then((res) => {
584 
         }).then((res) => {
585 
           this.total = res.pagenum
585 
           this.total = res.pagenum
586 
           this.centerDialogVisible = true
586 
           this.centerDialogVisible = true
587 
+          console.log(JSON.stringify(this.courseList))
587 
         })
588 
         })
588 
       }
589 
       }
589 
     },
590 
     },
748 
           this.total = res.pagenum
749 
           this.total = res.pagenum
749 
         })
750 
         })
750 
       } else if (this.couponInfo.CouponType === 'course') {
751 
       } else if (this.couponInfo.CouponType === 'course') {
751 
-        this.GetCourseList({
752 
+        this.getCourseLister({
752 
           ...this.postData,
753 
           ...this.postData,
753 
           caseid: this.couponInfo.CaseId
754 
           caseid: this.couponInfo.CaseId
754 
         }).then((res) => {
755 
         }).then((res) => {

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

78 
     </el-pagination>
78 
     </el-pagination>
79 
     <el-dialog title="钥匙绑定" :visible.sync="dialogTableVisible">
79 
     <el-dialog title="钥匙绑定" :visible.sync="dialogTableVisible">
80 
       <ul class="cutBindType">
80 
       <ul class="cutBindType">
81 
-        <li :class="{'active':cutBindType==0}" @click="showCardList = false; bindPhone = ''; cutBindType = 0">扫码绑定</li>
81 
+        <!-- <li :class="{'active':cutBindType==0}" @click="showCardList = false; bindPhone = ''; cutBindType = 0">扫码绑定</li> -->
82 
         <li :class="{'active':cutBindType==1}" @click="showCardList = false; bindPhone = ''; cutBindType = 1">手机号绑定</li>
82 
         <li :class="{'active':cutBindType==1}" @click="showCardList = false; bindPhone = ''; cutBindType = 1">手机号绑定</li>
83 
       </ul>
83 
       </ul>
84 
       <ul class="cutBody">
84 
       <ul class="cutBody">
85 
-        <li :hidden="cutBindType==1">
85 
+        <!-- <li :hidden="cutBindType==1">
86 
           <div class="flex-h" v-if="!showCardList">
86 
           <div class="flex-h" v-if="!showCardList">
87 
             <div class="flex-item">
87 
             <div class="flex-item">
88 
               <el-input
88 
               <el-input
93 
             </div>
93 
             </div>
94 
             <el-button type="success" size="mini">确定</el-button>
94 
             <el-button type="success" size="mini">确定</el-button>
95 
           </div>
95 
           </div>
96 
-        </li>
96 
+        </li> -->
97 
         <li :hidden="cutBindType==0">
97 
         <li :hidden="cutBindType==0">
98 
           <div class="flex-h" v-if="!showCardList">
98 
           <div class="flex-h" v-if="!showCardList">
99 
             <div class="flex-item">
99 
             <div class="flex-item">
167 
       this.$router.push({ name: 'addKey' })
167 
       this.$router.push({ name: 'addKey' })
168 
     },
168 
     },
169 
     sureBindPhone () { // 确认绑定手机号
169 
     sureBindPhone () { // 确认绑定手机号
170 
-      this.bindKeyByPhone({
171 
-        phone: this.bindPhone,
172 
-        keyid: this.currentItem.KeyId
173 
-      }).then((res) => {
170 
+      if (this.bindPhone !== '') {
171 
+        this.bindKeyByPhone({
172 
+          phone: this.bindPhone,
173 
+          keyid: this.currentItem.KeyId
174 
+        }).then((res) => {
175 
+          this.$message({
176 
+            message: '操作成功',
177 
+            type: 'success'
178 
+          })
179 
+          this.dialogTableVisible = false
180 
+          this.bindPhone = ''
181 
+          this.getList()
182 
+        })
183 
+      } else {
174 
         this.$message({
184 
         this.$message({
175 
-          message: '操作成功',
176 
-          type: 'success'
185 
+          type: 'error',
186 
+          message: '请输入手机号'
177 
         })
187 
         })
178 
-        this.dialogTableVisible = false
179 
-        this.bindPhone = ''
180 
-        this.getList()
181 
-      })
188 
+      }
182 
     },
189 
     },
183 
     search () { // 搜索
190 
     search () { // 搜索
184 
       this.postData.page = 1
191 
       this.postData.page = 1
219 
             type: 'success',
226 
             type: 'success',
220 
             message: '解绑成功!'
227 
             message: '解绑成功!'
221 
           })
228 
           })
229 
+          this.bindPhone = ''
222 
           this.getList()
230 
           this.getList()
223 
         })
231 
         })
224 
       }).catch(() => {
232 
       }).catch(() => {

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

164 
           })
164 
           })
165 
           return false
165 
           return false
166 
         } else {
166 
         } else {
167 
-          var reg = /http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w- .\/?%&=]*)?/  // eslint-disable-line
167 
+          var reg = /[A-Za-z0-9-_]+\\.[A-Za-z0-9-_%&\?\/.=]+$/  // eslint-disable-line
168 
           if (!reg.test(this.postData.ForwardUrl)) {
168 
           if (!reg.test(this.postData.ForwardUrl)) {
169 
             this.$message({
169 
             this.$message({
170 
               message: '链接地址格式不正确',
170 
               message: '链接地址格式不正确',

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

153 
           })
153 
           })
154 
           return false
154 
           return false
155 
         } else {
155 
         } else {
156 
-          var reg = /http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w- .\/?%&=]*)?/  // eslint-disable-line
156 
+          var reg = /[A-Za-z0-9-_]+\\.[A-Za-z0-9-_%&\?\/.=]+$/  // eslint-disable-line
157 
           if (!reg.test(this.postData.ForwardUrl)) {
157 
           if (!reg.test(this.postData.ForwardUrl)) {
158 
             this.$message({
158 
             this.$message({
159 
               message: '链接地址格式不正确',
159 
               message: '链接地址格式不正确',

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

94 
     }),
94 
     }),
95 
     CaseId: {
95 
     CaseId: {
96 
       get () {
96 
       get () {
97 
-        return this.postData.caseid || this.defaultCaseId || this.cases[0].CaseId
97 
+        return this.postData.caseid || this.defaultCaseId
98 
       },
98 
       },
99 
       set (val) {
99 
       set (val) {
100 
         this.postData.caseid = val
100 
         this.postData.caseid = val
103 
   },
103 
   },
104 
   mounted () {
104 
   mounted () {
105 
     this.$nextTick(function () {
105 
     this.$nextTick(function () {
106 
+      console.log(this.defaultCaseId)
107 
+      console.log(JSON.stringify(this.cases))
106 
       this.postData.caseid = this.postData.caseid || this.cases[0].CaseId
108 
       this.postData.caseid = this.postData.caseid || this.cases[0].CaseId
107 
       this.getDashboardData({
109 
       this.getDashboardData({
108 
         caseid: this.postData.caseid
110 
         caseid: this.postData.caseid

+ 1
- 1
src/pages/system/verificationManager/phoneVerification/verificationList/index.vue View File

75 
             :total="courses.pagenum">
75 
             :total="courses.pagenum">
76 
           </el-pagination>
76 
           </el-pagination>
77 
         </div>
77 
         </div>
78 
-        <span class="noData" v-else>查不到当前信息，请核对手机号或详情</span>
78 
+        <span class="noData" v-else>查不到当前课程信息，请核对手机号或课程详情</span>
79 
       </div>
79 
       </div>
80 
     </div>
80 
     </div>
81 
     <el-dialog
81 
     <el-dialog

+ 1
- 1
src/pages/system/verificationManager/qrcodeVerification/verificationList/index.vue View File

56 
               </el-table-column>
56 
               </el-table-column>
57 
             </el-table>
57 
             </el-table>
58 
         </div>
58 
         </div>
59 
-        <span class="noData" v-else>查不到当前信息，请核对二维码或详情</span>
59 
+        <span class="noData" v-else>查不到当前课程信息，请核对二维码或课程详情</span>
60 
       </div>
60 
       </div>
61 
     </div>
61 
     </div>
62 
     <el-dialog
62 
     <el-dialog

+ 17
- 0
src/store/course/course.js View File

5 
   namespaced: true,
 5 
   namespaced: true,
6 
   state: {
 6 
   state: {
7 
     courseList: [],
 7 
     courseList: [],
8 
+    courseLister: [],
8 
     courseInfo: {},
 9 
     courseInfo: {},
9 
     courseImgs: [],
 10 
     courseImgs: [],
10 
   },
 11 
   },
12 
     updateList (state, payload) {
 13 
     updateList (state, payload) {
13 
       state.courseList = payload || []
 14 
       state.courseList = payload || []
14 
     },
 15 
     },
16 
+    updateLister (state, payload) {
17 
+      state.courseLister = payload.list || []
18 
+    },
15 
     updateInfo (state, payload) {
 19 
     updateInfo (state, payload) {
16 
       state.courseInfo = payload || {}
 20 
       state.courseInfo = payload || {}
17 
     },
 21 
     },
20 
     }
 24 
     }
21 
   },
 25 
   },
22 
   actions: {
 26 
   actions: {
27 
+    getCourseLister ({ commit }, payload) {
28 
+      return new Promise((resolve, reject) => {
29 
+        ajax(api.course.getCourseList.url, {
30 
+          method: api.course.getCourseList.method,
31 
+          queryData: {
32 
+            ...payload,
33 
+          }
34 
+        }).then(res => {
35 
+          commit('updateLister', res)
36 
+          resolve(res)
37 
+        }).catch(reject)
38 
+      })
39 
+    },
23 
     GetCourseList ({ commit }, payload) {
 40 
     GetCourseList ({ commit }, payload) {
24 
       return new Promise((resolve, reject) => {
 41 
       return new Promise((resolve, reject) => {
25 
         ajax(api.course.list.url, {
 42 
         ajax(api.course.list.url, {

+ 4
- 0
src/util/api.js View File

479 
     },
479 
     },
480 
   },
480 
   },
481 
   course: {
481 
   course: {
482 
+    getCourseList: {
483 
+      method: 'get',
484 
+      url: `${baseUrl}${common}/courseues`
485 
+    },
482 
     list: {
486 
     list: {
483 
       method: 'get',
487 
       method: 'get',
484 
       url: `${baseUrl}${common}/course`
488 
       url: `${baseUrl}${common}/course`