Compare commits

..

5 Commits

Author SHA1 Message Date
杨杰 1633d9a105 测试测试 2 years ago
杨杰 2b9d84cf46 1.新增统计 2 years ago
杨杰 3025da4686 1. 对接交接班功能 2 years ago
杨杰 2f8e532c07 1.修改文字描述 2 years ago
杨杰 1eec54bbc3 1.修改问题 2 years ago
  1. 20
      App.vue
  2. 66
      Utils/Api.js
  3. 9
      Utils/Request.js
  4. 11
      manifest.json
  5. 65
      pages.json
  6. 40
      pages/home/oderDetails/oderDetails.vue
  7. 64
      pages/login/login/login.vue
  8. 34
      pages/tabBar/home/home.vue
  9. 67
      pages/tabBar/user/user.vue
  10. 18
      pages/user/oil-list/oil-list.vue
  11. 364
      pages/user/orderStatistics/orderStatistics.vue
  12. 202
      pages/user/select-team/select-team.vue
  13. 227
      pages/user/shift-management/shift-management.vue
  14. 128
      pages/user/shift-summary/shift-summary.vue
  15. 24
      pages/user/updateOilgun/updateOilgun.vue
  16. 5
      pages/user/updateOilprice/updateOilprice.vue
  17. BIN
      static/img/10.png
  18. BIN
      static/img/11.png
  19. BIN
      static/img/noorder1.png
  20. 10
      uni.scss

@ -5,17 +5,23 @@
// brestUrl: 'http://192.168.3.4:9302/brest',
// imgUrl: 'https://192.168.3.4:9301/filesystem/',
//
// url: 'https://hsg.dctpay.com/brest',
// imgUrl: 'https://hsg.dctpay.com/filesystem/',
// imageWxImg: 'https://hsg.dctpay.com/filesystem/wxApplets/',
url: 'https://hsg.dctpay.com/brest',
imgUrl: 'https://hsg.dctpay.com/filesystem/',
imageWxImg: 'https://hsg.dctpay.com/filesystem/wxApplets/',
wsssocket:'wss://hsg.dctpay.com/msg/WebSocket/',
//
url: 'https://hsgcs.dctpay.com/brest',
imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/',
// url: 'https://hsgcs.dctpay.com/brest',
// imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
// imageWxImg: 'https://hsgcs.dctpay.com/filesystem/wxApplets/',
// wsssocket: 'wss://hsgcs.dctpay.com/msg/WebSocket/',
userInfo: "",
openId: '',
code: '',
token: ''
token: '',
//
positionType:0,
//
positionGunPrice:0
},
onLaunch: function() {
console.log('App Launch')

@ -10,8 +10,8 @@ export const userLogin = params => {
//退出登录
export const logout = params => {
return POST('POST', `${base}/login/logout`, params).then(res => res.data);
}
//查询数据字典
}
//查询数据字典
export const getDictionaryByCodeType = params => {
return POST('GET', `${base}/common/getDictionaryByCodeType`, params).then(res => res.data);
}
@ -42,23 +42,65 @@ export const addGasOilPrice = params => {
//删除油枪
export const delGunNo = params => {
return POST('POST', `${base}/gasOilGunNo/delGunNo`, params).then(res => res.data);
}
//修改密码
}
//修改密码
export const sendUserPass = params => {
return POST('POST', `${base}/secUser/sendUserPass`, params).then(res => res.data);
}
//我的信息
}
//我的信息
export const getGasStatistical = params => {
return POST('POST', `${base}/highGas/getGasStatistical`, params).then(res => res.data);
}
//订单列表
}
//订单列表
export const getGasOrderList = params => {
return POST('GET', `${base}/highGas/getGasOrderList`, params).then(res => res.data);
}
//订单详情
//订单统计
export const countGasOrder = params => {
return POST('GET', `${base}/highGas/countGasOrder`, params).then(res => res.data);
}
//订单详情
export const getGasOrderDetail = params => {
return POST('GET', `${base}/highGas/getGasOrderDetail`, params).then(res => res.data);
}
//交接班班组功能
//班组列表
export const getClassGroupList = params => {
return POST('GET', `${base}/gasClassGroup/getClassGroupList`, params).then(res => res.data);
}
//开启班组任务
export const startGroupTask = params => {
return POST('POST', `${base}/gasClassGroupTask/startGroupTask`, params).then(res => res.data);
}
//结束班组
export const endGroupTask = params => {
return POST('POST', `${base}/gasClassGroupTask/endGroupTask`, params).then(res => res.data);
}
//交接班组
export const swapGroupTask = params => {
return POST('POST', `${base}/gasClassGroupTask/swapGroupTask`, params).then(res => res.data);
}
//当前班次
export const getCurrentClassGroupTask = params => {
return POST('GET', `${base}/gasClassGroupTask/getCurrentClassGroupTask`, params).then(res => res.data);
}
//查询历史班次列表
export const getClassGroupTaskList = params => {
return POST('GET', `${base}/gasClassGroupTask/getClassGroupTaskList`, params).then(res => res.data);
}
//查询历史班次详情
export const getClassGroupTaskById = params => {
return POST('GET', `${base}/gasClassGroupTask/getClassGroupTaskById`, params).then(res => res.data);
}
//打印小票
export const print = params => {
return POST('GET', `${base}/gasClassGroupTask/print`, params).then(res => res.data);
}

@ -43,7 +43,14 @@ function request(method, url, data) {
uni.showToast({
title: '请求失败',
icon: 'none',
duration: 1500,
duration: 1500,
success() {
setTimeout(() => {
uni.reLaunch({
url:'/pages/login/login/login'
})
}, 2000);
}
})
}
})

@ -1,5 +1,5 @@
{
"name" : "high-mini-manage",
"name" : "嗨森逛商家端",
"appid" : "__UNI__309E2E8",
"description" : "",
"versionName" : "1.0.0",
@ -68,5 +68,12 @@
"uniStatistics" : {
"enable" : false
},
"vueVersion" : "2"
"vueVersion" : "2",
"h5" : {
"title" : "嗨森逛商家端",
"router" : {
"mode" : "hash",
"base" : "/merchantH5/"
}
}
}

@ -1,16 +1,33 @@
{
"pages": [ //pageshttps://uniapp.dcloud.io/collocation/pages
{
"path": "pages/login/login/login",
"style": {
"navigationBarTitleText": "登录",
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"enablePullDownRefresh": false
}
{
"path": "pages/login/login/login",
"style": {
"navigationBarTitleText": "登录",
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"enablePullDownRefresh": false
}
}, {
"path": "pages/user/orderStatistics/orderStatistics",
"style": {
"navigationBarTitleText": "统计",
"enablePullDownRefresh": false
}
},{
"path": "pages/user/shift-management/shift-management",
"style": {
"navigationBarTitleText": "班次管理",
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"enablePullDownRefresh": false
}
}, {
"path": "pages/tabBar/home/home",
"style": {
"navigationBarTextStyle": "white",
@ -23,7 +40,7 @@
"softinputNavBar": "none"
}
}
},{
}, {
"path": "pages/home/oderDetails/oderDetails",
"style": {
"navigationBarTitleText": "订单详情",
@ -42,7 +59,7 @@
"enablePullDownRefresh": false
}
}, {
}, {
"path": "pages/tabBar/user/user",
"style": {
"enablePullDownRefresh": true,
@ -96,6 +113,28 @@
}
}
, {
"path": "pages/user/shift-summary/shift-summary",
"style": {
"navigationBarTitleText": "班次汇总",
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"enablePullDownRefresh": false
}
}, {
"path": "pages/user/select-team/select-team",
"style": {
"navigationBarTitleText": "",
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"enablePullDownRefresh": false
}
}
],
"globalStyle": {
"navigationBarTextStyle": "black",
@ -112,7 +151,7 @@
"pagePath": "pages/tabBar/home/home",
"iconPath": "static/img/tabBar/home.png",
"selectedIconPath": "static/img/tabBar/home-on.png",
"text": "嗨森逛"
"text": "订单"
},
{
"pagePath": "pages/tabBar/user/user",

@ -7,11 +7,13 @@
<view class="ordsrig">{{oilorderdetails.payTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}</view>
</view>
<view class="heads">
<view class="prices">实际支付: <text style="font-size: 16px;margin-left: 5px;"> ¥{{oilorderdetails.payRealPrice}}</text></view>
<view class="prices">实际支付: <text style="font-size: 16px;margin-left: 5px;">
¥{{oilorderdetails.payRealPrice}}</text></view>
</view>
<view class="line1con"></view>
<view style="padding-top: 15px;">
<view class="prices">优惠立减: <text style="font-size: 16px;margin-left: 5px;"> ¥{{oilorderdetails.deductionPrice}}</text></view>
<view class="prices">优惠立减: <text style="font-size: 16px;margin-left: 5px;">
¥{{oilorderdetails.deductionPrice}}</text></view>
</view>
</view>
<view class="width92 height20 titles fcor333 font15 mart15 fontwig6">
@ -50,7 +52,7 @@
<view class="width80p fotrt">¥{{oilorderdetails.gasPriceGun}}</view>
</view>
<view class="width92 fcor666 font14 mart20 alijusstart">
<view class="width80p">加油升数<text class="fcor999">实际升数以油站加油机为准</text></view>
<view class="width80p">加油升数<text class="fcor999 font13">实际升数以油站加油机为准</text></view>
<view class="width20 fotrt">{{oilorderdetails.gasOilLiters}}</view>
</view>
<view class="width92 fcor666 font14 mart20 alijusstart">
@ -65,21 +67,23 @@
<view class="width20">加油折扣</view>
<view class="width80p fotrt" v-if="oilorderdetails.gasDiscount">¥{{oilorderdetails.gasDiscount}}</view>
<view class="width80p fotrt" v-else>0折</view>
</view>
<view class="width92 fcor666 font14 mart20 alijusstart">
<view class="width20">加油补贴</view>
<view class="width80p fotrt" v-if="oilorderdetails.gasOilSubsidy">¥{{oilorderdetails.gasOilSubsidy}}</view>
<view class="width80p fotrt" v-else>¥0</view>
</view>
<view class="width92 fcor666 font14 mart20 alijusstart">
<view class="width20">每升优惠</view>
<view class="width80p fotrt" v-if="oilorderdetails.gasLitersPreferences">¥{{oilorderdetails.gasLitersPreferences}}</view>
<view class="width80p fotrt" v-else>¥0</view>
</view>
<view class="width92 fcor666 font14 mart20 alijusstart">
<view class="width20">优惠价格</view>
<view class="width80p fotrt" v-if="oilorderdetails.gasPricePreferences">¥{{oilorderdetails.gasPricePreferences}}</view>
<view class="width80p fotrt" v-else>¥0</view>
</view>
<view class="width92 fcor666 font14 mart20 alijusstart">
<view class="width20">加油补贴</view>
<view class="width80p fotrt" v-if="oilorderdetails.gasOilSubsidy">¥{{oilorderdetails.gasOilSubsidy}}</view>
<view class="width80p fotrt" v-else>¥0</view>
</view>
<view class="width92 fcor666 font14 mart20 alijusstart">
<view class="width20">每升优惠</view>
<view class="width80p fotrt" v-if="oilorderdetails.gasLitersPreferences">
¥{{oilorderdetails.gasLitersPreferences}}</view>
<view class="width80p fotrt" v-else>¥0</view>
</view>
<view class="width92 fcor666 font14 mart20 alijusstart">
<view class="width20">优惠价格</view>
<view class="width80p fotrt" v-if="oilorderdetails.gasPricePreferences">
¥{{oilorderdetails.gasPricePreferences}}</view>
<view class="width80p fotrt" v-else>¥0</view>
</view>
<view class="width92 line1 mart15"></view>
<view class="width92 fcor666 font18 mart20 alijusstart">

@ -2,7 +2,7 @@
<view>
<image src="../../../static/img/logo.png" mode="widthFix" class="mart40 alijus imgs"></image>
<view class="main mart40">
<wInput v-model="phoneData" type="text" placeholder="用户名" :focus="isFocus"></wInput>
<wInput v-model="phoneData" type="text" placeholder="用户名"></wInput>
<wInput v-model="passData" type="password" placeholder="密码" isShowPass="true"></wInput>
</view>
<view class="height40p"></view>
@ -28,25 +28,25 @@
passData: '', //
isRotate: false, //
}
},
},
mounted() {
this.isLogin();
},
methods: {
//
isLogin() {
uni.getStorage({
key: 'oilaccount',
success: (res) => {
this.phoneData = res.data
}
});
uni.getStorage({
key: 'oilpass',
success: (res) => {
this.passData = res.data
}
});
methods: {
//
isLogin() {
uni.getStorage({
key: 'oilaccount',
success: (res) => {
this.phoneData = res.data
}
});
uni.getStorage({
key: 'oilpass',
success: (res) => {
this.passData = res.data
}
});
},
//
startLogin(e) {
@ -65,14 +65,6 @@
});
return;
}
if (this.passData.length < 5) {
uni.showToast({
icon: 'none',
position: 'bottom',
title: '密码不正确'
});
return;
}
this.isRotate = true
let params = {
loginName: this.phoneData,
@ -93,17 +85,17 @@
uni.setStorage({
key: "oiltoken",
data: res.return_data.uniqueCode
})
uni.setStorage({
key: "oilaccount",
data: this.phoneData
})
uni.setStorage({
key: "oilpass",
data: this.passData
})
uni.reLaunch({
url: '../../tabBar/home/home'
})
uni.setStorage({
key: "oilaccount",
data: this.phoneData
})
uni.setStorage({
key: "oilpass",
data: this.passData
})
uni.reLaunch({
url: '../../tabBar/home/home'
})
} else {
uni.showToast({

@ -13,7 +13,7 @@
<view class="width33" :class="[type=='4' ? 'fcor089' : 'fcor333']" @click="updateStu(4)">已退款</view>
</view>
<view v-if="orderList == ''" class="mart40 fotct font14 fcor666">
<image mode="widthFix" style="width: 70vw;" src="../../../static/img/noorder.png"></image>
<image mode="widthFix" style="width: 70vw;" src="../../../static/img/noorder1.png"></image>
</view>
<view class="width94 backcorfff headcont mart10" v-for="(item,index) in orderList" :key="index"
@click="jumpDetails(item.orderNo)">
@ -68,11 +68,13 @@
pagesize: 10,
isLoadMore: false, //
innerAudioContext: '', //
orderNo: '' //
orderNo: '', //
userinfo: '' //
};
},
onShow() {
let that = this;
that.userinfo = app.globalData.userInfo;
that.orderList = [];
that.pageNum = 1;
uni.getStorage({
@ -89,6 +91,18 @@
},
fail: res => {}
})
//
if (this.userinfo.buttonList) {
for (var i = 0; i < this.userinfo.buttonList.length; i++) {
if (this.userinfo.buttonList[i].permissionCode == 'BTN_CONFIG_OIL_GUN_PURVIEW') {
app.globalData.positionType = 1
}
if (this.userinfo.buttonList[i].permissionCode == 'BTN_CONFIG_OIL_GUN_PRICE_PURVIEW') {
app.globalData.positionGunPrice = 1
}
}
}
},
onLoad() {
@ -106,7 +120,7 @@
socketio() {
let that = this;
uni.connectSocket({
url: 'ws://139.159.177.244:9302/brest/WebSocket/' + app.globalData.userInfo.merchantStore.id
url: app.globalData.wsssocket + app.globalData.userInfo.merchantStore.id
});
uni.onSocketOpen(function(res) {
console.log('WebSocket连接已打开!');
@ -119,13 +133,18 @@
uni.onSocketMessage(function(res) {
let innerAudioContext = uni.createInnerAudioContext(); //
innerAudioContext.autoplay = false; //
innerAudioContext.src = res.data; //
innerAudioContext.src = JSON.parse(res.data).voice; //
that.innerAudioContext = innerAudioContext;
that.orderList = [];
that.pageNum = 1;
that.getGasOrderList();
that.startAudio();
console.log('收到服务器内容:' + res.data);
console.log('收到服务器内容:' + JSON.parse(res.data).voice);
});
uni.onSocketClose(function(res) {
console.log('WebSocket 已关闭!');
uni.closeSocket();
that.socketio();
});
},
//
@ -155,9 +174,11 @@
uni.showLoading({
title: '加载中'
})
let daydate = new Date(new Date().toLocaleDateString()).getTime();
let datas = {
orderNo: this.orderNo,
status: status,
createTimeS: daydate,
pageNum: this.pageNum,
pageSize: this.pagesize,
}
@ -171,6 +192,7 @@
this.isLoadMore = false
}
} else {
this.orderList = [];
this.isLoadMore = true
}
});
@ -249,7 +271,7 @@
}
.counimgs {
width: 60px;
width: 60px;
max-height: 60px;
}

@ -6,7 +6,7 @@
<text v-else>暂无信息</text>
<!-- <image mode="widthFix" class="margle iconw" src="../../../static/img/jt.png"></image> -->
</view>
<view class="font15 height40 fcorfff mart10 width94">今日总收入</view>
<view class="font15 height40 fcorfff mart10 width94">今日加油总额</view>
<view class="font28 fcorfff mart5 width94">¥<text class="margle font40">{{oilInfo.today.incomePrice}}</text></view>
<view class="width94 mart5">
<view class="width50 fcorfff font16 flleft">
@ -31,8 +31,8 @@
<!-- 菜单功能 -->
<view class="width100 line10"></view>
<view class="funcss" v-for="(item,index) in funcList" :key="index" @click="jumpdesfun(item)">
<image :src="item.img" mode="widthFix" class="funicon"></image>
<view class="width100 font14 mart5">{{item.title}}</view>
<image :src="item.menuUrlImg" mode="widthFix" class="funicon"></image>
<view class="width100 font14 mart5">{{item.menuName}}</view>
</view>
<view class="width100 height40p"></view>
</view>
@ -47,26 +47,27 @@
export default {
data() {
return {
funcList: [{
title: '配置油枪',
url: '../../user/oil-list/oil-list?id=1',
img: '../../../static/img/3.png'
},
{
title: '配置油品价格',
url: '../../user/oil-list/oil-list?id=2',
img: '../../../static/img/2.png'
},
{
title: '修改密码',
url: '../../login/updatePsd/updatePsd',
img: '../../../static/img/9.png'
},
{
title: '退出登录',
url: '',
img: '../../../static/img/7.png'
}
funcList: [
// {
// title: '',
// url: '../../user/oil-list/oil-list?id=1',
// img: '../../../static/img/3.png'
// },
// {
// title: '',
// url: '../../user/oil-list/oil-list?id=2',
// img: '../../../static/img/2.png'
// },
// {
// title: '',
// url: '../../login/updatePsd/updatePsd',
// img: '../../../static/img/9.png'
// },
// {
// title: '退',
// url: '',
// img: '../../../static/img/7.png'
// }
],
auditnum: '', //
userinfo: '', //
@ -75,7 +76,12 @@
};
},
onLoad() {
this.userinfo = app.globalData.userInfo;
this.userinfo = app.globalData.userInfo;
for(var i =0;i<this.userinfo.menuList.length;i++){
if(this.userinfo.menuList[i].menuUrl == 'APPLETS_MER'){
this.funcList = this.userinfo.menuList[i].children;
}
}
},
onShow() {
this.getGasStatistical();
@ -85,7 +91,7 @@
getGasStatistical() {
getGasStatistical().then(res => {
if (res.return_code == '000000') {
this.oilInfo = res.return_data;
this.oilInfo = res.return_data;
}
});
},
@ -99,11 +105,12 @@
},
//
jumpdesfun(item) {
if (item.title == '退出登录') {
this.logout();
if (item.menuMobileUrl == '#') {
this.logout();
uni.closeSocket();
}
uni.navigateTo({
url: item.url
url: item.menuMobileUrl
})
},
//退
@ -121,7 +128,9 @@
uni.hideLoading();
if (res.return_code == '000000') {
app.globalData.userInfo = '';
app.globalData.token = '';
app.globalData.token = '';
app.globalData.positionType = 0;
app.globalData.positionGunPrice = 0;
uni.setStorage({
key: "oiluser",
data: ''

@ -1,16 +1,15 @@
<template>
<view>
<view class="width90 mart15 font15 fcor666">选择油品</view>
<view v-if="oilpriceList == ''" class="mart40 fotct font14 fcor666">
<image mode="widthFix" style="width: 70vw;" src="../../../static/img/noorder.png"></image>
<view class="width90 mart15 font15 fcor666">选择油品</view>
<view v-if="oilpriceList == ''" class="mart40 fotct font14 fcor666">
<image mode="widthFix" style="width: 70vw;" src="../../../static/img/noorder.png"></image>
</view>
<view class="activeRefuel" v-for="(item,index) in oilpriceList" :key="index"
@click="jumpupdatePrice(item)">
<view class="activeRefuel" v-for="(item,index) in oilpriceList" :key="index" @click="jumpupdatePrice(item)">
{{item.oilNoName}}
<image src="../../../static/img/6.png" mode="widthFix" class="imgcha iconw"
@click.stop="delOilPrice(item.oilNo)"></image>
@click.stop="delOilPrice(item.oilNo)" v-if="positionType == 1"></image>
</view>
<view class="btn mart50" @click="jumpaddoil()"> </view>
<view class="btn mart50" @click="jumpaddoil()" v-if="positionType == 1"> </view>
</view>
</template>
@ -25,10 +24,11 @@
return {
oilpriceList: [],
typeid: '', //
userinfo: '' //
userinfo: '', //
positionType: app.globalData.positionType //
}
},
onLoad(Option) {
onLoad(Option) {
this.typeid = Option.id;
},
onShow() {

@ -0,0 +1,364 @@
<template>
<view>
<view class="headsearch width94 mart15 paddtop15 paddbotm10 fotct">
<view class="font15 height40 fcorfff width94">总加油金额</view>
<view class="font28 fcorfff width94">¥<text class="margle font40">{{GasOrder.refuelPrice}}</text></view>
<view class="alijus marb20 mart10">
<view class="width50 fcorfff font16">
<view class="width100">总笔数</view>
<view class="width100 mart10 font22">{{GasOrder.refuelNum}} </view>
</view>
<view class="width50 fcorfff font16">
<view class="width100">总升数</view>
<view class="width100 mart10 font22">{{GasOrder.refuelLiters}} </view>
</view>
</view>
</view>
<view class="headsearch width94 mart15 paddtop5 paddbotm10 fotct">
<view class="mart10 width90 alijusstart">
<view class="fcorfff font14 margleri10 width60 fotlt">开始时间 :</view>
<picker mode="date" :value="startdate" :start="startDate" :end="endDate" @change="bindDateChange">
<view class="uni-input datetim fcorfff">{{startdate}}<i class="down"></i></view>
</picker>
</view>
<view class="mart10 width90 alijusstart">
<view class="fcorfff font14 margleri10 width60 fotlt">结束时间 :</view>
<picker mode="date" :value="enddate" :start="startDate" :end="endDate" @change="bindDateChange1">
<view class="uni-input datetim fcorfff">{{enddate}}<i class="down"></i></view>
</picker>
</view>
<view class="mart10 width90 alijusstart">
<view class="fcorfff font14 margleri10 width60 fotlt">油品 :</view>
<picker mode="selector" :range="oilList" range-key="codeName" @change="changeUserCard">
<view class="uni-input datetim fcorfff font14">{{typeName}}<i class="down"></i></view>
</picker>
</view>
<view class="mart10 width90 alijusstart">
<view class="fcorfff font14 margleri10 width60 fotlt">状态 :</view>
<picker mode="selector" :range="statulist" range-key="codeName" @change="changeUserstu">
<view class="uni-input datetim fcorfff font14">{{statusname}}<i class="down"></i></view>
</picker>
</view>
<view class="input-box fotlt alijusstart mart15 marb10">
<input placeholder="订单号搜索" v-model="orderNo" placeholder-style="color:#c0c0c0;"
@input="searchOrder()" />
<view class="icon search"></view>
</view>
</view>
<view v-if="orderDetailsList == ''" class="mart40 fotct font14 fcor666">
<image mode="widthFix" style="width: 70vw;" src="../../../static/img/noorder.png"></image>
</view>
<view class="width94 backcorfff headcont mart10" v-for="(item,index) in orderDetailsList" :key="index"
@click="jumpDetails(item.orderNo)">
<view class="alijusstart width94 height30 fcor333 paddtop5">
<view class="width70 font14 text1">{{item.orderNo}}</view>
<image class="iconw alicntend" mode="widthFix" src="../../../static/img/jtg.png"></image>
<text class="width20 font14 fotrt" v-if="item.status == 1">待支付</text>
<text class="width20 font14 fotrt" v-if="item.status == 2">已支付</text>
<text class="width20 font14 fotrt" v-if="item.status == 3">已完成</text>
<text class="width20 font14 fotrt" v-if="item.status == 4">已退款</text>
<text class="width20 font14 fotrt" v-if="item.status == 5">已取消</text>
<text class="width20 font14 fotrt" v-if="item.status == 6">已退款</text>
<text class="width20 font14 fotrt" v-if="item.status == 7">拒绝退款</text>
</view>
<view class="line1 width94"></view>
<view class="width94 mart5">
<image :src="item.gasLogo" mode="widthFix" class="counimgs flleft"></image>
<view class="counscou paddtop10">
<view class="width94 height25 font14 fcor666">
油品: <text class="margle marglerig">{{item.gasOilNo}}</text> 升数: <text
class="margle">{{item.gasOilLiters}}L</text>
</view>
<view class="width94 height25 alijusstart ">
<view class="width50 font14 fcor666">加油金额: ¥{{item.totalPrice}}</view>
<view class="width50 font14 fcor333 fotrt">实付:
<text class="font18" v-if="item.payRealPrice">¥{{item.payRealPrice}}</text>
<text class="font18" v-else>¥0</text>
</view>
</view>
</view>
</view>
<view class="line1 width94 mart5"></view>
<view class="height30 width94 mart5 font14 fcor666">下单时间:
{{item.createTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
</view>
</view>
</view>
</template>
<script>
import {
getDictionaryByCodeType,
getGasOrderList,
countGasOrder
} from '../../../Utils/Api.js';
export default {
data() {
const currentDate = this.getDate({
format: true
})
return {
startdate: currentDate,
enddate: currentDate,
pageNum: 1,
pagesize: 10,
isLoadMore: false, //
orderNo: '', //
oilList: [{
codeValue: '',
codeName: '全部'
}], //
typeName: '全部', //
typeId: '', //
statulist: [{
codeValue: '',
codeName: '全部'
}, {
codeValue: 3,
codeName: '已完成'
}, {
codeValue: 4,
codeName: '已退款'
}, {
codeValue: 6,
codeName: '退款中'
}, ], //
statuid: '',
statusname: '全部',
orderDetailsList: [], //
GasOrder: '' //
}
},
onLoad() {
this.getDictionaryByCodeType();
this.getGasOrderList();
this.countGasOrder();
},
computed: {
startDate() {
return this.getDate('start');
},
endDate() {
return this.getDate('end');
}
},
onReachBottom() { //
if (!this.isLoadMore) { //
this.isLoadMore = true
this.pageNum += 1
this.getGasOrderList()
}
},
methods: {
bindDateChange: function(e) {
this.startdate = e.target.value;
this.pageNum = 1;
this.orderDetailsList = [];
this.GasOrder = '';
this.isLoadMore = true;
this.countGasOrder();
this.getGasOrderList();
},
bindDateChange1: function(e) {
this.enddate = e.target.value;
this.pageNum = 1;
this.orderDetailsList = [];
this.GasOrder = '';
this.isLoadMore = true;
this.countGasOrder();
this.getGasOrderList();
},
getDate(type) {
const date = new Date();
let year = date.getFullYear();
let month = date.getMonth() + 1;
let day = date.getDate();
if (type === 'start') {
year = year - 60;
} else if (type === 'end') {
year = year + 2;
}
month = month > 9 ? month : '0' + month;;
day = day > 9 ? day : '0' + day;
return `${year}-${month}-${day}`;
},
//
getDictionaryByCodeType() {
let datas = {
codeType: 'GAS_OIL_TYPE'
}
getDictionaryByCodeType(datas).then(res => {
if (res.return_code == '000000') {
let List = res.return_data;
for (var i = 0; i < List.length; i++) {
this.oilList.push(List[i]);
}
}
})
},
//
changeUserCard(e) {
this.typeId = this.oilList[e.target.value].codeValue;
this.typeName = this.oilList[e.target.value].codeName;
this.pageNum = 1;
this.orderDetailsList = [];
this.GasOrder = '';
this.isLoadMore = true;
this.countGasOrder();
this.getGasOrderList();
},
//
changeUserstu(e) {
this.statuid = this.statulist[e.target.value].codeValue;
this.statusname = this.statulist[e.target.value].codeName;
this.pageNum = 1;
this.orderDetailsList = [];
this.GasOrder = '';
this.isLoadMore = true;
this.countGasOrder();
this.getGasOrderList();
},
//
countGasOrder() {
uni.showLoading({
title: '加载中'
})
let a = new Date(this.startdate).getTime();
let b = new Date(this.enddate).getTime();
let startTime = a - 28800000;
let endTime = b + 57599000;
let datas = {
orderNo: this.orderNo,
oilNo: this.typeId,
status: this.statuid,
pageNum: this.pageNum,
pageSize: this.pagesize,
payTimeS: startTime,
payTimeE: endTime
}
countGasOrder(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
this.GasOrder = res.return_data;
}
})
},
//
getGasOrderList() {
uni.showLoading({
title: '加载中'
})
let a = new Date(this.startdate).getTime();
let b = new Date(this.enddate).getTime();
let startTime = a - 28800000;
let endTime = b + 57599000;
let datas = {
orderNo: this.orderNo,
oilNo: this.typeId,
status: this.statuid,
pageNum: this.pageNum,
pageSize: this.pagesize,
payTimeS: startTime,
payTimeE: endTime
}
getGasOrderList(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000' && res.return_data.list !='') {
this.orderDetailsList = this.orderDetailsList.concat(res.return_data.list);
if (res.return_data.pages == this.pageNum) {
this.isLoadMore = true;
} else {
this.isLoadMore = false
}
} else {
this.orderDetailsList = [];
this.isLoadMore = true
}
});
},
//
searchOrder() {
this.orderDetailsList = [];
this.pageNum = 1;
this.getGasOrderList();
},
//
jumpDetails(item) {
uni.navigateTo({
url: '../../home/oderDetails/oderDetails?ordesid=' + item
})
}
}
}
</script>
<style lang="scss">
page {
background-color: #f3f4f8;
}
.datetim {
width: 130px;
height: 30px;
line-height: 30px;
text-align: right;
border-radius: 15px;
}
i {
border: solid #ffffff;
border-width: 0 2px 2px 0;
display: inline-block;
padding: 4px;
margin-left: 10px;
vertical-align: 3px;
}
.down {
-webkit-transform: rotate(45deg);
}
.headsearch {
border-radius: 8px;
background-color: #4c7fe6;
}
.input-box {
width: 90%;
margin-left: 5%;
background-color: #f5f5f5;
border-radius: 10rpx;
height: 35px;
.icon {
align-items: center;
width: 60upx;
font-size: 40upx;
color: #c0c0c0;
}
input {
padding-left: 28upx;
height: 28upx;
font-size: 28upx;
width: 100%;
}
}
.headcont {
height: 150px;
border-radius: 8px;
}
.counimgs {
width: 60px;
max-height: 60px;
}
.counscou {
margin-left: 70px;
}
</style>

@ -0,0 +1,202 @@
<template>
<view>
<view class="username paddtop10">
<view class="namecont">班组选择</view>
<picker mode="selector" style="width: 90%;" :range="classGroupList" range-key="name" @change="changeclass">
<view class="date text1" style="padding: 0 50rpx;">{{className}}</view>
</picker>
<image class="flright" style="width: 15px;height: 15px;" src="../../../static/img/downj.png"></image>
</view>
<view class="width80 height40 backcor008 border-r font14 fotct fcorfff" v-if="typeid == 1"
style="position: fixed;bottom: 40px;" @click="swapGroupTask()">
交接班次
</view>
<view class="width80 height40 backcor008 border-r font14 fotct fcorfff" v-if="typeid == 2"
style="position: fixed;bottom: 40px;" @click="startGroupTask()">
开始班次
</view>
</view>
</template>
<script>
import {
startGroupTask,
getClassGroupList,
swapGroupTask
} from '../../../Utils/Api.js';
let app = getApp();
export default {
data() {
return {
typeid: '', //
classGroupList: '', //
className: '', //
classId: '' ,//id
userinfo: '', //
}
},
onLoad(options) {
this.typeid = options.typeid;
this.userinfo = app.globalData.userInfo;
if (options.typeid == 1) {
uni.setNavigationBarTitle({
title: '交换班次'
})
}
if (options.typeid == 2) {
uni.setNavigationBarTitle({
title: '开始班次'
})
}
this.getClassGroupList();
},
methods: {
//
getClassGroupList() {
uni.showLoading({
title: '加载中...'
})
let datas = {
pageNum: 1,
pageSize: 9999
}
getClassGroupList(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
this.classGroupList = res.return_data.list;
this.classId = res.return_data.list[0].id;
this.className = res.return_data.list[0].name;
}
})
},
//
changeclass(e) {
this.classId = this.classGroupList[e.target.value].id;
this.className = this.classGroupList[e.target.value].name;
},
//
startGroupTask() {
let that = this;
uni.showModal({
title: '开始班次',
content: '是否开始当前班次?',
success: function(res) {
if (res.confirm) {
uni.showLoading({
title: '操作中'
})
let datas = {
gasId: that.userinfo.merchantStore.id,
gasClassGroupId: that.classId
}
startGroupTask(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
uni.showToast({
title: '操作成功',
icon: 'none',
duration: 2000
})
uni.navigateBack({})
} else {
uni.showToast({
title: res.return_msg,
icon: 'none',
duration: 2000
})
}
})
}
}
})
},
//
swapGroupTask() {
let that = this;
uni.showModal({
title: '交换班次',
content: '是否交换当前班次?',
success: function(res) {
if (res.confirm) {
uni.showLoading({
title: '操作中'
})
let datas = {
gasId: that.userinfo.merchantStore.id,
gasClassGroupId: that.classId
}
swapGroupTask(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
uni.showToast({
title: '操作成功',
icon: 'none',
duration: 2000
})
uni.navigateBack({})
} else {
uni.showToast({
title: res.return_msg,
icon: 'none',
duration: 2000
})
}
})
}
}
})
}
}
}
</script>
<style lang="scss">
.username {
width: calc(100% - 90upx);
height: 100upx;
display: flex;
align-items: center;
background-color: rgba($color: #ffffff, $alpha: 0.1);
border-bottom: 1px solid #f6f6f6;
padding: 8upx 45upx;
input {
width: 50%;
height: 50upx;
font-size: 16px;
color: #333333;
font-weight: blod;
}
.get-code {
position: absolute;
display: flex;
align-items: center;
justify-content: center;
right: 7px;
z-index: 3;
border: 1px solid #bfbfbf;
width: 25%;
padding: 3px 5px;
border-radius: 22px;
&:after {
content: " ";
width: 1upx;
height: 50upx;
position: absolute;
z-index: 3;
margin-right: 100%;
left: 0;
top: 20upx;
}
}
.namecont {
color: #666666;
width: 28%;
}
}
</style>

@ -0,0 +1,227 @@
<template>
<view>
<view class="width94 mart20 height80">
<view class="width46 fcor333 font16 flleft backcor9 fotct paddtop10 paddbotm10">
<view class="width100 fcor666">当前班次</view>
<view class="width100 mart15 font14">
<text class="font24" v-if="currentClassGroup.classNum">{{currentClassGroup.classNum}}</text>
<text class="font24" v-else></text>班次
</view>
</view>
<view class="width46 fcor333 font16 flright backcor9 fotct paddtop10 paddbotm10">
<view class="width100 fcor666">加油总金额</view>
<view class="width100 mart15 font14"><text class="font24">{{currentClassGroup.refuelPrice}}</text>
</view>
</view>
</view>
<view class="width94 mart20 height80">
<view class="width46 fcor333 font16 flleft backcor9 fotct paddtop10 paddbotm10">
<view class="width100 fcor666">加油总笔数</view>
<view class="width100 mart15 font14"><text class="font24">{{currentClassGroup.refuelNum}}</text></view>
</view>
<view class="width46 fcor333 font16 flright backcor9 fotct paddtop10 paddbotm10">
<view class="width100 fcor666">加油总升数</view>
<view class="width100 mart15 font14"><text class="font24">{{currentClassGroup.refuelLiters}}</text>
</view>
</view>
</view>
<view class="width94 mart20 height80">
<view class="width46 fcor333 font16 flleft backcor9 fotct paddtop10 paddbotm10">
<view class="width100 fcor666">退款总金额</view>
<view class="width100 mart15 font14"><text class="font24">{{currentClassGroup.refundPrice}}</text>
</view>
</view>
<view class="width46 fcor333 font16 flright backcor9 fotct paddtop10 paddbotm10">
<view class="width100 fcor666">退款总笔数</view>
<view class="width100 mart15 font14"><text class="font24">{{currentClassGroup.refundNum}}</text></view>
</view>
</view>
<view class="width94 mart40 alijusstart marb20">
<view class="width40 height40 backcor008 border-r font14 fotct fcorfff" style="margin-left: 5%;"
@click="startGroupTask(1)">
交接班组
</view>
<view class="width40 height40 backcor008 border-r font14 fotct fcorfff" v-if="currentClassGroup.status == 0"
style="margin-left: 10%;" @click="startGroupTask(2)">
开始班次
</view>
<view class="width40 height40 backcolor72 border-r font14 fotct fcorfff"
v-if="currentClassGroup.status == 1" style="margin-left: 10%;" @click="endGroupTask()">
结束班次
</view>
</view>
<!-- // -->
<view class="fcor333 width94 fontwig6 font15 mart20">历史班次共计{{listcount}}条数据</view>
<view v-if="classGroupTaskList == '' " class="mart20 fotct font14 fcor666">
<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
</view>
<view class="width94 backcorfff headcont mart20 border-r" style="box-shadow: 0px 0px 6px #999999;"
v-for="(item,index) in classGroupTaskList" :key="index">
<view class="alijusstart width94 height30 fcor333 paddtop5">
<view class="width50 font14 fcor666 ">班次: <text class="font16 fcor333">{{item.classNum}}</text></view>
<view class="width50 font14 fcor666 fotrt">状态:
<text class="font16 fcor089" v-if="item.status == 1"> 进行中</text>
<text class="font16 fcoreb5" v-if="item.status == 2"> 已结束</text>
</view>
</view>
<view class="line1 width94"></view>
<view class="width94 mart5">
<view class="width100 height25 font14 fcor666">
班组名称: {{item.gasClassGroupName}}
</view>
<view class="width100 height25 font14 fcor666 ">
开始时间: {{item.startTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
</view>
<view class="width100 height25 font14 fcor666 " v-if="item.endTime">
结束时间: {{item.endTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
</view>
<view class="width100 height25 font14 fcor666 " v-else>
结束时间: 未结束
</view>
</view>
<view class="line1 width94 mart5"></view>
<view class="height30 backcor008 margle10 border-r font14 fotct fcorfff mart10 paddleft10 paddtright10"
style="width: 60px;" v-if="item.status == 2" @click="jumpSummary(item.id)">
班次汇总
</view>
<view class="height10" v-if="item.status == 2"></view>
</view>
<view class="height40p"></view>
</view>
</template>
<script>
import {
getCurrentClassGroupTask,
endGroupTask,
getClassGroupTaskList
} from '../../../Utils/Api.js';
let app = getApp();
export default {
data() {
return {
userinfo: '', //
currentClassGroup: '', //
pageNum: 1,
pagesize: 10,
isLoadMore: false, //
classGroupTaskList: [], //
listcount: '' ,//
imgadres: 'noorder.png',
imagewxUrl: app.globalData.imageWxImg,
}
},
onLoad() {
this.userinfo = app.globalData.userInfo;
},
onShow() {
this.isLoadMore = true;
this.classGroupTaskList = [];
this.pageNum = 1;
this.getCurrentClassGroupTask();
this.getClassGroupTaskList();
},
onReachBottom() { //
if (!this.isLoadMore) { //
this.isLoadMore = true
this.pageNum += 1
this.getClassGroupTaskList()
}
},
methods: {
//
getCurrentClassGroupTask() {
uni.showLoading({
title: '加载中...'
})
let datas = {
gasId: this.userinfo.merchantStore.id
}
getCurrentClassGroupTask(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
this.currentClassGroup = res.return_data;
}
})
},
//
startGroupTask(item) {
uni.navigateTo({
url: '../select-team/select-team?typeid=' + item
})
},
//
endGroupTask() {
let that = this;
uni.showModal({
title: '结束班次',
content: '是否结束当前班次?',
success: function(res) {
if (res.confirm) {
uni.showLoading({
title: '操作中'
})
let datas = {
gasId: that.userinfo.merchantStore.id
}
endGroupTask(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
uni.showToast({
title: '操作成功',
icon: 'none',
duration: 2000
})
that.pageNum = 1;
that.isLoadMore = true
that.classGroupTaskList = [];
that.getCurrentClassGroupTask();
that.getClassGroupTaskList();
}
})
}
}
})
},
//
getClassGroupTaskList() {
uni.showLoading({
title: '加载中'
})
let datas = {
pageNum: this.pageNum,
pageSize: this.pagesize,
}
getClassGroupTaskList(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000' && res.return_data.list != '') {
this.listcount = res.return_data.total;
this.classGroupTaskList = this.classGroupTaskList.concat(res.return_data.list);
if (res.return_data.pages == this.pageNum) {
this.isLoadMore = true;
} else {
this.isLoadMore = false
}
} else {
this.listcount = 0;
this.classGroupTaskList = [];
this.isLoadMore = true
}
});
},
//
jumpSummary(item) {
uni.navigateTo({
url: '../shift-summary/shift-summary?id=' + item
})
}
}
}
</script>
<style lang="scss">
</style>

@ -0,0 +1,128 @@
<template>
<view>
<view class="width92 fcor666 font14 mart20 alijusstart">
<view class="width30 fcor333">开始时间:</view>
<view class="width50">{{classGroupTaskDetails.startTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}</view>
</view>
<view class="width92 fcor666 font14 mart20 alijusstart">
<view class="width30 fcor333">结束时间:</view>
<view class="width50">{{classGroupTaskDetails.endTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}</view>
</view>
<view class="width92 fcor666 font14 mart20 alijusstart">
<view class="width30 fcor333">加油金额汇总:</view>
<view class="width50">{{classGroupTaskDetails.refuelPrice}} </view>
</view>
<view class="width92 fcor666 font14 mart20 alijusstart">
<view class="width30 fcor333">加油笔数汇总:</view>
<view class="width50">{{classGroupTaskDetails.refuelNum}} </view>
</view>
<view class="width92 fcor666 font14 mart20 alijusstart">
<view class="width30 fcor333">加油升数汇总:</view>
<view class="width50">{{classGroupTaskDetails.refuelLiters}} </view>
</view>
<view class="width92 fcor666 font14 mart20 alijusstart">
<view class="width30 fcor333">退款金额汇总:</view>
<view class="width50">{{classGroupTaskDetails.refundPrice }} </view>
</view>
<view class="width92 fcor666 font14 mart20 alijusstart">
<view class="width30 fcor333">退款笔数汇总:</view>
<view class="width50">{{classGroupTaskDetails.refundNum }} </view>
</view>
<view class="width92 fcor666 font14 mart20 alijusstart">
<view class="width30 fcor333">退款升数汇总:</view>
<view class="width50">{{classGroupTaskDetails.refundLiters}} </view>
</view>
<view class="alijusstart fotct font14 height40p backcor9 mart30 fcor333">
<view class="width25">油号</view>
<view class="width25">金额</view>
<view class="width25">升数</view>
<view class="width25">笔数</view>
</view>
<view v-if="classGroupTaskDetails.groupTaskOilCountList == '' " class="mart60 fotct font14 fcor666">
<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
</view>
<view class="width100 alijusstart fotct font14 height45 fcor666 mart5 bor-botm1 marb5" :key="index"
v-for="(item,index) in classGroupTaskDetails.groupTaskOilCountList">
<view class="width25">{{item.oilNo}}#</view>
<view class="width25">{{item.refuelPrice}}</view>
<view class="width25">{{item.refuelLiters}}</view>
<view class="width25">{{item.refuelNum}}</view>
</view>
<view class="height80"></view>
<view class="width40w height40 backcor008 border-r font14 fotct fcorfff" style="position: fixed;bottom: 15px;"
@click="print()">
打印小票
</view>
</view>
</template>
<script>
import {
getClassGroupTaskById,
print
} from '../../../Utils/Api.js';
let app = getApp();
export default {
data() {
return {
taskId: '', //id
classGroupTaskDetails: '', //
imgadres: 'noorder.png',
imagewxUrl: app.globalData.imageWxImg,
}
},
onLoad(options) {
this.taskId = options.id;
this.getClassGroupTaskById();
},
methods: {
//
getClassGroupTaskById() {
uni.showLoading({
title: '加载中...'
})
let datas = {
gasClassGroupTaskId: this.taskId
}
getClassGroupTaskById(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
this.classGroupTaskDetails = JSON.parse(res.return_data.dataCount);
}
})
},
//
print() {
uni.showLoading({
title: '打印小票'
})
let datas = {
gasClassGroupTaskId: this.taskId
}
print(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
uni.showToast({
title: '打印成功',
icon: 'none',
duration: 2000
})
} else {
uni.showToast({
title: res.return_msg,
icon: 'none',
duration: 2000
})
}
})
}
}
}
</script>
<style lang="scss">
</style>

@ -1,14 +1,14 @@
<template>
<view>
<view v-if="oilgunList == ''" class="mart40 fotct font14 fcor666">
<image mode="widthFix" style="width: 70vw;" src="../../../static/img/noorder.png"></image>
<view>
<view v-if="oilgunList == ''" class="mart40 fotct font14 fcor666">
<image mode="widthFix" style="width: 70vw;" src="../../../static/img/noorder.png"></image>
</view>
<view class="activeRefuel" v-for="(item,index) in oilgunList" :key="index">
{{item.gunNo}}号枪
<image src="../../../static/img/6.png" mode="widthFix" class="imgcha iconw" @click.stop="delGunNo(item.id)">
<image src="../../../static/img/6.png" mode="widthFix" v-if="positionType == 1" class="imgcha iconw" @click.stop="delGunNo(item.id)">
</image>
</view>
<view class="btn mart50" @click="addgasoilPrice()"> </view>
<view class="btn mart50" @click="addgasoilPrice()" v-if="positionType == 1"> </view>
</view>
</template>
@ -23,7 +23,8 @@
data() {
return {
oilgunList: [], //
oilNo: '' //
oilNo: '' ,//
positionType: app.globalData.positionType //
}
},
onLoad(options) {
@ -40,14 +41,25 @@
editable: true,
success: function(res) {
if (res.confirm) {
var a = /^[0-9]*$/;
if (!(a.test(res.content))) {
uni.showToast({
title: '请输入正确的枪号',
duration: 2000,
icon: 'none'
})
return;
}
uni.showLoading({
title: '提交中'
})
let datas = {
"oilPriceId": that.oilNo,
"gunNo": res.content
}
addGasOilPrice(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
that.getGunNoListByOilPrice();
} else {

@ -15,7 +15,7 @@
<input placeholder="请输入优惠幅度" v-model="discountPrice" type="text"
placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
</view>
<view class="btn mart50" @click="editGasOilPrice()"> </view>
<view class="btn mart50" @click="editGasOilPrice()" v-if="positionGunPrice == 1"> </view>
</view>
</template>
@ -33,7 +33,8 @@
discountPrice: '', //
oilNo: '', //
oilDetails: '', //
userinfo: '' //
userinfo: '' ,//
positionGunPrice: app.globalData.positionGunPrice //
}
},
onLoad(options) {

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

@ -248,7 +248,10 @@ $uni-font-size-paragraph:30upx;
.backcolor32 {
background-color: #32649d;
}
}
.backcolor72{
background-color: #eb5823;
}
//渐变
.backcorlr{
background: linear-gradient(to right, #fe1a1a, #ff722e);
@ -323,7 +326,10 @@ $uni-font-size-paragraph:30upx;
.width50 {
width: 50%;
}
.width46 {
width: 46%;
}
.width40 {
width: 40%;
}

Loading…
Cancel
Save