Merge branch 'dev' into test

src/components/Pay.vue

@@ -111,9 +111,9 @@ const goPay = async (type: number) => {
       OrderType: prop.OrderType,
       PayType: type,
     });
-    if (data.data) {
     // 1微信支付 2积分支付
     if (type === 1) {
+      if (data.data) {
         Taro.requestPayment({
           timeStamp: data.data.timeStamp,
           nonceStr: data.data.nonceStr,
@@ -137,6 +137,13 @@ const goPay = async (type: number) => {
             emit("closePay", false);
           },
         });
+      } else {
+        Taro.showToast({
+          title: "未知异常",
+          icon: "none",
+        });
+        emit("closePay", false);
+      }
     } else {
       Taro.showToast({
         title: "支付成功",
@@ -145,19 +152,12 @@ const goPay = async (type: number) => {
       });
       emit("successPay", false);
     }
-    } else {
-      Taro.showToast({
-        title: "未知异常",
-        icon: "none",
-      });
-      emit("closePay", false);
-    }
   } catch (e) {
     Taro.showToast({
       title: e.msg,
       icon: "none",
     });
-    // emit("closePay", false);
+    emit("closePay", false);
     throw e;
   }
 };

src/pages/users/order_list/index.vue

@@ -147,7 +147,8 @@ const countInfo = ref<{
   C?: number;
   D?: number;
   F?: number;
-  Total?: number;
+  ExchangeTotal?: number;
+  PriceTotal?: number;
 }>({});
 
 const getTj = async () => {
@@ -176,7 +177,10 @@ const getTj = async () => {
       <view>
         <view style="font-weight: bold">订单信息</view>
         <view style="font-size: 15px"
-          >总消费积分：{{ countInfo.Total || 0 }}
+          >总消费积分：{{ countInfo.ExchangeTotal || 0 }}
+        </view>
+        <view style="font-size: 15px"
+          >总消费金额：{{ countInfo.PriceTotal || 0 }}
         </view>
       </view>
       <image src="../static/user/order_list_top.png" />