This commit is contained in:
tangxinyue
parent
eb59411bda
commit
1d4fd42cbb
|
|
@ -6,7 +6,7 @@
|
|||
<view class="status-placeholder" :style="{ height: `${data.statusBarHeight}px` }">
|
||||
<slot name="statusBar"></slot>
|
||||
</view>
|
||||
<view class="nav-box" style="width: 100%;height: 88rpx;">
|
||||
<view class="nav-box" style="width: 100%;height: 88rpx;" @click="openPopup">
|
||||
<slot>
|
||||
<uni-nav-bar backgroundColor="#00000000" class="nav-bar" :border="false" :title="title" v-bind="$attrs"
|
||||
v-on="$attrs">
|
||||
|
|
|
|||
2
main.js
2
main.js
|
|
@ -29,7 +29,7 @@ export function createApp() {
|
|||
app.config.globalProperties.$system = plus.os.name;
|
||||
// #endif
|
||||
app.config.globalProperties.$systemInfo = systemInfo
|
||||
uni.setStorageSync('version', '1.0.5.sp5')
|
||||
uni.setStorageSync('version', '1.0.5.sp9')
|
||||
app.config.globalProperties.$version = uni.getStorageSync('version')
|
||||
app.use(globalMethods);
|
||||
return {
|
||||
|
|
|
|||
|
|
@ -56,7 +56,8 @@
|
|||
<!-- 详情信息列表 -->
|
||||
<view class="detail-info-container">
|
||||
<template v-for="item in billData.itemInfoList" :key="item.id">
|
||||
<view class="info-item-box" v-if="item.key != 'paymentReward'">
|
||||
<view class="info-item-box"
|
||||
v-if="item.key != 'paymentReward' && (item.key != 'transferNote' || billData.merchantOption.isTransferNote)">
|
||||
<view class="item-label" :class="{ 'switchable-label': item.key === 'createTime' }"
|
||||
@click="toggleCreateTimeLabel(item)">
|
||||
<text>{{ item.label }}</text>
|
||||
|
|
@ -132,7 +133,8 @@
|
|||
<view class="switch-option-container">
|
||||
<template v-for="option in data.switchOptions" :key="option.id">
|
||||
<view v-if="option.showTypeIds ? option.showTypeIds.includes(billData.selectId) : true"
|
||||
class="border-bottom" :class="{ 'no-border-bottom': isNoBorderBottom(option) }">
|
||||
class="border-bottom"
|
||||
:class="{ 'no-border-bottom': isNoBorderBottom(option) || option.isMarginBottom, 'margin-bottom-16rpx': option.isMarginBottom }">
|
||||
<view class="switch-option">
|
||||
<view class="switch-option-text">{{ option.name }}</view>
|
||||
<switch v-if="option.isSwitch" color="#1676FE" :checked="billData.merchantOption[option.key]"
|
||||
|
|
@ -408,7 +410,15 @@ const serviceDetailRightTextList = [{
|
|||
}
|
||||
]
|
||||
// switch选项
|
||||
const switchOptions = [{
|
||||
const switchOptions = [
|
||||
{
|
||||
"id": 11,
|
||||
"name": "转账备注",
|
||||
"isSwitch": true,
|
||||
showTypeIds: [7],
|
||||
key: 'isTransferNote',
|
||||
isMarginBottom: true
|
||||
}, {
|
||||
"id": 7,
|
||||
"name": "账单分类",
|
||||
"isSwitch": false,
|
||||
|
|
@ -542,6 +552,7 @@ const data = reactive({
|
|||
merchantOption: {
|
||||
serviceDetail: false,
|
||||
isShowBarcode: false,
|
||||
isTransferNote: false,
|
||||
serviceDetailInfo: {
|
||||
imgUrl: '',
|
||||
rightText: 0,
|
||||
|
|
@ -1400,11 +1411,11 @@ page {
|
|||
|
||||
.switch-option-container {
|
||||
margin: 16rpx 24rpx;
|
||||
background-color: #ffffff;
|
||||
border-radius: 16rpx 16rpx 16rpx 16rpx;
|
||||
|
||||
.border-bottom {
|
||||
border-bottom: 1px solid #efefef
|
||||
border-bottom: 1px solid #efefef;
|
||||
background-color: #ffffff;
|
||||
}
|
||||
|
||||
.no-border-bottom {
|
||||
|
|
@ -1605,4 +1616,8 @@ page {
|
|||
padding: 0 24rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.margin-bottom-16rpx {
|
||||
margin-bottom: 16rpx;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -42,7 +42,9 @@
|
|||
<!-- 详情信息列表 -->
|
||||
<view class="detail-info-container">
|
||||
<template v-for="item in visibleItemInfoList" :key="item.id">
|
||||
<view class="info-item-box" :class="{ 'bottom-border': item.key == 'relatedRecord' }">
|
||||
<view class="info-item-box"
|
||||
v-if="item.key != 'transferNote' || billData.merchantOption.isTransferNote"
|
||||
:class="{ 'bottom-border': item.key == 'relatedRecord' }">
|
||||
<view class="item-label">
|
||||
{{ item.label }}
|
||||
</view>
|
||||
|
|
|
|||
|
|
@ -117,6 +117,12 @@
|
|||
</l-painter>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 水印 -->
|
||||
<view v-if="$isVip()">
|
||||
<liu-drag-button :canDocking="false" @clickBtn="$goRechargePage('watermark', 'uni_alipay_other_ranking')">
|
||||
<c-lottie ref="cLottieRef" :src='$watermark()' width="94px" height='74px' :loop="true"></c-lottie>
|
||||
</liu-drag-button>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@
|
|||
</view>
|
||||
</view>
|
||||
<view class="progress-box" style="height: 192rpx;">
|
||||
<text class="text">快递运输 · 温馨提示：您的订单预计3月11日09:00- 15:53送达</text>
|
||||
<text class="text">{{ order.trackingDesc2 }}</text>
|
||||
<view class="upload-box">
|
||||
<view class="info-box">
|
||||
<view class="image-box">
|
||||
|
|
|
|||
|
|
@ -424,7 +424,8 @@ const items = [
|
|||
{
|
||||
image: "/static/image/shopping/taobao/waimai/cuidan.png",
|
||||
text: "催单",
|
||||
show: () => order.value.statusType == 'wait_recv'
|
||||
show: () => order.value.statusType == 'wait_recv',
|
||||
color: "#CDCDCD"
|
||||
},
|
||||
{
|
||||
image: "/static/image/shopping/taobao/waimai/quxiaodingdan.png",
|
||||
|
|
|
|||
|
|
@ -403,6 +403,13 @@
|
|||
"key": "payMethod",
|
||||
"required": true
|
||||
},
|
||||
{
|
||||
"label": "转账备注",
|
||||
"value": "转账",
|
||||
"type": "text",
|
||||
"focus": false,
|
||||
"key": "transferNote"
|
||||
},
|
||||
{
|
||||
"label": "对方账户",
|
||||
"value": "",
|
||||
|
|
|
|||
Loading…
Reference in New Issue