支付返回,修改禅道bug

This commit is contained in:
zhouyanli
2026-07-28 17:48:06 +08:00
parent a9a5afaf26
commit 9be76c6386
10 changed files with 52 additions and 65 deletions

View File

@@ -11,7 +11,23 @@
"Bash(node *)", "Bash(node *)",
"Bash(git checkout *)", "Bash(git checkout *)",
"Bash(sed -i '207,213d' D:/wuye-jumin-front/property-uniapp-project/pageSubPack/loginSub/login.vue)", "Bash(sed -i '207,213d' D:/wuye-jumin-front/property-uniapp-project/pageSubPack/loginSub/login.vue)",
"Bash(sed -n '203,213p' D:/wuye-jumin-front/property-uniapp-project/pageSubPack/loginSub/login.vue)" "Bash(sed -n '203,213p' D:/wuye-jumin-front/property-uniapp-project/pageSubPack/loginSub/login.vue)",
"Bash(xargs -I{} sh -c 'echo \"== {} ==\" && cat {}')",
"WebSearch",
"Bash(sed -i '115s/\\(result\\)/\\(type, result\\)/' pageSubPack/payment-list/addHydropower.vue)",
"Bash(sed -i \"117s/'扫码成功', result/'扫码成功 type=' + type + ' result=' + result/\" pageSubPack/payment-list/addHydropower.vue)",
"Bash(xxd)",
"Bash(sed -i '311s/^\\\\t//' pageSubPack/payment-list/paymentIndex.vue)",
"Bash(sed -i '312s/^\\\\t//' pageSubPack/payment-list/paymentIndex.vue)",
"Bash(sed -i '225,242d' pages/index/index.vue)",
"Bash(sed -i '224a\\\\\\\\n\\\\t// banner点击跳转\\\\n\\\\tconst bannerClick = \\(index\\) => {\\\\n\\\\t const item = bannerRawData.value[index]\\\\n\\\\t if \\(item \\\\&\\\\& item.link\\) {\\\\n\\\\t uni.navigateTo\\({ url: item.link }\\)\\\\n\\\\t }\\\\n\\\\t}' pages/index/index.vue)",
"Bash(sed -i '229s/^\\\\t\\\\/\\\\//\\\\t\\\\/\\\\//' pages/index/index.vue)",
"Bash(sed -i '230s/^\\\\t\\\\tconst/\\\\tconst/' pages/index/index.vue)",
"Bash(sed -i '231s/^\t\t / /' pages/index/index.vue)",
"Bash(sed -i '232s/^\t\t /\\\\t\\\\t/' pages/index/index.vue)",
"Bash(sed -i '233s/^\t\t /\\\\t\\\\t\\\\t/' pages/index/index.vue)",
"Bash(awk 'NR==235 { print substr\\($0, 2\\); next } 1' \"D:/wuye-jumin-front/property-uniapp-project/pages.json\")",
"Bash(mv /tmp/pages_temp.json \"D:/wuye-jumin-front/property-uniapp-project/pages.json\")"
] ]
} }
} }

View File

@@ -32,8 +32,28 @@
} }
// 有 token已在首页不做跳转 // 有 token已在首页不做跳转
}) })
onShow(() =>{ onShow((options) => {
console.log('App Show') console.log('App Show', options)
// 处理从小程序返回的支付结果
if (options && options.referrerInfo && options.referrerInfo.extraData) {
const extraData = options.referrerInfo.extraData
console.log('小程序返回数据:', extraData)
if (extraData.retCode === 'SUCCESS') {
// 支付成功:返回缴费列表页并刷新数据
uni.showToast({ title: '支付成功', icon: 'success' })
setTimeout(() => {
uni.redirectTo({
url: '/pageSubPack/payment-list/paymentIndex'
})
}, 1500)
return
} else if (extraData.retCode === 'FAIL') {
uni.showToast({ title: extraData.retMsg || '支付失败', icon: 'none' })
return
}
}
// #ifdef APP-PLUS // #ifdef APP-PLUS
// 每次回到前台时检查 CID 是否有效,没有则重新获取 // 每次回到前台时检查 CID 是否有效,没有则重新获取
const savedCid = uni.getStorageSync('push_cid') const savedCid = uni.getStorageSync('push_cid')

View File

@@ -268,7 +268,7 @@ onLoad((option) =>{
curActivityId.value = option?.id curActivityId.value = option?.id
statusTextFromParam.value = option?.statusText || '' statusTextFromParam.value = option?.statusText || ''
// 处理applied参数 // 处理applied参数
hasSigned.value = option?.applied === true hasSigned.value = option?.applied === 'true'
// console.log('hasSigned.value',hasSigned.value) // console.log('hasSigned.value',hasSigned.value)
// 2. 初始化数据 // 2. 初始化数据
if (curActivityId.value) { if (curActivityId.value) {

View File

@@ -1,7 +1,7 @@
let baseUrl = ''; let baseUrl = '';
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
// baseUrl = 'http://192.168.1.222:8080'; // 开发环境 baseUrl = 'http://192.168.1.222:8080'; // 开发环境
baseUrl = 'https://wuyeapi.ckdzkj.com'; // baseUrl = 'https://wuyeapi.ckdzkj.com';
} else { } else {
baseUrl = 'https://wuyeapi.ckdzkj.com'; // 生产环境 baseUrl = 'https://wuyeapi.ckdzkj.com'; // 生产环境
} }

View File

@@ -192,7 +192,7 @@
console.log(form.value); console.log(form.value);
} catch (err) { } catch (err) {
uni.showToast({ uni.showToast({
title: `${err}`, title: err.msg || '网络异常',
icon: 'none' icon: 'none'
}) })
console.error('列表接口报错:', err) console.error('列表接口报错:', err)
@@ -232,14 +232,14 @@
} else { } else {
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
icon: 'error' icon: 'none'
}); });
} }
}).catch(err => { }).catch(err => {
uni.showToast({ uni.showToast({
title: err, title: err.msg,
icon: 'error' icon: 'none'
}); });
}) })

View File

@@ -22,7 +22,7 @@
<!-- 标题 --> <!-- 标题 -->
<view class="form-item"> <view class="form-item">
<text class="label">标题</text> <text class="label">标题</text>
<uni-easyinput v-model="form.title" placeholder="请输入内容" :inputBorder="false"></uni-easyinput> <uni-easyinput v-model="form.title" placeholder="请输入内容" :inputBorder="false" :maxlength="30"></uni-easyinput>
</view> </view>
<!-- 问题描述 --> <!-- 问题描述 -->

View File

@@ -15,7 +15,7 @@
<!-- 标题输入 --> <!-- 标题输入 -->
<view class="form-item"> <view class="form-item">
<text class="label">标题</text> <text class="label">标题</text>
<uni-easyinput v-model="form.title" placeholder="请输入内容" :inputBorder="false"></uni-easyinput> <uni-easyinput v-model="form.title" placeholder="请输入内容" :inputBorder="false" :maxlength="30"></uni-easyinput>
</view> </view>
<!-- 问题描述 --> <!-- 问题描述 -->

View File

@@ -122,31 +122,7 @@
initPaymentData() initPaymentData()
}) })
// 从支付收银台返回时检查支付结果 onShow(() => {})
onShow((options) => {
// 检查是否有从日照银行小程序返回的支付结果
if (options && options.referrerInfo && options.referrerInfo.extraData) {
const extraData = options.referrerInfo.extraData
if (extraData.retCode === 'SUCCESS') {
sendPaySuccessPush()
uni.redirectTo({
url: '/pageSubPack/payment-list/addPaymentSuccess?type=pay'
})
return
} else if (extraData.retCode === 'FAIL') {
uni.showToast({ title: extraData.retMsg || '支付失败', icon: 'none' })
return
}
}
const paySuccess = uni.getStorageSync('paySuccess')
if (paySuccess) {
uni.removeStorageSync('paySuccess')
uni.redirectTo({
url: '/pageSubPack/payment-list/addPaymentSuccess?type=pay'
})
}
})
// 初始化缴费数据 // 初始化缴费数据
const initPaymentData = () => { const initPaymentData = () => {

View File

@@ -105,32 +105,7 @@
} }
}) })
// 从支付收银台返回时检查支付结果 onShow(() => {})
onShow((options) => {
// 检查是否有从日照银行小程序返回的支付结果
if (options && options.referrerInfo && options.referrerInfo.extraData) {
const extraData = options.referrerInfo.extraData
if (extraData.retCode === 'SUCCESS') {
sendPaySuccessPush()
uni.redirectTo({
url: '/pageSubPack/payment-list/addPaymentSuccess?type=pay'
})
return
} else if (extraData.retCode === 'FAIL') {
uni.showToast({ title: extraData.retMsg || '支付失败', icon: 'none' })
return
}
}
const paySuccess = uni.getStorageSync('paySuccess')
if (paySuccess) {
uni.removeStorageSync('paySuccess')
uni.redirectTo({
url: '/pageSubPack/payment-list/addPaymentSuccess?type=pay'
})
// currentStep.value = 2
}
})
// 初始化缴费数据 // 初始化缴费数据
const initPaymentData = () => { const initPaymentData = () => {

View File

@@ -47,7 +47,7 @@
<view class="label"> <view class="label">
<text class="required">*</text>访客联系方式 <text class="required">*</text>访客联系方式
</view> </view>
<input class="input" placeholder="请输入联系方式" v-model="form.phone" type="number" /> <input class="input" placeholder="请输入联系方式" v-model="form.phone" type="number" maxlength="11" />
</view> </view>
<!-- 车牌号仅车辆来访显示 --> <!-- 车牌号仅车辆来访显示 -->
@@ -68,7 +68,7 @@
<view class="label"> <view class="label">
<text class="required">*</text>随行人数 <text class="required">*</text>随行人数
</view> </view>
<input class="input" placeholder="请输入随行人数" v-model="form.peopleNum" type="number" /> <input class="input" placeholder="请输入随行人数" v-model="form.peopleNum" type="number" maxlength="2" />
</view> </view>
</view> </view>