chuangte/easypay-admin
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'tx'

Browse Source
This commit is contained in:
邱贞招 2024-02-04 10:45:08 +08:00
commit b6feb2c011
4 changed files with 99 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
src/views/dashboard/components/baseInfo.vue
View File

@ -8,16 +8,16 @@
<!-- <div class="main_badge">
<span class="iconfont iconxiaoshoue"></span>
</div> -->
<span class="main_tit">销售额</span>
<span class="main_tit">总注册</span>
</div>
<el-tag type="primary">今日</el-tag>
<el-tag type="primary" >总计</el-tag>
</div>
<div class="content" v-if="viewData">
<span class="content-number spBlock my15">{{ viewData.sales }}</span>
<span class="content-number spBlock my15">{{ viewData.totalRegisterNum }}</span>
<el-divider></el-divider>
<div class="acea-row row-between-wrapper">
<span class="content-time">昨日数据</span>
<span class="content-time">{{ viewData.yesterdaySales }} 元</span>
<div class="acea-row row-between-wrapper" >
<span class="content-time">今日注册</span>
<span class="content-time">{{ viewData.todayRegisterNum }} </span>
</div>
</div>
</el-card>
@ -29,16 +29,16 @@
<!-- <div class="main_badge">
<span class="iconfont iconyonghu"></span>
</div> -->
<span class="main_tit">用户访问量</span>
<span class="main_tit">总订单数</span>
</div>
<el-tag type="primary">今日</el-tag>
<el-tag type="primary">总计</el-tag>
</div>
<div class="content" v-if="viewData">
<span class="content-number spBlock my15">{{ viewData.pageviews }}</span>
<span class="content-number spBlock my15">{{ viewData.totalOrderNum }}</span>
<el-divider></el-divider>
<div class="acea-row row-between-wrapper">
<span class="content-time">昨日数据</span>
<span class="content-time">{{ viewData.yesterdayPageviews }}</span>
<div class="acea-row row-between-wrapper " >
<span class="content-time">今日订单数</span>
<span class="content-time">{{ viewData.todayOrderNum }}</span>
</div>
</div>
</el-card>
@ -50,16 +50,16 @@
<!-- <div class="main_badge">
<span class="iconfont icondingdan"></span>
</div> -->
<span class="main_tit">订单量</span>
<span class="main_tit">总订单金额</span>
</div>
<el-tag type="primary">今日</el-tag>
<el-tag type="primary">总计</el-tag>
</div>
<div class="content" v-if="viewData">
<span class="content-number spBlock my15">{{ viewData.orderNum }}</span>
<span class="content-number spBlock my15">{{ viewData.totalOrderAmount }}</span>
<el-divider></el-divider>
<div class="acea-row row-between-wrapper">
<span class="content-time">昨日数据</span>
<span class="content-time">{{ viewData.yesterdayOrderNum }}单</span>
<div class="acea-row row-between-wrapper" >
<span class="content-time">今日订单金额</span>
<span class="content-time">{{ viewData.todayOrderAmount }}元</span>
</div>
</div>
</el-card>
@ -71,16 +71,58 @@
<!-- <div class="main_badge">
<span class="iconfont iconxinzengyonghu"></span>
</div> -->
<span class="main_tit">新增用户</span>
<span class="main_tit">已收金额</span>
</div>
<el-tag type="primary">今日</el-tag>
<el-tag type="primary">总计</el-tag>
</div>
<div class="content" v-if="viewData">
<span class="content-number spBlock my15">{{ viewData.newUserNum }}</span>
<span class="content-number spBlock my15">{{ viewData.totalReceivedAmount }}元</span>
<el-divider></el-divider>
<div class="acea-row row-between-wrapper">
<span class="content-time">昨日数据</span>
<span class="content-time">{{ viewData.yesterdayNewUserNum }} 人</span>
<span class="content-time">今日已收金额</span>
<span class="content-time">{{ viewData.todayReceivedAmount }} 元</span>
</div>
</div>
</el-card>
</el-col>
<el-col v-bind="grid" class="ivu-mb">
<el-card :bordered="false" dis-hover :padding="12">
<div class="acea-row row-between-wrapper">
<div class="acea-row align-center">
<!-- <div class="main_badge">
<span class="iconfont iconxinzengyonghu"></span>
</div> -->
<span class="main_tit">应收金额</span>
</div>
<el-tag type="primary">总计</el-tag>
</div>
<div class="content" v-if="viewData">
<span class="content-number spBlock my15">{{ viewData.totalReceivableAccount }}元</span>
<el-divider></el-divider>
<div class="acea-row row-between-wrapper" >
<span class="content-time">今日应收金额</span>
<span class="content-time">{{ viewData.todayReceivableAccount }} 元</span>
</div>
</div>
</el-card>
</el-col>
<el-col v-bind="grid" class="ivu-mb">
<el-card :bordered="false" dis-hover :padding="12">
<div class="acea-row row-between-wrapper">
<div class="acea-row align-center">
<!-- <div class="main_badge">
<span class="iconfont iconxinzengyonghu"></span>
</div> -->
<span class="main_tit">回款率</span>
</div>
<el-tag type="primary">总计</el-tag>
</div>
<div class="content" v-if="viewData">
<span class="content-number spBlock my15">{{ viewData.rateOfReturn }}%</span>
<el-divider></el-divider>
<div class="acea-row row-between-wrapper" key="">
<span class="content-time">今日回款率</span>
<span class="content-time">{{ viewData.todayRateOfReturn }} %</span>
</div>
</div>
</el-card>
@ -95,6 +137,7 @@ export default {
return {
grid: { xl: 6, lg: 6, md: 12, sm: 12, xs: 24 },
viewData: {},
totaldata:{}
};
},
methods: {
@ -102,7 +145,12 @@ export default {
viewModelApi().then(async (res) => {
this.viewData = res;
});
// allinfo().then(async (res) => {
// // console.log(res,'resresresre');
// this.totaldata = res;
// });
},
},
mounted() {
this.statisticsOrder();
@ -154,6 +202,8 @@ export default {
align-items: center;
}
.baseInfo {
display: flex;
flex-wrap: nowrap;
::v-deep .el-card__header {
padding: 15px 20px !important;
}

1
src/views/dashboard/components/gridMenu.vue
View File

@ -14,6 +14,7 @@
</div>
</el-card>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="12">
<el-card class="box-card">
<div class="header_title">经营数据</div>

21
src/views/order/index.vue
View File

@ -287,7 +287,7 @@
checkPermi(['admin:order:send'])
">发货</el-button>
<el-button size="small"
style="margin-top: 10px;" @click="showht(scope.row.contractUrl)" v-show="scope.row.statusStr.value!='待审核'&&scope.row.statusStr.value!='待签约'&&scope.row.contractUrl!=null">查看合同</el-button>
style="margin-top: 10px;" @click="showht(scope.row.contractUrl)" v-show="scope.row.statusStr.value!='待审核'&&scope.row.statusStr.value!='待签约'">查看合同</el-button>
<el-button size="small"
style="margin-top: 10px;" @click.native="handleDelete(scope.row, scope.$index)">取消订单</el-button>
<!-- <el-button
@ -528,7 +528,8 @@
width="1000px"
:before-close="htClose">
<div class="pdfCom">
<canvas :id="'canvas'+item" v-for="item in pdfHTML" :key="item" />
<iframe :src="pdfUrl" width="100%" height="600px" frameborder="0" sandbox="allow-same-origin allow-scripts allow-forms"></iframe>
<!-- <canvas :id="'canvas'+item" v-for="item in pdfHTML" :key="item" /> -->
</div>
</el-dialog>
@ -919,7 +920,8 @@ export default {
});
},
showht(url){
this.pdfUrl=url
// this.pdfUrl='@/assets/222.pdf'
this.pdfUrl='http://api.yruibao.com/crmebimage/public/content/2024/02/03/0eba557ba62041e190b8d819a9f69ca3884hdh9izs.pdf'
const CMAP_URL = "https://cdn.jsdelivr.net/npm/pdfjs-dist@2.0.943/cmaps/";
let obj = {};
obj.url = this.pdfUrl; //pdf文件地址，根据情景自行修改
@ -931,18 +933,7 @@ export default {
htClose(){
this.htVisible=false
},
downloadAndOpenPDF() {
// 替换为你的直接下载的PDF文件链接
const pdfUrl = 'https://esignoss.esign.cn/7439001031/c432aa2f-b786-4d60-807f-f33013f2430a/%E5%88%86%E6%9C%9F%E4%BB%98%E6%AC%BE%E6%89%8B%E6%9C%BA%E4%B9%B0%E5%8D%96%E5%90%88%E5%90%8C.pdf?Expires=1706538506&OSSAccessKeyId=LTAI4G23YViiKnxTC28ygQzF&Signature=V1gxvTgnonr6wdQTKlHgGuRHK6A%3D';
// 创建一个新窗口并在其中打开PDF文件
const newWindow = window.open(pdfUrl, '_blank');
// 如果浏览器的弹窗拦截器（pop-up blocker）启用，可能需要延迟打开新窗口
if (!newWindow || newWindow.closed || typeof newWindow.closed === 'undefined') {
alert('请允许浏览器弹窗以查看PDF文件。');
}
},
init(fileUrl) {
let _this = this;
PDFJS.getDocument(fileUrl).then(fileContent => {

19
vue.config.js
View File

@ -36,8 +36,27 @@ module.exports = {
overlay: {
warnings: false,
errors: true
},
proxy: {
'/api': {
target: 'http://api.yruibao.com',
changeOrigin: true,
pathRewrite: {
'^/api': ''
},
followRedirects: true
}
}
},
// devServer: {
// port: 9527,//它是用来修改你打开后的端口号的
// open: true,//值为 true的话，项目启动时自动打开到浏览器里边， false不会打开
// },
configureWebpack: {
// provide the app's title in webpack's name field, so that
// it can be accessed in index.html to inject the correct title.