许成详 6 lat temu
rodzic
commit
b3660af65d

+ 2
- 2
config/index.js Wyświetl plik

@@ -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
- 4
dist/index.html Wyświetl plik

@@ -1,4 +1 @@
1
-<<<<<<< HEAD
2
-=======
3
-<!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.cc1f90c9ffc52c3f483a949e2c10acd6.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.5c35c9c3aac1bbcf9f74.js></script></body></html>
4
->>>>>>> 0b9bbc49e3efad436d5b6723a315ca00d7060653
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.164c89e926d99f06f64231aa2ed79f36.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.d4b2eb05a59a97a75f2a.js></script></body></html>

+ 163
- 0
src/pages/system/marketingActivities/listOfLotteryActivities/index.vue Wyświetl plik

@@ -0,0 +1,163 @@
1
+<template>
2
+  <div class="subPage">
3
+    <div class="system-table-search">
4
+      <div class="flex-h">
5
+        <div class="flex-item flex-h">
6
+          <el-button size="mini" type="success">新增抽奖活动</el-button>
7
+        </div>
8
+        <ul>
9
+          <li>
10
+            <el-select v-model="CaseId" placeholder="请选择案场">
11
+              <el-option
12
+                key="all"
13
+                label="所有案场"
14
+                value="all">
15
+              </el-option>
16
+              <el-option
17
+                v-for="item in cases"
18
+                :key="item.CaseId"
19
+                :label="item.CaseName"
20
+                :value="item.CaseId">
21
+              </el-option>
22
+            </el-select>
23
+          </li>
24
+          <li>
25
+            <el-select v-model="postData.state" placeholder="请选择状态">
26
+              <el-option
27
+                v-for="item in cases"
28
+                :key="item.CaseId"
29
+                :label="item.CaseName"
30
+                :value="item.CaseId">
31
+              </el-option>
32
+            </el-select>
33
+          </li>
34
+          <li>
35
+            <el-input
36
+              placeholder="请输入活动名称"
37
+              v-model="postData.name"
38
+              clearable>
39
+            </el-input>
40
+          </li>
41
+        </ul>
42
+        <el-button
43
+          size="mini"
44
+          type="primary">搜索</el-button>
45
+      </div>
46
+      <div class="moreFilter"></div>
47
+    </div>
48
+    <div class="system-table-box">
49
+      <el-table
50
+          :data="tableData"
51
+          style="width: 100%">
52
+          <el-table-column
53
+            prop="CaseName"
54
+            label="案场"
55
+            width="180">
56
+          </el-table-column>
57
+          <el-table-column
58
+            prop="ActivityName"
59
+            label="活动名称">
60
+          </el-table-column>
61
+          <el-table-column
62
+            prop="StartDate"
63
+            label="开始时间">
64
+          </el-table-column>
65
+          <el-table-column
66
+            prop="EndDate"
67
+            label="结束时间">
68
+          </el-table-column>
69
+          <el-table-column
70
+            prop="num"
71
+            label="已参与人数">
72
+          </el-table-column>
73
+          <el-table-column
74
+            prop="Status"
75
+            label="状态">
76
+          </el-table-column>
77
+          <el-table-column
78
+            prop="url"
79
+            label="活动链接">
80
+          </el-table-column>
81
+          <el-table-column
82
+            prop="address"
83
+            label="操作"
84
+            width="200">
85
+            <template slot-scope="scope">
86
+              <el-button
87
+                size="mini"
88
+                type="danger">删除</el-button>
89
+              <el-button
90
+                size="mini"
91
+                type="warning">停用</el-button>
92
+              <el-button
93
+                size="mini"
94
+                type="success">启用</el-button>
95
+              <el-button
96
+                size="mini"
97
+                type="success">分享记录</el-button>
98
+              <el-button
99
+                size="mini"
100
+                type="success">抽奖记录</el-button>
101
+            </template>
102
+          </el-table-column>
103
+        </el-table>
104
+    </div>
105
+    <el-pagination
106
+      @current-change="handleCurrentChange"
107
+      :current-page.sync="postData.page"
108
+      :page-size="postData.pagesize"
109
+      layout="prev, pager, next, jumper"
110
+      :total="total">
111
+    </el-pagination>
112
+  </div>
113
+</template>
114
+<script>
115
+import { mapState } from 'vuex'
116
+export default {
117
+  data () {
118
+    return {
119
+      tableData: [],
120
+      postData: { // 表格搜索条件 //caseid: '', // 案场id
121
+        page: 1, // 当前页码
122
+        pageSize: 10, // 请求数据量
123
+        name: '', // 活动名称
124
+        state: '', // 状态
125
+      },
126
+      total: 0 // 数据条数
127
+    }
128
+  },
129
+  computed: {
130
+    ...mapState({
131
+      cases: x => x.app.cases.list,
132
+      defaultCaseId: x => x.app.cases.default
133
+    }),
134
+    CaseId: {
135
+      get () {
136
+        return this.postData.caseid || this.defaultCaseId
137
+      },
138
+      set (val) {
139
+        this.postData.caseid = val
140
+      }
141
+    }
142
+  },
143
+  mounted () {
144
+    this.getList()
145
+  },
146
+  methods: {
147
+    handleCurrentChange (val) {
148
+      this.$data.postData.page = val
149
+      this.getList()
150
+    },
151
+    redirection (pathName) { // 重定向
152
+      this.$router.push({ name: pathName })
153
+    },
154
+    getList () { // 获取数据列表
155
+    },
156
+  },
157
+}
158
+</script>
159
+
160
+<!-- Add "scoped" attribute to limit CSS to this component only -->
161
+<style lang="scss" scoped>
162
+@import "page.scss";
163
+</style>

+ 33
- 0
src/pages/system/marketingActivities/listOfLotteryActivities/page.scss Wyświetl plik

@@ -0,0 +1,33 @@
1
+
2
+// 活动列表 标题
3
+.title{
4
+  font-size: 28px;
5
+  color: darkgray;
6
+  width: 100%;
7
+  border-bottom: 1px solid darkgray;
8
+  padding-left: 30px;
9
+  padding-top: 20px;
10
+  padding-bottom: 20px;
11
+}
12
+
13
+// 头部div
14
+.head-div {
15
+  width: 100%;
16
+  margin-left: 30px;
17
+  margin-right: 30px;
18
+  padding-top: 30px;
19
+}
20
+
21
+.button-div {
22
+  width: 100%;
23
+  margin-left: 30px;
24
+  margin-right: 30px;
25
+  margin-bottom: 30px;
26
+  float: right;
27
+}
28
+// 表格 div
29
+.content {
30
+  width: 100%;
31
+  margin-left: 30px;
32
+  margin-right: 30px;
33
+}

+ 148
- 0
src/pages/system/marketingActivities/snapUpList/index.vue Wyświetl plik

@@ -0,0 +1,148 @@
1
+<template>
2
+  <div class="subPage">
3
+    <div class="system-table-search">
4
+      <div class="flex-h">
5
+        <div class="flex-item flex-h">
6
+          <el-button size="mini" type="success">新增抢购活动</el-button>
7
+        </div>
8
+        <ul>
9
+          <li>
10
+            <el-select v-model="CaseId" placeholder="请选择案场">
11
+              <el-option
12
+                key="all"
13
+                label="所有案场"
14
+                value="all">
15
+              </el-option>
16
+              <el-option
17
+                v-for="item in cases"
18
+                :key="item.CaseId"
19
+                :label="item.CaseName"
20
+                :value="item.CaseId">
21
+              </el-option>
22
+            </el-select>
23
+          </li>
24
+          <li>
25
+            <el-select v-model="postData.state" placeholder="请选择状态">
26
+              <el-option
27
+                v-for="item in cases"
28
+                :key="item.CaseId"
29
+                :label="item.CaseName"
30
+                :value="item.CaseId">
31
+              </el-option>
32
+            </el-select>
33
+          </li>
34
+          <li>
35
+            <el-input
36
+              placeholder="请输入活动名称"
37
+              v-model="postData.name"
38
+              clearable>
39
+            </el-input>
40
+          </li>
41
+        </ul>
42
+        <el-button
43
+          size="mini"
44
+          type="primary">搜索</el-button>
45
+      </div>
46
+      <div class="moreFilter"></div>
47
+    </div>
48
+    <div class="system-table-box">
49
+      <el-table
50
+          :data="tableData"
51
+          style="width: 100%">
52
+          <el-table-column
53
+            prop="CaseName"
54
+            label="案场"
55
+            width="180">
56
+          </el-table-column>
57
+          <el-table-column
58
+            prop="ActivityName"
59
+            label="活动名称">
60
+          </el-table-column>
61
+          <el-table-column
62
+            prop="Status"
63
+            label="状态">
64
+          </el-table-column>
65
+          <el-table-column
66
+            prop="url"
67
+            label="活动链接">
68
+          </el-table-column>
69
+          <el-table-column
70
+            prop="address"
71
+            label="操作"
72
+            width="200">
73
+            <template slot-scope="scope">
74
+              <el-button
75
+                size="mini"
76
+                type="danger">删除</el-button>
77
+              <el-button
78
+                size="mini"
79
+                type="warning">停用</el-button>
80
+              <el-button
81
+                size="mini"
82
+                type="success">启用</el-button>
83
+              <el-button
84
+                size="mini"
85
+                type="success">获取记录</el-button>
86
+            </template>
87
+          </el-table-column>
88
+        </el-table>
89
+    </div>
90
+    <el-pagination
91
+      @current-change="handleCurrentChange"
92
+      :current-page.sync="postData.page"
93
+      :page-size="postData.pagesize"
94
+      layout="prev, pager, next, jumper"
95
+      :total="total">
96
+    </el-pagination>
97
+  </div>
98
+</template>
99
+<script>
100
+import { mapState } from 'vuex'
101
+export default {
102
+  data () {
103
+    return {
104
+      tableData: [],
105
+      postData: { // 表格搜索条件 //caseid: '', // 案场id
106
+        page: 1, // 当前页码
107
+        pageSize: 10, // 请求数据量
108
+        name: '', // 活动名称
109
+        state: '', // 状态
110
+      },
111
+      total: 0 // 数据条数
112
+    }
113
+  },
114
+  computed: {
115
+    ...mapState({
116
+      cases: x => x.app.cases.list,
117
+      defaultCaseId: x => x.app.cases.default
118
+    }),
119
+    CaseId: {
120
+      get () {
121
+        return this.postData.caseid || this.defaultCaseId
122
+      },
123
+      set (val) {
124
+        this.postData.caseid = val
125
+      }
126
+    }
127
+  },
128
+  mounted () {
129
+    this.getList()
130
+  },
131
+  methods: {
132
+    handleCurrentChange (val) {
133
+      this.$data.postData.page = val
134
+      this.getList()
135
+    },
136
+    redirection (pathName) { // 重定向
137
+      this.$router.push({ name: pathName })
138
+    },
139
+    getList () { // 获取数据列表
140
+    },
141
+  },
142
+}
143
+</script>
144
+
145
+<!-- Add "scoped" attribute to limit CSS to this component only -->
146
+<style lang="scss" scoped>
147
+@import "page.scss";
148
+</style>

+ 33
- 0
src/pages/system/marketingActivities/snapUpList/page.scss Wyświetl plik

@@ -0,0 +1,33 @@
1
+
2
+// 活动列表 标题
3
+.title{
4
+  font-size: 28px;
5
+  color: darkgray;
6
+  width: 100%;
7
+  border-bottom: 1px solid darkgray;
8
+  padding-left: 30px;
9
+  padding-top: 20px;
10
+  padding-bottom: 20px;
11
+}
12
+
13
+// 头部div
14
+.head-div {
15
+  width: 100%;
16
+  margin-left: 30px;
17
+  margin-right: 30px;
18
+  padding-top: 30px;
19
+}
20
+
21
+.button-div {
22
+  width: 100%;
23
+  margin-left: 30px;
24
+  margin-right: 30px;
25
+  margin-bottom: 30px;
26
+  float: right;
27
+}
28
+// 表格 div
29
+.content {
30
+  width: 100%;
31
+  margin-left: 30px;
32
+  margin-right: 30px;
33
+}

+ 12
- 0
src/pages/system/page.js Wyświetl plik

@@ -117,6 +117,8 @@ import caseRecord from './newOrder/caseRecord/index' // 月记录
117 117
 import marketingActivities from './marketingActivities/index' // 营销活动
118 118
 import activitiesList from './marketingActivities/activitiesList/index' // 活动列表
119 119
 import addActivities from './marketingActivities/addActivities/index' // 添加活动
120
+import listOfLotteryActivities from './marketingActivities/listOfLotteryActivities/index' // 抽奖活动列表
121
+import snapUpList from './marketingActivities/snapUpList/index' // 抢购活动列表
120 122
 
121 123
 import healthManager from './healthManager/index' // 健康管理
122 124
 import healthRecord from './healthManager/healthRecord/index' // 体检记录列表
@@ -645,6 +647,16 @@ export default {
645 647
             component: addActivities,
646 648
             children: []
647 649
           }]
650
+        }, { // 抽奖活动列表
651
+          path: 'listOfLotteryActivities',
652
+          name: 'listOfLotteryActivities',
653
+          component: listOfLotteryActivities,
654
+          children: []
655
+        }, { // 抢购活动列表
656
+          path: 'snapUpList',
657
+          name: 'snapUpList',
658
+          component: snapUpList,
659
+          children: []
648 660
         }]
649 661
       }, { // 健康管理
650 662
         path: 'healthManager',