更改销售量为商品数，修正订单数的显示

src/assets/language/en.json

@@ -531,7 +531,7 @@
     "dataOverview": "dataOverview",
     "orderData": "orderData",
     "totalIncome": "totalIncome",
-    "salesVolume": "salesVolume",
+    "productNum": "numberOfProducts",
     "numberOfOrders": "numberOfOrders",
     "commonTools": "commonTools",
     "deviceManagement": "deviceManagement",
@@ -701,7 +701,7 @@
     "dataOverview": "Data overview",
     "search": "search",
     "totalIncome": "Total income",
-    "salesVolume": "sales volume",
+    "productNum": "Number of products",
     "numberOfOrders": "Number of orders",
     "orderDetails": "order details",
     "exportToExcel": "Export to Excel",

src/assets/language/zh.json

@@ -531,7 +531,7 @@
     "dataOverview": "数据概览",
     "orderData": "订单数据",
     "totalIncome": "收入总额",
-    "salesVolume": "销售量",
+    "productNum": "商品数",
     "numberOfOrders": "订单数",
     "commonTools": "常用工具",
     "deviceManagement": "设备管理",
@@ -701,7 +701,7 @@
     "dataOverview": "数据概览",
     "search": "搜索",
     "totalIncome": "收入总额",
-    "salesVolume": "销售量",
+    "productNum": "商品数",
     "numberOfOrders": "订单数",
     "orderDetails": "订单明细",
     "exportToExcel": "导出excel",

src/views/forgetPassword.vue

@@ -32,7 +32,7 @@
             :rules="[{ required: true, message: $t('forgetPassword.phoneRequired') }]"
           >
             <template #button>
-              <van-button size="small" type="primary" @click="seedVerCode()" :disabled="time !== 0" style="color: black;">{{time === 0 ? $t('forgetPassword.seedVerCode') : time + '秒后可重发'}}</van-button>
+              <van-button size="small" type="primary" @click="seedVerCode()" :disabled="time !== 0">{{time === 0 ? $t('forgetPassword.seedVerCode') : time + '秒后可重发'}}</van-button>
             </template>
           </van-field>
         </div>
@@ -158,6 +158,7 @@ export default {
         margin-top: 20px;
         overflow: visible;
         &::after { display: none;}
+		.van-field__button button { background-color: #4d6add; color: #fff; }
         .van-field__control {
           height: 38px;
           line-height: 38px;

src/views/home/index.vue

@@ -64,12 +64,12 @@
               <div class="TextGroup7 flex-col">
                 <div class="mod3 flex-col justify-between">
                   <span class="txt8">{{ salesNumber }}</span>
-                  <span class="info6">{{ $t("home.salesVolume") }}</span>
+                  <span class="info6">{{ $t("home.productNum") }}</span>
                 </div>
               </div>
               <div class="TextGroup8 flex-col">
                 <div class="outer6 flex-col justify-between">
-                  <span class="txt9">{{ salesNumber }}</span>
+                  <span class="txt9">{{ orderNumber }}</span>
                   <span class="word10">{{ $t("home.numberOfOrders") }}</span>
                 </div>
               </div>
@@ -223,6 +223,7 @@ export default {
     };
     const salesVolume = ref(0);
     const salesNumber = ref(0);
+	const orderNumber = ref(0);
     // 查询图表
     const getStatisticsFun = async () => {
       const params = {
@@ -240,12 +241,16 @@ export default {
       if (data.code && data.data) {
         salesVolume.value = 0;
         salesNumber.value = 0;
+		orderNumber.value = 0;
         data.data.series[0].data.forEach((item) => {
           salesNumber.value = parseInt(salesNumber.value + item);
         });
         data.data.series[1].data.forEach((item) => {
           salesVolume.value = parseInt(salesVolume.value + item);
         });
+		data.data.series[2].data.forEach((item) => {
+		  orderNumber.value = parseInt(orderNumber.value + item);
+		});
         // 解决eacharts与v-if的渲染问题
         await nextTick();
         if (chartBox.value) {
@@ -494,6 +499,7 @@ export default {
       pushToolPage,
       salesVolume,
       salesNumber,
+	  orderNumber,
       sys,
       noticeClk,
       confirmClk,

src/views/orderCenter/index.vue

@@ -29,7 +29,7 @@
         </div>
         <dateSelectList @update="update($event)"></dateSelectList>
         <typeSelectList @upselectdata="upselectdata($event)"></typeSelectList>
-        <div v-if="!noData(salesVolume, salesNumber)" class="o-plr-8">
+        <div v-if="!noData(salesVolume, salesNumber, orderNumber)" class="o-plr-8">
           <div class="outer5 flex-col">
           <div class="block5 flex-col">
             <div class="outerBox flex-row">
@@ -43,12 +43,12 @@
               <div class="TextGroup7 flex-col">
                 <div class="mod3 flex-col justify-between">
                   <span class="txt8">{{ salesNumber }}</span>
-                  <span class="info6">{{ $t("home.salesVolume") }}</span>
+                  <span class="info6">{{ $t("home.productNum") }}</span>
                 </div>
               </div>
               <div class="TextGroup8 flex-col">
                 <div class="outer6 flex-col justify-between">
-                  <span class="txt9">{{ salesNumber }}</span>
+                  <span class="txt9">{{ orderNumber }}</span>
                   <span class="word10">{{ $t("home.numberOfOrders") }}</span>
                 </div>
               </div>
@@ -545,6 +545,7 @@ export default {
     };
     const salesVolume = ref(0);
     const salesNumber = ref(0);
+	const orderNumber = ref(0);
     // 查询图表
     const getStatisticsFun = async () => {
       console.log('searchParams',searchParams)
@@ -566,12 +567,16 @@ export default {
       if (data.code && data.data) {
         salesVolume.value = 0;
         salesNumber.value = 0;
+		orderNumber.value = 0;
         data.data.series[0].data.forEach((item) => {
           salesNumber.value = parseInt(salesNumber.value + item);
         });
         data.data.series[1].data.forEach((item) => {
           salesVolume.value = parseInt(salesVolume.value + item);
         });
+		data.data.series[2].data.forEach((item) => {
+		  orderNumber.value = parseInt(orderNumber.value + item);
+		});
       }
     };
     return {
@@ -598,6 +603,7 @@ export default {
       showPayType,
       salesVolume,
       salesNumber,
+	  orderNumber,
       noData,
       kDialogRef,
       noticeClk,