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

版本1.3.4

Browse Source
lixuan
xk_yangdeshi 4 years ago
parent 1d7add295e
commit 61a10d1e36
11 changed files with 245 additions and 209 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. 36
      App.vue
  2. 2
      manifest.json
  3. 10
      package-lock.json
  4. 4
      package.json
  5. 48
      packageOrders/components/order-item.vue
  6. 86
      packageOrders/pages/orderList/OrderDetail/OrderDetail.vue
  7. 11
      packageQr/components/OrderOil.vue
  8. 22
      pages.json
  9. 34
      pages/index/index.vue
  10. 2
      pages/setup/setup.vue
  11. 29
      utils/request.js

36
App.vue
Unescape View File

@ -28,26 +28,42 @@
}
})
},
onShow: function() {
console.log('App Show')
onShow: function() {
const JSESSIONID = utils.uuid()
console.log(JSESSIONID)
// console.log(utils.bcrypt(JSESSIONID))
uni.getLocation({
type: 'wgs84',
success: function(res) {
console.log('当前位置的经度：' + res.longitude);
console.log('当前位置的纬度：' + res.latitude);
const updateManager = uni.getUpdateManager();
updateManager.onCheckForUpdate(function(res) {
// 请求完新版本信息的回调
console.log('请求完新版本信息的回调', res.hasUpdate);
});
updateManager.onUpdateReady(function(res) {
uni.showModal({
title: '更新提示',
content: '新版本已经准备好，是否重启应用？',
success(resRes) {
if (resRes.confirm) {
// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
updateManager.applyUpdate();
}
}
});
});
updateManager.onUpdateFailed(function(res) {
// 新的版本下载失败
});
uni.setStorage({
key: 'service_baseUrl',
data: 'https://www.51xingka.net/LSMOIL/',
success: function() {
console.log('缓存baseUrl成功');
// console.log('缓存baseUrl成功');
}
})
}
});
},
onHide: function() {
console.log('App Hide')

2
manifest.json
Unescape View File

@ -74,7 +74,7 @@
"subPackages" : true
},
"uniStatistics" : {
"enable" : true
"enable" : false
}
},
"mp-alipay" : {

10
package-lock.json generated
Unescape View File

@ -57,6 +57,16 @@
"version": "0.1.6",
"resolved": "https://registry.npm.taobao.org/tki-qrcode/download/tki-qrcode-0.1.6.tgz",
"integrity": "sha1-cTc9nEs/iUT6pU0+6Ziroz2X3n8="
},
"tsc": {
"version": "2.0.3",
"resolved": "https://registry.nlark.com/tsc/download/tsc-2.0.3.tgz",
"integrity": "sha1-A3/leeO9Z6XL2qYEtDxsGZGwS+8="
},
"typescript": {
"version": "4.3.5",
"resolved": "https://registry.nlark.com/typescript/download/typescript-4.3.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftypescript%2Fdownload%2Ftypescript-4.3.5.tgz",
"integrity": "sha1-TRw3zBbok5c8RaBohrcRMjTxGfQ="
}
}
}

4
package.json
Unescape View File

@ -18,6 +18,8 @@
"js-cookie": "2.2.1",
"js-md5": "0.7.3",
"jsencrypt": "^3.0.0-rc.1",
"tki-qrcode": "^0.1.6"
"tki-qrcode": "^0.1.6",
"tsc": "^2.0.3",
"typescript": "^4.3.5"
}
}

48
packageOrders/components/order-item.vue
Unescape View File

@ -3,12 +3,9 @@
<template>
<view class="cu-item radius shadow margin-bottom ">
<!-- <image class="pay-status" :src="baseURL+'static/img/oil-unfinished.png'" alt /> -->
<view class="cu-avatar text-sl" v-if="item.sourceType==='3'"
:style="'background-image:url('+baseURL+'static/img/order-wjy.png)'"></view>
<view class="cu-avatar text-sl" v-if="item.sourceType==='4'||item.sourceType==='6'"
:style="'background-image:url('+baseURL+'static/img/order-xy.png)'"></view>
<view class="cu-avatar text-sl" v-if="item.sourceType==='5'"
:style="'background-image:url('+baseURL+'static/img/order-lv.png)'"></view>
<view class="cu-avatar text-sl" v-if="item.sourceType==='3'" :style="'background-image:url('+baseURL+'static/img/order-wjy.png)'"></view>
<view class="cu-avatar text-sl" v-if="item.sourceType==='4'||item.sourceType==='6'" :style="'background-image:url('+baseURL+'static/img/order-xy.png)'"></view>
<view class="cu-avatar text-sl" v-if="item.sourceType==='5'" :style="'background-image:url('+baseURL+'static/img/order-lv.png)'"></view>
<view class="content">
<view class=" solid-bottom padding-bottom-sm">
<view class="flex-treble" @tap="copyId(item.orderID)">
@ -19,18 +16,21 @@
</view>
</view>
<view class=" text-content text-df">
<text class="lin-h-2">
{{item.oilSiteName}}
</text>
</view>
<view class="text-sm padding-top-sm" @tap="toDetails(item.orderID)">
<view class="text-sm " @tap="toDetails(item.orderID)">
<view class="flex">
<view class="details">
<view class="top1 text-left">
<image class="icon icon-desc " :src="baseURL+'static/img/oil-lf.png'" alt />
<text class="padding-left-xs padding-right-xs" v-if="item.vol">
{{item.vol|numberFilter}}升</text>
<text>
<text class="padding-left-xs padding-right-sm">
{{item.oilName}}
</text>
<text class=" text-lg text-bold text-red " v-if="item.vol">
{{item.vol|numberFilter}} L</text>
</view>
<view class="bottom text-left">
@ -38,14 +38,13 @@
<text class="padding-left-xs">
{{item.createDatetime.substring(0, 10)}}
</text>
</view>
<view class="bottom text-left">
<image class="icon icon-desc " :src="baseURL+'static/img/mini-car.png'" alt />
<text class="padding-left-xs">
加油车牌： {{item.carNo}}
加油车牌： {{item.carNo|plateFilter}}
</text>
</view>
</view>
@ -56,7 +55,7 @@
{{item.createDatetime.substring(0,19)}}
</view>
<view>
<text class="color-000 text-lg total-money">￥{{item.realamount|numberFilter}}</text>
<text class="text-red text-lg text-bold total-money">￥{{amount|numberFilter}}</text>
<view class="round pay-state light bg-olive bg-transparent text-center state-0" v-if="istate==0">
<text class="inner-istate round">{{istate|formatStr}}</text>
<view class="inner-border">
@ -109,7 +108,7 @@
console.log(this.item.istate)
switch (parseInt(this.item.istate)) {
// 网页版 0：待支付， 1：已支付 ，-1：支付失败 ，-2：退款，
//小程序 0：待支付， 1：已支付 ，-1：支付失败 ，2：已取消，3：已退款
//小程序 1：待支付， 1：已支付 ，-1：支付失败 ，2：已取消，3：已退款
case 1:
return 1
case -1:
@ -124,6 +123,14 @@
} else {
return this.item.istate
}
},
amount(){
let orderType = uni.getStorageSync('orderType')
if (orderType == 1) {
return this.item.sitePrice*this.item.vol
}else{
return this.item.realamount
}
}
},
data() {
@ -154,6 +161,15 @@
}
},
filters: {
plateFilter(value) {
if (value) {
const numBegin = value.substring(0, 2);
const numEnd = value.substring(5);
return numBegin + '***' + numEnd;
} else {
return '暂无'
}
},
toT(value) {
if (value) {
return value / 1000
@ -190,6 +206,10 @@
</script>
<style scoped>
.lin-h-2 {
line-height: 2.6rem;
}
.cu-avatar {
background-color: rgba(255, 255, 255, 0);
}

86
packageOrders/pages/orderList/OrderDetail/OrderDetail.vue
Unescape View File

@ -8,14 +8,10 @@
</view>
<view class="text-center margin-top icon-container">
<view class="cu-avatar xl round text-sl" v-if="orderItem.sourceType===3"
:style="'background-image:url('+baseURL+'static/img/order-wjy.png)'"></view>
<view class="cu-avatar xl round text-sl" v-else-if="orderItem.sourceType===4||orderItem.sourceType===6"
:style="'background-image:url('+baseURL+'static/img/order-xy.png)'"></view>
<view class="cu-avatar xl round text-sl" v-else-if="orderItem.sourceType===5"
:style="'background-image:url('+baseURL+'static/img/order-lv.png)'"></view>
<view class="cu-avatar xl round text-sl" v-else
:style="'background-image:url('+baseURL+'static/img/order-xy.png)'"></view>
<view class="cu-avatar xl round text-sl" v-if="orderItem.sourceType===3" :style="'background-image:url('+baseURL+'static/img/order-wjy.png)'"></view>
<view class="cu-avatar xl round text-sl" v-else-if="orderItem.sourceType===4||orderItem.sourceType===6" :style="'background-image:url('+baseURL+'static/img/order-xy.png)'"></view>
<view class="cu-avatar xl round text-sl" v-else-if="orderItem.sourceType===5" :style="'background-image:url('+baseURL+'static/img/order-lv.png)'"></view>
<view class="cu-avatar xl round text-sl" v-else :style="'background-image:url('+baseURL+'static/img/order-xy.png)'"></view>
</view>
<view class="radius margin margin-top bg-white padding-top padding">
<!-- sourceType 万金油3 老吕5 星油4/6 -->
@ -25,38 +21,52 @@
<view class="margin padding">
<view class="text-lg text-center" v-if="orderSource=='zy'">{{orderItem.istate|formatZyStr}}</view>
<view class="text-lg text-center" v-else>{{istate|formatStr}}</view>
<view class="number text-xl text-center oil-main-color">￥{{orderItem.realamount|numberFormat}}
<view class="number text-xl text-center oil-main-color">￥{{displayMoney|numberFormat}}
</view>
</view>
<view class="margin-bottom-sm" @tap="copyId(orderItem.userName,'加油司机')">
加油司机
<text class="fr">{{orderItem.userName}}<text
class="flex-sub padding-left-sm text-right cuIcon-copy text-lg text-red">
<view class="margin-bottom-sm" @tap="copyId(orderItem.driverID,'司机编号')">
司机编号
<text class="fr">{{orderItem.driverID}}<text :class="orderItem.driverID?'cuIcon-copy':''" class="flex-sub padding-left-sm text-right text-lg text-red">
</text></text>
</view>
<view class="margin-bottom-sm">
加油司机
<view class="fr">
<text>{{orderItem.userName|nameFilter}}</text> <text class="padding-left-sm">{{orderItem.carNo|plateFilter}}
</text>
</view>
</view>
<view class="margin-bottom-sm" @tap="copyId(orderItem.carNo,'司机车牌')">
<!-- <view class="margin-bottom-sm" @tap="copyId(orderItem.carNo,'司机车牌')">
司机车牌
<text class="fr">{{orderItem.carNo}}<text
class="flex-sub padding-left-sm text-right cuIcon-copy text-lg text-red">
<text class="fr">{{orderItem.carNo?orderItem.carNo:'暂无'}}<text :class="orderItem.carNo?'cuIcon-copy':''" class="flex-sub padding-left-sm text-right text-lg text-red">
</text></text>
</view>
</view> -->
<view class="margin-bottom-sm">
油枪油号
<text class="fr">{{orderItem.bar}}号枪{{orderItem.oilName||orderItem.oilCode}}</text>
</view>
<view class="margin-bottom-sm">
<!-- <view class="margin-bottom-sm">
加油总金额
<text
class="fr">¥{{orderItem.amount?orderItem.amount:(orderItem.xoilDiscountAmount+orderItem.realamount)|numberFormat}}</text>
</view> -->
<view class="margin-bottom-sm">
油机单价
<text class="fr">￥{{orderItem.sitePrice||orderItem.price}} / 升</text>
</view>
<view class="margin-bottom-sm">
加油升数
<text class="fr">{{orderItem.vol|numberFormat}} 升</text>
</view>
<view class="margin-bottom-sm" v-if="orderItem.xoilDiscountAmount">
<view class="margin-bottom-sm" v-if="orderSource=='mpxoil'">
油机总价
<text class="fr">￥{{displayMoney|numberFormat}}</text>
</view>
<!-- <view class="margin-bottom-sm" v-if="orderItem.xoilDiscountAmount">
星卡优惠
<text class="fr">¥ {{(orderItem.xoilDiscountAmount)|numberFormat}}</text>
</view>
@ -67,11 +77,11 @@
<view class="margin-bottom-sm">
优惠券
<text class="fr">{{orderItem.coupon|couponFormat}}</text>
</view>
<view class="margin-bottom-sm">
</view> -->
<!-- <view class="margin-bottom-sm">
实扣款
<text class="fr oil-main-color">¥ {{orderItem.realamount|numberFormat}}</text>
</view>
</view> -->
</view>
<view class="radius bg-white margin padding ">
@ -93,8 +103,7 @@
<view class="radius bg-white margin margin-bottom-0 padding">
<view class="margin-bottom-sm" @tap="copyId(orderItem.orderID,'订单号')">
订单号
<text class=" fr">{{orderItem.orderID}}<text
class="flex-sub padding-left-sm text-right cuIcon-copy text-lg text-red">
<text class=" fr">{{orderItem.orderID}}<text class="flex-sub padding-left-sm text-right cuIcon-copy text-lg text-red">
</text></text>
</view>
@ -150,6 +159,14 @@
this.clearStatus()
},
computed: {
displayMoney(){
if(this.orderSource=='mpxoil'){
return this.orderItem.sitePrice*this.orderItem.vol
}else{
// return this.orderItem.price*this.orderItem.vol
return this.orderItem.realamount
}
},
istate() {
let orderType = uni.getStorageSync('orderType')
if (orderType == 1) {
@ -243,6 +260,7 @@
})
},
copyId(id, name) {
if (id) {
uni.setClipboardData({
data: id,
success: () => {
@ -252,6 +270,8 @@
})
}
})
}
},
getOrderDetail() {
cloudSiteApi.getSiteOrderById(this.orderId).then(res => {
@ -263,6 +283,22 @@
}
},
filters: {
nameFilter(value) {
if (value) {
var arr = value.split('')
arr[1] = "*"
return arr.join('')
}
},
plateFilter(value) {
if (value) {
const numBegin = value.substring(0, 2);
const numEnd = value.substring(5);
return numBegin + '***' + numEnd;
}else{
return '暂无'
}
},
formatZyStr(value) {
switch (parseInt(value)) {
case 1:

11
packageQr/components/OrderOil.vue
Unescape View File

@ -84,7 +84,6 @@
}
},
created() {
console.log(this.oilList)
this.initForm()
},
watch: {
@ -116,7 +115,7 @@
},
initForm() {
if (this.oilList) {
if (this.oilList[0]) {
this.selected = this.oilList[0]
}
},
@ -128,21 +127,13 @@
gunId: this.gunId + 1,
realPay: this.money.realPay
}
console.log('被选中的', data5)
this.$emit('confirmVol', data5)
},
calcMoney(e) {
// var vol;
// vol = e.detail.value.replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3');
// this.vol = vol
this.price = this.selected.xkPrice ? this.selected.xkPrice : this.selected.lvPrice
this.money.total = this.vol * this.selected.standardPrice
// this.money.discount = this.money.total - this.vol * (this.selected.standardPrice - this.price)
// this.money.realPay = (this.money.total - this.money.discount).toFixed(2)
this.money.discount = this.vol * (this.selected.standardPrice - this.price)
this.money.realPay = (this.money.total - this.money.discount).toFixed(2)
console.log('总金额', '折扣', '实际支付')
}
},
filters: {

22
pages.json
Unescape View File

@ -36,25 +36,22 @@
{
"path": "pages/Auth/Auth",
"style": {}
}
,{
"path" : "pages/test/test",
"style" :
{
}, {
"path": "pages/test/test",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
}
,{
"path" : "pages/stationDetail/ZYSite",
"style" :
{
}, {
"path": "pages/stationDetail/ZYSite",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
}
],
"subPackages": [{
"root": "packageOrders",
@ -68,6 +65,9 @@
}, {
"path": "pages/orderList/dailyOrder/dailyOrder",
"style": {}
}, {
"path": "pages/printTicket/printTicket",
"style": {}
}
]
},
@ -213,7 +213,7 @@
"query": "" //启动参数，在页面的onLoad函数里面得到
}]
},
"window": {// 开发者可在 app.json 配置 renderingMode 关闭同层来规避此问题。
"window": { // 开发者可在 app.json 配置 renderingMode 关闭同层来规避此问题。
"renderingMode": "seperated"
}

34
pages/index/index.vue
Unescape View File

@ -50,38 +50,12 @@
},
onPullDownRefresh() {
this.getUserInfo()
// let url = '/pages/station-info/scan-camera/scan-camera'
// uni.redirectTo({
// url: url
// })
},
onReady(option) {
const updateManager = uni.getUpdateManager();
updateManager.onCheckForUpdate(function(res) {
// 请求完新版本信息的回调
console.log('请求完新版本信息的回调', res.hasUpdate);
});
updateManager.onUpdateReady(function(res) {
uni.showModal({
title: '更新提示',
content: '新版本已经准备好，是否重启应用？',
success(res) {
if (res.confirm) {
// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
updateManager.applyUpdate();
}
}
});
});
updateManager.onUpdateFailed(function(res) {
// 新的版本下载失败
});
uni.redirectTo({
url: '../../packageOrders/pages/printTicket/printTicket'
})
},
onShow() {
uni.setStorageSync('orderType',null)
// uni.preloadPage({url: "/pages/station-info/scan-camera/scan-camera"});

2
pages/setup/setup.vue
Unescape View File

@ -61,7 +61,7 @@
<text class="color-000">版本号</text>
</view>
<view class="action">
<text class="text-grey text-sm">1.3.3.8</text>
<text class="text-grey text-sm">1.3.4</text>
</view>
</view>

29
utils/request.js
Unescape View File

@ -1,17 +1,16 @@
import axios from 'axios'
import utils from '@/utils/encode'
const devUrl = 'http://192.168.0.33:48080' // 测试，不加密
const testUrl = 'http://192.168.0.25:48080' // 测试，加密
// const devUrl = 'http://192.168.0.13:48080' // 测试，不加密
// const testUrl = 'http://192.168.0.25:48080' // 测试，加密
const productionUrl = 'https://www.51xingka.net/oilApp' // 生产，加密
const env = process.env.NODE_ENV // 环境
// const env = 'production' // 仅用于测试
// const env = process.env.NODE_ENV // 环境
const env = 'production' // 仅用于测试
const service = axios.create({
baseURL: env=='production'?productionUrl:testUrl, //
// baseURL: 'http://192.168.0.33:48080', //
// baseURL: 'https://www.51xingka.net/oilApp', //生产
baseURL: env=='production'?productionUrl:devUrl, //
// baseURL:testUrl, //
timeout: 5000
})
var url = ''
@ -42,7 +41,7 @@ service.interceptors.request.use(
const data = { // 用于存储加密
params: '' // 加密后的密文
}
console.log('请求路径', config.url, '参数加密前', config.data)
// console.log('请求路径', config.url, '参数加密前', config.data)
// 要加密
data.params = utils.encrypt(JSON.stringify(config.data))
config.data = data
@ -76,7 +75,7 @@ service.interceptors.response.use(
// 加密的数据，需要解密
const dataParam = JSON.parse(utils.decrypt(res.data))
res.data = JSON.stringify(dataParam) === '{}' ? null : dataParam
console.log('生产环境 请求路径', response.config.url, '解密为', res.data)
// console.log('生产环境 请求路径', response.config.url, '解密为', res.data)
}
} else {
console.log('请求路径', response.config.url, '返回结果未加密', res)
@ -90,18 +89,6 @@ service.interceptors.response.use(
title: res.msg,
icon: "none"
})
// if (res.code === 42011) {
// console.log(res.code)
// uni.reLaunch({
// url: '/pages/startPage/startPage',
// success: () => {
// console.log('跳转成功')
// },
// fail: (err) => {
// console.log(err)
// }
// })
// }
if (res.msg === '您已被迫下线') {
outTimer = setTimeout(() => {
uni.showModal({

Write Preview
Loading…
Cancel
Save