Merge branch 'feature/asyncOrder' of http://git.aseanbusiness.cn/qzyReal/market-app-ui into feature/asyncOrder

# Conflicts:
#	pages/market/one/leader/order.vue

main.js

@@ -18,7 +18,6 @@ Vue.prototype.getUser = function() {
 
 Vue.prototype.hasAuth = () => {
 	let user = uni.getStorageSync('info');
-	console.log("asd:"+user.auth);
 	if (user.auth == '0') {
 		return false
 	} else {

pages/index/index.vue

@@ -209,7 +209,7 @@ page {
 }
 .cmain {
 	padding: 10px 15px 10px 15px;
-	margin-top: -193px;
+	margin-top: -183px;
 	position: relative;
 	.vsearch {
 		margin-bottom: 13px;

pages/market/one/confirm/apply.vue

@@ -46,7 +46,6 @@ export default {
 				peopleConfirmStatus: 1, //边民确认状态
 				cooperEntrustStatus: 1,//互助委托申报确认状态
 				//applyConfirmStatus: 0, //进口申报确认状态
-				apply: 0, //订单申报状态
 				finishStatus: 0, //订单完成状态
 				resaleStatus: 0 //订单转售状态
 			},

pages/market/one/confirm/cooperation.vue

@@ -47,7 +47,6 @@ export default {
 				peopleConfirmStatus: 1, //边民确认状态
 				//cooperEntrustStatus: 0,//互助委托申报确认状态
 				applyConfirmStatus: 0, //进口申报确认状态
-				apply: 0, //订单申报状态
 				finishStatus: 0, //订单完成状态
 				resaleStatus: 0 //订单转售状态
 			},

pages/market/one/confirm/people.vue

@@ -46,7 +46,6 @@ export default {
 				//peopleConfirmStatus: 0, //边民确认状态
 				cooperEntrustStatus: 0,//互助委托申报确认状态
 				applyConfirmStatus: 0, //进口申报确认状态
-				apply: 0, //订单申报状态
 				finishStatus: 0, //订单完成状态
 				resaleStatus: 0 //订单转售状态
 			},

pages/market/one/cooperative/peopleOrders.vue

@@ -10,7 +10,7 @@
 						<text class="icon">&#xe830;</text>
 						<text>未确认</text>
 					</view>
-					<view class="state" v-if="item.peopleConfirmStatus == 1 && item.apply == 0">
+					<view class="state" v-if="item.peopleConfirmStatus == 1">
 						<text class="icon" style="color: #13ce66">&#xe830;</text>
 						<text>已确认</text>
 					</view>
@@ -18,10 +18,6 @@
 						<text class="icon" style="color: #13ce66">&#xe830;</text>
 						<text>已转售</text>
 					</view>
-					<view class="state" v-if="item.finishStatus == 3">
-						<text class="icon" style="color: #f44336">&#xe622;</text>
-						<text>已取消</text>
-					</view>
 				</view>
 
 				<image src="../../../../static/news.jpg" mode="aspectFill" class="pic"></image>
@@ -49,45 +45,33 @@ export default {
 				{
 					name: '全部',
 					peopleConfirmStatus: '',	//边民确认状态
-					apply: '',					//订单申报状态
 					finishStatus: '',			//订单完成状态
 					resaleStatus: ''			//订单转售状态
 				},
 				{
 					name: '待确认',
 					peopleConfirmStatus: 0,
-					apply: 0,
 					finishStatus: 0,
 					resaleStatus: 0
 				},
 				{
 					name: '申报中',
 					peopleConfirmStatus: 1,
-					apply: 0,
 					finishStatus: 0,
 					resaleStatus: 0
 				},
 				{
 					name: '已完成',
 					peopleConfirmStatus: 1,
-					apply: 1,
 					finishStatus: 1,
 					resaleStatus: 0
 				},
 				{
 					name: '已转售',
 					peopleConfirmStatus: 1,
-					apply: 1,
 					finishStatus: 1,
 					resaleStatus: 1
-				}/* ,
-				{
-					name: '已取消',
-					peopleConfirmStatus: '',
-					apply: '',
-					finishStatus: 3,
-					resaleStatus: ''
-				} */
+				}
 			],
 			param: {
 				pageNo: 1,
@@ -104,7 +88,7 @@ export default {
 			this.collageOrdersId = e.collageOrdersId;
 			this.getData();
 		}
-		
+
 	},
 	methods: {
 		getData() {
@@ -124,7 +108,6 @@ export default {
 		click(e) {
 			console.log(e);
 			this.param.peopleConfirmStatus = e.appeopleConfirmStatusply;
-			this.param.apply = e.apply;
 			this.param.finishStatus = e.finishStatus;
 			this.param.resaleStatus = e.resaleStatus;
 			this.refresh();
@@ -139,7 +122,7 @@ export default {
 			this.list = [];
 			this.getData();
 		},
-		
+
 	},
 	//下拉刷新
 	onPullDownRefresh() {

pages/market/one/leader/order.vue

@@ -36,7 +36,7 @@
 				<view class="clear"></view>
 				<view class="op">
 					<view class="date">{{ item.createTime }}</view>
-					<template v-if="item.finishStatus == 1">
+					<template v-if="item.finishStatus == 1 && item.resaleStatus == 0">
 						<view class="an" style="color: #f44336"  @click.stop="resale(item)">订单转售</view>
 					</template>
 				</view>
@@ -136,7 +136,6 @@ export default {
 			this.param.peopleConfirmStatus = e.peopleConfirmStatus;
 			this.param.cooperEntrustStatus = e.cooperEntrustStatus;
 			this.param.applyConfirmStatus = e.applyConfirmStatus;
-			this.param.apply = e.apply;
 			this.param.finishStatus = e.finishStatus;
 			this.param.resaleStatus = e.resaleStatus;
 			this.refresh();

pages/personal/personal.vue

@@ -205,6 +205,7 @@ export default {
 				success: res => {
 					this.user.auth = res.data.data.auth;
 					this.user.face=res.data.data.face;
+					uni.setStorageSync('info', this.user);
 				}
 			});
 		}