From 82f1d4a1c53400756999297f37776dcd1bac4a11 Mon Sep 17 00:00:00 2001
From: "@QQNZX" <cccccc420590@163.com>
Date: Thu, 14 Mar 2024 20:45:09 +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

---
 .../views/EventMarketing/SaveBlock/index.vue  | 86 +++++++------------
 .../activeConsumption/index.vue               | 16 ++--
 .../EventMarketing/activeNewlyweds/index.vue  | 31 ++++---
 .../EventMarketing/activeRecommend/index.vue  | 16 ++--
 .../EventMarketing/storeOilBlock/index.vue    | 49 +++++++----
 fuintCashierWeb/.env.development              |  2 +-
 .../views/cashier/NewComponents/credit.vue    |  2 +-
 .../views/cashier/NewComponents/homeindex.vue |  2 +-
 8 files changed, 103 insertions(+), 101 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
index b0878065e..4e356b6c3 100644
--- a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
@@ -167,68 +167,48 @@
             <el-row :gutter="20">
             <el-col :span="14">
               <el-form-item   label="充值金额" :label-width="formLabelWidth" prop="rechargeBalance">
-                <el-input type="number" v-model="form.rechargeBalance" autocomplete="off">
-                  <template slot="append">元</template>
-                </el-input>
+                <div style="width: 250px">
+                  <el-input type="number" v-model="form.rechargeBalance" autocomplete="off">
+                    <template slot="append">元</template>
+                  </el-input>
+                </div>
+
               </el-form-item>
             </el-col>
               <el-col :span="14">
                 <el-form-item label="赠送金额" :label-width="formLabelWidth" prop="giftBalance">
-                  <el-input type="number" v-model="form.giftBalance" autocomplete="off">
-                    <template slot="append">元</template>
-                  </el-input>
+                  <div style="width: 250px">
+                    <el-input type="number" v-model="form.giftBalance" autocomplete="off">
+                      <template slot="append">元</template>
+                    </el-input>
+                  </div>
+
                 </el-form-item>
               </el-col>
               <el-col :span="14">
                 <el-form-item label="赠送积分" :label-width="formLabelWidth" prop="points">
-                  <el-input type="number" v-model="form.points" autocomplete="off">
-                    <template slot="append">分</template>
-                  </el-input>
+                  <div style="width: 250px">
+                    <el-input type="number" v-model="form.points" autocomplete="off">
+                      <template slot="append">分</template>
+                    </el-input>
+                  </div>
+
                 </el-form-item>
               </el-col>
               <el-col :span="14">
                 <el-form-item  label="赠送成长值" :label-width="formLabelWidth" prop="growthValue">
-                  <el-input type="number" v-model="form.growthValue" autocomplete="off">
-                    <template slot="append">成长值</template>
-                  </el-input>
+                  <div style="width: 250px">
+                    <el-input type="number" v-model="form.growthValue" autocomplete="off">
+                      <template slot="append">成长值</template>
+                    </el-input>
+                  </div>
+
                 </el-form-item>
               </el-col>
-<!--              <el-col :span="14">
-                <el-form-item label="赠送加油金" :label-width="formLabelWidth" prop="refuelMoney">
-                  <el-input type="number" v-model="form.refuelMoney" autocomplete="off">
-                    <template slot="append">元</template>
-                  </el-input>
-                </el-form-item>
-              </el-col>-->
+
             </el-row>
 
-<!--            <el-form-item label="赠送特权" :label-width="formLabelWidth" prop="resource">
-              <el-radio-group v-model="form.resource">
-                <el-radio label="1">显示</el-radio>
-                <el-radio label="2">隐藏</el-radio>
-              </el-radio-group>
-            </el-form-item>-->
 
-<!--            <el-form-item label="参与次数" :label-width="formLabelWidth">
-              <el-input-number v-model="form.participationNo" controls-position="right" :min="1" :max="10"></el-input-number>
-            </el-form-item>-->
-<!--            <div>-->
-<!--              <el-form-item label="员工提成" :label-width="formLabelWidth" prop="employeeCommission">-->
-<!--                <el-radio-group v-model="form.employeeCommission">-->
-<!--                  <el-radio label="1">仅会员首次充值提成</el-radio>-->
-<!--                  <el-radio label="2">会员每次充值提成</el-radio>-->
-<!--                </el-radio-group>-->
-<!--              </el-form-item>-->
-<!--            </div>-->
-<!--            <div>-->
-<!--            <el-form-item label="提成类型" :label-width="formLabelWidth" prop="royaltyType">-->
-<!--              <el-radio-group v-model="form.royaltyType">-->
-<!--                <el-radio label="1">无</el-radio>-->
-<!--                <el-radio label="2">按提成金额</el-radio>-->
-<!--                <el-radio label="3">按充值金额*提成比例</el-radio>-->
-<!--              </el-radio-group>-->
-<!--            </el-form-item>-->
-<!--            </div>-->
             <el-form-item label="提成金额" v-if="form.royaltyType == 2" :label-width="formLabelWidth" prop="amountCommission">
               <el-input v-model="form.amountCommission" autocomplete="off">
                 <template slot="append">元</template>
@@ -453,12 +433,12 @@
           <el-table-column
             prop="name"
             label="卡券名称"
-            width="100">
+           >
           </el-table-column>
           <el-table-column
             prop="date"
             label="券类型"
-            width="100">
+            >
             <template slot-scope="scope">
               <span v-if="scope.row.type == 0" >油品券</span>
               <span v-if="scope.row.type == 1"  >商品券</span>
@@ -468,7 +448,7 @@
           <el-table-column
             prop="date"
             label="券详情"
-            width="100">
+            >
             <template slot-scope="scope">
               <span>满{{scope.row.satisfiedAmount}}减 {{scope.row.discountAmount}}元 </span>
             </template>
@@ -476,7 +456,7 @@
           <el-table-column
             prop="date"
             label="有效期（天）"
-            width="180">
+            >
             <template slot-scope="scope">
               <span v-if="scope.row.timeType == 0" >{{scope.row.validityZero}}天 </span>
               <span v-if="scope.row.timeType == 1" >{{scope.row.validityOne}}天 </span>
@@ -519,12 +499,12 @@
           <el-table-column
             prop="name"
             label="卡券名称"
-            width="100">
+            >
           </el-table-column>
           <el-table-column
             prop="date"
             label="券类型"
-            width="100">
+            >
             <template slot-scope="scope">
               <span v-if="scope.row.type == 0" >油品券</span>
               <span v-if="scope.row.type == 1"  >商品券</span>
@@ -534,7 +514,7 @@
           <el-table-column
             prop="date"
             label="使用说明"
-            width="100">
+            >
             <template slot-scope="scope">
               <span>{{scope.row.useInstructions}}</span>
             </template>
@@ -542,7 +522,7 @@
           <el-table-column
             prop="date"
             label="有效期（天）"
-            width="180">
+            >
             <template slot-scope="scope">
               <span  >{{scope.row.validity}}天 </span>
             </template>
diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
index 3cdcd93ac..e6bcc33b5 100644
--- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
@@ -497,12 +497,12 @@
         <el-table-column
           prop="name"
           label="卡券名称"
-          width="100">
+          >
         </el-table-column>
         <el-table-column
           prop="date"
           label="券类型"
-          width="100">
+          >
           <template slot-scope="scope">
             <span v-if="scope.row.type == 0" >油品券</span>
             <span v-if="scope.row.type == 1"  >商品券</span>
@@ -512,7 +512,7 @@
         <el-table-column
           prop="date"
           label="券详情"
-          width="100">
+         >
           <template slot-scope="scope">
            <span>满{{scope.row.satisfiedAmount}}减 {{scope.row.discountAmount}}元 </span>
           </template>
@@ -520,7 +520,7 @@
         <el-table-column
           prop="date"
           label="有效期（天）"
-          width="180">
+          >
           <template slot-scope="scope">
             <span v-if="scope.row.timeType == 0" >{{scope.row.validityZero}}天 </span>
             <span v-if="scope.row.timeType == 1" >{{scope.row.validityOne}}天 </span>
@@ -563,12 +563,12 @@
         <el-table-column
           prop="name"
           label="卡券名称"
-          width="100">
+         >
         </el-table-column>
         <el-table-column
           prop="date"
           label="券类型"
-          width="100">
+         >
           <template slot-scope="scope">
             <span v-if="scope.row.type == 0" >油品券</span>
             <span v-if="scope.row.type == 1"  >商品券</span>
@@ -578,7 +578,7 @@
         <el-table-column
           prop="date"
           label="使用说明"
-          width="100">
+          >
           <template slot-scope="scope">
             <span>{{scope.row.useInstructions}}</span>
           </template>
@@ -586,7 +586,7 @@
         <el-table-column
           prop="date"
           label="有效期（天）"
-          width="180">
+          >
           <template slot-scope="scope">
             <span  >{{scope.row.validity}}天 </span>
           </template>
diff --git a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
index 97671cda7..fef3d8d03 100644
--- a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
@@ -2,13 +2,15 @@
   <div class="app-container">
     <el-card style="margin-bottom: 20px">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+
         <el-form-item label="活动名称" prop="name">
-          <el-input
+          <div style="width: 220px">   <el-input
             v-model="queryParams.name"
             placeholder="请输入活动名称"
             clearable
             @keyup.enter.native="handleQuery"
-          />
+          /></div>
+
         </el-form-item>
 <!--        <el-form-item label="状态">-->
 <!--          <el-select v-model="queryParams.status" clearable placeholder="请选择活动状态">-->
@@ -43,7 +45,10 @@
     <el-dialog :title="title" :visible.sync="open" width="55%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" :label-position="labelPosition" label-width="110px">
         <el-form-item label="活动名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入活动名称" />
+          <div style="width: 220px">
+            <el-input v-model="form.name" placeholder="请输入活动名称" />
+          </div>
+
         </el-form-item>
         <el-row :gutter="20">
           <el-col :span="12">
@@ -216,7 +221,10 @@
           <el-input-number v-model="form.growthValue" controls-position="right"  :min="1" :max="9999999"></el-input-number>
         </el-form-item>
         <el-form-item label="自定义规则" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入自定义规则" />
+          <div style="width: 200px">
+            <el-input v-model="form.remark" placeholder="请输入自定义规则" />
+          </div>
+
         </el-form-item>
         <!--        <div slot="footer" class="dialog-footer">-->
         <!--          <el-button type="primary" @click="submitForm">确 定</el-button>-->
@@ -323,7 +331,6 @@
 
 
 
-
     <!--    优惠券列表-->
     <el-dialog title="优惠券列表" :visible.sync="dialogTableVisible">
       <div style="display: flex;align-items: center; margin-bottom: 20px ">
@@ -337,12 +344,12 @@
         <el-table-column
           prop="name"
           label="卡券名称"
-          width="100">
+          >
         </el-table-column>
         <el-table-column
           prop="date"
           label="券类型"
-          width="100">
+      >
           <template slot-scope="scope">
             <span v-if="scope.row.type == 0" >油品券</span>
             <span v-if="scope.row.type == 1"  >商品券</span>
@@ -352,7 +359,7 @@
         <el-table-column
           prop="date"
           label="券详情"
-          width="100">
+      >
           <template slot-scope="scope">
             <span>满{{scope.row.satisfiedAmount}}减 {{scope.row.discountAmount}}元 </span>
           </template>
@@ -401,12 +408,12 @@
         <el-table-column
           prop="name"
           label="卡券名称"
-          width="100">
+         >
         </el-table-column>
         <el-table-column
           prop="date"
           label="券类型"
-          width="100">
+          >
           <template slot-scope="scope">
             <span v-if="scope.row.type == 0" >洗车券</span>
             <span v-if="scope.row.type == 1"  >商品券</span>
@@ -415,7 +422,7 @@
         <el-table-column
           prop="date"
           label="使用说明"
-          width="100">
+          >
           <template slot-scope="scope">
             <span>{{scope.row.useInstructions}}</span>
           </template>
@@ -423,7 +430,7 @@
         <el-table-column
           prop="date"
           label="有效期（天）"
-          width="180">
+          >
           <template slot-scope="scope">
             <span  >{{scope.row.validity}}天 </span>
           </template>
diff --git a/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue b/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue
index 5cc2dc6a1..d76210edb 100644
--- a/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue
@@ -507,12 +507,12 @@
         <el-table-column
           prop="name"
           label="卡券名称"
-          width="80">
+          >
         </el-table-column>
         <el-table-column
           prop="date"
           label="券类型"
-          width="100">
+         >
           <template slot-scope="scope">
             <span v-if="scope.row.type == 0" >油品券</span>
             <span v-if="scope.row.type == 1"  >商品券</span>
@@ -522,7 +522,7 @@
         <el-table-column
           prop="date"
           label="券详情"
-          width="100">
+         >
           <template slot-scope="scope">
             <span>满{{scope.row.satisfiedAmount}}减 {{scope.row.discountAmount}}元 </span>
           </template>
@@ -530,7 +530,7 @@
         <el-table-column
           prop="date"
           label="有效期（天）"
-          width="180">
+          >
           <template slot-scope="scope">
             <span v-if="scope.row.timeType == 0" >{{scope.row.validityZero}}天 </span>
             <span v-if="scope.row.timeType == 1" >{{scope.row.validityOne}}天 </span>
@@ -571,12 +571,12 @@
         <el-table-column
           prop="name"
           label="卡券名称"
-          width="100">
+          >
         </el-table-column>
         <el-table-column
           prop="date"
           label="券类型"
-          width="100">
+          >
           <template slot-scope="scope">
             <span v-if="scope.row.type == 0" >油品券</span>
             <span v-if="scope.row.type == 1"  >商品券</span>
@@ -586,7 +586,7 @@
         <el-table-column
           prop="date"
           label="使用说明"
-          width="100">
+          >
           <template slot-scope="scope">
             <span>{{scope.row.useInstructions}}</span>
           </template>
@@ -594,7 +594,7 @@
         <el-table-column
           prop="date"
           label="有效期（天）"
-          width="180">
+          >
           <template slot-scope="scope">
             <span  >{{scope.row.validity}}天 </span>
           </template>
diff --git a/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue b/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
index eef844834..32701b1d6 100644
--- a/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
@@ -218,35 +218,50 @@
 
 
           <el-form-item label="锁价单价" prop="lockupPrice">
-            <el-input v-model="ruleForm.lockupPrice" min="1" placeholder="请输入锁价单价">
-              <template slot="append">元/升</template>
-            </el-input>
+            <div style="width: 217px">
+              <el-input v-model="ruleForm.lockupPrice" min="1" placeholder="请输入锁价单价">
+                <template slot="append">元/升</template>
+              </el-input>
+            </div>
+
           </el-form-item>
           <el-form-item label="满足金额" prop="rechargeBalance">
-            <el-input v-model="ruleForm.rechargeBalance" min="1" placeholder="请输入满足金额">
-              <template slot="append">元</template>
-            </el-input>
+            <div style="width: 217px">
+              <el-input v-model="ruleForm.rechargeBalance" min="1" placeholder="请输入满足金额">
+                <template slot="append">元</template>
+              </el-input>
+            </div>
+
           </el-form-item>
           <el-form-item label="换算升数" prop="incomeLitres">
-            <el-input v-model="ruleForm.incomeLitres.toFixed(2)">
-              <template slot="append">L</template>
-            </el-input>
+            <div style="width: 217px">
+              <el-input v-model="ruleForm.incomeLitres.toFixed(2)">
+                <template slot="append">L</template>
+              </el-input>
+            </div>
+
           </el-form-item>
           <el-form-item label="赠送积分" prop="points">
-            <el-input v-model="ruleForm.points">
-              <template slot="append">分</template>
-            </el-input>
+            <div style="width: 217px">
+              <el-input v-model="ruleForm.points">
+                <template slot="append">分</template>
+              </el-input>
+            </div>
+
           </el-form-item>
           <el-form-item label="活动时间" prop="resource">
-            <el-radio-group v-model="ruleForm.activeTime">
-              <el-radio label="1">不限时间</el-radio>
-              <el-radio label="2">自定义时间</el-radio>
-            </el-radio-group>
+
+              <el-radio-group v-model="ruleForm.activeTime">
+                <el-radio label="1">不限时间</el-radio>
+                <el-radio label="2">自定义时间</el-radio>
+              </el-radio-group>
+
+
           </el-form-item>
 
           <el-form-item label="时间范围" v-if="ruleForm.activeTime == 2" prop="startTime">
             <div style="width: 100%;display: flex;align-items: center ">
-              <div style="width: 45%">
+              <div style="width: 217px">
                 <el-date-picker
                   v-model="ruleForm.startTime"
                   value-format="yyyy-MM-dd HH:mm:ss"
diff --git a/fuintCashierWeb/.env.development b/fuintCashierWeb/.env.development
index bcc4a0a9d..4b043ed28 100644
--- a/fuintCashierWeb/.env.development
+++ b/fuintCashierWeb/.env.development
@@ -11,4 +11,4 @@ VUE_APP_BASE_API = '/dev-api'
 VUE_APP_PUBLIC_PATH = '/'
 
 # 后端接口地址
-VUE_APP_SERVER_URL = 'http://192.168.0.196:8080/'
+VUE_APP_SERVER_URL = 'http://192.168.31.55:8081/'
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
index d7328994b..2b2e4535d 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
@@ -1746,7 +1746,7 @@ import {getLodop} from "@/api/LodopFuncs";
 
 <style scoped>
   .app-center{
-    width: 100%;
+    width: 90%;
     box-sizing: border-box;
     padding: 10px;
 
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
index 8c9d61b35..29efcd792 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
@@ -307,7 +307,7 @@
               <div>库存</div>
               <div>单价</div>
               <div v-if="isMember">会员价</div>
-              <div>数量</div>
+              <div style="width: 135px;text-align: center">数量</div>
               <div>操作</div>
             </div>
           </div>