webapp / GreenwayWeb

Commit ed7a1f3e9a69fc809c5992916b3f27c4af885f7b

Authored by 杨鑫
2 parents 3ea048fb 04473319

Merge branch 'master' of http://39.98.150.180/webapp/GreenwayWeb

Inline Side-by-side
Showing 20 changed files with 1074 additions and 579 deletions
admin-web-master/src/App.vue
  View file @ed7a1f3
1 <template> 1 <template>
2 - <div id="app" class="font" > 2 + <div id="app" class="font">
3 <el-dialog title="温馨提示" top="30vh" :visible.sync="tipShow" width="30%" center> 3 <el-dialog title="温馨提示" top="30vh" :visible.sync="tipShow" width="30%" center>
4 - <span  
5 - >为保护个人隐私信息，系统自动对敏感数据进行脱敏。如需编辑、查看完整信息，可通过“用户隐私二次认证”功能进行验证，验证通过之后，24小时内可查看完整信息。</span  
6 - > 4 + <span>为保护个人隐私信息，系统自动对敏感数据进行脱敏。如需编辑、查看完整信息，可通过“用户隐私二次认证”功能进行验证，验证通过之后，24小时内可查看完整信息。</span>
7 <span slot="footer" class="dialog-footer"> 5 <span slot="footer" class="dialog-footer">
8 <el-button @click="tipShow = false">关闭</el-button> 6 <el-button @click="tipShow = false">关闭</el-button>
9 </span> 7 </span>
@@ -13,20 +11,22 @@ @@ -13,20 +11,22 @@
13 </template> 11 </template>
14 12
15 <script> 13 <script>
16 -import { getPrivacySwitch } from "@/api/privacy";  
17 -import axios from "axios"  
18 -import vuex from 'vuex'  
19 -  
20 -const JM = require('@/utils/rsaEncrypt.js')  
21 -export default {  
22 - name: "App",  
23 - data() {  
24 - return {  
25 - tipShow: false,  
26 -  
27 - };  
28 - },  
29 - computed: { 14 + import {
  15 + getPrivacySwitch
  16 + } from "@/api/privacy";
  17 + import axios from "axios"
  18 + import vuex from 'vuex'
  19 + import {mapActions } from "vuex";
  20 + const JM = require('@/utils/rsaEncrypt.js')
  21 + export default {
  22 + name: "App",
  23 + data() {
  24 + return {
  25 + tipShow: false,
  26 +
  27 + };
  28 + },
  29 + computed: {
30 fontFaceStyle() { 30 fontFaceStyle() {
31 return ` 31 return `
32 @font-face { 32 @font-face {
@@ -40,83 +40,104 @@ export default { @@ -40,83 +40,104 @@ export default {
40 `; 40 `;
41 } 41 }
42 }, 42 },
43 - mounted() {  
44 - const styleElement = document.createElement('style');  
45 - styleElement.innerHTML = this.fontFaceStyle;  
46 - document.head.appendChild(styleElement);  
47 - },  
48 - created() { 43 + mounted() {
  44 + const styleElement = document.createElement('style');
  45 + styleElement.innerHTML = this.fontFaceStyle;
  46 + document.head.appendChild(styleElement);
  47 + },
  48 + created() {
49 49
50 - // this.fetchData()  
51 - if (this.$store.state.user.token) {  
52 - this.getPrivacySwitch();  
53 - }else{  
54 - this.handleLogin()  
55 - }  
56 - },  
57 - methods: {  
58 - handleLogin () {  
59 -  
60 - const data = {  
61 - username: JM.encrypt('admin'),  
62 - password: JM.encrypt('ILoveChina@666'),  
63 - // username: JM.encrypt('15827188456'),  
64 - // password: JM.encrypt('ILoveChina@666'),  
65 - rememberMe: false  
66 - }  
67 - this.$store  
68 - .dispatch('user/login', data)  
69 - .then(() => {  
70 - this.$router.push({ path: '/investigation/index' }) 50 + // this.fetchData()
  51 + if (this.$store.state.user.token) {
  52 + this.getPrivacySwitch();
  53 + } else {
  54 + this.handleLogin()
  55 + }
  56 + console.log('========================,' )
  57 + this.getzdlist()
  58 + },
  59 + methods: {
  60 + ...mapActions(["getChildsall"]),
  61 + async getzdlist() {
  62 + await this.getChildsall()
  63 + console.error(this.$store.state.cent.regionList)
  64 + },
  65 + handleLogin() {
71 66
  67 + const data = {
  68 + username: JM.encrypt('admin'),
  69 + password: JM.encrypt('ILoveChina@666'),
  70 + // username: JM.encrypt('15827188456'),
  71 + // password: JM.encrypt('ILoveChina@666'),
  72 + rememberMe: false
  73 + }
  74 + this.$store
  75 + .dispatch('user/login', data)
  76 + .then(() => {
  77 + this.$router.push({
  78 + path: '/investigation/index'
72 }) 79 })
73 80
74 - }, 81 + })
75 82
76 - getPrivacySwitch() {  
77 - getPrivacySwitch().then((res) => {  
78 - var IsTipshow = localStorage.getItem("IsTipshow");  
79 - localStorage.setItem('privacyTime', res.data)  
80 - if (this.$store.state.user.token && !IsTipshow && res.data === 0) {  
81 - this.tipShow = true;  
82 - localStorage.setItem("IsTipshow", true);  
83 - }  
84 - }); 83 + },
  84 +
  85 + getPrivacySwitch() {
  86 + getPrivacySwitch().then((res) => {
  87 + var IsTipshow = localStorage.getItem("IsTipshow");
  88 + localStorage.setItem('privacyTime', res.data)
  89 + if (this.$store.state.user.token && !IsTipshow && res.data === 0) {
  90 + this.tipShow = true;
  91 + localStorage.setItem("IsTipshow", true);
  92 + }
  93 + });
85 } 94 }
86 - }  
87 -}; 95 + }
  96 + };
88 </script> 97 </script>
89 <style> 98 <style>
90 - .el-month-table td .cell:hover{  
91 - color:#3F9B6A ;  
92 - }  
93 - .el-date-picker__header-label.active, .el-date-picker__header-label:hover{  
94 - color:#3F9B6A ;  
95 - }  
96 - .el-month-table td.today .cell{  
97 - color:#3F9B6A ;  
98 - }  
99 - .el-month-table td.current:not(.disabled) .cell{  
100 - color:#3F9B6A ;  
101 - }  
102 - .el-year-table td.today .cell{  
103 - color:#3F9B6A ;  
104 - }  
105 - .el-year-table td .cell:hover, .el-year-table td.current:not(.disabled) .cell{  
106 - color:#3F9B6A ;  
107 - }  
108 -.el-backtop, .el-calendar-table td.is-today{  
109 - color:#3F9B6A ;  
110 -}  
111 -.tableBtn {  
112 - display: inline-block;  
113 - margin-right: 10px;  
114 - color: #ACACAC;  
115 - cursor: pointer  
116 -} 99 + .el-month-table td .cell:hover {
  100 + color: #3F9B6A;
  101 + }
  102 +
  103 + .el-date-picker__header-label.active,
  104 + .el-date-picker__header-label:hover {
  105 + color: #3F9B6A;
  106 + }
  107 +
  108 + .el-month-table td.today .cell {
  109 + color: #3F9B6A;
  110 + }
  111 +
  112 + .el-month-table td.current:not(.disabled) .cell {
  113 + color: #3F9B6A;
  114 + }
  115 +
  116 + .el-year-table td.today .cell {
  117 + color: #3F9B6A;
  118 + }
  119 +
  120 + .el-year-table td .cell:hover,
  121 + .el-year-table td.current:not(.disabled) .cell {
  122 + color: #3F9B6A;
  123 + }
  124 +
  125 + .el-backtop,
  126 + .el-calendar-table td.is-today {
  127 + color: #3F9B6A;
  128 + }
  129 +
  130 + .tableBtn {
  131 + display: inline-block;
  132 + margin-right: 10px;
  133 + color: #ACACAC;
  134 + cursor: pointer
  135 + }
  136 +
117 .el-pagination.is-background .el-pager li:not(.disabled).active { 137 .el-pagination.is-background .el-pager li:not(.disabled).active {
118 background-color: #3F9B6A; 138 background-color: #3F9B6A;
119 } 139 }
  140 +
120 .buttonHover:hover { 141 .buttonHover:hover {
121 color: #3f9b6a !important; 142 color: #3f9b6a !important;
122 border-color: #c5e1d2 !important; 143 border-color: #c5e1d2 !important;
@@ -127,198 +148,260 @@ export default { @@ -127,198 +148,260 @@ export default {
127 .greens { 148 .greens {
128 color: #3F9B6A; 149 color: #3F9B6A;
129 } 150 }
130 -.font{  
131 - font-family: "Alibaba-PuHuiTi-Regular";  
132 -}  
133 -  
134 -.el-submenu__title{  
135 - font-family: "Alibaba-PuHuiTi-Bold";  
136 -}  
137 -.el-dialog__header {  
138 - background-color: #fafafa;  
139 - text-align: left;  
140 - border-bottom:1px solid #EFEFEF;  
141 -}  
142 -  
143 -.el-dialog__title {  
144 - color: #000000e6;  
145 - /* color: #FFFFFF; */  
146 -}  
147 -.el-select-dropdown__item.selected{ 151 +
  152 + .font {
  153 + font-family: "Alibaba-PuHuiTi-Regular";
  154 + }
  155 +
  156 + .el-submenu__title {
  157 + font-family: "Alibaba-PuHuiTi-Bold";
  158 + }
  159 +
  160 + .el-dialog__header {
  161 + background-color: #fafafa;
  162 + text-align: left;
  163 + border-bottom: 1px solid #EFEFEF;
  164 + }
  165 +
  166 + .el-dialog__title {
  167 + color: #000000e6;
  168 + /* color: #FFFFFF; */
  169 + }
  170 +
  171 + .el-select-dropdown__item.selected {
148 color: #3F9B6A; 172 color: #3F9B6A;
149 -} 173 + }
150 174
151 -.el-pagination__sizes .el-input .el-input__inner:hover{ 175 + .el-pagination__sizes .el-input .el-input__inner:hover {
152 border-color: #3F9B6A; 176 border-color: #3F9B6A;
153 -} 177 + }
  178 +
154 ::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active { 179 ::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
155 background-color: #3F9B6A; 180 background-color: #3F9B6A;
156 } 181 }
157 - .el-input__inner:focus {  
158 - border: #3F9B6A 1px solid;  
159 - }  
160 - .el-input__inner:hover {  
161 - border: #3F9B6A 1px solid;  
162 - }  
163 - ::v-deep .el-select .el-input.is-focus .el-input__inner{  
164 - border-color:#3F9B6A  
165 - }  
166 - .el-form-item__label{  
167 - font-weight: 100;  
168 - font-size: 14px;  
169 - color:#000000e6;  
170 -  
171 - }  
172 - .el-tabs__item:hover{  
173 - color:#3F9B6A;  
174 - }  
175 - .el-radio__input.is-checked+.el-radio__label{  
176 - color:#3F9B6A;  
177 - }  
178 - .el-dialog__headerbtn:focus .el-dialog__close, .el-dialog__headerbtn:hover .el-dialog__close{  
179 - color:#3F9B6A;  
180 - }  
181 - .custom-message {  
182 - background-color: #fff; /* 设置背景颜色 */  
183 - border:0px;  
184 - }  
185 - .custom-message .el-message__icon {  
186 - color:#3F9B6A;  
187 -  
188 - }  
189 - .el-checkbox__input.is-checked .el-checkbox__inner, .el-checkbox__input.is-indeterminate .el-checkbox__inner{  
190 - background-color:#3F9B6A;  
191 - border-color:#3F9B6A;  
192 - }  
193 - .el-checkbox__inner:hover{  
194 - border-color:#3F9B6A;  
195 - }  
196 - .el-textarea__inner:focus{  
197 - border-color:#3F9B6A;  
198 - }  
199 - .el-select .el-input__inner:focus{  
200 - border-color:#3F9B6A;  
201 - }  
202 - .el-button:focus, .el-button:hover{  
203 - /* color:#606266; 182 +
  183 + .el-input__inner:focus {
  184 + border: #3F9B6A 1px solid;
  185 + }
  186 +
  187 + .el-input__inner:hover {
  188 + border: #3F9B6A 1px solid;
  189 + }
  190 +
  191 + ::v-deep .el-select .el-input.is-focus .el-input__inner {
  192 + border-color: #3F9B6A
  193 + }
  194 +
  195 + .el-form-item__label {
  196 + font-weight: 100;
  197 + font-size: 14px;
  198 + color: #000000e6;
  199 +
  200 + }
  201 +
  202 + .el-tabs__item:hover {
  203 + color: #3F9B6A;
  204 + }
  205 +
  206 + .el-radio__input.is-checked+.el-radio__label {
  207 + color: #3F9B6A;
  208 + }
  209 +
  210 + .el-dialog__headerbtn:focus .el-dialog__close,
  211 + .el-dialog__headerbtn:hover .el-dialog__close {
  212 + color: #3F9B6A;
  213 + }
  214 +
  215 + .custom-message {
  216 + background-color: #fff;
  217 + /* 设置背景颜色 */
  218 + border: 0px;
  219 + }
  220 +
  221 + .custom-message .el-message__icon {
  222 + color: #3F9B6A;
  223 +
  224 + }
  225 +
  226 + .el-checkbox__input.is-checked .el-checkbox__inner,
  227 + .el-checkbox__input.is-indeterminate .el-checkbox__inner {
  228 + background-color: #3F9B6A;
  229 + border-color: #3F9B6A;
  230 + }
  231 +
  232 + .el-checkbox__inner:hover {
  233 + border-color: #3F9B6A;
  234 + }
  235 +
  236 + .el-textarea__inner:focus {
  237 + border-color: #3F9B6A;
  238 + }
  239 +
  240 + .el-select .el-input__inner:focus {
  241 + border-color: #3F9B6A;
  242 + }
  243 +
  244 + .el-button:focus,
  245 + .el-button:hover {
  246 + /* color:#606266;
204 border-color:#DCDFE6; 247 border-color:#DCDFE6;
205 background-color:#fff; */ 248 background-color:#fff; */
206 - }  
207 - .el-button--primary{  
208 - background-color:#3F9B6A;  
209 - border-color:#3F9B6A;  
210 - }  
211 - .el-button--primary:focus, .el-button--primary:hover{  
212 - color:#fff;  
213 - background:#3F9B6A;  
214 - border-color:#3F9B6A;  
215 - }  
216 -.el-checkbox__input.is-focus .el-checkbox__inner{  
217 - border-color:#3F9B6A;  
218 -}  
219 -.el-date-table td.end-date span, .el-date-table td.start-date span{  
220 - background-color:#3F9B6A;  
221 -}  
222 -.el-date-table td.in-range div{  
223 - background-color:#D3E6CC;  
224 -}  
225 -.el-date-table td.available:hover{  
226 - color:#3F9B6A;  
227 - background-color:#D3E6CC;  
228 -}  
229 -.el-date-table td.today span{  
230 - color:#3F9B6A;  
231 -}  
232 -.el-picker-panel__footer .el-button--text{  
233 - color:#3F9B6A;  
234 -}  
235 -.el-button.is-plain:focus, .el-button.is-plain:hover{  
236 - color:#3F9B6A;  
237 - border-color:#3F9B6A;  
238 - background-color:#fff;  
239 -}  
240 -  
241 -.el-picker-panel__icon-btn:hover{  
242 - color:#3F9B6A;  
243 -}  
244 -.el-time-panel__btn.confirm{  
245 - color:#3F9B6A;  
246 -}  
247 -.el-table .descending .sort-caret.descending{  
248 - border-top-color:#3F9B6A;  
249 -}  
250 -.el-table .ascending .sort-caret.ascending{  
251 - border-bottom-color:#3F9B6A;  
252 -}  
253 -.el-range-editor.is-active, .el-range-editor.is-active:hover, .el-select .el-input.is-focus .el-input__inner{  
254 - border-color:#3F9B6A;  
255 -}  
256 -.el-radio-button__inner:hover{  
257 - color:#3F9B6A;  
258 -}  
259 -.el-radio-button__orig-radio:checked+.el-radio-button__inner{  
260 - background-color:#3F9B6A;  
261 - border-color:#3F9B6A;  
262 - -webkit-box-shadow:none;  
263 - box-shadow:none;  
264 -}  
265 - .el-button{  
266 - min-width: 88px;  
267 - font-size: 14px;  
268 - height:32px;  
269 - padding:8px 15px;  
270 - font-weight: 400;  
271 } 249 }
272 - .el-button:hover{  
273 - opacity: 0.8;  
274 - }  
275 - .el-upload--picture-card:hover, .el-upload:focus{  
276 - border-color:#3F9B6A;  
277 - color:#3F9B6A;  
278 - }  
279 - .el-cascader .el-input .el-input__inner:focus, .el-cascader .el-input.is-focus .el-input__inner{  
280 - border-color:#3F9B6A;  
281 - }  
282 - .el-cascader-node.in-active-path, .el-cascader-node.is-active, .el-cascader-node.is-selectable.in-checked-path{  
283 - color:#3F9B6A;  
284 - }  
285 - .el-radio__input.is-checked .el-radio__inner{  
286 - border-color:#3F9B6A;  
287 - background-color: #3F9B6A;  
288 - }  
289 - .el-radio__inner:hover{  
290 - border-color:#3F9B6A;  
291 - }  
292 - .app-breadcrumb.el-breadcrumb .no-redirect{  
293 - font-size: 14px;  
294 - color: #0006 !important;  
295 - }  
296 -.el-input__inner::placeholder {  
297 - color:#999999;  
298 -}  
299 -.el-table .el-table__cell{  
300 - padding:9px 0;  
301 - text-align:left !important;  
302 -}  
303 - .el-table tr:hover{  
304 - background-color: #F0F7F3 !important;  
305 - }  
306 - .el-form-item__label {  
307 - font-weight: 100;  
308 - font-size: 14px;  
309 - color:#000000e6;  
310 - }  
311 - .el-input__inner{  
312 - height:32px;  
313 - line-height:32px;  
314 250
315 - }  
316 - .el-input__icon{  
317 - line-height:32px;  
318 - }  
319 - .el-form-item{  
320 - margin-bottom:16px;  
321 - } 251 + .el-button--primary {
  252 + background-color: #3F9B6A;
  253 + border-color: #3F9B6A;
  254 + }
  255 +
  256 + .el-button--primary:focus,
  257 + .el-button--primary:hover {
  258 + color: #fff;
  259 + background: #3F9B6A;
  260 + border-color: #3F9B6A;
  261 + }
  262 +
  263 + .el-checkbox__input.is-focus .el-checkbox__inner {
  264 + border-color: #3F9B6A;
  265 + }
  266 +
  267 + .el-date-table td.end-date span,
  268 + .el-date-table td.start-date span {
  269 + background-color: #3F9B6A;
  270 + }
  271 +
  272 + .el-date-table td.in-range div {
  273 + background-color: #D3E6CC;
  274 + }
  275 +
  276 + .el-date-table td.available:hover {
  277 + color: #3F9B6A;
  278 + background-color: #D3E6CC;
  279 + }
  280 +
  281 + .el-date-table td.today span {
  282 + color: #3F9B6A;
  283 + }
  284 +
  285 + .el-picker-panel__footer .el-button--text {
  286 + color: #3F9B6A;
  287 + }
  288 +
  289 + .el-button.is-plain:focus,
  290 + .el-button.is-plain:hover {
  291 + color: #3F9B6A;
  292 + border-color: #3F9B6A;
  293 + background-color: #fff;
  294 + }
  295 +
  296 + .el-picker-panel__icon-btn:hover {
  297 + color: #3F9B6A;
  298 + }
  299 +
  300 + .el-time-panel__btn.confirm {
  301 + color: #3F9B6A;
  302 + }
  303 +
  304 + .el-table .descending .sort-caret.descending {
  305 + border-top-color: #3F9B6A;
  306 + }
  307 +
  308 + .el-table .ascending .sort-caret.ascending {
  309 + border-bottom-color: #3F9B6A;
  310 + }
  311 +
  312 + .el-range-editor.is-active,
  313 + .el-range-editor.is-active:hover,
  314 + .el-select .el-input.is-focus .el-input__inner {
  315 + border-color: #3F9B6A;
  316 + }
  317 +
  318 + .el-radio-button__inner:hover {
  319 + color: #3F9B6A;
  320 + }
  321 +
  322 + .el-radio-button__orig-radio:checked+.el-radio-button__inner {
  323 + background-color: #3F9B6A;
  324 + border-color: #3F9B6A;
  325 + -webkit-box-shadow: none;
  326 + box-shadow: none;
  327 + }
  328 +
  329 + .el-button {
  330 + min-width: 88px;
  331 + font-size: 14px;
  332 + height: 32px;
  333 + padding: 8px 15px;
  334 + font-weight: 400;
  335 + }
  336 +
  337 + .el-button:hover {
  338 + opacity: 0.8;
  339 + }
  340 +
  341 + .el-upload--picture-card:hover,
  342 + .el-upload:focus {
  343 + border-color: #3F9B6A;
  344 + color: #3F9B6A;
  345 + }
  346 +
  347 + .el-cascader .el-input .el-input__inner:focus,
  348 + .el-cascader .el-input.is-focus .el-input__inner {
  349 + border-color: #3F9B6A;
  350 + }
  351 +
  352 + .el-cascader-node.in-active-path,
  353 + .el-cascader-node.is-active,
  354 + .el-cascader-node.is-selectable.in-checked-path {
  355 + color: #3F9B6A;
  356 + }
  357 +
  358 + .el-radio__input.is-checked .el-radio__inner {
  359 + border-color: #3F9B6A;
  360 + background-color: #3F9B6A;
  361 + }
  362 +
  363 + .el-radio__inner:hover {
  364 + border-color: #3F9B6A;
  365 + }
  366 +
  367 + .app-breadcrumb.el-breadcrumb .no-redirect {
  368 + font-size: 14px;
  369 + color: #0006 !important;
  370 + }
  371 +
  372 + .el-input__inner::placeholder {
  373 + color: #999999;
  374 + }
  375 +
  376 + .el-table .el-table__cell {
  377 + padding: 9px 0;
  378 + text-align: left !important;
  379 + }
  380 +
  381 + .el-table tr:hover {
  382 + background-color: #F0F7F3 !important;
  383 + }
  384 +
  385 + .el-form-item__label {
  386 + font-weight: 100;
  387 + font-size: 14px;
  388 + color: #000000e6;
  389 + }
  390 +
  391 + .el-input__inner {
  392 + height: 32px;
  393 + line-height: 32px;
  394 +
  395 + }
  396 +
  397 + .el-input__icon {
  398 + line-height: 32px;
  399 + }
  400 +
  401 + .el-form-item {
  402 + margin-bottom: 16px;
  403 + }
  404 +
322 .titles { 405 .titles {
323 font-size: 16px; 406 font-size: 16px;
324 position: relative; 407 position: relative;
@@ -336,309 +419,382 @@ export default { @@ -336,309 +419,382 @@ export default {
336 left: 0; 419 left: 0;
337 border-radius: 5px; 420 border-radius: 5px;
338 } 421 }
339 -.duiqi { 422 +
  423 + .duiqi {
340 line-height: 40px; 424 line-height: 40px;
341 } 425 }
342 </style> 426 </style>
343 <style lang="scss"> 427 <style lang="scss">
344 - .XDD_css {  
345 - margin-top: 10vh;  
346 - margin-left: 20%;  
347 - max-height:550px;  
348 - overflow-y: auto;  
349 - .el-dialog__body {  
350 - padding: 0px;  
351 - background-color: #fff;  
352 - }  
353 -  
354 - .el-dialog__header {  
355 - background-color: #fff;  
356 - padding: 10px 20px 10px 20px;  
357 - border-bottom: 1px solid #EFEFEF;  
358 - }  
359 -  
360 - .el-dialog__title {  
361 - font-size: 14px;  
362 - color: #000000e6;  
363 - }  
364 - }  
365 - .xiaoguo_css{  
366 - margin-top: 30vh !important;  
367 - margin-left: 25%;  
368 - .el-dialog__header{  
369 - padding:0;  
370 - }  
371 - .el-tabs--border-card {  
372 - border: none;  
373 - -webkit-box-shadow:none;  
374 - box-shadow:none;  
375 - .el-tabs__content{  
376 - border: 1px solid #E4E7ED;  
377 - padding:0;  
378 - }  
379 - .el-tabs__header{  
380 - background-color: #fff;  
381 - border-bottom:none;  
382 - }  
383 - .el-tabs__content{  
384 - border: none;  
385 - }  
386 - .el-tabs__header .el-tabs__item{  
387 - border: none;  
388 - margin-right: 10px;  
389 - background-color: #F2F2F2;  
390 - font-size:14px;  
391 - border-top-left-radius: 8px;  
392 - border-top-right-radius: 8px;  
393 - padding:0 15px;  
394 - }  
395 - .el-tabs__header .el-tabs__item.is-active{  
396 - color:#fff;  
397 - background-color: #3F9B6A;  
398 - }  
399 - .el-tabs__header .el-tabs__item:not(.is-disabled):hover{  
400 - color:#3F9B6A;  
401 - }  
402 - } 428 + .XDD_css {
  429 + margin-top: 10vh;
  430 + margin-left: 20%;
  431 + max-height: 550px;
  432 + overflow-y: auto;
  433 +
  434 + .el-dialog__body {
  435 + padding: 0px;
  436 + background-color: #fff;
403 } 437 }
404 - .yaunXin_css{  
405 - margin-top: 30vh !important;  
406 - margin-left: 25%;  
407 - .el-dialog__header{  
408 - padding:0;  
409 - }  
410 - .el-tabs--border-card {  
411 - border: none;  
412 - -webkit-box-shadow:none;  
413 - box-shadow:none;  
414 - .el-tabs__content{  
415 - border: 1px solid #E4E7ED;  
416 - padding:0;  
417 - }  
418 - .el-tabs__header{  
419 - background-color: #fff;  
420 - border-bottom:none;  
421 - }  
422 - .el-tabs__content{  
423 - border: none;  
424 - }  
425 - .el-tabs__header .el-tabs__item{  
426 - border: none;  
427 - margin-right: 10px;  
428 - background-color: #F2F2F2;  
429 - font-size:14px;  
430 - border-top-left-radius: 8px;  
431 - border-top-right-radius: 8px;  
432 - padding:0 15px;  
433 - }  
434 - .el-tabs__header .el-tabs__item.is-active{  
435 - color:#fff;  
436 - background-color: #3F9B6A;  
437 - }  
438 - .el-tabs__header .el-tabs__item:not(.is-disabled):hover{  
439 - color:#3F9B6A;  
440 - }  
441 - }  
442 438
  439 + .el-dialog__header {
  440 + background-color: #fff;
  441 + padding: 10px 20px 10px 20px;
  442 + border-bottom: 1px solid #EFEFEF;
443 } 443 }
444 - .fenxi_css{  
445 - margin-top: 9vh !important;  
446 - margin-left: 15% !important;  
447 - .el-dialog__header{  
448 - padding:0;  
449 - }  
450 - .el-tabs--border-card {  
451 - border: none;  
452 - -webkit-box-shadow:none;  
453 - box-shadow:none;  
454 - .el-tabs__content{  
455 - border: 1px solid #E4E7ED;  
456 - padding:0;  
457 - }  
458 - .el-tabs__header{  
459 - background-color: #fff;  
460 - border-bottom:none;  
461 - }  
462 - .el-tabs__content{  
463 - border: none;  
464 - }  
465 - .el-tabs__header .el-tabs__item{  
466 - border: none;  
467 - margin-right: 10px;  
468 - background-color: #F2F2F2;  
469 - font-size:14px;  
470 - border-top-left-radius: 8px;  
471 - border-top-right-radius: 8px;  
472 - padding:0 15px;  
473 - }  
474 - .el-tabs__header .el-tabs__item.is-active{  
475 - color:#fff;  
476 - background-color: #3F9B6A;  
477 - }  
478 - .el-tabs__header .el-tabs__item:not(.is-disabled):hover{  
479 - color:#3F9B6A;  
480 - }  
481 - }  
482 444
  445 + .el-dialog__title {
  446 + font-size: 14px;
  447 + color: #000000e6;
483 } 448 }
484 - .el-tree-node__label{  
485 - color:#000000e6; 449 + }
  450 +
  451 + .xiaoguo_css {
  452 + margin-top: 30vh !important;
  453 + margin-left: 25%;
  454 +
  455 + .el-dialog__header {
  456 + padding: 0;
486 } 457 }
487 - .bian_css{  
488 - margin-top:9vh !important;  
489 - margin-left:20%;  
490 - max-height:600px;  
491 - overflow-y: auto;  
492 - .el-dialog__body {  
493 - padding: 0px;  
494 - background-color: #fff;  
495 - }  
496 - .el-dialog__header {  
497 - background-color: #fff;  
498 - padding:10px 20px 10px 20px;  
499 - border-bottom: 1px solid #EFEFEF;  
500 - }  
501 - .el-dialog__title {  
502 - font-size: 14px;  
503 - color: #000000e6;  
504 - }  
505 - .el-date-table td.available:hover{  
506 - background-color:#3F9B6A;  
507 - }  
508 - .el-date-table td.start-date span{  
509 - background-color:#3F9B6A;  
510 - } 458 +
  459 + .el-tabs--border-card {
  460 + border: none;
  461 + -webkit-box-shadow: none;
  462 + box-shadow: none;
  463 +
  464 + .el-tabs__content {
  465 + border: 1px solid #E4E7ED;
  466 + padding: 0;
  467 + }
  468 +
  469 + .el-tabs__header {
  470 + background-color: #fff;
  471 + border-bottom: none;
  472 + }
  473 +
  474 + .el-tabs__content {
  475 + border: none;
  476 + }
  477 +
  478 + .el-tabs__header .el-tabs__item {
  479 + border: none;
  480 + margin-right: 10px;
  481 + background-color: #F2F2F2;
  482 + font-size: 14px;
  483 + border-top-left-radius: 8px;
  484 + border-top-right-radius: 8px;
  485 + padding: 0 15px;
  486 + }
  487 +
  488 + .el-tabs__header .el-tabs__item.is-active {
  489 + color: #fff;
  490 + background-color: #3F9B6A;
  491 + }
  492 +
  493 + .el-tabs__header .el-tabs__item:not(.is-disabled):hover {
  494 + color: #3F9B6A;
511 } 495 }
512 - .tongyong_css{  
513 - margin-top:9vh !important;  
514 - margin-left:20%;  
515 - max-height:800px;  
516 - overflow-y: auto;  
517 - .el-dialog__body {  
518 - padding: 0px;  
519 - background-color: #fff;  
520 - }  
521 - .el-dialog__header {  
522 - background-color: #fff;  
523 - padding:0;  
524 - }  
525 - .el-dialog__title {  
526 - font-size: 14px;  
527 - color: #000000e6;  
528 - }  
529 - .el-date-table td.available:hover{  
530 - background-color:#3F9B6A;  
531 - }  
532 - .el-date-table td.start-date span{  
533 - background-color:#3F9B6A;  
534 - }  
535 - }  
536 - .Xintongyong_css{  
537 - margin-top:9vh !important;  
538 - margin-left:20%;  
539 - overflow-y: auto;  
540 - .el-dialog__body {  
541 - padding: 0px;  
542 - background-color: #fff;  
543 - }  
544 - .el-dialog__header {  
545 - background-color: #fff;  
546 - padding:0;  
547 - }  
548 - .el-dialog__title {  
549 - font-size: 14px;  
550 - color: #000000e6;  
551 - }  
552 - .el-date-table td.available:hover{  
553 - background-color:#3F9B6A;  
554 - }  
555 - .el-date-table td.start-date span{  
556 - background-color:#3F9B6A;  
557 - }  
558 - }  
559 -.el-descriptions__body .el-descriptions__table .el-descriptions-item__cell{  
560 - line-height:1;  
561 -}  
562 -.el-tabs__item.is-active{  
563 - color:#3F9B6A;  
564 -}  
565 -.el-tabs__active-bar{  
566 - background-color:#3F9B6A;  
567 -}  
568 -.el-step__title.is-process{  
569 - font-weight: 100;  
570 -}  
571 -.el-pagination.is-background .el-pager li:not(.disabled):hover{  
572 - color:#3F9B6A  
573 -}  
574 -.el-table__row{  
575 - font-size:14px;  
576 - color:#000000e6;  
577 -}  
578 -.el-upload-list__item.is-success .el-upload-list__item-name:focus, .el-upload-list__item.is-success .el-upload-list__item-name:hover {  
579 - color: #3F9B6A;  
580 - cursor: pointer;  
581 -}  
582 -.actSpye_dialog{  
583 - .el-dialog__header{  
584 - padding: 0px;  
585 } 496 }
586 - .el-dialog__body{  
587 - padding:0px; 497 + }
  498 +
  499 + .yaunXin_css {
  500 + margin-top: 30vh !important;
  501 + margin-left: 25%;
  502 +
  503 + .el-dialog__header {
  504 + padding: 0;
  505 + }
  506 +
  507 + .el-tabs--border-card {
  508 + border: none;
  509 + -webkit-box-shadow: none;
  510 + box-shadow: none;
  511 +
  512 + .el-tabs__content {
  513 + border: 1px solid #E4E7ED;
  514 + padding: 0;
  515 + }
  516 +
  517 + .el-tabs__header {
  518 + background-color: #fff;
  519 + border-bottom: none;
  520 + }
  521 +
  522 + .el-tabs__content {
  523 + border: none;
  524 + }
  525 +
  526 + .el-tabs__header .el-tabs__item {
  527 + border: none;
  528 + margin-right: 10px;
  529 + background-color: #F2F2F2;
  530 + font-size: 14px;
  531 + border-top-left-radius: 8px;
  532 + border-top-right-radius: 8px;
  533 + padding: 0 15px;
  534 + }
  535 +
  536 + .el-tabs__header .el-tabs__item.is-active {
  537 + color: #fff;
  538 + background-color: #3F9B6A;
  539 + }
  540 +
  541 + .el-tabs__header .el-tabs__item:not(.is-disabled):hover {
  542 + color: #3F9B6A;
  543 + }
588 } 544 }
  545 +
589 } 546 }
590 - .liucheng_css{  
591 - .el-dialog__header{  
592 - padding: 10px 20px;  
593 - border-bottom: 1px solid #EFEFEF;  
594 - background-color:#fff;  
595 547
  548 + .fenxi_css {
  549 + margin-top: 9vh !important;
  550 + margin-left: 15% !important;
  551 +
  552 + .el-dialog__header {
  553 + padding: 0;
  554 + }
  555 +
  556 + .el-tabs--border-card {
  557 + border: none;
  558 + -webkit-box-shadow: none;
  559 + box-shadow: none;
  560 +
  561 + .el-tabs__content {
  562 + border: 1px solid #E4E7ED;
  563 + padding: 0;
  564 + }
  565 +
  566 + .el-tabs__header {
  567 + background-color: #fff;
  568 + border-bottom: none;
  569 + }
  570 +
  571 + .el-tabs__content {
  572 + border: none;
596 } 573 }
597 - .el-dialog__title{  
598 - color:#000;  
599 - font-size:14px; 574 +
  575 + .el-tabs__header .el-tabs__item {
  576 + border: none;
  577 + margin-right: 10px;
  578 + background-color: #F2F2F2;
  579 + font-size: 14px;
  580 + border-top-left-radius: 8px;
  581 + border-top-right-radius: 8px;
  582 + padding: 0 15px;
  583 + }
  584 +
  585 + .el-tabs__header .el-tabs__item.is-active {
  586 + color: #fff;
  587 + background-color: #3F9B6A;
600 } 588 }
601 - .el-dialog__body{  
602 - padding:0px; 589 +
  590 + .el-tabs__header .el-tabs__item:not(.is-disabled):hover {
  591 + color: #3F9B6A;
603 } 592 }
604 } 593 }
605 - .el-table__body tr.current-row>td.el-table__cell, .el-table__body tr.selection-row>td.el-table__cell{  
606 - background-color: transparent; 594 +
  595 + }
  596 +
  597 + .el-tree-node__label {
  598 + color: #000000e6;
  599 + }
  600 +
  601 + .bian_css {
  602 + margin-top: 9vh !important;
  603 + margin-left: 20%;
  604 + max-height: 600px;
  605 + overflow-y: auto;
  606 +
  607 + .el-dialog__body {
  608 + padding: 0px;
  609 + background-color: #fff;
  610 + }
  611 +
  612 + .el-dialog__header {
  613 + background-color: #fff;
  614 + padding: 10px 20px 10px 20px;
  615 + border-bottom: 1px solid #EFEFEF;
  616 + }
  617 +
  618 + .el-dialog__title {
  619 + font-size: 14px;
  620 + color: #000000e6;
  621 + }
  622 +
  623 + .el-date-table td.available:hover {
  624 + background-color: #3F9B6A;
  625 + }
  626 +
  627 + .el-date-table td.start-date span {
  628 + background-color: #3F9B6A;
  629 + }
  630 + }
  631 +
  632 + .tongyong_css {
  633 + margin-top: 9vh !important;
  634 + margin-left: 20%;
  635 + max-height: 800px;
  636 + overflow-y: auto;
  637 +
  638 + .el-dialog__body {
  639 + padding: 0px;
  640 + background-color: #fff;
  641 + }
  642 +
  643 + .el-dialog__header {
  644 + background-color: #fff;
  645 + padding: 0;
607 } 646 }
608 - .el-checkbox__input.is-checked+.el-checkbox__label{  
609 - color:#3F9B6A; 647 +
  648 + .el-dialog__title {
  649 + font-size: 14px;
  650 + color: #000000e6;
  651 + }
  652 +
  653 + .el-date-table td.available:hover {
  654 + background-color: #3F9B6A;
  655 + }
  656 +
  657 + .el-date-table td.start-date span {
  658 + background-color: #3F9B6A;
610 } 659 }
  660 + }
  661 +
  662 + .Xintongyong_css {
  663 + margin-top: 9vh !important;
  664 + margin-left: 20%;
  665 + overflow-y: auto;
611 666
612 - .el-checkbox__input.is-disabled+span.el-checkbox__label{  
613 - color: #606266; 667 + .el-dialog__body {
  668 + padding: 0px;
  669 + background-color: #fff;
614 } 670 }
615 - .el-radio__input.is-disabled+span.el-radio__label{  
616 - color: #606266; 671 +
  672 + .el-dialog__header {
  673 + background-color: #fff;
  674 + padding: 0;
617 } 675 }
618 - .el-date-table td.current:not(.disabled) span{  
619 - background-color:#3F9B6A;  
620 - color: #fff; 676 +
  677 + .el-dialog__title {
  678 + font-size: 14px;
  679 + color: #000000e6;
621 } 680 }
622 - .el-pager li.active{  
623 - color:#3F9B6A; 681 +
  682 + .el-date-table td.available:hover {
  683 + background-color: #3F9B6A;
624 } 684 }
625 - .el-pager li:hover {  
626 - color:#3F9B6A; 685 +
  686 + .el-date-table td.start-date span {
  687 + background-color: #3F9B6A;
627 } 688 }
628 - .stepsColor .one_class{  
629 - background:#3F9B6A; 689 + }
  690 +
  691 + .el-descriptions__body .el-descriptions__table .el-descriptions-item__cell {
  692 + line-height: 1;
  693 + }
  694 +
  695 + .el-tabs__item.is-active {
  696 + color: #3F9B6A;
  697 + }
  698 +
  699 + .el-tabs__active-bar {
  700 + background-color: #3F9B6A;
  701 + }
  702 +
  703 + .el-step__title.is-process {
  704 + font-weight: 100;
  705 + }
  706 +
  707 + .el-pagination.is-background .el-pager li:not(.disabled):hover {
  708 + color: #3F9B6A
  709 + }
  710 +
  711 + .el-table__row {
  712 + font-size: 14px;
  713 + color: #000000e6;
  714 + }
  715 +
  716 + .el-upload-list__item.is-success .el-upload-list__item-name:focus,
  717 + .el-upload-list__item.is-success .el-upload-list__item-name:hover {
  718 + color: #3F9B6A;
  719 + cursor: pointer;
  720 + }
  721 +
  722 + .actSpye_dialog {
  723 + .el-dialog__header {
  724 + padding: 0px;
630 } 725 }
631 - .stepsColor .two_class{  
632 - color:#3F9B6A; 726 +
  727 + .el-dialog__body {
  728 + padding: 0px;
633 } 729 }
634 - .el-popover{  
635 - background-color: black;  
636 - color:#fff; 730 + }
  731 +
  732 + .liucheng_css {
  733 + .el-dialog__header {
  734 + padding: 10px 20px;
  735 + border-bottom: 1px solid #EFEFEF;
  736 + background-color: #fff;
  737 +
637 } 738 }
638 - .el-table__fixed-right {  
639 - background: #fff; 739 +
  740 + .el-dialog__title {
  741 + color: #000;
  742 + font-size: 14px;
640 } 743 }
641 - .bom {  
642 - margin-top: 40px; 744 +
  745 + .el-dialog__body {
  746 + padding: 0px;
643 } 747 }
  748 + }
  749 +
  750 + .el-table__body tr.current-row>td.el-table__cell,
  751 + .el-table__body tr.selection-row>td.el-table__cell {
  752 + background-color: transparent;
  753 + }
  754 +
  755 + .el-checkbox__input.is-checked+.el-checkbox__label {
  756 + color: #3F9B6A;
  757 + }
  758 +
  759 + .el-checkbox__input.is-disabled+span.el-checkbox__label {
  760 + color: #606266;
  761 + }
  762 +
  763 + .el-radio__input.is-disabled+span.el-radio__label {
  764 + color: #606266;
  765 + }
  766 +
  767 + .el-date-table td.current:not(.disabled) span {
  768 + background-color: #3F9B6A;
  769 + color: #fff;
  770 + }
  771 +
  772 + .el-pager li.active {
  773 + color: #3F9B6A;
  774 + }
  775 +
  776 + .el-pager li:hover {
  777 + color: #3F9B6A;
  778 + }
  779 +
  780 + .stepsColor .one_class {
  781 + background: #3F9B6A;
  782 + }
  783 +
  784 + .stepsColor .two_class {
  785 + color: #3F9B6A;
  786 + }
  787 +
  788 + .el-popover {
  789 + background-color: black;
  790 + color: #fff;
  791 + }
  792 +
  793 + .el-table__fixed-right {
  794 + background: #fff;
  795 + }
  796 +
  797 + .bom {
  798 + margin-top: 40px;
  799 + }
644 </style> 800 </style>
admin-web-master/src/api/newly.js
  View file @ed7a1f3
1 import request from '@/utils/request' 1 import request from '@/utils/request'
2 // import request from '@/utils/request2' 2 // import request from '@/utils/request2'
3 3
  4 +// 字典
  5 +export function getChilds(data) {
  6 + return request({
  7 + url: '/dict/getChilds',
  8 + method: 'post',
  9 + data
  10 + })
  11 +}
  12 +
4 // 方案资源 13 // 方案资源
5 export function resourcesFindPlan(data) { 14 export function resourcesFindPlan(data) {
6 return request({ 15 return request({
admin-web-master/src/components/add/addcd.vue
  View file @ed7a1f3
@@ -10,7 +10,9 @@ @@ -10,7 +10,9 @@
10 <el-col :span="12"> 10 <el-col :span="12">
11 <el-form-item label="场地类型" prop="venueType"> 11 <el-form-item label="场地类型" prop="venueType">
12 <el-select v-model="ruleForm.venueType" placeholder="请选择" style="width: 100%;"> 12 <el-select v-model="ruleForm.venueType" placeholder="请选择" style="width: 100%;">
13 - <el-option label="草地" value="草地"></el-option> 13 + <!-- <el-option label="草地" value="草地"></el-option> -->
  14 + <el-option v-for="(item,index) in siteTypeList"
  15 + :key="index" :label="item.label" :value="item.value"></el-option>
14 </el-select> 16 </el-select>
15 </el-form-item> 17 </el-form-item>
16 </el-col> 18 </el-col>
@@ -243,7 +245,10 @@ @@ -243,7 +245,10 @@
243 }, 245 },
244 computed: { 246 computed: {
245 regionOptions() { 247 regionOptions() {
246 - return this.$store.state.app.regionOptions; 248 + return this.$store.state.cent.regionList;
  249 + },
  250 + siteTypeList() {
  251 + return this.$store.state.cent.siteTypeList;
247 } 252 }
248 }, 253 },
249 props: { 254 props: {
admin-web-master/src/components/add/addinformation.vue
  View file @ed7a1f3
@@ -10,8 +10,9 @@ @@ -10,8 +10,9 @@
10 <el-col :span="12"> 10 <el-col :span="12">
11 <el-form-item label="商铺类型" prop="shopType"> 11 <el-form-item label="商铺类型" prop="shopType">
12 <el-select v-model="ruleForm.shopType" placeholder="请选择" style="width: 100%;"> 12 <el-select v-model="ruleForm.shopType" placeholder="请选择" style="width: 100%;">
13 - <el-option label="移动铺位" value="1"></el-option>  
14 - <el-option label="固定铺位" value="2"></el-option> 13 + <!-- <el-option label="移动铺位" value="1"></el-option>
  14 + <el-option label="固定铺位" value="2"></el-option> -->
  15 + <el-option v-for="(item,index) in typeShopList" :key="index" :label="item.label" :value="item.value"></el-option>
15 </el-select> 16 </el-select>
16 </el-form-item> 17 </el-form-item>
17 </el-col> 18 </el-col>
@@ -172,8 +173,11 @@ @@ -172,8 +173,11 @@
172 }, 173 },
173 computed: { 174 computed: {
174 regionOptions() { 175 regionOptions() {
175 - return this.$store.state.app.regionOptions;  
176 - } 176 + return this.$store.state.cent.regionList;
  177 + },
  178 + typeShopList() {
  179 + return this.$store.state.cent.typeShopList;
  180 + },
177 }, 181 },
178 data() { 182 data() {
179 return { 183 return {
admin-web-master/src/components/add/addmap.vue
  View file @ed7a1f3
@@ -12,15 +12,19 @@ @@ -12,15 +12,19 @@
12 </el-form-item> 12 </el-form-item>
13 <el-form-item label="所属端" prop="affiliation" > 13 <el-form-item label="所属端" prop="affiliation" >
14 <el-select v-model="formInline.affiliation" placeholder="请选择" style="width: 100%;"> 14 <el-select v-model="formInline.affiliation" placeholder="请选择" style="width: 100%;">
15 - <el-option label="游客小程序" value="游客小程序"></el-option>  
16 - <el-option label="商家客户端" value="商家客户端"></el-option> 15 + <!-- <el-option label="游客小程序" value="游客小程序"></el-option>
  16 + <el-option label="商家客户端" value="商家客户端"></el-option> -->
  17 + <el-option v-for="(item,index) in owningEndList"
  18 + :key="index" :label="item.label" :value="item.value"></el-option>
17 </el-select> 19 </el-select>
18 </el-form-item> 20 </el-form-item>
19 <el-form-item label="轮播顺序" prop="rotationOrder" > 21 <el-form-item label="轮播顺序" prop="rotationOrder" >
20 <el-select v-model="formInline.rotationOrder" placeholder="请选择" style="width: 100%;"> 22 <el-select v-model="formInline.rotationOrder" placeholder="请选择" style="width: 100%;">
21 - <el-option label="第一张" value="第一张"></el-option> 23 + <!-- <el-option label="第一张" value="第一张"></el-option>
22 <el-option label="第二张" value="第二张"></el-option> 24 <el-option label="第二张" value="第二张"></el-option>
23 - <el-option label="第三张" value="第三张"></el-option> 25 + <el-option label="第三张" value="第三张"></el-option> -->
  26 + <el-option v-for="(item,index) in rotationSequenceList"
  27 + :key="index" :label="item.label" :value="item.value"></el-option>
24 </el-select> 28 </el-select>
25 </el-form-item> 29 </el-form-item>
26 <el-form-item label="广告尺寸" prop="dimensions" > 30 <el-form-item label="广告尺寸" prop="dimensions" >
@@ -284,6 +288,14 @@ @@ -284,6 +288,14 @@
284 lvdaoList: [], 288 lvdaoList: [],
285 }; 289 };
286 }, 290 },
  291 + computed: {
  292 + owningEndList() {
  293 + return this.$store.state.cent.owningEndList;
  294 + },
  295 + rotationSequenceList() {
  296 + return this.$store.state.cent.rotationSequenceList;
  297 + },
  298 + },
287 props: { 299 props: {
288 type: { 300 type: {
289 type: String, 301 type: String,
admin-web-master/src/components/resourceCommodity/index.vue
  View file @ed7a1f3
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 </el-col> 20 </el-col>
21 <el-col :span="8"> 21 <el-col :span="8">
22 <el-form-item label="商铺类型" prop="shopType"> 22 <el-form-item label="商铺类型" prop="shopType">
23 - <div class="duiqi">{{editbgid.shopType=='1'?'移动铺位':editbgid.shopType=='2'?'固定铺位':'无'}}</div> 23 + <div class="duiqi">{{gettypeShopList(editbgid.shopType) || '无'}}</div>
24 </el-form-item> 24 </el-form-item>
25 </el-col> 25 </el-col>
26 </el-row> 26 </el-row>
@@ -458,8 +458,24 @@ @@ -458,8 +458,24 @@
458 this.getAll() 458 this.getAll()
459 }, 459 },
460 computed: { 460 computed: {
  461 + typeShopList() {
  462 + return this.$store.state.cent.typeShopList;
  463 + },
461 }, 464 },
462 methods: { 465 methods: {
  466 + gettypeShopList(code) {
  467 + if (!code) {
  468 + return '无';
  469 + }
  470 + for (let i = 0; i < this.typeShopList.length; i++) {
  471 + const item = this.typeShopList[i];
  472 + item.value=item.value+''
  473 + if (item.value === code) {
  474 + return item.label;
  475 + }
  476 + }
  477 + return '无';
  478 + },
463 async getAll(){ 479 async getAll(){
464 const lvdao = await lvdaoduan() 480 const lvdao = await lvdaoduan()
465 const gongyua = await parkTrails() 481 const gongyua = await parkTrails()
admin-web-master/src/store/index.js
  View file @ed7a1f3
@@ -5,7 +5,7 @@ import app from &#39;@/store/modules/app&#39; @@ -5,7 +5,7 @@ import app from &#39;@/store/modules/app&#39;
5 import settings from '@/store/modules/settings' 5 import settings from '@/store/modules/settings'
6 import user from '@/store/modules/user' 6 import user from '@/store/modules/user'
7 import permission from '@/store/modules/permission.js' 7 import permission from '@/store/modules/permission.js'
8 - 8 +import cent from '@/store/modules/cent'
9 Vue.use(Vuex) 9 Vue.use(Vuex)
10 10
11 const store = new Vuex.Store({ 11 const store = new Vuex.Store({
@@ -13,7 +13,8 @@ const store = new Vuex.Store({ @@ -13,7 +13,8 @@ const store = new Vuex.Store({
13 app, 13 app,
14 settings, 14 settings,
15 user, 15 user,
16 - permission 16 + permission,
  17 + cent
17 }, 18 },
18 getters 19 getters
19 }) 20 })
admin-web-master/src/store/modules/cent.js 0 → 100644
  View file @ed7a1f3
  1 +import {getChilds } from '@/api/newly'
  2 +
  3 +
  4 +const state = () => {
  5 + return {
  6 + regionList: [],//区域
  7 + typeShopList:[],//商铺类型
  8 + owningEndList:[],//所属端
  9 + rotationSequenceList:[],//轮播顺序
  10 + siteTypeList:[],//场地类型
  11 +
  12 + rangeSettingList:[],// 范围设置
  13 + contentClassificationList:[],//内容分类
  14 + channelTypeList:[],//渠道类型
  15 + informationTypeList:[],//信息类型
  16 + cooperationTypeList:[],//合作类型
  17 + receivingMerchantList:[],//接收商家
  18 + }
  19 +}
  20 +
  21 +const mutations = {
  22 + setregion: (state, cent) => {
  23 + state.regionList = cent
  24 + },
  25 + settypeShop: (state, cent) => {
  26 + state.typeShopList = cent
  27 + },
  28 + setowningEnd: (state, cent) => {
  29 + state.owningEndList = cent
  30 + },
  31 + setrotationSequence: (state, cent) => {
  32 + state.rotationSequenceList = cent
  33 + },
  34 + setsiteType: (state, cent) => {
  35 + state.siteTypeList = cent
  36 + },
  37 +
  38 +
  39 + setrangeSetting: (state, cent) => {
  40 + state.rangeSettingList = cent
  41 + },
  42 + setcontentClassification: (state, cent) => {
  43 + state.contentClassificationList = cent
  44 + },
  45 + setchannelType: (state, cent) => {
  46 + state.channelTypeList = cent
  47 + },
  48 + setinformationType: (state, cent) => {
  49 + state.informationTypeList = cent
  50 + },
  51 + setcooperationType: (state, cent) => {
  52 + state.cooperationTypeList = cent
  53 + },
  54 + setreceivingMerchant: (state, cent) => {
  55 + state.receivingMerchantList = cent
  56 + },
  57 +}
  58 +
  59 +const actions = {
  60 + getChildsall({commit},) {
  61 + console.error(']]]]]]]]]]]]]')
  62 + return new Promise((resolve, reject) => {
  63 + getChilds({"dictPid":2377,"page":1,"pageSize":50}).then(response => {
  64 + console.error(response.data.list)
  65 + response.data.list = response.data.list.map(item => {
  66 + let c1 = {
  67 + label: item.dictName,
  68 + value: item.dictName
  69 + }
  70 + return c1
  71 + })
  72 + commit('setregion',response.data.list)
  73 + resolve()
  74 + }).catch(error => {
  75 + reject(error)
  76 + })
  77 + getChilds({"dictPid":2378,"page":1,"pageSize":50}).then(response => {
  78 + console.error(response.data.list)
  79 + response.data.list = response.data.list.map(item => {
  80 + let c1 = {
  81 + label: item.dictName,
  82 + value: item.dictName=='移动铺位'?'1':item.dictName=='固定铺位'?'2':item.dictId
  83 + }
  84 + return c1
  85 + })
  86 + commit('settypeShop',response.data.list)
  87 + resolve()
  88 + }).catch(error => {
  89 + reject(error)
  90 + })
  91 + getChilds({"dictPid":2379,"page":1,"pageSize":50}).then(response => {
  92 + console.error(response.data.list)
  93 + response.data.list = response.data.list.map(item => {
  94 + let c1 = {
  95 + label: item.dictName,
  96 + value: item.dictName
  97 + }
  98 + return c1
  99 + })
  100 + commit('setowningEnd',response.data.list)
  101 + resolve()
  102 + }).catch(error => {
  103 + reject(error)
  104 + })
  105 + getChilds({"dictPid":2384,"page":1,"pageSize":50}).then(response => {
  106 + console.error(response.data.list)
  107 + response.data.list = response.data.list.map(item => {
  108 + let c1 = {
  109 + label: item.dictName,
  110 + value: item.dictName
  111 + }
  112 + return c1
  113 + })
  114 + commit('setrotationSequence',response.data.list)
  115 + resolve()
  116 + }).catch(error => {
  117 + reject(error)
  118 + })
  119 + getChilds({"dictPid":2385,"page":1,"pageSize":50}).then(response => {
  120 + console.error(response.data.list)
  121 + response.data.list = response.data.list.map(item => {
  122 + let c1 = {
  123 + label: item.dictName,
  124 + value: item.dictName
  125 + }
  126 + return c1
  127 + })
  128 + commit('setsiteType',response.data.list)
  129 + resolve()
  130 + }).catch(error => {
  131 + reject(error)
  132 + })
  133 +
  134 +
  135 +
  136 + getChilds({"dictPid":2397,"page":1,"pageSize":50}).then(response => {
  137 + console.error(response.data.list)
  138 + response.data.list = response.data.list.map(item => {
  139 + let c1 = {
  140 + label: item.dictName,
  141 + value: item.dictName
  142 + }
  143 + return c1
  144 + })
  145 + commit('setrangeSetting',response.data.list)
  146 + resolve()
  147 + }).catch(error => {
  148 + reject(error)
  149 + })
  150 +
  151 + getChilds({"dictPid":2398,"page":1,"pageSize":50}).then(response => {
  152 + console.error(response.data.list)
  153 + response.data.list = response.data.list.map(item => {
  154 + let c1 = {
  155 + label: item.dictName,
  156 + value: item.dictName
  157 + }
  158 + return c1
  159 + })
  160 + commit('setcontentClassification',response.data.list)
  161 + resolve()
  162 + }).catch(error => {
  163 + reject(error)
  164 + })
  165 + getChilds({"dictPid":2399,"page":1,"pageSize":50}).then(response => {
  166 + console.error(response.data.list)
  167 + response.data.list = response.data.list.map(item => {
  168 + let c1 = {
  169 + label: item.dictName,
  170 + value: item.dictName
  171 + }
  172 + return c1
  173 + })
  174 + commit('setchannelType',response.data.list)
  175 + resolve()
  176 + }).catch(error => {
  177 + reject(error)
  178 + })
  179 + getChilds({"dictPid":2400,"page":1,"pageSize":50}).then(response => {
  180 + console.error(response.data.list)
  181 + response.data.list = response.data.list.map(item => {
  182 + let c1 = {
  183 + label: item.dictName,
  184 + value: item.dictName
  185 + }
  186 + return c1
  187 + })
  188 + commit('setinformationType',response.data.list)
  189 + resolve()
  190 + }).catch(error => {
  191 + reject(error)
  192 + })
  193 + getChilds({"dictPid":2401,"page":1,"pageSize":50}).then(response => {
  194 + console.error(response.data.list)
  195 + response.data.list = response.data.list.map(item => {
  196 + let c1 = {
  197 + label: item.dictName,
  198 + value: item.dictName
  199 + }
  200 + return c1
  201 + })
  202 + commit('setcooperationType',response.data.list)
  203 + resolve()
  204 + }).catch(error => {
  205 + reject(error)
  206 + })
  207 + getChilds({"dictPid":2402,"page":1,"pageSize":50}).then(response => {
  208 + console.error(response.data.list)
  209 + response.data.list = response.data.list.map(item => {
  210 + let c1 = {
  211 + label: item.dictName,
  212 + value: item.dictName
  213 + }
  214 + return c1
  215 + })
  216 + commit('setreceivingMerchant',response.data.list)
  217 + resolve()
  218 + }).catch(error => {
  219 + reject(error)
  220 + })
  221 + })
  222 + },
  223 +}
  224 +
  225 +export default {
  226 + state,
  227 + mutations,
  228 + actions
  229 +}
  230 +
admin-web-master/src/views/activity/activityBian.vue
  View file @ed7a1f3
@@ -75,8 +75,9 @@ @@ -75,8 +75,9 @@
75 <el-col :span="12"> 75 <el-col :span="12">
76 <el-form-item label="范围设置" class="grid-content bg-purple" prop="sponsor"> 76 <el-form-item label="范围设置" class="grid-content bg-purple" prop="sponsor">
77 <el-select v-model="secondData.rangeSetting" placeholder="请选择" style="width: 100%"> 77 <el-select v-model="secondData.rangeSetting" placeholder="请选择" style="width: 100%">
78 - <el-option label="活动绿道段内" value="活动绿道段内"></el-option>  
79 - <el-option label="活动场地内" value="活动场地内"></el-option> 78 + <!-- <el-option label="活动绿道段内" value="活动绿道段内"></el-option>
  79 + <el-option label="活动场地内" value="活动场地内"></el-option> -->
  80 + <el-option v-for="(item,index) in rangeSettingList" :key="index" :label="item.label" :value="item.value"></el-option>
80 </el-select> 81 </el-select>
81 </el-form-item> 82 </el-form-item>
82 </el-col> 83 </el-col>
@@ -396,7 +397,11 @@ @@ -396,7 +397,11 @@
396 created() { 397 created() {
397 398
398 }, 399 },
399 - mounted() { 400 + computed: {
  401 + rangeSettingList() {
  402 + return this.$store.state.cent.rangeSettingList;
  403 + },
  404 + }, mounted() {
400 }, 405 },
401 methods: { 406 methods: {
402 changimg(e,type) { 407 changimg(e,type) {
admin-web-master/src/views/activity/activityBz.vue
  View file @ed7a1f3
@@ -95,8 +95,9 @@ @@ -95,8 +95,9 @@
95 <el-form-item label="范围设置" class="grid-content bg-purple" prop="sponsor"> 95 <el-form-item label="范围设置" class="grid-content bg-purple" prop="sponsor">
96 <el-select v-model="ruleForm.rangeSetting" placeholder="请选择" 96 <el-select v-model="ruleForm.rangeSetting" placeholder="请选择"
97 style="width: 100%"> 97 style="width: 100%">
98 - <el-option label="活动绿道段内" value="活动绿道段内"></el-option>  
99 - <el-option label="活动场地内" value="活动场地内"></el-option> 98 + <el-option v-for="(item,index) in rangeSettingList" :key="index" :label="item.label" :value="item.value"></el-option>
  99 + <!-- <el-option label="活动绿道段内" value="活动绿道段内"></el-option>
  100 + <el-option label="活动场地内" value="活动场地内"></el-option> -->
100 </el-select> 101 </el-select>
101 </el-form-item> 102 </el-form-item>
102 </el-col> 103 </el-col>
@@ -528,6 +529,11 @@ @@ -528,6 +529,11 @@
528 529
529 530
530 }, 531 },
  532 + computed: {
  533 + rangeSettingList() {
  534 + return this.$store.state.cent.rangeSettingList;
  535 + },
  536 + },
531 mounted() { 537 mounted() {
532 this.editTrue = true 538 this.editTrue = true
533 this.lishi() 539 this.lishi()
admin-web-master/src/views/atmosphere/atmosphereBian.vue
  View file @ed7a1f3
@@ -72,8 +72,9 @@ @@ -72,8 +72,9 @@
72 <el-col :span="8"> 72 <el-col :span="8">
73 <el-form-item label="范围设置" class="grid-content bg-purple" prop="sponsor"> 73 <el-form-item label="范围设置" class="grid-content bg-purple" prop="sponsor">
74 <el-select v-model="secondData.rangeSetting" placeholder="请选择" style="width: 100%"> 74 <el-select v-model="secondData.rangeSetting" placeholder="请选择" style="width: 100%">
75 - <el-option label="活动绿道段内" value="活动绿道段内"></el-option>  
76 - <el-option label="活动场地内" value="活动场地内"></el-option> 75 + <!-- <el-option label="活动绿道段内" value="活动绿道段内"></el-option>
  76 + <el-option label="活动场地内" value="活动场地内"></el-option> -->
  77 + <el-option v-for="(item,index) in rangeSettingList" :key="index" :label="item.label" :value="item.value"></el-option>
77 </el-select> 78 </el-select>
78 </el-form-item> 79 </el-form-item>
79 </el-col> 80 </el-col>
@@ -391,6 +392,11 @@ @@ -391,6 +392,11 @@
391 }, 392 },
392 mounted() { 393 mounted() {
393 }, 394 },
  395 + computed: {
  396 + rangeSettingList() {
  397 + return this.$store.state.cent.rangeSettingList;
  398 + },
  399 + },
394 methods: { 400 methods: {
395 changimg(e,type) { 401 changimg(e,type) {
396 this.secondData[type] = e 402 this.secondData[type] = e
admin-web-master/src/views/atmosphere/atmosphereBz.vue
  View file @ed7a1f3
@@ -93,8 +93,9 @@ @@ -93,8 +93,9 @@
93 <el-form-item label="范围设置" class="grid-content bg-purple" prop="sponsor"> 93 <el-form-item label="范围设置" class="grid-content bg-purple" prop="sponsor">
94 <el-select v-model="ruleForm.rangeSetting" placeholder="请选择" 94 <el-select v-model="ruleForm.rangeSetting" placeholder="请选择"
95 style="width: 100%"> 95 style="width: 100%">
96 - <el-option label="活动绿道段内" value="活动绿道段内"></el-option>  
97 - <el-option label="活动场地内" value="活动场地内"></el-option> 96 + <!-- <el-option label="活动绿道段内" value="活动绿道段内"></el-option>
  97 + <el-option label="活动场地内" value="活动场地内"></el-option> -->
  98 + <el-option v-for="(item,index) in rangeSettingList" :key="index" :label="item.label" :value="item.value"></el-option>
98 </el-select> 99 </el-select>
99 </el-form-item> 100 </el-form-item>
100 </el-col> 101 </el-col>
@@ -520,6 +521,11 @@ @@ -520,6 +521,11 @@
520 521
521 this.lishi() 522 this.lishi()
522 }, 523 },
  524 + computed: {
  525 + rangeSettingList() {
  526 + return this.$store.state.cent.rangeSettingList;
  527 + },
  528 + },
523 methods: { 529 methods: {
524 changimg(e, type) { 530 changimg(e, type) {
525 this.ruleForm[type] = e 531 this.ruleForm[type] = e
admin-web-master/src/views/detect/information/index.vue
  View file @ed7a1f3
@@ -190,7 +190,7 @@ @@ -190,7 +190,7 @@
190 }, 190 },
191 computed: { 191 computed: {
192 regionOptions() { 192 regionOptions() {
193 - return this.$store.state.app.regionOptions; 193 + return this.$store.state.cent.regionList;
194 } 194 }
195 }, 195 },
196 components: { 196 components: {
admin-web-master/src/views/detect/map/index.vue
  View file @ed7a1f3
@@ -19,14 +19,17 @@ @@ -19,14 +19,17 @@
19 </el-form-item> 19 </el-form-item>
20 <el-form-item label="所属端" prop="affiliation" v-if="leixing"> 20 <el-form-item label="所属端" prop="affiliation" v-if="leixing">
21 <el-select v-model="pagequery.affiliation" clearable placeholder="请选择" style="width: 168px;margin-right: 15px"> 21 <el-select v-model="pagequery.affiliation" clearable placeholder="请选择" style="width: 168px;margin-right: 15px">
22 - <el-option label="游客小程序" value="游客小程序" />  
23 - <el-option label="商家客户端" value="商家客户端" /> 22 + <!-- <el-option label="游客小程序" value="游客小程序" />
  23 + <el-option label="商家客户端" value="商家客户端" /> -->
  24 + <el-option v-for="(item,index) in owningEndList"
  25 + :key="index" :label="item.label" :value="item.value"></el-option>
24 </el-select> 26 </el-select>
25 </el-form-item> 27 </el-form-item>
26 <el-form-item label="设备类型" prop="deviceType" v-if="leixing == false"> 28 <el-form-item label="设备类型" prop="deviceType" v-if="leixing == false">
27 - <el-select v-model="pagequery.deviceType" placeholder="请选择" style="width: 168px;margin-right: 15px"> 29 + <!-- <el-select v-model="pagequery.deviceType" placeholder="请选择" style="width: 168px;margin-right: 15px">
28 <el-option label="灯箱广告牌" value="灯箱广告牌"></el-option> 30 <el-option label="灯箱广告牌" value="灯箱广告牌"></el-option>
29 - </el-select> 31 + </el-select> -->
  32 + <el-input v-model="pagequery.deviceType" placeholder="请输入" maxlength="50"></el-input>
30 </el-form-item> 33 </el-form-item>
31 </el-form> 34 </el-form>
32 35
@@ -207,6 +210,11 @@ @@ -207,6 +210,11 @@
207 add, 210 add,
208 resourceCommodity, 211 resourceCommodity,
209 }, 212 },
  213 + computed: {
  214 + owningEndList() {
  215 + return this.$store.state.cent.owningEndList;
  216 + }
  217 + },
210 created() { 218 created() {
211 this.getAll() 219 this.getAll()
212 }, 220 },
admin-web-master/src/views/promotion/contentMant.vue
  View file @ed7a1f3
@@ -217,9 +217,10 @@ @@ -217,9 +217,10 @@
217 </div> 217 </div>
218 <el-select v-model="formInline.contentCategory" placeholder="请选择" 218 <el-select v-model="formInline.contentCategory" placeholder="请选择"
219 v-else style="width:100%"> 219 v-else style="width:100%">
220 - <el-option label="宣传资料" value="宣传资料" /> 220 + <!-- <el-option label="宣传资料" value="宣传资料" />
221 <el-option label="宣传文案" value="宣传文案" /> 221 <el-option label="宣传文案" value="宣传文案" />
222 - <el-option label="宣传软文" value="宣传软文" /> 222 + <el-option label="宣传软文" value="宣传软文" /> -->
  223 + <el-option v-for="(item,index) in contentClassificationList" :key="index" :label="item.label" :value="item.value"></el-option>
223 </el-select> 224 </el-select>
224 </el-form-item> 225 </el-form-item>
225 <el-form-item label="内容编制" prop="contentCompilation"> 226 <el-form-item label="内容编制" prop="contentCompilation">
@@ -247,10 +248,11 @@ @@ -247,10 +248,11 @@
247 </div> 248 </div>
248 <el-select v-model="formInline.channelType" placeholder="请选择" 249 <el-select v-model="formInline.channelType" placeholder="请选择"
249 v-else style="width:100%"> 250 v-else style="width:100%">
250 - <el-option label="APP" value="APP" /> 251 + <!-- <el-option label="APP" value="APP" />
251 <el-option label="电视" value="电视" /> 252 <el-option label="电视" value="电视" />
252 <el-option label="广播" value="广播" /> 253 <el-option label="广播" value="广播" />
253 - <el-option label="网站" value="网站" /> 254 + <el-option label="网站" value="网站" /> -->
  255 + <el-option v-for="(item,index) in channelTypeList" :key="index" :label="item.label" :value="item.value"></el-option>
254 </el-select> 256 </el-select>
255 </el-form-item> 257 </el-form-item>
256 258
@@ -401,6 +403,14 @@ @@ -401,6 +403,14 @@
401 mounted() { 403 mounted() {
402 this.getAll() 404 this.getAll()
403 }, 405 },
  406 + computed: {
  407 + contentClassificationList() {
  408 + return this.$store.state.cent.contentClassificationList;
  409 + },
  410 + channelTypeList() {
  411 + return this.$store.state.cent.channelTypeList;
  412 + }
  413 + },
404 methods: { 414 methods: {
405 changimg(e,type) { 415 changimg(e,type) {
406 this.formInline[type] = e 416 this.formInline[type] = e
admin-web-master/src/views/serve/Merchant/index.vue
  View file @ed7a1f3
@@ -222,10 +222,12 @@ @@ -222,10 +222,12 @@
222 <el-col :span="12"> 222 <el-col :span="12">
223 <el-form-item label="合作类型" prop="cooperationType"> 223 <el-form-item label="合作类型" prop="cooperationType">
224 <el-select v-model="formInline.cooperationType" placeholder="请选择" style="width:100%"> 224 <el-select v-model="formInline.cooperationType" placeholder="请选择" style="width:100%">
225 - <el-option label="品牌推广合作" value="品牌推广合作" /> 225 + <!-- <el-option label="品牌推广合作" value="品牌推广合作" />
226 <el-option label="场地租赁合作" value="场地租赁合作" /> 226 <el-option label="场地租赁合作" value="场地租赁合作" />
227 <el-option label="文化旅游合作" value="文化旅游合作" /> 227 <el-option label="文化旅游合作" value="文化旅游合作" />
228 - <el-option label="健康生活产品合作" value="健康生活产品合作" /> 228 + <el-option label="健康生活产品合作" value="健康生活产品合作" /> -->
  229 + <el-option v-for="(item,index) in cooperationTypeList"
  230 + :key="index" :label="item.label" :value="item.value"></el-option>
229 </el-select> 231 </el-select>
230 </el-form-item> 232 </el-form-item>
231 </el-col> 233 </el-col>
@@ -499,6 +501,11 @@ @@ -499,6 +501,11 @@
499 computed: { 501 computed: {
500 502
501 }, 503 },
  504 + computed: {
  505 + cooperationTypeList() {
  506 + return this.$store.state.cent.cooperationTypeList;
  507 + },
  508 + },
502 methods: { 509 methods: {
503 changimg(e, type) { 510 changimg(e, type) {
504 this.formInline[type] = e 511 this.formInline[type] = e
admin-web-master/src/views/serve/PerWorkstation/index.vue
  View file @ed7a1f3
@@ -91,7 +91,9 @@ @@ -91,7 +91,9 @@
91 </el-form-item> 91 </el-form-item>
92 <el-form-item label="接收商家" v-if="xian ==1"> 92 <el-form-item label="接收商家" v-if="xian ==1">
93 <el-select v-model="secondData.receiverMerchant" style="width: 90%;" disabled> 93 <el-select v-model="secondData.receiverMerchant" style="width: 90%;" disabled>
94 - <el-option label="电商商家" value="电商商家" /> 94 + <!-- <el-option label="电商商家" value="电商商家" /> -->
  95 + <el-option v-for="(item,index) in receivingMerchantList"
  96 + :key="index" :label="item.label" :value="item.value"></el-option>
95 </el-select> 97 </el-select>
96 </el-form-item> 98 </el-form-item>
97 <el-form-item label="发布类型" v-if="xian ==1"> 99 <el-form-item label="发布类型" v-if="xian ==1">
@@ -156,8 +158,9 @@ @@ -156,8 +158,9 @@
156 </el-form-item> 158 </el-form-item>
157 <el-form-item label="接收商家" prop="receiverMerchant"> 159 <el-form-item label="接收商家" prop="receiverMerchant">
158 <el-select v-model="ruleForm.receiverMerchant" placeholder="请选择" style="width: 100%;"> 160 <el-select v-model="ruleForm.receiverMerchant" placeholder="请选择" style="width: 100%;">
159 - <el-option label="小程序商家" value="小程序商家" />  
160 - 161 + <!-- <el-option label="小程序商家" value="小程序商家" /> -->
  162 + <el-option v-for="(item,index) in receivingMerchantList"
  163 + :key="index" :label="item.label" :value="item.value"></el-option>
161 </el-select> 164 </el-select>
162 </el-form-item> 165 </el-form-item>
163 <el-form-item label="发布类型" prop="postType"> 166 <el-form-item label="发布类型" prop="postType">
@@ -273,6 +276,11 @@ @@ -273,6 +276,11 @@
273 created() { 276 created() {
274 277
275 }, 278 },
  279 + computed: {
  280 + receivingMerchantList() {
  281 + return this.$store.state.cent.receivingMerchantList;
  282 + },
  283 + },
276 mounted() { 284 mounted() {
277 this.getAll(); 285 this.getAll();
278 }, 286 },
admin-web-master/src/views/serve/procedure.vue
  View file @ed7a1f3
@@ -199,10 +199,11 @@ @@ -199,10 +199,11 @@
199 </el-form-item> 199 </el-form-item>
200 <el-form-item label="信息类型" prop="informationType"> 200 <el-form-item label="信息类型" prop="informationType">
201 <el-select v-model="ruleForm.informationType" placeholder="请选择" style="width:100%;"> 201 <el-select v-model="ruleForm.informationType" placeholder="请选择" style="width:100%;">
202 - <el-option label="通知" value="通知" /> 202 + <!-- <el-option label="通知" value="通知" />
203 <el-option label="热点租赁信息" value="热点租赁信息" /> 203 <el-option label="热点租赁信息" value="热点租赁信息" />
204 <el-option label="广告信息" value="广告信息" /> 204 <el-option label="广告信息" value="广告信息" />
205 - <el-option label="活动信息" value="活动信息" /> 205 + <el-option label="活动信息" value="活动信息" /> -->
  206 + <el-option v-for="(item,index) in informationTypeList" :key="index" :label="item.label" :value="item.value"></el-option>
206 </el-select> 207 </el-select>
207 </el-form-item> 208 </el-form-item>
208 <el-form-item label="公告内容" > 209 <el-form-item label="公告内容" >
@@ -302,6 +303,11 @@ @@ -302,6 +303,11 @@
302 created() { 303 created() {
303 this.getAll(); 304 this.getAll();
304 }, 305 },
  306 + computed: {
  307 + informationTypeList() {
  308 + return this.$store.state.cent.informationTypeList;
  309 + },
  310 + },
305 mounted() {}, 311 mounted() {},
306 312
307 methods: { 313 methods: {
lvdao-miniapp/pages/message/message.vue
  View file @ed7a1f3
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 </view> 34 </view>
35 </view> 35 </view>
36 </view> 36 </view>
37 - <view class="more"> 37 + <view class="more" v-if="tableList.length>0">
38 <view class="icon-more">{{formatDateTime(tableList[0]?tableList[0].createdAt:'')}}</view> 38 <view class="icon-more">{{formatDateTime(tableList[0]?tableList[0].createdAt:'')}}</view>
39 </view> 39 </view>
40 </view> 40 </view>
lvdao-miniapp/utils/request.js
  View file @ed7a1f3
@@ -24,7 +24,7 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; { @@ -24,7 +24,7 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
24 // bases = 'http://128.10.249.41:9003'+ url; 24 // bases = 'http://128.10.249.41:9003'+ url;
25 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url; 25 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
26 26
27 - bases = c1 + 'cdwlMall/meserver/admin-server' + url; 27 + bases = c1 + 'cdwlMall/meserver/admin-server' + url;
28 28
29 }else if(baseUrl == 3){ 29 }else if(baseUrl == 3){
30 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url; 30 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;