Merge branch 'master' of https://code.itechtop.cn/yangyang/ztx_wx_gzt

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="cn.fjdmy.uniapp.UniappProjectDataService">
+    <option name="basePath" value="$PROJECT_DIR$" />
+    <option name="generalBasePath" value="$PROJECT_DIR$" />
+    <option name="manifestPath" value="$PROJECT_DIR$/manifest.json" />
+    <option name="pagesPath" value="$PROJECT_DIR$/pages.json" />
+    <option name="scanNum" value="1" />
+    <option name="type" value="store" />
+    <option name="uniapp" value="true" />
+    <option name="uniappHx" value="true" />
+    <option name="vueVersion" value="3" />
+  </component>
+</project>
\ No newline at end of file

+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="HtmlDeprecatedAttribute" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSEqualityComparisonWithCoercion" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUnresolvedReference" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+  </profile>
+</component>
\ No newline at end of file

@@ -85,9 +85,13 @@ async function minShengPay(orderId, encryptedData) {
   
   uni.hideLoading()
   // 8. 调起微信支付
-	const [payErr] = await to(invokeWechatPayment(payParams, orderId))
+  const [payErr, paySuccess] = await to(invokeWechatPayment(payParams, orderId))
   if (payErr) {
     handlePaymentError(payErr, orderId)
+    
+  }
+  if (paySuccess) {
+    return paySuccess
   }
 }
 

 // dev
-// const baseUrl_api = 'http://192.168.1.137:8787'
-const baseUrl_api = 'http://tk001.wxjylt.com/stage-api'
+const baseUrl_api = 'http://192.168.1.137:8787'
+// const baseUrl_api = 'http://tk001.wxjylt.com/stage-api'
 const payUrl = 'https://wxpay.cmbc.com.cn/mobilePlatform/appserver/lcbpPay.do'
 
 // prod

@@ -109,7 +109,7 @@
 			const res = await api.goPay(rangeId.value)
 
 			if (res.data?.orderId) {
-				api.pcallBack2(res.data.orderId)
+			await	api.pcallBack2(res.data.orderId)
 				uni.redirectTo({
 					url: `/myCenter/sucPay?rangeId=${rangeId.value}from=payOrder`
 				})

@@ -350,6 +350,7 @@
 			};
 		}
 	})
+ 
 	onLoad(option => {
 		let userName = uni.getStorageSync('userName')
 		if (!userName) {
@@ -463,8 +464,7 @@
 			// deptInfo.value = app.globalData.dept || {}
 			//  app.globalData.deptInfo  = res.dept || {}
 				console.log(43,res)
-			if (userType.value != '1' && app.globalData.authenticationStatus != '2' && app.globalData
-				.authenticationStatus != '4') {
+			if (userType.value != '1' && app.globalData.authenticationStatus != '2' && app.globalData.authenticationStatus != '4') {
 				// 注册引导
 				uni.navigateTo({
 					url: '/pages/index/perfect'
@@ -544,7 +544,7 @@
 		});
 	}
 </script>
-<style scope lang="scss">
+<style scoped lang="scss">
 	:deep(.uni-section) {
 		background-color: transparent !important;
 	}
@@ -663,3 +663,4 @@
 		}
 	}
 </style>
+

@@ -84,7 +84,7 @@
             <button 
               class="action-btn submit-btn" 
               @click.stop="commitFN(item)"
-              :disabled="item.auditStatus != 0">
+              :disabled="item.auditStatus != 0&&item.auditStatus != 9">
               提交审核
             </button>
           </view>