5d5e4447 by 张猛

团体支付

1 parent f6e7f935
1 <?xml version="1.0" encoding="UTF-8"?>
2 <project version="4">
3 <component name="cn.fjdmy.uniapp.UniappProjectDataService">
4 <option name="basePath" value="$PROJECT_DIR$" />
5 <option name="generalBasePath" value="$PROJECT_DIR$" />
6 <option name="manifestPath" value="$PROJECT_DIR$/manifest.json" />
7 <option name="pagesPath" value="$PROJECT_DIR$/pages.json" />
8 <option name="scanNum" value="1" />
9 <option name="type" value="store" />
10 <option name="uniapp" value="true" />
11 <option name="uniappHx" value="true" />
12 <option name="vueVersion" value="3" />
13 </component>
14 </project>
...\ No newline at end of file ...\ No newline at end of file
1 <component name="InspectionProjectProfileManager">
2 <profile version="1.0">
3 <option name="myName" value="Project Default" />
4 <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
5 <inspection_tool class="HtmlDeprecatedAttribute" enabled="false" level="WARNING" enabled_by_default="false" />
6 <inspection_tool class="JSEqualityComparisonWithCoercion" enabled="false" level="WARNING" enabled_by_default="false" />
7 <inspection_tool class="JSUnresolvedReference" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
8 </profile>
9 </component>
...\ No newline at end of file ...\ No newline at end of file
1 // dev 1 // dev
2 // const baseUrl_api = 'http://192.168.1.137:8787' 2 const baseUrl_api = 'http://192.168.1.137:8787'
3 const baseUrl_api = 'http://tk001.wxjylt.com/stage-api' 3 // const baseUrl_api = 'http://tk001.wxjylt.com/stage-api'
4 const payUrl = 'https://wxpay.cmbc.com.cn/mobilePlatform/appserver/lcbpPay.do' 4 const payUrl = 'https://wxpay.cmbc.com.cn/mobilePlatform/appserver/lcbpPay.do'
5 5
6 // prod 6 // prod
...@@ -10,4 +10,4 @@ const payUrl = 'https://wxpay.cmbc.com.cn/mobilePlatform/appserver/lcbpPay.do' ...@@ -10,4 +10,4 @@ const payUrl = 'https://wxpay.cmbc.com.cn/mobilePlatform/appserver/lcbpPay.do'
10 export default { 10 export default {
11 baseUrl_api, 11 baseUrl_api,
12 payUrl 12 payUrl
13 }
...\ No newline at end of file ...\ No newline at end of file
13 }
......
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
109 const res = await api.goPay(rangeId.value) 109 const res = await api.goPay(rangeId.value)
110 110
111 if (res.data?.orderId) { 111 if (res.data?.orderId) {
112 api.pcallBack2(res.data.orderId) 112 await api.pcallBack2(res.data.orderId)
113 uni.redirectTo({ 113 uni.redirectTo({
114 url: `/myCenter/sucPay?rangeId=${rangeId.value}from=payOrder` 114 url: `/myCenter/sucPay?rangeId=${rangeId.value}from=payOrder`
115 }) 115 })
...@@ -251,4 +251,4 @@ ...@@ -251,4 +251,4 @@
251 color: #fff; 251 color: #fff;
252 } 252 }
253 } 253 }
254 </style>
...\ No newline at end of file ...\ No newline at end of file
254 </style>
......
...@@ -330,6 +330,7 @@ ...@@ -330,6 +330,7 @@
330 }; 330 };
331 } 331 }
332 }) 332 })
333
333 onLoad(option => { 334 onLoad(option => {
334 let userName = uni.getStorageSync('userName') 335 let userName = uni.getStorageSync('userName')
335 if (!userName) { 336 if (!userName) {
...@@ -443,8 +444,7 @@ ...@@ -443,8 +444,7 @@
443 // deptInfo.value = app.globalData.dept || {} 444 // deptInfo.value = app.globalData.dept || {}
444 // app.globalData.deptInfo = res.dept || {} 445 // app.globalData.deptInfo = res.dept || {}
445 console.log(43,res) 446 console.log(43,res)
446 if (userType.value != '1' && app.globalData.authenticationStatus != '2' && app.globalData 447 if (userType.value != '1' && app.globalData.authenticationStatus != '2' && app.globalData.authenticationStatus != '4') {
447 .authenticationStatus != '4') {
448 // 注册引导 448 // 注册引导
449 uni.navigateTo({ 449 uni.navigateTo({
450 url: '/pages/index/perfect' 450 url: '/pages/index/perfect'
...@@ -524,7 +524,7 @@ ...@@ -524,7 +524,7 @@
524 }); 524 });
525 } 525 }
526 </script> 526 </script>
527 <style scope lang="scss"> 527 <style scoped lang="scss">
528 :deep(.uni-section) { 528 :deep(.uni-section) {
529 background-color: transparent !important; 529 background-color: transparent !important;
530 } 530 }
...@@ -642,4 +642,4 @@ ...@@ -642,4 +642,4 @@
642 padding: 0 20rpx 0; 642 padding: 0 20rpx 0;
643 } 643 }
644 } 644 }
645 </style>
...\ No newline at end of file ...\ No newline at end of file
645 </style>
......
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
84 <button 84 <button
85 class="action-btn submit-btn" 85 class="action-btn submit-btn"
86 @click.stop="commitFN(item)" 86 @click.stop="commitFN(item)"
87 :disabled="item.auditStatus != 0"> 87 :disabled="item.auditStatus != 0&&item.auditStatus != 9">
88 提交审核 88 提交审核
89 </button> 89 </button>
90 </view> 90 </view>
...@@ -630,4 +630,4 @@ onUnmounted(() => { ...@@ -630,4 +630,4 @@ onUnmounted(() => {
630 border-radius:46rpx; 630 border-radius:46rpx;
631 font-weight:600; 631 font-weight:600;
632 } 632 }
633 </style>
...\ No newline at end of file ...\ No newline at end of file
633 </style>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!