冲突

pageC/myPackage/component/packageCard.vue

@@ -131,7 +131,7 @@ export default {
   methods: {
     toPayment() {
       uni.navigateTo({
-        url: `/pageD/paymentOrder/paymentOrder?money=${this.itemInfo.gap_price}&weight=${this.itemInfo.actual_weight}&packageType=${this.itemInfo.goods[0].type_text}&num=${this.itemInfo.goods[0].number}&orderid=${this.itemInfo.id}&type=${this.itemInfo.type}`,
+        url: `/pageD/paymentOrder/paymentOrder?money=${this.itemInfo.pay_amount}&weight=${this.itemInfo.actual_weight}&packageType=${this.itemInfo.goods[0].type_text}&num=${this.itemInfo.goods[0].number}&orderid=${this.itemInfo.id}&type=${this.itemInfo.type}`,
       });
     },
     toSending() {

pageD/faceIdentify/faceIdentify.vue

@@ -0,0 +1,13 @@
+<template>
+  <view> </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {};
+  },
+};
+</script>
+
+<style lang="scss"></style>

pageD/orderInformation/orderInformation.vue

@@ -378,7 +378,7 @@ export default {
     //去支付
     toPay() {
       uni.navigateTo({
-        url: `/pageD/paymentOrder/paymentOrder?money=${this.orderInformation.gap_price}&weight=${this.orderInformation.goods[0].actual_weight}&packageType=${this.orderInformation.goods[0].type_text}&num=${this.orderInformation.goods[0].number}&orderid=${this.orderInformation.id}&type=${this.orderInformation.type}`,
+        url: `/pageD/paymentOrder/paymentOrder?money=${this.orderInformation.pay_amount}&weight=${this.orderInformation.goods[0].actual_weight}&packageType=${this.orderInformation.goods[0].type_text}&num=${this.orderInformation.goods[0].number}&orderid=${this.orderInformation.id}&type=${this.orderInformation.type}`,
       });
     },
     getDetail() {

pageD/settleIn/settleIn.vue

@@ -113,6 +113,10 @@ export default {
       console.log(e);
     },
     submit() {
+      // uni.navigateTo({
+      //   url: "/pageD/faceIdentify/faceIdentify",
+      // });
+      // return;
       delete this.model1.code;
       if (!this.model1.name) {
         uni.showToast({
@@ -140,7 +144,6 @@ export default {
         return;
       }
       uni.$u.http.post("/api/merchant/apply", this.model1).then((res) => {
-        console.log(res);
         uni.showToast({
           title: "申请成功，请等待审核结果",
         });

pages.json

@@ -676,6 +676,13 @@
 					{
 						"navigationBarTitleText" : ""
 					}
+				},
+				{
+					"path" : "faceIdentify/faceIdentify",
+					"style" : 
+					{
+						"navigationBarTitleText" : ""
+					}
 				}
 
 			]