Skip to content

杨炀 / ztx_wx_gzt

Go to a project
Toggle navigation
Toggle navigation pinning
6a64b49d by lttnew
Options

订单

1 parent a4d367f7
Expand all
Inline Side-by-side
Showing 7 changed files with 86 additions and 149 deletions
components/dao-guan-tab-bar.vue
......@@ -68,11 +68,11 @@ const handleClick = (index, url) => {
bottom: 0;
left: 0;
right: 0;
height: 120rpx;
height: 130rpx;
display: flex;
justify-content: flex-start;
align-items: stretch;
padding-bottom: env(safe-area-inset-bottom);
padding-bottom: 0;
z-index: 9999;
background-color: #d9d9d9;
overflow: hidden;
......@@ -80,9 +80,10 @@ const handleClick = (index, url) => {
.dg-tab-bar-bg {
position: absolute;
top: 0rpx;
top: 0;
bottom: 0;
width: 20%;
height: calc(100% - 35rpx);
height: 130rpx;
z-index: 0;
transition: left 0.3s ease;
pointer-events: none;
......@@ -94,7 +95,7 @@ const handleClick = (index, url) => {
align-items: center;
justify-content: center;
width: 20%;
height: 100%;
height: 130rpx;
position: relative;
z-index: 1;
}
......
level/apply.vue
......@@ -9,11 +9,7 @@
<view class="appList">
<view v-for="(item,index) in list" :key="item.examId || index" class="appItem">
<view class="status" @click="goDetail(item)">
<text v-if="item.status=='0'" class="text-primary-bg">{{ item.statusStr }}</text>
<text v-if="item.status=='1'" class="text-primary-bg">{{ item.statusStr }}</text>
<text v-if="item.status=='2'" class="text-success-bg">{{ item.statusStr }}</text>
<text v-if="item.status=='3'" class="text-danger-bg">{{ item.statusStr }}</text>
<text v-if="item.status=='4'" class="text-warning-bg">{{ item.statusStr }}</text>
<text :class="getStatusClass(item.status)">{{ auditStatusTag(item.status) }}</text>
</view>
<view v-if="item.status!='0'&&item.submitTime" class="date">提交时间:{{ item.submitTime }}</view>
<view class="mt0" @click="goDetail(item)">
......@@ -39,10 +35,12 @@
<view class="pp esp">考级日期：{{ item.startTime?.substring(0, 16) }} 至 {{ item.endTime?.substring(0, 16) }}
</view>
<view v-if="item.status=='0'||item.status=='3'||item.status=='4'||item.status=='9'" class="func">
<button v-if="item.status !== '1' && item.status !== '2' && item.status !== '3'" @click="handleDelete(item)">删除</button>
<button v-if="item.status === '0'" @click="editThis(item)">编辑</button>
<button v-if="(item.status === '0' || item.status === '9') && item.totalNum > 0 && item.pass > 0" @click="handleSubmit(item)">提交审核</button>
<view class="func">
<!-- <button :disabled="item.status=='0'" @click="goDetail(item)">查看</button> -->
<button :disabled="item.status!='0'" @click="editThis(item)">编辑</button>
<button v-if="item.status === '9'" class="btn-pay" :disabled="item.status!='0'&&item.status!='9'||item.totalNum==0||item.pass==0" @click="handlePay(item)">支付</button>
<button v-else :disabled="item.status!='0'&&item.status!='9'||item.totalNum==0||item.pass==0" @click="handleSubmit(item)">提交审核</button>
<button :disabled="item.status!= 8" @click="handleDelete(item)">删除</button>
</view>
</view>
</view>
......@@ -112,6 +110,26 @@ function getList() {
})
}
const auditStatusTag = (status) => {
const map = {
'0': '待提交',
'1': '审核中',
'2': '审核通过',
'3': '审核拒绝',
'4': '已退回',
'8': '已取消',
'9': '待支付'
}
return map[status] || ''
}
const getStatusClass = (status) => {
if (status === '2') return 'text-success-bg'
if (status === '3' || status === '8') return 'text-danger-bg'
if (status === '4' || status === '9') return 'text-warning-bg'
return 'text-primary-bg'
}
function goAdd() {
let path = `/level/addApply`
uni.navigateTo({
......@@ -186,6 +204,12 @@ function goDetail(item) {
}
}
function handlePay(item) {
uni.navigateTo({
url: `/level/paymentDetail?examId=${item.examId}`
})
}
</script>
......@@ -220,12 +244,31 @@ function goDetail(item) {
// border-color: #eee;
// }
}
.btn-pay {
background-color: #13B5B1;
color: #fff;
border-color: #13B5B1;
}
:deep(.func button[disabled]) {
background-color: #f5f5f5 !important;
color: #ccc !important;
border-color: #eee !important;
opacity: 0.6;
}
:deep(.func) {
display: flex;
flex-wrap: wrap;
justify-content: flex-start;
gap: 10rpx;
button {
padding: 0 20rpx;
font-size: 24rpx;
line-height: 2;
min-width: 120rpx;
}
}
.mt0 {
margin-top: 0 !important;
}
......@@ -234,4 +277,25 @@ function goDetail(item) {
width: 85%;
word-break: break-all;
}
// 状态样式
.text-primary-bg {
background: #e6f0ff;
color: #409eff;
}
.text-success-bg {
background: #e6fff7;
color: #52c41a;
}
.text-danger-bg {
background: #fff1f0;
color: #ff4d4f;
}
.text-warning-bg {
background: #fff7e6;
color: #fa8c16;
}
</style>
......
myCenter/order.vue
......@@ -40,129 +40,6 @@
@scrolltolower="loadMore"
>
<view class="order-list">
<!-- 有数据才循环 -->
<!-- <view v-if="list.length > 0">-->
<!-- <view-->
<!-- v-for="(item, index) in list"-->
<!-- :key="index"-->
<!-- class="order-card"-->
<!-- @click="goToDetail(item)"-->
<!-- >-->
<!-- &lt;!&ndash; 订单头部：日期 + 状态 &ndash;&gt;-->
<!-- <view class="card-header">-->
<!-- <view class="date">-->
<!-- &lt;!&ndash; <image :src="config.baseUrl_api + '/fs/static/calendar@2x.png'" mode="widthFix" style="width:30rpx;height:30rpx;"/> &ndash;&gt;-->
<!-- &lt;!&ndash; &ndash;&gt;-->
<!-- <text class="value text-primary">{{ item.wfCode || '——' }}</text>-->
<!-- </view>-->
<!-- <view class="status-tags">-->
<!-- &lt;!&ndash; <view-->
<!-- class="status-tag"-->
<!-- :class="{-->
<!-- success: item.payStatus == 1,-->
<!-- danger: item.payStatus == 2,-->
<!-- pending: item.payStatus == 0-->
<!-- }"-->
<!-- >-->
<!-- {{ getStatusText(item.payStatus) }}-->
<!-- </view> &ndash;&gt;-->
<!-- <view-->
<!-- :class="{-->
<!-- 'status-wait': item.auditStatus == 0,-->
<!-- 'status-pending': item.auditStatus == 1,-->
<!-- 'status-success': item.auditStatus == 2,-->
<!-- 'status-danger': item.auditStatus == 3-->
<!-- }"-->
<!-- class="status-tag ml-10"-->
<!-- >-->
<!-- {{ getAuditStatusText(item.auditStatus) }}-->
<!-- </view>-->
<!-- </view>-->
<!-- </view>-->
<!-- -->
<!-- &lt;!&ndash; 订单编号、缴费编号 &ndash;&gt;-->
<!-- <view class="info-row">-->
<!-- <text class="label">订单编号：</text>-->
<!-- <text class="value">{{ item.tradeNo || '——' }}</text>-->
<!-- </view>-->
<!-- <view v-if="item.orderName" class="info-row">-->
<!-- <text class="label">缴费名称：</text>-->
<!-- <text class="value">{{ item.orderName || '' }}</text>-->
<!-- </view>-->
<!-- &lt;!&ndash; <view class="info-row">-->
<!-- <text class="label">缴费编号：</text>-->
<!-- -->
<!-- </view> &ndash;&gt;-->
<!-- -->
<!-- &lt;!&ndash; 核心：前2tab仅展示缴费年限，后2tab仅展示人数合计 &ndash;&gt;-->
<!-- <view v-if="item.content" class="info-section flex f-j-s">-->
<!-- &lt;!&ndash; 个人/单位会员（仅缴费年限） &ndash;&gt;-->
<!-- <view v-if="currentTab === '0' || currentTab === '1'" class="single-info">-->
<!-- <view class="label">缴费年限：</view>-->
<!-- <view class="value">{{ item.content.yearCount || 0 }}</view>-->
<!-- </view>-->
<!-- &lt;!&ndash; 级位/段位考试（仅人数合计） &ndash;&gt;-->
<!-- <view v-if="currentTab === '2' || currentTab === '3' || currentTab === '4'" class="single-info">-->
<!-- <view class="label">人数合计</view>-->
<!-- <view class="value">{{ item.content.personCount || 0 }}</view>-->
<!-- </view>-->
<!-- <view class="line"></view>-->
<!-- <view class="single-info">-->
<!-- <view class="label">订单状态</view>-->
<!-- <view :class="item.effect == 1 ? 'text-success' : 'text-warning'" class="value">-->
<!-- {{ item.effect == 1 ? '已生效' : '未生效' }}-->
<!-- </view>-->
<!-- </view>-->
<!-- <view class="line"></view>-->
<!-- <view class="single-info">-->
<!-- <view class="label">缴费状态</view>-->
<!-- <view-->
<!-- :class="{-->
<!-- 'text-primary': item.payStatus == 0,-->
<!-- 'text-success': item.payStatus == 1,-->
<!-- 'text-danger': item.payStatus == 2-->
<!-- }"-->
<!-- class="value"-->
<!-- >-->
<!-- {{ item.payStatus == 0 ? '待缴费' : item.payStatus == 1 ? '缴费成功' : '订单取消' }}-->
<!-- </view>-->
<!-- </view>-->
<!-- </view>-->
<!-- -->
<!-- &lt;!&ndash; 费用合计 + 缴费方式 &ndash;&gt;-->
<!-- <view class="price-section">-->
<!-- <view class="price-row">-->
<!-- <text class="price-label">费用合计</text>-->
<!-- <text class="price-value">¥{{ (Number(item.price) || 0).toFixed(2) }}</text>-->
<!-- </view>-->
<!-- <view class="price-row">-->
<!-- <text class="price-label">缴费方式</text>-->
<!-- <text class="price-value">{{ item.ziZhangBu ? '对公转账' : '民生付' }}</text>-->
<!-- </view>-->
<!-- </view>-->
<!-- -->
<!-- &lt;!&ndash; 按钮组：靠右紧凑展示 &ndash;&gt;-->
<!-- <view class="btn-group">-->
<!-- &lt;!&ndash; 已缴费：申请开票/已开票（需要审核通过才能开票） &ndash;&gt;-->
<!-- <template v-if="item.payStatus == 1 && item.invoiceStatus != 1&& item.auditStatus == 2 &&item.price>0">-->
<!-- <button :disabled="item.invoiceStatus === 1" class="btn btn-view-invoice" @click="makeInvoiceFN(item)">-->
<!-- 开票-->
<!-- </button>-->
<!-- </template>-->
<!-- &lt;!&ndash; 已开票：查看发票 &ndash;&gt;-->
<!-- <template v-if="item.invoiceStatus == 1">-->
<!-- <button class="btn btn-invoice" @click.stop="viewInvoice(item)">查看发票</button>-->
<!-- </template>-->
<!-- &lt;!&ndash; 未缴费：去缴费 + 取消订单 &ndash;&gt;-->
<!-- &lt;!&ndash; <template v-if="item.payStatus == 0">-->
<!-- <button class="btn btn-cancel" @click="handleCancel(item)">取消订单</button>-->
<!-- <button class="btn btn-pay" @click="handlePay(item)">去缴费</button>-->
<!-- </template> &ndash;&gt;-->
<!-- </view>-->
<!-- </view>-->
<!-- </view>-->
<!-- 有数据才循环 -->
<view v-if="list.length > 0">
<view
v-for="(item, index) in list"
......
pages/index/daoGuanMy.vue
......@@ -34,7 +34,7 @@
<image class="menu-icon" :src="config.baseUrl_api + '/fs/static/img/user01.png'" mode="aspectFit"></image>
<text>单位信息</text>
</view>
<text class="arrow">></text>
<uni-icons type="arrowright" size="18" color="#111"></uni-icons>
</view>
<view class="menu-item" @click="goPath('/myCenter/auth')">
......@@ -42,15 +42,15 @@
<image class="menu-icon" :src="config.baseUrl_api + '/fs/static/img/user02.png'" mode="aspectFit"></image>
<text>会员认证</text>
</view>
<text class="arrow">></text>
<uni-icons type="arrowright" size="18" color="#111"></uni-icons>
</view>
<view class="menu-item" @click="goPath('/myCenter/examPointApplyList')">
<view class="menu-left">
<image class="menu-icon" :src="config.baseUrl_api + '/fs/static/img/user02.png'" mode="aspectFit"></image>
<image class="menu-icon" :src="config.baseUrl_api + '/fs/static/img/user04.png'" mode="aspectFit"></image>
<text>考点认证</text>
</view>
<text class="arrow">></text>
<uni-icons type="arrowright" size="18" color="#111"></uni-icons>
</view>
<view class="menu-item" @click="goPath('/myCenter/safe')">
......@@ -58,7 +58,7 @@
<image class="menu-icon" :src="config.baseUrl_api + '/fs/static/img/user03.png'" mode="aspectFit"></image>
<text>账号安全</text>
</view>
<text class="arrow">></text>
<uni-icons type="arrowright" size="18" color="#111"></uni-icons>
</view>
</view>
......@@ -353,13 +353,6 @@ function onTabSwitch(index, url) {
margin-right: 18rpx;
}
.arrow {
color: #111;
font-size: 42rpx;
font-weight: 400;
line-height: 1;
}
.logout-area {
position: fixed;
left: 0;
......
pages/index/daoGuanPerson.vue
......@@ -402,6 +402,7 @@ function checkDialogs() {
}
async function checkExamPointDialog() {
console.log('checkExamPointDialog', app.globalData.userInfo.hintFlag )
const [err, res] = await to(api.getMyRecentExam())
if (err || !res?.data) return
const status = res.data?.auditStatus
......@@ -409,6 +410,7 @@ async function checkExamPointDialog() {
app.globalData.memberInfo?.activeStatus == 1 &&
app.globalData.authenticationStatus == 2 &&
app.globalData.deptType == 6 &&
app.globalData.userInfo.hintFlag == 1 &&
app.globalData.memberInfo?.isPoints == 1) {
examPointPopup.value?.open()
}
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!