Skip to content

W
wly-APP
Commit 4b073852 authored by chuan.liu's avatar chuan.liu
Browse files
Options

修复bug

parent 569881b7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 270 additions and 314 deletions
manifest.json
View file @ 4b073852
This diff is collapsed.
pages.json
View file @ 4b073852
...@@ -912,7 +912,7 @@ ...@@ -912,7 +912,7 @@
"titleColor": "#333", "titleColor": "#333",
"titleSize": "17px", "titleSize": "17px",
"backgroundColor": "#fff", "backgroundColor": "#fff",
"titleText": "联络函信息", "titleText": "银行账户选择",
"autoBackButton": true "autoBackButton": true
}, },
"bounce": "none" "bounce": "none"
......
pages/home/home.vue
View file @ 4b073852
...@@ -125,6 +125,7 @@ ...@@ -125,6 +125,7 @@
}, },
yAxis: { yAxis: {
"dashLength": 20, "dashLength": 20,
disabled: true
}, },
legend: { legend: {
"position": "bottom", "position": "bottom",
...@@ -135,15 +136,16 @@ ...@@ -135,15 +136,16 @@
column: { column: {
categoryGap: 7 categoryGap: 7
} }
} },
series: {
show: false
},
padding: [50, 0, 20, 0]
}, },
chartData: { chartData: {
"categories": [ "categories": [
"1618", "1618",
"七代", "七代",
"八代",
"定制",
"经典"
], ],
"series": [{ "series": [{
"name": "制票总金额", "name": "制票总金额",
...@@ -166,50 +168,6 @@ ...@@ -166,50 +168,6 @@
// 34 // 34
// ] // ]
// }, // },
// {
// "name": "订单金(万)",
// "data": [
// 18,
// 27,
// 21,
// 24,
// 6,
// 28
// ]
// },
// {
// "name": "开票(万)",
// "data": [
// 28,
// 17,
// 11,
// 14,
// 16,
// 18
// ]
// },
// {
// "name": "发货",
// "data": [
// 28,
// 17,
// 11,
// 14,
// 16,
// 18
// ]
// },
// {
// "name": "到货",
// "data": [
// 28,
// 17,
// 11,
// 14,
// 16,
// 18
// ]
// }
// ] // ]
}, },
statisticsData: [] statisticsData: []
......
pages/login/login.nvue
View file @ 4b073852
...@@ -138,6 +138,12 @@ ...@@ -138,6 +138,12 @@
...res.data.operator ...res.data.operator
} }
}); });
this.$uStore({
name: 'userBpData',
value: {
...res.data.userBpData
}
});
this.$uStore({ this.$uStore({
name: 'vuex_token', name: 'vuex_token',
value: res.data.token value: res.data.token
......
pages/message-list/message-list-page.nvue
View file @ 4b073852
...@@ -187,7 +187,10 @@ ...@@ -187,7 +187,10 @@
uni.hideLoading(); uni.hideLoading();
if (res.status === 1) { if (res.status === 1) {
this.loadData(true); const index = this.dataList.findIndex((item2) => {
return item2.id === item.id
})
this.dataList.splice(index, 1)
} }
}, },
refreshData() { refreshData() {
......
pages/my-order/my-order.nvue
View file @ 4b073852
...@@ -451,7 +451,6 @@ ...@@ -451,7 +451,6 @@
.icon-arrow { .icon-arrow {
width: 32rpx; width: 32rpx;
height: 20rpx; height: 20rpx;
// margin-left: 12rpx;
margin-top: 24rpx; margin-top: 24rpx;
transition-property: transform; transition-property: transform;
transition-duration: 0.15s; transition-duration: 0.15s;
...@@ -464,40 +463,36 @@ ...@@ -464,40 +463,36 @@
.filter-btn { .filter-btn {
flex: 1; width: 148rpx;
min-width: 148rpx;
max-width: 148rpx;
height: 68rpx; height: 68rpx;
line-height: unset; line-height: 64rpx;
background: #f8f8f8; background-color: #f8f8f8;
border-radius: 16rpx; border-radius: 8px;
color: #8e8e8e;
font-size: 24rpx;
margin-right: 20rpx; margin-right: 20rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
margin-left: 0; margin-left: 0;
border: 2rpx solid #f8f8f8; border: 2rpx solid transparent;
overflow: hidden;
padding: 0;
} }
.filter-btn__text { .filter-btn__text {
display: inline-block;
width: 148rpx;
height: 68rpx; height: 68rpx;
border-radius: 8px;
line-height: 68rpx; line-height: 68rpx;
color: #8e8e8e; color: #8e8e8e;
font-size: 24rpx;
text-align: center; text-align: center;
font-size: 24rpx;
} }
.filter-btn-active { .filter-btn-active {
background: #f61d30; background: #f61d30;
color: #fff;
border: 2rpx solid #f61d30;
// box-shadow: 0px 4rpx 12rpx 0px rgba(255, 29, 50, 0.56);
} }
.filter-btn-active__text { .filter-btn-active__text {
color: #fff; color: #fff;
height: 68rpx;
line-height: 68rpx;
background: #f61d30; background: #f61d30;
} }
......
pages/order-detail-group/order-detail-group.nvue
View file @ 4b073852
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
</view> </view>
<view class="order-bottom view"> <!-- <view class="order-bottom view">
<view class="middle view"> <view class="middle view">
<view class="item-block item-block-name"> <view class="item-block item-block-name">
<text class="item-block-label">附件</text> <text class="item-block-label">附件</text>
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
</view> </view>
</view> </view>
</view> </view>
</view> </view> -->
</cell> </cell>
</list> </list>
</view> </view>
......
pages/order-detail-noquota/order-detail-noquota.nvue
View file @ 4b073852
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
</view> </view>
<view class="order-bottom view"> <!-- <view class="order-bottom view">
<view class="middle view"> <view class="middle view">
<view class="item-block item-block-name"> <view class="item-block item-block-name">
<text class="item-block-label">附件</text> <text class="item-block-label">附件</text>
...@@ -88,9 +88,9 @@ ...@@ -88,9 +88,9 @@
<view class="block-detal"> <view class="block-detal">
<view class="block-detal-item"> <view class="block-detal-item">
<view class="detal-item-file"> <view class="detal-item-file">
<!-- <image class="icon-file" :src="formateToStream(ATTACHMENT[0].XCONTENT)" <image class="icon-file" :src="formateToStream(ATTACHMENT[0].XCONTENT)"
mode="widthFix"> mode="widthFix">
</image> --> </image>
<image class="icon-file" src="@/static/image/logo@3x.png" mode="widthFix"> <image class="icon-file" src="@/static/image/logo@3x.png" mode="widthFix">
</image> </image>
<text <text
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
</view> </view>
</view> </view>
</view> </view>
</view> </view> -->
</cell> </cell>
</list> </list>
</view> </view>
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
handleShowReceiveDetail() { handleShowReceiveDetail() {
this.ishowReceiveDetail = !this.ishowReceiveDetail this.ishowReceiveDetail = !this.ishowReceiveDetail
if (this.ishowReceiveDetail === true) { if (this.ishowReceiveDetail === true) {
this.receiveInfoHeight = `${270*this.ITEM.length}` this.receiveInfoHeight = `${280*this.ITEM.length}`
} else { } else {
this.receiveInfoHeight = '145' this.receiveInfoHeight = '145'
} }
...@@ -256,7 +256,6 @@ ...@@ -256,7 +256,6 @@
.title-info { .title-info {
align-items: center; align-items: center;
// margin-right: 26rpx;
} }
.title-info__status { .title-info__status {
...@@ -345,10 +344,6 @@ ...@@ -345,10 +344,6 @@
margin-bottom: 16rpx; margin-bottom: 16rpx;
} }
.order-middle-auto {
// height: auto;
}
.middle { .middle {
background-color: #fff; background-color: #fff;
border-radius: 16rpx; border-radius: 16rpx;
......
pages/order-detail-quota/order-detail-quota.nvue
View file @ 4b073852
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
</view> </view>
<view class="order-bottom view"> <!-- <view class="order-bottom view">
<view class="middle view"> <view class="middle view">
<view class="item-block item-block-name"> <view class="item-block item-block-name">
<text class="item-block-label">附件</text> <text class="item-block-label">附件</text>
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
</view> </view>
</view> </view>
</view> </view>
</view> </view> -->
</cell> </cell>
</list> </list>
</view> </view>
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
this.ishowReceiveDetail = !this.ishowReceiveDetail this.ishowReceiveDetail = !this.ishowReceiveDetail
if (this.ishowReceiveDetail === true) { if (this.ishowReceiveDetail === true) {
let len = this.ITEM_INNER.length + this.ITEM_OUTER.length let len = this.ITEM_INNER.length + this.ITEM_OUTER.length
this.receiveInfoHeight = `${340*len}` this.receiveInfoHeight = `${350*len}`
} else { } else {
this.receiveInfoHeight = '132' this.receiveInfoHeight = '132'
} }
...@@ -237,7 +237,6 @@ ...@@ -237,7 +237,6 @@
.header-bg { .header-bg {
height: 284rpx; height: 284rpx;
opacity: 0.72;
margin-top: -88rpx; margin-top: -88rpx;
} }
...@@ -248,9 +247,7 @@ ...@@ -248,9 +247,7 @@
.lists { .lists {
position: relative; position: relative;
flex-direction: column; flex-direction: column;
// overflow-y: scroll;
background: #f0f4f5; background: #f0f4f5;
height: 100%;
} }
.main { .main {
...@@ -296,7 +293,6 @@ ...@@ -296,7 +293,6 @@
.title-info { .title-info {
align-items: center; align-items: center;
// margin-right: 26rpx;
} }
.title-info__status { .title-info__status {
...@@ -384,10 +380,6 @@ ...@@ -384,10 +380,6 @@
margin-bottom: 16rpx; margin-bottom: 16rpx;
} }
.order-middle-auto {
// height: auto;
}
.middle { .middle {
background-color: #fff; background-color: #fff;
border-radius: 16rpx; border-radius: 16rpx;
......
pages/produce-material/produce-material.nvue
View file @ 4b073852
...@@ -364,7 +364,6 @@ ...@@ -364,7 +364,6 @@
.icon-arrow { .icon-arrow {
width: 32rpx; width: 32rpx;
height: 20rpx; height: 20rpx;
// margin-left: 12rpx;
margin-top: 24rpx; margin-top: 24rpx;
transition-property: transform; transition-property: transform;
transition-duration: 0.15s; transition-duration: 0.15s;
...@@ -381,38 +380,36 @@ ...@@ -381,38 +380,36 @@
} }
.filter-btn { .filter-btn {
flex: 1; width: 148rpx;
min-width: 148rpx;
max-width: 148rpx;
height: 68rpx; height: 68rpx;
line-height: unset; line-height: 64rpx;
background: #f8f8f8; background-color: #f8f8f8;
border-radius: 16rpx; border-radius: 8px;
margin-right: 20rpx; margin-right: 20rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
margin-left: 0; margin-left: 0;
border: 2rpx solid #f8f8f8; border: 2rpx solid transparent;
overflow: hidden;
padding: 0;
} }
.filter-btn__text { .filter-btn__text {
display: inline-block;
width: 148rpx;
height: 68rpx; height: 68rpx;
border-radius: 8px;
line-height: 68rpx; line-height: 68rpx;
color: #8e8e8e; color: #8e8e8e;
font-size: 24rpx;
text-align: center; text-align: center;
font-size: 24rpx;
} }
.filter-btn-active { .filter-btn-active {
background: #f61d30; background: #f61d30;
color: #fff;
border: 2rpx solid #f61d30;
// box-shadow: 0px 4rpx 12rpx 0px rgba(255, 29, 50, 0.56);
} }
.filter-btn-active__text { .filter-btn-active__text {
color: #fff; color: #fff;
height: 68rpx;
line-height: 68rpx;
background: #f61d30; background: #f61d30;
} }
......
pages/produce-material/produce-plan.nvue
View file @ 4b073852
...@@ -233,7 +233,7 @@ ...@@ -233,7 +233,7 @@
return return
} }
item_inner = [productAfterInit] item_inner = productAfterInit
const params = { const params = {
// "HEAD": this.HEADINFO, // "HEAD": this.HEADINFO,
...@@ -247,7 +247,7 @@ ...@@ -247,7 +247,7 @@
item = { item = {
...item, ...item,
...product, ...product,
...res.DATA.ITEM[0] ...res.DATA
} }
} }
return item return item
......
pages/produce-order/produce-order.nvue
View file @ 4b073852
...@@ -4,17 +4,17 @@ ...@@ -4,17 +4,17 @@
<view class="conditon-block" :style="conditionTop" :class="{'conditon-block-auto':ishowDetail}"> <view class="conditon-block" :style="conditionTop" :class="{'conditon-block-auto':ishowDetail}">
<view class="filter-title"> <view class="filter-title">
<button type="default" class="filter-btn" :class="{'filter-btn-active':0 === filterActiveIndex}" <button type="default" class="filter-btn" :class="{'filter-btn-active':0 === filterActiveIndex}"
@tap="handleFilter('week')"><text class="filter-btn__text" @click="handleFilter('week')"><text class="filter-btn__text"
:class="{'filter-btn-active__text':0 === filterActiveIndex}">一周内</text></button> :class="{'filter-btn-active__text':0 === filterActiveIndex}">一周内</text></button>
<button type="default" @tap="handleFilter(item)" class="filter-btn" <button type="default" @click="handleFilter(item)" class="filter-btn"
:class="{'filter-btn-active':item === filterActiveIndex}" v-for="item in 3" :key='item'><text :class="{'filter-btn-active':item === filterActiveIndex}" v-for="item in 3" :key='item'><text
class="filter-btn__text" class="filter-btn__text"
:class="{'filter-btn-active__text':item === filterActiveIndex}">{{item}}月内</text></button> :class="{'filter-btn-active__text':item === filterActiveIndex}">{{item}}月内</text></button>
<image @tap="handleShowDetail" class="icon-arrow" :class="{'icon-arrow-rotate':ishowDetail}" <image @click="handleShowDetail" class="icon-arrow" :class="{'icon-arrow-rotate':ishowDetail}"
src="@/static/image/arrow_up@3x.png" mode="aspectFit"></image> src="@/static/image/arrow_up@3x.png" mode="aspectFit"></image>
</view> </view>
<view class="filter-content"> <view class="filter-content">
<button type="default" @tap="handleFilter(item+3)" class="filter-btn" <button type="default" @click="handleFilter(item+3)" class="filter-btn"
:class="{'filter-btn-active':item+3 === filterActiveIndex}" v-for="item in 9" :key='item'> :class="{'filter-btn-active':item+3 === filterActiveIndex}" v-for="item in 9" :key='item'>
<text class="filter-btn__text" <text class="filter-btn__text"
:class="{'filter-btn-active__text':item+3 === filterActiveIndex}">{{item+3}}月内</text></button> :class="{'filter-btn-active__text':item+3 === filterActiveIndex}">{{item+3}}月内</text></button>
...@@ -365,7 +365,6 @@ ...@@ -365,7 +365,6 @@
.icon-arrow { .icon-arrow {
width: 32rpx; width: 32rpx;
height: 20rpx; height: 20rpx;
// margin-left: 12rpx;
margin-top: 24rpx; margin-top: 24rpx;
transition-property: transform; transition-property: transform;
transition-duration: 0.15s; transition-duration: 0.15s;
...@@ -382,21 +381,24 @@ ...@@ -382,21 +381,24 @@
} }
.filter-btn { .filter-btn {
flex: 1; width: 148rpx;
min-width: 148rpx;
max-width: 148rpx;
height: 68rpx; height: 68rpx;
line-height: unset; line-height: 64rpx;
background: #f8f8f8; background-color: #f8f8f8;
border-radius: 16rpx; border-radius: 8px;
margin-right: 20rpx; margin-right: 20rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
margin-left: 0; margin-left: 0;
border: 2rpx solid #f8f8f8; border: 2rpx solid transparent;
overflow: hidden;
padding: 0;
} }
.filter-btn__text { .filter-btn__text {
display: inline-block;
width: 148rpx;
height: 68rpx; height: 68rpx;
border-radius: 8px;
line-height: 68rpx; line-height: 68rpx;
color: #8e8e8e; color: #8e8e8e;
text-align: center; text-align: center;
...@@ -404,16 +406,12 @@ ...@@ -404,16 +406,12 @@
} }
.filter-btn-active { .filter-btn-active {
background: #f61d30; background-color: #f61d30;
border: 2rpx solid #f61d30;
// box-shadow: 0px 4rpx 12rpx 0px rgba(255, 29, 50, 0.56);
} }
.filter-btn-active__text { .filter-btn-active__text {
color: #fff; color: #fff;
height: 68rpx; background-color: #f61d30;
line-height: 68rpx;
background: #f61d30;
} }
.filter-content { .filter-content {
......
pages/purchase-plan/purchase-plan.nvue
View file @ 4b073852
...@@ -114,8 +114,8 @@ ...@@ -114,8 +114,8 @@
loadingText: '加载中...', loadingText: '加载中...',
refreshing: false, refreshing: false,
condition: { condition: {
MV_BP: '0081000010', MV_BP: '',
ROLE: 'WLYALL', ROLE: 'WLY001',
RT_GJAHR: [{ RT_GJAHR: [{
SIGN: 'I', SIGN: 'I',
OPTION: 'EQ', OPTION: 'EQ',
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
// }, // },
created() { created() {
this.condition.RT_GJAHR[0].LOW = timeFormat(new Date(), 'yyyy') this.condition.RT_GJAHR[0].LOW = timeFormat(new Date(), 'yyyy')
this.condition.MV_BP = '0081000010' || this.userInfo.code this.condition.MV_BP = this.userInfo.code
this.reset() this.reset()
this.getSalesPlanTypes(true); this.getSalesPlanTypes(true);
}, },
...@@ -199,17 +199,17 @@ ...@@ -199,17 +199,17 @@
uni.hideLoading(); uni.hideLoading();
const { const {
lt_result, data,
page, page,
pagesize, pagesize,
total total
} = res } = res
this.page.PAGE = page this.page.PAGE = page * 1
this.page.PAGESIZE = pagesize this.page.PAGESIZE = pagesize * 1
this.loadParams.total = total this.loadParams.total = total * 1
this.loadParams.totalPage = Math.ceil(total * 1 / this.page.PAGESIZE * 1) this.loadParams.totalPage = Math.ceil(total * 1 / this.page.PAGESIZE * 1)
const dataMap = lt_result && lt_result.map((item) => { const dataMap = data && data.map((item) => {
item.checked = false item.checked = false
return item return item
}) })
......
pages/ticket-order/order-item.nvue
View file @ 4b073852
<template> <template>
<view class="order view"> <view class="order view">
<view class="top"> <view class="top">
<text class="title-no">制票编号：{{itemHead.INVO_INFOID}}</text> <text class="title-no">制票编号：{{itemHead.invo_infoid}}</text>
<view class="title-info"> <view class="title-info">
<button class="title-info__status" type="default"><text <button class="title-info__status" type="default"><text
class="item-block-btn__text">{{itemHead.INV_STATUS_TEXT}}</text></button> class="item-block-btn__text">{{itemHead.inv_status_text}}</text></button>
</view> </view>
</view> </view>
<view class="middle view"> <view class="middle view">
<text class="middle-title">{{itemHead.INFTYPE}}</text> <text class="middle-title">{{itemHead.inftype}}</text>
<view class="text-block"> <view class="text-block">
<text class="middle-date">{{itemHead.MAK_DATE}}</text> <text class="middle-date">{{itemHead.mak_date}}</text>
<text class="middle-date-des">下单日期</text> <text class="middle-date-des">下单日期</text>
</view> </view>
</view> </view>
...@@ -24,44 +24,44 @@ ...@@ -24,44 +24,44 @@
</view> </view>
<view v-if="ishowDetail" class="bottom-content" v-for="(item,index) in itemLists" :key="index"> <view v-if="ishowDetail" class="bottom-content" v-for="(item,index) in itemLists" :key="index">
<view class="text-block"> <view class="text-block">
<text class="middle-date">{{item.DESCRIPTION}}</text> <text class="middle-date">{{item.description}}</text>
<text class="middle-date-des">产品描述</text> <text class="middle-date-des">产品描述</text>
</view> </view>
<view class="text-block"> <view class="text-block">
<text class="middle-date middle-billno">{{item.INV_GUID}}</text> <text class="middle-date middle-billno">{{item.inv_guid}}</text>
<text class="middle-date-des">发票号</text> <text class="middle-date-des">发票号</text>
</view> </view>
<view class="text-block"> <view class="text-block">
<text class="middle-date">{{item.ZZFLD00002S}}</text> <text class="middle-date">{{item.zzfld00002s}}</text>
<text class="middle-date-des">规格</text> <text class="middle-date-des">规格</text>
</view> </view>
<view class="text-block-2"> <view class="text-block-2">
<view class="text-block text-block-1"> <view class="text-block text-block-1">
<text class="middle-date">{{item.USE_ZZFLD9}}</text> <text class="middle-date">{{item.use_zzfld9}}</text>
<text class="middle-date-des">开票件数</text> <text class="middle-date-des">开票件数</text>
</view> </view>
<view class="text-block"> <view class="text-block">
<text class="middle-date">{{item.ZZFLD00002T}}</text> <text class="middle-date">{{item.zzfld00002t}}</text>
<text class="middle-date-des">单位</text> <text class="middle-date-des">单位</text>
</view> </view>
</view> </view>
<view class="text-block-2"> <view class="text-block-2">
<view class="text-block text-block-1"> <view class="text-block text-block-1">
<text class="middle-date">{{item.NET_PRICE}}</text> <text class="middle-date">{{item.net_price}}</text>
<text class="middle-date-des">单价</text> <text class="middle-date-des">单价</text>
</view> </view>
<view class="text-block"> <view class="text-block">
<text class="middle-date">{{item.USE_QUANTITY}}</text> <text class="middle-date">{{item.use_quantity}}</text>
<text class="middle-date-des">数量</text> <text class="middle-date-des">数量</text>
</view> </view>
</view> </view>
<view class="text-block-2"> <view class="text-block-2">
<view class="text-block text-block-1"> <view class="text-block text-block-1">
<text class="middle-date">{{item.REMAIN_ZZFLD9}}</text> <text class="middle-date">{{item.remain_zzfld9}}</text>
<text class="middle-date-des">剩余开票件数</text> <text class="middle-date-des">剩余开票件数</text>
</view> </view>
<view class="text-block"> <view class="text-block">
<text class="middle-date">{{item.ZZFLD00002E}}</text> <text class="middle-date">{{item.zzfld00002e}}</text>
<text class="middle-date-des">税率</text> <text class="middle-date-des">税率</text>
</view> </view>
</view> </view>
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
<text class="middle-date-des">剩余发货件数</text> <text class="middle-date-des">剩余发货件数</text>
</view> --> </view> -->
<view class="text-block"> <view class="text-block">
<text class="middle-date">{{item.NET_VALUE}}</text> <text class="middle-date">{{item.net_value}}</text>
<text class="middle-date-des">价税合计</text> <text class="middle-date-des">价税合计</text>
</view> </view>
</view> </view>
...@@ -88,18 +88,18 @@ ...@@ -88,18 +88,18 @@
type: Object, type: Object,
default: function(e) { default: function(e) {
return { return {
HEAD: {}, head: {},
ITEM: [] item: []
} }
} }
} }
}, },
computed: { computed: {
itemHead() { itemHead() {
return this.newsItem.HEAD || {} return this.newsItem.head || {}
}, },
itemLists() { itemLists() {
return this.newsItem.ITEM || [] return this.newsItem.item || []
}, },
}, },
data() { data() {
...@@ -161,11 +161,17 @@ ...@@ -161,11 +161,17 @@
font-size: 12px; font-size: 12px;
color: #fff; color: #fff;
text-align: center; text-align: center;
border-color: transparent;
}
uni-button::after {
border: 0;
} }
.item-block-btn__text { .item-block-btn__text {
font-size: 12px; font-size: 12px;
color: #fff; color: #fff;
background: #f61d30;
} }
.middle { .middle {
......
pages/ticket-order/order-page.nvue
View file @ 4b073852
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<text class="loading-text">{{refreshText}}</text> <text class="loading-text">{{refreshText}}</text>
</div> </div>
</uni-refresh> </uni-refresh>
<uni-cell v-for="(item, index) in dataList" :key="item.id"> <uni-cell v-for="(item, index) in dataList" :key="index">
<order-item :newsItem="item" @click="goDetail(item)"></order-item> <order-item :newsItem="item" @click="goDetail(item)"></order-item>
</uni-cell> </uni-cell>
<uni-cell v-if="isLoading || dataList.length > 4"> <uni-cell v-if="isLoading || dataList.length > 4">
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
}, },
refreshIcon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAB5QTFRFcHBw3Nzct7e39vb2ycnJioqK7e3tpqam29vb////D8oK7wAAAAp0Uk5T////////////ALLMLM8AAABxSURBVHja7JVBDoAgDASrjqj//7CJBi90iyYeOHTPMwmFZrHjYyyFYYUy1bwUZqtJIYVxhf1a6u0R7iUvWsCcrEtwJHp8MwMdvh2amHduiZD3rpWId9+BgPd7Cc2LIkPyqvlQvKxKBJ//Qwq/CacAAwDUv0a0YuKhzgAAAABJRU5ErkJggg==", refreshIcon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAB5QTFRFcHBw3Nzct7e39vb2ycnJioqK7e3tpqam29vb////D8oK7wAAAAp0Uk5T////////////ALLMLM8AAABxSURBVHja7JVBDoAgDASrjqj//7CJBi90iyYeOHTPMwmFZrHjYyyFYYUy1bwUZqtJIYVxhf1a6u0R7iUvWsCcrEtwJHp8MwMdvh2amHduiZD3rpWId9+BgPd7Cc2LIkPyqvlQvKxKBJ//Qwq/CacAAwDUv0a0YuKhzgAAAABJRU5ErkJggg==",
condition: { condition: {
PARTNER: '4001139400', PARTNER: '',
ROLE: 'WLY001', ROLE: 'WLY001',
INV_STATUS: [{ INV_STATUS: [{
"SIGN": "I", "SIGN": "I",
...@@ -180,14 +180,14 @@ ...@@ -180,14 +180,14 @@
apiGetTicketOrder(params).then((res) => { apiGetTicketOrder(params).then((res) => {
console.log('loadData', res) console.log('loadData', res)
const { const {
DATA, data,
PAGE, page,
TOTAL total
} = res } = res
const data_list = DATA; const data_list = data;
this.page.PAGE = PAGE this.page.PAGE = page * 1
this.loadParams.total = TOTAL this.loadParams.total = total * 1
this.loadParams.totalPage = Math.ceil(TOTAL * 1 / this.page.PAGESIZE * 1) this.loadParams.totalPage = Math.ceil(total * 1 / this.page.PAGESIZE * 1)
this.isNoData = (data_list.length <= 0); this.isNoData = (data_list.length <= 0);
......
pages/ticket-order/ticket-order.nvue
View file @ 4b073852
...@@ -450,40 +450,36 @@ ...@@ -450,40 +450,36 @@
.filter-btn { .filter-btn {
flex: 1; width: 148rpx;
min-width: 148rpx;
max-width: 148rpx;
height: 68rpx; height: 68rpx;
line-height: unset; line-height: 64rpx;
background: #f8f8f8; background-color: #f8f8f8;
border-radius: 16rpx; border-radius: 8px;
color: #8e8e8e;
font-size: 24rpx;
margin-right: 20rpx; margin-right: 20rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
margin-left: 0; margin-left: 0;
border: 2rpx solid #f8f8f8; border: 2rpx solid transparent;
overflow: hidden;
padding: 0;
} }
.filter-btn__text { .filter-btn__text {
display: inline-block;
width: 148rpx;
height: 68rpx; height: 68rpx;
border-radius: 8px;
line-height: 68rpx; line-height: 68rpx;
text-align: center;
color: #8e8e8e; color: #8e8e8e;
text-align: center;
font-size: 24rpx; font-size: 24rpx;
} }
.filter-btn-active { .filter-btn-active {
background: #f61d30; background: #f61d30;
color: #fff;
border: 2rpx solid #f61d30;
// box-shadow: 0px 4rpx 12rpx 0px rgba(255, 29, 50, 0.56);
} }
.filter-btn-active__text { .filter-btn-active__text {
color: #fff; color: #fff;
height: 68rpx;
line-height: 68rpx;
background: #f61d30; background: #f61d30;
} }
......
store/index.js
View file @ 4b073852
...@@ -39,8 +39,16 @@ const store = new Vuex.Store({ ...@@ -39,8 +39,16 @@ const store = new Vuex.Store({
vuex_version: '1.0.1', vuex_version: '1.0.1',
vuex_demo: '绛紫', vuex_demo: '绛紫',
userInfo: { userInfo: {
name: '测试', name: '',
code: '0050000215' code: ''
},
userBpData: {
USER_BP: '',
ROLES: [{
"ROLE_DESC": "",
"ROLE_ID": "WLY001"
}],
USER_NAME: ''
}, },
quotaOrder: { quotaOrder: {
'ITEM_INNER': [], 'ITEM_INNER': [],
......
unpackage/dist/dev/app-plus/app-service.js
View file @ 4b073852
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/app-plus/manifest.json
View file @ 4b073852
{"@platforms":["android","iPhone","iPad"],"id":"__UNI__343534B","name":"五粮液APP","version":{"name":"1.0.0","code":"100"},"description":"订货系统","launch_path":"","developer":{"name":"","email":"","url":""},"permissions":{"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview","render":"always","uniNView":{"path":"pages/login/login.js"}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#fff"},"usingComponents":true,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","nvue":{"flex-direction":"row"},"distribute":{"icons":{"android":{"hdpi":"unpackage/res/icons/72x72.png","xhdpi":"unpackage/res/icons/96x96.png","xxhdpi":"unpackage/res/icons/144x144.png","xxxhdpi":"unpackage/res/icons/192x192.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"google":{"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"],"abiFilters":["armeabi-v7a"]},"apple":{},"plugins":{"ad":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"arguments":"{\"name\":\"me\",\"query\":\"uuid=c4bba940-f69e-11ea-a419-6bafda9d095e&__id__=1\",\"id\":0,\"pathName\":\"pages/login/login\"}","allowsInlineMediaPlayback":true,"safearea":{"background":"rgba(250,250,250,0.90)","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"3.5.3","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"row"},"nvueLaunchMode":"normal"},"tabBar":{"iconWidth":"19px","spacing":"4px","color":"#999999","selectedColor":"#FF1D32","borderStyle":"rgba(250,250,250,0.90)","backgroundColor":"rgba(250,250,250,0.90)","list":[{"pagePath":"pages/home/home","iconPath":"static/image/home@3x.png","selectedIconPath":"static/image/home_red@3x.png","text":"首页"},{"pagePath":"pages/go-order/go-order","iconPath":"static/image/tab_order@3x.png","selectedIconPath":"static/image/tab_order_red@3x.png","text":"下单"},{"pagePath":"pages/purchase/purchase","iconPath":"static/image/tab_purchase@3x.png","selectedIconPath":"static/image/tab_purchase_red@3x.png","text":"要货"},{"pagePath":"pages/message/message","iconPath":"static/image/tab_message@3x.png","selectedIconPath":"static/image/tab_message_red@3x.png","text":"消息"},{"pagePath":"pages/usercenter/usercenter","iconPath":"static/image/tab_my@3x.png","selectedIconPath":"static/image/tab_my_red@3x.png","text":"我的"}],"height":"50px"}}} {"@platforms":["android","iPhone","iPad"],"id":"__UNI__343534B","name":"五粮液APP","version":{"name":"1.0.0","code":"100"},"description":"订货系统","launch_path":"","developer":{"name":"","email":"","url":""},"permissions":{"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview","render":"always","uniNView":{"path":"pages/login/login.js"}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#fff"},"usingComponents":true,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","nvue":{"flex-direction":"row"},"distribute":{"icons":{"android":{"hdpi":"unpackage/res/icons/72x72.png","xhdpi":"unpackage/res/icons/96x96.png","xxhdpi":"unpackage/res/icons/144x144.png","xxxhdpi":"unpackage/res/icons/192x192.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"google":{"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"],"abiFilters":["armeabi-v7a"]},"apple":{"dSYMs":false},"plugins":{"ad":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"arguments":"{\"name\":\"me\",\"query\":\"uuid=c4bba940-f69e-11ea-a419-6bafda9d095e&__id__=1\",\"id\":0,\"pathName\":\"pages/login/login\"}","allowsInlineMediaPlayback":true,"safearea":{"background":"rgba(250,250,250,0.90)","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"3.5.3","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"row"},"nvueLaunchMode":"normal"},"tabBar":{"iconWidth":"19px","spacing":"4px","color":"#999999","selectedColor":"#FF1D32","borderStyle":"rgba(250,250,250,0.90)","backgroundColor":"rgba(250,250,250,0.90)","list":[{"pagePath":"pages/home/home","iconPath":"static/image/home@3x.png","selectedIconPath":"static/image/home_red@3x.png","text":"首页"},{"pagePath":"pages/go-order/go-order","iconPath":"static/image/tab_order@3x.png","selectedIconPath":"static/image/tab_order_red@3x.png","text":"下单"},{"pagePath":"pages/purchase/purchase","iconPath":"static/image/tab_purchase@3x.png","selectedIconPath":"static/image/tab_purchase_red@3x.png","text":"要货"},{"pagePath":"pages/message/message","iconPath":"static/image/tab_message@3x.png","selectedIconPath":"static/image/tab_message_red@3x.png","text":"消息"},{"pagePath":"pages/usercenter/usercenter","iconPath":"static/image/tab_my@3x.png","selectedIconPath":"static/image/tab_my_red@3x.png","text":"我的"}],"height":"50px"}}}
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment