Merge branch 'gaoqucodecheck' of...

Merge branch 'gaoqucodecheck' of http://h.gemho.cn:7099/zhaojunbao/gaoquyingjih5-asd into gaoqucodecheck

sdk/axios_http3.js

@@ -2,21 +2,27 @@
  * 请求拦截、相应拦截、错误统一处理
  */
 // 环境的切换
-// axios.defaults.baseURL = 'http://192.168.2.37:8080'
-axios.defaults.baseURL = 'https://gqyjpt.weihai.cn/prod-api'
+
+if (window.env == 'dev') {
+	axios.defaults.baseURL = 'http://192.168.2.37:8080'
+	// 商户token
+	// axios.defaults.headers.common['Authorization'] =
+	//   'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiLlvKDlrZ3lvakiLCJsb2dpbl91c2VyX2tleSI6IjNjMmRiMWFiLWIyZGMtNDBjYi04YjM5LWRiNTJmM2VmYzNkYyJ9.sfZyPP-COShNCjwxKR26zGDsPHXss97gu7JEpaMapIZyMQEsxzMigVickcqdhaqDwTRcfr0IxAj64vnrriS9Cw'
+	
+	// admin账号token
+	axios.defaults.headers.common['Authorization'] =
+	'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImxvZ2luX3VzZXJfa2V5IjoiYjA1MWRmZmEtYWE4Yy00NTNiLThlNGUtMTdjOTEzYmMwOWFkIn0.nj2miSFFPQRDabzhq_05z_wW0w13quXBooQbbtnyRZQxOhxenEQQZM3OgKjgd8AxjY7W2uKlpdyqGuTmMb1PRQ'
+	
+}else{
+	axios.defaults.baseURL = 'https://gqyjpt.weihai.cn/prod-api'
+	axios.defaults.headers.common['Authorization'] = gemhoUtil.getCookie('token')
+}
+
 
 axios.defaults.timeout = 50000
 // post请求头
 // axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
 axios.defaults.headers.post['Content-Type'] = 'application/json'
-axios.defaults.headers.common['Authorization'] = gemhoUtil.getCookie('token')
-// 商户token
-// axios.defaults.headers.common['Authorization'] =
-//   'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiLlvKDlrZ3lvakiLCJsb2dpbl91c2VyX2tleSI6IjNjMmRiMWFiLWIyZGMtNDBjYi04YjM5LWRiNTJmM2VmYzNkYyJ9.sfZyPP-COShNCjwxKR26zGDsPHXss97gu7JEpaMapIZyMQEsxzMigVickcqdhaqDwTRcfr0IxAj64vnrriS9Cw'
-
-// admin账号token
-// axios.defaults.headers.common['Authorization'] =
-// 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImxvZ2luX3VzZXJfa2V5IjoiYjA1MWRmZmEtYWE4Yy00NTNiLThlNGUtMTdjOTEzYmMwOWFkIn0.nj2miSFFPQRDabzhq_05z_wW0w13quXBooQbbtnyRZQxOhxenEQQZM3OgKjgd8AxjY7W2uKlpdyqGuTmMb1PRQ'
 
 
 // 请求拦截器

sdk/includeHead.js

@@ -43,12 +43,13 @@ document.write(`
    <script type="text/javascript" src="${contextPath}/sdk/flexible.js"></script>
    <script type="text/javascript" src="${contextPath}/sdk/util.js?rev=${jsVersion}"></script>
    <script type="text/javascript" src="${contextPath}/sdk/jssdk2/apiKeyMap.js?rev=${jsVersion}"></script>
+	<script type="text/javascript" src="${contextPath}/sdk/axios.min.js"></script>
 `)
 
 let writeText = ''
 if (window.env == 'dev') {
   writeText = `
-  <script type="text/javascript" src="${contextPath}/sdk/axios.min.js"></script>
+
   <script type="text/javascript" src="${contextPath}/sdk/axios_http.js"></script>
 `
 } else {

src/_check_info.js

@@ -102,22 +102,22 @@ window.onload = function() {
 		methods: {
 			
 			validRequired(){
-			// 	const currentPageData = this.checkData[this.checkPageIndex];
-			// 	const errorRows = currentPageData.gqCheckItemList.filter((item)=>{
-			// 		console.log(item)
-			// 		if(item.itemAnswer === 2){
-			// 			return !item.description || !item.photos.length || !item.deadlineDays
-			// 		}
-			// 		return false
-			// 	})
-			// 	console.log('errorRows.length', errorRows.length)
-			// 	if(errorRows.length){
-			// 		vant.Dialog.alert({
-			// 			title: '信息提示',
-			// 			message: '请填写完整信息，必填项不可为空',
-			// 		  })
-			// 		  return
-			// 	}
+				const currentPageData = this.checkData[this.checkPageIndex];
+				const errorRows = currentPageData.gqCheckItemList.filter((item)=>{
+					console.log(item)
+					if(item.itemAnswer === 2){
+						return !item.description || !item.photos?.length || !item.deadlineDays
+					}
+					return false
+				})
+				console.log('errorRows.length', errorRows.length)
+				if(errorRows.length){
+					vant.Dialog.alert({
+						title: '信息提示',
+						message: '请填写完整信息，必填项不可为空',
+					  })
+					  return
+				}
 			
 				this.checkPageIndex++;
 			},