-
- 
+ style=" width: 100%; height: 50px; background: #3F9B6A; position: fixed;top:0;left:0;z-index:1001;display: flex;flex-wrap: wrap; margin-bottom: 1px;">
+
+ style=" width: 100%; height: 50px; background: #3F9B6A; position: fixed;top:0;left:0;z-index:1001;display: flex;flex-wrap: wrap; margin-bottom: 1px;">
+
+
- {{item}}
+
+
@@ -34,7 +34,7 @@
-
-
+
@@ -272,10 +272,16 @@ this.echar( this.tableData)
return accumulator;
}, []); // 初始值为空数组
- console.log(processedData)
// this.chart1 = echarts.init(diameter);
// 指定图表的配置项和数据
let option = {
+ // 提示框组件
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow'
+ }
+ },
xAxis: {
type: 'category',
data:processedData.map(item => item.name),
@@ -296,6 +302,9 @@ this.echar( this.tableData)
// 使用刚指定的配置项和数据显示图表。
option && myChart.setOption(option);
+ window.addEventListener('resize', function () {
+ myChart.resize();
+ })
},
weiqi(val) {
switch (val) {
@@ -329,6 +338,20 @@ this.echar( this.tableData)
}, []); // 初始值为空数组
// this.chart2= echarts.init(diameter);
let option = {
+ // 提示框组件
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow'
+ }
+ },
+ // 网格配置，设置 left 为 50px 使图表右移
+ grid: {
+ left: '50px',
+ right: '10%',
+ bottom: '3%',
+ containLabel: true
+ },
xAxis: {
type: 'category',
data:processedData.map(item => this.weiqi(item.name)),
@@ -349,6 +372,9 @@ this.echar( this.tableData)
};
option && myChart.setOption(option);
+ window.addEventListener('resize', function () {
+ myChart.resize();
+ })
},
echar3(datas) {
let Dom = this.$refs.container3
@@ -371,6 +397,20 @@ this.echar( this.tableData)
// this.chart3 = echarts.init(diameter);
// 指定图表的配置项和数据
let option = {
+ // 提示框组件
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow'
+ }
+ },
+ // 网格配置，设置 left 为 50px 使图表右移
+ grid: {
+ left: '50px',
+ right: '10%',
+ bottom: '3%',
+ containLabel: true
+ },
xAxis: {
type: 'category',
data:processedData.map(item => item.name),
@@ -390,6 +430,9 @@ this.echar( this.tableData)
};
// 使用刚指定的配置项和数据显示图表。
option && myChart.setOption(option)
+ window.addEventListener('resize', function () {
+ myChart.resize();
+ })
},
getSummaries(param) {
const { columns, data } = param;
diff --git a/admin-web-master/src/views/scheme/sam.vue b/admin-web-master/src/views/scheme/sam.vue
index 8b8253a..a6fa4d2 100644
--- a/admin-web-master/src/views/scheme/sam.vue
+++ b/admin-web-master/src/views/scheme/sam.vue
@@ -61,7 +61,10 @@
-
+
+
+ {{scope.row.rentalPrice}}/M²
+
diff --git a/admin-web-master/src/views/serve/salesStatistics.vue b/admin-web-master/src/views/serve/salesStatistics.vue
index 5d883ab..e579b99 100644
--- a/admin-web-master/src/views/serve/salesStatistics.vue
+++ b/admin-web-master/src/views/serve/salesStatistics.vue
@@ -13,31 +13,38 @@
-
-
-
-
+
+
-
+
- {{scope.row.state == '1'?'待提交':scope.row.state == '2'?'待审批':scope.row.state == '5'?'审核通过':'已驳回'}}
+ {{scope.row.state == '1'?'待提交':scope.row.state == '2'?'待审批':scope.row.state == '5'?'上架':'已下架'}}
-
+
-
+
-
+
查看
- 修改
-
- 提交审核
+
+ 上架
+ 下架
+
-
+
@@ -537,18 +539,10 @@ components: { addAct,wangEditor,upimg},
pageSize: 10,
ggXin: false,
fenlei:[],
- formInline: {
- merchantName: '', // 商家名称
- storeId: '', // 编码
- contacts: '', // 联系人
- businessEntity: '', //经营主体
- page: 1, // 当前页
- pageSize: 10 // 每页记录数
- },
tableData: [],
multipleSelection:[],
pageindex: {
- pageNumber: 1,
+ pageNumber: 0,
pageSize: 10,
},
rules:{
@@ -621,7 +615,7 @@ components: { addAct,wangEditor,upimg},
async getAll() {
const res = await tuiGetAll(this.pageindex)
this.tableData = res.data.content
- this.total = res.data.content.length
+ this.total = res.data.totalElements
let page = {
pageNumber: 1,
pageSize: 10,
@@ -708,11 +702,11 @@ components: { addAct,wangEditor,upimg},
if (this.planName != '') {
const res = await tuiGetAll({
schemeTitle: this.planName,
- pageNumber: 1,
+ pageNumber: 0,
pageSize: 10,
})
this.tableData = res.data.content
- this.total = res.data.content.length
+ this.total = res.data.totalElements
}
},
//详情点击
@@ -757,7 +751,8 @@ components: { addAct,wangEditor,upimg},
return Object.keys(obj).length === 0 && obj.constructor === Object;
},
handleCurrentChange(val) {
- this.currentPage = val
+ this.pageindex.pageNumber = val -1
+ this.getAll()
},
handleSizeChange(val) {
this.pageSize = val
@@ -1097,6 +1092,33 @@ this.$refs.mulTable.clearSelection(); // 清除所有选项
})
},
+ xiajia(ids,val){
+ const h = this.$createElement;
+ this.$msgbox({
+ title: '消息',
+ message: h('p', null, [
+ h('span', null, '是否处理 '),
+ ]),
+ showCancelButton: true,
+ showClose: false,
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ customClass: 'oe-dialog-btn',
+ beforeClose: (action, instance, done) => {
+ if (action === 'confirm') {
+ editTui({
+ id: ids,
+ state: val
+ }).then(res => {
+ this.getAll()
+ })
+ done();
+ } else {
+ done();
+ }
+ }
+ })
+ }
}
}
@@ -1413,7 +1435,7 @@ this.$refs.mulTable.clearSelection(); // 清除所有选项
}
::v-deep .tableList {
- width: 81%;
+ width: 100%;
.el-button:hover {
border: none
diff --git a/admin-web-master/src/views/online/reconciliationAnalysis/index.vue b/admin-web-master/src/views/online/reconciliationAnalysis/index.vue
index c3f36e7..e676307 100644
--- a/admin-web-master/src/views/online/reconciliationAnalysis/index.vue
+++ b/admin-web-master/src/views/online/reconciliationAnalysis/index.vue
@@ -273,11 +273,11 @@
formatIsoToDateTime(isoTime) {
// 1. 空值/非法值处理
if (!isoTime) return '';
- if (typeof isoTime !== 'string') return '时间格式错误';
+ if (typeof isoTime !== 'string') return '';
// 2. 解析时间（兼容带时区的ISO格式，如2025-03-11T14:19:54+08:00）
const date = new Date(isoTime.replace('T', ' ').replace(/-/g, '/'));
- if (isNaN(date.getTime())) return '时间格式错误';
+ if (isNaN(date.getTime())) return '';
// 3. 补零函数（确保两位数）
const pad = (num) => num.toString().padStart(2, '0');
diff --git a/admin-web-master/src/views/online/reconciliationDetails/index.vue b/admin-web-master/src/views/online/reconciliationDetails/index.vue
index a4d7360..342bc65 100644
--- a/admin-web-master/src/views/online/reconciliationDetails/index.vue
+++ b/admin-web-master/src/views/online/reconciliationDetails/index.vue
@@ -153,7 +153,7 @@
formatIsoToDateTime(isoTime) {
// 1. 空值/非法值处理
if (!isoTime) return '';
- if (typeof isoTime !== 'string') return '时间格式错误';
+ if (typeof isoTime !== 'string') return '';
// 2. 解析时间（兼容带时区的ISO格式，如2025-03-11T14:19:54+08:00）
const date = new Date(isoTime.replace('T', ' ').replace(/-/g, '/'));
diff --git a/admin-web-master/src/views/promotion/audit.vue b/admin-web-master/src/views/promotion/audit.vue
index 5cacbc0..37cfaf3 100644
--- a/admin-web-master/src/views/promotion/audit.vue
+++ b/admin-web-master/src/views/promotion/audit.vue
@@ -37,7 +37,7 @@
共{{total}}条
+
+
-
@@ -68,7 +68,7 @@
-->
共{{total}}条
单位：张
-
+
@@ -102,7 +102,7 @@
-->
单位：元
-
+
@@ -120,7 +120,7 @@
-->
单位：元
-
+
+
+
+
+
+
+
+
+ 日交易额
+
-
+
+
diff --git a/ceres-uniapp-master/unpackage/dist/build/web.zip b/ceres-uniapp-master/unpackage/dist/build/web.zip
index 0f0a2b6..2430e5c 100644
Binary files a/ceres-uniapp-master/unpackage/dist/build/web.zip and b/ceres-uniapp-master/unpackage/dist/build/web.zip differ
diff --git a/ceres-uniapp-master/unpackage/dist/build/web/index.html b/ceres-uniapp-master/unpackage/dist/build/web/index.html
index a5a9401..4906ac1 100644
--- a/ceres-uniapp-master/unpackage/dist/build/web/index.html
+++ b/ceres-uniapp-master/unpackage/dist/build/web/index.html
@@ -1,2 +1,2 @@
在线商城
\ No newline at end of file
+ document.write('')
周订单量
@@ -91,9 +98,9 @@ export default {
mounted(){
this.charDam()
this.charDam1()
- this.charDam2()
+ // this.charDam2()
this.charDam3()
- this.charDam4()
+ // this.charDam4()
this.charDam5()
},
methods: {
diff --git a/ceres-uniapp-master/pages_category_page1/goodsModule/goodsDetails.vue b/ceres-uniapp-master/pages_category_page1/goodsModule/goodsDetails.vue
index a447fd4..8397e27 100644
--- a/ceres-uniapp-master/pages_category_page1/goodsModule/goodsDetails.vue
+++ b/ceres-uniapp-master/pages_category_page1/goodsModule/goodsDetails.vue
@@ -140,12 +140,12 @@
-