Showing
1 changed file
with
12 additions
and
8 deletions
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | * @Author: hookehuyr hookehuyr@gmail.com | 2 | * @Author: hookehuyr hookehuyr@gmail.com |
| 3 | * @Date: 2022-05-31 22:09:58 | 3 | * @Date: 2022-05-31 22:09:58 |
| 4 | * @LastEditors: hookehuyr hookehuyr@gmail.com | 4 | * @LastEditors: hookehuyr hookehuyr@gmail.com |
| 5 | - * @LastEditTime: 2022-06-16 15:12:18 | 5 | + * @LastEditTime: 2022-06-17 13:42:56 |
| 6 | * @FilePath: /tswj/src/components/DonateFlower/index.vue | 6 | * @FilePath: /tswj/src/components/DonateFlower/index.vue |
| 7 | * @Description: 捐花组件 | 7 | * @Description: 捐花组件 |
| 8 | --> | 8 | --> |
| ... | @@ -121,6 +121,10 @@ const donateFlower = () => { | ... | @@ -121,6 +121,10 @@ const donateFlower = () => { |
| 121 | Toast.fail('请先查看捐赠协议,勾选同意!'); | 121 | Toast.fail('请先查看捐赠协议,勾选同意!'); |
| 122 | return false; | 122 | return false; |
| 123 | } | 123 | } |
| 124 | + if (!props.item.donate_name) { | ||
| 125 | + Toast.fail('捐赠人姓名不能为空!'); | ||
| 126 | + return false; | ||
| 127 | + } | ||
| 124 | // 捐钱接口 | 128 | // 捐钱接口 |
| 125 | // 根据类型过滤提交数据 | 129 | // 根据类型过滤提交数据 |
| 126 | // 儿童: 提交 perf_id,kg_id | 130 | // 儿童: 提交 perf_id,kg_id |
| ... | @@ -149,17 +153,17 @@ const addDonate = async (params) => { | ... | @@ -149,17 +153,17 @@ const addDonate = async (params) => { |
| 149 | if (data.id) { | 153 | if (data.id) { |
| 150 | closeBtn(); | 154 | closeBtn(); |
| 151 | // TODO: 微信支付 | 155 | // TODO: 微信支付 |
| 152 | - // wechatPay(data.id); | 156 | + wechatPay(data.id); |
| 153 | // 交易成功跳转回调页面 | 157 | // 交易成功跳转回调页面 |
| 154 | // TEMP: 临时传参 donate_id, 页面到时候给到后端跳转 | 158 | // TEMP: 临时传参 donate_id, 页面到时候给到后端跳转 |
| 155 | // 回调地址 | 159 | // 回调地址 |
| 156 | // http://voice.onwall.cn/f/voice/#/client/wechatpayCallback?donate_id=xxx | 160 | // http://voice.onwall.cn/f/voice/#/client/wechatpayCallback?donate_id=xxx |
| 157 | - $router.push({ | 161 | + // $router.push({ |
| 158 | - path: '/client/wechatpayCallback', | 162 | + // path: '/client/wechatpayCallback', |
| 159 | - query: { | 163 | + // query: { |
| 160 | - donate_id: data.id | 164 | + // donate_id: data.id |
| 161 | - } | 165 | + // } |
| 162 | - }) | 166 | + // }) |
| 163 | } | 167 | } |
| 164 | } | 168 | } |
| 165 | 169 | ... | ... |
-
Please register or login to post a comment