测试支付功能

pages/authorization/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
-		<view v-if="!token">
-			<view v-if="$deviceType == 'weixin'">
+		<view v-if="!token">
+			<view v-if="$deviceType == 'routine'">
 				<view class="getUserInfo">
 					<text>您还未允许微信登录授权，请点击下方按钮允许微信授权登录。</text>
 					<button type="primary" open-type="getUserInfo" @getuserinfo="getUserInfo">允许微信登录授权</button>
@@ -30,7 +30,7 @@ import { login } from '@/utils';
 
 export default {
 	data() {
-		return {
+		return {
 		};
 	},
 	computed: {
@@ -80,7 +80,7 @@ export default {
 		}
 	},
 	onUnload() {},
-	mounted() {
+	mounted() {
 	}
 };
 </script>
@@ -206,4 +206,4 @@ export default {
 ._van-dialog {
 	z-index: 99999999999;
 }
-</style>
+</style>

pages/order/OrderDetails/index.vue

@@ -482,7 +482,7 @@ export default {
       status: {},
       pay: false,
       payType: ["yue", "weixin"],
-      from: "routine",
+      from: this.$deviceType,
       system_store: {},
       mapKay: "",
       mapShow: false
@@ -652,6 +652,7 @@ export default {
     },
     async toPay(type) {
       var that = this;
+      console.log(type, "支付方式");
       await payOrderHandle(this.orderInfo.orderId, type, that.from);
       that.getDetail();
     }

pages/order/OrderSubmission/index.vue

@@ -286,7 +286,7 @@
 		data: function() {
 			return {
 				offlinePayStatus: 2,
-				from: "routine",
+				from: this.$deviceType,
 				// from: _isWeixin ? "weixin" : "weixinh5",
 				deduction: true,
 				isWeixin: _isWeixin,