一级市场订单状态

common/http.js

@@ -1,6 +1,6 @@
 
-// const ip = 'http://192.168.88.12:8080'; //线下
-const ip = 'http://hs-server.aseanbusiness.cn'; //线上
+const ip = 'http://127.0.0.1:8080'; //线下
+// const ip = 'http://hs-server.aseanbusiness.cn'; //线上
 
 //const ip = 'http://192.168.88.36:8080'; //线下
 

pages/market/one/leader/order.vue

@@ -10,6 +10,14 @@
 						<text class="icon">&#xe830;</text>
 						<text>未确认</text>
 					</view>
+					<view class="state" v-if="item.finishStatus == 0">
+						<text class="icon">&#xe830;</text>
+						<text>进口中</text>
+					</view>
+					<view class="state" v-if="item.finishStatus == 1&&item.resaleStatus == 0">
+						<text class="icon">&#xe830;</text>
+						<text>已完成</text>
+					</view>
 					<view class="state" v-if="item.resaleStatus == 1">
 						<text class="icon" style="color: #13ce66">&#xe830;</text>
 						<text>已转售</text>
@@ -28,7 +36,7 @@
 				<view class="clear"></view>
 				<view class="op">
 					<view class="date">{{ item.createTime }}</view>
-					<template v-if="item.peopleConfirmStatus == 1 && item.applyConfirmStatus == 1 && item.apply == 1 && item.resaleStatus == 0">
+					<template v-if="item.finishStatus == 1">
 						<view class="an" style="color: #f44336"  @click.stop="resale(item)">订单转售</view>
 					</template>
 				</view>

pages/personal/my.vue

@@ -9,10 +9,10 @@
 				<view class="l">性别：</view>
 				<input class="r" v-model="person.genderName" :disabled="enable" />
 			</view>
-			<view class="item">
+		<!-- 	<view class="item">
 				<view class="l">年龄：</view>
 				<input class="r" v-model="person.age" :disabled="enable" />
-			</view>
+			</view> -->
 			<view class="item">
 				<view class="l">手机号：</view>
 				<input class="r" v-model="person.phone" :disabled="enable" />
@@ -21,10 +21,10 @@
 				<view class="l">互助组：</view>
 				<input class="r" v-model="person.groupName" :disabled="enable" />
 			</view>
-			<view class="item">
+			<!-- <view class="item">
 				<view class="l">角色：</view>
 				<input class="r" v-model="person.roleName" :disabled="enable" />
-			</view>
+			</view> -->
 			<view class="item">
 				<view class="l">贸易区域：</view>
 				<input class="r" v-model="person.tradeAreaName" :disabled="enable" />