结算与支付接口appId

src/components/pay-popup/pay-popup.vue

@@ -59,6 +59,7 @@
 
 <script>
 	import $http from '@/utils/request.js'
+	import appId from '@/config/appId.js'
 	import Auth from '../../components/auth/auth.vue'
 	export default {
 		name: "pay-popup",
@@ -140,18 +141,19 @@
 							// #ifdef MP-ALIPAY
 							let data = {
 								orderId: res.data.orderId,
-								payType: 1
+								payType: 1,
+								appSource: appId 
 							}
 							// #endif
 							// #ifndef MP-ALIPAY
 							let data = {
 								orderId: res.data.orderId,
-								payType: 2
+								payType: 2,
+								appSource: appId
 							}
 							// #endif
 							$http.post('/api/v1/mp/user/ticket/order/pay', data).then(ele => {
 								if (ele.code == 0) {
-									// 测试
 									// #ifdef MP-ALIPAY
 									my.tradePay({
 										tradeNO: ele.data.pay_info,

src/config/appId.js

@@ -2,4 +2,6 @@ const mp = 1
 
 const msdq = 2
 
+const zfb = 3
+
 export default msdq

src/config/env.js

@@ -2,7 +2,7 @@ import dev from './dev.js'
 import prod from './prod.js'
 
 // #ifndef H5
-export default prod
+export default dev
 // #endif
 
 // #ifdef H5

src/packageGoods/coupon/index.vue

@@ -54,6 +54,7 @@
 
 <script>
 	import env from '../../config/env.js'
+	import appId from '@/config/appId.js'
 	import $http from '@/utils/request.js'
 	export default {
 		data() {
@@ -148,7 +149,8 @@
 					autoCoupon: 0,
 					boxId: this.boxId,
 					ticketId: this.ticketId,
-					orderNum: 1
+					orderNum: 1,
+					appSource: appId
 				}
 				$http.post('/api/v1/mp/user/ticket/order/settle', data).then(res => {
 					if (res.code == 0) {

src/packageGoods/order/detail.vue

@@ -110,6 +110,7 @@
 <script>
 	import env from '../../config/env.js'
 	import $http from '@/utils/request.js'
+	import appId from '@/config/appId.js'
 	import Auth from '../../components/auth/auth.vue'
 	export default {
 		components: {
@@ -194,13 +195,15 @@
 				// #ifdef MP-ALIPAY
 				let data = {
 					orderId: _this.info.orderId,
-					payType: 1
+					payType: 1,
+					appSource: appId 
 				}
 				// #endif
 				// #ifndef MP-ALIPAY
 				let data = {
 					orderId: _this.info.orderId,
-					payType: 2
+					payType: 2,
+					appSource: appId 
 				}
 				// #endif
 				$http.post('/api/v1/mp/user/deliver/order/pay', data).then(ele => {

src/packageGoods/order/index.vue

@@ -70,6 +70,7 @@
 <script>
 	import env from '../../config/env.js'
 	import $http from '@/utils/request.js'
+	import appId from '@/config/appId.js'
 	import Auth from '../../components/auth/auth.vue'
 	export default {
 		components: {
@@ -179,13 +180,15 @@
 				// #ifdef MP-ALIPAY
 				let data = {
 					orderId: item.orderId,
-					payType: 1
+					payType: 1,
+					appSource: appId 
 				}
 				// #endif
 				// #ifndef MP-ALIPAY
 				let data = {
 					orderId: item.orderId,
-					payType: 2
+					payType: 2,
+					appSource: appId
 				}
 				// #endif
 				$http.post('/api/v1/mp/user/deliver/order/pay', data).then(ele => {

src/packageGoods/order/settlement.vue

@@ -118,6 +118,7 @@
 <script>
 	import env from '../../config/env.js'
 	import $http from '@/utils/request.js'
+	import appId from '@/config/appId.js'
 	import AreaPicker from '../../components/area-picker/area-picker.vue'
 	import Auth from '../../components/auth/auth.vue'
 	export default {
@@ -194,13 +195,15 @@
 							// #ifdef MP-ALIPAY
 							let data = {
 								orderId: res.data.orderId,
-								payType: 1
+								payType: 1,
+								appSource: appId 
 							}
 							// #endif
 							// #ifndef MP-ALIPAY
 							let data = {
 								orderId: res.data.orderId,
-								payType: 2
+								payType: 2,
+								appSource: appId
 							}
 							// #endif
 							$http.post('/api/v1/mp/user/deliver/order/pay', data).then(ele => {
@@ -321,7 +324,8 @@
 					title: '加载中'
 				});
 				let data = {
-					ids: this.ids
+					ids: this.ids,
+					appSource: appId
 				}
 				if(this.payment != ""){
 					data = this.payment

src/packageOther/about/index.vue

@@ -14,7 +14,7 @@
 				<view class="edition">v 2.1.9</view>
 				<!-- #endif -->
 				<!-- #ifdef MP-ALIPAY -->
-				<view class="edition">v 2.1.11</view>
+				<view class="edition">v 2.1.23</view>
 				<!-- #endif -->
 			</view>
 			<view class="about-action">

src/packagePrize/goods/detail.vue

@@ -46,6 +46,7 @@
 <script>
 	import env from '../../config/env.js'
 	import $http from '@/utils/request.js'
+	import appId from '@/config/appId.js'
 	import { formatRichText } from '@/utils/util.js'
 	export default {
 		data() {
@@ -112,7 +113,8 @@
 					autoCoupon: 1,
 					boxId: this.info.boxId,
 					ticketId: this.info.ticketId,
-					orderNum: 1
+					orderNum: 1,
+					appSource: appId
 				}
 				$http.post('/api/v1/mp/user/ticket/order/settle', data).then(res => {
 					if (res.code == 0) {

src/pages/index/index.vue

@@ -416,7 +416,8 @@
 						userCouponIds: [],
 						autoCoupon: 1,
 						boxId: this.payInfo.boxId,
-						orderNum: 1
+						orderNum: 1,
+						appSource: appId
 					}
 					$http.post('/api/v1/mp/user/ticket/order/settle', data).then(res => {
 						if (res.code == 0) {

src/pages/login/index.vue

@@ -11,7 +11,8 @@
 		<view class="flex login">
 			<view class="flex login-image">
 				<image src="../../static/public/logo.png" mode="scaleToFill"></image>
-				<view class="login-image-txt">盲票</view>
+				<view class="login-image-txt" v-if="appId == 2">码上兑券</view>
+				<view class="login-image-txt" v-else>盲票</view>
 			</view>
 			<!-- #ifdef MP-ALIPAY -->
 			<view class="login-btn">
@@ -59,8 +60,12 @@
 				authShow: false,
 				token: '',
 				checked: true,
+				appId: 1,
 			};
 		},
+		created() {
+			this.appId = appId
+		},
 		methods: {
 			getPhoneNumber(e) {
 				let _this = this

src/pages/lucky/index.vue

@@ -86,6 +86,7 @@
 <script>
 	import env from '../../config/env.js'
 	import $http from '@/utils/request.js'
+	import appId from '@/config/appId.js'
 	import PayPopup from '../../components/pay-popup/pay-popup.vue'
 	import {
 		urlParameter
@@ -261,7 +262,8 @@
 					ticketId: this.info.ticketId,
 					autoCoupon: 0,
 					userCouponIds: [],
-					orderNum: 1
+					orderNum: 1,
+					appSource: appId
 				}
 				uni.showLoading();
 				let suid = uni.getStorageSync('shareUid')
@@ -295,7 +297,8 @@
 					ticketId: this.info.ticketId,
 					autoCoupon: 1,
 					userCouponIds: [],
-					orderNum: 1
+					orderNum: 1,
+					appSource: appId
 				}
 				this.payLookFlag = false
 				uni.showLoading({

src/pages/ticketBox/detail.vue

@@ -310,7 +310,8 @@
 					userCouponIds: [],
 					autoCoupon: 1,
 					boxId: this.info.boxId,
-					orderNum: 1
+					orderNum: 1,
+					appSource: appId
 				}
 				$http.post('/api/v1/mp/user/ticket/order/settle', data).then(res => {
 					if (res.code == 0) {