SpaceOfCheng
/
admin
關注 3
收藏 0
複製 0
程式碼 問題 0 合併請求 0 版本發佈 2 活動
瀏覽代碼

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

wangfei 6 年之前
父節點
4e509dd132 97a5a8e979
當前提交
19584566e0
共有 31 個檔案被更改，包括 170 行新增 和 158 行删除
分割檢視 顯示文件統計
  1. 2
    2
      config/index.js
  2. 1
    1
      dist/index.html
  3. 5
    3
      src/pages/system/cardAndCouponManager/bodyBuildingCardManager/index.vue
  4. 8
    8
      src/pages/system/cardAndCouponManager/cardManager/edit.vue
  5. 5
    3
      src/pages/system/cardAndCouponManager/cardManager/index.vue
  6. 9
    9
      src/pages/system/cardAndCouponManager/couponManager/edit.vue
  7. 2
    1
      src/pages/system/cardAndCouponManager/couponManager/index.vue
  8. 2
    1
      src/pages/system/cardAndCouponManager/givingRecords.vue
  9. 3
    2
      src/pages/system/cardAndCouponManager/vipManager/index.vue
  10. 47
    50
      src/pages/system/caseManager/signinManager/index.vue
  11. 8
    4
      src/pages/system/cmsManager/majorProjects/edit.vue
  12. 1
    1
      src/pages/system/cmsManager/majorProjects/index.vue
  13. 4
    2
      src/pages/system/courseManager/courseList/index.vue
  14. 2
    25
      src/pages/system/courseManager/scheduleManager/index.vue
  15. 2
    2
      src/pages/system/dataStatistics/cardCouponUsedList/index.vue
  16. 3
    3
      src/pages/system/dataStatistics/courseOrderList/index.vue
  17. 2
    2
      src/pages/system/dataStatistics/courseStatisticsList/index.vue
  18. 4
    4
      src/pages/system/dataStatistics/courseVerifyList/index.vue
  19. 1
    1
      src/pages/system/dataStatistics/frontEndUserList/index.vue
  20. 1
    1
      src/pages/system/healthManager/healthRecord/index.vue
  21. 6
    2
      src/pages/system/index.vue
  22. 2
    2
      src/pages/system/luckyDrawManager/luckyDrawList/index.vue
  23. 1
    1
      src/pages/system/luckyDrawManager/luckyDrawShareList/index.vue
  24. 39
    19
      src/pages/system/newOrder/newOrderList/index.vue
  25. 1
    1
      src/pages/system/systemSet/roleManager/index.vue
  26. 1
    1
      src/pages/system/verificationManager/drawVerification/verificationList/index.vue
  27. 2
    2
      src/pages/system/verificationManager/phoneVerification/verificationList/index.vue
  28. 2
    2
      src/pages/system/verificationManager/qrcodeVerification/verificationList/index.vue
  29. 2
    1
      src/store/course/course.js
  30. 1
    1
      src/store/goods/order.js
  31. 1
    1
      src/util/api.js

+ 2
- 2
config/index.js 查看文件 

@@ -12,9 +12,9 @@ module.exports = {
12 12 
     proxyTable: {
13 13 
       '/api': {
14 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 16 
         // target: 'http://127.0.0.1:8080',
17 
-        target: 'http://192.168.0.11:8080', //ys
17 
+        // target: 'http://192.168.0.11:8080', //ys
18 18 
         // target: 'http://192.168.0.125:8080', //hyq
19 19 
         // target: 'http://dev.ycjcjy.com/', //frp
20 20 
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置

+ 1
- 1
dist/index.html 查看文件 

@@ -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><link rel="shortcut icon" href=favorite.ico><title>城的空间后台管理系统</title><link href=./static/css/app.24281c9dce9b5911b24df59ed26b4e33.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.81b971066d20e9e83b0c.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><link rel="shortcut icon" href=favorite.ico><title>城的空间后台管理系统</title><link href=./static/css/app.90669cc3fbc21880e606b85d1375e710.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.7e921535e20f729cf046.js></script><script type=text/javascript src=./static/js/app.ee8ac8bcfdbcedb227c3.js></script></body></html>

+ 5
- 3
src/pages/system/cardAndCouponManager/bodyBuildingCardManager/index.vue 查看文件 

@@ -41,9 +41,10 @@
41 41 
           label="有效期"
42 42 
           width="150">
43 43 
           <template slot-scope="scope">
44 
-            <span style="width:100%;display:block;text-align:center;white-space: nowrap;">{{toolClass.dateFormat(scope.row.StartDate)}}</span>
44 
+            <span v-if="scope.row.StartDate !== '0001-01-01T00:00:00Z'" style="width:100%;display:block;text-align:center;white-space: nowrap;">{{toolClass.dateFormat(scope.row.StartDate)}}</span>
45 45 
             <span style="width:100%;display:block;text-align:center;white-space: nowrap;">至</span>
46 
-            <span style="width:100%;display:block;text-align:center;white-space: nowrap;">{{toolClass.dateFormat(scope.row.EndDate)}}</span>
46 
+            <span v-if="scope.row.EndDate !== '0001-01-01T00:00:00Z'" style="width:100%;display:block;text-align:center;white-space: nowrap;">{{toolClass.dateFormat(scope.row.EndDate)}}</span>
47 
+            <span v-if="scope.row.StartDate === '0001-01-01T00:00:00Z' && scope.row.EndDate === '0001-01-01T00:00:00Z'">-</span>
47 48 
           </template>
48 49 
         </el-table-column>
49 50 
         <el-table-column

@@ -175,7 +176,8 @@
175 176 
             prop="CreatDate"
176 177 
             label="创建时间">
177 178 
             <template slot-scope="scope">
178 
-              <span>{{toolClass.dateFormat(scope.row.CreateDate, 'yyyy-MM-dd')}}</span>
179 
+              <span v-if="scope.row.CreateDate !== '0001-01-01T00:00:00Z'">{{toolClass.dateFormat(scope.row.CreateDate, 'yyyy-MM-dd')}}</span>
180 
+              <span v-else>-</span>
179 181 
             </template>
180 182 
           </el-table-column>
181 183 
           <el-table-column

+ 8
- 8
src/pages/system/cardAndCouponManager/cardManager/edit.vue 查看文件 

@@ -140,7 +140,7 @@
140 140 
           </div>
141 141 
         </li>
142 142 
         <li class="flex-h" v-if="cardInfo.SendType !== 'case' && cardInfo.SendType !== 'system'">
143 
-          <span>视频：<em>*</em></span>
143 
+          <span>视频：</span>
144 144 
           <div class="flex-item">
145 145 
             <div style="vertical-align: middle;">
146 146 
               <a style="line-height: 40px;" v-if="videoOff" :href="cardInfo.VideoUrl" target="blank">{{cardInfo.VideoUrl}}</a>

@@ -471,13 +471,13 @@ export default {
471 471 
         })
472 472 
         return false
473 473 
       }
474 
-      if (this.cardInfo.SendType === 'channel' && this.cardInfo.VideoUrl === '') {
475 
-        this.$message({
476 
-          type: 'error',
477 
-          message: '视频不能为空'
478 
-        })
479 
-        return false
480 
-      }
474 
+      // if (this.cardInfo.SendType === 'channel' && this.cardInfo.VideoUrl === '') {
475 
+      //   this.$message({
476 
+      //     type: 'error',
477 
+      //     message: '视频不能为空'
478 
+      //   })
479 
+      //   return false
480 
+      // }
481 481 
       if (this.cardInfo.Share.CardShareInfo === '') {
482 482 
         this.$message({
483 483 
           type: 'error',

+ 5
- 3
src/pages/system/cardAndCouponManager/cardManager/index.vue 查看文件 

@@ -46,9 +46,10 @@
46 46 
           label="有效期"
47 47 
           width="150">
48 48 
           <template slot-scope="scope">
49 
-            <span style="width:100%;display:block;text-align:center;white-space: nowrap;">{{toolClass.dateFormat(scope.row.StartDate, 'yyyy-MM-dd')}}</span>
49 
+            <span v-if="scope.row.StartDate !== '0001-01-01T00:00:00Z'" style="width:100%;display:block;text-align:center;white-space: nowrap;">{{toolClass.dateFormat(scope.row.StartDate, 'yyyy-MM-dd')}}</span>
50 50 
             <span style="width:100%;display:block;text-align:center;white-space: nowrap;">至</span>
51 
-            <span style="width:100%;display:block;text-align:center;white-space: nowrap;">{{toolClass.dateFormat(scope.row.EndDate, 'yyyy-MM-dd')}}</span>
51 
+            <span v-if="scope.row.EndDate !== '0001-01-01T00:00:00Z'" style="width:100%;display:block;text-align:center;white-space: nowrap;">{{toolClass.dateFormat(scope.row.EndDate, 'yyyy-MM-dd')}}</span>
52 
+            <span v-if="scope.row.StartDate === '0001-01-01T00:00:00Z' && scope.row.EndDate === '0001-01-01T00:00:00Z'">-</span>
52 53 
           </template>
53 54 
         </el-table-column>
54 55 
         <el-table-column

@@ -182,7 +183,8 @@
182 183 
             prop="CreatDate"
183 184 
             label="创建时间">
184 185 
             <template slot-scope="scope">
185 
-              <span>{{toolClass.dateFormat(scope.row.CreateDate, 'yyyy-MM-dd')}}</span>
186 
+              <span v-if="scope.row.CreateDate !== '0001-01-01T00:00:00Z'">{{toolClass.dateFormat(scope.row.CreateDate, 'yyyy-MM-dd')}}</span>
187 
+              <span v-else>-</span>
186 188 
             </template>
187 189 
           </el-table-column>
188 190 
           <el-table-column

+ 9
- 9
src/pages/system/cardAndCouponManager/couponManager/edit.vue 查看文件 

@@ -219,7 +219,7 @@
219 219 
           </div>
220 220 
         </li>
221 221 
         <li class="flex-h" v-if="couponInfo.SendType !== 'case' && couponInfo.SendType !== 'system'">
222 
-          <span>视频：<em>*</em></span>
222 
+          <span>视频：</span>
223 223 
           <div class="flex-item">
224 224 
             <div style="vertical-align: middle;">
225 225 
               <a style="line-height: 40px;" v-if="videoOff" :href="couponInfo.VideoUrl" target="blank">{{couponInfo.VideoUrl}}</a>

@@ -704,20 +704,20 @@ export default {
704 704 
         })
705 705 
         return false
706 706 
       }
707 
-      if (!(this.couponInfo.IsAll - 0) && !this.courseList.length && !this.goodsList.length) {
707 
+      if (!(this.couponInfo.IsAll - 0) && !this.courseList.length && !this.goodsList.length && !this.isEdit) {
708 708 
         this.$message({
709 709 
           type: 'error',
710 710 
           message: '目标商品不能为空'
711 711 
         })
712 712 
         return false
713 713 
       }
714 
-      if (this.couponInfo.SendType === 'channel' && this.couponInfo.VideoUrl === '') {
715 
-        this.$message({
716 
-          type: 'error',
717 
-          message: '视频不能为空'
718 
-        })
719 
-        return false
720 
-      }
714 
+      // if (this.couponInfo.SendType === 'channel' && this.couponInfo.VideoUrl === '') {
715 
+      //   this.$message({
716 
+      //     type: 'error',
717 
+      //     message: '视频不能为空'
718 
+      //   })
719 
+      //   return false
720 
+      // }
721 721 
       if (this.couponInfo.CouponType === 'goods') {
722 722 
         if (this.TimeType === 1 && this.couponInfo.StartDate === '') {
723 723 
           this.$message({

+ 2
- 1
src/pages/system/cardAndCouponManager/couponManager/index.vue 查看文件 

@@ -178,7 +178,8 @@
178 178 
             prop="CreateDate"
179 179 
             label="创建时间">
180 180 
             <template slot-scope="scope">
181 
-              <span>{{toolClass.dateFormat(scope.row.CreateDate, 'yyyy-MM-dd')}}</span>
181 
+              <span v-if="scope.row.CreateDate !== '0001-01-01T00:00:00Z'">{{toolClass.dateFormat(scope.row.CreateDate, 'yyyy-MM-dd')}}</span>
182 
+              <span v-else>-</span>
182 183 
             </template>
183 184 
           </el-table-column>
184 185 
           <el-table-column

+ 2
- 1
src/pages/system/cardAndCouponManager/givingRecords.vue 查看文件 

@@ -62,7 +62,8 @@
62 62 
           prop="CreateDate"
63 63 
           label="赠送时间">
64 64 
           <template slot-scope="scope">
65 
-            <span>{{toolClass.dateFormat(scope.row.CreateDate)}}</span>
65 
+            <span v-if="scope.row.CreateDate !== '0001-01-01T00:00:00Z'">{{toolClass.dateFormat(scope.row.CreateDate, 'yyyy-MM-dd')}}</span>
66 
+            <span v-else>-</span>
66 67 
           </template>
67 68 
         </el-table-column>
68 69 
         <el-table-column

+ 3
- 2
src/pages/system/cardAndCouponManager/vipManager/index.vue 查看文件 

@@ -93,14 +93,15 @@
93 93 
           prop="ActiveDate"
94 94 
           label="激活时间">
95 95 
           <template slot-scope="scope">
96 
-            <span>{{toolClass.dateFormat(scope.row.ActiveDate, 'yyyy-MM-dd')==='1-01-01'?'':toolClass.dateFormat(scope.row.ActiveDate, 'yyyy-MM-dd hh:mm')}}</span>
96 
+            <span>{{toolClass.dateFormat(scope.row.ActiveDate, 'yyyy-MM-dd')==='1-01-01'?'-':toolClass.dateFormat(scope.row.ActiveDate, 'yyyy-MM-dd hh:mm')}}</span>
97 97 
           </template>
98 98 
         </el-table-column>
99 99 
         <el-table-column
100 100 
           prop="CreateDate"
101 101 
           label="创建时间">
102 102 
           <template slot-scope="scope">
103 
-            <span>{{toolClass.dateFormat(scope.row.CreateDate, 'yyyy-MM-dd hh:mm')}}</span>
103 
+            <span v-if="scope.row.CreateDate !== '0001-01-01T00:00:00Z'">{{toolClass.dateFormat(scope.row.CreateDate, 'yyyy-MM-dd')}}</span>
104 
+            <span v-else>-</span>
104 105 
           </template>
105 106 
         </el-table-column>
106 107 
       </el-table>

+ 47
- 50
src/pages/system/caseManager/signinManager/index.vue 查看文件 

@@ -1,41 +1,46 @@
1 1 
 <template>
2 2 
   <div class="subPage">
3 
-    <div class="title">
4 
-      签到列表
5 
-    </div>
6 
-    <div class="head-div">
7 
-      <span class="time-title">时间选择:</span>
8 
-       <el-select v-model="valueTime" placeholder="请选择">
9 
-            <el-option
10 
-              v-for="item in optionsTime"
11 
-              :key="item.valueTime"
12 
-              :label="item.label"
13 
-              :value="item.valueTime">
14 
-            </el-option>
15 
-        </el-select>
16 
-        <!-- 案场选择 -->
17 
-      <span class="case-title">案场:</span>
18 
-       <el-select v-model="valueCase" placeholder="请选择" @change="handelSignin">
19 
-            <el-option
20 
-              key="all"
21 
-              label="所有案场"
22 
-              value="all">
23 
-            </el-option>
24 
-            <el-option
25 
-              v-for="item in optionsCase"
26 
-              :key="item.valueCase"
27 
-              :label="item.label"
28 
-              :value="item.valueCase">
29 
-            </el-option>
30 
-        </el-select>
31 
-    </div>
32 
-    <div class="button-div">
33 
-      <el-button type="success" icon="el-icon-search" style="float: right;" @click="excelSignin">导出excel</el-button>
34 
-      <el-button type="warning" icon="el-icon-search" style="float: right;" @click="reset">重置</el-button>
35 
-      <el-button type="primary" icon="el-icon-search" style="float: right; margin-right: -10px;" @click="getList">搜索</el-button>
3 
+    <div class="system-table-search">
4 
+      <div class="flex-h">
5 
+        <div class="flex-item flex-h"></div>
6 
+        <ul>
7 
+          <li>
8 
+            <el-select v-model="postData.caseid" placeholder="请选择案场">
9 
+              <el-option
10 
+                key=""
11 
+                label="所有案场"
12 
+                value="">
13 
+              </el-option>
14 
+              <el-option
15 
+                v-for="item in optionsCase"
16 
+                :key="item.valueCase"
17 
+                :label="item.label"
18 
+                :value="item.valueCase">
19 
+              </el-option>
20 
+            </el-select>
21 
+          </li>
22 
+          <li>
23 
+            <el-select v-model="valueTime" placeholder="请选择时间">
24 
+              <el-option
25 
+                v-for="item in optionsTime"
26 
+                :key="item.valueTime"
27 
+                :label="item.label"
28 
+                :value="item.valueTime">
29 
+              </el-option>
30 
+            </el-select>
31 
+          </li>
32 
+        </ul>
33 
+        <el-button
34 
+          size="mini"
35 
+          type="primary" @click="getList">搜索</el-button>
36 
+        <el-button
37 
+        size="mini"
38 
+        type="success" @click="excelSignin">导出excel</el-button>
39 
+      </div>
40 
+      <div class="moreFilter"></div>
36 41 
     </div>
37 42 
     <!-- 表格 -->
38 
-    <div class="content">
43 
+    <div class="content" style="margin: 20px auto;width:calc(100% - 40px);">
39 44 
         <el-table
40 45 
           :data="tableData"
41 46 
           border
 
@@ -50,7 +55,8 @@
50 55 
             label="签到时间"
51 56 
             width="250">
52 57 
             <template slot-scope="scope">
53 
-              <span>{{FormatDate(scope.row.CreateDate)}}</span>
58 
+              <span v-if="scope.row.CreateDate !== '0001-01-01T00:00:00Z'">{{toolClass.dateFormat(scope.row.CreateDate, 'yyyy-MM-dd')}}</span>
59 
+              <span v-else>-</span>
54 60 
             </template>
55 61 
           </el-table-column>
56 62 
           <el-table-column
 
@@ -73,10 +79,7 @@
73 79 
             label="手机号">
74 80 
           </el-table-column>
75 81 
         </el-table>
76 
-    </div>
77 
-    <!-- 分页 -->
78 
-    <div class="foot">
79 
-       <el-pagination
82 
+        <el-pagination
80 83 
           @size-change="handleSizeChange"
81 84 
           @current-change="handleCurrentChange"
82 85 
           :current-page.sync="postData.page"
 
@@ -97,7 +100,8 @@ export default {
97 100 
     return {
98 101 
       msg: '签到管理',
99 102 
       currentPage: 1,
100 
-      postData: { // 表格搜索条件 //caseid: '', // 案场id
103 
+      postData: { // 表格搜索条件 //
104 
+        caseid: '', // 案场id
101 105 
         page: 1, // 当前页码
102 106 
         pageSize: 10, // 请求数据量
103 107 
       },
 
@@ -122,7 +126,7 @@ export default {
122 126 
         valueTime: '3',
123 127 
         label: '今年'
124 128 
       }],
125 
-      valueTime: '0',
129 
+      valueTime: '-1',
126 130 
       // 案场数据
127 131 
       // {valueCase: '1',label: '案场1'}
128 132 
       optionsCase: [], // 调用computed计算属性
 
@@ -136,17 +140,15 @@ export default {
136 140 
   },
137 141 
   methods: {
138 142 
     handleSizeChange (val) {
139 
-      console.log(`每页 ${val} 条`)
140 143 
     },
141 144 
     handleCurrentChange (val) {
142 
-      console.log(`当前页: ${val}`)
143 145 
       this.$data.postData.page = val
144 146 
       this.getList()
145 147 
     },
146 148 
     getList () { // 获取数据列表
147 149 
       this.$ajax(this.$api.caseManager.getSignin.url, {
148 150 
         method: this.$api.caseManager.getSignin.method,
149 
-        queryData: { ...this.postData, org: this.$data.valueCase, selectType: this.$data.valueTime }
151 
+        queryData: { ...this.postData, caseid: this.postData.caseid === 'all' ? '' : this.postData.caseid, org: this.$data.valueCase, selectType: this.$data.valueTime }
150 152 
       }).then(res => {
151 153 
         this.tableData = res.list
152 154 
         this.postData.page = res.page
 
@@ -163,11 +165,9 @@ export default {
163 165 
         this.total = res.pagenum
164 166 
         // 调用一次,计算属性
165 167 
         this.optionsCase = this.CaseCompted
168 
+        this.getList()
166 169 
       })
167 170 
     },
168 
-    handelSignin () { // 查询签到记录
169 
-      this.getList()
170 
-    },
171 171 
     reset () { // 重置按钮
172 172 
       this.$data.valueTime = '0'
173 173 
       this.$data.total = ''
 
@@ -199,14 +199,11 @@ export default {
199 199 
     CaseCompted: {
200 200 
       get () { // get方法
201 201 
         let data = []
202 
-        console.log('数据大小')
203 
-        console.log(this.$data.tempoptionsCase)
204 202 
         var cases = this.$data.tempoptionsCase
205 203 
         for (let i = 0; i < cases.length; i++) {
206 204 
           let obj = []
207 205 
           obj.valueCase = cases[i].CaseId
208 206 
           obj.label = cases[i].CaseName
209 
-          console.log('编号:' + obj.valueCase + '名称:' + obj.label)
210 207 
           data.push(obj)
211 208 
         }
212 209 
         return data

+ 8
- 4
src/pages/system/cmsManager/majorProjects/edit.vue 查看文件 

@@ -110,14 +110,16 @@
110 110 
               prop="BeginDate"
111 111 
               label="课程开始时间">
112 112 
               <template slot-scope="scope">
113 
-                <label>{{toolClass.dateFormat(scope.row.BeginDate,'yyyy-MM-dd')}}</label>
113 
+                <label v-if="scope.row.BeginDate !== '0001-01-01T00:00:00Z'">{{toolClass.dateFormat(scope.row.BeginDate,'yyyy-MM-dd')}}</label>
114 
+                <label v-else>-</label>
114 115 
               </template>
115 116 
             </el-table-column>
116 117 
             <el-table-column
117 118 
               prop="EndDate"
118 119 
               label="课程结束时间">
119 120 
               <template slot-scope="scope">
120 
-                <label>{{toolClass.dateFormat(scope.row.EndDate,'yyyy-MM-dd')}}</label>
121 
+                <label v-if="scope.row.EndDate !== '0001-01-01T00:00:00Z'">{{toolClass.dateFormat(scope.row.EndDate,'yyyy-MM-dd')}}</label>
122 
+                <label v-else>-</label>
121 123 
               </template>
122 124 
             </el-table-column>
123 125 
             <el-table-column label="操作" width="450">

@@ -171,14 +173,16 @@
171 173 
             prop="BeginDate"
172 174 
             label="课程开始时间">
173 175 
             <template slot-scope="scope">
174 
-              <label>{{toolClass.dateFormat(scope.row.BeginDate,'yyyy-MM-dd')}}</label>
176 
+              <label v-if="scope.row.BeginDate !== '0001-01-01T00:00:00Z'">{{toolClass.dateFormat(scope.row.BeginDate,'yyyy-MM-dd')}}</label>
177 
+              <label v-else>-</label>
175 178 
             </template>
176 179 
           </el-table-column>
177 180 
           <el-table-column
178 181 
             prop="EndDate"
179 182 
             label="课程结束时间">
180 183 
             <template slot-scope="scope">
181 
-              <label>{{toolClass.dateFormat(scope.row.EndDate,'yyyy-MM-dd')}}</label>
184 
+              <label v-if="scope.row.EndDate !== '0001-01-01T00:00:00Z'">{{toolClass.dateFormat(scope.row.EndDate,'yyyy-MM-dd')}}</label>
185 
+              <label v-else>-</label>
182 186 
             </template>
183 187 
           </el-table-column>
184 188 
         </el-table>

+ 1
- 1
src/pages/system/cmsManager/majorProjects/index.vue 查看文件 

@@ -8,7 +8,7 @@
8 8 
         <ul>
9 9 
           <li>
10 10 
             <!-- <span>选择案场：</span> -->
11 
-            <el-select v-model="tableSearch.caseId" placeholder="请选择">
11 
+            <el-select v-model="tableSearch.caseId" placeholder="请选择案场">
12 12 
               <el-option
13 13 
                 key="all"
14 14 
                 label="所有案场"

+ 4
- 2
src/pages/system/courseManager/courseList/index.vue 查看文件 

@@ -94,7 +94,8 @@
94 94 
           label="课程开始时间"
95 95 
           width="150">
96 96 
           <template slot-scope="scope">
97 
-            <label>{{FormatDate(scope.row.BeginDate)}}</label>
97 
+            <label v-if="scope.row.BeginDate !== '0001-01-01T00:00:00Z'">{{FormatDate(scope.row.BeginDate)}}</label>
98 
+            <label v-else>-</label>
98 99 
           </template>
99 100 
         </el-table-column>
100 101 
         <el-table-column

@@ -102,7 +103,8 @@
102 103 
           label="课程结束时间"
103 104 
           width="150">
104 105 
           <template slot-scope="scope">
105 
-            <label>{{FormatDate(scope.row.EndDate)}}</label>
106 
+            <label v-if="scope.row.EndDate !== '0001-01-01T00:00:00Z'">{{FormatDate(scope.row.EndDate)}}</label>
107 
+            <label v-else>-</label>
106 108 
           </template>
107 109 
         </el-table-column>
108 110 
         <el-table-column

+ 2
- 25
src/pages/system/courseManager/scheduleManager/index.vue 查看文件 

@@ -71,34 +71,11 @@
71 71 
           </li>
72 72 
           <li class="flex-h">
73 73 
             <span>开始时间：</span>
74 
-            <!-- <div class="flex-item" v-if="currentCourseItem.CourseStatus===0">
75 
-              <div>
76 
-                <el-date-picker
77 
-                  v-if="currentCourseItem.CourseStatus===0"
78 
-                  v-model="currentCourseItem.BeginDate"
79 
-                  type="datetime"
80 
-                  placeholder="选择开始日期"
81 
-                  >
82 
-                </el-date-picker>
83 
-                <span v-else>{{this.toolClass.dateFormat(currentCourseItem.BeginDate, 'yyyy-MM-dd hh:mm')}}</span>
84 
-              </div>
85 
-            </div> -->
86 
-            <span>{{this.toolClass.dateFormat(currentCourseItem.BeginDate, 'yyyy-MM-dd hh:mm:ss')}}</span>
74 
+            <span>{{currentCourseItem.BeginDate === '0001-01-01T00:00:00Z' ? '-' : this.toolClass.dateFormat(currentCourseItem.BeginDate, 'yyyy-MM-dd hh:mm:ss')}}</span>
87 75 
           </li>
88 76 
           <li class="flex-h">
89 77 
             <span>结束时间：</span>
90 
-            <!-- <div class="flex-item" v-if="currentCourseItem.CourseStatus===0">
91 
-              <div>
92 
-                <el-date-picker
93 
-                  v-if="currentCourseItem.CourseStatus===0"
94 
-                  v-model="currentCourseItem.EndDate"
95 
-                  type="datetime"
96 
-                  placeholder="选择结束日期">
97 
-                </el-date-picker>
98 
-                <span v-else>{{this.toolClass.dateFormat(currentCourseItem.EndDate, 'yyyy-MM-dd hh:mm')}}</span>
99 
-              </div>
100 
-            </div> -->
101 
-            <span>{{this.toolClass.dateFormat(currentCourseItem.EndDate, 'yyyy-MM-dd hh:mm:ss')}}</span>
78 
+            <span>{{currentCourseItem.EndDate === '0001-01-01T00:00:00Z' ? '-' : this.toolClass.dateFormat(currentCourseItem.EndDate, 'yyyy-MM-dd hh:mm:ss')}}</span>
102 79 
           </li>
103 80 
         </ul>
104 81 
       </div>

+ 2
- 2
src/pages/system/dataStatistics/cardCouponUsedList/index.vue 查看文件 

@@ -117,7 +117,7 @@
117 117 
           label="有效期"
118 118 
           width="140px">
119 119 
           <template slot-scope="scope">
120 
-            {{toolClass.dateFormat(scope.row.EndDate)}}
120 
+            {{scope.row.EndDate === '0001-01-01T00:00:00Z' ? '-' : toolClass.dateFormat(scope.row.EndDate)}}
121 121 
           </template>
122 122 
         </el-table-column>
123 123 
         <el-table-column

@@ -125,7 +125,7 @@
125 125 
           label="获取时间"
126 126 
           width="140px">
127 127 
           <template slot-scope="scope">
128 
-            {{toolClass.dateFormat(scope.row.ReceiveDate)}}
128 
+            {{scope.row.ReceiveDate === '0001-01-01T00:00:00Z' ? '-' : toolClass.dateFormat(scope.row.ReceiveDate)}}
129 129 
           </template>
130 130 
         </el-table-column>
131 131 
         <el-table-column

+ 3
- 3
src/pages/system/dataStatistics/courseOrderList/index.vue 查看文件 

@@ -85,9 +85,9 @@
85 85 
           label="课程时间"
86 86 
           width="140px">
87 87 
           <template slot-scope="scope">
88 
-            {{toolClass.dateFormat(scope.row.BeginDate)}}<br>
88 
+            {{scope.row.BeginDate === '0001-01-01T00:00:00Z' ? '-' : toolClass.dateFormat(scope.row.BeginDate)}}<br>
89 89 
             -<br>
90 
-            {{toolClass.dateFormat(scope.row.EndDate)}}
90 
+            {{scope.row.EndDate === '0001-01-01T00:00:00Z' ? '-' : toolClass.dateFormat(scope.row.EndDate)}}
91 91 
           </template>
92 92 
         </el-table-column>
93 93 
         <el-table-column

@@ -107,7 +107,7 @@
107 107 
           label="下单时间"
108 108 
           width="140px">
109 109 
           <template slot-scope="scope">
110 
-            {{toolClass.dateFormat(scope.row.CreateDate)}}
110 
+            {{scope.row.CreateDate === '0001-01-01T00:00:00Z' ? '-' : toolClass.dateFormat(scope.row.CreateDate)}}
111 111 
           </template>
112 112 
         </el-table-column>
113 113 
       </el-table>

+ 2
- 2
src/pages/system/dataStatistics/courseStatisticsList/index.vue 查看文件 

@@ -63,9 +63,9 @@
63 63 
           label="课程时间"
64 64 
           width="140px">
65 65 
           <template slot-scope="scope">
66 
-            {{toolClass.dateFormat(scope.row.BeginDate)}}<br>
66 
+            {{scope.row.BeginDate === '0001-01-01T00:00:00Z' ? '-' : toolClass.dateFormat(scope.row.BeginDate)}}<br>
67 67 
             -<br>
68 
-            {{toolClass.dateFormat(scope.row.EndDate)}}
68 
+            {{scope.row.EndDate === '0001-01-01T00:00:00Z' ? '-' : toolClass.dateFormat(scope.row.EndDate)}}
69 69 
           </template>
70 70 
         </el-table-column>
71 71 
         <el-table-column

+ 4
- 4
src/pages/system/dataStatistics/courseVerifyList/index.vue 查看文件 

@@ -68,9 +68,9 @@
68 68 
           label="课程时间"
69 69 
           width="140px">
70 70 
           <template slot-scope="scope">
71 
-            {{toolClass.dateFormat(scope.row.BeginDate)}}<br>
71 
+            {{scope.row.BeginDate === '0001-01-01T00:00:00Z' ? '-' : toolClass.dateFormat(scope.row.BeginDate)}}<br>
72 72 
             -<br>
73 
-            {{toolClass.dateFormat(scope.row.EndDate)}}
73 
+            {{scope.row.EndDate === '0001-01-01T00:00:00Z' ? '-' : toolClass.dateFormat(scope.row.EndDate)}}
74 74 
           </template>
75 75 
         </el-table-column>
76 76 
         <el-table-column

@@ -90,7 +90,7 @@
90 90 
           label="下单时间"
91 91 
           width="140px">
92 92 
           <template slot-scope="scope">
93 
-            {{toolClass.dateFormat(scope.row.CreateDate)}}
93 
+            {{scope.row.CreateDate === '0001-01-01T00:00:00Z' ? '-' : toolClass.dateFormat(scope.row.CreateDate)}}
94 94 
           </template>
95 95 
         </el-table-column>
96 96 
         <el-table-column

@@ -98,7 +98,7 @@
98 98 
           label="核销时间"
99 99 
           width="140px">
100 100 
           <template slot-scope="scope">
101 
-            {{toolClass.dateFormat(scope.row.VerifyDate)}}
101 
+            {{scope.row.VerifyDate === '0001-01-01T00:00:00Z' ? '-' : toolClass.dateFormat(scope.row.VerifyDate)}}
102 102 
           </template>
103 103 
         </el-table-column>
104 104 
         <el-table-column

+ 1
- 1
src/pages/system/dataStatistics/frontEndUserList/index.vue 查看文件 

@@ -35,7 +35,7 @@
35 35 
         <el-table-column
36 36 
           label="创建时间">
37 37 
           <template slot-scope="scope">
38 
-            <label>{{FormatDate(scope.row.CreateDate)}}</label>
38 
+            <label>{{scope.row.CreateDate === '0001-01-01T00:00:00Z' ? '-' : FormatDate(scope.row.CreateDate)}}</label>
39 39 
           </template>
40 40 
         </el-table-column>
41 41 
       </el-table>

+ 1
- 1
src/pages/system/healthManager/healthRecord/index.vue 查看文件 

@@ -67,7 +67,7 @@
67 67 
         <el-table-column
68 68 
           label="检测时间">
69 69 
           <template slot-scope="scope">
70 
-            <label>{{toolClass.dateFormat(scope.row.CreateDate)}}</label>
70 
+            <label>{{scope.row.CreateDate === '0001-01-01T00:00:00Z' ? '-' : toolClass.dateFormat(scope.row.CreateDate)}}</label>
71 71 
           </template>
72 72 
         </el-table-column>
73 73 
       </el-table>

+ 6
- 2
src/pages/system/index.vue 查看文件 

@@ -32,7 +32,7 @@
32 32 
         </div>
33 33 
       </div>
34 34 
     </div>
35 
-    <el-dialog title="修改密码" :visible.sync="dialogFormVisible">
35 
+    <el-dialog title="修改密码" :visible.sync="dialogFormVisible" @close="dialogClose">
36 36 
       <el-input
37 37 
         placeholder="请输入旧密码"
38 38 
         v-model="postData.oriPasswd"

@@ -81,12 +81,16 @@ export default {
81 81 
   created () {
82 82 
     this.updateSystemInfo().then(() => {
83 83 
       if (!this.pageMenu.length) {
84 
-        this.$router.push({name: 'noAccessRight'})
84 
+        this.$router.push({ name: 'noAccessRight' })
85 85 
       }
86 86 
       this.updateBread({ routerData, Url: this.$route.name })
87 87 
     })
88 88 
   },
89 89 
   methods: {
90 
+    dialogClose () {
91 
+      this.postData.oriPasswd = ''
92 
+      this.postData.newPasswd = ''
93 
+    },
90 94 
     submitPasswd () { // 修改密码
91 95 
       var aData = {
92 96 
         oriPasswd: this.md5(this.postData.oriPasswd),

+ 2
- 2
src/pages/system/luckyDrawManager/luckyDrawList/index.vue 查看文件 

@@ -38,13 +38,13 @@
38 38 
         <el-table-column
39 39 
           label="获取时间">
40 40 
           <template slot-scope="scope">
41 
-            <label>{{toolClass.dateFormat(scope.row.CreateDate)}}</label>
41 
+            <label>{{scope.row.CreateDate === '0001-01-01T00:00:00Z' ? '-' : toolClass.dateFormat(scope.row.CreateDate)}}</label>
42 42 
           </template>
43 43 
         </el-table-column>
44 44 
         <el-table-column
45 45 
           label="核销时间">
46 46 
           <template slot-scope="scope">
47 
-            <label>{{toolClass.dateFormat(scope.row.WriteoffDate)}}</label>
47 
+            <label>{{scope.row.WriteoffDate === '0001-01-01T00:00:00Z' ? '-' : toolClass.dateFormat(scope.row.WriteoffDate)}}</label>
48 48 
           </template>
49 49 
         </el-table-column>
50 50 
         <el-table-column

+ 1
- 1
src/pages/system/luckyDrawManager/luckyDrawShareList/index.vue 查看文件 

@@ -60,7 +60,7 @@
60 60 
         <el-table-column
61 61 
           label="分享时间">
62 62 
           <template slot-scope="scope">
63 
-            <label>{{toolClass.dateFormat(scope.row.CreateDate)}}</label>
63 
+            <label>{{scope.row.CreateDate === '0001-01-01T00:00:00Z' ? '-' : toolClass.dateFormat(scope.row.CreateDate)}}</label>
64 64 
           </template>
65 65 
         </el-table-column>
66 66 
       </el-table>

+ 39
- 19
src/pages/system/newOrder/newOrderList/index.vue 查看文件 

@@ -50,7 +50,7 @@
50 50 
           <div style="padding:0px 10px 5px;border-bottom:2px solid #cccccc;">
51 51 
             <div style="display:inline-block;">
52 52 
               <img class="topIcon" style="display:block;width:60%;margin:0 0 20px 0px;" src="http://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/upload/111101940020.png" alt="">
53 
-              <span style="display:block;font-size:20px;font-weight:700;text-align: center;"> <img width='25px' height="25px" :src='item.AreaIcon' alt=""> {{item.AreaName}}</span>
53 
+              <span style="display:block;font-size:20px;font-weight:700;text-align: center;"> <img width='25px' height="25px" :src='item.AreaIconWhite' alt=""> {{item.AreaName + item.TableNo}}</span>
54 54 
             </div>
55 55 
           </div>
56 56 
           <div style="padding:10px 10px 5px;border-bottom:1px solid #cccccc;" v-for='(item1,index1) in item.Goods' :key='index1'>

@@ -69,8 +69,8 @@
69 69 
           <div style="height:10px"></div>
70 70 
         </div>
71 71 
         <div class="btns">
72 
-          <span @click="cancel(item.OrdersId)">取消</span>
73 
-          <span @click="submit(item.OrdersId)">确定</span>
72 
+          <span @click="cancel(item.OrdersId,index)">取消</span>
73 
+          <span @click="submit(item.OrdersId,index)">确定</span>
74 74 
         </div>
75 75 
       </div>
76 76 
     </div>

@@ -101,6 +101,7 @@ export default {
101 101 
       leftTimes: {},
102 102 
       business: false,
103 103 
       caseid: '',
104 
+      websockets: {},
104 105 
       interval: () => { }
105 106 
     }
106 107 
   },

@@ -133,8 +134,23 @@ export default {
133 134 
   mounted () {
134 135 
     setTimeout(window.location.reload, 600 * 1000)
135 136 
   },
137 
+  beforeRouteLeave (to, from, next) {
138 
+    // 导航离开该组件的对应路由时调用
139 
+    // 可以访问组件实例 `this`
140 
+    console.log(this.websockets)
141 
+    Object.keys(this.websockets).forEach((key) => {
142 
+      console.log(key, this.websockets[key])
143 
+      this.websockets[key].onclose()
144 
+    })
145 
+    next()
146 
+  },
136 147 
   methods: {
137 148 
     init () {
149 
+      Object.keys(this.websockets).forEach((key) => {
150 
+        console.log(key, this.websockets[key])
151 
+        this.websockets[key].onclose()
152 
+      })
153 
+      console.log('init')
138 154 
       var param = []
139 155 
       if (!this.caseid) {
140 156 
         this.$message({

@@ -205,7 +221,7 @@ export default {
205 221 
     ...mapActions([
206 222 
       'updateSystemInfo'
207 223 
     ]),
208 
-    submit (id) {
224 
+    submit (id, index) {
209 225 
       this.$confirm('确定完成此饮品?', '提示', {
210 226 
         confirmButtonText: '确定',
211 227 
         cancelButtonText: '取消',

@@ -216,7 +232,8 @@ export default {
216 232 
             type: 'success',
217 233 
             message: '确认订单成功'
218 234 
           })
219 
-          this.init()
235 
+          this.list.splice(index, 1)
236 
+          this.updateList({ list: this.list })
220 237 
         })
221 238 
       }).catch((res) => {
222 239 
         this.$message({

@@ -225,7 +242,7 @@ export default {
225 242 
         })
226 243 
       })
227 244 
     },
228 
-    cancel (id) {
245 
+    cancel (id, index) {
229 246 
       this.$confirm('确定取消此饮品?', '提示', {
230 247 
         confirmButtonText: '确定',
231 248 
         cancelButtonText: '取消',

@@ -236,7 +253,8 @@ export default {
236 253 
             type: 'success',
237 254 
             message: '取消订单成功'
238 255 
           })
239 
-          this.init()
256 
+          this.list.splice(index, 1)
257 
+          this.updateList({ list: this.list })
240 258 
         })
241 259 
       }).catch((res) => {
242 260 
         this.$message({

@@ -256,23 +274,13 @@ export default {
256 274 
       LODOP.ADD_PRINT_HTM(0, 0, document.getElementsByClassName(cl)[0].offsetWidth, document.getElementsByClassName(cl)[0].offsetHeight, document.getElementsByClassName(cl)[0].innerHTML)
257 275 
     },
258 276 
     initWebSocket () {
277 
+      console.log('initWebSocket')
259 278 
       // console.log(this.user)
260 279 
       let caseid = this.caseid
261 280 
       let id = this.userInfo.UserId
262 281 
       const wsPath = this.$api.system.notify.newGoodsOrders.url
263 282 
       const wsRealPath = replaceURLParams(wsPath, { grps: caseid, id })
264 
-      const wsuri = `${window.location.origin.replace('http', 'ws')}${wsRealPath}?token=${localStorage.getItem('JWT')}`
265 
-      // const wsuri = `ws://192.168.0.11/api/guest/MQ/websocket/${caseid}/${id}`
266 
-      try {
267 
-        this.websock = new WebSocket(wsuri)
268 
-      } catch (e) {
269 
-        console.log(e)
270 
-      }
271 
-      this.websock.onopen = console.log
272 
-      this.websock.onmessage = this.websocketonmessage
273 
-      this.websock.onclose = console.log
274 
-
275 
-      setInterval(() => this.websock.send(10), 120000)
283 
+      this.newWebsocket(wsRealPath)
276 284 
     },
277 285 
     websocketonmessage (e) {
278 286 
       // let oldList = this.list

@@ -280,6 +288,7 @@ export default {
280 288 
       // let newinfo = newList.filter(x => this.list.filter(item => item.OrdersId === x.OrdersId).length === 0)
281 289 
       this.updateList({ list: this.list.concat(newList) }).then(() => {
282 290 
         newList.forEach((it) => {
291 
+          // console.log('it:', it)
283 292 
           this.printPdf(`item_${it.OrdersId}`)
284 293 
           this.putPrintGoodsOrder({
285 294 
             id: it.OrdersId

@@ -287,6 +296,17 @@ export default {
287 296 
         })
288 297 
       })
289 298 
     },
299 
+    newWebsocket (wsRealPath) {
300 
+      const ws = this.websockets[wsRealPath]
301 
+      if (!ws) {
302 
+        const url = `${window.location.origin.replace('http', 'ws')}${wsRealPath}?token=${localStorage.getItem('JWT')}`
303 
+        this.websockets[wsRealPath] = new WebSocket(url)
304 
+        this.websockets[wsRealPath].onopen = console.log
305 
+        this.websockets[wsRealPath].onmessage = this.websocketonmessage
306 
+        this.websockets[wsRealPath].onclose = console.log
307 
+        setInterval(() => this.websockets[wsRealPath].send(10), 120000)
308 
+      }
309 
+    },
290 310 
     open () {
291 311 
       if (!this.caseid) {
292 312 
         this.$message({

+ 1
- 1
src/pages/system/systemSet/roleManager/index.vue 查看文件 

@@ -15,7 +15,7 @@
15 15 
         </el-table-column>
16 16 
         <el-table-column label="创建时间" width="300">
17 17 
           <template slot-scope="scope">
18 
-            <label>{{FormatDate(scope.row.CreateDate)}}</label>
18 
+            <label>{{scope.row.CreateDate === '0001-01-01T00:00:00Z' ? '-' : FormatDate(scope.row.CreateDate)}}</label>
19 19 
           </template>
20 20 
         </el-table-column>
21 21 
         <el-table-column fixed='right' label="操作" width="300">

+ 1
- 1
src/pages/system/verificationManager/drawVerification/verificationList/index.vue 查看文件 

@@ -42,7 +42,7 @@
42 42 
                 label="获取时间"
43 43 
                 width="140px">
44 44 
                 <template slot-scope="scope">
45 
-                  {{toolClass.dateFormat(scope.row.CreateDate)}}
45 
+                  {{scope.row.CreateDate === '0001-01-01T00:00:00Z' ? '-' : toolClass.dateFormat(scope.row.CreateDate)}}
46 46 
                 </template>
47 47 
               </el-table-column>
48 48 
               <el-table-column

+ 2
- 2
src/pages/system/verificationManager/phoneVerification/verificationList/index.vue 查看文件 

@@ -41,14 +41,14 @@
41 41 
                 prop="StartDate"
42 42 
                 label="课程开始时间">
43 43 
                 <template slot-scope="scope">
44 
-                  <span>{{toolClass.dateFormat(scope.row.StartDate)}}</span>
44 
+                  <span>{{scope.row.StartDate === '0001-01-01T00:00:00Z' ? '-' : toolClass.dateFormat(scope.row.StartDate)}}</span>
45 45 
                 </template>
46 46 
               </el-table-column>
47 47 
               <el-table-column
48 48 
                 prop="EndDate"
49 49 
                 label="课程结束时间">
50 50 
                 <template slot-scope="scope">
51 
-                  <span>{{toolClass.dateFormat(scope.row.EndDate)}}</span>
51 
+                  <span>{{scope.row.EndDate === '0001-01-01T00:00:00Z' ? '-' : toolClass.dateFormat(scope.row.EndDate)}}</span>
52 52 
                 </template>
53 53 
               </el-table-column>
54 54 
               <el-table-column

+ 2
- 2
src/pages/system/verificationManager/qrcodeVerification/verificationList/index.vue 查看文件 

@@ -33,14 +33,14 @@
33 33 
                 prop="StartDate"
34 34 
                 label="课程开始时间">
35 35 
                 <template slot-scope="scope">
36 
-                  <span>{{toolClass.dateFormat(scope.row.StartDate)}}</span>
36 
+                  <span>{{scope.row.StartDate === '0001-01-01T00:00:00Z' ? '-' : toolClass.dateFormat(scope.row.StartDate)}}</span>
37 37 
                 </template>
38 38 
               </el-table-column>
39 39 
               <el-table-column
40 40 
                 prop="EndDate"
41 41 
                 label="课程结束时间">
42 42 
                 <template slot-scope="scope">
43 
-                  <span>{{toolClass.dateFormat(scope.row.EndDate)}}</span>
43 
+                  <span>{{scope.row.EndDate === '0001-01-01T00:00:00Z' ? '-' : toolClass.dateFormat(scope.row.EndDate)}}</span>
44 44 
                 </template>
45 45 
               </el-table-column>
46 46 
               <el-table-column

+ 2
- 1
src/store/course/course.js 查看文件 

@@ -19,6 +19,7 @@ export default {
19 19 
       state.courseLister = payload.list || []
20 20 
     },
21 21 
     updateInfo (state, payload) {
22 
+      // console.log(payload)
22 23 
       state.courseInfo = payload || { IsSelect: 0 }
23 24 
     },
24 25 
     updateImgList (state, payload) {
 
@@ -130,7 +131,7 @@ export default {
130 131 
       })
131 132 
     },
132 133 
     SetNull ({ commit }) {
133 
-      commit('updateInfo', {})
134 
+      commit('updateInfo', { IsSelect: 0 })
134 135 
     },
135 136 
     UpdateInfo ({ commit }, payload) {
136 137 
       commit('updateInfo', payload)

+ 1
- 1
src/store/goods/order.js 查看文件 

@@ -62,7 +62,7 @@ export default {
62 62 
     updateList ({ commit }, data) {
63 63 
       return new Promise((resolve) => {
64 64 
         commit('updateList', data)
65 
-        resolve()
65 
+        resolve(data)
66 66 
       })
67 67 
     },
68 68 
     openBusiness ({ commit }, caseid) {

+ 1
- 1
src/util/api.js 查看文件 

@@ -721,7 +721,7 @@ const $api = {
721 721 
   marketingActivities: { // 营销活动
722 722 
     getMarketingList: { // 查询所有
723 723 
       method: 'get',
724 
-      url: `${baseUrl}${common}/marketing/list`
724 
+      url: `${baseUrl}${common}/marketing`
725 725 
     },
726 726 
     addMarketing: { // 添加
727 727 
       method: 'post',