From d1c205d29b5eacf1de22a7af29329ca370d1c2d3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 29 十一月 2024 14:50:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/components/enterprise/additionSubtractionApplication.vue | 4
company/src/components/enterprise/reinsurance.vue | 64 +++++++++++++--------
company/src/components/business/detailsEntrustedInsurance.vue | 2
company/src/views/enterprise/myPolicy.vue | 6 +
company/.env.developmentCom | 4
company/.env.productionShop | 4
company/.env.developmentShop | 2
company/src/views/indexShop.vue | 2
company/src/components/business/OperaUnionChangeDetailWindow.vue | 3
company/src/views/business/member.vue | 13 +---
company/src/components/business/OperaApplyChangeCheckWindow.vue | 2
company/src/views/index.vue | 14 ++--
company/.env.development | 4
company/src/components/business/OperaApplyChangeUnitCheckWindow.vue | 19 ++++--
company/src/views/business/companyUserApply.vue | 8 +-
15 files changed, 86 insertions(+), 65 deletions(-)
diff --git a/company/.env.development b/company/.env.development
index fa73b3f..26cfba6 100644
--- a/company/.env.development
+++ b/company/.env.development
@@ -9,7 +9,7 @@
VUE_APP_COOKIE_NAME='dmplat-auth-token'
# 娴嬭瘯鏈�
-VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
+# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
# 浠诲悍
-# VUE_APP_API = 'http://192.168.0.147:10030/'
+VUE_APP_API = 'http://192.168.0.162:10030/'
diff --git a/company/.env.developmentCom b/company/.env.developmentCom
index 97327af..c2c8c29 100644
--- a/company/.env.developmentCom
+++ b/company/.env.developmentCom
@@ -7,8 +7,8 @@
VUE_APP_CONTEXT_PATH = '/yyb_web'
VUE_APP_COOKIE_NAME='doumee-auth-token'
-VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'
+# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'
-# VUE_APP_API = 'http://192.168.0.147:10031/'
+VUE_APP_API = 'http://192.168.0.162:10031/'
# VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'
diff --git a/company/.env.developmentShop b/company/.env.developmentShop
index 04e6f03..f3cbf46 100644
--- a/company/.env.developmentShop
+++ b/company/.env.developmentShop
@@ -8,7 +8,7 @@
VUE_APP_CONTEXT_PATH = '/yyb_shop'
VUE_APP_API = 'https://dmtest.ahapp.net/yyb_shop_api/'
-# VUE_APP_API = 'http://192.168.0.147:10032/'
+# VUE_APP_API = 'http://192.168.0.162:10032/'
#VUE_APP_API = 'http://localhost:10032/'
diff --git a/company/.env.productionShop b/company/.env.productionShop
index 9547a87..b73fc35 100644
--- a/company/.env.productionShop
+++ b/company/.env.productionShop
@@ -6,9 +6,9 @@
VUE_APP_COOKIE_NAME='dmshop-auth-token'
VUE_APP_CONTEXT_PATH = '/yyb_shop'
# 骞冲彴绔�
-# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_shop_api/'
+VUE_APP_API = 'https://dmtest.ahapp.net/yyb_shop_api/'
VUE_APP_SYSTEM_TITLE = '浜戞槗淇濆鎴锋湇鍔＄郴缁�-鍟嗘埛绔�'
# 浼佷笟绔�
-VUE_APP_API = 'https://www.yyb.red/yyb_shop_api/'
+# VUE_APP_API = 'https://www.yyb.red/yyb_shop_api/'
diff --git a/company/src/components/business/OperaApplyChangeCheckWindow.vue b/company/src/components/business/OperaApplyChangeCheckWindow.vue
index 18d9f6b..b14447b 100644
--- a/company/src/components/business/OperaApplyChangeCheckWindow.vue
+++ b/company/src/components/business/OperaApplyChangeCheckWindow.vue
@@ -381,7 +381,7 @@
this.$dialog.messageConfirm('纭杩涜璇ユ搷浣滃悧锛�')
.then(() => {
this.isWorking = true
- editChangePidan({ id: this.model.id, checkInfo: this.form.editCheckInfo, validCode: this.form.editValidCode, pidanFile: this.form.editPidanFile })
+ editChangePidan({ id: this.model.id, checkInfo: this.form.editCheckInfo, validCode: this.form.editValidCode, pidanFileList: this.form.editPidanFile })
.then(response => {
this.visible = false
this.$emit('success')
diff --git a/company/src/components/business/OperaApplyChangeUnitCheckWindow.vue b/company/src/components/business/OperaApplyChangeUnitCheckWindow.vue
index 7e881ff..bcae577 100644
--- a/company/src/components/business/OperaApplyChangeUnitCheckWindow.vue
+++ b/company/src/components/business/OperaApplyChangeUnitCheckWindow.vue
@@ -73,7 +73,7 @@
<div class="form_item">
<div class="form_item_label"><span>*</span>涓婁紶鎵瑰崟锛�</div>
<div class="form_item_val">
- <UploadFile :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList2" @uploadSuccess="editBaoxianFileUploaded" />
+ <UploadFile :uploadData="{ folder: 'apply',fileType:'.pdf' }" :limit="99" @remove="removeEditPiDan" :fileList="form.fileList2" @uploadSuccess="editBaoxianFileUploaded" />
</div>
</div>
<div class="form_item">
@@ -136,7 +136,7 @@
applyStartTime:null,
validCode:null,
pidanFile:[],
- editPidanFile:null,
+ editPidanFile:[],
fileList1: [],
fileList2: [],
selectRadio:0
@@ -167,7 +167,7 @@
applyStartTime:null,
validCode:null,
pidanFile:[],
- editPidanFile:null,
+ editPidanFile:[],
fileList1: [],
fileList2: [],
selectRadio:0
@@ -229,8 +229,15 @@
})
},
editBaoxianFileUploaded(data){
- this.form.editPidanFile=data
+ this.form.editPidanFile.push(data)
},
+ removeEditPiDan(imgaddr) {
+ this.form.editPidanFile.forEach((item, index) => {
+ if (imgaddr === item.imgaddr) {
+ this.form.editPidanFile.splice(index, 1)
+ }
+ })
+ },
backDo(){
this.$dialog.messageConfirm('纭杩涜璇ユ搷浣滃悧锛�')
.then(() => {
@@ -261,7 +268,7 @@
this.$dialog.messageConfirm('纭杩涜璇ユ搷浣滃悧锛�')
.then(() => {
this.isWorking = true
- uploadChangePidan({id:this.model.id,applyStartTime:this.form.applyStartTime, validCode:this.form.validCode,pidanFile:this.form.pidanFile})
+ uploadChangePidan({id:this.model.id,applyStartTime:this.form.applyStartTime, validCode:this.form.validCode,pidanFileList:this.form.pidanFile})
.then(response => {
this.visible = false
this.$emit('success')
@@ -275,7 +282,7 @@
this.$dialog.messageConfirm('纭杩涜璇ユ搷浣滃悧锛�')
.then(() => {
this.isWorking = true
- editChangePidan({id:this.model.id, checkInfo:this.form.editCheckInfo,validCode:this.form.editValidCode,pidanFile:this.form.editPidanFile})
+ editChangePidan({id:this.model.id, checkInfo:this.form.editCheckInfo,validCode:this.form.editValidCode,pidanFileList:this.form.editPidanFile})
.then(response => {
this.visible = false
this.$emit('success')
diff --git a/company/src/components/business/OperaUnionChangeDetailWindow.vue b/company/src/components/business/OperaUnionChangeDetailWindow.vue
index da2f6fc..9e708d2 100644
--- a/company/src/components/business/OperaUnionChangeDetailWindow.vue
+++ b/company/src/components/business/OperaUnionChangeDetailWindow.vue
@@ -28,7 +28,8 @@
<el-button v-if="[0].includes(model.status)" type="primary" :disabled="loading" :loading="loading" @click="getSignLink(0)">绛剧讲鐢宠鍗�</el-button>
<el-button v-if="[2].includes(model.status)" type="primary" @click="viewPidan">鏌ョ湅鎵瑰崟</el-button>
<el-button v-if=" [1].includes(model.status) && userInfo.type === 0" type="primary" @click="$refs.OperaUnionChangeCheckWindow.open('涓婁紶鎵瑰崟',model,3)">涓婁紶鎵瑰崟</el-button>
- <el-button v-if="[0,1].includes(model.status)" type="danger" @click="$refs.OperaUnionChangeCheckWindow.open('閫�鍥炵敵璇�',model,1)">閫�鍥炵敵璇�</el-button>
+
+ <el-button v-if="[0,1].includes(model.status)" type="danger" @click="$refs.OperaUnionChangeCheckWindow.open('鍏抽棴鐢宠',model,1)">鍏抽棴鐢宠</el-button>
</template>
<template v-if="0">
<template v-if="0">
diff --git a/company/src/components/business/detailsEntrustedInsurance.vue b/company/src/components/business/detailsEntrustedInsurance.vue
index d57101c..cae5e24 100644
--- a/company/src/components/business/detailsEntrustedInsurance.vue
+++ b/company/src/components/business/detailsEntrustedInsurance.vue
@@ -33,7 +33,7 @@
<el-button v-if="[0,1,2,5].includes(model.status) " type="danger" @click="$refs.OperaUnionApplyCheckWindow.open('閫�鍥炵敵璇�',model,1)">閫�鍥炵敵璇�</el-button>
<el-button v-if="[5].includes(model.status)" type="primary" @click="fusheng">鎶曚繚澶嶅</el-button>
- <el-button v-if="[0,1,2].includes(model.status) " type="danger" @click="$refs.OperaUnionApplyCheckWindow.open('閫�鍥炵敵璇�',model,1)">閫�鍥炵敵璇�</el-button>
+<!-- <el-button v-if="[0,1,2].includes(model.status) " type="danger" @click="$refs.OperaUnionApplyCheckWindow.open('閫�鍥炵敵璇�',model,1)">閫�鍥炵敵璇�</el-button>-->
</template>
<template v-if="userInfo.type ===0">
<el-button v-if="[2,3,4,1,5].includes(model.status) && (model.toubaodanFile || model.toubaodanSignedFile)" type="primary" @click="viewToubaodan">{{model.signType === 1 ? '鏌ョ湅鐢宠鍗�' : '鏌ョ湅鎶曚繚鍗�'}}</el-button>
diff --git a/company/src/components/enterprise/additionSubtractionApplication.vue b/company/src/components/enterprise/additionSubtractionApplication.vue
index b3c9821..af434aa 100644
--- a/company/src/components/enterprise/additionSubtractionApplication.vue
+++ b/company/src/components/enterprise/additionSubtractionApplication.vue
@@ -454,7 +454,8 @@
this.visible = false
this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
// this.$refs.OperaApplyChangeDetailWindow.open('鍔犲噺淇濊鎯�', { applyId: this.form.id, id: res })
- this.$emit('success', { applyId: this.form.id, id: res })
+ // { applyId: this.form.id, id: res }
+ this.$emit('success')
}).catch(e => {
this.$tip.apiFailed(e)
}).finally(() => {
@@ -607,7 +608,6 @@
}
},
getUser (obj) {
- console.log(this.seleData)
this.seleData.forEach(item => {
if (this.activeName === '0') {
this.form.addDetailList.forEach(row => {
diff --git a/company/src/components/enterprise/reinsurance.vue b/company/src/components/enterprise/reinsurance.vue
index 68651eb..0286f4f 100644
--- a/company/src/components/enterprise/reinsurance.vue
+++ b/company/src/components/enterprise/reinsurance.vue
@@ -102,7 +102,9 @@
<el-button type="danger" @click="deleItem">鍒犻櫎</el-button>
</div>
<div class="btns_item" v-if="activeName !== '1'">
- <el-button type="primary" @click="sele">閫夊彇娲鹃仯鍗曚綅</el-button>
+<!-- <el-button type="primary" @click="sele">閫夊彇娲鹃仯鍗曚綅</el-button>-->
+ <el-button type="primary" @click="sele(1)" v-if="item && item.hasDispatchUnit !== 1">閫夊彇娲鹃仯鍗曚綅</el-button>
+ <el-button type="primary" @click="sele(2)" v-if="item && item.hasDispatchUnit === 1">閫夊彇宸ョ</el-button>
</div>
</div>
<el-table
@@ -144,6 +146,7 @@
</template>
</el-table-column>
<el-table-column
+ v-if="item && item.hasDispatchUnit !== 1"
:key="Math.random()"
prop="duName"
label="娲鹃仯鍗曚綅">
@@ -205,14 +208,15 @@
</template>
</el-table-column>
<el-table-column
- :key="Math.random()"
- prop="duName"
- label="娲鹃仯鍗曚綅">
+ v-if="item && item.hasDispatchUnit !== 1"
+ :key="Math.random()"
+ prop="duName"
+ label="娲鹃仯鍗曚綅">
</el-table-column>
<el-table-column
- :key="Math.random()"
- prop="workTypeName"
- label="鎵�灞炲伐绉�">
+ :key="Math.random()"
+ prop="workTypeName"
+ label="鎵�灞炲伐绉�">
</el-table-column>
<el-table-column
:key="Math.random()"
@@ -346,7 +350,7 @@
types: [0]
}).then(res => {
res.forEach(item => {
- item.fee = ''
+ item.fee = item.fee
item.idCard = item.memberIdcardNo
item.workTypeName = ''
item.worktypeId = ''
@@ -409,7 +413,7 @@
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '鎬讳环'
- } else if (index === 7) {
+ } else if (this.item && this.item.hasDispatchUnit === 1 && index === 6) {
let total = 0
if (this.activeName === '0') {
this.form.addDetailList.forEach(item => {
@@ -421,14 +425,26 @@
this.form.delDetailList.forEach(item => {
total += item.fee
})
- // if (total < 0) {
sums[index] = (total||0).toFixed(2)
- // } else {
- // sums[index] = '-' + total
- // }
return
}
sums[index] = ''
+ } else if (this.item && this.item.hasDispatchUnit === 0 && index === 7) {
+ let total = 0
+ if (this.activeName === '0') {
+ this.form.addDetailList.forEach(item => {
+ total += item.fee
+ })
+ sums[index] = total.toFixed(2)
+ return
+ } else {
+ this.form.delDetailList.forEach(item => {
+ total += item.fee
+ })
+ sums[index] = (total||0).toFixed(2)
+ return
+ }
+ sums[index] = ''
}
})
return sums
@@ -441,7 +457,7 @@
if (this.activeName === '0') {
this.seleData.forEach(item => {
this.form.addDetailList.forEach((row, index) => {
- if (item === row.name) {
+ if (item === row.idCard) {
this.form.addDetailList.splice(index, 1)
}
})
@@ -449,7 +465,7 @@
} else {
this.seleData.forEach(item => {
this.form.delDetailList.forEach((row, index) => {
- if (item === row.name) {
+ if (item === row.idCard) {
this.form.delDetailList.splice(index, 1)
}
})
@@ -522,9 +538,9 @@
return
}
if (this.activeName === '0') {
- this.$refs.addEmployee.open('娣诲姞鍔犱繚鍛樺伐', { arr: this.form.addDetailList, solutionId: this.item.newVersionSolutionId, price: this.price })
+ this.$refs.addEmployee.open('娣诲姞鍔犱繚鍛樺伐', { arr: this.form.addDetailList, solutionId: this.item.newVersionSolutionId, price: this.price, companyId: this.item.hasDispatchUnit === 1 ? '1' : '' })
} else {
- this.$refs.addEmployee.open('娣诲姞鍑忎繚鍛樺伐', { arr: this.form.delDetailList, solutionId: this.item.newVersionSolutionId, price: this.reducePrice })
+ this.$refs.addEmployee.open('娣诲姞鍑忎繚鍛樺伐', { arr: this.form.delDetailList, solutionId: this.item.newVersionSolutionId, price: this.reducePrice, companyId: this.item.hasDispatchUnit === 1 ? '1' : '' })
}
},
uploadUser () {
@@ -533,9 +549,9 @@
return
}
if (this.activeName === '0') {
- this.$refs.importEmployees.open('鍔犱繚鍛樺伐鍚嶅崟', { arr: this.form.addDetailList, type: 1, price: this.price, solutionId: this.item.newVersionSolutionId })
+ this.$refs.importEmployees.open('鍔犱繚鍛樺伐鍚嶅崟', { arr: this.form.addDetailList, type: 1, price: this.price, solutionId: this.item.newVersionSolutionId, hasDispatchUnit: this.item.hasDispatchUnit })
} else {
- this.$refs.importEmployees.open('鍑忎繚鍛樺伐鍚嶅崟', { arr: this.form.delDetailList, type: 0, price: this.reducePrice, solutionId: this.item.newVersionSolutionId, insuranceApplyId: this.form.id })
+ this.$refs.importEmployees.open('鍑忎繚鍛樺伐鍚嶅崟', { arr: this.form.delDetailList, type: 0, price: this.reducePrice, solutionId: this.item.newVersionSolutionId, insuranceApplyId: this.form.id, hasDispatchUnit: this.item.hasDispatchUnit })
}
},
// 鍒囨崲鏂规
@@ -560,7 +576,7 @@
this.seleData.forEach(item => {
if (this.activeName === '0') {
this.form.addDetailList.forEach(row => {
- if (item === row.name) {
+ if (item === row.idCard) {
row.workTypeName = obj.workTypeName
row.worktypeId = obj.worktypeId
row.duName = obj.duName
@@ -569,7 +585,7 @@
})
} else {
this.form.delDetailList.forEach(row => {
- if (item === row.name) {
+ if (item === row.idCard) {
row.workTypeName = obj.workTypeName
row.worktypeId = obj.worktypeId
row.duName = obj.duName
@@ -582,7 +598,7 @@
this.$refs.multipleTable.clearSelection()
},
// 閫夋嫨鍛樺伐
- sele () {
+ sele (type) {
if (!this.form.solutionId) {
this.$message.warning('璇烽�夋嫨淇濋櫓鏂规')
return
@@ -591,7 +607,7 @@
this.$message.warning('璇烽�夋嫨鍛樺伐')
return
}
- this.$refs.confirmJobType.open('纭宸ョ', { solutionId: this.newVersionSolutionId })
+ this.$refs.confirmJobType.open('纭宸ョ', { solutionId: this.newVersionSolutionId, type })
},
// 鏌ヨ鍏ㄩ儴鏂规
getCompany () {
@@ -626,7 +642,7 @@
return sexAndAge.age
},
handleSelectionChange (e) {
- this.seleData = e.map(item => item.name)
+ this.seleData = e.map(item => item.memberIdcardNo)
},
getValue (list) {
console.log(list)
diff --git a/company/src/views/business/companyUserApply.vue b/company/src/views/business/companyUserApply.vue
index 9993b73..4a4e0cd 100644
--- a/company/src/views/business/companyUserApply.vue
+++ b/company/src/views/business/companyUserApply.vue
@@ -35,9 +35,9 @@
<el-table-column prop="createDate" label="鐢宠鏃堕棿"></el-table-column>
<el-table-column label="鐢宠鐘舵��">
<template slot-scope="{row}">
- <span v-if="row.status === 0">寰呭鏍�</span>
- <span v-if="row.status === 1">瀹℃牳閫氳繃</span>
- <span v-if="row.status === 2">瀹℃牳涓嶉�氳繃</span>
+ <span style="color: #216EEE;" v-if="row.status === 0">寰呭鏍�</span>
+ <span style="color: #00BA92;" v-if="row.status === 1">瀹℃牳閫氳繃</span>
+ <span style="color: red;" v-if="row.status === 2">瀹℃牳涓嶉�氳繃</span>
</template>
</el-table-column>
<el-table-column
@@ -48,7 +48,7 @@
<template slot-scope="{row}">
<el-button type="text" @click="$refs.operaCompanyUserApplyDescWindow.open('鐢宠璁板綍璇︽儏', row.id)" icon="el-icon-view">鏌ョ湅</el-button>
<el-button type="text" v-if="userInfo.type === 0 && row.status === 0" @click="$refs.operaCompanyUserApplyCarefulWindow.open('闆嗗洟鐢宠璁板綍瀹℃牳', row.id)">瀹℃牳</el-button>
- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-if="userInfo.type === 1" v-permissions="['business:companyuserapply:delete']">鍒犻櫎</el-button>
+ <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-if="userInfo.type === 1 && row.status === 0" v-permissions="['business:companyuserapply:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
diff --git a/company/src/views/business/member.vue b/company/src/views/business/member.vue
index 1519e05..c1a976f 100644
--- a/company/src/views/business/member.vue
+++ b/company/src/views/business/member.vue
@@ -172,16 +172,11 @@
.then(res => {
this.solutions = res
})
- /* if(this.userInfo.type ==1){
- findListByDTO({ dataType: 2 })
- .then(res => {
- this.options = res
+ if (this.userInfo.type === 0) {
+ companyAll({}).then(res => {
+ this.companyList = res
})
- }*/
-
- companyAll({}).then(res => {
- this.companyList = res
- })
+ }
},
calculateAge(idNumber) {
if (!idNumber) return
diff --git a/company/src/views/enterprise/myPolicy.vue b/company/src/views/enterprise/myPolicy.vue
index 19f8a23..2f1dd47 100644
--- a/company/src/views/enterprise/myPolicy.vue
+++ b/company/src/views/enterprise/myPolicy.vue
@@ -97,7 +97,9 @@
</el-table-column>
<el-table-column prop="statusInfo" align="center" fixed label="鐘舵��">
<template slot-scope="{row}">
- <span :class="'apply-status'+row.status">{{row.statusInfo}}</span>
+ <span style="color:#f95601;" v-if="row.status === 5 && row.statusInfo === '寰呯敓鏁�'">{{row.statusInfo}}</span>
+ <span style="color:#999;" v-else-if="row.status === 5 && row.statusInfo === '宸茶繃鏈�'">{{row.statusInfo}}</span>
+ <span :class="'apply-status'+row.status" v-else>{{row.statusInfo}}</span>
</template>
</el-table-column>
<el-table-column prop="solutionsName" align="center" fixed label="淇濋櫓鏂规" min-width="150"></el-table-column>
@@ -216,7 +218,7 @@
startTimeE: '',
startTimeS: '',
baseSolutionId: '',
- status: '5',
+ status: '5,27',
solutionType: '',
timeOut: ''
},
diff --git a/company/src/views/index.vue b/company/src/views/index.vue
index 86ba11f..80fc354 100644
--- a/company/src/views/index.vue
+++ b/company/src/views/index.vue
@@ -115,7 +115,7 @@
</div>
<div class="home_content_right_page">
<el-pagination
- @current-change="handleCurrentChange2"
+ @current-change="handleCurrentChange6"
:current-page="page2"
:page-size="5"
layout="total, prev, pager, next, jumper"
@@ -129,7 +129,7 @@
<div class="list_item" v-for="(item, index) in tableData6" :key="index">
<div class="list_item_left">
<span>{{item.title}}锛坽{ item.typeDetail }}锛�</span>
- <span>{{item.info}}锛坽{item.content}}锛�</span>
+ <span>{{item.content}}</span>
</div>
<div class="list_item_center">
<span>{{item.companyName}}</span>
@@ -160,7 +160,7 @@
<div class="list_item" v-for="(item, index) in tableData7" :key="index">
<div class="list_item_left">
<span>{{item.title}}锛坽{ item.typeDetail }}锛�</span>
- <span>{{item.info}}锛坽{item.content}}锛�</span>
+ <span>{{item.content}}</span>
</div>
<div class="list_item_center">
<span>{{item.companyName}}</span>
@@ -178,7 +178,7 @@
</div>
<div class="home_content_right_page">
<el-pagination
- @current-change="handleCurrentChange2"
+ @current-change="handleCurrentChange7"
:current-page="page7"
:page-size="5"
layout="total, prev, pager, next, jumper"
@@ -209,11 +209,11 @@
</div>
<div class="home_content_right_page">
<el-pagination
- @current-change="handleCurrentChange2"
- :current-page="page7"
+ @current-change="handleCurrentChange8"
+ :current-page="page8"
:page-size="5"
layout="total, prev, pager, next, jumper"
- :total="totalPage7">
+ :total="totalPage8">
</el-pagination>
</div>
</div>
diff --git a/company/src/views/indexShop.vue b/company/src/views/indexShop.vue
index 62d3e57..0f4f29d 100644
--- a/company/src/views/indexShop.vue
+++ b/company/src/views/indexShop.vue
@@ -92,7 +92,7 @@
<div class="list_item" v-for="(item, index) in tableData6" :key="index">
<div class="list_item_left">
<span>{{item.title}}锛坽{ item.typeDetail }}锛�</span>
- <span>{{item.info}}锛坽{item.content}}锛�</span>
+ <span>{{item.content}}</span>
</div>
<div class="list_item_center">
<span>{{item.companyName}}</span>
--
Gitblit v1.9.3