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

Compare commits

base: yumoqing:ededb5a3da789e613712e0453549868ae9bbc0a1
Branches Tags
yumoqing:main
yumoqing:prod
yumoqing:dev1
..
compare: yumoqing:ff1a27a96f504ba36cb4857f5233545fb3f8cab6
Branches Tags
yumoqing:prod
yumoqing:main
yumoqing:dev1

No commits in common. "ededb5a3da789e613712e0453549868ae9bbc0a1" and "ff1a27a96f504ba36cb4857f5233545fb3f8cab6" have entirely different histories.
ededb5a3da ... ff1a27a96f

11 changed files with 382 additions and 320 deletions
Show Stats Expand all files Collapse all files

3
f/web-kboss/src/components/FloatingBox/FloatingBox.vue
View File

@ -88,7 +88,7 @@
class="cloud-contact-us-icon"></span> class="cloud-contact-us-icon"></span>
<p class="cloud-contact-us-tit" style="font-size: 14px;">售前咨询</p> <p class="cloud-contact-us-tit" style="font-size: 14px;">售前咨询</p>
</div> </div>
<div style="display: flex;justify-content: center;align-items: center;" <div style=";display: flex;justify-content: center;align-items: center;"
> >
<div v-if="!phone" <div v-if="!phone"
style="width: 80px;height: 25px;display: flex!important;justify-content: center;align-items: center"> style="width: 80px;height: 25px;display: flex!important;justify-content: center;align-items: center">
@ -991,7 +991,6 @@ export default {
background-color: white; background-color: white;
box-shadow: 5px 5px 10px rgba(0, 0, 0, 0.5); box-shadow: 5px 5px 10px rgba(0, 0, 0, 0.5);
padding: 10px; padding: 10px;
z-index: 11;
} }
@keyframes slideInRight { @keyframes slideInRight {

1
f/web-kboss/src/mixin/globalMixin.js
View File

@ -5,4 +5,3 @@ export default {
document.body.style.userSelect = 'none'; document.body.style.userSelect = 'none';
}, },
}; };

2
f/web-kboss/src/views/finance/customerRechargeManagement/customersRechargeOnffline/index.vue
View File

@ -10,7 +10,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="充值金额:" prop="balance" label-width="130px"> <el-form-item label="充值金额:" prop="balance">
<el-input v-model="form.balance"></el-input> <el-input v-model="form.balance"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>

560
f/web-kboss/src/views/homePage/mainPage/index.vue
View File

File diff suppressed because it is too large Load Diff

8
f/web-kboss/src/views/operation/channelCustomer/index.vue
View File

@ -9,21 +9,21 @@
fixed fixed
prop="username" prop="username"
label="用户名" label="用户名"
> width="150">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="orgname" prop="orgname"
label="用户机构" label="用户机构"
> width="120">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="create_at" prop="create_at"
label="申请时间" label="申请时间"
> width="180">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="操作" label="操作"
> width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.type==='0'"> <div v-if="scope.row.type==='0'">
<el-button @click="handleClick(scope.row)" size="mini" type="primary">同意</el-button> <el-button @click="handleClick(scope.row)" size="mini" type="primary">同意</el-button>

1
f/web-kboss/src/views/operation/deviceMangement/deviceGrid/machineRoomGrid.vue
View File

@ -220,7 +220,6 @@ export default {
justify-content: flex-start; justify-content: flex-start;
flex-wrap: wrap; flex-wrap: wrap;
background-color: white; background-color: white;
padding: 20px;
} }
.itemStyle { .itemStyle {

2
f/web-kboss/src/views/product/productHome/index.vue
View File

@ -804,7 +804,7 @@ export default {
} }
.jd-code { .jd-code {
/* border:1px solid red; */ //border:1px solid red;
.el-dialog__body { .el-dialog__body {
display: flex; display: flex;

1
f/web-kboss/src/views/sales/distributorManagement/lodIndex.vue
View File

@ -919,5 +919,4 @@ export default {
.drawer_style { .drawer_style {
padding: 0px 30px 0px 30px !important; padding: 0px 30px 0px 30px !important;
} }
</style> </style>