diff --git a/package-lock.json b/package-lock.json
index f1165a9..fb8aec7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5870,6 +5870,11 @@
"minimist": "^1.2.5"
}
},
+ "moment": {
+ "version": "2.29.1",
+ "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
+ "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
+ },
"move-concurrently": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
diff --git a/package.json b/package.json
index 9e81c26..e8c6618 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
"axios": "^0.21.1",
"element-ui": "^2.15.3",
"mavon-editor": "^2.9.1",
+ "moment": "^2.29.1",
"vue": "^2.5.2",
"vue-router": "^3.0.1"
},
diff --git a/src/api/index.js b/src/api/index.js
index 5596743..69ba1a2 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -88,3 +88,35 @@ export const getPrice = query => {
params: query
});
};
+// 挂牌公告列表
+export const assetNoticeList = query => {
+ return request({
+ url: '/api/user.Asset/assetNoticeList',
+ method: 'get',
+ params: query
+ });
+};
+// 资产详情
+export const assetInfo = query => {
+ return request({
+ url: '/api/user.Asset/assetInfo',
+ method: 'get',
+ params: query
+ });
+};
+// 判断是否能购买
+export const checkBuy = query => {
+ return request({
+ url: '/api/user.Order/checkBuy',
+ method: 'get',
+ params: query
+ });
+};
+// 资产分类详情
+export const assetClassInfo = query => {
+ return request({
+ url: '/api/user.Asset/assetClassInfo',
+ method: 'get',
+ params: query
+ });
+};
diff --git a/src/assets/img/order_process.png b/src/assets/img/order_process.png
new file mode 100644
index 0000000..7f47fff
Binary files /dev/null and b/src/assets/img/order_process.png differ
diff --git a/src/assets/img/order_stats.png b/src/assets/img/order_stats.png
new file mode 100644
index 0000000..5f18826
Binary files /dev/null and b/src/assets/img/order_stats.png differ
diff --git a/src/assets/img/order_stats1.png b/src/assets/img/order_stats1.png
new file mode 100644
index 0000000..b51737f
Binary files /dev/null and b/src/assets/img/order_stats1.png differ
diff --git a/src/components/common/Header.vue b/src/components/common/Header.vue
index a3bb655..e0fb4c2 100644
--- a/src/components/common/Header.vue
+++ b/src/components/common/Header.vue
@@ -161,7 +161,7 @@ export default {
}
},
created(){
- console.info(this.$route)
+ // console.info(this.$route)
this.activeClass=this.$route.path
this.login_type=localStorage.getItem('login_type')
this.UserConsole(this.login_type,1)
diff --git a/src/components/page/AssetDetails.vue b/src/components/page/AssetDetails.vue
index f2d4fa6..8197eab 100644
--- a/src/components/page/AssetDetails.vue
+++ b/src/components/page/AssetDetails.vue
@@ -3,45 +3,45 @@
-
东莞市芳华沉香园林景观有限公司20棵沉香树采集权(2年)
+
{{listingList.serial_name}}
评估价格:
- ¥ 99,980.00
+ ¥ {{listingList.cartellino_type==1 ? listingList.price: listingList.start_auction_money}}
资产类型:
- 房屋
+ {{listingList.asset_name}}
所在地:
- 广东省东莞市虎门区
+ {{listingList.address_name}}
交易方式:
- 线下交易(物流配送)
+ {{listingList.buy_mode==1 ? '线下交易' : '线上交易'}}({{listingList.goods_mode==1? '现场交付' :'物流配送'}})
有效日期:
- 2022年7月15日 14:00 前
+ {{listingList.endtime}} 前
数量:
-
- 棵(可购数量20棵)
+
+ {{listingList.asset_unit}}(可购数量{{listingList.surplus_count}}{{listingList.asset_unit}})
-
浏览记录 88次
+
浏览记录 {{listingList.views}}次
-
+
@@ -54,17 +54,49 @@
购买须知
历史评价
+ {{listingList.serial_content}}
diff --git a/src/components/page/Order/index.vue b/src/components/page/Order/index.vue
new file mode 100644
index 0000000..c415abd
--- /dev/null
+++ b/src/components/page/Order/index.vue
@@ -0,0 +1,44 @@
+
+
+
{{title[step]}}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/page/Order/orderDetails.vue b/src/components/page/Order/orderDetails.vue
new file mode 100644
index 0000000..f2d63a0
--- /dev/null
+++ b/src/components/page/Order/orderDetails.vue
@@ -0,0 +1,313 @@
+
+
+
+
+
订单信息
+
+
+ 联系地址:
+ 广东省 东莞市 虎门镇 华东区 讯发大厦2座B607
+
+
+ 联系人:
+ 陈阳明 13812345678
+
+
+ 订单编号:
+ 851245854512
+
+
+ 下单时间:
+ 2021-08-08 10:33:54
+
+
+ 挂牌方:
+ 东莞市芳华沉香园林景观有限公司
+
+
+ 摘牌方留言:
+
+
+
+
+
+
+

+
订单状态:已完成
+
+
双方交易已完成!
+
+ 您可以点击
+
+ 下载资产交易凭证
+
+
+
+
+
资产名称
+
资产编号
+
资产分类
+
资产单价
+
交易数量
+
金额小计
+
+
+
+

+
东莞市芳华沉香园林景观有限公司20棵沉香树采集权(2年)
+
+
+ GM-BZ-165254
+
+
+ 采集权
+
+
+ ¥ 10,000.00
+
+
+ 3
+
+
+ ¥ 30,000.00
+
+
+
+
+
+ 给挂牌方留言:
+
+
+
+
+
+ 契税: ¥ 1,500.00
+ ¥ 1,500.00
+
+
+ 印花税: ¥ 1,500.00
+ ¥ 1,500.00
+
+
+
+
+ 金额合计
+ ¥ 33,000.00
+
+
+
+
+
+
diff --git a/src/components/page/Order/orderPayment.vue b/src/components/page/Order/orderPayment.vue
new file mode 100644
index 0000000..3d97616
--- /dev/null
+++ b/src/components/page/Order/orderPayment.vue
@@ -0,0 +1,91 @@
+
+
+
请选择支付方式
+
+
+ 线下转账
+ 请使用平台账户登记的银行账号通过银行柜台转账至深圳文化产权交易所指定对公账户(开户行:中国农业银行 开户名称:深圳文化产权交易所 开户账号:6228480125447858588)
+
+
+ 网上银行
+ 跳转至网银时请认真核对收款方,以保障支付安全。(请使用平台账户登记的银行账号进行交易)
+
+
+
+
付款金额可能超限,限额如下
+
+

+
+
+
+
+
diff --git a/src/components/page/Order/orderPendingPay.vue b/src/components/page/Order/orderPendingPay.vue
new file mode 100644
index 0000000..b47184e
--- /dev/null
+++ b/src/components/page/Order/orderPendingPay.vue
@@ -0,0 +1,318 @@
+
+
+
+
+
订单信息
+
+
+ 联系地址:
+ 广东省 东莞市 虎门镇 华东区 讯发大厦2座B607
+
+
+ 联系人:
+ 陈阳明 13812345678
+
+
+ 订单编号:
+ 851245854512
+
+
+ 下单时间:
+ 2021-08-08 10:33:54
+
+
+ 挂牌方:
+ 东莞市芳华沉香园林景观有限公司
+
+
+ 摘牌方留言:
+
+
+
+
+
+
+

+
订单状态:等待摘牌方付款
+
+
+ 您还有
+ 23小时43分15秒
+ 来付款,超时订单自动关闭。订单关闭后3天内不能再重复购买同一个资产,为避免不便之处,请尽快付款!
+
+
+ 您可以
+
+ 或上传转账记录
+ 点击上传
+
+
+
+
+
资产名称
+
资产编号
+
资产分类
+
资产单价
+
交易数量
+
金额小计
+
+
+
+

+
东莞市芳华沉香园林景观有限公司20棵沉香树采集权(2年)
+
+
+ GM-BZ-165254
+
+
+ 采集权
+
+
+ ¥ 10,000.00
+
+
+ 3
+
+
+ ¥ 30,000.00
+
+
+
+
+
+ 给挂牌方留言:
+
+
+
+
+
+ 契税: ¥ 1,500.00
+ ¥ 1,500.00
+
+
+ 印花税: ¥ 1,500.00
+ ¥ 1,500.00
+
+
+
+
+ 金额合计
+ ¥ 33,000.00
+
+
+
+
+
+
diff --git a/src/components/page/Purchaser/myOrder.vue b/src/components/page/Purchaser/myOrder.vue
index 806eebd..973b5d1 100644
--- a/src/components/page/Purchaser/myOrder.vue
+++ b/src/components/page/Purchaser/myOrder.vue
@@ -56,7 +56,7 @@
¥ 31,080.00
已完成
@@ -103,6 +103,9 @@ export default {
handlePageChange(val) {
this.$set(this.query, 'page', val);
// this.getData();
+ },
+ orderDetails(){
+ this.$router.push({path:'/order/orderDetails',query:{step:4}})
}
}
}
@@ -236,5 +239,6 @@ export default {
}
.order_item_info_content_operation p{
margin-bottom: 5px;
+ cursor: pointer;
}
diff --git a/src/main.js b/src/main.js
index 6e78010..14e7157 100644
--- a/src/main.js
+++ b/src/main.js
@@ -5,11 +5,20 @@ import App from './App'
import router from './router'
import ElementUI from 'element-ui';
import 'element-ui/lib/theme-chalk/index.css';
+import moment from 'moment'
Vue.config.productionTip = false
Vue.use(ElementUI, {
size: 'small'
});
+Vue.filter('formatDate',function (input,fmtstring) {//当input为时间戳,需转为Number类型
+ if(input){
+ return moment(input*1000).format(fmtstring);
+}else{
+ return "";
+}
+});
+
/* eslint-disable no-new */
new Vue({
el: '#app',
diff --git a/src/router/index.js b/src/router/index.js
index adfad04..a5016b6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -113,6 +113,33 @@ export default new Router({
component: () => import(/* webpackChunkName: "dashboard" */ '../components/page/Hoster/Listing.vue'),
meta: { title: '资产挂牌' }
},
+ {
+ path: '/Order',
+ component: () => import(/* webpackChunkName: "dashboard" */ '../components/page/Order/index.vue'),
+ meta: { title: '订单' },
+ children:[
+ {
+ path: 'confirmOrder',
+ component: () => import(/* webpackChunkName: "dashboard" */ '../components/page/Order/confirmOrder.vue'),
+ meta: { title: '确认订单' }
+ },
+ {
+ path: 'orderPayment',
+ component: () => import(/* webpackChunkName: "dashboard" */ '../components/page/Order/orderPayment.vue'),
+ meta: { title: '订单付款' }
+ },
+ {
+ path: 'orderPendingPay',
+ component: () => import(/* webpackChunkName: "dashboard" */ '../components/page/Order/orderPendingPay.vue'),
+ meta: { title: '订单付款' }
+ },
+ {
+ path: 'orderDetails',
+ component: () => import(/* webpackChunkName: "dashboard" */ '../components/page/Order/orderDetails.vue'),
+ meta: { title: '订单详情' }
+ },
+ ]
+ },
]
}
]