yumoqing/kboss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

main #34

Merged
charles merged 191 commits from main into prod 2025-11-19 16:18:39 +08:00
Conversation 0 Commits 191 Files Changed 154 +8 -8
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c7412fc2f7 - Show all commits

4
f/web-kboss/src/views/login/indexNew.vue
View File

@ -98,7 +98,7 @@
<!-- </div>-->
<div style="display:flex;">
<el-button @keyup.enter.native="handleLogin('loginForm')" :loading="loading" type="primary"
style="width: 300px;margin-top: 30px;margin-bottom: 30px" class="login-btn"
style="width: 300px;margin-top: 30px;margin-bottom: 10px" class="login-btn"
@click.native.prevent="handleLogin('loginForm')">立即登录
</el-button>
</div>
@ -846,7 +846,7 @@ export default {
if (this.$route.query.fromPath === 'homePage') {
// this.$router.push({path: "/homePage/index"});
if (this.$route.query.type === 'bd') {
// this.$router.push('/product/baiduProduct')
// this.$router.push('/product/baiduProduct')
this.goBaidu(this.$route.query.listUrl, this.$route.query.url)
} else if (this.$route.query.type === 'ali') {

6
f/web-kboss/src/views/operation/saleActives/index.vue
View File

@ -4,7 +4,7 @@
<el-row class="customerList">
<el-col :span="10">
<div style="display:flex;">
<el-button size="small" type="success" @click="addSaleActives">添加促销活动</el-button>
<el-button size="small" type="success" @click="addSaleActives" style="margin-bottom: 10px;">添加促销活动</el-button>
</div>
<div class="leftTable">
<el-table :data="leftTableData" row-key="id" border height="calc(100vh - 200px)" @row-click="getProduct"
@ -24,7 +24,7 @@
<el-col :span="14">
<div style="display:flex; flex-direction: row;">
<div style="display:flex;padding-right:20px">
<el-button size="small" type="success" @click="addProduct()" :disabled="isAddProduct">添加折扣产品
<el-button size="small" type="success" @click="addProduct()" :disabled="isAddProduct" style="margin-bottom: 10px;">添加折扣产品
</el-button>
</div>
<div>
@ -97,7 +97,7 @@
<!-- 添加折扣产品弹窗 -->
<el-dialog class="addSaleProduct" :title="'请为'+ this.tableTitle+'添加促销产品'" :visible.sync="addProductDialog"
width="45%" :before-close="handleClose1" :isEdit="isEdit">
width="45%" :before-close="handleClose1" :isEdit="isEdit" >
<el-form ref="productForm" :model="productForm" label-width="120px" :rules="ProductRules" style="width: 80%">
<div class="treeSelect">
<el-form-item label="促销产品:" prop="" required="">

4
f/web-kboss/src/views/operationAndMaintenance/documentManagement/index.vue
View File

@ -1,7 +1,7 @@
<template>
<div>
<div style="display:flex;">
<el-button type="primary" size="small" @click="addDocument">新增文档</el-button>
<el-button type="primary" size="small" @click="addDocument" style="margin:10px 0;">新增文档</el-button>
</div>
<el-table :data="tableData" style="width: 100%" height="720">
<el-table-column prop="title" label="标题"> </el-table-column>
@ -266,4 +266,4 @@ export default {
</script>
<style>
</style>
</style>

2
f/web-kboss/src/views/sales/distributorManagement/index.vue
View File

@ -2,7 +2,7 @@
<div class="box">
<div class="left_box">
<div style="background-color: white;display:flex;">
<el-button @click="drawer = true" type="primary" size="small">添加分销商</el-button>
<el-button @click="drawer = true" type="primary" size="small" style="margin: 10px 20px;">添加分销商</el-button>
</div>
<div class="distributor_box">
<el-table :data="distributorList" style="width: 100%" :unique-opened="true" height="calc(100vh - 130px)"