Ver Fonte

fix:“修复订单统计存在误差问题”

soobin há 1 ano atrás
pai
commit
d2ff4732d0

+ 2 - 2
src/views/home/index.vue

@@ -44,7 +44,7 @@
                   <!-- 首页 - 订单数据 - 收入总额¥ -->
                   <!-- <span class="word8">&yen;</span> -->
                   <span class="word8">{{ currencySymbol }}</span>
-                  <span class="word9">{{ salesVolume }}</span>
+                  <span class="word9">{{ salesVolume.toFixed(0) }}</span>
                 </div>
                 <span class="info5">{{ $t("home.totalIncome") }}</span>
               </div>
@@ -242,7 +242,7 @@ export default {
           salesNumber.value = parseInt(salesNumber.value + item);
         });
         data.data.series[1].data.forEach((item) => {
-          salesVolume.value = parseInt(salesVolume.value + item);
+          salesVolume.value = parseFloat(salesVolume.value) + parseFloat(item);
         });
         data.data.series[2].data.forEach((item) => {
           orderNumber.value = parseInt(orderNumber.value + item);

+ 14 - 6
src/views/merchantManage/set.vue

@@ -113,7 +113,8 @@
 
             <div class="block5 flex-row justify-between">
               <span class="txt6">{{ $t('merchantManage.accountType') }}
-                :{{ adminMchObj.bankAccountType === 1 ? $t('merchantManage.debitCard') : (adminMchObj.bankAccountType === 4
+                :{{ adminMchObj.bankAccountType === 1 ? $t('merchantManage.debitCard') : (adminMchObj.bankAccountType ===
+                  4
                   ? $t('merchantManage.corporateAccount') : "") }}</span>
               <!-- <span class="word9"></span> -->
             </div>
@@ -124,7 +125,8 @@
             <div v-if="adminType < 2">
               <span class="word12">{{ $t('merchantManage.joinpayMch') }}:{{ adminMchObj.signStatus == '签约成功' ?
                 adminMchObj.signStatus : '未签约' }}</span>
-              <span class="word12">{{ $t('merchantManage.huifuMch') }}:{{ huifuMchObj != null && huifuMchObj.status == '2' ? '签约成功' : '未签约' }}</span>
+              <span class="word12">{{ $t('merchantManage.huifuMch') }}:{{ huifuMchObj != null && huifuMchObj.status == '2'
+                ? '签约成功' : '未签约' }}</span>
             </div>
           </div>
         </div>
@@ -178,21 +180,27 @@ export default {
           adminObj.value.promoCodeOpen = '1';
         }
         ifForeign.value = data.data.ifForeign;
-      } 
+      }
       // else { showFailToast(data.message); }
       // console.log('getAdminFun', data);
     };
     const getAdminMchFun = async () => {
       const { data } = await getAdminMch({ id: merchantId.value });
-      if (data.code === "00000") { 
-        adminMchObj.value = data.data; 
+      if (data.code === "00000") {
+        if (data.data != null) {
+          adminMchObj.value = data.data;
+        }
       }
       // console.log('getAdminMchFun', data);
       // console.log('adminMchObj', adminMchObj.value.signStatus);
     }
     const getHuifuMchFun = async () => {
       const { data } = await getHuifuMch({ adminId: merchantId.value });
-      if (data.code === "00000") { huifuMchObj.value = data.data; }
+      if (data.code === "00000") {
+        if (data.data != null) {
+          huifuMchObj.value = data.data;
+        }
+      }
       // console.log('getHuifuMchFun', data);
     }
     const onSubmit = async () => {

+ 2 - 2
src/views/orderCenter/index.vue

@@ -39,7 +39,7 @@
                     <!-- 订单中心 - 收入总额¥ -->
                     <!-- <span class="word8">&yen;</span> -->
                     <span class="word8">{{ currencySymbol }}</span>
-                    <span class="word9">{{ salesVolume }}</span>
+                    <span class="word9">{{ salesVolume.toFixed(0) }}</span>
                   </div>
                   <span class="info5">{{ $t("home.totalIncome") }}</span>
                 </div>
@@ -799,7 +799,7 @@ export default {
           salesNumber.value = parseInt(salesNumber.value + item);
         });
         data.data.series[1].data.forEach((item) => {
-          salesVolume.value = parseInt(salesVolume.value + item);
+          salesVolume.value = parseFloat(salesVolume.value) + parseFloat(item);
         });
         data.data.series[2].data.forEach((item) => {
           orderNumber.value = parseInt(orderNumber.value + item);