Skip to content

G
GaoQuYingJiH5-ASD
Commit 4af8aade authored by lei's avatar lei
Browse files
Options

Merge branch 'gaoqucodecheck' of... 

Merge branch 'gaoqucodecheck' of http://h.gemho.cn:7099/zhaojunbao/gaoquyingjih5-asd into gaoqucodecheck
parents 8f8607ed c182fe0f
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 13 deletions
sdk/axios_http.js
View file @ 4af8aade
......@@ -9,12 +9,12 @@ axios.defaults.timeout = 50000
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'
axios.defaults.headers.common['Authorization'] =
'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiLlvKDlrZ3lvakiLCJsb2dpbl91c2VyX2tleSI6IjNjMmRiMWFiLWIyZGMtNDBjYi04YjM5LWRiNTJmM2VmYzNkYyJ9.sfZyPP-COShNCjwxKR26zGDsPHXss97gu7JEpaMapIZyMQEsxzMigVickcqdhaqDwTRcfr0IxAj64vnrriS9Cw'
// admin账号token
axios.defaults.headers.common['Authorization'] =
'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImxvZ2luX3VzZXJfa2V5IjoiYjA1MWRmZmEtYWE4Yy00NTNiLThlNGUtMTdjOTEzYmMwOWFkIn0.nj2miSFFPQRDabzhq_05z_wW0w13quXBooQbbtnyRZQxOhxenEQQZM3OgKjgd8AxjY7W2uKlpdyqGuTmMb1PRQ'
// axios.defaults.headers.common['Authorization'] =
// 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImxvZ2luX3VzZXJfa2V5IjoiYjA1MWRmZmEtYWE4Yy00NTNiLThlNGUtMTdjOTEzYmMwOWFkIn0.nj2miSFFPQRDabzhq_05z_wW0w13quXBooQbbtnyRZQxOhxenEQQZM3OgKjgd8AxjY7W2uKlpdyqGuTmMb1PRQ'
// 请求拦截器
......
sdk/axios_http3.js
View file @ 4af8aade
......@@ -2,19 +2,21 @@
* 请求拦截、相应拦截、错误统一处理
*/
// 环境的切换
axios.defaults.baseURL = 'http://192.168.2.37:8080'
// axios.defaults.baseURL = 'http://192.168.2.37:8080'
axios.defaults.baseURL = 'https://gqyjpt.weihai.cn/prod-api'
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')
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'
// axios.defaults.headers.common['Authorization'] =
// 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImxvZ2luX3VzZXJfa2V5IjoiYjA1MWRmZmEtYWE4Yy00NTNiLThlNGUtMTdjOTEzYmMwOWFkIn0.nj2miSFFPQRDabzhq_05z_wW0w13quXBooQbbtnyRZQxOhxenEQQZM3OgKjgd8AxjY7W2uKlpdyqGuTmMb1PRQ'
// 请求拦截器
......
src/_check_info.css
View file @ 4af8aade
......@@ -174,6 +174,13 @@
background: #f5f6fa;
padding: 0.1rem 0.3rem;
}
/* 图片预览大小 */
.expand-section .van-uploader__preview-image {
display: block;
width: 1.4rem;
height: 1.4rem;
overflow: hidden;
}
/* 子复选框组 */
.sub-checkbox-group {
......
src/_check_info.html
View file @ 4af8aade
......@@ -57,7 +57,7 @@
<van-cell v-if="item.itemType==2">
<div class="limit_date_wrapper">
<span>住宿人数:</span>
<input type="text" v-model="item.gqCheckQuestionList[0].content" :disabled="flag!=='ADD'"
<input type="text" v-model="item.gqCheckQuestionList[0].content" :disabled="flag!=='ADD'" maxlength="3"
style="width:.8rem;height:.4rem;text-align:center;" />
</div>
</van-cell>
......@@ -109,7 +109,7 @@
<van-uploader style="width: 80px; height:80px;" v-model="item.photos" multiple
:max-count="4" :after-read="handleFileUpload" class="uploader-wrapper" />
</div> -->
<van-uploader v-model="item.photos" multiple :max-count="2" />
<van-uploader v-model="item.photos" multiple :max-count="4" />
</van-cell>
</van-cell-group>
......@@ -188,9 +188,9 @@
<van-button type="info" size="small" @click="add4JC_XQ"
v-show="checkPageIndex===3&&flag=='ADD'">完成检查</van-button>
<van-button v-show="checkPageIndex<3" type="info" size="small"
@click="checkPageIndex++">下一项</van-button>
@click="validRequired">下一项</van-button>
</div>
</div>
</div>
......
src/_check_info.js
View file @ 4af8aade
......@@ -100,6 +100,27 @@ 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
// }
this.checkPageIndex++;
},
getOriginMatchedItemById(id) {
const result = this.originCheckData[this.checkPageIndex]['gqCheckItemList'].find(item =>
item.id === id) || []
......@@ -113,7 +134,7 @@ window.onload = function() {
newItem.itemAnswer = val
// console.log(this.checkData[this.checkPageIndex]['gqCheckItemList'])
this.$set(this.checkData[this.checkPageIndex]['gqCheckItemList'], index, JSON.parse(JSON
.stringify()));
.stringify(newItem)));
console.log(val, this.checkData[this.checkPageIndex]['gqCheckItemList'][index], '数据改变了后',
index)
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment