优化请求配置

api/http.js

@@ -15,7 +15,8 @@ import {
 } from '@/commons/utils/encryptUtil.js'
 import infoBox from "@/commons/utils/infoBox.js"
 // let baseUrl = ''
-let baseUrl = 'https://cashier-client.sxczgkj.cn/cashier-client'
+let baseUrl = 'https://cashier.sxczgkj.com'
+// let baseUrl = '/api'
 // 多少 ms 以内， 不提示loading 
 const loadingShowTime = 200
 

api/index.js

@@ -1,5 +1,5 @@
 import http from './http.js'
-const request=http.request
+const request = http.request
 
 
 /**
@@ -8,7 +8,7 @@ const request=http.request
  */
 export function createOrder(data) {
 	return request({
-        url: `/pay/createOrder`,
+		url: `/order/pay/shopPayApi/js2Pay`,
 		method: 'post',
 		data
 	})
@@ -19,8 +19,9 @@ export function createOrder(data) {
  * @returns
  */
 export function getOpenId(params) {
+	console.log('获取支付宝userId 或 微信openIdparams', params);
 	return request({
-        url: `/pay/openId`,
+		url: `/account/user/openId`,
 		method: 'get',
 		params
 	})

main.js

@@ -1,4 +1,7 @@
 import App from './App'
+import vConsloe from 'vconsole'
+
+new vConsloe()
 
 // #ifndef VUE3
 import Vue from 'vue'
@@ -10,11 +13,13 @@ App.mpType = 'app'
 const app = new Vue({
 	...App
 })
-    app.$mount(); //为了兼容小程序及app端必须这样写才有效果
+app.$mount(); //为了兼容小程序及app端必须这样写才有效果
 // #endif
 
 // #ifdef VUE3
-import { createSSRApp } from 'vue'
+import {
+	createSSRApp
+} from 'vue'
 export function createApp() {
 	const app = createSSRApp(App)
 	return {

manifest.json

@@ -64,7 +64,7 @@
             "proxy" : {
                 "/api" : {
                     // 需要被代理的后台地址
-                    "target" : "https://cashier-client.sxczgkj.cn/cashier-client",
+                    "target" : "https://cashier.sxczgkj.com",
                     "changeOrigin" : true,
                     "secure" : false,
                     "pathRewrite" : {

package.json

@@ -6,5 +6,8 @@
     "jweixin-module": "^1.6.0",
     "uni-simple-router": "^2.0.8-beta.4",
     "vue-router": "^4.4.5"
+  },
+  "devDependencies": {
+    "vconsole": "^3.15.1"
   }
 }

pages/index/index.vue

@@ -2,59 +2,62 @@
 	<view class="content">
 		<view class="info">
 			<image class="shopImage" :src="shopImage"></image>
-			<view class="shopName">{{shopName}}</view>
+			<view class="shopName">{{ shopName }}</view>
 		</view>
 		<view class="input">
-			<view class="payAmount">￥<input :disabled="disabled" @input="formatAmount" class="amount" v-model="payAmount" type="digit"></view>
+			<view class="payAmount">
-			<input class="remark" v-model="remark" type="text" placeholder="添加付款备注(最多10个字)">
+				￥
+				<input :disabled="disabled" @input="formatAmount" class="amount" v-model="payAmount" type="digit" />
+			</view>
+			<input class="remark" v-model="remark" type="text" placeholder="添加付款备注(最多10个字)" />
 		</view>
 		<view class="btn" @click="createOrder">立即付款</view>
 	</view>
 </template>
 
 <script>
-	
+import { getOpenId, createOrder, cancelOrderPay } from '@/api/index.js';
-	import { getOpenId , createOrder , cancelOrderPay } from '@/api/index.js'
+export default {
-	export default {
 	data() {
 		return {
-				payAmount: "",
+			payAmount: '',
 			openId: null,
+			// openId: '2088112837517234',
 			shopImage: null,
 			shopName: null,
 			shopId: null,
 			orderId: null,
-				remark: "",
+			remark: '',
-				payType: "",
+			payType: '',
-				disabled: false,
+			disabled: false
-				
+		};
-			}
 	},
-		onLoad() {
+	onLoad() {},
-		},
+	onShow() {
-		onShow () {
+		this.shopId = this.getUrlParam('shopId');
-			this.shopId = this.getUrlParam("shopId");
+		this.orderId = this.getUrlParam('orderId');
-			this.orderId = this.getUrlParam("orderId");
+		if (this.getUrlParam('payAmount')) {
-			if ( this.getUrlParam("payAmount") ) {
+			this.payAmount = this.getUrlParam('payAmount');
-				this.payAmount = this.getUrlParam("payAmount");
 			this.disabled = true;
 		}
 
-			document.body.addEventListener('touchmove', function (e) {
+		document.body.addEventListener(
+			'touchmove',
+			function (e) {
 				e.preventDefault(); //阻止默认的处理方式(阻止下拉滑动的效果)
-			}, {passive: false}); //passive 参数不能省略，用来兼容ios和android
+			},
-			this.login()
+			{ passive: false }
+		); //passive 参数不能省略，用来兼容ios和android
+		this.login();
 	},
 
-		mounted() {
+	mounted() {},
-		},
 	methods: {
-		
 		formatAmount(event) {
 			// 必须在nextTick中
 			this.$nextTick(() => {
-			            this.payAmount = event.target.value.match(/^\d*(\.?\d{0,2})/g)[0]
+				this.payAmount = event.target.value.match(/^\d*(\.?\d{0,2})/g)[0];
-			        })
+			});
 
 			// e.detail.value = (e.detail.value.match(/^\d*(.?\d{0,2})/g)[0]) || ""
 			//    this.$nextTick(() => {
@@ -65,7 +68,7 @@
 		/**
 		 * 判断是否为微信环境
 		 */
-			isWechat (){
+		isWechat() {
 			var ua = navigator.userAgent.toLowerCase();
 			var isWXWork = ua.match(/wxwork/i) == 'wxwork';
 			var isWeixin = !isWXWork && ua.match(/MicroMessenger/i) == 'micromessenger';
@@ -83,35 +86,34 @@
 		/**
 		 * 获取微信/支付宝code
 		 */
-			login () {
+		login() {
-				
 			// 获取微信code
-				if ( this.isWechat() ) {
+			if (this.isWechat()) {
-					let _code = this.getUrlParam("code");
+				let _code = this.getUrlParam('code');
-					uni.setStorageSync("code",_code)
+				uni.setStorageSync('code', _code);
-					if (_code == null || _code === "") {
+				if (_code == null || _code === '') {
 					// 传当前页面的URL（微信授权完之后返回到的页面）和 登录方式
 					this.getWXCode(window.location.href, 'snsapi_userinfo');
 				} else {
-						
+					this.payType = 'WECHAT';
-						this.payType = "WECHAT";
 					// this.getOpenId(_code,"wx212769170d2c6b2a"); //微信 WECHAT； 支付宝 ALIPAY；
-						this.getOpenId(uni.getStorageSync("code"),"wx212769170d2c6b2a"); //微信 WECHAT； 支付宝 ALIPAY；
+					this.getOpenId(uni.getStorageSync('code'), 'wx212769170d2c6b2a'); //微信 WECHAT； 支付宝 ALIPAY；
 				}
 			}
 
 			// 获取支付宝code
-				if ( this.isAlipay() ) {
+			if (this.isAlipay()) {
-					let _code = this.getUrlParam("auth_code");
+				let _code = this.getUrlParam('auth_code');
-					if (_code == null || _code === "") {
+				console.log('获取支付宝code', _code);
+				if (_code == null || _code === '') {
 					// 传当前页面的URL（支付宝授权完之后返回到的页面）和 登录方式
 					this.getAlipayCode(window.location.href, 'auth_user');
 				} else {
-						this.payType = "ALIPAY";
+					this.payType = 'ALIPAY';
-						this.getOpenId(_code,"2021004174605036"); //微信 WECHAT； 支付宝 ALIPAY；
+					this.getOpenId(_code, '2021004174605036'); //微信 WECHAT； 支付宝 ALIPAY；
 				}
 			}
-				
+			// this.getOpenId('1321312123123', '2021004174605036');
 		},
 
 		/**
@@ -119,15 +121,16 @@
 		 * @param {Object} code
 		 * @param {Object} payType
 		 */
-			getOpenId (code,appId) {
+		getOpenId(code, appId) {
 			let params = {
-					code : code,
+				code: code,
-					payType : this.payType, //微信 WECHAT； 支付宝 ALIPAY；
+				// payType: this.payType, //微信 WECHAT； 支付宝 ALIPAY；
-					appId : appId, //微信 WECHAT； 支付宝 ALIPAY；
+				// appId: appId, //微信 WECHAT； 支付宝 ALIPAY；
-					shopId : this.getUrlParam("shopId"), //微信 WECHAT； 支付宝 ALIPAY；
+				source: this.payType == 'WECHAT' ? 'wechat' : 'alipay',
-				}
+				shopId: this.getUrlParam('shopId') //微信 WECHAT； 支付宝 ALIPAY；
+			};
 			getOpenId(params).then((res) => {
-					if ( res.code == 0 ) {
+				if (res.code == 0) {
 					this.openId = res.data.openId;
 					this.shopImage = res.data.shopImage;
 					this.shopName = res.data.shopName;
@@ -136,31 +139,28 @@
 					uni.showToast({
 						title: res.msg,
 						icon: 'none'
-						})
+					});
 				}
-				})
+			});
-						
 		},
 
 		/**
 		 * 获取code并登录
 		 */
 		getWXCode: async (url, snsapi) => {
-				let appid = 'wx212769170d2c6b2a' //公众号的唯一标识
+			let appid = 'wx212769170d2c6b2a'; //公众号的唯一标识
-				let secrete = '8492a7e8d55bbb1b57f5c8276ea1add0' //
+			let secrete = '8492a7e8d55bbb1b57f5c8276ea1add0'; //
 			// let redirect_uri = "https://pcweb.sxczgkj.cn/cashier/pay"
 			let redirect_uri = encodeURIComponent(url); //授权后重定向的回调链接地址
 			let time = +new Date(); //时间戳
 
-				window.location.href =
+			window.location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?
-					`https://open.weixin.qq.com/connect/oauth2/authorize?
 						appid=${appid}&
 						redirect_uri=${redirect_uri}&
 						response_type=code&
 						scope=${snsapi}&
 						state=1&
 						time=${time}#wechat_redirect`;
-				
 		},
 
 		/**
@@ -168,12 +168,11 @@
 		 * @param {Object} url
 		 * @param {Object} snsapi
 		 */
-			getAlipayCode (url, snsapi) {
+		getAlipayCode(url, snsapi) {
-				let appid = '2021004174605036' //公众号的唯一标识
+			let appid = '2021004174605036'; //公众号的唯一标识
 			// let redirect_uri = "https://pcweb.sxczgkj.cn/cashier/pay"
 			let redirect_uri = encodeURIComponent(url); //授权后重定向的回调链接地址
-				window.location.href =
+			window.location.href = `https://openauth.alipay.com/oauth2/publicAppAuthorize.htm?
-					`https://openauth.alipay.com/oauth2/publicAppAuthorize.htm?
 						app_id=${appid}&
 						redirect_uri=${redirect_uri}&
 						scope=${snsapi}&
@@ -183,117 +182,143 @@
 		/**
 		 * 创建订单
 		 */
-			createOrder () {
+		createOrder() {
-				if ( this.payAmount == "") {
+			if (this.payAmount == '') {
 				uni.showToast({
 					title: '请输入支付金额',
 					icon: 'none'
-					})
+				});
 				return;
 			}
 
 			let params = {
-					userId : this.openId,
+				openId: this.openId,
-					shopId : this.shopId,
+				shopId: this.shopId,
-					payType : this.payType,
+				payType: this.payType,
-					payAmount : this.payAmount,
+				amount: this.payAmount,
-					remark: this.remark,
+				checkOrderPay: {
+					orderAmount: this.payAmount,
+					orderId: this.getUrlParam('orderId'),
+					remark: this.remark
 				}
-				if ( this.orderId ) {
+			};
+			// let params = {
+			// 	openId: '1212312312',
+			// 	shopId: this.shopId,
+			// 	payType: 'alipay',
+			// 	amount: this.payAmount,
+			// 	checkOrderPay: {
+			// 		orderAmount: this.payAmount,
+			// 		orderId: this.getUrlParam('orderId'),
+			// 		remark: this.remark
+			// 	}
+			// };
+			console.log('createOrder.params', params);
+			if (this.orderId) {
 				params.orderId = this.orderId;
 			}
-				createOrder(params).then((res) => {
+			createOrder(params)
+				.then((res) => {
+					console.log('createOrder.res', res);
 					// alert("创建订单=="+JSON.stringify(res))
-					if ( res.code == '100015' ) {
+					if (res.code == '100015') {
 						this.orderId = res.data.orderInfo.id;
-						if ( this.isWechat() ) {
+						if (this.isWechat()) {
-							this.wxH5Pay(res)
+							this.wxH5Pay(res);
 						}
-						if ( this.isAlipay() ) {
+						if (this.isAlipay()) {
-							this.alipay(res)
+							this.alipay(res);
 						}
 					} else {
 						uni.showToast({
 							title: res.msg,
 							icon: 'none'
-						})
+						});
 					}
-					
 				})
+				.catch((err) => {
+					console.log('createOrder.err', err);
+				});
 		},
 
 		/**
 		 * 微信支付
 		 * @param {Object} res
 		 */
-			wxH5Pay (res) {
+		wxH5Pay(res) {
-				WeixinJSBridge.invoke('getBrandWCPayRequest', {
+			WeixinJSBridge.invoke(
+				'getBrandWCPayRequest',
+				{
 					debug: true,
 					appId: res.data.payInfo.appId,
 					timeStamp: res.data.payInfo.timeStamp,
 					nonceStr: res.data.payInfo.nonceStr,
 					package: res.data.payInfo.package,
 					paySign: res.data.payInfo.paySign,
-					signType: res.data.payInfo.signType,
+					signType: res.data.payInfo.signType
-				}, function(res) {
+				},
-					console.log(res)
+				function (res) {
+					console.log(res);
 					if (res.err_msg === 'get_brand_wcpay_request:ok') {
 						// 支付成功的处理逻辑
 						uni.showToast({
 							title: '微信支付成功',
 							icon: 'none'
-						})
+						});
-						setTimeout(function (){
+						setTimeout(function () {
 							WeixinJSBridge.invoke('closeWindow');
-
+						}, 500);
-						},500)
+					} else if (res.err_msg == 'get_brand_wcpay_request:cancel') {
-					} else if (res.err_msg == "get_brand_wcpay_request:cancel") {
 						// 支付过程中取消支付
-						cancelOrderPay({ orderId: this.orderId, })
+						// cancelOrderPay({ orderId: this.orderId });
 						uni.showToast({
 							title: '取消支付',
 							icon: 'none'
-						})
+						});
 					} else {
-						cancelOrderPay({ orderId: this.orderId, })
+						// cancelOrderPay({ orderId: this.orderId });
 						uni.showToast({
 							title: '支付失败',
 							icon: 'none'
-						})
-					}
 						});
+					}
+				}
+			);
 		},
 
 		/**
 		 * 支付宝支付
 		 * @param {Object} res
 		 */
-			alipay (res) {
+		alipay(res) {
-			
 			// 判断是否存在支付宝的JSBridge
 			if (window.AlipayJSBridge) {
 				// 调用支付宝客户端接口，执行支付操作
-				    AlipayJSBridge.call('tradePay', {
+				AlipayJSBridge.call(
+					'tradePay',
+					{
 						tradeNO: res.data.payInfo.tradeNo
-				    }, function(result) {
+					},
+					function (result) {
 						if (result.resultCode === '9000') {
 							// 支付成功
 							uni.showToast({
 								title: '支付成功',
 								icon: 'none'
-							})
+							});
 							setTimeout(() => {
-								window.AlipayJSBridge.call('closeWebview')
+								window.AlipayJSBridge.call('closeWebview');
 							}, 500);
 						} else {
-							cancelOrderPay({ orderId: this.orderId, })
+							cancelOrderPay({ orderId: this.orderId });
 							// 支付失败
 							uni.showToast({
 								title: '支付失败',
 								icon: 'none'
-							})
-						  }
 							});
+						}
+					}
+				);
 			} else {
 				// 如果支付宝的JSBridge尚未准备好，在文档中添加AlipayJSBridgeReady事件监听器
 				document.addEventListener('AlipayJSBridgeReady', () => {
@@ -307,51 +332,47 @@
 		 * 截取code
 		 */
 		getUrlParam: (name) => {
-				let reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
+			let reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)');
 			let r = window.location.search.substr(1).match(reg);
 			if (r != null) {
 				return unescape(r[2]);
 			}
 			return null;
-			},
-			
-
 		}
 	}
+};
 </script>
 
 <style>
-
+.content {
-	
-	.content {
 	display: flex;
 	flex-direction: column;
 	padding: 48rpx 28rpx;
 	box-sizing: border-box;
-	}
+}
-	.info{
+.info {
 	display: flex;
 	align-items: center;
-	}
+}
-	.shopImage{
+.shopImage {
 	width: 80rpx;
 	height: 80rpx;
 	margin-right: 32rpx;
 	border-radius: 50%;
-	}
+}
-	.shopName{
+.shopName {
 	font-weight: bold;
 	font-size: 32rpx;
 	color: #333333;
-	}
+}
-	.input{
+.input {
 	display: flex;
 	flex-direction: column;
 	padding: 0 16rpx;
 	box-sizing: border-box;
-	}
+}
-	.payAmount{
+.payAmount {
-		border-bottom: 2rpx solid #E5E5E5;
+	border-bottom: 2rpx solid #e5e5e5;
 	font-weight: bold;
 	font-size: 36rpx;
 	color: #333333;
@@ -359,31 +380,31 @@
 	align-items: center;
 	padding: 24rpx 0;
 	box-sizing: border-box;
-	}
+}
-	.amount{
+.amount {
 	width: 100%;
 	font-weight: 400;
 	font-size: 28rpx;
 	color: #333;
 	padding-left: 10rpx;
 	box-sizing: border-box;
-	}
+}
-	.remark{
+.remark {
 	width: 100%;
 	margin-top: 28rpx;
 	font-weight: 400;
 	font-size: 24rpx;
 	color: #999999;
-	}
+}
-	.btn{
+.btn {
 	width: 100%;
 	height: 64rpx;
 	line-height: 64rpx;
 	text-align: center;
-		background-color: #F1CB66;
+	background-color: #f1cb66;
 	border-radius: 10rpx;
 	color: #fff;
 	font-size: 28rpx;
 	margin-top: 40rpx;
-	}
+}
 </style>

vite.config.js

@@ -10,7 +10,7 @@ export default defineConfig({
 		port:80
 		proxy: {
 			'/api': {
-				target: "https://cashier-client.sxczgkj.cn/cashier-client",
+				target: "https://cashier.sxczgkj.com",
 				changeOrigin: true,
 				rewrite: path => path.replace(/^\/api/, ''),
 			}

vue.config.js

@@ -31,7 +31,7 @@ module.exports = {
 		proxy: {
 			"/api": {
 				// 需要被代理的后台地址
-				"target": "https://cashier-client.sxczgkj.cn/cashier-client",
+				"target": "https://cashier-client.sxczgkj.cn",
 				"changeOrigin": true,
 				"secure": false,
 				"pathRewrite": {