From 282f0470dc3d306638e48152a0135a2578cd5d33 Mon Sep 17 00:00:00 2001
From: xvv <cccccc420590@163.com>
Date: Fri, 5 Jul 2024 14:11:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/oilConfig/oilPrice/index.vue    | 27 ++-----------------
 fuintAdmin/src/views/order/order_Vip.vue      | 14 ++++++----
 2 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/fuintAdmin/src/views/oilConfig/oilPrice/index.vue b/fuintAdmin/src/views/oilConfig/oilPrice/index.vue
index 3aca53cf8..5fe6c3e76 100644
--- a/fuintAdmin/src/views/oilConfig/oilPrice/index.vue
+++ b/fuintAdmin/src/views/oilConfig/oilPrice/index.vue
@@ -7,7 +7,7 @@
       <el-button type="primary" @click="oilTypeMethods(1)">新增油号</el-button>
       <div class="top-box">
         <!--              循环-->
-        <div class="oil-box" v-for="(item,index) in oilNumberList " :key="index" >
+        <div class="oil-box" :style=" 'background:'+ colorList[index] " v-for="(item,index) in oilNumberList " :key="index" >
           <div v-if="item.state == '启用'" class="top-icon">
             <div>{{item.state}}</div>
           </div>
@@ -372,13 +372,9 @@
         <el-button type="primary" @click="insertOilPresePrices()">确 定</el-button>
       </div>
     </el-dialog>
-
   </div>
 </template>
-
-
 <script>
-
 import {
   getOilNumberList,
   dictSelect,
@@ -390,11 +386,9 @@ import {
   getOilNameListApi, insertOilPresePricesApi, stopJobApi
 
 } from "@/api/oilPrice";
-
   export default {
     name: 'index',
     dicts: ['jobState','oil_type','zhzt'],
-
     data() {
       var valiNumberPass = (rule, value, callback) => {//包含小数的数字
         let reg = /^[+-]?(0|([1-9]\d*))(\.\d{1,2})?$/;
@@ -406,9 +400,7 @@ import {
           callback();
         }
       };
-
       return {
-
         defaultDateTime: new Date(), // 默认时间
         pickerOptions: {
           disabledDate(time) {
@@ -416,7 +408,6 @@ import {
             return time.getTime() < Date.now();
           },
         },
-
         oilPresetPricesRules: {
           numberId:[
             { required: true, message: '请选择油品类型', trigger: 'change' }
@@ -447,32 +438,22 @@ import {
           gbPrice: [
             { required: true, validator:valiNumberPass, trigger: "blur" }
           ],
-          // receivingUnits: [
-          //   { required: true, message: '请选择', trigger: 'change' }
-          // ],
           state: [
             { required: true, message: '请选择状态', trigger: 'change' }
           ]
         },
-
-
         oilNumberList: [],
         oilNumberList2: [],
-
         num: 1,
         dialogFormVisible: false, // 新增油价配置
         dialogFormNumberEdit: false, // 修改油价配置
-
         dialogFormPricesAdd: false, // 新增油价趋势
-
         oilTypeList: [], // 油品类型
         oilNameList: [], // 油品名称
         receivingUnitList: [], // 计价单位
-
         receivingUnitCN: [],
         receivingUnitEN: [],
-
-
+        colorList:["#EAF9F6","#FFF1E8","#EDF3FF","#FFF8E6"],
         oilNumber:{
           oilType: '汽油',
           oilName: '',
@@ -491,10 +472,8 @@ import {
           oilNameT: '',
           unit:'', // 计价单位
         },
-
         oilPresetPricesList:[],
         AllOilList:[],
-
         selectOilTypeByPrice: [],
         oilPresetPrices: {
           oilType:'',
@@ -534,8 +513,6 @@ import {
     mounted() {
     },
     methods: {
-
-
       getStatusText(data) {
         if (data == 1) {
           return "停止"
diff --git a/fuintAdmin/src/views/order/order_Vip.vue b/fuintAdmin/src/views/order/order_Vip.vue
index 9b802bdc3..8a6c48c00 100644
--- a/fuintAdmin/src/views/order/order_Vip.vue
+++ b/fuintAdmin/src/views/order/order_Vip.vue
@@ -501,17 +501,21 @@ export default {
     width: 200px;
     box-sizing: border-box;
     padding: 10px;
-    background: #f9f9f9;
+    background: rgba(64,158,255,0.05);
     height: 86px;
     margin-right: 10px;
+    border-radius: 6px;
+    border: 1px solid #409EFF;
   }
   .size-hui{
-    font-size: 14px;
-    margin-bottom: 10px;
-    margin-top: 10px;
+    font-size: 20px;
+    color: #555555;
+    font-weight: bold;
+
   }
   .size-bole{
-    font-weight: bold;
+    font-size: 14px;
+    color: #888888;
   }
   .wgang{
     width: 100%;