feat: 订单确认页添加总克重显示、添加支付前确认弹窗

pages/order_pay_status/index.vue

@@ -125,7 +125,7 @@ function getOrderPayInfo() {
 
 function goMallIndex() {
   console.log("mallType", order_pay_info.value.mallType);
-  uni.navigateTo({
+  uni.switchTab({
     url: "/pages/index/index",
   });
 }

pages/users/order_confirm/index.vue

@@ -132,8 +132,8 @@
                   <view class="lable">余料支付</view>
                   <view class="value">
                     可用余料:
-                    {{ metalTypeMap[metalType].name }}
-                    :{{ metalTypeMap[metalType].balance || 0 }}g
+                    {{ metalTypeMap[metalType]?.name }}
+                    :{{ metalTypeMap[metalType]?.balance || 0 }}g
                   </view>
                 </view>
               </view>
@@ -181,6 +181,13 @@
               贝币: {{ Number(orderInfoVo.proTotalFee) || 0 }}
             </view>
           </view>
+		  <view
+		      class="item acea-row row-between-wrapper"
+		      v-if="orderInfoVo?.proTotalWeight && orderInfoVo?.proTotalWeight>0"
+		  >
+		    <view>总克重：</view>
+		    <view class="money">{{orderInfoVo.proTotalWeight}} g</view>
+		  </view>
           <view
               class="item acea-row row-between-wrapper"
               v-if="orderInfoVo.couponFee > 0"
@@ -1070,11 +1077,23 @@ const SubOrder = async (e) => {
     showModal.value = true;
     return;
   }
-  uni.showLoading({
-    title: "订单支付中",
-  });
-  // 发起支付
-  payment(data);
+  uni.showModal({
+  	title: "提示",
+	content: "确认支付吗",
+	success: res=>{
+		console.log(res);
+		if(res.confirm){
+			uni.showLoading({
+			  title: "订单支付中",
+			});
+			// 发起支付
+			payment(data);
+		}else{
+			return
+		}
+	},
+  })
+  
 };
 </script>