aike/emis-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uu

Browse Source
This commit is contained in:
aihe 2024-05-07 21:44:17 +08:00
parent cdb19ff808
commit 99b59f332c
6 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/buns-post-edit-templates/bpe-cost-tmp.vue
View File

@ -69,7 +69,7 @@
},
feeTypeOptions() {
let list = this.dicData.emis_fee_type || []
let curVals = this.modelInfo.feeItems.map(t => t.feeCode)
let curVals = this.modelInfo?.feeItems?.map?.(t => t.feeCode) || []
list = list.filter(t => curVals.indexOf(t.val) == -1)
return list
},

2
components/tpx-checkitems/tpx-checkitems.vue
View File

@ -18,7 +18,7 @@
checkedVal() {
let val = this.value
let res = []
if (typeof val == "object") {
if (Array.isArray(val)) {
res = val
}
if (typeof val == 'string' && val !== '') {

8
components/tpx-scroll-view/tpx-scroll-view.vue
View File

@ -7,9 +7,11 @@
status="loading" />
<!-- 没有更多了 -->
<u-loadmore v-if="showLoadedAll && loadedAll && resObject.list.length !== 0" icon-size="28" font-size="28" margin-top="20" margin-bottom="20"
status="nomore" />
<view v-if="showLoadedAll && loadedAll && resObject.list.length !== 0" class="pt-20 pb-20">
<u-loadmore icon-size="28" font-size="28"
status="nomore" />
</view>
<!-- 空数据页 -->
<view v-if="resObject.list.length == 0" :style="`padding: ${kongSizeMap[size].pdTB}rpx 0;`">
<u-empty text="无数据" :icon="getCdnUrl('kong.png')" textSize="28" :width="kongSizeMap[size].width" :height="kongSizeMap[size].height">

3
pages/post/openorder.vue
View File

@ -340,7 +340,8 @@
if(this.isEdit) {
let res = await apiService.getOrderDetail({...this.queryOption, _loading: true})
let data = res.data || {}
data.warehouseInNo = (data.warehouseInNo && data.warehouseInNo.split) || []
data.warehouseInNo = (data.warehouseInNo && data.warehouseInNo.split(",")) || []
data.goodsPics = (data.goodsPics && data.goodsPics.split(",")) || []
this.submitParam = res.data
}
this.pageLoading = false

14
pages/tabBar/order/order.vue
View File

@ -91,7 +91,7 @@
<u-row @click="handleDealItem(item, { type: 1 })" custom-style="margin-top: 30rpx;" justify="center">
<u-col span="4">
<u-text :text="item.sendCountryName + item.sendProvinceName" size="30" :bold="true" align="center"></u-text>
<u-text :text="(item.sendCountryName + item.sendProvinceName)||'-'" size="30" :bold="true" align="center"></u-text>
<u-text :text="item.sendName" size="26" color="#999" margin="20rpx 0 0 0"
align="center"></u-text>
</u-col>
@ -104,7 +104,7 @@
</view>
</u-col>
<u-col span="4">
<u-text :text="item.receiveCountryName + item.receiveProvinceName" size="30" :bold="true" align="center"></u-text>
<u-text :text="(item.receiveCountryName + item.receiveProvinceName)||'-'" size="30" :bold="true" align="center"></u-text>
<u-text :text="item.receiveName" size="26" color="#999" margin="20rpx 0 0 0"
align="center"></u-text>
</u-col>
@ -118,9 +118,9 @@
<u-row justify="end" custom-style="margin-top:20rpx;">
<view style="display: inline-block;white-space: nowrap;">
<u-row>
<u-button @click="handleDealItem(orItem, { type: 4 })" shape="circle" type="primary"
<u-button @click="handleDealItem(item, { type: 4 })" shape="circle" type="primary"
:plain="true" custom-style="height: 54rpx;margin-left: 12rpx;">取消</u-button>
<u-button @click="handleDealItem(orItem, { type: 5 })" shape="circle" type="primary" :plain="true"
<u-button @click="handleDealItem(item, { type: 5 })" shape="circle" type="primary" :plain="true"
custom-style="height: 54rpx;margin-left: 12rpx;">立即开单</u-button>
</u-row>
</view>
@ -195,9 +195,9 @@
case 4: // 取消
await this.confirmModal('确认要取消吗?')
break;
case 5: // 理解开单
this.goto(`post/openorder?billCode=${item.billCode || ''}&orderSn=${item.orderSn || ''}`)
break;
case 5: // 立即开单
this.goto(`post/openorder?billCode=${item.billCode || ''}&orderSn=${item.orderSn || ''}`)
break;
default:
break;
}

2
uni_modules/uview-plus/components/u-textarea/u-textarea.vue
View File

@ -35,7 +35,7 @@
'background-color': disabled ? 'transparent' : '#fff',
}"
v-if="count"
>{{ innerValue.length }}/{{ maxlength }}</text
>{{ (innerValue && innerValue.length) || 0 }}/{{ maxlength }}</text
>
</view>
</template>