充值清账

hdApp/src/admin/ghs/pay.vue

@@ -31,7 +31,7 @@
 	import ModalModule from '@/components/plugin/modal'
 	import AppCouponSel from '@/components/app-coupon-sel'
 	import { share } from '@/mixins'
-	import { fastPay } from '@/api/pay'
+	import { rechargeFn } from '@/api/custom-recharge'
 	import { getGhsData } from '@/api/ghs'
 	import { recharge } from '@/api/member'
 	import { getOrderShop } from '@/utils/config'
@@ -48,7 +48,7 @@
 				constant: this.$constant,
 				inpFocus: false,
 				amount: '',
-				form: { payWay: 0 },
+				payWay: 0,
 				payCallData: null,
 				id:0,
 				salt:'',
@@ -92,12 +92,12 @@
 						title: `点我付款`, // 分享标题
 						desc: '享随机优惠，最高20元', // 分享内容
 						imgUrl: '',
-						pagePath: `/pages/pay/index?account=${res.shop.id}&store=0&fromType=3`
+						pagePath: `/pages/pay/index?account=${res.shop.id}&store=0`
 					}
                     // #ifdef MP-WEIXIN
 					this.jweixinFn(shareParams)
                     // #endif
-					console.log(`/pages/pay/index?account=${res.shop.id}&store=0&fromType=3`)
+					console.log(`/pages/pay/index?account=${res.shop.id}&store=0`)
 				})
 			},
 			toPay() {
@@ -107,25 +107,23 @@
 				}
 				let params = {}
 				params = {
-					prePrice: this.amount,
-					payWay: this.form.payWay,
+					actPrice: this.amount,
+					payWay: this.payWay,
 				}
-				if (this.option.store) {
-					params.store = this.option.store
-				}
-				params.fromType = this.option.fromType || 1
 				let miniOpenId = uni.getStorageSync('miniOpenId')
 				params.miniOpenId = miniOpenId
-				fastPay(params).then(res => {
+				params.ghsId = this.id
+				params.salt = this.salt
+				rechargeFn(params).then(res => {
 					this.payCallData = res.data
 					//错误返回判断
 					if(res.code == 0){
 						this.$msg(res.msg)
 						return false
 					}
-					if (this.form.payWay == 0) {
+					if (this.payWay == 0) {
 						wexinPay(res.data, this.paySuccess, this.payFail)
-					} else if (this.form.payWay == 1) {
+					} else if (this.payWay == 1) {
 						window.location.href = res.data.url;
 					} else {
 						this.paySuccess()
@@ -145,12 +143,12 @@
 			},
 			// 支付宝支付
 			aliPayFn() {
-				this.form.payWay = 1
+				this.payWay = 1
 				this.toPay()
 			},
 			// 微信支付
 			wexinPayFn() {
-				this.form.payWay = 0
+				this.payWay = 0
 				this.toPay()
 			},
 			// 暂未设置密码

hdApp/src/api/custom-recharge/index.js

@@ -0,0 +1,5 @@
+import https from '@/plugins/luch-request_0.0.7/request'
+
+export const rechargeFn = data => {
+	return https.post('/custom-recharge/recharge', data)
+}