页面修改

pages/market/two/leader/order.vue

@@ -1,18 +1,20 @@
 <template>
 	<view>
-		<view class="tab">
+		<!--<view class="tab">
 			<u-tabs :list="tab" @click="click" :lineHeight="5"></u-tabs>
-		</view>
+		</view>-->
 		<view class="goodsList">
 			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
-				<view class="title">{{ item.createName }}</view>
-				<view>
-					<view class="state" style="color: red" v-if="item.purchaserId === null || item.purchaserId === '' || item.purchaserId === undefined">待下单</view>
-					<view class="state" style="color: red" v-else>已下单</view>
+				<view class="title" style="width: 97%;font-size: 17px;">
+					<span v-if="item.purchaserId === null || item.purchaserId === '' || item.purchaserId === undefined">车牌号 {{ item.veNo }}</span>
+					<span v-else>采购商 {{ item.purchaserName }}</span>
+					<span>
+						<view class="state" v-if="item.purchaserId === null || item.purchaserId === '' || item.purchaserId === undefined"><text class="icon">&#xe830;</text>待下单</view>
+						<view class="state" v-else><text class="icon" style="color: #13ce66">&#xe830;</text>已下单</view>
+					</span>
+					<span class="state" style="color: #4581fb" v-if="item.isPay == 1 && item.payTax == 0">已支付</span>
+					<span class="state" style="color: #13ce66" v-if="item.payTax == 1 && item.orderFinish == 1">已完成</span>
 				</view>
-				<view class="state" style="color: #4581fb" v-if="item.isPay == 1 && item.payTax == 0">已支付</view>
-				<view class="state" style="color: #13ce66" v-if="item.payTax == 1 && item.orderFinish == 1">已完成</view>
-				<image src="../../../../static/news.jpg" mode="aspectFill" class="pic"></image>
 				<view class="con">
 					<view class="productName omit">{{ item.goodsName }}</view>
 					<view class="desc omit">

pages/market/two/leader/resale.vue

@@ -31,10 +31,8 @@
 					<text class="desc">¥ {{ item.totalPrice }}</text>
 				</view>
 				<view class="item">
-					<text class="label">上架金额(元)</text>
-					<text class="desc">
-						<input type="number" v-model="resalePrice" placeholder="请输入" />
-					</text>
+					<text class="label">预上架金额</text>
+					<text class="desc">¥ {{ item.totalPrice }}</text>
 				</view>
 				<!-- <view class="item">
 					<text class="label">利润</text>
@@ -138,7 +136,7 @@ export default {
 					if (res.confirm) {
 						this.http.request({
 							url: '/level-one-server/app/TbOrder/up',
-							data: {id: this.item.id, upPrice: this.resalePrice},
+							data: {id: this.item.id, upPrice: this.item.totalPrice},
 							success: res => {
 								uni.showToast({title: '提交成功'});
 								uni.navigateBack();

pages/market/two/purchaser/buy/buy.vue

@@ -8,19 +8,19 @@
 				</view>
 				<view class="item">
 					<text class="label">商品价格</text>
-					<text class="desc">{{ item.resalePrice }}</text>
+					<text class="desc">¥ {{ item.resalePrice }}</text>
 				</view>
 				<view class="item">
 					<text class="label">车牌号</text>
 					<text class="desc">{{ item.veNo }}</text>
 				</view>
 				<view class="item">
-					<text class="label">接单人</text>
-					<text class="desc">{{ user.name }}</text>
+					<text class="label">发布商</text>
+					<text class="desc">{{ item.leaderName }}</text>
 				</view>
 				<view class="item">
-					<text class="label">发布商</text>
-					<text class="desc">{{ item.createName }}</text>
+					<text class="label">采购商</text>
+					<text class="desc">{{ user.name }}</text>
 				</view>
 				<view class="item">
 					<text class="label">发布时间</text>

pages/market/two/purchaser/order/cart.vue

@@ -5,12 +5,12 @@
 				<view class="title" @click.stop="selected(item)">
 					<text class="icon" v-if="item.check" style="color: #4581fb">&#xe631;</text>
 					<text class="icon" v-else>&#xe60c;</text>
-					<text>{{ item.createName }}</text>
+					<text>{{ item.goodsName }}</text>
 				</view>
 				<view class="state" @click.stop="del(item)"><text class="icon del">&#xe852;</text></view>
-				<image src="../../../../../static/news.jpg" mode="aspectFill" class="pic"></image>
+
 				<view class="con">
-					<view class="productName omit">{{ item.goodsName }}</view>
+					<!--<view class="productName omit">{{ item.goodsName }}</view>-->
 					<view class="desc omit">
 						<text>{{ item.tradeAreaName }}</text>
 					</view>

pages/market/two/purchaser/order/detail.vue

@@ -51,27 +51,31 @@
 				<view class="item">
 					<text class="label">单价</text>
 					<text class="desc">{{ item.singlePrice }}</text>
-				</view>	
+				</view>
 				<view class="item">
 					<text class="label">总价</text>
 					<text class="desc">{{ item.resalePrice }}</text>
 				</view>
-			
-				<view class="item">
-					<text class="label">时间</text>
-					<text class="desc">{{ item.createTime }}</text>
-				</view>
+
+
 				<view class="item">
 					<text class="label">支付状态</text>
 					<text class="desc">
-						<text v-if="item.isPay==1">已支付</text>
-						<text v-else>未支付</text>
+						<text v-if="item.isPay==0">未支付</text>
+						<text v-else-if="item.isPay==1">已支付</text>
+						<text v-else-if="item.isPay==2">支付失败</text>
+						<text v-else-if="item.isPay==3">支付中</text>
+						<text v-else>支付中</text>
 					</text>
 				</view>
 				<view class="item" v-if="item.payTime">
-					<text class="label">支付时间</text>
+					<text class="label">采购时间</text>
 					<text class="desc">{{ item.payTime }}</text>
 				</view>
+				<view class="item">
+					<text class="label">创建时间</text>
+					<text class="desc">{{ item.createTime }}</text>
+				</view>
 				<view style="height: 50px;"></view>
 			</view>
 		</view>