fix: 修改数据统计页面,修改日志展示剔除url展示,台桌列表页面增加下载店铺码
This commit is contained in:
@@ -53,13 +53,13 @@
|
||||
</div>
|
||||
<div class="time_wrap">
|
||||
<el-radio-group v-model="timeValue" @change="timeChange">
|
||||
<el-radio-button label="0">今天</el-radio-button>
|
||||
<el-radio-button label="-1">昨天</el-radio-button>
|
||||
<el-radio-button label="-7">最近7天</el-radio-button>
|
||||
<el-radio-button label="-30">最近30天</el-radio-button>
|
||||
<el-radio-button label="week">本周</el-radio-button>
|
||||
<el-radio-button label="month">本月</el-radio-button>
|
||||
<el-radio-button label="custom">自定义</el-radio-button>
|
||||
<el-radio-button value="0">今天</el-radio-button>
|
||||
<el-radio-button value="-1">昨天</el-radio-button>
|
||||
<el-radio-button value="-7">最近7天</el-radio-button>
|
||||
<el-radio-button value="-30">最近30天</el-radio-button>
|
||||
<el-radio-button value="week">本周</el-radio-button>
|
||||
<el-radio-button value="month">本月</el-radio-button>
|
||||
<el-radio-button value="custom">自定义</el-radio-button>
|
||||
</el-radio-group>
|
||||
<el-date-picker
|
||||
v-model="query.createdAt"
|
||||
@@ -77,7 +77,7 @@
|
||||
<div class="top">
|
||||
<div class="item earnings">
|
||||
<div class="num_wrap">
|
||||
<div class="num">{{ formatDecimal(trade.saleAmount || 0) }}</div>
|
||||
<div class="num">{{ formatDecimal(yingyeShiShou || 0) }}</div>
|
||||
<div class="tips">
|
||||
营业实收(元)
|
||||
<el-tooltip popper-class="popper" effect="light" placement="bottom">
|
||||
@@ -88,35 +88,42 @@
|
||||
<img class="icon" src="@/assets/images/data/wx.png" />
|
||||
<span>微信小程序</span>
|
||||
</div>
|
||||
<span class="num">{{ trade.wechatPayCount }}</span>
|
||||
<span class="num">{{ trade.wechatPayAmount }}</span>
|
||||
</div>
|
||||
<div class="item">
|
||||
<div class="left">
|
||||
<img class="icon" src="@/assets/images/data/ali.png" />
|
||||
<span>支付宝小程序</span>
|
||||
</div>
|
||||
<span class="num">{{ trade.aliPayCount }}</span>
|
||||
<span class="num">{{ trade.aliPayAmount }}</span>
|
||||
</div>
|
||||
<div class="item">
|
||||
<div class="left">
|
||||
<img class="icon" src="@/assets/images/data/scan.png" />
|
||||
<span>主扫收款</span>
|
||||
</div>
|
||||
<span class="num">{{ trade.scanPayCount }}</span>
|
||||
<span class="num">{{ trade.scanPayAmount }}</span>
|
||||
</div>
|
||||
<div class="item">
|
||||
<div class="left">
|
||||
<img class="icon" src="@/assets/images/data/cash.png" />
|
||||
<span>现金</span>
|
||||
</div>
|
||||
<span class="num">{{ trade.cashPayCount }}</span>
|
||||
<span class="num">{{ trade.cashPayAmount }}</span>
|
||||
</div>
|
||||
<div class="item">
|
||||
<div class="left">
|
||||
<img class="icon" src="@/assets/images/data/cash.png" />
|
||||
<span>充值</span>
|
||||
</div>
|
||||
<span class="num">{{ trade.rechargeAmount }}</span>
|
||||
</div>
|
||||
<div class="item">
|
||||
<div class="left">
|
||||
<img class="icon" src="@/assets/images/data/cash.png" />
|
||||
<span>挂账</span>
|
||||
</div>
|
||||
<span class="num">{{ trade.creditPayCount }}</span>
|
||||
<span class="num">{{ trade.creditPayAmount }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@@ -135,7 +142,9 @@
|
||||
class="gropress l"
|
||||
:style="{
|
||||
width: `${
|
||||
trade.refundAmount ? (trade.refundAmount / trade.saleAmount) * 100 : 0
|
||||
trade.saleAmount
|
||||
? (trade.saleAmount / (trade.saleAmount * 1 + trade.refundAmount)) * 100
|
||||
: 0
|
||||
}%`,
|
||||
}"
|
||||
></div>
|
||||
@@ -143,7 +152,9 @@
|
||||
class="gropress r"
|
||||
:style="{
|
||||
width: `${
|
||||
trade.refundAmount ? (trade.refundAmount / trade.saleAmount) * 100 : 0
|
||||
trade.refundAmount
|
||||
? (trade.refundAmount / (trade.saleAmount * 1 + trade.refundAmount)) * 100
|
||||
: 0
|
||||
}%`,
|
||||
}"
|
||||
></div>
|
||||
@@ -274,8 +285,8 @@
|
||||
</div>
|
||||
</div>
|
||||
<el-radio-group v-model="saleActive" @change="lineChartTypeChange(lineChartType)">
|
||||
<el-radio-button label="7">近7天</el-radio-button>
|
||||
<el-radio-button label="30">30天</el-radio-button>
|
||||
<el-radio-button value="7">近7天</el-radio-button>
|
||||
<el-radio-button value="30">30天</el-radio-button>
|
||||
</el-radio-group>
|
||||
</div>
|
||||
<div
|
||||
@@ -301,8 +312,8 @@
|
||||
</div>
|
||||
<el-radio-group v-model="saleTableActive" @change="rankChange">
|
||||
<!-- <el-radio-button label="1">今天</el-radio-button> -->
|
||||
<el-radio-button label="7">近7天</el-radio-button>
|
||||
<el-radio-button label="30">30天</el-radio-button>
|
||||
<el-radio-button value="7">近7天</el-radio-button>
|
||||
<el-radio-button value="30">30天</el-radio-button>
|
||||
</el-radio-group>
|
||||
</div>
|
||||
<div class="sale_data">
|
||||
@@ -451,6 +462,21 @@ export default {
|
||||
tradeCount: "",
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
yingyeShiShou() {
|
||||
if (!this.trade) {
|
||||
return 0;
|
||||
}
|
||||
return (
|
||||
this.trade.wechatPayAmount * 1 +
|
||||
this.trade.aliPayAmount * 1 +
|
||||
this.trade.aliPayAmount * 1 +
|
||||
this.trade.memberPayAmount * 1 +
|
||||
this.trade.scanPayAmount * 1 +
|
||||
this.trade.cashPayAmount * 1
|
||||
);
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
// 增加首页提示是否账号30天过期
|
||||
let date = dayjs(localStorage.getItem("expireDate")).diff(dayjs().format("YYYY-MM-DD"), "day");
|
||||
@@ -780,9 +806,7 @@ export default {
|
||||
axisLabel: {
|
||||
rotate: time.length <= 7 ? 0 : 45,
|
||||
interval: 0,
|
||||
textStyle: {
|
||||
fontSize: "9",
|
||||
},
|
||||
fontSize: "9",
|
||||
},
|
||||
},
|
||||
],
|
||||
@@ -1113,14 +1137,6 @@ export default {
|
||||
async summaryDateGet(res) {
|
||||
try {
|
||||
console.log(res);
|
||||
|
||||
// const res = await summaryDateGet(this.saleTableActive);
|
||||
let p1 = [res.map((item) => item.tradeDay), res.map((item) => item.saleNum)];
|
||||
let p2 = [res.map((item) => item.tradeDay), res.map((item) => item.saleAmount)];
|
||||
|
||||
// console.log(p1);
|
||||
// console.log(p2);
|
||||
|
||||
// this.initProduceChart(p1, p2);
|
||||
} catch (error) {
|
||||
console.log(error);
|
||||
|
||||
Reference in New Issue
Block a user