From f0e7afbf4901363ae8601783098e2c1d1395c508 Mon Sep 17 00:00:00 2001
From: 2509699674 <2509699647@qq.com>
Date: Thu, 9 Jan 2025 09:55:22 +0800
Subject: [PATCH] '最新'
---
admin-web-master/src/views/activity/activityBian.vue | 35 ++++++++++++++++++++++++++++++-----
admin-web-master/src/views/activity/activityBz.vue | 22 ++++++++++++++++------
admin-web-master/src/views/activity/activitySp.vue | 4 ++--
admin-web-master/src/views/activity/index.vue | 9 +++------
admin-web-master/src/views/atmosphere/atmosphereBian.vue | 36 +++++++++++++++++++++++++++++++-----
admin-web-master/src/views/atmosphere/atmosphereBz.vue | 34 ++++++++++++++++++++--------------
admin-web-master/src/views/atmosphere/atmosphereGl.vue | 9 +++------
admin-web-master/src/views/atmosphere/atmosphereSp.vue | 4 ++--
admin-web-master/src/views/media/mediaMana.vue | 10 +++++++---
admin-web-master/src/views/media/mediaMannaAdd.vue | 23 ++++++++++++++---------
admin-web-master/src/views/promotion/account.vue | 6 +++++-
admin-web-master/src/views/promotion/audit.vue | 150 ++----------------------------------------------------------------------------------------------------------------------------------------------------
admin-web-master/src/views/promotion/contentMant.vue | 37 ++++++++++++++++++++++++++-----------
admin-web-master/src/views/serve/MarkActivity/index.vue | 10 ++++++++--
admin-web-master/src/views/serve/procedure.vue | 8 ++++----
lvdao-miniapp/pages/my/my.vue | 55 ++-----------------------------------------------------
lvdao-miniapp/pages/saleReport/saleReport.vue | 2 +-
lvdao-miniapp/pages/salesReporting/salesReporting.vue | 171 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------
lvdao-miniapp/pages/salesSta/salesSta.vue | 41 +++++++++++++++++++++--------------------
lvdao-miniapp/utils/request.js | 3 ++-
20 files changed, 304 insertions(+), 365 deletions(-)
diff --git a/admin-web-master/src/views/activity/activityBian.vue b/admin-web-master/src/views/activity/activityBian.vue
index da21152..1320a24 100644
--- a/admin-web-master/src/views/activity/activityBian.vue
+++ b/admin-web-master/src/views/activity/activityBian.vue
@@ -81,9 +81,10 @@
-
+
-
+ changimg(e,'coverPoster')">
+
@@ -245,14 +246,15 @@
相关附件信息
- changimg(e,'otherImageVideos')">
+
@@ -338,6 +340,7 @@
import Vue from 'vue'
import { uploadUrl } from '@/utils/request'
import upimg from "@/components/ImageUpload/index"
+ import upfile from "@/components/fujianUpload/fujianList"
export default {
props:{
showBian:{
@@ -345,7 +348,7 @@
default: () => ({})
}
},
- components: { upimg},
+ components: { upimg,upfile},
data() {
return {
uploadFileUrl: uploadUrl, // 请求地址
@@ -370,6 +373,7 @@
estimatedCost:'',
notes:''
},
+ ruleForm:{}
}
},
@@ -391,6 +395,27 @@
mounted() {
},
methods: {
+ changimg(e,type) {
+ this.ruleForm[type] = e
+
+ if(type=='otherImageVideos'){
+ const parts = e.split('/');
+ const filename = parts[parts.length - 1];
+ // let file ={
+ // url:e,
+ // attachmentName:filename
+ // }
+ let fuji={
+ detailsId:this.secondData.id,
+ attachmentName:filename,
+ attachmentUrl:e,
+ }
+ fujiaAdd(fuji).then(res=>{
+ this.fucha(this.secondData.id)
+ })
+ // this.dataList.push(file)
+ }
+ },
//获取当前时间
updateCurrentTime() {
const now = new Date();
diff --git a/admin-web-master/src/views/activity/activityBz.vue b/admin-web-master/src/views/activity/activityBz.vue
index 7cee96a..86cf94e 100644
--- a/admin-web-master/src/views/activity/activityBz.vue
+++ b/admin-web-master/src/views/activity/activityBz.vue
@@ -118,7 +118,7 @@
-
+
changimg(e,'coverPoster')">
@@ -279,9 +279,10 @@
-
相关附件
+
相关附件
-
changimg(e,'otherImageVideos')">
+
changimg(e,'otherImageVideos')">
+
-
下载
+
下载
@@ -489,7 +489,7 @@
-
+
@@ -2230,9 +2230,6 @@
::v-deep .el-form-item{
margin-bottom:16px;
}
- /deep/ .el-form-item__content {
- line-height: 0;
- }
.tableBtn {
display: inline-block;
diff --git a/admin-web-master/src/views/atmosphere/atmosphereBian.vue b/admin-web-master/src/views/atmosphere/atmosphereBian.vue
index a51ab56..bc1e6fd 100644
--- a/admin-web-master/src/views/atmosphere/atmosphereBian.vue
+++ b/admin-web-master/src/views/atmosphere/atmosphereBian.vue
@@ -79,9 +79,11 @@
-
-
+
+
+ changimg(e,'coverPoster')">
+
@@ -238,14 +240,15 @@
相关附件信息
- changimg(e,'otherImageVideos')">
+
@@ -330,6 +333,8 @@
import Vue from 'vue'
import { uploadUrl } from '@/utils/request'
import upimg from "@/components/ImageUpload/index"
+ import upfile from "@/components/fujianUpload/fujianList"
+
export default {
props:{
showBian:{
@@ -337,7 +342,7 @@
default: () => ({})
}
},
- components: { upimg},
+ components: { upfile,upimg},
data() {
return {
uploadFileUrl: uploadUrl, // 请求地址
@@ -383,6 +388,27 @@
mounted() {
},
methods: {
+ changimg(e,type) {
+ this.ruleForm[type] = e
+
+ if(type=='otherImageVideos'){
+ const parts = e.split('/');
+ const filename = parts[parts.length - 1];
+ // let file ={
+ // url:e,
+ // attachmentName:filename
+ // }
+ let fuji={
+ detailsId:this.secondData.id,
+ attachmentName:filename,
+ attachmentUrl:e,
+ }
+ fujiaAdd(fuji).then(res=>{
+ this.fucha(this.secondData.id)
+ })
+ // this.dataList.push(file)
+ }
+ },
//获取当前时间
updateCurrentTime() {
const now = new Date();
diff --git a/admin-web-master/src/views/atmosphere/atmosphereBz.vue b/admin-web-master/src/views/atmosphere/atmosphereBz.vue
index f96f5b8..4703fcb 100644
--- a/admin-web-master/src/views/atmosphere/atmosphereBz.vue
+++ b/admin-web-master/src/views/atmosphere/atmosphereBz.vue
@@ -118,9 +118,9 @@
-
-
-
+
+
+ changimg(e,'coverPoster')">
@@ -282,17 +282,9 @@
-
相关附件
+
相关附件
-
-
- 上传附件
-
-
+
changimg(e,'otherImageVideos')">
@@ -391,6 +383,7 @@
import { uploadUrl } from '@/utils/request'
import html2canvas from 'html2canvas'
import jsPDF from 'jspdf'
+ import upfile from "@/components/fujianUpload/fujianList"
export default {
props: {
showAdd:{
@@ -404,7 +397,7 @@ export default {
},
}
},
- components: { wangEditor ,upimg},
+ components: { wangEditor ,upimg,upfile},
data(){
return{
uploadFileUrl: uploadUrl, // 请求地址
@@ -476,6 +469,19 @@ lishiList:'',
this.lishi()
},
methods: {
+ changimg(e,type) {
+ this.ruleForm[type] = e
+
+ if(type=='otherImageVideos'){
+ const parts = e.split('/');
+ const filename = parts[parts.length - 1];
+ let file ={
+ url:e,
+ name:filename
+ }
+ this.dataList.push(file)
+ }
+ },
//获取当前时间
updateCurrentTime() {
const now = new Date();
diff --git a/admin-web-master/src/views/atmosphere/atmosphereGl.vue b/admin-web-master/src/views/atmosphere/atmosphereGl.vue
index 3ab4225..88bbb99 100644
--- a/admin-web-master/src/views/atmosphere/atmosphereGl.vue
+++ b/admin-web-master/src/views/atmosphere/atmosphereGl.vue
@@ -139,7 +139,7 @@
-
![]()
+
@@ -553,7 +553,7 @@
-
+
@@ -2216,9 +2216,6 @@ this.fileData=[]
}
-/deep/ .el-form-item__content {
- line-height: 0;
-}
.tableBtn {
display: inline-block;
diff --git a/admin-web-master/src/views/atmosphere/atmosphereSp.vue b/admin-web-master/src/views/atmosphere/atmosphereSp.vue
index 57660ec..56f9a72 100644
--- a/admin-web-master/src/views/atmosphere/atmosphereSp.vue
+++ b/admin-web-master/src/views/atmosphere/atmosphereSp.vue
@@ -430,7 +430,7 @@
-
+
@@ -761,7 +761,7 @@
-
![]()
+
diff --git a/admin-web-master/src/views/media/mediaMana.vue b/admin-web-master/src/views/media/mediaMana.vue
index c19a19f..f1db138 100644
--- a/admin-web-master/src/views/media/mediaMana.vue
+++ b/admin-web-master/src/views/media/mediaMana.vue
@@ -126,8 +126,8 @@
-
-
![]()
+
changimg(e,'coverImage')">
+
@@ -531,7 +531,7 @@ components: { addAct,wangEditor,upimg},
planName: '',
planFen:'',
currentPage: 1,
- total: 100,
+ total: 0,
flag: false,
pageSize: 10,
ggXin: false,
@@ -602,6 +602,10 @@ components: { addAct,wangEditor,upimg},
},
methods: {
+ changimg(e,type) {
+ this.secondData[type] = e
+
+ },
//查询全数据
async getAll() {
const res = await tuiGetAll(this.pageindex)
diff --git a/admin-web-master/src/views/media/mediaMannaAdd.vue b/admin-web-master/src/views/media/mediaMannaAdd.vue
index 292e3ab..ec1635a 100644
--- a/admin-web-master/src/views/media/mediaMannaAdd.vue
+++ b/admin-web-master/src/views/media/mediaMannaAdd.vue
@@ -44,19 +44,20 @@
-
微信
-
-
- 请选择海报
-
+
封面海报
+
+
+ changimg(e,'coverImage')">
+
+
-
+
@@ -69,10 +70,10 @@
- 媒体上传
+
返回
@@ -147,6 +148,10 @@
this.editTrue = true
},
methods: {
+ changimg(e,type) {
+ this.ruleForm[type] = e
+
+ },
//获取当前时间
updateCurrentTime() {
const now = new Date();
diff --git a/admin-web-master/src/views/promotion/account.vue b/admin-web-master/src/views/promotion/account.vue
index 2fdc81e..76bd4d2 100644
--- a/admin-web-master/src/views/promotion/account.vue
+++ b/admin-web-master/src/views/promotion/account.vue
@@ -139,7 +139,8 @@
-
+ changimg(e,'coverPoster')">
+
-
-
{{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 @@
-
-
OA流程审批
@@ -76,148 +72,6 @@
-
-
-
- 渠道效果分析
-
-
-
成本分析
-
-
-
吸引游客流量
-
4289人
-
+45%
-
-
-
-
参与人数
-
4289人
-
+45%
-
-
-
-
直接收益
-
4289人
-
+45%
-
-
-
-
间接收益
-
4289人
-
+45%
-
-
-
-
投入生产比
-
4289人
-
+45%
-
-
-
-
-
- 策划主题占比
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{scope.$index + 1}}
-
-
-
-
- {{scope.$index + 1}}
-
-
-
-
- {{scope.$index + 1}}
-
-
-
-
- {{scope.row.name}}
-
-
-
-
- {{scope.row.name}}
-
-
-
-
- {{scope.row.name}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -285,7 +139,7 @@
-
![]()
+
@@ -797,7 +651,7 @@ actSp(item){
line-height: 0;
}
-
+
.formSearch {
display: flex;
diff --git a/admin-web-master/src/views/promotion/contentMant.vue b/admin-web-master/src/views/promotion/contentMant.vue
index 09b02ed..d559d45 100644
--- a/admin-web-master/src/views/promotion/contentMant.vue
+++ b/admin-web-master/src/views/promotion/contentMant.vue
@@ -97,11 +97,12 @@
-
+点击上传
-
+ -->
+ changimg(e,'otherImageVideos')">
{{formInline.attachmentUpload[0]&&formInline.attachmentUpload[0].name?formInline.attachmentUpload[0].name:''}}
@@ -119,7 +120,8 @@
-
+
+ changimg(e,'appImage')">
{
if (valid) {
if(index == 1){
- if(this.fileData.length !='0'){
- this.formInline.attachmentUpload = JSON.stringify(this.fileData)
- }
+ // if(this.fileData.length !='0'){
+ // this.formInline.attachmentUpload = JSON.stringify(this.fileData)
+ // }
this.formInline.createDate = this.updateCurrentTime()
contentAdd(this.formInline).then(res => {
this.getAll()
this.ggXin = false
})
}else{
- if(this.fileData.length !='0'){
- this.formInline.attachmentUpload = JSON.stringify(this.fileData)
+ // if(this.fileData.length !='0'){
+ // this.formInline.attachmentUpload = JSON.stringify(this.fileData)
- }
+ // }
contentEdit(this.formInline).then(res => {
this.getAll()
this.ggXin = false
@@ -445,7 +460,7 @@
line-height: 0;
}
-
+
.formSearch {
display: flex;
diff --git a/admin-web-master/src/views/serve/MarkActivity/index.vue b/admin-web-master/src/views/serve/MarkActivity/index.vue
index 729068a..6956402 100644
--- a/admin-web-master/src/views/serve/MarkActivity/index.vue
+++ b/admin-web-master/src/views/serve/MarkActivity/index.vue
@@ -155,7 +155,8 @@
-
+
+ changimg(e,'coverImage')">
@@ -238,7 +239,8 @@
-
+
+ changimg(e,'coverImage')">
@@ -430,6 +432,10 @@
},
methods: {
+ changimg(e,type) {
+ this.xiangData[type] = e
+ this.changimg[type] = e
+ },
// 获取时间
currentTime() {
let date = new Date();
diff --git a/admin-web-master/src/views/serve/procedure.vue b/admin-web-master/src/views/serve/procedure.vue
index 9b684a5..a43a368 100644
--- a/admin-web-master/src/views/serve/procedure.vue
+++ b/admin-web-master/src/views/serve/procedure.vue
@@ -244,15 +244,15 @@
@click="closeFn(1)"
>取消
-
编辑
+ >编辑 -->
确定
@@ -301,7 +301,7 @@
-
+
diff --git a/lvdao-miniapp/pages/my/my.vue b/lvdao-miniapp/pages/my/my.vue
index 91305da..2fd19bf 100644
--- a/lvdao-miniapp/pages/my/my.vue
+++ b/lvdao-miniapp/pages/my/my.vue
@@ -222,21 +222,7 @@
-
+
@@ -455,44 +441,7 @@
}
},
- handleApplySettle() {
- // uni.navigateTo({
- // url: '/pages/myzili/myzili'
- // })
- const res = uni.getStorageSync('token');
- let token = Encrypt(res)
- let username = this.shopMsg.shopName
- // let url = 'http://8.130.38.56:8027/settled-merchant'
- let url = 'https://jy.scjysm.asia:18086/settled-merchant'
-
- // #ifdef H5
- console.log('h5 test')
- window.location.href = url + `/#/?username=${ username }&user=${ token }`
- // #endif
- // #ifdef APP-PLUS
- plus.runtime.openURL(url + `/#/?username=${ username }&user=${ token }`, function(
- e) {
- console.log(e);
- })
- // #endif
- // #ifdef MP-WEIXIN
- uni.navigateTo({
- url: `../linkOthers/index?url=${ url }&username=${ username }&user=${ token }`
- // 此处的链接为小程序上面新建的webview页面路径,参数url为要跳转外链的地址
- // url: '../../../pages_category_page1/linkOthers/index?url=' + encodeURIComponent(url)
- // url:'../../../pages_category_page2/userModule/coupon'
- })
- // #endif
- // #ifdef MP-ALIPAY
- uni.navigateTo({
- url: `../linkOthers/index?url=${ url }&username=${ username }&user=${ token }`
- // 此处的链接为小程序上面新建的webview页面路径,参数url为要跳转外链的地址
- // url: '../../../pages_category_page1/linkOthers/index?url=' + encodeURIComponent(url)
- // url:'../../../pages_category_page2/userModule/coupon'
- })
- // #endif
-
- },
+
myMsg() {
const res = uni.getStorageSync('token');
if (res == '') {
diff --git a/lvdao-miniapp/pages/saleReport/saleReport.vue b/lvdao-miniapp/pages/saleReport/saleReport.vue
index 64e17bc..b3de043 100644
--- a/lvdao-miniapp/pages/saleReport/saleReport.vue
+++ b/lvdao-miniapp/pages/saleReport/saleReport.vue
@@ -32,7 +32,7 @@
- 价格
+ 单价
diff --git a/lvdao-miniapp/pages/salesReporting/salesReporting.vue b/lvdao-miniapp/pages/salesReporting/salesReporting.vue
index a5636f7..b1efb02 100644
--- a/lvdao-miniapp/pages/salesReporting/salesReporting.vue
+++ b/lvdao-miniapp/pages/salesReporting/salesReporting.vue
@@ -10,8 +10,8 @@
今日销售金额
- 21
- 同比昨日上升5
+ {{todayRe}}
+ 同比昨日{{subtract}}