Merge remote-tracking branch 'origin/master'

fuintAdmin/src/assets/styles/fonts.css

@@ -6,3 +6,8 @@
   font-family: 'Source Han Sans CN';
   src: url("../fonts/Source Han Sans CN Regular.otf");
 }
+
+@font-face {
+  font-family: 'AlimamaShuHeiTi';
+  src: url("../fonts/AlimamaShuHeiTi-Bold.ttf");
+}

fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue

@@ -34,7 +34,7 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
+
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"

fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue

@@ -34,7 +34,6 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"

fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue

@@ -34,7 +34,6 @@
         <el-col :span="1.5">
           <el-button
             type="primary"
-            plain
             icon="el-icon-plus"
             size="mini"
             @click="handleAdd"

fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue

@@ -29,17 +29,7 @@
 
         </el-form-item>
       </el-form>
-      <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
-          <el-button
-            type="primary"
-            plain
-            icon="el-icon-plus"
-            size="mini"
-            @click="addDatas"
-          >新增</el-button>
-        </el-col>
-      </el-row>
+
     </el-card>
 
     <el-dialog :title="title" :visible.sync="open" width="55%" append-to-body>
@@ -237,6 +227,16 @@
     </el-dialog>
 
     <el-card>
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            icon="el-icon-plus"
+            size="mini"
+            @click="addDatas"
+          >新增</el-button>
+        </el-col>
+      </el-row>
       <el-table v-loading="loading" :data="activeFullminusList"  @selection-change="handleSelectionChange">
         <el-table-column
           type="index"

fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue

@@ -27,19 +27,19 @@
 
         </el-form-item>
       </el-form>
+
+    </el-card>
+    <el-card>
       <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
           <el-button
             type="primary"
-            plain
             icon="el-icon-plus"
             size="mini"
             @click="addActivef"
           >新增</el-button>
         </el-col>
       </el-row>
-    </el-card>
-    <el-card>
       <el-table v-loading="loading" :data="zList"  @selection-change="handleSelectionChange">
         <el-table-column
           type="index"

fuintAdmin/src/views/EventMarketing/cardExchange/index.vue

@@ -40,7 +40,6 @@
         <el-col :span="1.5">
           <el-button
             type="primary"
-            plain
             icon="el-icon-plus"
             size="mini"
             @click="handleAdd"
@@ -50,7 +49,6 @@
         <el-col :span="1.5">
           <el-button
             type="success"
-            plain
             icon="el-icon-edit"
             size="mini"
             :disabled="single"

fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue

@@ -35,7 +35,6 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"

fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue

@@ -20,7 +20,6 @@
         <el-col :span="1.5">
           <el-button
             type="primary"
-            plain
             icon="el-icon-plus"
             size="mini"
             @click="handleAdd"

fuintAdmin/src/views/convenienceStore/damage/details.vue

@@ -6,20 +6,26 @@
         <!--        <el-link icon="el-icon-edit" :underline="false" @click="goToAbout">编辑</el-link>-->
         <span> 货损详情</span>
       </div>
-      <div style="height: 90px; display: flex; justify-content: space-between;">
-        <div style="height: 100%; width: 50%; display: flex; justify-content: space-between;">
-          <div style="height: 100%; width: 70%;  display: flex; justify-content: space-between;">
+      <div class="" style="height: 90px; display: flex; justify-content: space-between;">
+        <div style="height: 100%;  display: flex; justify-content: space-between;">
+          <div style="height: 100%; width: 70%;  display: flex; justify-content: space-between;font-family: YouSheBiaoTiHei">
             <div class="box">
-              <span>{{damageForm.totalAmount}}</span>
-              <span>报损总额</span>
+              <span style="font-size: 26px;color: #3B6ADE;font-weight: bold" >{{damageForm.totalAmount}}</span>
+              <span style="display: flex">
+                <div style="background-color: #0DC291;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
+                报损总额</span>
             </div>
             <div class="box">
-              <span>{{damageForm.productQuantity}}</span>
-              <span>商品数量</span>
+              <span style="font-size: 26px;color: #3B6ADE;font-weight: bold" >{{damageForm.productQuantity}}</span>
+              <span style="display: flex">
+                <div style="background-color: #3B6ADE;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
+                商品数量</span>
             </div>
             <div class="box">
-              <span>{{damageForm.damageQuantity}}</span>
-              <span>报损数量</span>
+              <span style="font-size: 26px;color: #FF4347;font-weight: bold">{{damageForm.damageQuantity}}</span>
+              <span style="display: flex">
+                <div style="background-color: #FF4347;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
+                报损数量</span>
             </div>
           </div>
           <div style="height: 100%; width: 30%; display: flex; flex-direction: column; justify-content: space-between;">
@@ -59,7 +65,7 @@
 
     <el-card style="margin-top: 20px" >
       <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
+        <el-col :span="1.5" style="text-align: right; float: right">
           <el-button
           v-if="!numberInput"
             type="primary"
@@ -701,14 +707,16 @@ export default {
 
 .box {
   height: 100%;
-  width: 50%;
+  width: 212px;
   margin-right: 10px;
-  background-color: rgba(204, 204, 204, 0.3);
+  background: #FFFFFF;
+  border-radius: 10px 10px 10px 10px;
+  border: 1px solid #EEEEEE;
   border-radius: 10px;
   display: flex;
   flex-direction: column;
   justify-content: center;
-  align-items: center;
-  text-align: center;
+  align-items: start;
+  padding-left: 20px;
 }
 </style>

fuintAdmin/src/views/convenienceStore/inventory/details.vue

@@ -6,44 +6,73 @@
         <!--        <el-link icon="el-icon-edit" :underline="false" @click="goToAbout">编辑</el-link>-->
         <span> 盘点详情</span>
       </div>
-      <div style="height: 90px; display: flex; justify-content: space-between;">
-        <div style="height: 100%; width: 40%; display: flex; justify-content: space-between;">
-          <div style="height: 100%; width: 60%;  display: flex; justify-content: space-between;">
+      <div class="" style="height: 110px; display: flex; justify-content: space-between;">
+        <div style="height: 100%;  display: flex; justify-content: space-between;">
+          <div style="height: 100%; width: 70%;  display: flex; justify-content: space-between;font-family: YouSheBiaoTiHei">
             <div class="box">
-              <span>{{inventoryForm.productQuantity}}</span>
-              <span>商品数量</span>
+              <span style="font-size: 26px;color: #3B6ADE;font-weight: bold" >{{inventoryForm.productQuantity}}</span>
+              <span style="display: flex">
+                <div style="background-color: #0DC291;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
+                商品数量</span>
             </div>
             <div class="box">
-              <span>{{inventoryForm.inventoryQuantity}}</span>
-              <span>盘点数量</span>
+              <span style="font-size: 26px;color: #FF4347;font-weight: bold">{{inventoryForm.inventoryQuantity}}</span>
+              <span style="display: flex">
+                <div style="background-color: #3b7cde;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
+                盘点数量</span>
             </div>
             <div class="box">
-              <span>{{inventoryForm.inventoryDiscrepancy}}</span>
-              <span>库存差异</span>
+              <span style="font-size: 26px;color: #3B6ADE;font-weight: bold" >{{inventoryForm.inventoryDiscrepancy}}</span>
+              <span style="display: flex">
+                <div style="background-color: #3B6ADE;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
+                库存差异</span>
             </div>
             <div class="box">
-              <span>{{inventoryForm.profitLossAmount}}</span>
-              <span>盈亏总额</span>
+              <span style="font-size: 26px;color: #FF4347;font-weight: bold">{{inventoryForm.profitLossAmount}}</span>
+              <span style="display: flex">
+                <div style="background-color: #FF4347;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
+                盈亏总额
+              </span>
             </div>
-          </div>
-            <table class="container1">
-            <tr>
-              <td>制单人</td>
-              <td style="width: 10px;"> </td>
-              <td style=""><span class="underlined-text" >{{inventoryForm.creataByName}}</span></td>
-            </tr>
-            <tr>
-              <td>制单时间</td>
-              <td> </td>
-              <td><span class="underlined-text">{{parseTime(inventoryForm.orderDate)}}</span></td>
-            </tr>
-            <tr>
-              <td>盘点编号</td>
-              <td> </td>
-              <td><span class="underlined-text">{{inventoryForm.orderNumber}}</span></td>
-            </tr>
-          </table>
+            </div>
+            <div style="height: 100%; width: 40%; display: flex; flex-direction: column; justify-content: space-between;">
+              <el-form ref="" label-width="100px">
+                <el-form-item label="制单人" style="margin-bottom: 1px">
+                  <el-input  size="mini" v-model="inventoryForm.creataByName" disabled="true"
+                             style="width: 220Px;margin-bottom: 1px;">
+                  </el-input>
+                </el-form-item>
+                <el-form-item label="制单时间" style="margin-bottom: 1px">
+                  <el-input size="mini" v-model="inventoryForm.orderDate" disabled="true"
+                             style="width: 220Px">
+                  </el-input>
+                </el-form-item>
+                <el-form-item label="盘点编号" style="margin-bottom: 1px">
+                  <el-input size="mini" v-model="inventoryForm.orderNumber" disabled="true"
+                             style="width: 220Px">
+                  </el-input>
+                </el-form-item>
 
+              </el-form>
+<!--            <table class="container1">-->
+<!--            <tr>-->
+<!--              <td>制单人</td>-->
+<!--              <td style="width: 10px;"> </td>-->
+<!--              <td style=""><span class="underlined-text" >{{inventoryForm.creataByName}}</span></td>-->
+<!--            </tr>-->
+<!--            <tr>-->
+<!--              <td>制单时间</td>-->
+<!--              <td> </td>-->
+<!--              <td><span class="underlined-text">{{parseTime(inventoryForm.orderDate)}}</span></td>-->
+<!--            </tr>-->
+<!--            <tr>-->
+<!--              <td>盘点编号</td>-->
+<!--              <td> </td>-->
+<!--              <td><span class="underlined-text">{{inventoryForm.orderNumber}}</span></td>-->
+<!--            </tr>-->
+<!--          </table>-->
+
+          </div>
         </div>
         <div style="height: 100%; width: 30%; display: flex; align-items: center; justify-content: flex-end;">
           <el-button type="primary" v-if="state=='await'" :disabled="saveFlag" @click="save()">保存</el-button>
@@ -60,7 +89,7 @@
 
     <el-card style="margin-top: 20px" >
       <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
+        <el-col :span="1.5" style="text-align: right; float: right">
           <el-button
           v-if="!numberInput"
             type="primary"
@@ -342,6 +371,10 @@ export default {
   },
 
   async created() {
+    if (this.inventoryForm.orderDate) {
+      this.inventoryForm.orderDate = parseTime(this.inventoryForm.orderDate)
+
+    }
     // this.inventoryForm.inventoryId = this.$props.PinventoryId
     // this.inventoryId = this.$props.PinventoryId
     // this.queryParams.inventoryId = this.$props.PinventoryId
@@ -374,6 +407,7 @@ export default {
     this.JudgmentButton();
   },
   methods: {
+    parseTime,
     getDetailsList() {
       let this_ = this
       getInventoryDetailsPageApi(this.queryParams).then(res=>{
@@ -744,18 +778,7 @@ export default {
   background: #f6f8f9;
 }
 
-.box {
-  height: 100%;
-  width: 50%;
-  margin-right: 10px;
-  background-color: rgba(204, 204, 204, 0.3);
-  border-radius: 10px;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  text-align: center;
-}
+
 
 /* .underlined-text {
   /* padding-bottom: 10px; /* 通过增加下边距来调整文本与下划线的间距 */
@@ -784,5 +807,18 @@ export default {
   /* text-decoration: underline; */
   /* vertical-align: middle;  */
 }
-
+.box {
+  height: 100%;
+  width: 212px;
+  margin-right: 10px;
+  background: #FFFFFF;
+  border-radius: 10px 10px 10px 10px;
+  border: 1px solid #EEEEEE;
+  border-radius: 10px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: start;
+  padding-left: 20px;
+}
 </style>

fuintAdmin/src/views/convenienceStore/purchase/details.vue

@@ -9,20 +9,26 @@
         </div>
 
       </div>
-      <div style="height: 90px; display: flex; justify-content: space-between;">
-        <div style="height: 100%; width: 50%; display: flex; justify-content: space-between;">
-          <div style="height: 100%; width: 70%;  display: flex; justify-content: space-between;">
+      <div class="" style="height: 90px; display: flex; justify-content: space-between;">
+        <div style="height: 100%;  display: flex; justify-content: space-between;">
+          <div style="height: 100%; width: 70%;  display: flex; justify-content: space-between;font-family: YouSheBiaoTiHei">
             <div class="box">
-              <span>{{purchaseForm.totalAmount}}</span>
-              <span>总金额</span>
+              <span style="font-size: 26px;color: #3B6ADE;font-weight: bold" >{{purchaseForm.totalAmount}}</span>
+              <span style="display: flex">
+                <div style="background-color: #0DC291;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
+                总金额</span>
             </div>
             <div class="box">
-              <span>{{purchaseForm.productQuantity}}</span>
-              <span>商品数量</span>
+              <span style="font-size: 26px;color: #3B6ADE;font-weight: bold" >{{purchaseForm.productQuantity}}</span>
+              <span style="display: flex">
+                <div style="background-color: #3B6ADE;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
+                商品数量</span>
             </div>
             <div class="box">
-              <span>{{purchaseForm.quantityPurchased}}</span>
-              <span>进货数量</span>
+              <span style="font-size: 26px;color: #FF4347;font-weight: bold">{{purchaseForm.quantityPurchased}}</span>
+              <span style="display: flex">
+                <div style="background-color: #FF4347;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
+                进货数量</span>
             </div>
           </div>
           <div style="height: 100%; width: 30%; display: flex; flex-direction: column; justify-content: space-between;">
@@ -60,7 +66,7 @@
 
     <el-card style="margin-top: 20px" >
       <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
+        <el-col :span="1.5" style="text-align: right; float: right">
           <el-button
           v-if="!numberInput"
             type="primary"
@@ -777,14 +783,16 @@ export default {
 
 .box {
   height: 100%;
-  width: 50%;
+  width: 212px;
   margin-right: 10px;
-  background-color: rgba(204, 204, 204, 0.3);
+  background: #FFFFFF;
+  border-radius: 10px 10px 10px 10px;
+  border: 1px solid #EEEEEE;
   border-radius: 10px;
   display: flex;
   flex-direction: column;
   justify-content: center;
-  align-items: center;
-  text-align: center;
+  align-items: start;
+  padding-left: 20px;
 }
 </style>

fuintAdmin/src/views/convenienceStore/returns/details.vue

@@ -6,20 +6,26 @@
         <!--        <el-link icon="el-icon-edit" :underline="false" @click="goToAbout">编辑</el-link>-->
         <span> 退货详情</span>
       </div>
-      <div style="height: 90px; display: flex; justify-content: space-between;">
-        <div style="height: 100%; width: 50%; display: flex; justify-content: space-between;">
-          <div style="height: 100%; width: 70%;  display: flex; justify-content: space-between;">
+      <div class="" style="height: 90px; display: flex; justify-content: space-between;">
+        <div style="height: 100%;  display: flex; justify-content: space-between;">
+          <div style="height: 100%; width: 70%;  display: flex; justify-content: space-between;font-family: YouSheBiaoTiHei">
             <div class="box">
-              <span>{{returnsForm.totalAmount}}</span>
-              <span>总金额</span>
+              <span style="font-size: 26px;color: #3B6ADE;font-weight: bold" >{{returnsForm.totalAmount}}</span>
+              <span style="display: flex">
+                <div style="background-color: #0DC291;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
+                总金额</span>
             </div>
             <div class="box">
-              <span>{{returnsForm.productQuantity}}</span>
-              <span>商品数量</span>
+              <span style="font-size: 26px;color: #3B6ADE;font-weight: bold" >{{returnsForm.productQuantity}}</span>
+              <span style="display: flex">
+                <div style="background-color: #3B6ADE;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
+                商品数量</span>
             </div>
             <div class="box">
-              <span>{{returnsForm.returnQuantity}}</span>
-              <span>退货数量</span>
+              <span style="font-size: 26px;color: #FF4347;font-weight: bold">{{returnsForm.returnQuantity}}</span>
+              <span style="display: flex">
+                <div style="background-color: #FF4347;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
+                退货数量</span>
             </div>
           </div>
           <div style="height: 100%; width: 30%; display: flex; flex-direction: column; justify-content: space-between;">
@@ -60,7 +66,7 @@
 
     <el-card style="margin-top: 20px" >
       <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
+        <el-col :span="1.5" style="text-align: right; float: right">
           <el-button
           v-if="!numberInput"
             type="primary"
@@ -736,14 +742,16 @@ export default {
 
 .box {
   height: 100%;
-  width: 50%;
+  width: 212px;
   margin-right: 10px;
-  background-color: rgba(204, 204, 204, 0.3);
+  background: #FFFFFF;
+  border-radius: 10px 10px 10px 10px;
+  border: 1px solid #EEEEEE;
   border-radius: 10px;
   display: flex;
   flex-direction: column;
   justify-content: center;
-  align-items: center;
-  text-align: center;
+  align-items: start;
+  padding-left: 20px;
 }
 </style>

fuintAdmin/src/views/oilConfig/oilPurchase/purchaseOrder.vue

@@ -6,20 +6,27 @@
         <i class="el-icon-back" @click="goToAbout">返回  |  </i>
         <span>  采购详情</span>
       </div>
-      <div style="height: 90px; display: flex; justify-content: space-between;">
-        <div style="height: 100%; width: 40%; display: flex; justify-content: space-between;">
-          <div style="height: 100%; width: 60%;  display: flex; justify-content: space-between;">
+      <div class="" style="height: 90px; display: flex; justify-content: space-between;">
+        <div style="height: 100%;  display: flex; justify-content: space-between;">
+          <div style="height: 100%; width: 70%;  display: flex; justify-content: space-between;font-family: YouSheBiaoTiHei">
             <div class="box">
-              <span>{{purchasedTonnage}}</span>
-              <span>采购吨数</span>
+              <span style="font-size: 26px;color: #3B6ADE;font-weight: bold" >{{purchasedTonnage}}</span>
+              <span style="display: flex">
+                <div style="background-color: #0DC291;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
+                采购吨数
+              </span>
             </div>
             <div class="box">
-              <span>{{purchaseLiters}}</span>
-              <span>采购升数</span>
+              <span style="font-size: 26px;color: #3B6ADE;font-weight: bold" >{{purchaseLiters}}</span>
+              <span style="display: flex">
+                <div style="background-color: #3B6ADE;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
+                采购升数</span>
             </div>
             <div class="box">
-              <span>{{totalAmountPurchased}}</span>
-              <span>采购总额</span>
+              <span style="font-size: 26px;color: #FF4347;font-weight: bold">{{totalAmountPurchased}}</span>
+              <span style="display: flex">
+                <div style="background-color: #FF4347;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
+                采购总额</span>
             </div>
           </div>
           <div style="height: 100%; width: 40%; display: flex; flex-direction: column; justify-content: space-between;">
@@ -57,7 +64,7 @@
 
     <el-card style="margin-top: 20px" >
       <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5" >
+        <el-col :span="1.5"  style="text-align: right; float: right">
           <el-button
           v-if="state =='await'"
             type="primary"
@@ -937,14 +944,18 @@ export default {
 
   .box {
     height: 100%;
-    width: 50%;
+    width: 212px;
     margin-right: 10px;
-    background-color: rgba(204, 204, 204, 0.3);
+    background: #FFFFFF;
+    border-radius: 10px 10px 10px 10px;
+    border: 1px solid #EEEEEE;
     border-radius: 10px;
     display: flex;
     flex-direction: column;
     justify-content: center;
-    align-items: center;
-    text-align: center;
+    align-items: start;
+    padding-left: 20px;
   }
+
+
 </style>

fuintAdmin_zt/src/assets/styles/element-ui.scss

@@ -117,3 +117,11 @@
     font-weight: bold;
   }
 }
+.el-switch.is-checked .el-switch__core{
+  background-color: #0DC291 !important;
+  border-color: #0DC291 !important;
+}
+.el-switch__core{
+  background-color: #FF4347 !important;
+  border-color: #FF4347 !important;
+}

fuintAdmin_zt/src/assets/styles/fonts.css

@@ -6,3 +6,8 @@
   font-family: 'Source Han Sans CN';
   src: url("../fonts/Source Han Sans CN Regular.otf");
 }
+
+@font-face {
+  font-family: 'AlimamaShuHeiTi';
+  src: url("../fonts/AlimamaShuHeiTi-Bold.ttf");
+}

fuintAdmin_zt/src/views/Site/index.vue

@@ -69,22 +69,29 @@
               <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-              </el-form-item>
-            </el-form>
-
-            <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5">
                 <el-button
-                  type="primary"
+                  type="warning"
                   plain
-                  icon="el-icon-plus"
                   size="mini"
                   @click="handleAdd"
 
-                >新增
+                >新增用户
                 </el-button>
-              </el-col>
-            </el-row>
+              </el-form-item>
+            </el-form>
+
+<!--            <el-row :gutter="10" class="mb8">-->
+<!--              <el-col :span="1.5">-->
+<!--                <el-button-->
+<!--                  type="warning"-->
+<!--                  plain-->
+<!--                  size="mini"-->
+<!--                  @click="handleAdd"-->
+
+<!--                >新增用户-->
+<!--                </el-button>-->
+<!--              </el-col>-->
+<!--            </el-row>-->
   <!--        </el-card>-->
   <!--        <el-card >-->
                 <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
@@ -1871,7 +1878,7 @@ export default {
       handleStatusChange(row) {
         let text = row.status === "0" ? "启用" : "停用";
         this.$modal.confirm('确认要"' + text + '""' + row.realName + '"用户吗？').then(function () {
-          return changeUserStatus(row.userId, row.status);
+          return updateUser(row);
         }).then(() => {
           this.$modal.msgSuccess(text + "成功");
         }).catch(function () {

fuintCashierWeb/src/assets/styles/fonts.css

@@ -6,3 +6,8 @@
   font-family: 'Source Han Sans CN';
   src: url("../fonts/Source Han Sans CN Regular.otf");
 }
+
+@font-face {
+  font-family: 'AlimamaShuHeiTi';
+  src: url("../fonts/AlimamaShuHeiTi-Bold.ttf");
+}