Merge branch 'main' of http://192.168.195.14:3000/outsource/huangye-parking

miniapp/pages/merchant/index.vue

@@ -184,7 +184,7 @@
 				this.confirmVisible = false
 				try {
 					const api = this.pendingType === 'scan' ? scanVerify : codeVerify
-					await api({ code: this.pendingCode })
+					await api({ couponCode: this.pendingCode })
 					this.showResult(true, '优惠券核销成功')
 				} catch (err) {
 					const msg = (err && err.message) || '核销失败，请重试'

miniapp/utils/request.js

@@ -4,7 +4,8 @@
  */
 
 // 后台 API 基础地址，按环境配置
-const BASE_URL = 'http://localhost:5030'
+// const BASE_URL = 'http://localhost:5030'
+const BASE_URL = 'https://api.pli.shhmkjgs.cn'
 
 // 请求超时时间（毫秒）
 const TIMEOUT = 10000