Merge branch 'v1.0.0' into v1.0.0_saas

# Conflicts:
#	src/utils/http.ts

src/PagesStatistics/businessOverview.vue

@@ -22,7 +22,7 @@
           <view v-for="(item, index) in gridList1" :key="index">
             <text v-if="item.name">{{ item.name }}：</text
             ><text v-if="item.name"
-              >{{ item.isBefore ? item.unit : "" }} {{ formatMoney(item.num) }}
+              >{{ item.isBefore ? item.unit : "" }} {{ formatMoney(item.num, 2) }}
               {{ item.isBefore ? "" : item.unit }}
             </text>
           </view>
@@ -33,7 +33,7 @@
             <text v-if="item.name">{{ item.name }}：</text
             >
             <text :class="{'highLight': item.isHighLight || false}"  v-if="item.name"
-              >{{ item.isBefore ? item.unit : "" }} {{ formatMoney(item.num) }}
+              >{{ item.isBefore ? item.unit : "" }} {{ formatMoney(item.num, item.decimal) }}
               {{ item.isBefore ? "" : item.unit }}
             </text>
           </view>
@@ -43,7 +43,7 @@
           <view v-for="(item, index) in gridList3" :key="index">
             <text>{{ item.name }}：</text
             ><text :class="item.isHighLight ? 'highLight' : ''"
-              >{{ item.isBefore ? item.unit : "" }} {{ formatMoney(item.num) }}
+              >{{ item.isBefore ? item.unit : "" }} {{ formatMoney(item.num, item.decimal)}}
               {{ item.isBefore ? "" : item.unit }}
             </text>
           </view>
@@ -177,6 +177,7 @@ const gridList2 = reactive([
     unit: "￥",
     isBefore: true,
     isHighLight: true,
+    decimal: 2,
   },
   {
     name: "出货应收金额",
@@ -185,12 +186,15 @@ const gridList2 = reactive([
     unit: "￥",
     isBefore: true,
     isHighLight: true,
+    decimal: 2,
   },
   {
     name: "出货笔数",
     enName: "orderOutNum",
-    num: "2",
+    num: "",
     isHighLight: true,
+    decimal: 0,
+
   },
   {
     name: "",
@@ -202,6 +206,7 @@ const gridList2 = reactive([
     num: "",
     unit: "KG",
     isBefore: false,
+    decimal: 2,
   },
   {
     name: "出货净重（客户）",
@@ -209,6 +214,7 @@ const gridList2 = reactive([
     num: "",
     unit: "KG",
     isBefore: false,
+    decimal: 2,
   },
   {
     name: "出货重量(已结)",
@@ -216,6 +222,7 @@ const gridList2 = reactive([
     num: "",
     unit: "KG",
     isBefore: false,
+    decimal: 2,
   },
   {
     name: "结算总重量",
@@ -223,6 +230,7 @@ const gridList2 = reactive([
     num: "",
     unit: "KG",
     isBefore: false,
+    decimal: 2,
   },
   {
     name: "出货重量(未结)",
@@ -230,6 +238,7 @@ const gridList2 = reactive([
     num: "",
     unit: "KG",
     isBefore: false,
+    decimal: 2,
   },
   {
     name: "结算重量(已结)",
@@ -237,6 +246,7 @@ const gridList2 = reactive([
     num: "",
     unit: "KG",
     isBefore: false,
+    decimal: 2,
   },
   {
     name: "净重误差",
@@ -244,6 +254,7 @@ const gridList2 = reactive([
     num: "",
     unit: "KG",
     isBefore: false,
+    decimal: 2,
   },
   {
     name: "结算总量(未结)",
@@ -251,6 +262,7 @@ const gridList2 = reactive([
     num: "",
     unit: "KG",
     isBefore: false,
+    decimal: 2,
   },
 ]);
 const gridList3 = reactive([
@@ -261,6 +273,7 @@ const gridList3 = reactive([
     unit: "KG",
     isBefore: false,
     isHighLight: true,
+    decimal: 2,
   },
   {
     name: "收货笔数",
@@ -269,6 +282,7 @@ const gridList3 = reactive([
     unit: "",
     isBefore: false,
     isHighLight: true,
+    decimal: 0,
   },
   {
     name: "收货重量(已付)",
@@ -276,6 +290,7 @@ const gridList3 = reactive([
     num: "",
     unit: "KG",
     isBefore: false,
+    decimal: 2,
   },
   {
     name: "收货实付金额",
@@ -283,6 +298,7 @@ const gridList3 = reactive([
     num: "",
     unit: "￥",
     isBefore: true,
+    decimal: 2,
   },
   {
     name: "收货重量(未付)",
@@ -290,6 +306,7 @@ const gridList3 = reactive([
     num: "",
     unit: "KG",
     isBefore: false,
+    decimal: 2,
   },
   {
     name: "收货应付金额",
@@ -297,6 +314,7 @@ const gridList3 = reactive([
     num: "",
     unit: "￥",
     isBefore: true,
+    decimal: 2,
   },
 ]);
 

src/pagesApp/customerMgt.vue

@@ -102,6 +102,7 @@ const handleSearch = () => {
 const deleteCustomer = (item: any) => {
   CustomerApi.updateCustomUser({ isDeleted: true, id: item.id }).then((res) => {
     if (res.code === 200) {
+      resetPageList();
       getList();
     }
   });

src/pagesApp/shipmentType.vue

@@ -119,6 +119,7 @@ const edit = (item: any) => {
 const deleteType = (item: any) => {
   GoodsApi.deleteById({ id: item.id }).then((res) => {
     if (res.code === 200) {
+      resetPageList();
       getList();
     }
   });

src/utils/http.ts

@@ -154,10 +154,7 @@ export const http = <T>(options: UniApp.RequestOptions) => {
           console.log(res1);
           if (res.statusCode >= 200 && res.statusCode < 300) {
             if (
-              res1.code === 1001 ||
-              res1.code === 1002 ||
-              res1.code === 1003 ||
-              res1.code === 1004
+              [1001,1002,1003,1004].indexOf(res1.code) > -1
             ) {
               uni.showToast({
                 icon: "none",
@@ -168,22 +165,12 @@ export const http = <T>(options: UniApp.RequestOptions) => {
                 url: "/pagesLogin/login/index",
               });
               return;
-            } else if ((res1 as any).code === 10001) {
+            } else if ([500,5001,10001].indexOf(res1.code) > -1) {
               uni.showToast({
                 icon: "none",
                 title: (res1 as Data<T>).message || "请求失败",
               });
               return;
-            } else if ((res1 as any).code === 5001) {
-              uni.showToast({
-                icon: "none",
-                title: (res1 as Data<T>).message || "请求失败",
-              });
-            } else if (res1.code === 500) {
-              uni.showToast({
-                icon: "none",
-                title: (res1 as Data<T>).message || "请求失败",
-              });
             }
             resolve(res1 as Data<T>);
           } else {