Skip to content

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

修复bug

parent 4b073852
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 71 deletions
pages/breakwords-clue-detail/breakwords-clue-detail.vue
View file @ cc97cef3
......@@ -267,7 +267,7 @@
<image class="swiper-item-img" :src="clueDetail.doorPicUrl" mode="widthFix">
</image>
</view>
<text class="des">(点击图片可放大，只能上传一次图片，多次上传至保留最后上传）</text>
<text class="des">(只能上传一次图片，多次上传至保留最后上传）</text>
</view>
<view class="upload-area view">
<text class="title">产品照片</text>
......@@ -275,7 +275,7 @@
<image class="swiper-item-img" :src="clueDetail.productPicUrl" mode="widthFix">
</image>
</view>
<text class="des">(点击图片可放大，只能上传一次图片，多次上传至保留最后上传）</text>
<text class="des">(只能上传一次图片，多次上传至保留最后上传）</text>
</view>
<view class="upload-area view">
<text class="title">发票/收据照片</text>
......@@ -283,7 +283,7 @@
<image class="swiper-item-img" :src="clueDetail.receiptPicUrl" mode="widthFix">
</image>
</view>
<text class="des">(点击图片可放大，只能上传一次图片，多次上传至保留最后上传）</text>
<text class="des">(只能上传一次图片，多次上传至保留最后上传）</text>
</view>
</view>
......
pages/breakwords-clue/breakwords-clue.vue
View file @ cc97cef3
......@@ -306,7 +306,7 @@
<text>+</text>
</uni-file-picker>
</view>
<text class="des">(点击图片可放大，只能上传一次图片，多次上传至保留最后上传）</text>
<text class="des">(只能上传一次图片，多次上传至保留最后上传）</text>
</view>
<view class="upload-area view">
<text class="title">产品照片</text>
......@@ -317,7 +317,7 @@
<text>+</text>
</uni-file-picker>
</view>
<text class="des">(点击图片可放大，只能上传一次图片，多次上传至保留最后上传）</text>
<text class="des">(只能上传一次图片，多次上传至保留最后上传）</text>
</view>
<view class="upload-area view">
<text class="title">发票/收据照片</text>
......@@ -328,7 +328,7 @@
<text>+</text>
</uni-file-picker>
</view>
<text class="des">(点击图片可放大，只能上传一次图片，多次上传至保留最后上传）</text>
<text class="des">(只能上传一次图片，多次上传至保留最后上传）</text>
</view>
</view>
......
pages/breakwords-handle/breakwords-handle.nvue
View file @ cc97cef3
......@@ -74,7 +74,7 @@
</view>
</cell>
<cell>
<view class="loading-more" v-if='lists.length>2'>
<view class="loading-more" v-if='lists.length>6'>
<text class="loading-more-text">{{loadingText}}</text>
</view>
</cell>
......@@ -137,8 +137,14 @@
'name': '全部状态'
},
selectDataOptions: {
'PunishType': [],
'ProcessOrderStatus': [],
'PunishType': [{
'code': '',
'name': '全部类型'
}],
'ProcessOrderStatus': [{
'code': '',
'name': '全部状态'
}],
},
typesIndex: 0,
lists: [],
......@@ -177,7 +183,7 @@
dictionaryKey: key
}
const res = await apiGetDictionary(params)
this.selectDataOptions[key] = res.data
this.selectDataOptions[key] = [...this.selectDataOptions[key], ...res.data]
},
async getProcessOrder(isRefresh) {
if (this.loadParams.isDone) {
......@@ -199,9 +205,12 @@
uni.hideLoading();
const {
currentPage,
totalNumberOfResults,
numberOfPages
} = res.data.pagination
this.page.currentPage = currentPage
this.loadParams.total = totalNumberOfResults
this.loadParams.totalPage = numberOfPages
......@@ -224,7 +233,6 @@
this.getProcessOrder(true)
// #ifdef APP-NVUE
try {
// console.log('-------', this.$refs.list)
this.$refs.list.resetLoadmore();
} catch (e) {
console.log('onrefresh', e)
......@@ -256,13 +264,22 @@
bindPickerTypesChange(e) {
console.log('bindPickerTypesChange', e.detail.value)
this.punishTypeSelected = this.selectDataOptions['PunishType'][e.detail.value]
this.condition.punishTypes[0] = this.punishTypeSelected.code
if (e.detail.value === 0) {
this.condition.punishTypes = []
} else {
this.condition.punishTypes[0] = this.punishTypeSelected.code
}
this.getProcessOrder(true)
},
bindPickerStatusChange(e) {
console.log('bindPickerStatusChange', e.detail.value)
this.orderStatusSelected = this.selectDataOptions['ProcessOrderStatus'][e.detail.value]
this.condition.statusList[0] = this.orderStatusSelected.code
if (e.detail.value === 0) {
this.condition.statusList = []
} else {
this.condition.statusList[0] = this.orderStatusSelected.code
}
this.getProcessOrder(true)
},
bindPickerYearChange(e) {
......
pages/breakwords-market/breakwords-market.nvue
View file @ cc97cef3
......@@ -77,7 +77,7 @@
</view>
</cell>
<cell>
<view class="loading-more" v-if='lists.length>2'>
<view class="loading-more" v-if='lists.length>6'>
<text class="loading-more-text">{{loadingText}}</text>
</view>
</cell>
......@@ -173,9 +173,14 @@
created() {
this.condition.submitUserId = this.userInfo.code
// this.reset()
this.getClueList(true)
},
methods: {
async getClueList(isRefresh) {
if (isRefresh) {
this.lists = []
}
if (this.loadParams.isDone) {
return
}
......@@ -215,9 +220,11 @@
if (res?.data?.results) {
const {
currentPage,
totalNumberOfResults,
numberOfPages
} = res.data.pagination
this.page.currentPage = currentPage
this.loadParams.total = totalNumberOfResults
this.loadParams.totalPage = numberOfPages
......
pages/diy-wine/diy-wine.vue
View file @ cc97cef3
......@@ -28,10 +28,10 @@
<view class="middle view planout-block-item" v-for="(item,index) in lists" :key='item.PRODUCT_ID'
@click="handleChecked($event,item, index)">
<text class="item-name">{{orderDetail.ITEM.DESCRIPTION}}</text>
<text class="item-name">{{orderDetail.ITEM[0].DESCRIPTION}}</text>
<view class="text-block">
<text class="middle-date middle-date-select">定制件数</text>
<text class="middle-date-des middle-date-des-select">{{orderDetail.ITEM.ZZFLD000009}}</text>
<text class="middle-date-des middle-date-des-select">{{orderDetail.ITEM[0].ZZFLD000009}}</text>
</view>
<view class="text-block">
<text class="middle-date middle-date-select">收货方名称</text>
......@@ -51,7 +51,7 @@
</view>
<view class="text-block">
<text class="middle-date middle-date-select">经销商名称</text>
<text class="middle-date-des middle-date-des-select">{{orderDetail.INFO.BUSINAME}}</text>
<text class="middle-date-des middle-date-des-select">{{orderDetail.INFO.GRPNAME}}</text>
</view>
<view class="text-block text-block-last">
<text class="middle-date middle-date-select">外箱喷码内容</text>
......@@ -104,12 +104,12 @@
"Sign": "b4eeef27e8dbb663bab932d742dc425f"
},
orderDetail: {
ITEM: {
ITEM: [{
DESCRIPTION: '',
ZZFLD000009: '',
DESCRIPTION: '',
DESCRIPTION: '',
},
}],
INFO: {
ZZFLD00008T: '',
ZZFLD00002L: '',
......
pages/group-buy/group-baseinfo.nvue
View file @ cc97cef3
......@@ -143,6 +143,9 @@
HEADINFO: {},
paintDesignIndex: 0,
paintDesignPicker: [{
key: '',
value: ''
}, {
key: 'O',
value: '团购订单'
},
......@@ -397,6 +400,7 @@
.uni-list-cell {
flex: 1;
height: 96rpx;
}
.uni-list-cell-db {
......
pages/group-buy/quota-order.nvue
View file @ cc97cef3
......@@ -138,7 +138,7 @@
intotalComputed() {
let money = 0
this.planinnerLists.forEach((item) => {
money += item.NET_VALUE
money += item.NET_VALUE * 1
})
return money
},
......@@ -360,8 +360,8 @@
"ORDERED_PROD": "",
"DESCRIPTION": "",
"SHORT_TEXT": "",
'NET_PRICE': '',
'NET_VALUE': '',
'NET_PRICE': 0,
'NET_VALUE': 0,
'quantity': 0,
'total': 0,
'product_info': {},
......
pages/no-quota/quota-order.nvue
View file @ cc97cef3
......@@ -136,7 +136,7 @@
intotalComputed() {
let money = 0
this.planinnerLists.forEach((item) => {
money += item.NET_VALUE
money += item.NET_VALUE * 1
})
return money
}
......@@ -333,11 +333,10 @@
"ORDERED_PROD": "",
"DESCRIPTION": "",
"SHORT_TEXT": "",
'NET_PRICE': '',
'NET_VALUE': '',
'NET_PRICE': 0,
'NET_VALUE': 0,
'quantity': 0,
'total': 0,
NET_VALUE: 0,
'product_info': {}
}
this.planinnerLists.unshift(product)
......
pages/quota/quota-order.nvue
View file @ cc97cef3
......@@ -524,11 +524,10 @@
"ORDERED_PROD": "",
"DESCRIPTION": "",
"SHORT_TEXT": "",
'NET_PRICE': '',
'NET_VALUE': '',
'NET_PRICE': 0,
'NET_VALUE': 0,
'quantity': 0,
'total': 0,
NET_VALUE: 0,
'product_info': {},
'salesplan_info': {}
}
......
pages/select-business/select-business.vue
View file @ cc97cef3
......@@ -209,9 +209,9 @@
const params = {
...this.page,
"input": {
BUNAME: '',
OWNERCODE: '',
CUNAME: ''
BUNAME,
OWNERCODE,
CUNAME
},
}
......@@ -228,7 +228,7 @@
DATA,
TOTAL
} = res
this.loadParams.total = TOTAL
this.loadParams.total = TOTAL * 1
this.loadParams.totalPage = Math.ceil(TOTAL * 1 / this.page.PAGESIZE * 1)
const dataMap = res.DATA.map((item) => {
......
unpackage/dist/dev/app-plus/app-service.js
View file @ cc97cef3
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/app-plus/app-view.js
View file @ cc97cef3
......@@ -18640,11 +18640,7 @@ var render = function() {
_c(
"v-uni-text",
{ staticClass: _vm._$g(172, "sc"), attrs: { _i: 172 } },
[
_vm._v(
"(点击图片可放大，只能上传一次图片，多次上传至保留最后上传）"
)
]
[_vm._v("(只能上传一次图片，多次上传至保留最后上传）")]
)
],
1
......@@ -18700,11 +18696,7 @@ var render = function() {
_c(
"v-uni-text",
{ staticClass: _vm._$g(178, "sc"), attrs: { _i: 178 } },
[
_vm._v(
"(点击图片可放大，只能上传一次图片，多次上传至保留最后上传）"
)
]
[_vm._v("(只能上传一次图片，多次上传至保留最后上传）")]
)
],
1
......@@ -18760,11 +18752,7 @@ var render = function() {
_c(
"v-uni-text",
{ staticClass: _vm._$g(184, "sc"), attrs: { _i: 184 } },
[
_vm._v(
"(点击图片可放大，只能上传一次图片，多次上传至保留最后上传）"
)
]
[_vm._v("(只能上传一次图片，多次上传至保留最后上传）")]
)
],
1
......@@ -21034,11 +21022,7 @@ var render = function() {
_c(
"v-uni-text",
{ staticClass: _vm._$g(155, "sc"), attrs: { _i: 155 } },
[
_vm._v(
"(点击图片可放大，只能上传一次图片，多次上传至保留最后上传）"
)
]
[_vm._v("(只能上传一次图片，多次上传至保留最后上传）")]
)
],
1
......@@ -21070,11 +21054,7 @@ var render = function() {
_c(
"v-uni-text",
{ staticClass: _vm._$g(160, "sc"), attrs: { _i: 160 } },
[
_vm._v(
"(点击图片可放大，只能上传一次图片，多次上传至保留最后上传）"
)
]
[_vm._v("(只能上传一次图片，多次上传至保留最后上传）")]
)
],
1
......@@ -21106,11 +21086,7 @@ var render = function() {
_c(
"v-uni-text",
{ staticClass: _vm._$g(165, "sc"), attrs: { _i: 165 } },
[
_vm._v(
"(点击图片可放大，只能上传一次图片，多次上传至保留最后上传）"
)
]
[_vm._v("(只能上传一次图片，多次上传至保留最后上传）")]
)
],
1
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