提交 e4015d7b authored 作者: lihuihui's avatar lihuihui

update

上级 bd926dd2
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
padding: 0; padding: 0;
} }
html{ html{
max-width: 750px; max-width: 400px;
margin: 0 auto; margin: 0 auto;
} }
body { body {
......
...@@ -8,9 +8,27 @@ ...@@ -8,9 +8,27 @@
? win.screen.width ? win.screen.width
: win.innerWidth : win.innerWidth
: win.innerWidth : win.innerWidth
const wFsize = ((wWidth > 750 ? 750 : wWidth) / 750) * 100 console.log(IsPC(), 'is')
const wFsize = ((wWidth > 750 ? 750 : wWidth) / 750) * (IsPC() ? 50 : 100)
doc.documentElement.style.fontSize = wFsize + 'px' doc.documentElement.style.fontSize = wFsize + 'px'
} }
win.addEventListener(resize, resizeRoot, false) win.addEventListener(resize, resizeRoot, false)
doc.addEventListener('DOMContentLoaded', resizeRoot, false) doc.addEventListener('DOMContentLoaded', resizeRoot, false)
})(window, document) })(window, document)
function IsPC() {
const userAgentInfo = navigator.userAgent
const Agents = ['Android', 'iPhone', 'SymbianOS', 'Windows Phone', 'iPad', 'iPod']
let flagPc = true
for (let v = 0; v < Agents.length; v++) {
if (userAgentInfo.indexOf(Agents[v]) > 0) {
flagPc = false
break
}
}
return flagPc
}
<template> <template>
<div class="main_header"> <div class="main_header" id="main_header">
<van-nav-bar fixed :title="title" left-arrow @click-left="onClickLeft"> <van-nav-bar :title="title" left-arrow @click-left="onClickLeft">
<template #right v-if="center"> <template #right v-if="center && pathName === '/'">
<div style="display:flex;" @click="onClickRight"> <div style="display: flex" @click="onClickRight">
<div class="text" style="font-size: .24rem;color: #333333;margin-right:.05rem">个人中心</div> <div class="text" style="font-size: 0.24rem; color: #333333; margin-right: 0.05rem">个人中心</div>
<van-icon v-if="pathName === '/'" name="contact" size="18" /> <van-icon name="contact" size="18" />
</div> </div>
</template> </template>
</van-nav-bar> </van-nav-bar>
...@@ -32,7 +32,25 @@ export default { ...@@ -32,7 +32,25 @@ export default {
return window.location.pathname return window.location.pathname
} }
}, },
mounted() {
if (this.isPc()) {
document.getElementById('main_header').style.width = '400px'
}
},
methods: { methods: {
isPc() {
const userAgentInfo = navigator.userAgent
const Agents = ['Android', 'iPhone', 'SymbianOS', 'Windows Phone', 'iPad', 'iPod']
let flagPc = true
for (let v = 0; v < Agents.length; v++) {
if (userAgentInfo.indexOf(Agents[v]) > 0) {
flagPc = false
break
}
}
return flagPc
},
// 首页返回按钮 // 首页返回按钮
onClickLeft() { onClickLeft() {
this.callBack ? this.$emit('back') : history.back() this.callBack ? this.$emit('back') : history.back()
...@@ -68,5 +86,6 @@ export default { ...@@ -68,5 +86,6 @@ export default {
position: fixed; position: fixed;
top: 0; top: 0;
z-index: 2000; z-index: 2000;
width: 100%;
} }
</style> </style>
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="show_content"> <div class="show_content">
<div class="show_content_img" v-html="data.desc"></div> <div class="show_content_img" v-html="data.desc"></div>
</div> </div>
<div class="main_content_footer"> <div class="main_content_footer" id="main_content_footer">
<div class="show_content_btn" @click="handleSubmit">{{ data.title }}</div> <div class="show_content_btn" @click="handleSubmit">{{ data.title }}</div>
</div> </div>
</div> </div>
...@@ -26,8 +26,25 @@ export default { ...@@ -26,8 +26,25 @@ export default {
stepList: { type: Array }, stepList: { type: Array },
data: { type: Object } data: { type: Object }
}, },
mounted() {}, mounted() {
if (this.isPc()) {
document.getElementById('main_content_footer').style.width = '400px'
}
},
methods: { methods: {
isPc() {
const userAgentInfo = navigator.userAgent
const Agents = ['Android', 'iPhone', 'SymbianOS', 'Windows Phone', 'iPad', 'iPod']
let flagPc = true
for (let v = 0; v < Agents.length; v++) {
if (userAgentInfo.indexOf(Agents[v]) > 0) {
flagPc = false
break
}
}
return flagPc
},
handlePrev() { handlePrev() {
this.$emit('prev') this.$emit('prev')
}, },
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
import { uploadPay } from '../api.js' import { uploadPay } from '../api.js'
import Commonheader from './Commonheader.vue' import Commonheader from './Commonheader.vue'
import UploadImage from '@/components/upload/UploadImage.vue' import UploadImage from '@/components/upload/UploadImage.vue'
import { Toast } from 'vant'
export default { export default {
components: { components: {
UploadImage, UploadImage,
...@@ -59,7 +60,10 @@ export default { ...@@ -59,7 +60,10 @@ export default {
voucher: JSON.stringify(this.form.voucher), voucher: JSON.stringify(this.form.voucher),
comment: this.form.comment comment: this.form.comment
} }
console.log(params, 'par') if (!this.form.voucher.length) {
Toast('请上传凭证')
return false
}
uploadPay(Object.assign(this.data.params, params)).then(res => { uploadPay(Object.assign(this.data.params, params)).then(res => {
if (this.stepList.length !== this.data.num) { if (this.stepList.length !== this.data.num) {
this.$router.go(0) this.$router.go(0)
......
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
</van-form> </van-form>
</div> </div>
</div> </div>
<div class="main_footer"> <div class="main_footer" id="main_footer">
<div class="main_footer_top" v-if="data.can_skip_pay === 1"> <div class="main_footer_top" v-if="data.can_skip_pay === 1">
<van-checkbox icon-size="13px" v-model="checkedPay" shape="square" class="main_content_skipPay"> <van-checkbox icon-size="13px" v-model="checkedPay" shape="square" class="main_content_skipPay">
{{ data.skip_pay_title }}</van-checkbox {{ data.skip_pay_title }}</van-checkbox
...@@ -150,8 +150,25 @@ export default { ...@@ -150,8 +150,25 @@ export default {
minDate: new Date() minDate: new Date()
} }
}, },
mounted() {}, mounted() {
if (this.isPc()) {
document.getElementById('main_footer').style.width = '400px'
}
},
methods: { methods: {
isPc() {
const userAgentInfo = navigator.userAgent
const Agents = ['Android', 'iPhone', 'SymbianOS', 'Windows Phone', 'iPad', 'iPod']
let flagPc = true
for (let v = 0; v < Agents.length; v++) {
if (userAgentInfo.indexOf(Agents[v]) > 0) {
flagPc = false
break
}
}
return flagPc
},
handleBack() { handleBack() {
this.$emit('prev') this.$emit('prev')
}, },
......
<template> <template>
<div class="main"> <div class="main">
<commonheader :title="title" @back="handleBack" :callBack="true" /> <commonheader :title="title" @back="handleBack" :callBack="true" :center="false" />
<div class="main_content"> <div class="main_content">
<!-- 头部tab --> <!-- 头部tab -->
<van-tabs v-model="active" animated sticky> <van-tabs v-model="active" animated sticky>
...@@ -73,9 +73,25 @@ export default { ...@@ -73,9 +73,25 @@ export default {
mounted() { mounted() {
this.getOrderList() this.getOrderList()
if (this.isPc()) {
document.getElementsByClassName('van-sticky')[0].style.width = '400px'
}
}, },
methods: { methods: {
isPc() {
const userAgentInfo = navigator.userAgent
const Agents = ['Android', 'iPhone', 'SymbianOS', 'Windows Phone', 'iPad', 'iPod']
let flagPc = true
for (let v = 0; v < Agents.length; v++) {
if (userAgentInfo.indexOf(Agents[v]) > 0) {
flagPc = false
break
}
}
return flagPc
},
handleBack() { handleBack() {
this.$router.push('/') this.$router.push('/')
}, },
...@@ -226,6 +242,8 @@ export default { ...@@ -226,6 +242,8 @@ export default {
width: 100%; width: 100%;
position: fixed; position: fixed;
z-index: 1000; z-index: 1000;
left: 50% !important;
transform: translateX(-50%) !important;
top: 0.8rem; top: 0.8rem;
} }
::v-deep .pay_btn { ::v-deep .pay_btn {
......
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<!-- <div class="pay-mode"> <!-- <div class="pay-mode">
<div class="title">选择支付方式</div> <div class="title">选择支付方式</div>
</div> --> </div> -->
<div class="main_footer"> <div class="main_footer" id="main_footer">
<van-checkbox v-model="isAll" :disabled="!data.payData.list.filter(item => ['0', '3'].includes(item.pay_record.pay_status)).length" @click="checkAll" class="checkAll">全选</van-checkbox> <van-checkbox v-model="isAll" :disabled="!data.payData.list.filter(item => ['0', '3'].includes(item.pay_record.pay_status)).length" @click="checkAll" class="checkAll">全选</van-checkbox>
<div class="main_footer_total"> <div class="main_footer_total">
<div class="main_footer_total_top"></div> <div class="main_footer_total_top"></div>
...@@ -151,10 +151,26 @@ export default { ...@@ -151,10 +151,26 @@ export default {
} }
}, },
mounted() { mounted() {
if (this.isPc()) {
document.getElementById('main_footer').style.width = '400px'
}
// console.log(JSON.parse(window.localStorage.stepData), 'data') // console.log(JSON.parse(window.localStorage.stepData), 'data')
this.payMode = this.data.pay_type[0] this.payMode = this.data.pay_type[0]
}, },
methods: { methods: {
isPc() {
const userAgentInfo = navigator.userAgent
const Agents = ['Android', 'iPhone', 'SymbianOS', 'Windows Phone', 'iPad', 'iPod']
let flagPc = true
for (let v = 0; v < Agents.length; v++) {
if (userAgentInfo.indexOf(Agents[v]) > 0) {
flagPc = false
break
}
}
return flagPc
},
getPayStatusValue(n) { getPayStatusValue(n) {
const value = { const value = {
0: '未支付', 0: '未支付',
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论