07d82489 by 张猛

个人支付跳转

1 parent 4377830a
...@@ -94,11 +94,11 @@ onLoad((option) => { ...@@ -94,11 +94,11 @@ onLoad((option) => {
94 }) 94 })
95 } 95 }
96 }) 96 })
97
97 onShow(() => { 98 onShow(() => {
98 if (app.globalData.isLogin) { 99 if (app.globalData.isLogin) {
99 init() 100 init()
100 } else { 101 } else {
101
102 app.firstLoadCallback = () => { 102 app.firstLoadCallback = () => {
103 init() 103 init()
104 }; 104 };
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
22 <!-- <image v-if="item.payTime" :src="config.baseUrl_api + '/fs/static/calendar@2x.png'" mode="widthFix" --> 22 <!-- <image v-if="item.payTime" :src="config.baseUrl_api + '/fs/static/calendar@2x.png'" mode="widthFix" -->
23 <!-- style="width:30rpx;height:30rpx;"/> --> 23 <!-- style="width:30rpx;height:30rpx;"/> -->
24 <!-- <text v-if="item.payTime" class="date-text">{{ item.payTime }}</text> --> 24 <!-- <text v-if="item.payTime" class="date-text">{{ item.payTime }}</text> -->
25 <text class="value text-primary" >{{ item.wfCode || '——' }}</text> 25 <text class="value text-primary">{{ item.wfCode || '——' }}</text>
26 </view> 26 </view>
27 <view 27 <view
28 :class="{ 28 :class="{
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
124 <script setup> 124 <script setup>
125 import {ref, reactive, onMounted, computed} from 'vue'; 125 import {ref, reactive, onMounted, computed} from 'vue';
126 import {onReachBottom} from '@dcloudio/uni-app' 126 import {onReachBottom} from '@dcloudio/uni-app'
127 import {useUserStore} from "../store/modules/user"; 127 import {useUserStore} from "@/store/modules/user";
128 import * as api from '@/common/api.js' 128 import * as api from '@/common/api.js'
129 import config from '@/config.js' 129 import config from '@/config.js'
130 130
...@@ -242,7 +242,7 @@ const confirmDel = async () => { ...@@ -242,7 +242,7 @@ const confirmDel = async () => {
242 uni.showToast({title: '删除成功', icon: 'success'}); 242 uni.showToast({title: '删除成功', icon: 'success'});
243 pageNum.value = 1; 243 pageNum.value = 1;
244 list.value = []; 244 list.value = [];
245 initData(); 245 await initData();
246 closeDelPopup(); 246 closeDelPopup();
247 } catch (e) { 247 } catch (e) {
248 uni.showToast({title: '删除失败', icon: 'error'}); 248 uni.showToast({title: '删除失败', icon: 'error'});
...@@ -288,7 +288,7 @@ const confirmCancel = async () => { ...@@ -288,7 +288,7 @@ const confirmCancel = async () => {
288 uni.showToast({title: '取消成功', icon: 'success'}); 288 uni.showToast({title: '取消成功', icon: 'success'});
289 pageNum.value = 1; 289 pageNum.value = 1;
290 list.value = []; 290 list.value = [];
291 initData(); 291 await initData();
292 closeCancelPopup(); 292 closeCancelPopup();
293 } catch (e) { 293 } catch (e) {
294 uni.showToast({title: '取消失败', icon: 'error'}); 294 uni.showToast({title: '取消失败', icon: 'error'});
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 <view class="info-card"> 15 <view class="info-card">
16 <view class="info-item"> 16 <view class="info-item">
17 <text class="label">交易流水号</text> 17 <text class="label">交易流水号</text>
18 <text class="value">{{ orderInfo.tradeNo||'--' }}</text> 18 <text class="value">{{ orderInfo.tradeNo || '--' }}</text>
19 </view> 19 </view>
20 <view class="info-item"> 20 <view class="info-item">
21 <text class="label">商户名称</text> 21 <text class="label">商户名称</text>
...@@ -35,29 +35,30 @@ ...@@ -35,29 +35,30 @@
35 </template> 35 </template>
36 36
37 <script setup> 37 <script setup>
38 import { 38 import {
39 ref 39 ref
40 } from 'vue' 40 } from 'vue'
41 import { 41 import {
42 onLoad 42 onLoad
43 } from '@dcloudio/uni-app' 43 } from '@dcloudio/uni-app'
44 import to from 'await-to-js' 44 import to from 'await-to-js'
45 import * as api from '@/common/api.js' 45 import * as api from '@/common/api.js'
46 46
47 const orderInfo = ref({ 47 const orderInfo = ref({
48 id: '', 48 id: '',
49 tradeNo: '', 49 tradeNo: '',
50 merchantName: '中国跆拳道协会', 50 merchantName: '中国跆拳道协会',
51 price: '' 51 price: ''
52 }) 52 })
53 53
54 const goBack = () => { 54 const goBack = () => {
55 uni.reLaunch({ 55 uni.redirectTo({
56 url: '/login/login' 56 // url: '/login/login'
57 url: '/personal/order'
57 }) 58 })
58 } 59 }
59 60
60 onLoad(async (option) => { 61 onLoad(async (option) => {
61 if (option.orderId) { 62 if (option.orderId) {
62 const [err, res] = await to(api.getOrderInfo(option.orderId)) 63 const [err, res] = await to(api.getOrderInfo(option.orderId))
63 if (!err && res.data) { 64 if (!err && res.data) {
...@@ -66,12 +67,12 @@ ...@@ -66,12 +67,12 @@
66 orderInfo.value.id = option.orderId 67 orderInfo.value.id = option.orderId
67 } 68 }
68 } 69 }
69 }) 70 })
70 </script> 71 </script>
71 72
72 <style scoped> 73 <style scoped>
73 /* 全局容器 */ 74 /* 全局容器 */
74 .success-container { 75 .success-container {
75 display: flex; 76 display: flex;
76 flex-direction: column; 77 flex-direction: column;
77 align-items: center; 78 align-items: center;
...@@ -79,16 +80,16 @@ ...@@ -79,16 +80,16 @@
79 min-height: 100vh; 80 min-height: 100vh;
80 background-color: #f8f9fa; 81 background-color: #f8f9fa;
81 box-sizing: border-box; 82 box-sizing: border-box;
82 } 83 }
83 84
84 /* 成功图标容器 */ 85 /* 成功图标容器 */
85 .success-icon { 86 .success-icon {
86 margin-bottom: 40rpx; 87 margin-bottom: 40rpx;
87 animation: fadeIn 0.6s ease-out; 88 animation: fadeIn 0.6s ease-out;
88 } 89 }
89 90
90 /* 渐变圆形背景 */ 91 /* 渐变圆形背景 */
91 .icon-circle { 92 .icon-circle {
92 width: 180rpx; 93 width: 180rpx;
93 height: 180rpx; 94 height: 180rpx;
94 border-radius: 50%; 95 border-radius: 50%;
...@@ -100,34 +101,34 @@ ...@@ -100,34 +101,34 @@
100 box-shadow: 0 8rpx 30rpx rgba(6, 193, 174, 0.3); 101 box-shadow: 0 8rpx 30rpx rgba(6, 193, 174, 0.3);
101 /* 轻微上浮动效 */ 102 /* 轻微上浮动效 */
102 animation: scaleIn 0.8s ease-out; 103 animation: scaleIn 0.8s ease-out;
103 } 104 }
104 105
105 /* 对勾图标 */ 106 /* 对勾图标 */
106 .check-icon { 107 .check-icon {
107 font-size: 90rpx; 108 font-size: 90rpx;
108 color: #ffffff; 109 color: #ffffff;
109 font-weight: bold; 110 font-weight: bold;
110 } 111 }
111 112
112 /* 支付成功标题 */ 113 /* 支付成功标题 */
113 .success-title { 114 .success-title {
114 font-size: 48rpx; 115 font-size: 48rpx;
115 font-weight: 700; 116 font-weight: 700;
116 color: #333333; 117 color: #333333;
117 margin-bottom: 12rpx; 118 margin-bottom: 12rpx;
118 animation: slideUp 0.6s ease-out; 119 animation: slideUp 0.6s ease-out;
119 } 120 }
120 121
121 /* 副标题 */ 122 /* 副标题 */
122 .success-subtitle { 123 .success-subtitle {
123 font-size: 28rpx; 124 font-size: 28rpx;
124 color: #666666; 125 color: #666666;
125 margin-bottom: 60rpx; 126 margin-bottom: 60rpx;
126 animation: slideUp 0.8s ease-out; 127 animation: slideUp 0.8s ease-out;
127 } 128 }
128 129
129 /* 订单信息卡片 */ 130 /* 订单信息卡片 */
130 .info-card { 131 .info-card {
131 width: 100%; 132 width: 100%;
132 background: #ffffff; 133 background: #ffffff;
133 border-radius: 20rpx; 134 border-radius: 20rpx;
...@@ -135,55 +136,55 @@ ...@@ -135,55 +136,55 @@
135 box-shadow: 0 6rpx 20rpx rgba(0, 0, 0, 0.05); 136 box-shadow: 0 6rpx 20rpx rgba(0, 0, 0, 0.05);
136 margin-bottom: 80rpx; 137 margin-bottom: 80rpx;
137 animation: fadeIn 1s ease-out; 138 animation: fadeIn 1s ease-out;
138 } 139 }
139 140
140 /* 单个信息项 */ 141 /* 单个信息项 */
141 .info-item { 142 .info-item {
142 display: flex; 143 display: flex;
143 justify-content: space-between; 144 justify-content: space-between;
144 align-items: center; 145 align-items: center;
145 padding: 24rpx 0; 146 padding: 24rpx 0;
146 border-bottom: 1rpx solid #f5f5f5; 147 border-bottom: 1rpx solid #f5f5f5;
147 } 148 }
148 149
149 /* 最后一项去掉下划线 */ 150 /* 最后一项去掉下划线 */
150 .info-item:last-child { 151 .info-item:last-child {
151 border-bottom: none; 152 border-bottom: none;
152 } 153 }
153 154
154 /* 标签样式 */ 155 /* 标签样式 */
155 .label { 156 .label {
156 font-size: 32rpx; 157 font-size: 32rpx;
157 color: #666666; 158 color: #666666;
158 white-space: nowrap; 159 white-space: nowrap;
159 margin-right: 20rpx; 160 margin-right: 20rpx;
160 flex-shrink: 0; 161 flex-shrink: 0;
161 } 162 }
162 163
163 /* 值样式 */ 164 /* 值样式 */
164 .value { 165 .value {
165 font-size: 32rpx; 166 font-size: 32rpx;
166 color: #333333; 167 color: #333333;
167 text-align: right; 168 text-align: right;
168 word-break: break-all; 169 word-break: break-all;
169 word-wrap: break-word; 170 word-wrap: break-word;
170 } 171 }
171 172
172 /* 金额特殊样式 */ 173 /* 金额特殊样式 */
173 .amount { 174 .amount {
174 color: #cd1e27; 175 color: #cd1e27;
175 font-weight: 600; 176 font-weight: 600;
176 } 177 }
177 178
178 /* 确定按钮区域 */ 179 /* 确定按钮区域 */
179 .confirm-btn-area { 180 .confirm-btn-area {
180 width: 100%; 181 width: 100%;
181 padding: 0 20rpx; 182 padding: 0 20rpx;
182 box-sizing: border-box; 183 box-sizing: border-box;
183 } 184 }
184 185
185 /* 确定按钮(渐变+动效) */ 186 /* 确定按钮(渐变+动效) */
186 .confirm-btn { 187 .confirm-btn {
187 width: 100%; 188 width: 100%;
188 height: 90rpx; 189 height: 90rpx;
189 line-height: 90rpx; 190 line-height: 90rpx;
...@@ -198,20 +199,20 @@ ...@@ -198,20 +199,20 @@
198 /* 禁止默认样式 */ 199 /* 禁止默认样式 */
199 position: relative; 200 position: relative;
200 overflow: hidden; 201 overflow: hidden;
201 } 202 }
202 203
203 /* 按钮点击反馈 */ 204 /* 按钮点击反馈 */
204 .confirm-btn::after { 205 .confirm-btn::after {
205 border: none; 206 border: none;
206 } 207 }
207 208
208 .confirm-btn:active { 209 .confirm-btn:active {
209 transform: scale(0.98); 210 transform: scale(0.98);
210 box-shadow: 0 4rpx 10rpx rgba(6, 193, 174, 0.2); 211 box-shadow: 0 4rpx 10rpx rgba(6, 193, 174, 0.2);
211 } 212 }
212 213
213 /* 动画定义 */ 214 /* 动画定义 */
214 @keyframes fadeIn { 215 @keyframes fadeIn {
215 0% { 216 0% {
216 opacity: 0; 217 opacity: 0;
217 } 218 }
...@@ -219,9 +220,9 @@ ...@@ -219,9 +220,9 @@
219 100% { 220 100% {
220 opacity: 1; 221 opacity: 1;
221 } 222 }
222 } 223 }
223 224
224 @keyframes scaleIn { 225 @keyframes scaleIn {
225 0% { 226 0% {
226 transform: scale(0); 227 transform: scale(0);
227 } 228 }
...@@ -233,9 +234,9 @@ ...@@ -233,9 +234,9 @@
233 100% { 234 100% {
234 transform: scale(1); 235 transform: scale(1);
235 } 236 }
236 } 237 }
237 238
238 @keyframes slideUp { 239 @keyframes slideUp {
239 0% { 240 0% {
240 opacity: 0; 241 opacity: 0;
241 transform: translateY(30rpx); 242 transform: translateY(30rpx);
...@@ -245,5 +246,5 @@ ...@@ -245,5 +246,5 @@
245 opacity: 1; 246 opacity: 1;
246 transform: translateY(0); 247 transform: translateY(0);
247 } 248 }
248 } 249 }
249 </style> 250 </style>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!