diff --git a/src/api/notice/index.js b/src/api/notice/index.js
index 35c016bf..5246bb58 100644
--- a/src/api/notice/index.js
+++ b/src/api/notice/index.js
@@ -33,3 +33,48 @@ export function AttestationDetail(id) {
method: 'get'
})
}
+
+//鉴证公告
+export function needProject(id,query) {
+ return request({
+ url: '/transaction/website/needProject/'+id,
+ method: 'get',
+ params: query
+ })
+}
+
+//招标公告
+export function tenderList(query) {
+ return request({
+ url: '/transaction/website/tender/publicity',
+ method: 'get',
+ params: query
+ })
+}
+
+//中标公告
+export function winList(query) {
+ return request({
+ url: '/transaction/website/win/publicity',
+ method: 'get',
+ params: query
+ })
+}
+
+//招标公告详情
+export function tenderDetail(id,query) {
+ return request({
+ url: '/transaction/website/tender/'+id,
+ method: 'get',
+ params: query
+ })
+}
+
+//中标公告详情
+export function tenderWinDetail(id,query) {
+ return request({
+ url: '/transaction/website/tenderWin/'+id,
+ method: 'get',
+ params: query
+ })
+}
diff --git a/src/permission.js b/src/permission.js
index 16fd9839..4560e313 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -16,6 +16,10 @@ const whiteList = [
'/news/index',
'/news/newDetail',
'/notice/index',
+ '/notice/inviteTendersDetail',
+ '/notice/winTheBiddingDetail',
+ '/project/projectNeedsDetail',
+
'/supply/index',
'/interaction/index',
'/register/index',
@@ -166,6 +170,9 @@ const whiteList = [
'/agriculturalTrusteeship/societyProjectList',//社会化产品列表
'/agriculturalTrusteeship/societyProjectDetail',//社会化产品详情
'/agriculturalTrusteeship/shopList',//保险列表首页
+ '/agriculturalTrusteeship/shopNeedsList',//保险列表首页
+ '/agriculturalTrusteeship/shopOrganizationDetail',//保险列表首页
+ '/agriculturalTrusteeship/shopDepositDetail',//保险列表首页
'/agriculturalTrusteeship/shopDetail',//保险列表详情
'/agriculturalTrusteeship/shopEdit',//保险列表详情
'/agriculturalTrusteeship/shopAdd',//保险列表首页
diff --git a/src/router/index.js b/src/router/index.js
index 9122ad4d..d58d62b4 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -111,6 +111,33 @@ export const constantRoutes = [
},
component: (resolve) => require(['@/views/project/projectDetail'], resolve)
},
+ {
+ path: '/project/projectNeedsDetail',
+ name: 'projectNeedsDetail',
+ meta: {
+ title: '需求项目',
+ hidden: true
+ },
+ component: (resolve) => require(['@/views/project/projectNeedsDetail'], resolve)
+ },
+ {
+ path: '/notice/inviteTendersDetail',
+ name: 'inviteTendersDetail',
+ meta: {
+ title: '招标公告',
+ hidden: true
+ },
+ component: (resolve) => require(['@/views/notice/inviteTendersDetail'], resolve)
+ },
+ {
+ path: '/notice/winTheBiddingDetail',
+ name: 'winTheBiddingDetail',
+ meta: {
+ title: '中标公告',
+ hidden: true
+ },
+ component: (resolve) => require(['@/views/notice/winTheBiddingDetail'], resolve)
+ },
{
path: '/news/index',
name: 'news',
@@ -5110,6 +5137,33 @@ export const constantRoutes = [
},
component: (resolve) => require(['@/views/agriculturalTrusteeship/shop/shopList'], resolve)
},
+ {
+ path: '/agriculturalTrusteeship/shopNeedsList',
+ name: 'agriculturalTrusteeshipShopNeedsList',
+ meta: {
+ title: '贷款需求',
+ hidden: true,
+ },
+ component: (resolve) => require(['@/views/agriculturalTrusteeship/shop/shopNeedsList'], resolve)
+ },
+ {
+ path: '/agriculturalTrusteeship/shopOrganizationDetail',
+ name: 'agriculturalTrusteeshipShopOrganizationDetail',
+ meta: {
+ title: '服务组织',
+ hidden: true,
+ },
+ component: (resolve) => require(['@/views/agriculturalTrusteeship/shop/shopOrganizationDetail'], resolve)
+ },
+ {
+ path: '/agriculturalTrusteeship/shopDepositDetail',
+ name: 'agriculturalTrusteeshipShopDepositDetail',
+ meta: {
+ title: '托管主体',
+ hidden: true,
+ },
+ component: (resolve) => require(['@/views/agriculturalTrusteeship/shop/shopDepositDetail'], resolve)
+ },
{
path: '/agriculturalTrusteeship/serviceEdit',
name: 'agriculturalTrusteeshipServiceEdit',
diff --git a/src/views/agriculturalTrusteeship/shop/shopDepositDetail.vue b/src/views/agriculturalTrusteeship/shop/shopDepositDetail.vue
new file mode 100644
index 00000000..8920f180
--- /dev/null
+++ b/src/views/agriculturalTrusteeship/shop/shopDepositDetail.vue
@@ -0,0 +1,394 @@
+
+
+
+
+
+
+
+
+
+
+
村口需要水牛石头诚招水牛贷款联系电话165822本人人品优良绝不拖欠还款。
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/agriculturalTrusteeship/shop/shopList.vue b/src/views/agriculturalTrusteeship/shop/shopList.vue
index 9597eb7a..7763e11c 100644
--- a/src/views/agriculturalTrusteeship/shop/shopList.vue
+++ b/src/views/agriculturalTrusteeship/shop/shopList.vue
@@ -75,11 +75,31 @@
-
-
-
+
+
+
+

+
查看贷款需求
+
+
+
+
+
+
+
+
+
+
import Cookies from "js-cookie";
import {productList, productOut, productIn, serviceGet, treeselect} from "@/api/agriculturalTrusteeship";
+ import {Dialog} from "vant";
export default {
name: "agriculturalTrusteeshipShopList",
data() {
@@ -178,7 +199,19 @@
methods: {
getDetail(){
serviceGet(Cookies.get('ACCESS-SESSION-ID')).then(response => {
- this.serviceForm = response.data;
+ if (response.code == 200){
+ this.serviceForm = response.data;
+ }else{
+ Dialog.confirm({
+ title: '系统提示',
+ message: '登录状态已过期,请重新登录',
+ confirmButtonText: '重新登录',
+ cancelButtonText: '取消'
+ }).then(() => {
+ window.location.href = '/agriculturalTrusteeship/login';
+ });
+ }
+
});
},
getList(){
@@ -260,6 +293,45 @@
}
}
+ .main_btn{
+ display: flex;
+ background: #ffffff;
+ border-top-left-radius: 25PX;
+ border-top-right-radius: 25PX;
+ overflow: hidden;
+ padding: 4vw 4% 0;
+ justify-content: space-between;
+ .btn_box_01{
+ width: 48%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ border: 1Px dashed #4E7FFF;
+ color: #4E7FFF;
+ font-size: .35rem;
+ line-height: 15vw;
+ border-radius: 10Px;
+ p:first-child{
+ font-weight: bold;
+ margin-right: 5PX;
+ }
+ }
+ .btn_box_02{
+ width: 48%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ background: rgba(78,127,255,0.17);
+ color: #1E49BB;
+ font-size: .35rem;
+ line-height: 15vw;
+ border-radius: 10Px;
+ p{
+ margin-left: 5PX;
+ }
+ }
+ }
+
.serviceName{
display: flex;
align-items: center;
@@ -305,9 +377,9 @@
.main{
background-image: linear-gradient(to right , #6E93F3 , #7E89E9 , #54C6E4);
/deep/ .van-tabs__nav{
- border-top-left-radius: 25PX;
- border-top-right-radius: 25PX;
- overflow: hidden;
+ /*border-top-left-radius: 25PX;*/
+ /*border-top-right-radius: 25PX;*/
+ /*overflow: hidden;*/
}
/deep/ .van-tabs__line{
background: #334281!important;
diff --git a/src/views/agriculturalTrusteeship/shop/shopNeedsList.vue b/src/views/agriculturalTrusteeship/shop/shopNeedsList.vue
new file mode 100644
index 00000000..1777fc80
--- /dev/null
+++ b/src/views/agriculturalTrusteeship/shop/shopNeedsList.vue
@@ -0,0 +1,416 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/agriculturalTrusteeship/shop/shopOrganizationDetail.vue b/src/views/agriculturalTrusteeship/shop/shopOrganizationDetail.vue
new file mode 100644
index 00000000..d73aa0ee
--- /dev/null
+++ b/src/views/agriculturalTrusteeship/shop/shopOrganizationDetail.vue
@@ -0,0 +1,442 @@
+
+
+
+
+
+
+
+
+
+
+
村口需要水牛石头诚招水牛贷款联系电话165822本人人品优良绝不拖欠还款。
+
+
+
+
+
+
+
+
+
+
+
+
+
家家加加加加加加加就爱简爱家合作社
+
(1/10)
+
+
+
+
丰田村
+
2023.03.15-2024.09.15
+
+
+
+
+
+
+
+
+
diff --git a/src/views/notice/index.vue b/src/views/notice/index.vue
index ff90d3df..94b439e7 100644
--- a/src/views/notice/index.vue
+++ b/src/views/notice/index.vue
@@ -24,7 +24,7 @@
-
+
鉴证公告
+
+ 招标公告
+
+
+
+ 招标方:{{item.tenderName}} {{item.logintime}}
+
+
+
+
+
+ 中标公告
+
+
+
+ 招标方:{{item.tenderName}} {{item.dealTime}}
+
+
+
+
diff --git a/src/views/notice/inviteTendersDetail.vue b/src/views/notice/inviteTendersDetail.vue
new file mode 100644
index 00000000..a17a8e30
--- /dev/null
+++ b/src/views/notice/inviteTendersDetail.vue
@@ -0,0 +1,111 @@
+
+
+
+
{{attestationDetail.projectName}}
+
+ 招标方名称:{{attestationDetail.tenderName}}
+
+
+ 资金来源:{{attestationDetail.moneySource}}
+
+
+ 招标代理公司:{{attestationDetail.agentName}}
+
+
+ 联系人:{{attestationDetail.linkman}}
+
+
+ 联系电话:{{attestationDetail.linkphone}}
+
+
+ 联系地址:{{attestationDetail.linkaddress}}
+
+
+ 招标方意见:{{attestationDetail.tenderOpinion}}
+
+
+ 代理公司意见:{{attestationDetail.agentOpinion}}
+
+
+ 建设地点:{{attestationDetail.address}}
+
+
+ 建设工期:{{attestationDetail.timeLimit}}
+
+
+ 项目规模:{{attestationDetail.scale}}
+
+
+ 招标内容:{{attestationDetail.tenderContent}}
+
+
+ 投标人要求:{{attestationDetail.condition}}
+
+
+ 保证金:{{attestationDetail.deposit}}
+
+
+ 招标文件价格(元):{{attestationDetail.price}}
+
+
+ 招标发布日期:{{attestationDetail.logintime}}
+
+
+ 招标书领取开始日期:{{attestationDetail.startTime}}
+
+
+ 招标书领取结束日期:{{attestationDetail.stopTime}}
+
+
+
+
+
+
+
diff --git a/src/views/notice/winTheBiddingDetail.vue b/src/views/notice/winTheBiddingDetail.vue
new file mode 100644
index 00000000..2961ce98
--- /dev/null
+++ b/src/views/notice/winTheBiddingDetail.vue
@@ -0,0 +1,78 @@
+
+
+
+
{{attestationDetail.projectName}}
+
+ 招标方名称:{{attestationDetail.tenderName}}
+
+
+ 中标人:{{attestationDetail.assignee}}
+
+
+ 建设单位:{{attestationDetail.bulidPart}}
+
+
+ 项目负责人:{{attestationDetail.partLinkman}}
+
+
+ 中标价格:{{attestationDetail.transactionPrice}}
+
+
+ 中标日期:{{attestationDetail.dealTime}}
+
+
+ 公示开始日期:{{attestationDetail.startTime}}
+
+
+ 公示结束日期:{{attestationDetail.stopTime}}
+
+
+
+
+
+
+
diff --git a/src/views/project/index.vue b/src/views/project/index.vue
index 111bd9f3..cc43b2a9 100644
--- a/src/views/project/index.vue
+++ b/src/views/project/index.vue
@@ -50,10 +50,10 @@
-
+
- {{item.projectName}}
+ {{ item.projectName }}
{{ item.needname }}
需求开始时间 {{ item.needStartTime }}
需求结束时间 {{ item.needStopTime }}
diff --git a/src/views/project/projectDetail.vue b/src/views/project/projectDetail.vue
index 220259c9..ee7ed722 100644
--- a/src/views/project/projectDetail.vue
+++ b/src/views/project/projectDetail.vue
@@ -67,11 +67,14 @@
竞价方式:{{ detail.biddingType }}
+
+ 竞价方向:{{ detail.biddingDirect }}
+
阶梯价(加价幅度):{{ detail.ladderPrice }}
- 延时周期:2分钟报名
+ 延时周期:2分钟
@@ -336,6 +339,9 @@ export default {
this.getDicts("bidding_type").then(res => {
this.detail.biddingType = this.selectDictLabel(res.data,response.data.biddingType);
});
+ this.getDicts("bidding_direct").then(res => {
+ this.detail.biddingDirect = this.selectDictLabel(res.data,response.data.biddingDirect);
+ });
for(let i of this.detail.subjectList){
this.getDicts("area_unit").then(res => {
i.areaUnit = this.selectDictLabel(res.data,i.areaUnit);
@@ -346,6 +352,12 @@ export default {
let signupStartTime = Date.parse(this.detail.signupStartTime)+0
let signupStopTime = Date.parse(this.detail.signupStopTime)+0
let nowDate = Date.parse(new Date());
+
+ console.log('biddingStartTime'+biddingStartTime)
+ console.log('biddingStopTime'+biddingStopTime)
+ console.log('signupStartTime'+signupStartTime)
+ console.log('signupStopTime'+signupStopTime)
+
if(signupStartTime>nowDate){
this.process= "报名未开始"
this.tip=this.detail.signupStartTime+"开始报名"
@@ -474,6 +486,11 @@ export default {
})
},
add(){
+ if (this.detail.biddingDirect == '反向竞价'){
+ if(this.detail.price
+
+
+
{{noticeDetail.projectName}}
+
+ 需求项目类别:{{noticeDetail.projectNumber}}
+
+
+ 需求价格描述:{{noticeDetail.price}}
+
+
+ 需求方名称:{{noticeDetail.needname}}
+
+
+ 需求方地址:{{noticeDetail.address}}
+
+
+ 单位性质:{{noticeDetail.company}}
+
+
+ 单位法人:{{noticeDetail.legalPerson}}
+
+
+ 联系人:{{noticeDetail.realname}}
+
+
+ 联系电话:{{noticeDetail.phone}}
+
+
+ 身份证号:{{noticeDetail.idCardNum}}
+
+
+ 邮箱:{{noticeDetail.email}}
+
+
+ 需求开始时间:{{noticeDetail.needStartTime}}
+
+
+ 需求结束时间:{{noticeDetail.needStopTime}}
+
+
+ 用途与经营描述:{{noticeDetail.description}}
+
+
+ 附件图片:
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/sunVillage_info/list_signature.vue b/src/views/sunVillage_info/list_signature.vue
index a0a2ebaf..0913adfc 100644
--- a/src/views/sunVillage_info/list_signature.vue
+++ b/src/views/sunVillage_info/list_signature.vue
@@ -36,17 +36,22 @@
-
+
+
签名
-
+
预览
-
+
+

+
电子合同
+
+

-
下载
+
线下合同
diff --git a/src/views/user/signature/signatureList.vue b/src/views/user/signature/signatureList.vue
index 4a5610a2..4c60c14d 100644
--- a/src/views/user/signature/signatureList.vue
+++ b/src/views/user/signature/signatureList.vue
@@ -20,11 +20,11 @@
-
-
-
{{item.contractCode}}
-
{{item.signingMode}}
-
{{item.signingStatus}}
+
+
+
{{item.contractCode}}
+
{{item.signingMode}}
+
{{item.signingStatus}}
{{item.contractName}}
@@ -35,17 +35,21 @@
-
+
签名
-
+
预览
-
+

-
下载
+
电子合同
+
+
+

+
线下合同
diff --git a/static/images/agriculturalTrusteeship/insurance/shop_icon_add2.png b/static/images/agriculturalTrusteeship/insurance/shop_icon_add2.png
new file mode 100644
index 00000000..d208533a
Binary files /dev/null and b/static/images/agriculturalTrusteeship/insurance/shop_icon_add2.png differ
diff --git a/static/images/agriculturalTrusteeship/insurance/shop_icon_see.png b/static/images/agriculturalTrusteeship/insurance/shop_icon_see.png
new file mode 100644
index 00000000..6b81ae88
Binary files /dev/null and b/static/images/agriculturalTrusteeship/insurance/shop_icon_see.png differ
diff --git a/static/images/agriculturalTrusteeship/insurance/shop_icon_see2.png b/static/images/agriculturalTrusteeship/insurance/shop_icon_see2.png
new file mode 100644
index 00000000..1193b1b1
Binary files /dev/null and b/static/images/agriculturalTrusteeship/insurance/shop_icon_see2.png differ
diff --git a/static/images/agriculturalTrusteeship/insurance/shop_needs_icon.png b/static/images/agriculturalTrusteeship/insurance/shop_needs_icon.png
new file mode 100644
index 00000000..2a8a1c92
Binary files /dev/null and b/static/images/agriculturalTrusteeship/insurance/shop_needs_icon.png differ
diff --git a/static/images/agriculturalTrusteeship/insurance/shop_needs_icon01.png b/static/images/agriculturalTrusteeship/insurance/shop_needs_icon01.png
new file mode 100644
index 00000000..aaf4fa95
Binary files /dev/null and b/static/images/agriculturalTrusteeship/insurance/shop_needs_icon01.png differ
diff --git a/static/images/agriculturalTrusteeship/insurance/shop_needs_icon02.png b/static/images/agriculturalTrusteeship/insurance/shop_needs_icon02.png
new file mode 100644
index 00000000..7191d829
Binary files /dev/null and b/static/images/agriculturalTrusteeship/insurance/shop_needs_icon02.png differ
diff --git a/static/images/agriculturalTrusteeship/insurance/shop_needs_icon03.png b/static/images/agriculturalTrusteeship/insurance/shop_needs_icon03.png
new file mode 100644
index 00000000..c8ba7d56
Binary files /dev/null and b/static/images/agriculturalTrusteeship/insurance/shop_needs_icon03.png differ