lex 2 years ago
parent
commit
949d697187

+ 4 - 0
src/components/MPayment.vue

@@ -159,6 +159,10 @@ export default {
     },
     payment(val) {
       // 监听数据
+      let tempUrl = val.payMap.returnUrl; // 替换连接参数
+      if (tempUrl) {
+        val.payMap.returnUrl = tempUrl.replace(/&/gi, "^^");
+      }
       this.paymentObject = val;
     },
   },

+ 1 - 1
src/views/shopMall/GoodsOrder.vue

@@ -184,7 +184,7 @@
 <script>
 /* eslint-disable */
 import { queryStudentGoodsOrders, addGoodsSellOrder } from "../service/api";
-import MHeader from "@/components/MHeader";
+import MHeader from "@/components/header";
 import MEmpty from "@/components/MEmpty";
 import MPayment from "@/components/MPayment";
 import Search from "@/components/Search";

+ 1 - 2
src/views/shopMall/GoodsOrderDetail.vue

@@ -191,8 +191,7 @@
 
 <script>
 /* eslint-disable */
-import { browser } from "@/common/util";
-import MHeader from "@/components/MHeader";
+import MHeader from "@/components/header";
 import MEmpty from "@/components/MEmpty";
 import setLoading from "@/common/loading";
 import { goodsGet } from "./api";

+ 3 - 3
src/views/shopMall/GoodsSale.vue

@@ -263,7 +263,7 @@
 <script>
 import GoodsList from "./model/goodsList";
 import AddAddress from "./model/addAddress";
-import MHeader from "@/components/MHeader";
+import MHeader from "@/components/header";
 import MPayment from "@/components/MPayment";
 import Protocol from "@/components/Protocol";
 import MRefund from "@/components/MRefund";
@@ -343,7 +343,7 @@ export default {
       groupPrice: 0,
       obj: null,
       showPicker: false,
-      columns: ["教务代买", "创建订单"],
+      columns: ["老师代买", "创建订单"],
       orderType: null,
       orderText: null,
     };
@@ -1032,4 +1032,4 @@ export default {
     height: 0.2rem;
   }
 }
-</style>
+</style>