Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pages.json

components/category-bar/category-bar.vue

@@ -6,7 +6,7 @@
                     <div class="clearfix navigation-bottom">
                         <div class="classification" id="bannerAllPro">
                             <div class="classification-text">
-                                <i class="icon-nav icon-nav-menu"></i> 全部商品分类
+                                <i class="el-icon-menu"></i> 全部商品分类
                             </div>
                             <!--全部商品分类开始-->
                             <div v-show="alwaysShowCategory || showCategory" class="banner-left" style="">
@@ -368,4 +368,7 @@ export default {
         }
     }
 }
+.el-icon-menu{
+  padding: 0 4px;
+}
 </style>

components/common-nav/common-nav.vue

@@ -12,8 +12,7 @@
 		            <li class="" :class="[currentPage.includes('user')  ? 'active' : '']"><a href="javascript:;" @click="jump('/pages/user/user')">个人中心</a></li>
 		            <li class="" :class="[currentPage.includes('contract')  ? 'active' : '']"><a href="javascript:;" @click="jump('/pages/contract/index')">买家中心</a></li>
 		            <li class="" :class="[currentPage.includes('store')  ? 'active' : '']"><a href="javascript:;" @click="jump('/pages/store/store')">卖家中心</a></li>
-<!--		            <li><a href="/hezuo/my.html">我的合作</a></li>-->
+		            <li class="" :class="[currentPage.includes('order')  ? 'active' : '']"><a href="javascript:;" @click="jump('/pages/order/order')">订单管理</a></li>
-		<!--            <li><a href="">金久信黄页</a></li>-->
 		            <li><a href="javascript:;" @click="jump('/pages/article/list')">金久信学堂</a></li>
 		        </ul>
 		    </div>

pages/index/index.vue

@@ -8,8 +8,7 @@
 		<view class="banner-outer">
 			<el-carousel height="365px">
 				<el-carousel-item v-for="item in 4" :key="item">
-                    <image class="carousel-img"
+					<image class="carousel-img" src="/static/images/336a76fbf9fe44a07b5cfd4caf6f8bb9.jpg"
-                           src="/static/images/336a76fbf9fe44a07b5cfd4caf6f8bb9.jpg"
 						mode="scaleToFill"></image>
 				</el-carousel-item>
 			</el-carousel>
@@ -55,15 +54,39 @@
 			</div>
 		</div>
 
+		<view class="register">
+			<view class="left">
+				<view class="text">
+					<text>免费注册！！</text>
+					<el-divider class="divider" direction="vertical" />
+					<view class="ad-text2">
+						<text class="yellow">成为平台会员 免费询价</text>
+						<text class="white">企业专享价 续重免运费 增值权益 免息账期 采购管家</text>
+					</view>
+				</view>
+
+			</view>
+			<view class="right">
+				<el-button type="warning" round>
+					立即注册
+					<i class="el-icon-arrow-right"></i>
+				</el-button>
+			</view>
+
+		</view>
+
+
+		<!--        <gap height="100" />-->
+
 		<div style="clear:both;width: 100%;"></div>
 
 		<!-- 询价列表 start -->
 		<view class="enquiry-outer">
-            <view class="" style="height: 40px;"></view>
+			<view class="" style="height: 20px;"></view>
 			<el-divider>
 				<view class="divider-text">最新询价信息</view>
 			</el-divider>
-            <view class="" style="height: 40px;"></view>
+			<view class="" style="height: 20px;"></view>
 			<div class="mod-inner2Listcenter clearfix sliper">
 				<ul class="clearfix">
 					<li v-for="(item, index) in enquirySheetData" class="inli-mask" :key="index"
@@ -88,19 +111,19 @@
 						</a>
 					</li>
 
-                    <div style="clear:both;width: 100%;"></div>
+					<div class="show-more"><i class="el-icon-view"></i>查看更多</div>
 				</ul>
 			</div>
 		</view>
 		<!-- 询价列表 end -->
 
 		<!-- 现货市场 start -->
-        <view class="" style="height: 40px;"></view>
+		<view class="" style="height: 20px;"></view>
 		<view class="spot-outer">
 			<el-divider>
 				<view class="spot-divider-text">现货市场</view>
 			</el-divider>
-            <view class="" style="height: 40px;"></view>
+			<view class="" style="height: 20px;"></view>
 			<view class="goods-list">
 				<view v-for="(item, index) in spotGoodsData" :key="index" class="goods"
 					:style="{marginRight:( index % 4 === 0 && index > 0) ? 0 : '25px'}">
@@ -115,17 +138,403 @@
 					<view v-if="item.user.accountType === 2" class="goods-company">{{ item.user.company.companyName }}
 					</view>
 					<el-button class="empty-bg-plain-btn"
-                               @click="vk.navigateTo('/pages/spot/goods/detail?id=' + item._id);"
+						@click="vk.navigateTo('/pages/spot/goods/detail?id=' + item._id);" type="primary" plain
-                               type="primary" plain size="small">立即查看
+						size="small">立即查看
 					</el-button>
 				</view>
 			</view>
-            <view class="text-center">
+			<div class="show-more"><i class="el-icon-view"></i>查看更多</div>
-                <el-button>查看更多</el-button>
-            </view>
 		</view>
 		<!-- 现货市场 end -->
-        <gap height="100"/>
+		<gap height="50" />
+
+		<!-- 合作商家 start -->
+		<view class="" style="height: 20px;"></view>
+		<view class="spot-outer">
+			<el-divider>
+				<view class="spot-divider-text">合作商家</view>
+			</el-divider>
+			<view class="" style="height: 20px;"></view>
+			<view class="goods-list">
+				<view v-for="(item, index) in spotGoodsData" :key="index" class="goods"
+					:style="{marginRight:( index % 4 === 0 && index > 0) ? 0 : '25px'}">
+					<view class="goods-title">{{ item.name }}</view>
+					<view class="goods-stock">库存：{{ item.stock }}吨</view>
+					<view class="goods-address">供货地：{{ item.addressStr }}</view>
+					<!--                    <view class="goods-image">-->
+					<!--                        <image :src="item.user.businessCard.logo" mode="aspectFit"></image>-->
+					<!--                    </view>-->
+					<view v-if="item.user.accountType === 1" class="goods-company">{{ item.user.person.personName }}
+					</view>
+					<view v-if="item.user.accountType === 2" class="goods-company">{{ item.user.company.companyName }}
+					</view>
+					<el-button class="empty-bg-plain-btn"
+						@click="vk.navigateTo('/pages/spot/goods/detail?id=' + item._id);" type="primary" plain
+						size="small">立即查看
+					</el-button>
+				</view>
+			</view>
+			<div class="show-more"><i class="el-icon-view"></i>查看更多</div>
+		</view>
+		<!-- 合作商家 end -->
+
+
+		<!-- 金久信服务商展示 start -->
+		<view class="w1200">
+			<view class="" style="height: 20px;"></view>
+			<el-divider>
+				<view class="divider-text">金久信服务商展示</view>
+			</el-divider>
+			<view class="" style="height: 20px;"></view>
+			<view class="server-card2">
+				<view class="item b1">
+					<i class="el-icon-lock"></i>
+					<view class="p4">
+						<el-button plain round size="mini">交易安全</el-button>
+					</view>
+				</view>
+				<view class="item b2">
+					<i class="el-icon-lock"></i>
+					<view class="p4">
+						<el-button plain round size="mini">代检代查</el-button>
+					</view>
+				</view>
+				<view class="item b3">
+					<i class="el-icon-lock"></i>
+					<view class="p4">
+						<el-button plain round size="mini">优势资源匹配</el-button>
+					</view>
+				</view>
+				<view class="item b4">
+					<i class="el-icon-lock"></i>
+					<view class="p4">
+						<el-button plain round size="mini">交易模式多元化</el-button>
+					</view>
+				</view>
+				<view class="item b5">
+					<i class="el-icon-lock"></i>
+					<view class="p4">
+						<el-button plain round size="mini">电子合同</el-button>
+					</view>
+				</view>
+			</view>
+		</view>
+
+
+		<!-- 合作商家 end -->
+
+		<!-- 交易模式 start -->
+		<view class="w1200">
+			<view class="" style="height: 20px;"></view>
+			<el-divider>
+				<view class="divider-text">交易模式</view>
+			</el-divider>
+			<view class="" style="height: 20px;"></view>
+			<el-row :gutter="10" class="wrap" justify="space-between">
+				<el-col :span="6">
+					<el-card shadow="hover" class="transaction-card">
+						<view class="item">
+							<view class="p1">
+								<i class="el-icon-lock"></i>
+								自主交易
+							</view>
+							<view class="p2">
+								<view class="line"></view>
+							</view>
+							<view class="p3">
+								<text>货款直付销售商</text>
+								<text>双方平台保证金</text>
+							</view>
+							<view class="p4">
+								<el-button plain round size="mini">交易流程</el-button>
+							</view>
+						</view>
+					</el-card>
+				</el-col>
+				<el-col :span="6">
+					<el-card shadow="hover" class="transaction-card">
+						<view class="item">
+							<view class="p1">
+								<i class="el-icon-key"></i>
+								金久信公正
+							</view>
+							<view class="p2">
+								<view class="line"></view>
+							</view>
+							<view class="p3">
+								<text>货款直付平台</text>
+								<text>交易成功后支付至销售商</text>
+							</view>
+							<view class="p4">
+								<el-button plain round size="mini">交易流程</el-button>
+							</view>
+						</view>
+					</el-card>
+				</el-col>
+				<el-col :span="6">
+					<el-card shadow="hover" class="transaction-card">
+						<view class="item">
+							<view class="p1">
+								<i class="el-icon-postcard"></i>
+								信誉采购
+							</view>
+							<view class="p2">
+								<view class="line"></view>
+							</view>
+							<view class="p3">
+								<text>平台接受信誉采购的销售商</text>
+								<text>进行交易、到期后结算</text>
+							</view>
+							<view class="p4">
+								<el-button plain round size="mini">交易流程</el-button>
+							</view>
+						</view>
+					</el-card>
+				</el-col>
+				<el-col :span="6">
+					<el-card shadow="hover" class="transaction-card">
+						<view class="item">
+							<view class="p1">
+								<i class="el-icon-medal"></i>
+								金久信自营
+							</view>
+							<view class="p2">
+								<view class="line"></view>
+							</view>
+							<view class="p3">
+								<text>货款直付平台</text>
+								<text>交易成功后支付至销售商</text>
+							</view>
+							<view class="p4">
+								<el-button plain round size="mini">交易流程</el-button>
+							</view>
+						</view>
+					</el-card>
+				</el-col>
+			</el-row>
+		</view>
+		<!-- 交易模式 end -->
+
+
+		<!-- 新闻资讯 start -->
+		<view class="w1200">
+			<el-row :gutter="10" class="wrap" justify="space-between">
+				<el-col :span="18">
+					<el-card shadow="hover" class="news-card">
+						<div slot="header" class="clearfix">
+							<span class="card-title">金久信·金融服务</span>
+							<el-button style="float: right; color: #BD3124;" size="mini">马上开通</el-button>
+						</div>
+						<div class="jrfw-img">
+							<image src="https://oss.wsdns.cn/20231207/a3ea8ffd7242453eb2242ffaaa89116d.png"
+								mode="widthFix"></image>
+						</div>
+					</el-card>
+				</el-col>
+				<el-col :span="6">
+					<el-card shadow="hover" class="news-card">
+						<div slot="header" class="clearfix">
+							<span class="card-title">最新入驻</span>
+						</div>
+						<ul class="news-list" style="line-height: 2em;">
+							<li>广西聚钱财实业有限公司</li>
+							<li>广西聚钱财实业有限公司2</li>
+							<li>广西聚钱财实业有限公司3</li>
+							<li>广西聚钱财实业有限公司4</li>
+							<li>广西聚钱财实业有限公司5</li>
+							<li>广西聚钱财实业有限公司5</li>
+							<li>广西聚钱财实业有限公司5</li>
+						</ul>
+					</el-card>
+				</el-col>
+			</el-row>
+		</view>
+		<!-- 新闻资讯 end -->
+
+		<!-- 买家入门 卖家入门 start -->
+		<view class="w1200">
+			<el-row :gutter="10" class="wrap" justify="space-between">
+				<el-col :span="12">
+					<el-card shadow="hover" class="news-card">
+						<div slot="header" class="clearfix">
+							<span class="card-title">买家入门</span>
+							<el-button style="float: right; padding: 3px 0; color: #999999;" type="text">更多></el-button>
+						</div>
+						<div class="content">
+							<div class="news-img">
+								<image src="http://jyx.gxwebsoft.com/public/index/images/xw1.jpg" mode="widthFix">
+								</image>
+							</div>
+							<div class="tabs">
+								<el-tabs type="card" v-model="buyerTabs" @tab-click="handleClick1">
+									<el-tab-pane label="常见问题" name="first">
+										<ul class="news-list">
+											<li>常见问题常见问题常见见问题常问题常见问题常见问题常见问题1</li>
+											<li>常见问题2</li>
+											<li>常见问题3</li>
+											<li>常见问题4</li>
+											<li>常见问题5</li>
+										</ul>
+									</el-tab-pane>
+									<el-tab-pane label="如何采购" name="second">
+										<ul class="news-list">
+											<li>如何采购</li>
+											<li>如何采购</li>
+											<li>如何采购</li>
+											<li>如何采购</li>
+											<li>如何采购</li>
+										</ul>
+									</el-tab-pane>
+								</el-tabs>
+							</div>
+						</div>
+					</el-card>
+				</el-col>
+				<el-col :span="12" class="wrap" justify="space-between">
+					<el-card shadow="hover" class="news-card">
+						<div slot="header" class="clearfix">
+							<span class="card-title">卖家入门</span>
+							<el-button style="float: right; padding: 3px 0; color: #999999;" type="text">更多></el-button>
+						</div>
+						<div class="content">
+							<div class="news-img">
+								<image src="http://jyx.gxwebsoft.com/public/index/images/xw2.jpg" mode="widthFix">
+								</image>
+							</div>
+							<div class="tabs">
+								<el-tabs type="card" v-model="sellerTabs" @tab-click="handleClick2">
+									<el-tab-pane label="常见问题" name="first">
+										<ul class="news-list">
+											<li>常见问题常见问题常见见问题常问题常见问题常见问题常见问题1</li>
+											<li>常见问题2</li>
+											<li>常见问题3</li>
+											<li>常见问题4</li>
+											<li>常见问题5</li>
+										</ul>
+									</el-tab-pane>
+									<el-tab-pane label="店铺管理" name="second">
+										<ul class="news-list">
+											<li>如何采购</li>
+											<li>如何采购</li>
+											<li>如何采购</li>
+											<li>如何采购</li>
+											<li>如何采购</li>
+										</ul>
+									</el-tab-pane>
+								</el-tabs>
+							</div>
+						</div>
+					</el-card>
+				</el-col>
+			</el-row>
+		</view>
+		<!-- 买家入门 卖家入门 end -->
+
+		<!-- 资讯中心 start -->
+		<view class="w1200">
+			<view class="" style="height: 20px;"></view>
+			<el-divider>
+				<view class="divider-text">资讯中心</view>
+			</el-divider>
+			<view class="" style="height: 20px;"></view>
+			<el-row :gutter="10" class="wrap" justify="space-between">
+				<el-col :span="6">
+					<el-card shadow="hover">
+						<div slot="header" class="clearfix">
+							<span>市场信息</span>
+						</div>
+						<ul class="news-list">
+							<li>新闻资讯</li>
+							<li>新闻资讯</li>
+							<li>新闻资讯</li>
+							<li>新闻资讯</li>
+							<li>新闻资讯</li>
+						</ul>
+					</el-card>
+				</el-col>
+				<el-col :span="6">
+					<el-card shadow="hover">
+						<div slot="header" class="clearfix">
+							<span>期货信息</span>
+						</div>
+						<ul class="news-list">
+							<li>新闻资讯</li>
+							<li>新闻资讯</li>
+							<li>新闻资讯</li>
+							<li>新闻资讯</li>
+							<li>新闻资讯</li>
+						</ul>
+					</el-card>
+				</el-col>
+				<el-col :span="6">
+					<el-card shadow="hover">
+						<div slot="header" class="clearfix">
+							<span>行情分析</span>
+						</div>
+						<ul class="news-list">
+							<li>新闻资讯</li>
+							<li>新闻资讯</li>
+							<li>新闻资讯</li>
+							<li>新闻资讯</li>
+							<li>新闻资讯</li>
+						</ul>
+					</el-card>
+				</el-col>
+				<el-col :span="6">
+					<el-card shadow="hover">
+						<div slot="header" class="clearfix">
+							<span>行业动态</span>
+						</div>
+						<ul class="news-list">
+							<li>新闻资讯</li>
+							<li>新闻资讯</li>
+							<li>新闻资讯</li>
+							<li>新闻资讯</li>
+							<li>新闻资讯</li>
+						</ul>
+					</el-card>
+				</el-col>
+			</el-row>
+		</view>
+		<!-- 资讯中心 end -->
+
+
+		<view class="ad-bottom">
+			<el-row :gutter="10" class="wrap" justify="space-between">
+				<el-col :span="12">
+					<view class="item">
+						<image src="http://jyx.gxwebsoft.com/uploads/20210506/8a6b689d22ffcb382dad758e15e933f9.jpg"
+							mode="widthFix" />
+					</view>
+				</el-col>
+				<el-col :span="12">
+					<view class="item">
+						<image src="http://jyx.gxwebsoft.com/uploads/20210506/13a1ee4c52fda80a7e03080198944671.jpg"
+							mode="widthFix" />
+					</view>
+				</el-col>
+				<el-col :span="12">
+					<view class="item">
+						<image src="http://jyx.gxwebsoft.com/uploads/20210521/41e761a2f98cdf5a7e873ead16fb47eb.jpg"
+							mode="widthFix" />
+					</view>
+				</el-col>
+				<el-col :span="12">
+					<view class="item">
+						<image src="http://jyx.gxwebsoft.com/uploads/20210506/8e24bf5d6b29858a8c5b1256b29ffadc.jpg"
+							mode="widthFix" />
+					</view>
+				</el-col>
+			</el-row>
+		</view>
+
+		<!-- 		<el-card class="register-count">
+			金久信已帮助6,157,952位企业解决产品供需难题
+			在线提交您的需求，即享专业服务
+		</el-card> -->
+
+
+		<gap height="50" />
 		<common-footer></common-footer>
 		<right-bar></right-bar>
 	</view>
@@ -133,9 +542,13 @@
 
 
 <script>
+	import Gap from "../../components/gap/gap.vue";
 
-var vk = uni.vk;
+	var vk = uni.vk;
-export default {
+	export default {
+		components: {
+			Gap
+		},
 		data() {
 			// 页面数据变量
 			return {
@@ -146,6 +559,8 @@ export default {
 				// 表单请求数据
 				form1: {},
 				scrollTop: 0,
+				buyerTabs: 'first',
+				sellerTabs: 'first'
 			}
 		},
 		onPageScroll(e) {
@@ -219,71 +634,154 @@ export default {
 			},
 			pageTo(path) {
 				vk.navigateTo(path);
+			},
+			handleClick1() {
+
+			},
+			handleClick2() {
+
 			}
 		},
 		// 监听器
 		watch: {},
 		// 计算属性
 		computed: {}
-}
+	}
 </script>
 <style lang="scss" scoped>
-.banner-outer {
+	.w1200 {
-}
+		width: 1200px;
+		margin: 20px auto;
+	}
 
-.carousel-img {
+	.register {
+		background-color: #3d5fda;
+		width: 1200px;
+		height: 88px;
+		margin: 20px auto;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+
+		.left {
+			display: flex;
+			align-items: center;
+
+			.text {
+				display: flex;
+				align-items: center;
+				font-size: 30px;
+				color: #ffffff;
+				padding-left: 50px;
+
+				.divider {
+					margin: 0 30px;
+					transform: translateX(-10%);
+				}
+
+				.ad-text2 {
+					display: flex;
+					flex-direction: column;
+					font-size: 18px;
+
+					// transform: rotate(0.1turn);
+					.yellow {
+						color: #fcb800;
+						font-size: 25px;
+					}
+
+					.white {
+						color: #ffffff;
+					}
+				}
+			}
+		}
+
+		.right {
+			padding-right: 50px;
+			display: flex;
+		}
+	}
+
+	.banner-outer {}
+
+	.carousel-img {
 		width: 760px;
 		height: 365px;
 		margin: 0 auto;
-}
+	}
 
-.el-divider__text {
+	.el-divider__text {
 		background-color: initial;
-}
+	}
 
-.el-carousel__item {
+	.el-carousel__item {
 		text-align: center;
-}
+	}
 
-.divider-text {
+	.divider-text {
 		color: #393735;
 		font-size: 28px;
 		padding: 0 20px;
 		background-color: #f4f4f4;
 		font-weight: bold;
-}
+	}
 
-.spot-divider-text {
+	.spot-divider-text {
 		color: #393735;
 		font-size: 28px;
 		font-weight: bold;
 		padding: 0 20px;
 		background-color: white;
-}
+	}
 
-.enquiry-outer {
+	.enquiry-outer {
 		width: 1200px;
 		margin: 0px auto;
-}
 
-.enquiry-outer .mod-inner2Listcenter {
+		.inli-mask {
+			padding: 20px;
+			min-height: 120px;
+		}
+	}
+
+	.show-more {
+		clear: both;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: #ffffff;
+		background-color: #BD3124;
+		text-align: center;
+		width: 150px;
+		margin: 0 auto;
+		height: 40px;
+		cursor: pointer;
+
+		.el-icon-view {
+			font-size: 18px;
+			padding-right: 5px;
+		}
+	}
+
+	.enquiry-outer .mod-inner2Listcenter {
 
 		padding: 20px 0;
-}
+	}
 
-.spot-outer {
+	.spot-outer {
 		width: 1200px;
 		margin: 0px auto;
 		background-color: white;
 		padding: 50px;
-}
+	}
 
-.goods-list {
+	.goods-list {
 		display: flex;
 		flex-wrap: wrap;
-}
+	}
 
-.goods {
+	.goods {
 		width: 200px;
 		//height: 280px;
 		background-color: #FFFFFF;
@@ -350,5 +848,164 @@ export default {
 			color: gray;
 		}
 
-}
+	}
+
+	.detail-num .company {
+		font-size: 15px !important;
+		line-height: 2em;
+	}
+
+	.ad-bottom {
+		width: 1200px;
+		margin: 40px auto;
+
+		.item {
+			margin: 3px 0;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.wrap {
+			flex-wrap: wrap;
+		}
+	}
+
+	.register-count {
+		width: 1200px;
+		margin: auto;
+	}
+
+	.card-title {
+		color: #BD3124;
+	}
+
+	.clearfix {
+		font-size: 16px;
+		font-weight: 500;
+	}
+
+	.news-card {
+		.news-img {
+			image {
+				width: 200px;
+			}
+		}
+
+		.content {
+			display: flex;
+
+			.tabs {
+				padding: 0 20px;
+			}
+
+			.news-list {
+				ul {}
+
+				li {
+					width: 330px;
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+				}
+			}
+		}
+	}
+
+	.jrfw-img {
+		image {
+			width: 100%;
+		}
+	}
+
+	.transaction-card {
+		.item {
+			display: flex;
+			flex-direction: column;
+			justify-content: space-around;
+			align-items: center;
+			height: 150px;
+
+			.p1 {
+				font-size: 20px;
+				font-weight: 500;
+
+				i {
+					font-size: 20px;
+					padding: 0 4px;
+				}
+			}
+
+			.p2 {
+				.line {
+					width: 40px;
+					height: 3px;
+					border-radius: 100px;
+					background-color: #BD3124;
+				}
+			}
+
+			.p3 {
+				display: flex;
+				flex-direction: column;
+				text-align: center;
+				font-size: 15px;
+				color: #666;
+			}
+		}
+	}
+
+	.server-card2 {
+		display: flex;
+		justify-content: space-between;
+
+		.item {
+			width: 240px;
+			height: 270px;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			i {
+				font-size: 30px;
+				color: #ffffff;
+			}
+			
+			.p4 {
+				margin-top: 20px;
+			}
+		}
+
+		.b1 {
+			background: url('http://jyx.gxwebsoft.com/public/index/images/god1hover.jpg');
+			background-position: center;
+			background-size: 150%;
+		}
+
+		.b2 {
+			background: url('http://jyx.gxwebsoft.com/public/index/images/god2hover.jpg');
+			background-position: center;
+			background-size: 150%;
+		}
+
+		.b3 {
+			background: url('http://jyx.gxwebsoft.com/public/index/images/god3hover.jpg');
+			background-position: center;
+			background-size: 150%;
+		}
+
+		.b4 {
+			background: url('http://jyx.gxwebsoft.com/public/index/images/god4hover.jpg');
+			background-position: center;
+			background-size: 150%;
+		}
+
+		.b5 {
+			background: url('http://jyx.gxwebsoft.com/public/index/images/god5hover.jpg');
+			background-position: center;
+			background-size: 150%;
+		}
+	}
 </style>

pages/order/order.vue

@@ -0,0 +1,825 @@
+<template>
+	<view class="">
+		<top-bar></top-bar>
+		<common-nav></common-nav>
+		<view class="w-1200">
+			<el-row :gutter="20">
+				<el-col :span="6">
+					<el-menu @select="menuSelect" :default-active="menuIndex" class="el-menu-vertical-demo">
+						<el-menu-item index="0">
+							<i class="el-icon-edit"></i>
+							<span slot="title">我卖出的</span>
+						</el-menu-item>
+						<el-menu-item index="1">
+							<i class="el-icon-warning-outline"></i>
+							<span slot="title">我购买的</span>
+						</el-menu-item>
+						<el-menu-item index="2">
+							<i class="el-icon-circle-check"></i>
+							<span slot="title">线下交易</span>
+						</el-menu-item>
+					</el-menu>
+				</el-col>
+				<el-col :span="18">
+					<el-card shadow="never">
+						<el-tabs v-model="activeName" @tab-click="handleClick">
+							<el-tab-pane label="全部(4)" name="all">
+							</el-tab-pane>
+							<el-tab-pane label="待付款(2)" name="待付款"></el-tab-pane>
+							<el-tab-pane label="待发货(1)" name="待发货"></el-tab-pane>
+							<el-tab-pane label="待收货" name="待收货"></el-tab-pane>
+							<el-tab-pane label="待退款" name="待退款"></el-tab-pane>
+							<el-tab-pane label="已取消" name="已取消"></el-tab-pane>
+							<el-tab-pane label="已完成" name="已完成"></el-tab-pane>
+						</el-tabs>
+						<el-descriptions border size="small">
+							<el-descriptions-item label="订单编号"><input placeholder="请输入订单编号" /></el-descriptions-item>
+							<el-descriptions-item label="下单时间"><input placeholder="下单时间" /></el-descriptions-item>
+							<el-descriptions-item label="采购商品"><input placeholder="请输入采购商品" /></el-descriptions-item>
+							<el-descriptions-item label="交易方式">
+								<el-select v-model="value" size="small" placeholder="请选择">
+									<el-option v-for="item in options" :key="item.value" :label="item.label"
+										:value="item.value">
+									</el-option>
+								</el-select>
+							</el-descriptions-item>
+							<el-descriptions-item label="买家名称">
+								<input placeholder="请输入买家名称" />
+							</el-descriptions-item>
+							<el-descriptions-item label="发票管理">
+								<el-select size="small" v-model="value2" placeholder="请选择">
+									<el-option v-for="item in options2" :key="item.value" :label="item.label"
+										:value="item.value">
+									</el-option>
+								</el-select>
+							</el-descriptions-item>
+
+						</el-descriptions>
+					</el-card>
+					<el-card shadow="never" style="margin-top: 20px;">
+						<template v-if="menuIndex === '0'">
+							<view class="order-list">
+								<view class="item">
+									<view class="info">
+										<view class="title">直缝焊管 Q235B 20米 不限</view>
+										<view class="sub-title">
+											<text>订单编号：JJX008456456</text>
+											<text>创建时间：2023-05-13 10:30:55</text>
+											<text>卖家：广西某某有限责任公司</text>
+										</view>
+										<view class="action">
+											<view class="btn-buy">联系买家</view>
+											<el-divider direction="vertical"></el-divider>
+											<view class="btn-close">取消订单</view>
+										</view>
+									</view>
+									<view class="tool">
+										<view class="price">
+											<text class="red">￥22311</text>
+											<text>总金额</text>
+										</view>
+										<view class="status">
+											<view class="icon">
+												<img src="https://oss.wsdns.cn/20231207/010a7e26b1294284a63b890c46031225.png" alt="" />
+											</view>
+										</view>
+									</view>
+								</view>
+
+								<view class="item">
+									<view class="info">
+										<view class="title">直缝焊管 Q235B 20米 不限</view>
+										<view class="sub-title">
+											<text>订单编号：JJX008456456</text>
+											<text>创建时间：2023-05-13 10:30:55</text>
+											<text>卖家：广西某某有限责任公司</text>
+										</view>
+										<view class="action">
+											<view class="btn-buy">联系买家</view>
+											<el-divider direction="vertical"></el-divider>
+											<view class="btn-close">取消订单</view>
+										</view>
+									</view>
+									<view class="tool">
+										<view class="price">
+											<text class="red">￥22311</text>
+											<text>总金额</text>
+										</view>
+										<view class="status">
+											<view class="icon">
+												<img src="https://oss.wsdns.cn/20231207/010a7e26b1294284a63b890c46031225.png" alt="" />
+											</view>
+										</view>
+									</view>
+								</view>
+
+								<view class="item">
+									<view class="info">
+										<view class="title">直缝焊管 Q235B 20米 不限</view>
+										<view class="sub-title">
+											<text>订单编号：JJX008456456</text>
+											<text>创建时间：2023-05-13 10:30:55</text>
+											<text>卖家：广西某某有限责任公司</text>
+										</view>
+										<view class="action">
+											<view class="btn-buy">联系买家</view>
+											<el-divider direction="vertical"></el-divider>
+											<view class="btn-close">取消订单</view>
+										</view>
+									</view>
+									<view class="tool">
+										<view class="price">
+											<text class="red">￥22311</text>
+											<text>总金额</text>
+										</view>
+										<view class="status">
+											<view class="icon">
+												<img src="https://oss.wsdns.cn/20231207/010a7e26b1294284a63b890c46031225.png" alt="" />
+											</view>
+										</view>
+									</view>
+								</view>
+								<view class="paginatio">
+									<el-pagination
+									  background
+									  layout="prev, pager, next"
+									  :total="1000">
+									</el-pagination>
+								</view>
+							</view>
+						</template>
+						<template v-if="menuIndex === '1'">
+							我购买的订单列表
+						</template>
+						<template v-if="menuIndex === '2'">
+              <view class="transaction-list">
+                <view class="item">
+                  <view class="info">
+                    <view class="title">
+						<view class="name">直缝钢管 <el-tag effect="plain" size="mini" class="el-tag">线下交易</el-tag></view>
+						<view class="buyer"><text>买家：</text><a>网宿信息科技有限公司</a></view>
+						<view class="seller"><text>卖家：</text><a>金久信交易平台</a></view>
+					</view>
+					<view class="caigou">
+						<view class="item">
+							<view class="icon">
+								<i class="el-icon-shopping-bag-1"></i>
+							</view>
+							<view class="infos">
+								<view class="name">采购量</view>
+								<view class="unit">500吨</view>
+							</view>
+						</view>
+						<view class="item" style="margin-left: 100px;">
+							<view class="icon">
+								<i class="el-icon-location-outline"></i>
+							</view>
+							<view class="infos">
+								<view class="name">交易地址</view>
+								<view class="unit">广西壮族自治区-南宁市-五象航洋城</view>
+							</view>
+						</view>
+					</view>
+                    <view class="sub-title">
+                      <text>交易编号：JJX008456456</text>
+                      <text>发布时间：2023-05-13 10:30:55</text>
+                    </view>
+                  </view>
+                  <view class="tool">
+                    <view class="btn">
+						<el-button size="small" plain style="width: 120px;">收到的报价列表</el-button>
+                    </view>
+                    <view class="btn">
+						<el-button size="small" type="danger" style="width: 120px;">查看交易对象</el-button>
+                    </view>
+                    <view class="btn">
+						<el-button size="small" type="text" style="width: 120px;">共收到4个报价</el-button>
+                    </view>
+                  </view>
+                </view>
+                <view class="paginatio">
+                  <el-pagination
+                      background
+                      layout="prev, pager, next"
+                      :total="1000">
+                  </el-pagination>
+                </view>
+              </view>
+						</template>
+					</el-card>
+				</el-col>
+			</el-row>
+
+		</view>
+		<common-footer></common-footer>
+
+		<el-dialog :visible.sync="form1.props.show">
+			<vk-data-form ref="form1" v-model="form1.data" :action="form1.props.action" :columns="form1.props.columns"
+				:rules="form1.props.rules" :form-type="form1.props.formType" :loading.sync="form1.props.loading"
+				:auto-close="true" label-width="140px" @success="onFormSuccess"></vk-data-form>
+		</el-dialog>
+
+		<!-- 上传合同弹窗 -->
+	</view>
+</template>
+
+<script>
+	import {
+		Agreement
+	} from "@icon-park/vue";
+
+	export default {
+		components: {
+			Agreement
+		},
+		data() {
+			return {
+				activeName: 'all',
+				value: '',
+				options: [{
+					value: '自主交易',
+					label: '自主交易'
+				}],
+				value2: '',
+				options2: [{
+					value: '未开发票',
+					label: '自主交易'
+				}],
+				pageIndex: 1,
+				menuIndex: '0',
+				isSign: false,
+				formData: {
+					status: 0,
+					tradeMethod: null
+				},
+				tableData: {},
+				// 表单相关开始-----------------------------------------------------------
+				form1: {
+					// 表单请求数据，此处可以设置默认值
+					data: {
+						contractId: '',
+						signEndDate: '',
+						title: '',
+						contractFile: '',
+						buyerSignKeyword: '',
+						sellerSignKeyword: '',
+						otherFile: '',
+					},
+					// 表单属性
+					props: {
+						// 表单请求地址
+						action: 'client/contract/kh/launch',
+						// 表单字段显示规则
+						columns: [{
+								key: "title",
+								title: "标题",
+								type: "text"
+							},
+							{
+								key: "signEndDate",
+								title: "签署截止日期",
+								type: "date",
+								pickerOptions: {
+									disabledDate: (date) => {
+										const now = new Date()
+										return now > date
+									}
+								}
+
+							},
+							{
+								key: "contractFile",
+								title: "签署文档",
+								type: "file",
+								limit: 1,
+								accept: ".pdf",
+								tips: "仅支持PDF文件",
+							},
+							{
+								key: "buyerSignKeyword",
+								title: "买家签章关键字",
+								type: "text",
+								tips: '关键字为文档中的文字内容（要能使用ctrl+f搜索到）。法大大按此关键字进行签章位置的定位，将电子章盖在这个关键字上面。凡出现关键字的地方均会盖上指定用户的电子章，建议关键字在合同中保持唯一。'
+							},
+							{
+								key: "sellerSignKeyword",
+								title: "卖家签章关键字",
+								type: "text",
+								tips: '关键字为文档中的文字内容（要能使用ctrl+f搜索到）。法大大按此关键字进行签章位置的定位，将电子章盖在这个关键字上面。凡出现关键字的地方均会盖上指定用户的电子章，建议关键字在合同中保持唯一。'
+							},
+							{
+								key: "otherFile",
+								title: "附件",
+								type: "file"
+							},
+						],
+						// 表单验证规则
+						rules: {
+							title: [{
+								required: true,
+								message: "标题不能为空",
+								trigger: "change"
+							}, ],
+							signEndDate: [{
+								required: true,
+								message: "签署截止日期不能为空",
+								trigger: "change"
+							}],
+							buyerSignKeyword: [{
+								required: true,
+								message: "买家签章关键字不能为空",
+								trigger: "change"
+							}],
+							sellerSignKeyword: [{
+								required: true,
+								message: "卖家签章关键字不能为空",
+								trigger: "change"
+							}],
+							contractFile: [{
+								required: true,
+								message: "签署文档不能为空",
+								trigger: "change"
+							}, ]
+						},
+						// add 代表添加 update 代表修改
+						formType: "",
+						// 表单是否在请求中
+						loading: false,
+						// 是否显示表单1 的弹窗
+						show: false
+					}
+				},
+				form2: {
+					// 表单请求数据，此处可以设置默认值
+					data: {
+						contractId: '',
+						signEndDate: '',
+						title: '',
+						contractFile: '',
+						buyerSignKeyword: '',
+						sellerSignKeyword: '',
+						otherFile: '',
+					},
+					// 表单属性
+					props: {
+						// 表单请求地址
+						action: 'client/contract/kh/addSign',
+						// 表单字段显示规则
+						columns: [{
+								key: "title",
+								title: "标题",
+								type: "text"
+							},
+							{
+								key: "phone",
+								title: "对方手机号",
+								type: "text"
+							},
+							{
+								key: "userType",
+								title: "对方身份",
+								type: "select",
+								data: [{
+										value: 1,
+										label: "买家"
+									},
+									{
+										value: 2,
+										label: "卖家"
+									}
+								]
+							},
+							{
+								key: "signEndDate",
+								title: "签署截止日期",
+								type: "date",
+								pickerOptions: {
+									disabledDate: (date) => {
+										const now = new Date()
+										return now > date
+									}
+								}
+							},
+							{
+								key: "contractFile",
+								title: "签署文档",
+								type: "file",
+								limit: 1,
+								accept: ".pdf",
+								tips: "仅支持PDF文件",
+							},
+							{
+								key: "buyerSignKeyword",
+								title: "买家签章关键字",
+								type: "text",
+								tips: '关键字为文档中的文字内容（要能使用ctrl+f搜索到）。法大大按此关键字进行签章位置的定位，将电子章盖在这个关键字上面。凡出现关键字的地方均会盖上指定用户的电子章，建议关键字在合同中保持唯一。'
+							},
+							{
+								key: "sellerSignKeyword",
+								title: "卖家签章关键字",
+								type: "text",
+								tips: '关键字为文档中的文字内容（要能使用ctrl+f搜索到）。法大大按此关键字进行签章位置的定位，将电子章盖在这个关键字上面。凡出现关键字的地方均会盖上指定用户的电子章，建议关键字在合同中保持唯一。'
+							},
+							{
+								key: "otherFile",
+								title: "附件",
+								type: "file"
+							},
+						],
+						// 表单验证规则
+						rules: {
+							title: [{
+								required: true,
+								message: "标题不能为空",
+								trigger: "change"
+							}, ],
+							phone: [{
+								required: true,
+								message: "标题不能为空",
+								trigger: "change"
+							}, ],
+							signEndDate: [{
+								required: true,
+								message: "签署截止日期不能为空",
+								trigger: "change"
+							}],
+							buyerSignKeyword: [{
+								required: true,
+								message: "买家签章关键字不能为空",
+								trigger: "change"
+							}],
+							sellerSignKeyword: [{
+								required: true,
+								message: "卖家签章关键字不能为空",
+								trigger: "change"
+							}],
+							contractFile: [{
+								required: true,
+								message: "签署文档不能为空",
+								trigger: "change"
+							}, ]
+						},
+						// add 代表添加 update 代表修改
+						formType: "",
+						// 表单是否在请求中
+						loading: false,
+						// 是否显示表单1 的弹窗
+						show: false
+					}
+				},
+				// 表单相关结束-----------------------------------------------------------
+			}
+		},
+		onLoad(options) {
+			if (options.tab) {
+				if (options.tab === 'sign') {
+					this.isSign = true
+				} else {
+					this.menuIndex = String(options.tab)
+					this.formData.status = Number(options.tab)
+					this.isSign = false
+					this.query(1)
+				}
+			}
+		},
+		methods: {
+			menuSelect(e) {
+				this.menuIndex = String(e)
+				this.formData.status = Number(e)
+				this.isSign = false
+				this.query(1)
+			},
+			selectSign() {
+				this.isSign = true
+				this.menuIndex = ''
+			},
+			async query(pageIndex) {
+				this.tableData = await vk.callFunction({
+					url: 'client/contract/kh/getList',
+					title: '请求中...',
+					data: {
+						pageIndex,
+						pageSize: 10,
+						status: this.formData.status
+					},
+
+				});
+			},
+			/**
+			 * 创建合同
+			 * @param contract
+			 */
+			createContract(contract) {
+				this.form1.data.contractId = contract._id
+				this.form1.props.action = 'client/contract/kh/launch'
+				this.form1.props.show = true
+			},
+			async changeContract(contract) {
+				this.form1.data.contractId = contract._id
+				const res = await vk.callFunction({
+					url: 'client/contract/kh/getDetail',
+					title: '请求中...',
+					data: {
+						contractId: contract._id
+					},
+				});
+				this.form1.data.signEndDate = res.signEndDate
+				this.form1.data.title = res.docTitle
+				this.form1.data.contractFile = res.contractBase
+				this.form1.data.buyerSignKeyword = res.buyerSignKeyword
+				this.form1.data.sellerSignKeyword = res.sellerSignKeyword
+				this.form1.data.otherFile = res.otherFile
+				this.form1.props.show = true
+			},
+			onFormSuccess() {
+				this.form1.props.show = false
+				this.form1.data.contractId = null
+				this.formData.status = 1
+				this.menuIndex = '1'
+				this.isSign = false
+				this.$refs.form2.resetForm()
+				this.query(1)
+			},
+			/**
+			 * 签署合同
+			 * @param {Object} contract
+			 */
+			extSign(contract) {
+				vk.callFunction({
+					url: 'client/contract/kh/extSign',
+					title: '请求中...',
+					data: {
+						contractId: contract._id
+					},
+					success: (res) => {
+						window.open(res.data)
+					}
+				});
+			},
+			viewContract(contract) {
+				vk.callFunction({
+					url: 'client/contract/kh/viewContract',
+					title: '请求中...',
+					data: {
+						contractId: contract._id
+					},
+					success: (res) => {
+						window.open(res.data)
+						this.query(1)
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.w-1200 {
+		width: 1200px;
+		margin: 20px auto;
+	}
+
+	.contract-list {
+		background-color: #FFFFFF;
+		padding: 10px 20px 20px;
+	}
+
+	.order-list{
+		display: flex;
+		flex-direction: column;
+		.item{
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 10px 0;
+			border-bottom: 1px solid #f3f3f3;
+			.info{
+				.title{
+					font-size: 16px;
+					font-weight: bold;
+					line-height: 2em;
+          .el-tag{
+            margin-left: 10px;
+          }
+				}
+				.sub-title{
+					color: #999999;
+				}
+				.action{
+					padding: 10px 0;
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					.btn-buy,.btn-close{
+						color: #A92924;
+					}
+				}
+			}
+			.tool{
+				display: flex;
+				background-color: #f3f3f3;
+				.price{
+					margin:0 20px;
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+					align-items: center;
+					.red{
+						font-size: 16px;
+						color: #A92924;
+						font-weight: bold;
+					}
+				}
+				.status{
+					.icon{
+						margin:0 20px;
+						img{
+							width: 100px;
+						}
+					}
+				}
+			}
+		}
+	}
+  .transaction-list{
+    display: flex;
+    flex-direction: column;
+    .item{
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 10px 0;
+      border-bottom: 1px solid #f3f3f3;
+      .info{
+        .title{
+		  display: flex;
+          font-size: 16px;
+          font-weight: bold;
+          line-height: 2em;
+		  .buyer,.seller{
+				font-size: 14px;
+				font-weight: normal;
+			    display: flex;
+				margin: 0 30px;
+		  }
+          .el-tag{
+            margin-left: 10px;
+          }
+        }
+		.caigou{
+			display: flex;
+			align-items: center;
+			.item{
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				padding: 10px 0;
+				border: none;
+				.icon{
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					margin: 10px;
+					background-color: #f3f3f3;
+					padding: 10px;
+					border-radius: 100px;
+					.el-icon-shopping-bag-1,.el-icon-location-outline{
+						font-size: 30px;
+					}
+				}
+				.infos{
+					display: flex;
+					flex-direction: column;
+					.unit{
+						color: #A92924
+					}
+				}
+			}
+		}
+        .sub-title{
+          color: #999999;
+        }
+        .action{
+          padding: 10px 0;
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+          .btn-buy,.btn-close{
+            color: #A92924;
+          }
+        }
+      }
+      .tool{
+        display: flex;
+		width: 180px;
+		align-items: center;
+		justify-content: space-around;
+		flex-direction: column;
+		.btn{
+			margin: 5px 0;
+		}
+        .price{
+          margin:0 20px;
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+          align-items: center;
+          .red{
+            font-size: 16px;
+            color: #A92924;
+            font-weight: bold;
+          }
+        }
+        .status{
+          .icon{
+            margin:0 20px;
+            img{
+              width: 100px;
+            }
+          }
+        }
+      }
+    }
+  }
+	.paginatio {
+		margin: 20px auto;
+		display: flex;
+		justify-content: center;
+	}
+
+
+	.contract-box {
+		display: flex;
+		justify-content: space-between;
+		border-bottom: solid 1px #e8e8e8;
+		padding: 10rpx 0;
+	}
+
+	.contract-left {}
+
+	.contract-right {
+		text-align: right;
+		font-size: 13px;
+	}
+
+	.trade-method {
+		display: flex;
+		margin-bottom: 20px;
+		border-bottom: solid 2px #f4f4f4;
+	}
+
+	.trade-method-item {
+		cursor: pointer;
+		font-size: 18px;
+		margin-right: 15px;
+		height: 40px;
+		line-height: 40px;
+	}
+
+	.trade-method-item.active {
+		color: #A92924;
+		border-bottom: solid 2px #A92924;
+	}
+
+	.contract-left-top {
+		display: flex;
+		align-items: center;
+
+	}
+
+	.contract-product {
+		margin: 0 10px;
+	}
+
+	.contract-left-center {
+		height: 40px;
+		display: flex;
+		justify-content: flex-start;
+		align-items: flex-start;
+		color: #999999;
+		font-size: 12px;
+		flex-direction: column;
+		margin-top: 5px;
+	}
+
+	.contract-left-bottom {
+		display: flex;
+	}
+
+	.contract-status {
+		display: flex;
+	}
+
+	.contract-status-tag {
+		margin-left: 2px;
+	}
+
+	.sign {
+		padding: 20px 20px 20px 25px;
+		font-size: 14px;
+
+		.icon {
+			line-height: 18px;
+		}
+	}
+</style>

pages/store/store.vue

@@ -8,15 +8,11 @@
 					<el-menu @select="menuSelect" :default-active="menuIndex" class="el-menu-vertical-demo">
 						<el-menu-item index="0">
 							<i class="el-icon-edit"></i>
-							<span slot="title">我卖出的</span>
+							<span slot="title">现货列表</span>
 						</el-menu-item>
 						<el-menu-item index="1">
 							<i class="el-icon-warning-outline"></i>
-							<span slot="title">我购买的</span>
+							<span slot="title">询价单管理</span>
-						</el-menu-item>
-						<el-menu-item index="2">
-							<i class="el-icon-circle-check"></i>
-							<span slot="title">线下交易</span>
 						</el-menu-item>
 					</el-menu>
 				</el-col>
@@ -25,134 +21,162 @@
 						<el-tabs v-model="activeName" @tab-click="handleClick">
 							<el-tab-pane label="全部(4)" name="all">
 							</el-tab-pane>
-							<el-tab-pane label="待付款(2)" name="待付款"></el-tab-pane>
+							<el-tab-pane label="待报价(2)" name="待报价"></el-tab-pane>
-							<el-tab-pane label="待发货(1)" name="待发货"></el-tab-pane>
+							<el-tab-pane label="待选商(1)" name="待选商"></el-tab-pane>
-							<el-tab-pane label="待收货" name="待收货"></el-tab-pane>
+							<el-tab-pane label="已选商" name="已选商"></el-tab-pane>
-							<el-tab-pane label="待退款" name="待退款"></el-tab-pane>
-							<el-tab-pane label="已取消" name="已取消"></el-tab-pane>
-							<el-tab-pane label="已完成" name="已完成"></el-tab-pane>
 						</el-tabs>
-						<el-descriptions border size="small">
+						<div class="search">
-							<el-descriptions-item label="订单编号"><input placeholder="请输入订单编号" /></el-descriptions-item>
+							<view class="p">
-							<el-descriptions-item label="下单时间"><input placeholder="下单时间" /></el-descriptions-item>
+								<el-select v-model="value2" placeholder="请选择">
-							<el-descriptions-item label="采购商品"><input placeholder="请输入采购商品" /></el-descriptions-item>
-							<el-descriptions-item label="交易方式">
-								<el-select v-model="value" size="small" placeholder="请选择">
-									<el-option v-for="item in options" :key="item.value" :label="item.label"
-										:value="item.value">
-									</el-option>
-								</el-select>
-							</el-descriptions-item>
-							<el-descriptions-item label="买家名称">
-								<input placeholder="请输入买家名称" />
-							</el-descriptions-item>
-							<el-descriptions-item label="发票管理">
-								<el-select size="small" v-model="value2" placeholder="请选择">
 									<el-option v-for="item in options2" :key="item.value" :label="item.label"
 										:value="item.value">
 									</el-option>
 								</el-select>
-							</el-descriptions-item>
+							</view>
-
+							<view class="p">
-						</el-descriptions>
+								<el-date-picker v-model="value1" type="date" placeholder="选择日期">
+								</el-date-picker>
+							</view>
+							<view class="p">
+								<el-input placeholder="请输入内容" v-model="input3" class="input-with-select"
+									@change="onSearch">
+									<i slot="append" class="el-icon-search" @click="onSearch"></i>
+								</el-input>
+							</view>
+						</div>
 					</el-card>
 					<el-card shadow="never" style="margin-top: 20px;">
-						<template v-if="menuIndex == 0">
+						<template v-if="menuIndex === '0'">
-							<view class="order-list">
+							<view class="transaction-list">
 								<view class="item">
 									<view class="info">
-										<view class="title">直缝焊管 Q235B 20米 不限</view>
+										<view class="title">
+											<view class="name">
+												<view class="fabu-status">
+													<view class="text">发布中</view>
+													<view class="sjx"></view>
+												</view>
+												<span>直缝钢管</span>
+												<el-tag effect="plain" size="mini" class="el-tag">签单宝</el-tag>
+											</view>
+										</view>
+										<view class="caigou">
+											<view class="item">
+												<view class="icon">
+													<i class="el-icon-shopping-bag-1"></i>
+												</view>
+												<view class="infos">
+													<view class="name">采购量</view>
+													<view class="unit">500吨</view>
+												</view>
+											</view>
+											<view class="item" style="margin-left: 100px;">
+												<view class="icon">
+													<i class="el-icon-location-outline"></i>
+												</view>
+												<view class="infos">
+													<view class="name">交易地址</view>
+													<view class="unit">广西壮族自治区-南宁市-五象航洋城</view>
+												</view>
+											</view>
+										</view>
 										<view class="sub-title">
-											<text>订单编号：JJX008456456</text>
+											<text>交易编号：JJX008456456</text>
-											<text>创建时间：2023-05-13 10:30:55</text>
+											<text>发布时间：2023-05-13 10:30:55</text>
-											<text>卖家：广西某某有限责任公司</text>
-										</view>
-										<view class="action">
-											<view class="btn-buy">联系买家</view>
-											<el-divider direction="vertical"></el-divider>
-											<view class="btn-close">取消订单</view>
-										</view>
-									</view>
-									<view class="tool">
-										<view class="price">
-											<text class="red">￥22311</text>
-											<text>总金额</text>
 										</view>
 										<view class="status">
 											<view class="icon">
-												<img src="https://oss.wsdns.cn/20231207/010a7e26b1294284a63b890c46031225.png" alt="" />
+												<img src="https://oss.wsdns.cn/20231207/2b391d8a0ca94201ae08ee0196c7754d.png"
+													alt="" />
 											</view>
 										</view>
 									</view>
+									<view class="tool">
+										<view class="btn">
+											<el-button size="small" plain style="width: 160px;">编辑询价详情</el-button>
+										</view>
+										<view class="btn">
+											<el-button size="small" type="danger"
+												style="width: 160px;">查看收到的报价列表</el-button>
+										</view>
+										<view class="btn">
+											<el-button size="small" type="text"
+												style="width: 160px;">共收到4个报价</el-button>
+										</view>
+									</view>
 								</view>
 
-								<view class="item">
-									<view class="info">
-										<view class="title">直缝焊管 Q235B 20米 不限</view>
-										<view class="sub-title">
-											<text>订单编号：JJX008456456</text>
-											<text>创建时间：2023-05-13 10:30:55</text>
-											<text>卖家：广西某某有限责任公司</text>
-										</view>
-										<view class="action">
-											<view class="btn-buy">联系买家</view>
-											<el-divider direction="vertical"></el-divider>
-											<view class="btn-close">取消订单</view>
-										</view>
-									</view>
-									<view class="tool">
-										<view class="price">
-											<text class="red">￥22311</text>
-											<text>总金额</text>
-										</view>
-										<view class="status">
-											<view class="icon">
-												<img src="https://oss.wsdns.cn/20231207/010a7e26b1294284a63b890c46031225.png" alt="" />
-											</view>
-										</view>
-									</view>
-								</view>
-								
-								<view class="item">
-									<view class="info">
-										<view class="title">直缝焊管 Q235B 20米 不限</view>
-										<view class="sub-title">
-											<text>订单编号：JJX008456456</text>
-											<text>创建时间：2023-05-13 10:30:55</text>
-											<text>卖家：广西某某有限责任公司</text>
-										</view>
-										<view class="action">
-											<view class="btn-buy">联系买家</view>
-											<el-divider direction="vertical"></el-divider>
-											<view class="btn-close">取消订单</view>
-										</view>
-									</view>
-									<view class="tool">
-										<view class="price">
-											<text class="red">￥22311</text>
-											<text>总金额</text>
-										</view>
-										<view class="status">
-											<view class="icon">
-												<img src="https://oss.wsdns.cn/20231207/010a7e26b1294284a63b890c46031225.png" alt="" />
-											</view>
-										</view>
-									</view>
-								</view>
 								<view class="paginatio">
-									<el-pagination
+									<el-pagination background layout="prev, pager, next" :total="1000">
-									  background
-									  layout="prev, pager, next"
-									  :total="1000">
 									</el-pagination>
 								</view>
 							</view>
 						</template>
-						<template v-if="menuIndex == 1">
+						<template v-if="menuIndex === '1'">
-							我购买的订单列表
+							<view class="transaction-list">
-						</template>
+								<view class="item">
-						<template v-if="menuIndex == 2">
+									<view class="info">
-							线下交易列表
+										<view class="title">
+											<view class="name">
+												<view class="fabu-status">
+													<view class="text">发布中</view>
+													<view class="sjx"></view>
+												</view>
+												<span>直缝钢管</span>
+												<el-tag effect="plain" size="mini" class="el-tag">签单宝</el-tag>
+											</view>
+										</view>
+										<view class="caigou">
+											<view class="item">
+												<view class="icon">
+													<i class="el-icon-shopping-bag-1"></i>
+												</view>
+												<view class="infos">
+													<view class="name">采购量</view>
+													<view class="unit">500吨</view>
+												</view>
+											</view>
+											<view class="item" style="margin-left: 100px;">
+												<view class="icon">
+													<i class="el-icon-location-outline"></i>
+												</view>
+												<view class="infos">
+													<view class="name">交易地址</view>
+													<view class="unit">广西壮族自治区-南宁市-五象航洋城</view>
+												</view>
+											</view>
+										</view>
+										<view class="sub-title">
+											<text>交易编号：JJX008456456</text>
+											<text>发布时间：2023-05-13 10:30:55</text>
+										</view>
+										<view class="status">
+											<view class="icon">
+												<img src="https://oss.wsdns.cn/20231207/2b391d8a0ca94201ae08ee0196c7754d.png"
+													alt="" />
+											</view>
+										</view>
+									</view>
+									<view class="tool">
+										<view class="btn">
+											<el-button size="small" plain style="width: 160px;">编辑询价详情</el-button>
+										</view>
+										<view class="btn">
+											<el-button size="small" type="danger"
+												style="width: 160px;">查看收到的报价列表</el-button>
+										</view>
+										<view class="btn">
+											<el-button size="small" type="text"
+												style="width: 160px;">共收到4个报价</el-button>
+										</view>
+									</view>
+								</view>
+							
+								<view class="paginatio">
+									<el-pagination background layout="prev, pager, next" :total="1000">
+									</el-pagination>
+								</view>
+							</view>
 						</template>
 					</el-card>
 				</el-col>
@@ -184,15 +208,17 @@
 			return {
 				activeName: 'all',
 				value: '',
+				value1: '',
 				options: [{
-					value: '自主交易',
+					value: '金久信自营',
-					label: '自主交易'
+					label: '金久信自营'
 				}],
 				value2: '',
 				options2: [{
 					value: '未开发票',
 					label: '自主交易'
 				}],
+				input3: '',
 				pageIndex: 1,
 				menuIndex: '0',
 				isSign: false,
@@ -516,6 +542,9 @@
 						this.query(1)
 					}
 				});
+			},
+			onSearch() {
+				console.log('sdfsd: ');
 			}
 		}
 	}
@@ -532,59 +561,166 @@
 		padding: 10px 20px 20px;
 	}
 
-	.order-list{
+
+	.transaction-list {
 		display: flex;
 		flex-direction: column;
-		.item{
+
+		.item {
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
 			padding: 10px 0;
 			border-bottom: 1px solid #f3f3f3;
-			.info{
+
-				.title{
+			.info {
+				position: relative;
+				border-right: 1px solid #f3f3f3;
+				flex: 1;
+
+				.name {
+					display: flex;
 					font-size: 16px;
 					font-weight: bold;
-					line-height: 2em;
+					line-height: 1.6em;
+					align-items: center;
+
+					.fabu-status {
+						margin-right: 20px;
+						font-weight: normal;
+						display: flex;
+						.text {
+							padding: 0 10px 0 20px;
+							font-size: 13px;
+							color: #fff;
+							background-color: #A92924;
 						}
-				.sub-title{
+
+						.sjx {
+							border: 12px solid;
+							border-color: #A92924 #ffffff #A92924 #A92924;
+							position: relative;
+						}
+
+						// .text{
+						// 	color: #fff;
+						// 	background-color: #A92924
+						// }
+					}
+
+					.buyer,
+					.seller {
+						font-size: 14px;
+						font-weight: normal;
+						display: flex;
+						margin: 0 30px;
+					}
+
+					.el-tag {
+						margin-left: 10px;
+					}
+				}
+
+				.caigou {
+					display: flex;
+					align-items: center;
+
+					.item {
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+						padding: 10px 0;
+						border: none;
+
+						.icon {
+							display: flex;
+							justify-content: center;
+							align-items: center;
+							margin: 10px;
+							background-color: #f3f3f3;
+							padding: 10px;
+							border-radius: 100px;
+
+							.el-icon-shopping-bag-1,
+							.el-icon-location-outline {
+								font-size: 30px;
+							}
+						}
+
+						.infos {
+							display: flex;
+							flex-direction: column;
+
+							.unit {
+								color: #A92924
+							}
+						}
+					}
+				}
+
+				.sub-title {
 					color: #999999;
+
+					text {
+						margin-right: 60px;
 					}
-				.action{
+				}
+
+				.action {
 					padding: 10px 0;
 					display: flex;
 					flex-direction: row;
 					align-items: center;
-					.btn-buy,.btn-close{
+
+					.btn-buy,
+					.btn-close {
 						color: #A92924;
 					}
 				}
+
+				.status {
+					position: absolute;
+					top: 0;
+					right: 0;
+
+					.icon {
+						margin: 0 20px;
+
+						img {
+							width: 80px;
 						}
-			.tool{
+					}
+				}
+			}
+
+			.tool {
 				display: flex;
-				.price{
+				width: 200px;
-					margin:0 20px;
+				align-items: center;
+				justify-content: space-around;
+				flex-direction: column;
+
+				.btn {
+					margin: 5px 0;
+				}
+
+				.price {
+					margin: 0 20px;
 					display: flex;
 					flex-direction: column;
 					justify-content: center;
 					align-items: center;
-					.red{
+
+					.red {
 						font-size: 16px;
 						color: #A92924;
 						font-weight: bold;
 					}
 				}
-				.status{
-					.icon{
-						margin:0 20px;
-						img{
-							width: 100px;
-						}
-					}
-				}
 			}
 		}
 	}
+
 	.paginatio {
 		margin: 20px auto;
 		display: flex;
@@ -666,4 +802,20 @@
 			line-height: 18px;
 		}
 	}
+
+	.search {
+		display: flex;
+
+		.p {
+			margin-right: 10px;
+		}
+	}
+
+	.el-select .el-input {
+		width: 130px;
+	}
+
+	.input-with-select .el-input-group__prepend {
+		background-color: #fff;
+	}
 </style>