From 40a8b92415a4bab78d4a8ab463869a2686ba0ee3 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Tue, 18 Jun 2024 15:25:05 +0800
Subject: [PATCH] 1
---
src/views/statistics/transaction/index.vue | 6 +++---
src/views/store/store_branch_product/index.vue | 3 ++-
src/views/user/edit.vue | 4 ++--
src/views/user/indexList.vue | 7 -------
4 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/src/views/statistics/transaction/index.vue b/src/views/statistics/transaction/index.vue
index a7ea76690..0229f47f6 100644
--- a/src/views/statistics/transaction/index.vue
+++ b/src/views/statistics/transaction/index.vue
@@ -170,7 +170,7 @@ const optionModel = {
{
type: 'category',
boundaryGap: false,
- data: ['03', '04', '05', '06', '07', '08', '09', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '00', '01', '02'],
+ // data: ['03', '04', '05', '06', '07', '08', '09', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '00', '01', '02'],
axisLabel: {
show: false, // 不显示 x 轴标签
},
@@ -210,7 +210,7 @@ const optionModel = {
{
name: '昨天',
type: 'line',
- data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0],
+ // data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0],
smooth: true,
symbol: 'none', // 不显示数据点
itemStyle: {
@@ -236,7 +236,7 @@ const optionModel = {
{
name: '今天',
type: 'line',
- data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+ // data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
smooth: true,
symbol: 'none', // 不显示数据点
areaStyle: {
diff --git a/src/views/store/store_branch_product/index.vue b/src/views/store/store_branch_product/index.vue
index ba756f87b..3babac3fc 100644
--- a/src/views/store/store_branch_product/index.vue
+++ b/src/views/store/store_branch_product/index.vue
@@ -94,7 +94,8 @@ const queryParams = reactive({
store_id: '',
store_name: '',
bar_code: '',
- status: ''
+ status: '',
+ exchange: 0
})
// 选中数据
diff --git a/src/views/user/edit.vue b/src/views/user/edit.vue
index 215195ba9..ac001c5e9 100644
--- a/src/views/user/edit.vue
+++ b/src/views/user/edit.vue
@@ -10,7 +10,7 @@
>
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
<el-form-item label="用户名" prop="username">
- <el-select class="flex-1" v-model="formData.label">
+ <el-select class="flex-1" v-model="formData.label_id">
<el-option
v-for="item in labelList"
:key="item.label_id"
@@ -61,7 +61,7 @@ const popupTitle = computed(() => {
// 表单数据
const formData = reactive({
id: '',
- label: ''
+ label_id: ''
})
diff --git a/src/views/user/indexList.vue b/src/views/user/indexList.vue
index 0321f15f5..2b97d81d2 100644
--- a/src/views/user/indexList.vue
+++ b/src/views/user/indexList.vue
@@ -50,13 +50,6 @@
</template>
</el-table-column>
<el-table-column label="注册渠道" prop="channel" show-overflow-tooltip />
- <el-table-column label="是否禁用" prop="is_disable">
- <template #default="{ row }">
- <dict-value :options="dictData.system_disable" :value="row.is_disable" />
- </template>
- </el-table-column>
- <el-table-column label="最后登录IP" prop="login_ip" show-overflow-tooltip />
- <el-table-column label="最后登录时间" prop="login_time" show-overflow-tooltip />
<el-table-column label="用户余额" prop="user_money" show-overflow-tooltip />
<el-table-column label="累计充值" prop="total_recharge_amount" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right">