From 3e72240f9926463bba8d2d5cbec743dbcdcf9bd3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期日, 07 四月 2024 16:00:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
company/src/views/indexShop.vue | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/company/src/views/indexShop.vue b/company/src/views/indexShop.vue
index 8c02270..7f44181 100644
--- a/company/src/views/indexShop.vue
+++ b/company/src/views/indexShop.vue
@@ -25,7 +25,7 @@
</el-tab-pane>
</el-tabs>
<div v-if="activeName === '0'" >
- <div class="home_content_right_list">
+ <div class="home_content_right_list" v-if="tableData0&&tableData0.length">
<div class="list_item" v-for="(item, index) in tableData0" :key="index">
<div class="list_item_left">
<span>{{item.title}}锛坽{ item.typeDetail }}锛�</span>
@@ -40,6 +40,11 @@
</div>
</div>
</div>
+ <div class="home_content_right_list" v-else>
+ <div class="list_item" style="width: 100%;font-size: 12px;display:block;color: #8c939d;text-align: center; padding: 20px">
+ 鏆傛棤娑堟伅
+ </div>
+ </div>
<div class="home_content_right_page">
<el-pagination
@current-change="handleCurrentChange0"
@@ -51,8 +56,8 @@
</div>
</div>
<div v-if="activeName === '1'" >
- <div class="home_content_right_list">
- <div class="list_item" v-for="(item, index) in tableData1" :key="index">
+ <div class="home_content_right_list" v-if="tableData1&&tableData1.length">
+ <div class="list_item" v-for="(item, index) in tableData1" :key="index">
<div class="list_item_left">
<span>{{item.title}}锛坽{ item.typeDetail }}锛�</span>
<span>{{item.info}}锛坽{item.content}}锛�</span>
@@ -64,6 +69,11 @@
<div class="list_item_right">
<span @click="detail(item)">鏌ョ湅</span>
</div>
+ </div>
+ </div>
+ <div class="home_content_right_list" v-else>
+ <div class="list_item" style="width: 100%;font-size: 12px;display:block;color: #8c939d;text-align: center; padding: 20px">
+ 鏆傛棤娑堟伅
</div>
</div>
<div class="home_content_right_page">
@@ -79,8 +89,7 @@
</div>
</div>
<OperaInsuranceApplyWindow ref="operaInsuranceApplyWindow" @success="handleCurrentChange0()"/>
- <dispatchUnitDetailsPlat ref="dispatchUnitDetailsPlat" @success="handleCurrentChange0()"/>
- <OperaSettleClaimsWindow ref="operaSettleClaimsWindow" @success="handleCurrentChange2()"/>
+ <OperaWtbApplyShopWindow ref="OperaWtbApplyShopWindow" @success="handleCurrentChange0()"/>
<OperaApplyChangeUnitDetailWindow ref="operaApplyChangeUnitDetailWindow" @success="handleCurrentChange0()"/>
<OperaApplyChangeDetailWindow ref="operaApplyChangeDetailWindow" @success="handleCurrentChange0()"/>
<OperaTaxesWindow ref="OperaTaxesWindow" @success="handleCurrentChange1()"/>
@@ -91,20 +100,16 @@
import * as echarts from 'echarts'
import { mapState } from 'vuex'
import OperaInsuranceApplyWindow from '@/components/business/OperaInsuranceApplyWindow'
-import dispatchUnitDetailsPlat from '@/components/business/dispatchUnitDetailsPlat'
+import OperaWtbApplyShopWindow from '@/components/business/OperaWtbApplyShopWindow'
import OperaApplyChangeUnitDetailWindow from '@/components/business/OperaApplyChangeUnitDetailWindow'
-import OperaSettleClaimsWindow from '@/components/business/OperaSettleClaimsWindow'
import OperaApplyChangeDetailWindow from '@/components/business/OperaApplyChangeDetailWindow'
-import OperaTaxesWindow from '@/components/business/OperaTaxesWindow'
-import { fetchList as noticeList, deleById } from '@/api/business/notices'
+import { fetchList as noticeList } from '@/api/business/notices'
export default {
components: {
OperaInsuranceApplyWindow,
- dispatchUnitDetailsPlat,
- OperaTaxesWindow,
- OperaSettleClaimsWindow,
OperaApplyChangeDetailWindow,
- OperaApplyChangeUnitDetailWindow
+ OperaApplyChangeUnitDetailWindow,
+ OperaWtbApplyShopWindow
},
name: 'Index',
data () {
@@ -168,7 +173,7 @@
detail (obj) {
if(obj && obj.type === 7){
if (obj.objType === 0) {
- this.$refs.operaInsuranceApplyWindow.open('鎶曚繚鐢宠璇︽儏', { id: obj.objId })
+ this.$refs.OperaWtbApplyShopWindow.open('鎶曚繚鐢宠璇︽儏', { id: obj.objId })
} else if (obj.objType === 1) {
this.$refs.operaApplyChangeDetailWindow.open('鍔犲噺淇濊鎯�', { id: obj.objId, applyId: obj.param1 })
} else if (obj.objType === 2) {
@@ -206,16 +211,13 @@
sorts: []
})
.then(response => {
- if (type === 0) {
+ if (type === 3) {
this.tableData0 = response.records
this.totalPage0 = response.total
}
- if (type === 1) {
+ if (type === 4) {
this.tableData1 = response.records
this.totalPage1 = response.total
- } if (type === 2) {
- this.tableData2 = response.records
- this.totalPage2 = response.total
}
})
.catch(e => {
--
Gitblit v1.9.3