webapp / GreenwayWeb

Commit f0e7afbf4901363ae8601783098e2c1d1395c508

Authored by 杨鑫
1 parent 9816fbf6

'最新'

Inline Side-by-side
Showing 20 changed files with 304 additions and 365 deletions
admin-web-master/src/views/activity/activityBian.vue
  View file @f0e7afb
... ... @@ -81,9 +81,10 @@
81 81 </el-row>
82 82 <div style="padding: 10px">
83 83 <el-row :gutter="20">
84   - <el-col :span="12">
  84 + <el-col :span="24">
85 85 <el-form-item label="活动封面海报" prop="cover_poster" class="grid-content bg-purple">
86   - <upimg v-model="secondData.coverPoster" :value="secondData.coverPoster==''?'':secondData.coverPoster" :limit="1" :fileSize="1" :isShowTip="false"></upimg>
  86 + <upimg filePath="act" :value="secondData.coverPoster==''?'':secondData.coverPoster" inputtype="coverPoster" :limit="1" @changimg="e=>changimg(e,'coverPoster')"></upimg>
  87 + <!-- <upimg v-model="secondData.coverPoster" :value="secondData.coverPoster==''?'':secondData.coverPoster" :limit="1" :fileSize="1" :isShowTip="false"></upimg> -->
87 88 </el-form-item>
88 89 </el-col>
89 90 </el-row>
... ... @@ -245,14 +246,15 @@
245 246 相关附件信息
246 247 </div>
247 248 <div>
248   - <el-upload class="upload-demo" ref="upload"
  249 + <upfile filePath="act" inputtype="otherImageVideos" :islist="false" :accept="'.docx'" :value="ruleForm.otherImageVideos" @changimg="e=>changimg(e,'otherImageVideos')"></upfile>
  250 + <!-- <el-upload class="upload-demo" ref="upload"
249 251 :action="uploadFileUrl"
250 252 :on-success="handleUploadSuccess"
251 253 :file-list="fileData" :show-file-list="false">
252 254 <div style="color: #2d8a58;margin-left: 10px;margin-top: 10px;" slot="trigger">
253 255 上传附件
254 256 </div>
255   - </el-upload>
  257 + </el-upload> -->
256 258 </div>
257 259 </div>
258 260 <div style="padding: 20px 40px 0px 20px">
... ... @@ -338,6 +340,7 @@
338 340 import Vue from 'vue'
339 341 import { uploadUrl } from '@/utils/request'
340 342 import upimg from "@/components/ImageUpload/index"
  343 + import upfile from "@/components/fujianUpload/fujianList"
341 344 export default {
342 345 props:{
343 346 showBian:{
... ... @@ -345,7 +348,7 @@
345 348 default: () => ({})
346 349 }
347 350 },
348   - components: { upimg},
  351 + components: { upimg,upfile},
349 352 data() {
350 353 return {
351 354 uploadFileUrl: uploadUrl, // 请求地址
... ... @@ -370,6 +373,7 @@
370 373 estimatedCost:'',
371 374 notes:''
372 375 },
  376 + ruleForm:{}
373 377 }
374 378 },
375 379  
... ... @@ -391,6 +395,27 @@
391 395 mounted() {
392 396 },
393 397 methods: {
  398 + changimg(e,type) {
  399 + this.ruleForm[type] = e
  400 +
  401 + if(type=='otherImageVideos'){
  402 + const parts = e.split('/');
  403 + const filename = parts[parts.length - 1];
  404 + // let file ={
  405 + // url:e,
  406 + // attachmentName:filename
  407 + // }
  408 + let fuji={
  409 + detailsId:this.secondData.id,
  410 + attachmentName:filename,
  411 + attachmentUrl:e,
  412 + }
  413 + fujiaAdd(fuji).then(res=>{
  414 + this.fucha(this.secondData.id)
  415 + })
  416 + // this.dataList.push(file)
  417 + }
  418 + },
394 419 //获取当前时间
395 420 updateCurrentTime() {
396 421 const now = new Date();
... ...
admin-web-master/src/views/activity/activityBz.vue
  View file @f0e7afb
... ... @@ -118,7 +118,7 @@
118 118 </el-col>
119 119 </el-row>
120 120 <el-row :gutter="20">
121   - <el-col :span="12">
  121 + <el-col :span="24">
122 122 <el-form-item label="活动封面海报" prop="coverPoster" class="grid-content bg-purple">
123 123 <upimg filePath="act" :value="ruleForm.coverPoster" inputtype="coverPoster" :limit="1" @changimg="e=>changimg(e,'coverPoster')"></upimg>
124 124 <!-- <upimg v-model="ruleForm.coverPoster" :limit="1" :fileSize="1" :isShowTip="false"></upimg> -->
... ... @@ -279,9 +279,10 @@
279 279 <el-tab-pane label="相关附件">
280 280 <div style="border: 1px solid #E5E5E5;padding: 1px" id="fu">
281 281 <div style="padding: 10px 13px;font-size: 12px;border-bottom: 1px solid #E5E5E5;display: flex;">
282   - <div>相关附件</div>
  282 + <div style="line-height:38px;">相关附件</div>
283 283 <div>
284   - <upfile filePath="act" inputtype="otherImageVideos" :value="ruleForm.otherImageVideos" @changimg="e=>changimg(e,'otherImageVideos')"></upfile>
  284 + <upfile filePath="act" inputtype="otherImageVideos" :limit="10" :islist="false" :accept="'.docx'" :value="ruleForm.otherImageVideos" @changimg="e=>changimg(e,'otherImageVideos')"></upfile>
  285 +
285 286 <!-- <el-upload class="upload-demo" ref="upload" :on-preview="handlePreview" :on-remove="handleRemove"
286 287 :action="uploadFileUrl" :on-success="handleUploadSuccess" :file-list="fileData"
287 288 :show-file-list="false">
... ... @@ -515,7 +516,16 @@ lishiList:&#39;&#39;,
515 516 methods: {
516 517 changimg(e,type) {
517 518 this.ruleForm[type] = e
518   - console.log(e)
  519 +
  520 + if(type=='otherImageVideos'){
  521 + const parts = e.split('/');
  522 + const filename = parts[parts.length - 1];
  523 + let file ={
  524 + url:e,
  525 + name:filename
  526 + }
  527 + this.dataList.push(file)
  528 + }
519 529 },
520 530 //获取当前时间
521 531 updateCurrentTime() {
... ... @@ -551,7 +561,7 @@ lishiList:&#39;&#39;,
551 561 this.$refs.upload.submit();
552 562 },
553 563 handleUploadSuccess(response, file, fileList) {
554   - console.log(response, file, fileList)
  564 +
555 565 this.dataList.push(file)
556 566 },
557 567 handleRemove(file, fileList) {
... ... @@ -685,7 +695,7 @@ lishiList:&#39;&#39;,
685 695 let fuji = {
686 696 detailsId: res.data.id,
687 697 attachmentName: this.dataList[i].name,
688   - attachmentUrl: this.dataList[i].response.data.url,
  698 + attachmentUrl: this.dataList[i].url,
689 699 }
690 700 fujiaAdd(fuji).then(res => {
691 701 console.log('成功')
... ...
admin-web-master/src/views/activity/activitySp.vue
  View file @f0e7afb
... ... @@ -178,7 +178,7 @@
178 178 <div style="padding: 10px">
179 179 <el-row :gutter="20">
180 180 <el-form-item label="活动封面海报" prop="cover_poster" class="grid-content bg-purple">
181   - <img :src="secondData.coverPoster" alt="" style="width: 80px;height:80px;">
  181 + <img :src="$baseURL+secondData.coverPoster" alt="" style="width: 80px;height:80px;">
182 182 </el-form-item>
183 183 </el-row>
184 184 </div>
... ... @@ -510,7 +510,7 @@
510 510 <div style="width: 100%;">
511 511 <div style="display: flex;padding:0px 20px 20px 20px; ">
512 512 <div style="width: 150px;height: 80px;" v-if="secondData.coverPoster">
513   - <img :src="secondData.coverPoster" alt="" style="width: 100%;height: 80px;" />
  513 + <img :src="$baseURL+secondData.coverPoster" alt="" style="width: 100%;height: 80px;" />
514 514 </div>
515 515 <div
516 516 style="display: flex;flex-direction: column;justify-content: space-around;padding: 0 10px;font-size: 12px;">
... ...
admin-web-master/src/views/activity/index.vue
  View file @f0e7afb
... ... @@ -262,7 +262,7 @@
262 262 <el-table-column label="操作" min-width="20%">
263 263 <template slot-scope="scope">
264 264 <!-- <div class="tableBtn greens" @click="Down(scope.row)">下载</div> -->
265   - <a class="tableBtn greens" :href="scope.row.attachmentUrl" target="_blank" download>下载</a>
  265 + <a class="tableBtn greens" :href="$baseURL+scope.row.attachmentUrl" target="_blank" download>下载</a>
266 266 </template>
267 267 </el-table-column>
268 268  
... ... @@ -489,7 +489,7 @@
489 489 </el-col>
490 490  
491 491 </el-row>
492   - <el-row :gutter="20">
  492 + <!-- <el-row :gutter="20">
493 493 <el-col :span="24">
494 494 <el-form-item label="反馈内容" class="grid-content bg-purple" prop="name">
495 495 <el-upload class="upload-demo" ref="upload" :on-remove="handleRemove"
... ... @@ -501,7 +501,7 @@
501 501 </el-form-item>
502 502 </el-col>
503 503  
504   - </el-row>
  504 + </el-row> -->
505 505 </el-form>
506 506 </div>
507 507 </div>
... ... @@ -2230,9 +2230,6 @@
2230 2230 ::v-deep .el-form-item{
2231 2231 margin-bottom:16px;
2232 2232 }
2233   - /deep/ .el-form-item__content {
2234   - line-height: 0;
2235   - }
2236 2233  
2237 2234 .tableBtn {
2238 2235 display: inline-block;
... ...
admin-web-master/src/views/atmosphere/atmosphereBian.vue
  View file @f0e7afb
... ... @@ -79,9 +79,11 @@
79 79 </el-row>
80 80 <div style="padding: 10px">
81 81 <el-row :gutter="20">
82   - <el-form-item label="活动封面海报" prop="cover_poster" class="grid-content bg-purple">
83   - <upimg v-model="secondData.coverPoster" :value="secondData.coverPoster==''?'':secondData.coverPoster" :limit="1" :fileSize="1" :isShowTip="false"></upimg>
  82 + <el-col :span="24">
  83 + <el-form-item label="活动封面海报" prop="coverPoster" class="grid-content bg-purple">
  84 + <upimg filePath="act" :value="secondData.coverPoster==''?'':secondData.coverPoster" inputtype="coverPoster" :limit="1" @changimg="e=>changimg(e,'coverPoster')"></upimg>
84 85 </el-form-item>
  86 + </el-col>
85 87 </el-row>
86 88 </div>
87 89 </el-form>
... ... @@ -238,14 +240,15 @@
238 240 相关附件信息
239 241 </div>
240 242 <div>
241   - <el-upload class="upload-demo" ref="upload"
  243 + <upfile filePath="act" inputtype="otherImageVideos" :islist="false" :accept="'.docx'" :value="ruleForm.otherImageVideos" @changimg="e=>changimg(e,'otherImageVideos')"></upfile>
  244 + <!-- <el-upload class="upload-demo" ref="upload"
242 245 :action="uploadFileUrl"
243 246 :on-success="handleUploadSuccess"
244 247 :file-list="fileData" :show-file-list="false">
245 248 <div style="color: #2d8a58;margin-left: 10px;margin-top: 10px;" slot="trigger">
246 249 上传附件
247 250 </div>
248   - </el-upload>
  251 + </el-upload> -->
249 252 </div>
250 253 </div>
251 254 <div style="padding: 20px 40px 0px 20px">
... ... @@ -330,6 +333,8 @@
330 333 import Vue from 'vue'
331 334 import { uploadUrl } from '@/utils/request'
332 335 import upimg from "@/components/ImageUpload/index"
  336 + import upfile from "@/components/fujianUpload/fujianList"
  337 +
333 338 export default {
334 339 props:{
335 340 showBian:{
... ... @@ -337,7 +342,7 @@
337 342 default: () => ({})
338 343 }
339 344 },
340   - components: { upimg},
  345 + components: { upfile,upimg},
341 346 data() {
342 347 return {
343 348 uploadFileUrl: uploadUrl, // 请求地址
... ... @@ -383,6 +388,27 @@
383 388 mounted() {
384 389 },
385 390 methods: {
  391 + changimg(e,type) {
  392 + this.ruleForm[type] = e
  393 +
  394 + if(type=='otherImageVideos'){
  395 + const parts = e.split('/');
  396 + const filename = parts[parts.length - 1];
  397 + // let file ={
  398 + // url:e,
  399 + // attachmentName:filename
  400 + // }
  401 + let fuji={
  402 + detailsId:this.secondData.id,
  403 + attachmentName:filename,
  404 + attachmentUrl:e,
  405 + }
  406 + fujiaAdd(fuji).then(res=>{
  407 + this.fucha(this.secondData.id)
  408 + })
  409 + // this.dataList.push(file)
  410 + }
  411 + },
386 412 //获取当前时间
387 413 updateCurrentTime() {
388 414 const now = new Date();
... ...
admin-web-master/src/views/atmosphere/atmosphereBz.vue
  View file @f0e7afb
... ... @@ -118,9 +118,9 @@
118 118 </el-col>
119 119 </el-row>
120 120 <el-row :gutter="20">
121   - <el-col :span="12">
122   - <el-form-item label="活动封面海报" prop="cover_poster" class="grid-content bg-purple">
123   - <upimg v-model="ruleForm.coverPoster" :limit="1" :fileSize="1" :isShowTip="false"></upimg>
  121 + <el-col :span="24">
  122 + <el-form-item label="活动封面海报" prop="coverPoster" class="grid-content bg-purple">
  123 + <upimg filePath="act" :value="ruleForm.coverPoster" inputtype="coverPoster" :limit="1" @changimg="e=>changimg(e,'coverPoster')"></upimg>
124 124 </el-form-item>
125 125 </el-col>
126 126 </el-row>
... ... @@ -282,17 +282,9 @@
282 282 <el-tab-pane label="相关附件">
283 283 <div style="border: 1px solid #E5E5E5;padding: 1px" id="fu">
284 284 <div style="padding: 10px 13px;font-size: 12px;border-bottom: 1px solid #E5E5E5;display: flex;">
285   - <div>相关附件</div>
  285 + <div style="line-height:38px;">相关附件</div>
286 286 <div>
287   - <el-upload class="upload-demo" ref="upload"
288   - :action="uploadFileUrl"
289   - :on-success="handleUploadSuccess"
290   - :file-list="fileData"
291   - :show-file-list="false" >
292   - <div style="color: #2d8a58;margin-left: 10px;" slot="trigger">
293   - 上传附件
294   - </div>
295   - </el-upload>
  287 + <upfile filePath="act" inputtype="otherImageVideos" :limit="10" :islist="false" :accept="'.docx'" :value="ruleForm.otherImageVideos" @changimg="e=>changimg(e,'otherImageVideos')"></upfile>
296 288 </div>
297 289 </div>
298 290 <div style="padding: 15px;">
... ... @@ -391,6 +383,7 @@
391 383 import { uploadUrl } from '@/utils/request'
392 384 import html2canvas from 'html2canvas'
393 385 import jsPDF from 'jspdf'
  386 + import upfile from "@/components/fujianUpload/fujianList"
394 387 export default {
395 388 props: {
396 389 showAdd:{
... ... @@ -404,7 +397,7 @@ export default {
404 397 },
405 398 }
406 399 },
407   - components: { wangEditor ,upimg},
  400 + components: { wangEditor ,upimg,upfile},
408 401 data(){
409 402 return{
410 403 uploadFileUrl: uploadUrl, // 请求地址
... ... @@ -476,6 +469,19 @@ lishiList:&#39;&#39;,
476 469 this.lishi()
477 470 },
478 471 methods: {
  472 + changimg(e,type) {
  473 + this.ruleForm[type] = e
  474 +
  475 + if(type=='otherImageVideos'){
  476 + const parts = e.split('/');
  477 + const filename = parts[parts.length - 1];
  478 + let file ={
  479 + url:e,
  480 + name:filename
  481 + }
  482 + this.dataList.push(file)
  483 + }
  484 + },
479 485 //获取当前时间
480 486 updateCurrentTime() {
481 487 const now = new Date();
... ...
admin-web-master/src/views/atmosphere/atmosphereGl.vue
  View file @f0e7afb
... ... @@ -139,7 +139,7 @@
139 139 <div style="width: 100%;">
140 140 <div style="display: flex;padding:0px 20px 20px 20px; ">
141 141 <div style="width: 150px;height: 80px;" v-if="secondData.coverPoster">
142   - <img :src="secondData.coverPoster" alt="" style="width: 100%;height: 80px;"/>
  142 + <img :src="$baseURL+secondData.coverPoster" alt="" style="width: 100%;height: 80px;"/>
143 143 </div>
144 144 <div
145 145 style="display: flex;flex-direction: column;justify-content: space-around;padding: 0 10px;font-size: 12px;">
... ... @@ -553,7 +553,7 @@
553 553 </el-col>
554 554  
555 555 </el-row>
556   - <el-row :gutter="20">
  556 + <!-- <el-row :gutter="20">
557 557 <el-col :span="24">
558 558 <el-form-item label="反馈内容" class="grid-content bg-purple" prop="name">
559 559 <el-upload class="upload-demo" ref="upload" :on-remove="handleRemove"
... ... @@ -565,7 +565,7 @@
565 565 </el-form-item>
566 566 </el-col>
567 567  
568   - </el-row>
  568 + </el-row> -->
569 569 </el-form>
570 570 </div>
571 571 </div>
... ... @@ -2216,9 +2216,6 @@ this.fileData=[]
2216 2216  
2217 2217 }
2218 2218  
2219   -/deep/ .el-form-item__content {
2220   - line-height: 0;
2221   -}
2222 2219  
2223 2220 .tableBtn {
2224 2221 display: inline-block;
... ...
admin-web-master/src/views/atmosphere/atmosphereSp.vue
  View file @f0e7afb
... ... @@ -430,7 +430,7 @@
430 430 <div style="padding: 10px">
431 431 <el-row :gutter="20">
432 432 <el-form-item label="活动封面海报" prop="cover_poster" class="grid-content bg-purple">
433   - <img :src="secondData.coverPoster" alt="" style="width: 80px;height:80px;">
  433 + <img :src="$baseURL+secondData.coverPoster" alt="" style="width: 80px;height:80px;">
434 434 </el-form-item>
435 435 </el-row>
436 436 </div>
... ... @@ -761,7 +761,7 @@
761 761 <div style="width: 100%;">
762 762 <div style="display: flex;padding:0px 20px 20px 20px; ">
763 763 <div style="width: 150px;height: 80px;" v-if="secondData.coverPoster">
764   - <img :src="secondData.coverPoster" alt="" style="width: 100%;height: 80px;"/>
  764 + <img :src="$baseURL+secondData.coverPoster" alt="" style="width: 100%;height: 80px;"/>
765 765 </div>
766 766 <div
767 767 style="display: flex;flex-direction: column;justify-content: space-around;padding: 0 10px;font-size: 12px;">
... ...
admin-web-master/src/views/media/mediaMana.vue
  View file @f0e7afb
... ... @@ -126,8 +126,8 @@
126 126 </el-form-item>
127 127 <el-form-item label="封面海报" class="grid-content bg-purple" prop="name">
128 128 <div style="margin:0 10px;">
129   - <upimg v-model="secondData.coverImage" :value="secondData.coverImage" :limit="1" :fileSize="1" :isShowTip="false" v-if="wangShow==false"></upimg>
130   - <img :src="secondData.coverImage" alt="" style="width:150px;height: 150px;" v-if="wangShow"/>
  129 + <upimg filePath="tuiguang" :value="secondData.coverImage" inputtype="coverImage" :limit="1" v-if="wangShow==false" @changimg="e=>changimg(e,'coverImage')"></upimg>
  130 + <img :src="$baseURL+secondData.coverImage" alt="" style="width:150px;height: 150px;" v-if="wangShow"/>
131 131 </div>
132 132 </el-form-item>
133 133 <el-form-item label="宣传内容" class="grid-content bg-purple" prop="name">
... ... @@ -531,7 +531,7 @@ components: { addAct,wangEditor,upimg},
531 531 planName: '',
532 532 planFen:'',
533 533 currentPage: 1,
534   - total: 100,
  534 + total: 0,
535 535 flag: false,
536 536 pageSize: 10,
537 537 ggXin: false,
... ... @@ -602,6 +602,10 @@ components: { addAct,wangEditor,upimg},
602 602  
603 603 },
604 604 methods: {
  605 + changimg(e,type) {
  606 + this.secondData[type] = e
  607 +
  608 + },
605 609 //查询全数据
606 610 async getAll() {
607 611 const res = await tuiGetAll(this.pageindex)
... ...
admin-web-master/src/views/media/mediaMannaAdd.vue
  View file @f0e7afb
... ... @@ -44,19 +44,20 @@
44 44 <div style="padding:15px">
45 45 <div style="display:flex;">
46 46 <div style="display:flex;margin-right:30px;">
47   - <div>微信</div>
48   - <div style="margin:0 10px;"><upimg v-model="ruleForm.coverImage" :limit="1" :fileSize="1" :isShowTip="false"></upimg></div>
49   - <div style="color:#E5E5E5">
50   - 请选择海报
51   - </div>
  47 + <div>封面海报</div>
  48 + <div style="margin:0 10px;">
  49 + <!-- <upimg v-model="ruleForm.coverImage" :limit="1" :fileSize="1" :isShowTip="false"></upimg> -->
  50 + <upimg filePath="tuiguang" :value="ruleForm.coverImage" inputtype="coverImage" :limit="1" @changimg="e=>changimg(e,'coverImage')"></upimg>
  51 + </div>
  52 +
52 53 </div>
53   - <div style="display:flex">
  54 + <!-- <div style="display:flex">
54 55 <div>微信朋友圈</div>
55 56 <div style="margin:0 10px;"><upimg v-model="ruleForm.wxpyPoster" :limit="1" :fileSize="1" :isShowTip="false"></upimg></div>
56 57 <div style="color:#E5E5E5">
57 58 请选择海报
58 59 </div>
59   - </div>
  60 + </div> -->
60 61 </div>
61 62 </div>
62 63 </div>
... ... @@ -69,10 +70,10 @@
69 70 </el-button>
70 71 <!-- <el-button plain @click="close" size="mini" style="background-color: #3F9B6A;color: #fff;">发布信息填写
71 72 </el-button> -->
72   - <el-button plain @click="close" size="mini" style="background-color: #3F9B6A;color: #fff;">媒体上传
  73 + <!-- <el-button plain @click="close" size="mini" style="background-color: #3F9B6A;color: #fff;">媒体上传
73 74 </el-button>
74 75 <el-button plain @click="close" size="mini" style="background-color: #fff;color: #000;border:1px solid #A0A0A0" class="buttonHover">一键发布
75   - </el-button>
  76 + </el-button> -->
76 77 <el-button plain @click="close" size="mini" style="background-color: #fff;color: #000;border:1px solid #A0A0A0" class="buttonHover">返回
77 78 </el-button>
78 79 </div>
... ... @@ -147,6 +148,10 @@
147 148 this.editTrue = true
148 149 },
149 150 methods: {
  151 + changimg(e,type) {
  152 + this.ruleForm[type] = e
  153 +
  154 + },
150 155 //获取当前时间
151 156 updateCurrentTime() {
152 157 const now = new Date();
... ...
admin-web-master/src/views/promotion/account.vue
  View file @f0e7afb
... ... @@ -139,7 +139,8 @@
139 139 <el-input v-model="formInline.appKey" placeholder="请输入"></el-input>
140 140 </el-form-item>
141 141 <el-form-item label="APP图片" v-if="index==1?true:false" prop="coverPoster" style="margin-bottom:20px;">
142   - <upimg v-model="formInline.coverPoster" :limit="1" :fileSize="1" :isShowTip="false"></upimg>
  142 + <upimg filePath="qudao" :value="formInline.coverPoster" inputtype="coverPoster" :limit="1" @changimg="e=>changimg(e,'coverPoster')"></upimg>
  143 +
143 144 </el-form-item>
144 145 <el-form-item label="备注">
145 146 <el-input type="textarea" v-model="formInline.notes" :rows="4"
... ... @@ -297,6 +298,9 @@
297 298 this.getAll()
298 299 },
299 300 methods: {
  301 + changimg(e,type) {
  302 + this.formInline[type] = e
  303 + },
300 304 async getAll() {
301 305 const res = await quGetAll(this.pageindex)
302 306 this.tableData = res.data.content
... ...
admin-web-master/src/views/promotion/audit.vue
  View file @f0e7afb
... ... @@ -45,9 +45,7 @@
45 45 </el-table-column>
46 46 <el-table-column label="类型" prop="promotionContent" min-width="150" >
47 47 </el-table-column>
48   - <el-table-column label="发布状态" prop="" min-width="80" >
49 48  
50   - </el-table-column>
51 49 <el-table-column label="审批状态" prop="state" min-width="150" >
52 50 <template slot-scope="scope">
53 51 {{scope.row.state == ''?'待提交':scope.row.state == '1'?'待审批':scope.row.state == '2'?'部门领导审批':scope.row.state == '3'?'公司领导审批':scope.row.state == '4'?'其他审批':scope.row.state == '5'?'审核通过':'已驳回'}}
... ... @@ -55,9 +53,7 @@
55 53 </el-table-column>
56 54 <el-table-column label="修改时间" prop="createDate" min-width="250" >
57 55 </el-table-column>
58   - <el-table-column prop="eventEndTime" label="上传人员" min-width="120" >
59 56  
60   - </el-table-column>
61 57 <el-table-column label="操作" min-width="150">
62 58 <template slot-scope="scope">
63 59 <div @click="actSp(scope.row)" class="tableBtn greens" v-if="scope.row.state != ''">OA流程审批</div>
... ... @@ -76,148 +72,6 @@
76 72 </div>
77 73 </div>
78 74  
79   - <!-- 活动效果分析 -->
80   - <el-dialog :visible.sync="ggXin" custom-class='fenxi_css' style="padding: 0;" width="75%"
81   - center :close-on-click-modal="false" :close-on-press-escape="false">
82   - <div style="padding:15px;background-color:#F9F9F9;font-size:12px;border:1px solid #ECECEC;margin-bottom:20px">
83   - 渠道效果分析
84   - </div>
85   - <div style="padding:0 20px;">
86   - <div style="font-size:12px;margin-bottom:10px;">成本分析</div>
87   - <div style="display:flex;padding:10px 0;">
88   - <div style="margin-right:40px;width:17%">
89   - <div style="color:#BBBBBB;font-size:10px;">吸引游客流量</div>
90   - <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;font-weight:600;">4289</span>人</div>
91   - <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">+45%</div>
92   - <div style="height:5px;background-color:red;"></div>
93   - </div>
94   - <div style="margin-right:40px;width:17%">
95   - <div style="color:#BBBBBB;font-size:10px;">参与人数</div>
96   - <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;font-weight:600;">4289</span>人</div>
97   - <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">+45%</div>
98   - <div style="height:5px;background-color:red;"></div>
99   - </div>
100   - <div style="margin-right:40px;width:17%">
101   - <div style="color:#BBBBBB;font-size:10px;">直接收益</div>
102   - <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;font-weight:600;">4289</span>人</div>
103   - <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">+45%</div>
104   - <div style="height:5px;background-color:red;"></div>
105   - </div>
106   - <div style="margin-right:40px;width:17%">
107   - <div style="color:#BBBBBB;font-size:10px;">间接收益</div>
108   - <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;font-weight:600;">4289</span>人</div>
109   - <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">+45%</div>
110   - <div style="height:5px;background-color:red;"></div>
111   - </div>
112   - <div style="margin-right:40px;width:17%">
113   - <div style="color:#BBBBBB;font-size:10px;">投入生产比</div>
114   - <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;font-weight:600;">4289</span>人</div>
115   - <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">+45%</div>
116   - <div style="height:5px;background-color:red;"></div>
117   - </div>
118   - </div>
119   - </div>
120   - <div style="padding:15px;background-color:#F9F9F9;font-size:12px;border:1px solid #ECECEC;margin-bottom:20px">
121   - 策划主题占比
122   - </div>
123   - <div style="padding:0 20px;display:flex;justify-content: space-around;color:#999999">
124   - <div style="display:flex;width:24%;align-items: center">
125   - <el-progress type="circle" :percentage="100"></el-progress>
126   - <div style="margin-left:30px;">
127   - <div style="margin-bottom: 15px;">主题1</div>
128   - <div><span style="font-size:26px;">53.2</span>万流量</div>
129   - </div>
130   - </div>
131   - <div style="display:flex;width:24%;align-items: center">
132   - <el-progress type="circle" :percentage="25"></el-progress>
133   - <div style="margin-left:30px;">
134   - <div style="margin-bottom: 15px;">主题2</div>
135   - <div><span style="font-size:26px;">53.2</span>万流量</div>
136   - </div>
137   - </div>
138   - <div style="display:flex;width:24%;align-items: center">
139   - <el-progress type="circle" :percentage="50"></el-progress>
140   - <div style="margin-left:30px;">
141   - <div style="margin-bottom: 15px;">主题3</div>
142   - <div><span style="font-size:26px;">53.2</span>万流量</div>
143   - </div>
144   - </div>
145   - <div style="display:flex;width:24%;align-items: center">
146   - <el-progress type="circle" :percentage="75"></el-progress>
147   - <div style="margin-left:30px;">
148   - <div style="margin-bottom: 15px;">主题4</div>
149   - <div><span style="font-size:26px;">53.2</span>万流量</div>
150   - </div>
151   - </div>
152   - </div>
153   - <div style="padding:0 20px;margin-top:20px;">
154   - <div style="padding:55px 10px 10px 10px;background-color:#fff;position:relative">
155   - <div style="position: absolute;top: 60px;right: 10px; z-index: 10;">
156   - <el-radio-group v-model="radio1" style="margin-right:10px">
157   - <el-radio-button label="本周"></el-radio-button>
158   - <el-radio-button label="本月"></el-radio-button>
159   - <el-radio-button label="今年 "></el-radio-button>
160   - <el-radio-button label="自定义"></el-radio-button>
161   - </el-radio-group>
162   - <el-date-picker
163   - v-if="radio1=='自定义'"
164   -
165   - style="width:250px"
166   - v-model="radio1_time"
167   - type="datetimerange"
168   - range-separator="至"
169   - start-placeholder="开始日期"
170   - end-placeholder="结束日期">
171   - </el-date-picker>
172   - </div>
173   - <el-tabs type="border-card" @tab-click="TabClick">
174   - <el-tab-pane label="整体效果分析">
175   - <el-table :data="dataList"
176   - :header-cell-style="{fontSize: '12px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
177   - style="width: 100%">
178   - <el-table-column label="渠道" width="auto" min-width="12%" align="center">
179   - <template slot-scope="scope">
180   - {{scope.$index + 1}}
181   - </template>
182   - </el-table-column>
183   - <el-table-column label="阅读量" width="auto" min-width="15%" align="center">
184   - <template slot-scope="scope">
185   - {{scope.$index + 1}}
186   - </template>
187   - </el-table-column>
188   - <el-table-column label="点赞量" width="auto" min-width="15%" align="center">
189   - <template slot-scope="scope">
190   - {{scope.$index + 1}}
191   - </template>
192   - </el-table-column>
193   - <el-table-column label="评论量" prop="name" width="auto" min-width="15%">
194   - <template slot-scope="scope">
195   - {{scope.row.name}}
196   - </template>
197   - </el-table-column>
198   - <el-table-column label="播放量" prop="name" width="auto" min-width="15%">
199   - <template slot-scope="scope">
200   - {{scope.row.name}}
201   - </template>
202   - </el-table-column>
203   - <el-table-column label="回访人数" prop="name" width="auto" min-width="15%">
204   - <template slot-scope="scope">
205   - {{scope.row.name}}
206   - </template>
207   - </el-table-column>
208   - </el-table>
209   - </el-tab-pane>
210   - <el-tab-pane label="纵向分析">
211   -
212   - </el-tab-pane>
213   - <el-tab-pane label="横向分析">
214   -
215   - </el-tab-pane>
216   - </el-tabs>
217   - </div>
218   -
219   - </div>
220   - </el-dialog>
221 75 </div>
222 76 </div>
223 77 <!-- 审批 -->
... ... @@ -285,7 +139,7 @@
285 139 <el-col :span="8">
286 140 <el-form-item label="封面海报" class="grid-content bg-purple" prop="name">
287 141 <div style="margin:0 10px;">
288   - <img :src="secondData.coverImage" alt="" style="width:150px;height: 150px;" />
  142 + <img :src="$baseURL+secondData.coverImage" alt="" style="width:150px;height: 150px;" />
289 143 </div>
290 144 </el-form-item>
291 145 </el-col>
... ... @@ -797,7 +651,7 @@ actSp(item){
797 651 line-height: 0;
798 652 }
799 653  
800   -
  654 +
801 655  
802 656 .formSearch {
803 657 display: flex;
... ...
admin-web-master/src/views/promotion/contentMant.vue
  View file @f0e7afb
... ... @@ -97,11 +97,12 @@
97 97 <div style="padding:20px;" v-if="index == 2" v-html="formInline.contentCompilation"></div>
98 98 </el-form-item>
99 99 <el-form-item label="附件上传" prop="accountNumber">
100   - <el-upload class="upload-demo" ref="upload" :on-remove="handleRemove"
  100 + <!-- <el-upload class="upload-demo" ref="upload" :on-remove="handleRemove"
101 101 :action="uploadFileUrl" :on-success="handleUploadSuccess" :file-list="fileData"
102 102 :auto-upload="true" v-if="index ==3 || index ==1">
103 103 <el-button style="background-color: #fff;color: #3F9B6A;border: 1px solid #dcdfe6;" class="buttonHover" v-if="fileData.length==0">+点击上传</el-button>
104   - </el-upload>
  104 + </el-upload> -->
  105 + <upfile filePath="tuiguang" inputtype="otherImageVideos" :limit="1" :accept="'.docx'" :value="formInline.otherImageVideos" @changimg="e=>changimg(e,'otherImageVideos')"></upfile>
105 106 <div style="padding:20px;" v-if="index == 2">
106 107 {{formInline.attachmentUpload[0]&&formInline.attachmentUpload[0].name?formInline.attachmentUpload[0].name:''}}
107 108 </div>
... ... @@ -119,7 +120,8 @@
119 120 <el-input v-model="formInline.appKey" placeholder="请输入"></el-input>
120 121 </el-form-item>
121 122 <el-form-item label="APP图片" v-if="index==1?true:false" prop="appImage" style="margin-bottom:20px;">
122   - <upimg v-model="formInline.appImage" :limit="1" :fileSize="1" :isShowTip="false"></upimg>
  123 + <!-- <upimg v-model="formInline.appImage" :limit="1" :fileSize="1" :isShowTip="false"></upimg> -->
  124 + <upimg filePath="tuiguang" :value="formInline.appImage" inputtype="appImage" :limit="1" @changimg="e=>changimg(e,'appImage')"></upimg>
123 125 </el-form-item>
124 126 <el-form-item label="备注">
125 127 <el-input type="textarea" v-model="formInline.remarks" :rows="4"
... ... @@ -163,11 +165,12 @@
163 165 } from '@/api/contentMant.js'
164 166 import upimg from "@/components/ImageUpload/index"
165 167 import wangEditor from "@/components/editor/index"
  168 + import upfile from "@/components/fujianUpload/fujianList"
166 169 import {
167 170 uploadUrl
168 171 } from '@/utils/request'
169 172 export default {
170   - components: { upimg,wangEditor},
  173 + components: { upimg,wangEditor,upfile},
171 174 data() {
172 175 return {
173 176 uploadFileUrl: uploadUrl, // 请求地址
... ... @@ -234,6 +237,18 @@
234 237 this.getAll()
235 238 },
236 239 methods: {
  240 + changimg(e,type) {
  241 + this.formInline[type] = e
  242 + if(type=='otherImageVideos'){
  243 + const parts = e.split('/');
  244 + const filename = parts[parts.length - 1];
  245 + let file ={
  246 + url:e,
  247 + name:filename
  248 + }
  249 + this.formInline.attachmentUpload = JSON.stringify(this.file)
  250 + }
  251 + },
237 252 async getAll() {
238 253 const res = await quGetAll(this.pageindex)
239 254 this.qudaoData = res.data.content
... ... @@ -283,19 +298,19 @@
283 298 this.$refs.jibenFrom.validate((valid) => {
284 299 if (valid) {
285 300 if(index == 1){
286   - if(this.fileData.length !='0'){
287   - this.formInline.attachmentUpload = JSON.stringify(this.fileData)
288   - }
  301 + // if(this.fileData.length !='0'){
  302 + // this.formInline.attachmentUpload = JSON.stringify(this.fileData)
  303 + // }
289 304 this.formInline.createDate = this.updateCurrentTime()
290 305 contentAdd(this.formInline).then(res => {
291 306 this.getAll()
292 307 this.ggXin = false
293 308 })
294 309 }else{
295   - if(this.fileData.length !='0'){
296   - this.formInline.attachmentUpload = JSON.stringify(this.fileData)
  310 + // if(this.fileData.length !='0'){
  311 + // this.formInline.attachmentUpload = JSON.stringify(this.fileData)
297 312  
298   - }
  313 + // }
299 314 contentEdit(this.formInline).then(res => {
300 315 this.getAll()
301 316 this.ggXin = false
... ... @@ -445,7 +460,7 @@
445 460 line-height: 0;
446 461 }
447 462  
448   -
  463 +
449 464  
450 465 .formSearch {
451 466 display: flex;
... ...
admin-web-master/src/views/serve/MarkActivity/index.vue
  View file @f0e7afb
... ... @@ -155,7 +155,8 @@
155 155 <el-input placeholder="请输入" v-model="xiangData.contactPhone" :disabled="edit"></el-input>
156 156 </el-form-item>
157 157 <el-form-item label="封面图片" prop="coverImage">
158   - <upimg v-model="xiangData.coverImage" :limit="1" :fileSize="1" :isShowTip="false" v-if="!edit"></upimg>
  158 + <!-- <upimg v-model="xiangData.coverImage" :limit="1" :fileSize="1" :isShowTip="false" v-if="!edit"></upimg> -->
  159 + <upimg filePath="serve" :value="xiangData.coverImage" inputtype="coverImage" :limit="1" v-if="!edit" @changimg="e=>changimg(e,'coverImage')"></upimg>
159 160 <img :src="xiangData.coverImage" alt="" v-else>
160 161 </el-form-item>
161 162  
... ... @@ -238,7 +239,8 @@
238 239 <el-input placeholder="请输入" v-model="formInline.contactPhone" ></el-input>
239 240 </el-form-item>
240 241 <el-form-item label="封面图片">
241   - <upimg v-model="formInline.coverImage" :limit="1" :fileSize="1" :isShowTip="false"></upimg>
  242 + <!-- <upimg v-model="formInline.coverImage" :limit="1" :fileSize="1" :isShowTip="false"></upimg> -->
  243 + <upimg filePath="serve" :value="formInline.coverImage" inputtype="coverImage" :limit="1" v-if="!edit" @changimg="e=>changimg(e,'coverImage')"></upimg>
242 244 </el-form-item>
243 245  
244 246 </el-form>
... ... @@ -430,6 +432,10 @@
430 432  
431 433 },
432 434 methods: {
  435 + changimg(e,type) {
  436 + this.xiangData[type] = e
  437 + this.changimg[type] = e
  438 + },
433 439 // 获取时间
434 440 currentTime() {
435 441 let date = new Date();
... ...
admin-web-master/src/views/serve/procedure.vue
  View file @f0e7afb
... ... @@ -244,15 +244,15 @@
244 244 @click="closeFn(1)"
245 245 >取消</el-button
246 246 >
247   - <el-button
  247 + <!-- <el-button
248 248 style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"
249 249 @click="bianji"
250   - >编辑</el-button
251   - >
  250 + >编辑</el-button> -->
252 251  
253 252 <el-button
254 253 style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"
255 254 @click="msgeditS"
  255 + v-if="!edit"
256 256 >确定</el-button
257 257 >
258 258 </div>
... ... @@ -301,7 +301,7 @@
301 301 </el-select>
302 302 </el-form-item>
303 303 <el-form-item label="公告内容">
304   - <div style="border: 1px solid #ccc">
  304 + <div>
305 305 <wang-editor v-model="ruleForm.announcementContent" ref="editor"></wang-editor>
306 306  
307 307 </div>
... ...
lvdao-miniapp/pages/my/my.vue
  View file @f0e7afb
... ... @@ -222,21 +222,7 @@
222 222 <image :src="$imgUrl('/right2.png')"></image>
223 223 </view>
224 224 </view>
225   - <!-- <view class="list" @click="handleApplySettle">
226   - <view class="icon-data">
227   - <view class="icon">
228   - <image :src="$imgUrl('/my-icon4.png')" mode=""></image>
229   - </view>
230   - <view class="data">
231   - <view class="title">
232   - <text>商城入驻申请</text>
233   - </view>
234   - </view>
235   - </view>
236   - <view class="more">
237   - <image :src="$imgUrl('/right2.png')"></image>
238   - </view>
239   - </view> -->
  225 +
240 226 </view>
241 227 </view>
242 228 <!-- tabbar -->
... ... @@ -455,44 +441,7 @@
455 441 }
456 442  
457 443 },
458   - handleApplySettle() {
459   - // uni.navigateTo({
460   - // url: '/pages/myzili/myzili'
461   - // })
462   - const res = uni.getStorageSync('token');
463   - let token = Encrypt(res)
464   - let username = this.shopMsg.shopName
465   - // let url = 'http://8.130.38.56:8027/settled-merchant'
466   - let url = 'https://jy.scjysm.asia:18086/settled-merchant'
467   -
468   - // #ifdef H5
469   - console.log('h5 test')
470   - window.location.href = url + `/#/?username=${ username }&user=${ token }`
471   - // #endif
472   - // #ifdef APP-PLUS
473   - plus.runtime.openURL(url + `/#/?username=${ username }&user=${ token }`, function(
474   - e) {
475   - console.log(e);
476   - })
477   - // #endif
478   - // #ifdef MP-WEIXIN
479   - uni.navigateTo({
480   - url: `../linkOthers/index?url=${ url }&username=${ username }&user=${ token }`
481   - // 此处的链接为小程序上面新建的webview页面路径，参数url为要跳转外链的地址
482   - // url: '../../../pages_category_page1/linkOthers/index?url=' + encodeURIComponent(url)
483   - // url:'../../../pages_category_page2/userModule/coupon'
484   - })
485   - // #endif
486   - // #ifdef MP-ALIPAY
487   - uni.navigateTo({
488   - url: `../linkOthers/index?url=${ url }&username=${ username }&user=${ token }`
489   - // 此处的链接为小程序上面新建的webview页面路径，参数url为要跳转外链的地址
490   - // url: '../../../pages_category_page1/linkOthers/index?url=' + encodeURIComponent(url)
491   - // url:'../../../pages_category_page2/userModule/coupon'
492   - })
493   - // #endif
494   -
495   - },
  444 +
496 445 myMsg() {
497 446 const res = uni.getStorageSync('token');
498 447 if (res == '') {
... ...
lvdao-miniapp/pages/saleReport/saleReport.vue
  View file @f0e7afb
... ... @@ -32,7 +32,7 @@
32 32 <view class="up_line"></view>
33 33 <view class="item">
34 34 <view class="title">
35   - 价格
  35 + 单价
36 36 </view>
37 37 <view class="inputContent">
38 38 <input type="text" v-model="item.price" placeholder="请输入" />
... ...
lvdao-miniapp/pages/salesReporting/salesReporting.vue
  View file @f0e7afb
... ... @@ -10,8 +10,8 @@
10 10 <view class="title" style="font-size: 26rpx;">
11 11 今日销售金额
12 12 </view>
13   - <view class="num">21</view>
14   - <view>同比昨日上升5</view>
  13 + <view class="num">{{todayRe}}</view>
  14 + <view>同比昨日<span>{{subtract}}</span></view>
15 15 </view>
16 16 <!-- <view class="cardOne">
17 17 <view class="title">
... ... @@ -25,7 +25,7 @@
25 25 </view>
26 26 <view class="" style="width: 96%;margin: 0 auto;background-color: #fff;border-radius: 20rpx;margin-top: 20rpx;">
27 27 <view class="" style="width: 96%;margin: 0 auto;padding: 20rpx 20rpx;">
28   - <view style="font-weight: bold;font-size: 28rpx;">营业额趋势</view>
  28 + <view style="font-weight: bold;font-size: 28rpx;">营业额趋势(周)</view>
29 29 <view style="height: 300px;width: 100%;margin-top: 20rpx;">
30 30 <qiun-data-charts type="line" :opts="opts" :chartData="chartData" />
31 31 </view>
... ... @@ -51,32 +51,33 @@
51 51 return {
52 52 chart: null,
53 53 chartData: {},
  54 + todayRe:0,
  55 + subtract:0,
54 56 opts: {
55   - color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4",
56   - "#ea7ccc"
57   - ],
58   - padding: [15, 10, 0, 15],
59   - enableScroll: false,
60   - legend: {},
61   - xAxis: {
62   - disableGrid: true
63   - },
64   - yAxis: {
65   - gridType: "dash",
66   - dashLength: 2
67   - },
68   - extra: {
69   - line: {
70   - type: "straight",
71   - width: 2,
72   - activeType: "hollow"
73   - }
74   - }
75   - },
  57 + color: ["#3CA272"],
  58 + padding: [15,10,0,15],
  59 + enableScroll: false,
  60 + legend: {},
  61 + xAxis: {
  62 + disableGrid: true,
  63 + fontSize: 10, // 设置X轴字体大小
  64 + },
  65 + yAxis: {
  66 + gridType: "dash",
  67 + dashLength: 2
  68 + },
  69 + extra: {
  70 + line: {
  71 + type: "curve",
  72 + width: 2,
  73 + activeType: "hollow"
  74 + }
  75 + }
  76 +
  77 + },
76 78 chartData1: {},
77 79 opts1: {
78   - color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4",
79   - "#ea7ccc"
  80 + color: ["#3CA272"
80 81 ],
81 82 padding: [15, 30, 0, 5],
82 83 enableScroll: false,
... ... @@ -86,9 +87,12 @@
86 87 disableGrid: false,
87 88 min: 0,
88 89 axisLine: false,
89   - max: 70
  90 + AllyDecimals: false,
  91 +
  92 + },
  93 + yAxis: {
  94 +
90 95 },
91   - yAxis: {},
92 96 extra: {
93 97 bar: {
94 98 type: "stack",
... ... @@ -111,44 +115,79 @@
111 115 },
112 116 methods: {
113 117 getServerData() {
114   - //模拟从服务器获取数据时的延时
115   - setTimeout(() => {
116   - //模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接
117   - let res = {
118   - categories: ["2020", "2021", "2022", "2023", "2024", "2025"],
119   - series: [{
120   - name: "成交量A",
121   - data: [0, 0, 0, 0, 4,0]
122   - },
123   - {
124   - name: "成交量B",
125   - data: [0,0 ,0, 0, 44, 0]
126   - },
127   - {
128   - name: "成交量C",
129   - data: [0, 0, 0, 0, 112, 0]
130   - }
131   - ]
132   - };
133   - this.chartData = JSON.parse(JSON.stringify(res));
134   - }, 500);
135   -
136   - setTimeout(() => {
137   - //模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接
138   - let res = {
139   - categories: ["2020", "2021", "2022", "2023", "2024", "2025"],
140   - series: [{
141   - name: "目标值",
142   - data: [0, 0, 0,0 ,13, 0]
143   - },
144   - {
145   - name: "完成量",
146   - data: [0, 0, 0, 0, 6, 0]
147   - }
148   - ]
149   - };
150   - this.chartData1 = JSON.parse(JSON.stringify(res));
151   - }, 500);
  118 + this.$http.sendRequest('/cereSalesReporting/salesStatistics/154', 'GET',{},1).then(res => {
  119 + console.log(res.data)
  120 + this.subtract = res.data.data.subtract
  121 + this.todayRe = res.data.data.todayRe
  122 + let salesRankingCate = []
  123 + let salesRankingSeries =[]
  124 + res.data.data.salesRanking.map(item=>{
  125 + salesRankingCate.push(item.productName)
  126 + salesRankingSeries.push(item.salesQuantity)
  127 + })
  128 + let objList = {
  129 + categories:salesRankingCate,
  130 + series: [{
  131 + name: "数量",
  132 + data: salesRankingSeries,
  133 + }
  134 + ]
  135 + }
  136 +
  137 + let turnoverDetailSeries =[]
  138 + let objMsg ={
  139 + name:'销售额',
  140 + data:[0,0,0,0,0,0,0]
  141 + }
  142 + res.data.data.sameDaySalesVOS.map(item=>{
  143 +
  144 +
  145 + if(this.getWeekday(item.saleTime) == '周一'){
  146 + objMsg.data[0] = item.price
  147 + }else if(this.getWeekday(item.saleTime) == '周二'){
  148 + objMsg.data[1] = item.price
  149 + }else if(this.getWeekday(item.saleTime) == '周三'){
  150 + objMsg.data[2] = item.price
  151 + }else if(this.getWeekday(item.saleTime) == '周四'){
  152 + objMsg.data[3] = item.price
  153 + }else if(this.getWeekday(item.saleTime) == '周五'){
  154 + objMsg.data[4] = item.price
  155 + }else if(this.getWeekday(item.saleTime) == '周六'){
  156 + objMsg.data[5] = item.price
  157 + }else if(this.getWeekday(item.saleTime) == '周天'){
  158 + objMsg.data[6] = item.price
  159 + }
  160 +
  161 +
  162 + })
  163 + turnoverDetailSeries.push(objMsg)
  164 + this.chartData1 = JSON.parse(JSON.stringify(objList))
  165 + let qushi = {
  166 + categories: ["周一", "周二", "周三", "周四", "周五", "周六","周天"],
  167 + series: turnoverDetailSeries
  168 + }
  169 + this.chartData = JSON.parse(JSON.stringify(qushi))
  170 +
  171 + })
  172 +
  173 +
  174 + },
  175 + getWeekday(dateString) {
  176 + // 解析日期字符串
  177 + const date = new Date(dateString)
  178 +
  179 + // 检查日期是否有效
  180 + if (isNaN(date)) {
  181 + throw new Error('无效的日期格式。请使用 "YYYY-M-D" 或 "YYYY-MM-DD" 格式。')
  182 + }
  183 +
  184 + // 定义星期的中文表示
  185 + const weekdays = ["周一", "周二", "周三", "周四", "周五", "周六","周天"]
  186 +
  187 + // 获取星期几（0-6）
  188 + const dayIndex = date.getDay()
  189 +
  190 + return weekdays[dayIndex]
152 191 },
153 192 // 跳转到销售上报页面
154 193 toSaleReport(){
... ...
lvdao-miniapp/pages/salesSta/salesSta.vue
  View file @f0e7afb
... ... @@ -47,25 +47,26 @@
47 47 chart: null,
48 48 chartData: {},
49 49 opts: {
50   - color: ["#1890FF","#91CB74","#FAC858","#EE6666","#73C0DE","#3CA272","#FC8452","#9A60B4","#ea7ccc"],
51   - padding: [15,10,0,15],
52   - enableScroll: false,
53   - legend: {},
54   - xAxis: {
55   - disableGrid: true
56   - },
57   - yAxis: {
58   - gridType: "dash",
59   - dashLength: 2
60   - },
61   - extra: {
62   - line: {
63   - type: "straight",
64   - width: 2,
65   - activeType: "hollow"
66   - }
67   - }
68   - },
  50 + color: ["#1890FF","#91CB74","#FAC858","#EE6666","#73C0DE","#3CA272","#FC8452","#9A60B4","#ea7ccc"],
  51 + padding: [15,10,0,15],
  52 + enableScroll: false,
  53 + legend: {},
  54 + xAxis: {
  55 + disableGrid: true
  56 + },
  57 + yAxis: {
  58 + gridType: "dash",
  59 + dashLength: 2
  60 + },
  61 + extra: {
  62 + line: {
  63 + type: "curve",
  64 + width: 2,
  65 + activeType: "hollow"
  66 + }
  67 + }
  68 +
  69 + },
69 70 chartData1:{},
70 71 opts1: {
71 72 color: ["#1890FF","#91CB74","#FAC858","#EE6666","#73C0DE","#3CA272","#FC8452","#9A60B4","#ea7ccc"],
... ... @@ -122,7 +123,7 @@
122 123 }
123 124 ]
124 125 };
125   - this.chartData = JSON.parse(JSON.stringify(res));
  126 + this.chartData = JSON.parse(JSON.stringify(res))
126 127 }, 500);
127 128  
128 129 setTimeout(() => {
... ...
lvdao-miniapp/utils/request.js
  View file @f0e7afb
... ... @@ -15,7 +15,8 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
15 15 var bases = ''
16 16 if(baseUrl == 1){
17 17 // bases = 'http://8.130.38.56:8027/admin-server' + url;
18   - bases = 'http://172.16.61.125:9003' + url;
  18 + // bases = 'http://172.16.61.125:9003' + url;
  19 + bases = 'http://192.168.2.225:9003' + url;
19 20 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
20 21 // bases = 'https://jy.scjysm.asia:18086/admin-server' + url;
21 22  
... ...