caoliancun
/
company_h5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新

Browse Source
pull/2/head
xiaozhiyong 2 years ago
parent c50f14f14c
commit 4164ce1b5c
8 changed files with 101 additions and 92 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      .env.development
  2. 4
      public/index.html
  3. 51
      src/App.vue
  4. 1
      src/permission.js
  5. 9
      src/utils/auth.js
  6. 4
      src/utils/request.js
  7. 3
      src/views/cashier/cashierIndex.vue
  8. 118
      src/views/cashier/paymentl.vue

3
.env.development
Unescape View File

@ -12,8 +12,9 @@ VUE_APP_UPLOAD_PRIVATE_URL = '/api/oil-dict/imageHandler/uploadProtectedImg'
VUE_APP_DOMAIN = '192.168.0.150:38080'
# 开发环境，不会进行加密，会打印出数据
VUE_APP_ENV = 'development'
VUE_APP_ENV = 'production'
#production
VUE_CLI_BABEL_TRANSPILE_MODULES = true
# http://192.168.1.86:9528/h5/#/home?token=0fbdf930-21b8-47f6-be6e-fc9c65045424

4
public/index.html
Unescape View File

@ -31,8 +31,8 @@
})
</script>
<script src="https://cdn.bootcdn.net/ajax/libs/vConsole/3.9.0/vconsole.min.js"></script>
<!-- <script src="https://cdn.bootcdn.net/ajax/libs/vConsole/3.9.0/vconsole.min.js"></script>
<script>
var vConsole = new VConsole()
console.log('Hello world')
</script>
</script> -->

51
src/App.vue
Unescape View File

@ -1,20 +1,26 @@
<template>
<div id="app">
<van-nav-bar v-if="!$route.meta?.closeNavBar"
style="background-color: #ff6700 !important;color: #ffffff !important;" :title="navData.meta.title"
:border="false" :left-arrow="navData.path == '/' ? false : true" @click-left="onClickLeft"
@click-right="onClickRight" />
<van-nav-bar
v-if="!$route.meta?.closeNavBar"
style="background-color: #ff6700 !important; color: #ffffff !important"
:title="navData.meta.title"
:border="false"
:left-arrow="navData.path == '/' ? false : true"
@click-left="onClickLeft"
@click-right="onClickRight"
/>
<transition :name="silderName">
<keep-alive :include="['HomeView']" >
<router-view :style="{ height: navData.path == '/' ? '' : 'calc(100vh - 46px)' }" class="routerView" ></router-view>
<keep-alive :include="['HomeView']">
<router-view :style="{ height: navData.path == '/' ? '' : 'calc(100vh - 46px)' }" class="routerView"></router-view>
</keep-alive>
</transition>
<!-- <transition :name="silderName">
<!-- <transition :name="silderName">
<router-view :style="{ height: navData.path == '/' ? '' : 'calc(100vh - 46px)' }" class="routerView"></router-view>
</transition> -->
</div>
</template>
<script>
// import encode from 'utils/encode.js'
export default {
data() {
return {
@ -28,37 +34,42 @@ export default {
msg: process.env.VUE_APP_ENV
}
},
created() {
},
mounted() {
},
// created() {
// console.log(
// encode.encrypt(
// JSON.stringify({
// phone: '15098877777',
// companyId: '1644149961976160256'
// })
// )
// )
// console.log(encode.decrypt('PS3WM/yuXTO39U3trxsIv3MR6bQet5PgwiSo/BpGoEC7oQ4a8dtxItMPtba5ho/O5xU3x2NsNr4H6OkELDRKFxDn9OsDQq7CsMXiu/MUMKw='))
// },
mounted() {},
watch: {
$route: function (t, f) {
this.navData = t
if (t.meta.index > f.meta.index) {
this.silderName = 'slide-right';
this.silderName = 'slide-right'
} else {
this.silderName = 'slide-left';
this.silderName = 'slide-left'
}
}
},
methods: {
routerBar(){
},
routerBar() {},
onClickLeft() {
this.$router.back()
// this.$notify('点击返回');
},
onClickRight() {
console.log('点击按钮')
},
},
}
}
}
</script>
<style>
.sa{
.sa {
justify-content: space-around;
}
.bw {

1
src/permission.js
Unescape View File

@ -31,6 +31,7 @@ router.beforeEach(async (to, from, next) => {
// )
let paramsTarget = obtainUrlPathParameterTarget(location.href)
if (paramsTarget.token) {
// sessionStorage.setItem('h5Token',)
setToken(paramsTarget.token)
store.getUser()
next()

9
src/utils/auth.js
Unescape View File

@ -1,21 +1,22 @@
import Cookies from 'js-cookie'
const TokenKey = 'Authorization'
let tokenKey = 'h5Token'
// const TokenKey = 'Authorization'
// const NetWorkId = 'networkId'
// const UserName = 'username'
// const PassWord = 'password'
// const Checked = 'checked'
export function getToken() {
return Cookies.get(TokenKey)
return sessionStorage.getItem(tokenKey)
}
export function setToken(token) {
return Cookies.set(TokenKey, token, { expires: 1 })
sessionStorage.setItem(tokenKey, token)
}
export function removeToken() {
return Cookies.remove(TokenKey)
sessionStorage.removeItem(tokenKey)
}
// export function setNet(networkId) {

4
src/utils/request.js
Unescape View File

@ -54,7 +54,7 @@ service.interceptors.response.use(
// if (!contentType.includes('application/json')) return res
if (env === 'production') {
res.data = JSON.parse(encode.decrypt(res.data))
res.data = res.data ? JSON.parse(encode.decrypt(res.data)) : {}
}
if (res && res.code) {
@ -73,7 +73,7 @@ service.interceptors.response.use(
})
return
}
if (![20000].includes(res.code)) {
if (![20000, 40000].includes(res.code)) {
console.log('code码:' + res.code)
Notify({
message: res.msg || '操作失败',

3
src/views/cashier/cashierIndex.vue
Unescape View File

@ -93,7 +93,6 @@ export default {
},
created() {
this.orderData = JSON.parse(this.$route.query.order)
console.log('this.orderData', this.orderData)
this.time = this.getCountDownTime(this.orderData.createTime)
this.updateDetails()
@ -102,7 +101,6 @@ export default {
methods: {
cardListFn() {
let networkId = this.$pinia.state.value.user.user?.networkId
// console.log('this.$pinia.value', networkId)
let company = this.orderData.companyAccounts
? this.orderData.companyAccounts
.filter(item => {
@ -123,7 +121,6 @@ export default {
return item
})
: []
console.log('other', other)
this.cardList = [...company, ...other]
},
updateDetails() {

118
src/views/cashier/paymentl.vue
Unescape View File

@ -1,18 +1,18 @@
<template>
<div class="paymentl">
<detailsCardHeader :countTimer='countTimer' :codeTpe="codeTpe" ></detailsCardHeader>
<detailsCard :detailsList="detailsList"></detailsCard>
<detailsCardHeader :countTimer="countTimer" :codeTpe="codeTpe"></detailsCardHeader>
<detailsCard :detailsList="detailsList"></detailsCard>
<div @click="goHome" class="paymentl-footer flex ac jc">返回首页</div>
</div>
</template>
<script>
import vueQr from 'vue-qr'
import detailsCard from "./components/detailsCard.vue";
import detailsCardHeader from "./components/detailsCardHeader.vue";
import oilSiteApi from '@/api/oil-site.js';
import useStore from '@/store/piniaIndex';
let store = useStore();
import detailsCard from './components/detailsCard.vue'
import detailsCardHeader from './components/detailsCardHeader.vue'
import oilSiteApi from '@/api/oil-site.js'
import useStore from '@/store/piniaIndex'
let store = useStore()
export default {
components: {
detailsCard,
@ -21,13 +21,13 @@ export default {
},
data() {
return {
user:store.user,
countTimer:180,
timer:null,
codeTpe:{
switch:false,
codeValue:'',
imgType:true
user: store.user,
countTimer: 180,
timer: null,
codeTpe: {
switch: false,
codeValue: '',
imgType: true
},
detailsCardTitle: {},
detailsList: [
@ -38,7 +38,7 @@ export default {
valueStyle: {
color: ''
}
},
}
],
[
{
@ -56,7 +56,7 @@ export default {
{
lable: '加油员：',
value: '李某'
},
}
// {
// lable: '加油渠道：',
// value: '星油 查看三方支付凭证'
@ -81,7 +81,7 @@ export default {
valueStyle: {
color: '#FF0000'
}
},
}
],
[
{
@ -90,73 +90,71 @@ export default {
},
{
lable: '加油司机：',
value: (store.user&&store.user.name)||'---',
value: (store.user && store.user.name) || '---'
},
{
lable: '油卡性质：',
value: '企业油卡',
},
],
value: '企业油卡'
}
]
]
};
}
},
created(){
console.log(this.user,'user')
created() {
// console.log(this.user,'user')
this.init()
},
watch:{
countTimer:function(n){
}
watch: {
countTimer: function (n) {}
},
methods:{
init(){
methods: {
init() {
this.orderData = JSON.parse(this.$route.query.orderData)
this.codeTpe.imgType = JSON.parse(this.$route.query.type)
console.log(this.codeTpe.imgType)
this.getCode();
this.updateDetails();
console.log(this.codeTpe)
this.getCode()
this.updateDetails()
},
Timekeeping(){
Timekeeping() {
this.countTimer = 180000
this.timer = setInterval(()=>{
if(this.countTimer==0){
clearInterval(this.timer);
this.timer = setInterval(() => {
if (this.countTimer == 0) {
clearInterval(this.timer)
this.getCode()
return
}
this.countTimer-=10;
},10)
this.countTimer -= 10
}, 10)
},
goHome(){
goHome() {
this.$router.push('/')
},
updateDetails(){
this.detailsList[0][0].value = this.orderData.orderSerialNumber;
this.detailsList[1][0].value = this.orderData.siteName ;
this.detailsList[1][1].value = `${this.orderData.oilsCode} ${this.orderData.oilsBar}号枪`;
this.detailsList[1][2].value = `${Number(this.orderData.volume).toFixed(2)}L`;
this.detailsList[1][3].value = this.orderData.siteUserName ;
this.detailsList[2][0].value = '￥'+this.orderData.realAmount ;
this.detailsList[2][1].value = '￥'+ Number(this.orderData.oilDiscountAmount).toFixed(2) ;
this.detailsList[3][0].value = this.orderData.plateNumber ;
updateDetails() {
this.detailsList[0][0].value = this.orderData.orderSerialNumber
this.detailsList[1][0].value = this.orderData.siteName
this.detailsList[1][1].value = `${this.orderData.oilsCode} ${this.orderData.oilsBar}号枪`
this.detailsList[1][2].value = `${Number(this.orderData.volume).toFixed(2)}L`
this.detailsList[1][3].value = this.orderData.siteUserName
this.detailsList[2][0].value = '￥' + this.orderData.realAmount
this.detailsList[2][1].value = '￥' + Number(this.orderData.oilDiscountAmount).toFixed(2)
this.detailsList[3][0].value = this.orderData.plateNumber
// this.detailsList[3][2].value = '￥'+this.orderData.plateNumber ;
},
getCode(){
console.log( this.orderData)
oilSiteApi.getOrderQrCode(this.orderData.orderSerialNumber).then(res=>{
if(res.code==20000){
getCode() {
// console.log(this.orderData)
oilSiteApi.getOrderQrCode(this.orderData.orderSerialNumber).then(res => {
if (res.code == 20000) {
this.codeTpe.codeValue = ''
this.$nextTick(function(){
this.codeTpe.switch = true;
this.codeTpe.codeValue = res.data.codeStr;
this.Timekeeping()
})
this.$nextTick(function () {
this.codeTpe.switch = true
this.codeTpe.codeValue = res.data.codeStr
this.Timekeeping()
})
}
})
}
}
};
}
</script>
<style scoped>
@ -188,4 +186,4 @@ export default {
color: #333333;
margin: 50px auto;
}
</style>
</style>

Write Preview
Loading…
Cancel
Save