Skip to content

phsl / client

Go to a project
Commit c3c1c0ba by lijinqi
Options

1.我的资源：算力资源分类筛选条件bug修复 

2.算力资源列表 卡片布局切列表布局bug修复
3.我的订单：属性值为空时的异常处理
4.活动资讯页面，修复列表被导航栏遮挡bug
parent 39cb2954
Showing with 58 additions and 43 deletions
src/views/computingResource/resourceList.vue
...@@ -66,9 +66,22 @@ ...@@ -66,9 +66,22 @@
> >
<template #default="{ row }"> <template #default="{ row }">
{{ row.properties[index].valueName }} {{ row.properties?.[index]?.valueName || '-' }}
</template>
</el-table-column>
<!-- 新增的价格列（醒目字体） -->
<el-table-column label="价格" width="200px">
<template #default="{ row }">
<span style="font-weight: 600; font-size: 16px; color: #FF9811;">
￥{{ row.price ? (row.price / 100).toFixed(2) : '-' }}
</span>
<span style="margin-left: 4px; font-size: 14px; color: #606266;">
/{{ row.feeInfo }}
</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="204px"> <el-table-column label="操作" width="204px">
<template #default="{row}"> <template #default="{row}">
<!-- <el-button class="action-button" @click="selectedProduct(1,row.id)">加入购物车</el-button>--> <!-- <el-button class="action-button" @click="selectedProduct(1,row.id)">加入购物车</el-button>-->
...@@ -95,19 +108,20 @@ ...@@ -95,19 +108,20 @@
</div> </div>
<div class="bottom-info"> <div class="bottom-info">
<el-row> <el-row>
<el-col :span="24" <el-col
v-for="(i,x) in item?.properties.length!==0 ? item?.properties.slice(0,4):item.properties" v-for="(i,x) in (item?.properties && item.properties.length!==0 ? item.properties.slice(0,4) : item?.properties || [])"
:key="x"> :key="x"
>
<div class="parameter-item"> <div class="parameter-item">
<div class="label">{{ i.propertyName }}</div> <div class="label">{{ i?.propertyName || '-' }}</div>
<div class="value">{{ i.valueName }}</div> <div class="value">{{ i?.valueName || '-' }}</div>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<el-divider></el-divider> <el-divider></el-divider>
<div class="flex-justify-end price">￥{{ item.price ? item.price / 100 : '-' }}/{{ <div class="flex-justify-end price">
item.feeInfo ￥{{ item.price ? (item.price / 100).toFixed(2) : '-' }}/{{ item.feeInfo }}
}}
</div> </div>
<!--<div class="flex-justify-end month-expenses">约￥15/月</div>--> <!--<div class="flex-justify-end month-expenses">约￥15/月</div>-->
<el-divider></el-divider> <el-divider></el-divider>
...@@ -117,18 +131,19 @@ ...@@ -117,18 +131,19 @@
</el-button> </el-button>
</div> </div>
</div> </div>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<el-empty v-if="tableData.length === 0" description="暂无资源"/>
</div>
<pagination <pagination
v-show="total > 0" v-show="total > 0"
:total="total" :total="total"
v-model:page="pageNum" v-model:page="pageNo"
v-model:limit="pageSize" v-model:limit="pageSize"
@pagination="getList"/> @pagination="getList"/>
<el-empty v-if="tableData.length === 0" description="暂无资源"/>
</div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
...@@ -255,7 +270,7 @@ const router = useRouter() ...@@ -255,7 +270,7 @@ const router = useRouter()
const showVersion = ref(2) const showVersion = ref(2)
const tabActive = ref() const tabActive = ref()
const total = ref(0) const total = ref(0)
const pageNum = ref(1) const pageNo = ref(1)
const pageSize = ref(10) const pageSize = ref(10)
const productTypes = ref([]) const productTypes = ref([])
...@@ -326,13 +341,13 @@ async function handleCheckProtocol() { ...@@ -326,13 +341,13 @@ async function handleCheckProtocol() {
} }
function tabChange() { function tabChange() {
pageNum.value = 1 pageNo.value = 1
getList() getList()
} }
function getList() { function getList() {
getRListByCategory({categoryId: tabActive.value, pageNo: pageNum.value, pageSize: pageSize.value}).then(res => { getRListByCategory({categoryId: tabActive.value, pageNo: pageNo.value, pageSize: pageSize.value}).then(res => {
total.value = res.total total.value = res.data.total
tableData.value = res.data.list tableData.value = res.data.list
}) })
} }
......
src/views/console/apiResources.vue
...@@ -57,7 +57,7 @@ const title = ref('') ...@@ -57,7 +57,7 @@ const title = ref('')
const data = reactive({ const data = reactive({
form: {}, form: {},
queryParams: { queryParams: {
pageNum: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
} }
}) })
......
src/views/console/myOrder.vue
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
:label="item.propertyName" :label="item.propertyName"
> >
<template #default="{ row }"> <template #default="{ row }">
{{ row.properties[index].valueName }} {{ row.properties?.[index]?.valueName || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="订单状态" align="center" prop="statusName"/> <el-table-column label="订单状态" align="center" prop="statusName"/>
......
src/views/console/naturalResources.vue
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
:key="index" :key="index"
:label="item.propertyName" :label="item.propertyName"
> >
<template #default="{ row }"> <template #default="{ row }">
{{ row.properties[index].valueName }} {{ row.properties?.[index]?.valueName || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="申请时间" align="center" prop="createTime" width="180"> <el-table-column label="申请时间" align="center" prop="createTime" width="180">
<template #default="scope"> <template #default="scope">
......
src/views/console/overview.vue
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<el-button type="primary" @click="$router.push('/console/authentication')">申请认证</el-button> <el-button type="primary" @click="$router.push('/console/authentication')">申请认证</el-button>
</div> </div>
<el-alert v-if="infoData.status === '待审核'" style="width: 300px" class="mb20" show-icon <el-alert v-if="infoData.checkStatus === 0" style="width: 300px" class="mb20" show-icon
title="您的企业认证已提交，请等待审核" type="info" effect="dark"/> title="您的企业认证已提交，请等待审核" type="info" effect="dark"/>
<el-row :gutter="20"> <el-row :gutter="20">
...@@ -22,8 +22,9 @@ ...@@ -22,8 +22,9 @@
<div class="flex base-info"> <div class="flex base-info">
<div class="left"> <div class="left">
<el-image :src="infoData.avatar" fit="cover"></el-image> <el-image :src="infoData.avatar" fit="cover"></el-image>
<el-tag v-if="infoData.status === '审核通过'" type="success">已认证</el-tag> <el-tag v-if="infoData.checkStatus === 1" type="success">{{infoData.checkStatusName}}</el-tag>
<el-tag v-else type="warning">未认证</el-tag> <el-tag v-if="infoData.checkStatus === 2 || infoData.checkStatus === 3 " type="danger">{{infoData.checkStatusName}}</el-tag>
<el-tag v-if="infoData.checkStatus === 0" type="success">{{infoData.checkStatusName}}</el-tag>
</div> </div>
<el-form label-width="110px" label-position="left"> <el-form label-width="110px" label-position="left">
<el-form-item label="账号昵称："> <el-form-item label="账号昵称：">
...@@ -74,10 +75,9 @@ ...@@ -74,10 +75,9 @@
<div> <div>
<el-form label-width="110px" label-position="left"> <el-form label-width="110px" label-position="left">
<el-form-item label="企业认证："> <el-form-item label="企业认证：">
<el-tag v-if="infoData.checkStatus === '审核通过'" type="success">已认证</el-tag> <el-tag v-if="infoData.checkStatus === 1" type="success">{{infoData.checkStatusName}}</el-tag>
<el-tag v-else class="mr5" type="warning">未认证</el-tag> <el-tag v-if="infoData.checkStatus === 0" type="success">{{infoData.checkStatusName}}</el-tag>
<el-button v-if="infoData.checkStatus ===2 || infoData.checkStatus === 3"
<el-button v-if="!infoData.check_status || infoData.checkStatus === '驳回'"
@click="$router.push('/console/authentication')" type="primary" link class="ml20">去申请 @click="$router.push('/console/authentication')" type="primary" link class="ml20">去申请
</el-button> </el-button>
</el-form-item> </el-form-item>
...@@ -86,9 +86,9 @@ ...@@ -86,9 +86,9 @@
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="最后审核结果："> <el-form-item label="最后审核结果：">
<el-tag v-if="infoData.check_status === '驳回'" type="danger" class="mr5">未通过</el-tag> <el-tag v-if="infoData.checkStatus === 2" type="danger" class="mr5">{{infoData.checkStatusName}}</el-tag>
<el-tag v-if="infoData.check_status === '待审核'" type="primary" class="mr5">待审核</el-tag> <el-tag v-if="infoData.checkStatus === 0" type="primary" class="mr5">{{infoData.checkStatusName}}</el-tag>
<el-tag v-if="infoData.check_status === '审核通过'" type="primary" class="mr5">审核通过</el-tag> <el-tag v-if="infoData.checkStatus === 1" type="primary" class="mr5">审核通过</el-tag>
<el-button v-if="infoData.check_status === '驳回'" type="primary" link @click="handleViewReason"> <el-button v-if="infoData.check_status === '驳回'" type="primary" link @click="handleViewReason">
查看驳回理由 查看驳回理由
......
src/views/index.vue
...@@ -227,7 +227,7 @@ const goToDetail = (item) => { ...@@ -227,7 +227,7 @@ const goToDetail = (item) => {
return; return;
} }
window.open(item.url, '_blank'); window.open(item.url, '_self');
}; };
function updateHeight() { function updateHeight() {
...@@ -986,8 +986,8 @@ function handleInfoDetails(id) { ...@@ -986,8 +986,8 @@ function handleInfoDetails(id) {
//} //}
.resource-item .img { .resource-item .img {
width: 70px; width: 120px;
height: 70px; height: 120px;
margin: 0 auto; margin: 0 auto;
text-align: center; text-align: center;
display: flex; display: flex;
...@@ -996,10 +996,10 @@ function handleInfoDetails(id) { ...@@ -996,10 +996,10 @@ function handleInfoDetails(id) {
} }
.resource-item .img img { .resource-item .img img {
width: auto; width: 100%;
max-height: 100%; height: 100%;
max-width: 100%; object-fit: cover; // 保持比例并充满
display: inline-block border-radius: 10px; // 可选，增加圆角
} }
.resource-item .title { .resource-item .title {
......
src/views/index_old.vue
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
</el-row> </el-row>
</div> </div>
<div class="flex-justify-center" style="margin-top: 40px;margin-bottom: 100px"> <div class="flex-justify-center" style="margin-top: 40px;margin-bottom: 100px">
<el-button class="view-more-btn" @click="$router.push('/information/informationList')">更多资讯 <el-button class="view-more-btn" @click="$router.push('/information/list')">更多资讯
<el-icon> <el-icon>
<ArrowRight/> <ArrowRight/>
</el-icon> </el-icon>
......
src/views/industryApplications/detail.vue
...@@ -83,7 +83,7 @@ getDetail() ...@@ -83,7 +83,7 @@ getDetail()
<style scoped lang="scss"> <style scoped lang="scss">
.app-container { .app-container {
padding-top: 0; padding-top: 100px;
} }
.breadcrumb { .breadcrumb {
......
src/views/information/list.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<el-row v-if="informationData.length" :gutter="24"> <el-row v-if="informationData.length" :gutter="24">
<el-col :span="8" v-for="item in informationData" :key="item.id"> <el-col :span="8" v-for="item in informationData" :key="item.id">
<div class="item" @click="$router.push('/information/informationDetail?id='+item.id)"> <div class="item" @click="$router.push('/information/informationDetail?id='+item.id)">
<img :src="item.images" alt=""> <img :src="item.image" alt="">
<div class="title">{{ item.title }}</div> <div class="title">{{ item.title }}</div>
<div class="flex-align-center flex-space-between"> <div class="flex-align-center flex-space-between">
<div class="time" style="display: flex; align-items: center;flex: 1;"> <div class="time" style="display: flex; align-items: center;flex: 1;">
...@@ -42,7 +42,7 @@ function getInformation() { ...@@ -42,7 +42,7 @@ function getInformation() {
item.day = new Date(item.createTime).getDate() item.day = new Date(item.createTime).getDate()
item.day = item.day < 10 ? '0' + item.day : item.day item.day = item.day < 10 ? '0' + item.day : item.day
item.description = item.description.replace('<p><br></p>', '') item.description = item.description.replace('<p><br></p>', '')
item.images = item.images.length !== 0 ? item.images[0] : '' item.image = item.image
}) })
informationData.value = res.data informationData.value = res.data
}) })
...@@ -91,7 +91,7 @@ getInformation() ...@@ -91,7 +91,7 @@ getInformation()
.list-box { .list-box {
width: 1280px; width: 1280px;
margin: 0 auto; margin: 0 auto;
padding-top: 70px; padding-top: 170px;
.item { .item {
margin-bottom: 24px; margin-bottom: 24px;
......
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 sign in to comment