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

更新

Browse Source
pull/2/head
xiaozhiyong 2 years ago
parent a6909ed508
commit 9196734d72
3 changed files with 190 additions and 173 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. 4
      financialCenter/business/index.vue
  2. 167
      oilDistribution/index/index.vue
  3. 192
      orderList/index/index.vue

4
financialCenter/business/index.vue
Unescape View File

@ -11,7 +11,7 @@
</uni-easyinput>
</view>
</view>
<view style="flex:1;overflow: hidden;">
<view style="flex:1;overflow: hidden;">
<scroll-view style="height: 100%;" scroll-y="true" @scrolltolower='scrolltolower'>
<view class="container">
<view class="item" v-for="item,index in tableList" :key="index"
@ -74,7 +74,9 @@
}
return +number.toFixed(2)
},
jump(e, path,item) {
console.log(123)
switch (e) {
case -1:
uni.navigateBack()

167
oilDistribution/index/index.vue
Unescape View File

@ -5,16 +5,10 @@
<view class="header_seach">
<view class="header_seach_seach">
<view class="seach_input">
<uni-easyinput
:candidate='candidate'
:ejectOpen='ejectOpen'
@ejectFn='ejectFn'
:letfText='letfText'
confirmType='search'
@confirm='seachFn'
placeholder-style="color:#bbbbbb;font-weight: 100;"
v-model="seachValue"
:placeholder="letfText=='企业'?'企业名,企业ID':'司机姓名,司机手机号'" @iconClick="onClick">
<uni-easyinput :candidate='candidate' :ejectOpen='ejectOpen' @ejectFn='ejectFn'
:letfText='letfText' confirmType='search' @confirm='seachFn'
placeholder-style="color:#bbbbbb;font-weight: 100;" v-model="seachValue"
:placeholder="letfText=='企业'?'企业名,企业ID':'司机姓名,司机手机号'" @iconClick="onClick">
</uni-easyinput>
</view>
<button @tap='jump(2)' class="header_seach_butten">
@ -36,7 +30,7 @@
</topBar>
<view style="flex: 1;overflow: hidden;">
<scroll-view v-if="listData.length!=0" style="height: 100%;" scroll-y="true" @scrolltolower='scrolltolower'>
<view v-for="(item,index) in listData" class="form_body">
<view v-for="(item,index) in listData" class="form_body">
<view @tap="jump(1,item)" class="form_body_item">
<view v-if="item.auditMark==0" class="leftTip"></view>
<view class="form_body_item_body">
@ -87,19 +81,21 @@
</view>
</view>
</scroll-view>
<view v-if="listData.length==0" style="width: 100vw; height: 100%; display: flex;align-items: center;justify-content: center;">
<view v-if="listData.length==0"
style="width: 100vw; height: 100%; display: flex;align-items: center;justify-content: center;">
<image src="@/static/qx.png" style="width: 536rpx; height: 399rpx;"></image>
</view>
</view>
<popup :show="showPopup" @confirmFn='confirmFn' @closeFn='closeFn' :butten='butten'
v-model="iShow.examine">
<view slot="coment">
<popup :show="showPopup" @confirmFn='confirmFn' @closeFn='closeFn' :butten='butten' v-model="iShow.examine">
<view slot="coment">
<view class="examine_popup_body">
<view class="examine_popup_header">
<view class="examine_popup_header_top">
<view class="examine_popup_header_title">分发详情</view>
<view :style="{background:typeBackground(seledata.auditMark),color:typeColor(seledata.auditMark)}" class="listCard_header_Type">
<view :style="{background:typeColor(seledata.auditMark)}" class="garden"></view>
<view
:style="{background:typeBackground(seledata.auditMark),color:typeColor(seledata.auditMark)}"
class="listCard_header_Type">
<view :style="{background:typeColor(seledata.auditMark)}" class="garden"></view>
<text>{{seledata.auditMark|typeText}}</text>
</view>
</view>
@ -115,8 +111,10 @@
</view>
</view>
<view class="examine_popup_orderType">
<image style="width: 60rpx;height: 50rpx;" class="form_body_item_img" src="@/static/fy.png"></image>
<view class="examine_popup_orderType_text">{{ Number(seledata.disAmount).toFixed(2)||'--' }}</view>
<image style="width: 60rpx;height: 50rpx;" class="form_body_item_img" src="@/static/fy.png">
</image>
<view class="examine_popup_orderType_text">{{ Number(seledata.disAmount).toFixed(2)||'--' }}
</view>
</view>
<view class="information_item">
<view class="information_item_label">子公司</view>
@ -126,15 +124,21 @@
</view>
</view>
<view style="margin-top: 20rpx;" class="information_item_other">
<view class="information_item_other_value">{{seledata.createUserName||'暂无'}}({{seledata.createUser||'--'}}) <br/> {{seledata.createTime||'--'}}</view>
<view class="information_item_other_value">
{{seledata.createUserName||'暂无'}}({{seledata.createUser||'--'}}) <br />
{{seledata.createTime||'--'}}
</view>
<view class="information_item_other_label">申请信息</view>
</view>
<view class="information_item_other">
<view class="information_item_other_value">{{seledata.auditUserName||'暂无'}}({{seledata.auditUser||'暂无'}}) <br/> {{seledata.auditTime||'--'}}</view>
<view class="information_item_other_value">
{{seledata.auditUserName||'暂无'}}({{seledata.auditUser||'暂无'}}) <br />
{{seledata.auditTime||'--'}}
</view>
<view class="information_item_other_label">审核信息</view>
</view>
<!-- <view>
<!-- <view>
<view class="company_msg">
<text class="samll_txext">公司名</text>
<text class="company_msg_content">{{seledata.disCompanyName}}</text>
@ -164,7 +168,7 @@
</view>
</view>-->
</view>
</view>
</view>
</popup>
</view>
</template>
@ -180,9 +184,9 @@
},
data() {
return {
showPopup:{
img:false,
footer:false
showPopup: {
img: false,
footer: false
},
animationData: null,
seledata: {},
@ -269,44 +273,44 @@
onShow() {
this.getList();
},
filters:{
typeText:function(e){
switch(Number(e)){
case 0:
return '等待审核'
case 1:
return '审核通过'
case -1:
return '审核失败'
filters: {
typeText: function(e) {
switch (Number(e)) {
case 0:
return '等待审核'
case 1:
return '审核通过'
case -1:
return '审核失败'
default:
return '---'
return '---'
}
},
},
methods: {
typeColor:function(e){
console.log(e,'-----')
switch(Number(e)){
case 0:
return '#E8CD30'
case 1:
return '#17A00E'
case -1:
return '#EC4545'
typeColor: function(e) {
console.log(e, '-----')
switch (Number(e)) {
case 0:
return '#E8CD30'
case 1:
return '#17A00E'
case -1:
return '#EC4545'
default:
return ''
return ''
}
},
typeBackground:function(e){
switch(Number(e)){
case 0:
return '#E8CD3026'
case 1:
return '#17A00E26'
case -1:
return '#EC454526'
typeBackground: function(e) {
switch (Number(e)) {
case 0:
return '#E8CD3026'
case 1:
return '#17A00E26'
case -1:
return '#EC454526'
default:
return ''
return ''
}
},
animationFns() {
@ -388,10 +392,10 @@
getList() {
oilDistribution.getByPageOms(this.getData).then(res => {
if (res.code !== 20000) return
if(res.data.list.length==0){
if (res.data.list.length == 0) {
uni.showToast({
title:'没有数据了哦',
icon:'none'
title: '没有数据了哦',
icon: 'none'
})
}
if (this.getData.currentPage !== 1) {
@ -412,29 +416,29 @@
})
break;
case 1:
this.seledata = item
this.iShow.examine = true
this.seledata = item
this.iShow.examine = true
if (item.auditMark == 0) {
this.showPopup.footer = true
}else{
} else {
this.showPopup.footer = false
}
break;
case 2:
if(uni.getStorageSync('user').authList.includes('distributeReverse:info:add')){
uni.redirectTo({
url: "../distribute/distribute",
fail(E) {
console.log(e)
}
})
}else{
uni.showToast({
title:'暂无权限请联系管理员',
icon:'none'
})
}
if (uni.getStorageSync('user').authList.includes('distributeReverse:info:add')) {
uni.redirectTo({
url: "../distribute/distribute",
fail(E) {
console.log(e)
}
})
} else {
uni.showToast({
title: '暂无权限请联系管理员',
icon: 'none'
})
}
break;
}
},
@ -482,6 +486,7 @@
<style>
@import url("./popup.css");
.icoon :active {
color: #007AFF;
}
@ -747,14 +752,14 @@
border: 0px !important;
}
/* .header {
background-color: #007AFF;
.header {
/* background-color: #007AFF; */
color: white;
min-height: 403rpx;
background-image: url('https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油admin小程序/sjbj.png');
background-size: 100% 100%;
background: url('https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油admin小程序/sjbj.png') 100%/100%;
/* background-size: 100% 100%; */
position: relative;
} */
}
.uni-navbar__header-btns-right {
padding-right: 0 !important;

192
orderList/index/index.vue
Unescape View File

@ -8,7 +8,8 @@
<uni-easyinput :candidate='candidate' :ejectOpen='ejectOpen' @ejectFn='ejectFn'
:letfText='letfText' confirmType='search' @confirm='seachFn'
placeholder-style="color:#bbbbbb;font-weight: 100;" v-model="seachValue"
:placeholder="letfText=='订单号'? '订单编号':letfText=='司机'?'司机姓名,手机号码':letfText=='企业'?'企业名称,企业编号':'油站名称'" @iconClick="onClick">
:placeholder="letfText=='订单号'? '订单编号':letfText=='司机'?'司机姓名,手机号码':letfText=='企业'?'企业名称,企业编号':'油站名称'"
@iconClick="onClick">
</uni-easyinput>
</view>
</view>
@ -29,17 +30,20 @@
<view v-for="(item,index) in listData" class="form_body">
<view @tap="jump(1,item)" class="form_body_item">
<view class="form_body_item_top">
<view :style="{backgroundColor:item.payAccountType==0?'#FD9500':'#2866FF' }" class="form_body_item_top_label">{{item.payAccountType==0?'个人':'企业'}}</view>
<view :style="{backgroundColor:item.payAccountType==0?'#FD9500':'#2866FF' }"
class="form_body_item_top_label">{{item.payAccountType==0?'个人':'企业'}}</view>
<view>{{item.orderSerialNumber}}</view>
</view>
<view style="padding: 0 25rpx; margin-top: 23rpx;">
<view class="from_body_item_container">
<view class="from_body_item_container">
<view class="flex between">
<view class="flex">
<view class="flex">
<view>{{item.phone}}</view>
<view class="samll_txext" style="margin-left:23rpx;">{{item.userName}}</view>
</view>
<view style="color: ;" v-if="item.orderWfStatus==0&& String(item.siteName).indexOf('壳牌')!==-1">待核销</view>
<view style="color: ;"
v-if="item.orderWfStatus==0&& String(item.siteName).indexOf('壳牌')!==-1">待核销
</view>
</view>
<view style="margin-bottom:23rpx ; font-size: 26rpx;" class="text">
{{item.companyName?item.companyName:'暂无'}}
@ -60,7 +64,8 @@
</view>
<view class="form_body_item_footer">
<view style="font-size: 22rpx;" class="samll_txext">{{item.createTime}}</view>
<view :style="{fontSize: '24rpx', color:option(item.orderStatus).color }">{{option(item.orderStatus).text}}</view>
<view :style="{fontSize: '24rpx', color:option(item.orderStatus).color }">
{{option(item.orderStatus).text}}</view>
</view>
</view>
</view>
@ -78,12 +83,12 @@
export default {
data() {
return {
animation:null,
animationData:null,
animation: null,
animationData: null,
listData: [],
letfText: '订单号',
seleindex: 0,
candidate: ['企业', '司机','订单号','油站名称'],
candidate: ['企业', '司机', '订单号', '油站名称'],
ejectOpen: false,
seachValue: '',
navigation: [{
@ -108,7 +113,7 @@
userName: '',
orderStatus: '',
orderWfStatus: '',
siteName:''
siteName: ''
}
},
}
@ -120,66 +125,66 @@
this.rotateFn()
},
methods: {
jump(e,w){
switch(e){
jump(e, w) {
switch (e) {
case 1:
uni.navigateTo({
url:'../orderDetails/orderDetails?jsData=' + JSON.stringify(w)
})
break;
uni.navigateTo({
url: '../orderDetails/orderDetails?jsData=' + JSON.stringify(w)
})
break;
}
},
scrolltolower(){
scrolltolower() {
this.getData.currentPage += 1
this.getlist()
},
option(e){
switch(e){
option(e) {
switch (e) {
case 0:
return {
text:'待支付',
color:'#EBC153'
}
break;
return {
text: '待支付',
color: '#EBC153'
}
break;
case 1:
return {
text:'已支付',
color:'#17A00E'
}
break;
return {
text: '已支付',
color: '#17A00E'
}
break;
case -1:
return {
text:'支付失败',
color:'#EC4645'
}
break;
return {
text: '支付失败',
color: '#EC4645'
}
break;
case 2:
return {
text:'已取消',
color:'#999999'
}
break;
return {
text: '已取消',
color: '#999999'
}
break;
case 3:
return {
text:'已退款',
color:'#999999'
}
break;
return {
text: '已退款',
color: '#999999'
}
break;
case 4:
return {
text:'退款中',
color:'#EBC153'
}
// return '退款中'
break;
return {
text: '退款中',
color: '#EBC153'
}
// return '退款中'
break;
case 5:
return {
text:'退款失败',
color:'#EC4645'
}
// return '退款失败'
break;
return {
text: '退款失败',
color: '#EC4645'
}
// return '退款失败'
break;
}
},
animationFns() {
@ -192,7 +197,7 @@
this.animation.rotate(0).step()
this.animationData = this.animation.export()
},
rotateFn() {
rotateFn() {
var animation = uni.createAnimation({
duration: 1000,
timingFunction: 'ease',
@ -243,27 +248,27 @@
this.navigation[0].text = '全部'
break
case 3:
this.getData.params.orderWfStatus = ''
this.getData.params.orderStatus = ''
this.navigation[0].text = '全部'
break
this.getData.params.orderWfStatus = ''
this.getData.params.orderStatus = ''
this.navigation[0].text = '全部'
break
}
if(this.getData.params.orderWfStatus === 0){
if (this.getData.params.orderWfStatus === 0) {
this.getData.params.orderWfStatus = ''
this.getData.params.orderStatus = ''
this.navigation[0].text = '全部'
}
}
if(e.index==1){
if (e.index == 1) {
this.getData.params.orderStatus = ''
this.getData.params.orderWfStatus = 0
}
if(e.index == -1){
if (e.index == -1) {
this.getData.params.orderWfStatus = null
this.getData.params.orderStatus = 3
}
this.rotateFn()
console.log(this.getData.params,this.navigation[0].text )
console.log(this.getData.params, this.navigation[0].text)
this.getlist()
},
onClick() {
@ -272,31 +277,30 @@
},
seachFn() {
console.log(this.seachValue)
this.getData.params.userName= ''
this.getData.params.id= ''
this.getData.params.companyName= ''
this.getData.params.siteName= ''
if(this.letfText=='企业'){
this.getData.params.companyName= this.seachValue
console.log('现在是企业 companyName',this.letfText,)
}else if(this.letfText=='订单号') {
this.getData.params.id= this.seachValue
console.log('现在是订单 id',this.letfText,this.getData.params.id,this.getData.params)
}else if(this.letfText=='司机'){
this.getData.params.userName= this.seachValue
console.log('现在是司机 userName',this.letfText,)
}else
{
this.getData.params.siteName= this.seachValue
console.log('现在是其他 siteName',this.letfText,)
this.getData.params.userName = ''
this.getData.params.id = ''
this.getData.params.companyName = ''
this.getData.params.siteName = ''
if (this.letfText == '企业') {
this.getData.params.companyName = this.seachValue
console.log('现在是企业 companyName', this.letfText, )
} else if (this.letfText == '订单号') {
this.getData.params.id = this.seachValue
console.log('现在是订单 id', this.letfText, this.getData.params.id, this.getData.params)
} else if (this.letfText == '司机') {
this.getData.params.userName = this.seachValue
console.log('现在是司机 userName', this.letfText, )
} else {
this.getData.params.siteName = this.seachValue
console.log('现在是其他 siteName', this.letfText, )
}
this.getData.currentPage = 1
this.getlist()
},
ejectFn(e) {
this.letfText = e
if(this.letfText=='企业'){
if (this.letfText == '企业') {
}
console.log(e)
},
@ -306,6 +310,7 @@
<style>
@import url("./index.css");
.icoon :active {
color: #007AFF;
}
@ -344,28 +349,32 @@
justify-content: space-between;
align-items: baseline;
}
.bgtext{
.bgtext {
font-size: 28rpx;
font-family: PingFang SC;
font-weight: bold;
color: #333333;
}
.item_price {
font-size: 24rpx;
font-family: PingFang SC;
font-weight: 500;
color: #333333;
}
.text{
.text {
font-size: 26rpx;
font-family: PingFang SC;
font-weight: 500;
color: #333333;
}
.samll_txext {
font-size: 24rpx;
font-family: PingFang SC;
@ -414,6 +423,7 @@
page {
background-color: #F0F2FF;
}
.form_body_item {
min-height: 339rpx;
background: #FFFFFF;

Write Preview
Loading…
Cancel
Save