优化体验

common/style.scss

@@ -337,7 +337,7 @@
 		position: relative;
 		.title {
 			font-size: 14px;
-			color: #121212;
+			color: #192B20;
 			line-height: 1.6;
 		}
 		.source {
@@ -523,6 +523,7 @@
 }
 .tab {
 	position: relative;
+	background-color: white;
 	.length {
 		position: absolute;
 		right: 14px;
@@ -548,6 +549,7 @@
 				color: #192b20;
 				float: left;
 				width: 80%;
+				font-weight: bold;
 			}
 			.state {
 				float: right;
@@ -560,13 +562,26 @@
 		}
 		.con {
 			padding-bottom: 10px;
+			font-size: 14px;
+			overflow: hidden;
 			.fs {
-				font-size: 14px;
+				text-align: left;
 				.tag {
 					color: #abacb0;
 					padding-bottom: 3px;
 				}
 			}
+			.tradeAreaName{
+				padding-top: 10px;
+				color: #abacb0;
+				float: left;
+			}
+			.date{
+				float: left;
+				color: #abacb0;
+				padding-top: 10px;
+				padding-left: 10px;
+			}
 		}
 		.op {
 			border-top: 1px solid $line;

pages/market/one/merchant/goods/area.vue

@@ -1,9 +1,9 @@
 <template>
 	<view>
+		<view class="search">
+			<u-search placeholder="搜索互市" v-model="param.name" bgColor="white" @search="refresh()" :animation="true" actionText="取消" @clear="refresh()"></u-search>
+		</view>
 		<view class="list">
-			<view class="search">
-				<u-search placeholder="搜索互市" v-model="param.name" bgColor="white" @search="refresh()" :animation="true" actionText="取消" @clear="refresh()"></u-search>
-			</view>
 			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
 				<view class="title omit">{{ item.name }}</view>
 				<view class="desc">{{ item.address }}</view>

pages/market/one/merchant/goods/list.vue

@@ -34,9 +34,11 @@
 						</view>
 						<view class="f">
 							<view class="tag">库存</view>
-							<view class="v omit">{{ item.stock }}吨</view>
+							<view class="v omit">{{ item.stock }}</view>
 						</view>
 					</view>
+					<view class="tradeAreaName">{{ item.tradeAreaName }}</view>
+					<view class="date">发布于：{{ item.createTime }}</view>
 				</view>
 				<view class="op">
 					<view class="flex">

pages/market/one/merchant/goods/selects.vue

@@ -1,9 +1,9 @@
 <template>
 	<view>
+		<view class="search">
+			<u-search :placeholder="'搜索'+param.tradeAreaName+'商品'" v-model="param.name" bgColor="white" @search="refresh()" :animation="true" actionText="取消" @clear="refresh()"></u-search>
+		</view>
 		<view class="list">
-			<view class="search">
-				<u-search :placeholder="'搜索'+param.tradeAreaName+'商品'" v-model="param.name" bgColor="white" @search="refresh()" :animation="true" actionText="取消" @clear="refresh()"></u-search>
-			</view>
 			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
 				<view class="title omit">{{ item.name }}</view>
 				<view class="desc">

pages/market/two/leader/order.vue

@@ -53,7 +53,7 @@ export default {
 	methods: {
 		getData() {
 			this.http.request({
-				url: '/level-two-server/app/TbOrders/getList',
+				url: '/level-two-server/app/TbOrders/getLeaderOrderList',
 				loading: 'false',
 				data: this.param,
 				success: res => {

pages/personal/personal.vue

@@ -13,9 +13,9 @@
 					<view class="nickName omit">{{ user.phone }}</view>
 					<view class="tag" v-if="user.userType == 1">普通边民</view>
 					<view class="tag" v-if="user.userType == 2">互市组长</view>
-					<view class="tag" v-if="user.userType == 3">外籍商户</view>
+					<view class="tag" v-if="user.userType == 3">收购商</view>
 					<view class="tag" v-if="user.userType == 4">司机</view>
-					<view class="tag" v-if="user.userType == 5">收购商</view>
+					<view class="tag" v-if="user.userType == 5">外籍商户</view>
 				</view>
 				<text class="icon edit">&#xe645;</text>
 				<view class="clear"></view>