dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

9.8

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-09-08 17:38:26 +08:00
parent 4acf5c04bd
commit cdc81391c8
72 changed files with 114 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintAdmin/.env.development
View File

@ -11,7 +11,7 @@ VUE_APP_BASE_API = '/dev-api'
VUE_APP_PUBLIC_PATH = '/'
# 后端接口地址
VUE_APP_SERVER_URL = 'http://127.0.0.1:8081/'
VUE_APP_SERVER_URL = 'http://192.168.31.178:8080/'
# http://192.168.0.121:8080/

2
fuintAdmin/public/index.html
View File

@ -113,7 +113,7 @@
top: 0;
width: 51%;
height: 100%;
background: #409EFF;
background: #fe8c4a;
z-index: 1000;
-webkit-transform: translateX(0);
-ms-transform: translateX(0);

2
fuintAdmin/src/assets/styles/btn.scss
View File

@ -98,7 +98,7 @@
border-radius: 4px;
}
.el-button--warning{
background: linear-gradient( 90deg, #409EFF 0%, #409EFF 100%) !important;
background: linear-gradient( 90deg, #fe8c4a 0%, #fe8c4a 100%) !important;
color: white !important;
border: 0px !important;
}

2
fuintAdmin/src/assets/styles/element-variables.scss
View File

@ -4,7 +4,7 @@
**/
/* theme color */
$--color-primary:#409EFF;
$--color-primary:#fe8c4a;
$--color-success: #13ce66;
$--color-warning: #ffba00;
$--color-danger: #ff4949;

4
fuintAdmin/src/layout/components/TagsView/index.vue
View File

@ -82,8 +82,8 @@ export default {
activeStyle(tag) {
if (!this.isActive(tag)) return {};
return {
"background-color": '#409EFF',
"border-color": '#409EFF',
"background-color": '#fe8c4a',
"border-color": '#fe8c4a',
};
},
isAffix(tag) {

2
fuintAdmin/src/views/EventMarketing/ManageCard/SaveBlock/index.vue
View File

@ -93,7 +93,7 @@
v-model="scope.row.activeStatus"
:active-value="'1'"
:inactive-value="'2'"
active-color="#409EFF"
active-color="#fe8c4a"
inactive-color="#909399"
@change="posteid(scope.row)"
>

2
fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
View File

@ -697,7 +697,7 @@ import {
.butoon{
box-sizing: border-box;
padding: 6px 10px;
border: 1px solid #409eff;
border: 1px solid #fe8c4a;
border-radius: 6px;
font-size: 16px;
margin-left: 15px;

24
fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
View File

@ -169,15 +169,14 @@
<el-radio :label="1">不限</el-radio>
<el-radio :label="2">自定义</el-radio>
</el-radio-group>
<el-select v-model="ruleForm.oilNumber" multiple placeholder="请选择">
<el-select v-model="ruleForm.oilNumber" multiple placeholder="请选择" style="margin-left: 5px">
<el-option v-for="dict in dict.type.oilNumber_type" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</div>
</el-form-item>
</div>
<div class="d-s" style="justify-content: space-between">
<el-form-item label="适用会员等级" prop="name" style="width: 30%;">
<el-select v-model="ruleForm.membershipLevel" multiple placeholder="请选择">
@ -256,21 +255,14 @@
<div class="d-s" style="justify-content: space-between">
<el-form-item label="使用条件" style="width: 30%;">
<el-input type="textarea" v-model="ruleForm.useCondition"></el-input>
</el-form-item>
<!-- <div class="icon-type" v-for="(item, index) in oilTypelistL" :key="index"
:class="{ 'acvtive': index === tindex }" @click="Typeindex(index)">
<img src="../../../assets/images/wx.png" style="width: 20px;height: 20px" v-if="index != tindex">
<img src="../../../assets/images/xz.png" style="width: 20px;height: 20px" v-if="index == tindex">
{{ item }}
</div> -->
<el-form-item label="适用时间段" prop="name" style="width: 30%;">
<el-radio-group v-model="ruleForm.availableType">
<el-radio :label="1">每周 <el-select v-model="ruleForm.availableWeek" multiple placeholder="请选择周日期">
<el-radio :label="1" style="margin-bottom: 15px">每周 <el-select v-model="ruleForm.availableWeek" multiple placeholder="请选择周日期">
<el-option v-for="item in weekList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select></el-radio>
<el-radio :label="2">每月 <el-select v-model="ruleForm.availableDay" multiple placeholder="请选择每月固定日期">
<el-radio :label="2" style="margin-bottom: 15px">每月 <el-select v-model="ruleForm.availableDay" multiple placeholder="请选择每月固定日期">
<el-option v-for="item in monthList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select></el-radio>
@ -280,6 +272,7 @@
<div class="d-s">
<div class="malou">时间段</div>
<el-time-select
style="margin-right: 10px"
placeholder="起始时间"
v-model="ruleForm.availablePeriodStart"
:picker-options="{
@ -303,11 +296,11 @@
</el-form-item>
<el-form-item label="不适用时间段" prop="name" style="width: 30%;">
<el-radio-group v-model="ruleForm.unAvailableType">
<el-radio :label="1">每周 <el-select v-model="ruleForm.unAvailableWeek" multiple placeholder="请选择周日期">
<el-radio :label="1" style="margin-bottom: 15px">每周 <el-select v-model="ruleForm.unAvailableWeek" multiple placeholder="请选择周日期">
<el-option v-for="item in weekList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select></el-radio >
<el-radio :label="2">每月 <el-select v-model="ruleForm.unAvailableDay" multiple placeholder="请选择每月固定日期">
<el-radio :label="2" style="margin-bottom: 15px">每月 <el-select v-model="ruleForm.unAvailableDay" multiple placeholder="请选择每月固定日期">
<el-option v-for="item in monthList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select></el-radio>
@ -317,6 +310,7 @@
<div class="d-s">
<div class="malou">时间段</div>
<el-time-select
style="margin-right: 10px"
placeholder="起始时间"
v-model="ruleForm.unAvailablePeriodStart"
:picker-options="{
@ -973,7 +967,7 @@ export default {
.butoon {
box-sizing: border-box;
padding: 6px 10px;
border: 1px solid #409eff;
border: 1px solid #fe8c4a;
border-radius: 6px;
font-size: 16px;
margin-left: 15px;

2
fuintAdmin/src/views/EventMarketing/online/index.vue
View File

@ -173,7 +173,7 @@
align-items: center;
justify-content: center;
background: #ecf5ff;
color: #409EFF;
color: #fe8c4a;
width: 100px;
border-radius: 6px;
margin: 5px auto;

2
fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue
View File

@ -179,7 +179,7 @@
>
<template slot-scope="scope">
<span v-if="scope.row.status==0" style="color:#FF9655;">未生效</span>
<span v-if="scope.row.status==1" style="color:#409EFF;">使用中</span>
<span v-if="scope.row.status==1" style="color:#fe8c4a;">使用中</span>
<span v-if="scope.row.status==2" style="color:#F44522;">已失效</span>
</template>
</el-table-column>

2
fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue
View File

@ -179,7 +179,7 @@
>
<template slot-scope="scope">
<span v-if="scope.row.status==0" style="color:#FF9655;">未生效</span>
<span v-if="scope.row.status==1" style="color:#409EFF;">使用中</span>
<span v-if="scope.row.status==1" style="color:#fe8c4a;">使用中</span>
<span v-if="scope.row.status==2" style="color:#F44522;">已失效</span>
</template>
</el-table-column>

2
fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
View File

@ -107,7 +107,7 @@
v-model="scope.row.activeStatus"
active-value="1"
inactive-value="2"
active-color="#409EFF"
active-color="#fe8c4a"
inactive-color="#909399"
@change="posteid(scope.row)"
>

2
fuintAdmin/src/views/financialStatement/buy/tab/em.vue
View File

@ -371,7 +371,7 @@ import {getgetInfoByEmApi} from "@/api/order/oilorder";
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
}
.size-hui{
display: flex;

2
fuintAdmin/src/views/financialStatement/buy/tab/goods.vue
View File

@ -403,7 +403,7 @@ export default {
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
}
.el-form--inline .el-form-item {
margin-right: 44px;

2
fuintAdmin/src/views/financialStatement/buy/tab/gun.vue
View File

@ -352,7 +352,7 @@ import {getInfoByOilGunApi} from "@/api/order/oilorder";
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
}
.el-form--inline .el-form-item {
margin-right: 44px;

2
fuintAdmin/src/views/financialStatement/buy/tab/inter.vue
View File

@ -370,7 +370,7 @@ export default {
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
}
.el-form--inline .el-form-item {
margin-right: 44px;

2
fuintAdmin/src/views/financialStatement/buy/tab/oil.vue
View File

@ -389,7 +389,7 @@ import {getInfoByOilTypeApi} from "@/api/order/oilorder";
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
}
.el-form--inline .el-form-item {
margin-right: 44px;

2
fuintAdmin/src/views/financialStatement/reconciliation/tab/favourable.vue
View File

@ -195,7 +195,7 @@ export default {
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
}
.el-form--inline .el-form-item {
margin-right: 44px;

2
fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue
View File

@ -416,7 +416,7 @@ import {getmyDataApi, getRunningWaterByTissueApi, getTissueByDataApi, getTrading
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
}
.size-hui{

2
fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue
View File

@ -502,7 +502,7 @@ import {
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
}
.size-hui{

2
fuintAdmin/src/views/financialStatement/runningWater/tab/day.vue
View File

@ -318,7 +318,7 @@ import {
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
}
.el-form--inline .el-form-item {
margin-right: 44px;

2
fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue
View File

@ -346,7 +346,7 @@ import {
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
}
.el-form--inline .el-form-item {
margin-right: 44px;

2
fuintAdmin/src/views/handover/info/rec/ref.vue
View File

@ -428,7 +428,7 @@ import {getmyDataApi, getRunningWaterByTissueApi, getTissueByDataApi, getTrading
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
}
.size-hui{

2
fuintAdmin/src/views/handover/info/rec/trading.vue
View File

@ -530,7 +530,7 @@ import {
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
}
.size-hui{

2
fuintAdmin/src/views/integral/order/index.vue
View File

@ -250,7 +250,7 @@ export default {
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
}
.el-form--inline .el-form-item {
margin-right: 44px;

2
fuintAdmin/src/views/integral/order/pointsCashier.vue
View File

@ -306,7 +306,7 @@ export default {
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
}
.el-form--inline .el-form-item {
margin-right: 44px;

4
fuintAdmin/src/views/member/index.vue
View File

@ -195,7 +195,7 @@
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column label="会员名称" align="center" prop="name" width="200">
<template slot-scope="scope">
<span style="color: #409EFF;cursor: pointer "
<span style="color: #fe8c4a;cursor: pointer "
@click="goDedi(scope.row.id)">{{ scope.row.name ? scope.row.name : "--" }}</span>
</template>
</el-table-column>
@ -1318,7 +1318,7 @@ export default {
.k-three {
width: 19%;
border-radius: 10px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
background: rgba(64, 158, 255, 0.1);
box-sizing: border-box;
padding: 20px;

2
fuintAdmin/src/views/oilConfig/oilPrice/index.vue
View File

@ -94,7 +94,7 @@
left: 0px;
background-color: #e1ecfc;
padding: 3px 7px;
color: #409eff;
color: #fe8c4a;
font-size: 13px;
border-bottom-right-radius: 6px;
}

4
fuintAdmin/src/views/oilConfig/oilPrice/index1.vue
View File

@ -16,7 +16,7 @@
<div v-if="item.state == '禁用'" class="top-icon2">
<div>{{item.state}}</div>
</div>
<div class="box-icon"><i class="el-icon-edit" style="color:#409EFF" @click="dialogFormNumberEdit = true,oilTypeMethods(),openOilNumberEdit(item)"></i></div>
<div class="box-icon"><i class="el-icon-edit" style="color:#fe8c4a" @click="dialogFormNumberEdit = true,oilTypeMethods(),openOilNumberEdit(item)"></i></div>
<div class="box-title"> {{item.allOil}} </div>
<div class="between-box">
<div>油站价:</div>
@ -908,7 +908,7 @@ import {
left: 0px;
background-color: #e1ecfc;
padding: 3px 7px;
color: #409eff;
color: #fe8c4a;
font-size: 13px;
border-bottom-right-radius: 6px;
}

2
fuintAdmin/src/views/order/order_Added.vue
View File

@ -470,7 +470,7 @@ export default {
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
}
.el-form--inline .el-form-item {
margin-right: 44px;

2
fuintAdmin/src/views/order/order_Cashier.vue
View File

@ -707,7 +707,7 @@ import {refundApi} from "@/api/order/refund";
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
}
.el-form--inline .el-form-item {
margin-right: 44px;

2
fuintAdmin/src/views/order/order_Goods.vue
View File

@ -533,7 +533,7 @@ export default {
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
}
.el-form--inline .el-form-item {

2
fuintAdmin/src/views/order/order_Oil.vue
View File

@ -699,7 +699,7 @@
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
}
.el-form--inline .el-form-item {
margin-right: 44px;

2
fuintAdmin/src/views/order/order_Vip.vue
View File

@ -448,7 +448,7 @@ export default {
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
}
.el-form--inline .el-form-item {
margin-right: 44px;

14
fuintAdmin/src/views/power/payment/index.vue
View File

@ -283,7 +283,7 @@
width="100"
label="操作">
<template slot-scope="scope">
<div style="color: #409EFF;cursor: pointer" v-hasPermi="['Merchant:edit']" v-if="scope.row.isUse!=1" @click="editMerchant(scope.row)">修改</div>
<div style="color: #fe8c4a;cursor: pointer" v-hasPermi="['Merchant:edit']" v-if="scope.row.isUse!=1" @click="editMerchant(scope.row)">修改</div>
</template>
</el-table-column>
</el-table>
@ -336,7 +336,7 @@
align="center"
width="120">
<!-- <template slot-scope="scope">-->
<!-- <div style="color: #409EFF;cursor: pointer">{{ scope.row.ruleName }}</div>-->
<!-- <div style="color: #fe8c4a;cursor: pointer">{{ scope.row.ruleName }}</div>-->
<!-- </template>-->
</el-table-column>
@ -397,10 +397,10 @@
label="操作">
<template slot-scope="scope">
<div style="display: flex;justify-content: center;width: 100%">
<div style="color: #409EFF;cursor: pointer;margin: 0 10px" v-hasPermi="['payment:edit']" v-if="scope.row.status!= 'qy'" @click="editRule(scope.row,1)">修改</div>
<div style="color: #409EFF;cursor: pointer;margin: 0 10px" v-hasPermi="['payment:delete']" v-if="scope.row.status!= 'qy'" @click="deleteRule(scope.row)">删除</div>
<div style="color: #409EFF;cursor: pointer;margin: 0 10px" v-if="scope.row.status!= 'qy'" @click="EnableRule(scope.row)">启用</div>
<div style="color: #409EFF;cursor: pointer;margin: 0 10px" v-if="scope.row.status!= 'jy'" @click="editRule(scope.row,2)">查看</div>
<div style="color: #fe8c4a;cursor: pointer;margin: 0 10px" v-hasPermi="['payment:edit']" v-if="scope.row.status!= 'qy'" @click="editRule(scope.row,1)">修改</div>
<div style="color: #fe8c4a;cursor: pointer;margin: 0 10px" v-hasPermi="['payment:delete']" v-if="scope.row.status!= 'qy'" @click="deleteRule(scope.row)">删除</div>
<div style="color: #fe8c4a;cursor: pointer;margin: 0 10px" v-if="scope.row.status!= 'qy'" @click="EnableRule(scope.row)">启用</div>
<div style="color: #fe8c4a;cursor: pointer;margin: 0 10px" v-if="scope.row.status!= 'jy'" @click="editRule(scope.row,2)">查看</div>
</div>
</template>
@ -1364,7 +1364,7 @@ export default {
box-sizing: border-box;
padding: 5px 20px;
background: #F2F6FC;
color: #409EFF;
color: #fe8c4a;
font-weight: bold;
margin: 0px 5px;
border-radius: 4px;

2
fuintAdmin/src/views/power/receiptPrint.vue
View File

@ -308,7 +308,7 @@ avatar-uploader .el-upload {
overflow: hidden;
}
.avatar-uploader .el-upload:hover {
border-color: #409EFF;
border-color: #fe8c4a;
}
.avatar-uploader-icon {
font-size: 28px;

8
fuintAdmin/src/views/shopowner.vue
View File

@ -395,7 +395,7 @@ export default {
const option1 = {
color: [
'#3B6ADE',
'#409eff',
'#fe8c4a',
],
tooltip: {
trigger: 'item'
@ -570,7 +570,7 @@ export default {
},
{
name: '会员消费金额',
color: '#409EFF',
color: '#fe8c4a',
type: 'bar',
tooltip: {
valueFormatter: function (value) {
@ -725,7 +725,7 @@ export default {
},
{
name: '会员消费金额',
color: '#409EFF',
color: '#fe8c4a',
type: 'bar',
tooltip: {
valueFormatter: function (value) {
@ -860,7 +860,7 @@ export default {
height: 120px;
box-sizing: border-box;
border-radius: 8px;
background: #409eff;
background: #fe8c4a;
margin: 15px 0px;
margin-right: 15px;
box-sizing: border-box;

4
fuintAdmin/src/views/staff/storeInfo/index.vue
View File

@ -65,10 +65,10 @@
@click="handleDownloadqrCode('collection')">
下载图片
</el-button>
<el-button style="margin-left: 10px;color: #409EFF" size="small" v-if="type==0" @click="getQRCodeInfoByStoreId(1)">切换样式
<el-button style="margin-left: 10px;color: #fe8c4a" size="small" v-if="type==0" @click="getQRCodeInfoByStoreId(1)">切换样式
</el-button>
<br/>
<el-button style="margin-left: 10px;color: #409EFF" size="small" v-if="type==1" @click="getQRCodeInfoByStoreId(0)">切换样式
<el-button style="margin-left: 10px;color: #fe8c4a" size="small" v-if="type==1" @click="getQRCodeInfoByStoreId(0)">切换样式
</el-button>
</div>
</div>

2
fuintAdmin/src/views/system/dict/index.vue
View File

@ -86,7 +86,7 @@
<!-- <span>{{ scope.row.dictType }}</span>-->
<!-- </router-link>-->
<span style="color: #409EFF;cursor: pointer " @click="goDedi(scope.row.dictId)">{{ scope.row.dictType }}</span>
<span style="color: #fe8c4a;cursor: pointer " @click="goDedi(scope.row.dictId)">{{ scope.row.dictType }}</span>
</template>
</el-table-column>

2
fuintAdmin_zt/public/index.html
View File

@ -113,7 +113,7 @@
top: 0;
width: 51%;
height: 100%;
background: #409EFF;
background: #fe8c4a;
z-index: 1000;
-webkit-transform: translateX(0);
-ms-transform: translateX(0);

2
fuintAdmin_zt/src/assets/styles/btn.scss
View File

@ -100,7 +100,7 @@
.el-button--warning{
color: white !important;
background: linear-gradient( 90deg, #409EFF 0%, #409EFF 100%) !important;
background: linear-gradient( 90deg, #fe8c4a 0%, #fe8c4a 100%) !important;
color: white !important;
border: 0px !important;
}

2
fuintAdmin_zt/src/assets/styles/element-variables.scss
View File

@ -4,7 +4,7 @@
**/
/* theme color */
$--color-primary: #409EFF;
$--color-primary: #fe8c4a;
$--color-success: #13ce66;
$--color-warning: #ffba00;
$--color-danger: #ff4949;

4
fuintAdmin_zt/src/layout/components/TagsView/index.vue
View File

@ -78,8 +78,8 @@ export default {
activeStyle(tag) {
if (!this.isActive(tag)) return {};
return {
"background-color": '#409EFF',
"border-color": '#409EFF',
"background-color": '#fe8c4a',
"border-color": '#fe8c4a',
};
},
isAffix(tag) {

4
fuintAdmin_zt/src/views/Service/index.vue
View File

@ -151,8 +151,8 @@
label="操作">
<template slot-scope="scope">
<div style="display: flex;justify-content: center;width: 100%">
<div style="color: #409EFF;cursor: pointer;margin: 0 10px" v-hasPermi="['Service:enter']" @click="enterThePetrolStation(scope.row)">进入油站</div>
<div style="color: #409EFF;cursor: pointer;margin: 0 10px" @click="godetails(scope.row.id,scope.row.contractDeptId)">查看详情</div>
<div style="color: #fe8c4a;cursor: pointer;margin: 0 10px" v-hasPermi="['Service:enter']" @click="enterThePetrolStation(scope.row)">进入油站</div>
<div style="color: #fe8c4a;cursor: pointer;margin: 0 10px" @click="godetails(scope.row.id,scope.row.contractDeptId)">查看详情</div>
</div>

2
fuintAdmin_zt/src/views/Site/index.vue
View File

@ -2197,7 +2197,7 @@ export default {
padding: 0px 10px;
display: flex;
align-items: center;
color: #409EFF;
color: #fe8c4a;
/*background: #99a9bf;*/
}

12
fuintAdmin_zt/src/views/components/Service/payment.vue
View File

@ -78,7 +78,7 @@
width="100"
label="操作">
<template slot-scope="scope">
<div style="color: #409EFF;cursor: pointer" v-hasPermi="['Merchant:edit']" v-if="scope.row.isUse!=1" @click="editMerchant(scope.row)">修改</div>
<div style="color: #fe8c4a;cursor: pointer" v-hasPermi="['Merchant:edit']" v-if="scope.row.isUse!=1" @click="editMerchant(scope.row)">修改</div>
</template>
</el-table-column>
</el-table>
@ -131,7 +131,7 @@
align="center"
width="120">
<!-- <template slot-scope="scope">-->
<!-- <div style="color: #409EFF;cursor: pointer">{{ scope.row.ruleName }}</div>-->
<!-- <div style="color: #fe8c4a;cursor: pointer">{{ scope.row.ruleName }}</div>-->
<!-- </template>-->
</el-table-column>
@ -192,9 +192,9 @@
label="操作">
<template slot-scope="scope">
<div style="display: flex;justify-content: center;width: 100%">
<div style="color: #409EFF;cursor: pointer;margin: 0 10px" v-hasPermi="['payment:edit']" @click="editRule(scope.row)">修改</div>
<div style="color: #409EFF;cursor: pointer;margin: 0 10px" v-hasPermi="['payment:delete']" @click="deleteRule(scope.row)">删除</div>
<div style="color: #409EFF;cursor: pointer;margin: 0 10px" @click="EnableRule(scope.row)">启用</div>
<div style="color: #fe8c4a;cursor: pointer;margin: 0 10px" v-hasPermi="['payment:edit']" @click="editRule(scope.row)">修改</div>
<div style="color: #fe8c4a;cursor: pointer;margin: 0 10px" v-hasPermi="['payment:delete']" @click="deleteRule(scope.row)">删除</div>
<div style="color: #fe8c4a;cursor: pointer;margin: 0 10px" @click="EnableRule(scope.row)">启用</div>
</div>
</template>
@ -1111,7 +1111,7 @@ export default {
box-sizing: border-box;
padding: 5px 20px;
background: #F2F6FC;
color: #409EFF;
color: #fe8c4a;
font-weight: bold;
margin: 0px 5px;
border-radius: 4px;

2
fuintAdmin_zt/src/views/components/Service/peizhi.vue
View File

@ -183,7 +183,7 @@
box-sizing: border-box;
padding: 5px 20px;
background: #F2F6FC;
color: #409EFF;
color: #fe8c4a;
font-weight: bold;
margin: 0px 5px;
border-radius: 4px;

2
fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/ref.vue
View File

@ -390,7 +390,7 @@ import {getRunningWaterByTissueApi, getTissueByDataApi, getTradingPageApi} from
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
}
.el-form--inline .el-form-item {
margin-right: 44px;

2
fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/trading.vue
View File

@ -480,7 +480,7 @@ padding-left: 20px;
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
}
.size-hui{

2
fuintAdmin_zt/src/views/financialStatement/runningWater/tab/day.vue
View File

@ -296,7 +296,7 @@ import {exportExcelDayApi, getDayDatyListApi, getDayListApi, getRunningWaterByTi
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
}
.size-hui{
display: flex;

2
fuintAdmin_zt/src/views/financialStatement/runningWater/tab/instituion.vue
View File

@ -319,7 +319,7 @@ import {
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
}
.el-form--inline .el-form-item {
margin-right: 44px;

2
fuintAdmin_zt/src/views/financialStatement/runningWater/tab/oilDepot.vue
View File

@ -293,7 +293,7 @@ import {getInstituionListApi, getRunningWaterByDataApi,exportExcelOilDeptApi} fr
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
}
.el-form--inline .el-form-item {
margin-right: 44px;

6
fuintAdmin_zt/src/views/homeComponents/agent.vue
View File

@ -390,7 +390,7 @@ export default {
const option = {
color: [
'#3B6ADE',
'#409eff',
'#fe8c4a',
'#179726',
'#FFB519',
],
@ -459,7 +459,7 @@ export default {
const option1 = {
color: [
'#3B6ADE',
'#409eff',
'#fe8c4a',
],
tooltip: {
trigger: 'item'
@ -523,7 +523,7 @@ export default {
]
};
const option3 = {
color: ['#FF9655', '#0DC291', '#409EFF'],
color: ['#FF9655', '#0DC291', '#fe8c4a'],
tooltip: {
trigger: 'axis',
axisPointer: {

4
fuintAdmin_zt/src/views/homeComponents/manage.vue
View File

@ -433,7 +433,7 @@ export default {
const option1 = {
color: [
'#3B6ADE',
'#409eff',
'#fe8c4a',
],
tooltip: {
trigger: 'item'
@ -615,7 +615,7 @@ export default {
},
{
name: '会员消费金额',
color: '#409EFF',
color: '#fe8c4a',
type: 'bar',
tooltip: {
valueFormatter: function (value) {

4
fuintAdmin_zt/src/views/homeComponents/shopowner.vue
View File

@ -380,7 +380,7 @@ export default {
const option1 = {
color: [
'#3B6ADE',
'#409eff',
'#fe8c4a',
],
tooltip: {
trigger: 'item'
@ -556,7 +556,7 @@ export default {
},
{
name: '会员消费金额',
color: '#409EFF',
color: '#fe8c4a',
type: 'bar',
tooltip: {
valueFormatter: function (value) {

4
fuintAdmin_zt/src/views/oilPrice/index.vue
View File

@ -11,7 +11,7 @@
<div class="top-icon">
<div>启用</div>
</div>
<div class="box-icon"><i class="el-icon-edit" style="color:#409EFF; "></i></div>
<div class="box-icon"><i class="el-icon-edit" style="color:#fe8c4a; "></i></div>
<div class="box-title"> 汽油 92# </div>
<div class="between-box">
<div>油站价:</div>
@ -203,7 +203,7 @@
left: 0px;
background-color: #e1ecfc;
padding: 3px 7px;
color: #409eff;
color: #fe8c4a;
font-size: 13px;
border-bottom-right-radius: 6px;
}

2
fuintAdmin_zt/src/views/system/dict/index.vue
View File

@ -80,7 +80,7 @@
<!-- <span>{{ scope.row.dictType }}</span>-->
<!-- </router-link>-->
<span style="color: #409EFF;cursor: pointer " @click="goDedi(scope.row.dictId)">{{ scope.row.dictType }}</span>
<span style="color: #fe8c4a;cursor: pointer " @click="goDedi(scope.row.dictId)">{{ scope.row.dictType }}</span>
</template>
</el-table-column>

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/controller/ActivePriceRuleController.java
View File

@ -25,7 +25,7 @@ public class ActivePriceRuleController extends BaseController {
/**
* 分页查询活动规则（分时优惠/限时特价通用接口）
* 分页查询活动规则（分时优惠/-/）
*
* @param pageNo 分页参数
* @param pageSize 分页参数

2
fuintCashierWeb/public/index.html
View File

@ -113,7 +113,7 @@
top: 0;
width: 51%;
height: 100%;
background: #409eff;
background: #fe8c4a;
z-index: 1000;
-webkit-transform: translateX(0);
-ms-transform: translateX(0);

2
fuintCashierWeb/src/assets/styles/btn.scss
View File

@ -99,7 +99,7 @@
}
.el-button--warning{
color: white !important;
background: linear-gradient( 90deg, #409EFF 0%, #409EFF 100%) !important;
background: linear-gradient( 90deg, #fe8c4a 0%, #fe8c4a 100%) !important;
border: 0px !important;
}
.el-button--primary{

2
fuintCashierWeb/src/views/cashier/NewComponents/WriteOff.vue
View File

@ -169,7 +169,7 @@ export default {
align-items: center;
justify-content: center;
background: #ecf5ff;
color: #409EFF;
color: #fe8c4a;
width: 100px;
border-radius: 6px;
margin: 5px auto;

2
fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
View File

@ -1799,7 +1799,7 @@ import {getLodop} from "@/api/LodopFuncs";
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
}
.el-form--inline .el-form-item {
margin-right: 44px;

2
fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
View File

@ -1499,7 +1499,7 @@
leftindex:0,
oilList:[],
colorList:[
{color:'#e5f0ff',border:"#409EFF"},
{color:'#e5f0ff',border:"#fe8c4a"},
{color:'#fff2e5',border:"#FF9655"},
{color:'#ecfae5',border:"#0DC291"},
{color:'#fff8e7',border:"#FFB519"}

2
fuintCashierWeb/src/views/cashier/NewComponents/integralOrder/pointsCashier.vue
View File

@ -312,7 +312,7 @@ export default {
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
}
.el-form--inline .el-form-item {
margin-right: 44px;

2
fuintCashierWeb/src/views/cashier/orderComponents/integralComponents/pointsCashier.vue
View File

@ -293,7 +293,7 @@ export default {
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
}
.el-form--inline .el-form-item {
margin-right: 44px;

2
fuintCashierWeb/src/views/cashier/orderComponents/order_Added.vue
View File

@ -551,7 +551,7 @@ import {exportExcelCashierApi, exportExcelHangBillApi} from "@/api/order/exportE
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
}
.el-form--inline .el-form-item {
margin-right: 44px;

8
fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
View File

@ -266,15 +266,15 @@
</el-table-column>
<el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button style="color: #409EFF" size="mini"
<el-button style="color: #fe8c4a" size="mini"
@click="getOrdersInfo(scope.row.id)"
type="text" plain round>详情
</el-button>
<el-button style="color: #409EFF" size="mini"
<el-button style="color: #fe8c4a" size="mini"
@click="patchwork(scope.row)"
type="text" plain round>补打小票
</el-button>
<el-button style="color: #409EFF" size="mini"
<el-button style="color: #fe8c4a" size="mini"
v-if="scope.row.status === 'paid'"
@click="refHandleRefund(scope.row.id)"
type="text" plain round>退款
@ -1347,7 +1347,7 @@ export default {
height: 60px;
background: rgba(64, 158, 255, 0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
}
.box1 {

6
fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue
View File

@ -269,10 +269,10 @@
</el-table-column>
<el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button style="color: #409EFF" @click="patchwork(scope.row)"
<el-button style="color: #fe8c4a" @click="patchwork(scope.row)"
type="text" >补打
</el-button>
<el-button style="color: #409EFF"
<el-button style="color: #fe8c4a"
v-if="scope.row.status === 'paid'"
@click="refHandleRefund(scope.row.id)"
type="text">退款
@ -902,7 +902,7 @@ export default {
height: 60px;
background: rgba(64, 158, 255, 0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
}
.el-form--inline .el-form-item {

6
fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
View File

@ -313,9 +313,9 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">
<template slot-scope="scope">
<el-button style="color: #409EFF" @click="patchwork(scope.row)" type="text">补打
<el-button style="color: #fe8c4a" @click="patchwork(scope.row)" type="text">补打
</el-button>
<el-button style="color: #409EFF" @click="handleRefund(scope.row.id)" type="text"
<el-button style="color: #fe8c4a" @click="handleRefund(scope.row.id)" type="text"
v-if="scope.row.orderStatus === 'paid' && scope.row.terminal=='applet'" >退款
</el-button>
</template>
@ -957,7 +957,7 @@ export default {
height: 60px;
background: rgba(64, 158, 255, 0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
}
.el-form--inline .el-form-item {

2
fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue
View File

@ -700,7 +700,7 @@ export default {
height: 60px;
background: rgba(64, 158, 255, 0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
}
.el-form--inline .el-form-item {

2
fuintCashierWeb/src/views/cashier/vipComponents/balanceList.vue
View File

@ -806,7 +806,7 @@ import {oilNumbers} from "@/api/cashier/oilnumber";
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
}
.el-form--inline .el-form-item {
margin-right: 44px;

4
fuintCashierWeb/src/views/cashier/vipComponents/vipList.vue
View File

@ -197,7 +197,7 @@
<el-table-column label="会员号" align="center" prop="userNo" width="150"/>
<el-table-column label="名称" align="center" prop="name" >
<template slot-scope="scope">
<span style="color: #409EFF;cursor: pointer " @click="goDedi(scope.row.id)">{{ scope.row.name }}</span>
<span style="color: #fe8c4a;cursor: pointer " @click="goDedi(scope.row.id)">{{ scope.row.name }}</span>
</template>
</el-table-column>
<el-table-column label="手机号" align="center" prop="mobile" width="110">
@ -921,7 +921,7 @@
.k-three{
width: 19%;
border-radius: 10px;
border: 1px solid #409EFF;
border: 1px solid #fe8c4a;
background: rgba(64,158,255,0.1);
box-sizing: border-box;
padding: 20px;