achao 3 سال پیش
والد
کامیت
c909f0813f

+ 2 - 2
unimall-admin/config/dep.env.js

@@ -1,6 +1,6 @@
 module.exports = {
     NODE_ENV: '"production"',
     ENV_CONFIG: '"dep"',
-    HOST: '"http://192.168.110.82:8091"',
-    BASE_API: '"http://192.168.110.82:8091/m.api"'
+    HOST: '"http://192.168.110.82:8089"',
+    BASE_API: '"http://192.168.110.82:8089/m.api"'
 }

+ 2 - 2
unimall-admin/config/dev.env.js

@@ -2,8 +2,8 @@ module.exports = {
     NODE_ENV: '"development"',
     ENV_CONFIG: '"dev"',
 
-    HOST: '"http://192.168.110.82:8091"',
-    BASE_API: '"http://192.168.110.82:8091/m.api"'
+    HOST: '"http://192.168.110.82:8089"',
+    BASE_API: '"http://192.168.110.82:8089/m.api"'
         // HOST: '"http://192.168.1.115:8080"',
         // BASE_API: '"http://192.168.1.115:8080/m.api"'
         // HOST: '"http://192.168.1.113:8080"',

+ 4 - 1
unimall-admin/src/views/collectionPayment/collectionPayment.vue

@@ -520,7 +520,10 @@ export default {
           // sums[index] = "--";
         }
       })
-
+      if (sums.length>0) {
+        sums[5] = Number(sums[5]).toFixed(2)
+        sums[6] = Number(sums[6]).toFixed(2)
+      }
       return sums
     },
     getList() {

+ 3 - 1
unimall-admin/src/views/customerBilling/customerBillingInfo.vue

@@ -198,6 +198,9 @@
 </template>
 
 <script>
+import {
+  dayjs
+} from 'base-core-lib'
 import {
   importWord,
   listCustomerBillingInfo,
@@ -452,7 +455,6 @@ export default {
           // sums[index] = "--";
         }
       })
-      debugger
       if (sums.length>0) {
         sums[6] = Number(sums[6]).toFixed(2)
       }

+ 12 - 12
unimall-admin/src/views/dashboard/index.vue

@@ -9,13 +9,13 @@
           <div class="number">
             <div>欧元</div>
             <div>
-              {{ Number(tjList1.deductionEurotj).toString() }}
+              {{ Number(tjList1.deductionEurotj).toFixed(2) }}
             </div>
           </div>
           <div class="number">
             <div>人民币</div>
             <div>
-              {{ Number(tjList1.deductionRmbtj).toString() }}
+              {{ Number(tjList1.deductionRmbtj).toFixed(2) }}
             </div>
           </div>
         </div>
@@ -24,13 +24,13 @@
           <div class="number">
             <div>欧元</div>
             <div>
-              {{ Number(tjList2.deductionEurotj).toString() }}
+              {{ Number(tjList2.deductionEurotj).toFixed(2) }}
             </div>
           </div>
           <div class="number">
             <div>人民币</div>
             <div>
-              {{ Number(tjList2.deductionRmbtj).toString() }}
+              {{ Number(tjList2.deductionRmbtj).toFixed(2) }}
             </div>
           </div>
         </div>
@@ -39,13 +39,13 @@
           <div class="number">
             <div>欧元</div>
             <div>
-              {{ Number(tjList3.deductionEurotj).toString() }}
+              {{ Number(tjList3.deductionEurotj).toFixed(2) }}
             </div>
           </div>
           <div class="number">
             <div>人民币</div>
             <div>
-              {{ Number(tjList2.deductionRmbtj).toString() }}
+              {{ Number(tjList2.deductionRmbtj).toFixed(2) }}
             </div>
           </div>
         </div>
@@ -74,13 +74,13 @@
             <div class="number">
               <div>欧元</div>
               <div>
-                {{ Number(tjList11.deductionEurotj).toString() }}
+                {{ Number(tjList11.deductionEurotj).toFixed(2) }}
               </div>
             </div>
             <div class="number">
               <div>人民币</div>
               <div>
-                {{ Number(tjList11.deductionRmbtj).toString() }}
+                {{ Number(tjList11.deductionRmbtj).toFixed(2) }}
               </div>
             </div>
           </div>
@@ -89,13 +89,13 @@
             <div class="number">
               <div>欧元</div>
               <div>
-                {{ Number(tjList22.deductionEurotj).toString() }}
+                {{ Number(tjList22.deductionEurotj).toFixed(2) }}
               </div>
             </div>
             <div class="number">
               <div>人民币</div>
               <div>
-                {{ Number(tjList22.deductionRmbtj).toString() }}
+                {{ Number(tjList22.deductionRmbtj).toFixed(2) }}
               </div>
             </div>
           </div>
@@ -104,13 +104,13 @@
             <div class="number">
               <div>欧元</div>
               <div>
-                {{ Number(tjList33.deductionEurotj).toString() }}
+                {{ Number(tjList33.deductionEurotj).toFixed(2) }}
               </div>
             </div>
             <div class="number">
               <div>人民币</div>
               <div>
-                {{ Number(tjList33.deductionRmbtj).toString() }}
+                {{ Number(tjList33.deductionRmbtj).toFixed(2) }}
               </div>
             </div>
           </div>