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

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

pages/index/index.vue

@@ -30,6 +30,77 @@
 				</view>
 				<view class="clear"></view>
 			</view>
+			<view class="menu">
+				<!--边民菜单与组长菜单-->
+				<view class="menu" v-if="user.userType == 1 || user.userType == 2">
+					<view class="msn" @click="go('/pages/market/one/leader/order')">
+						<view class="out">
+							<view class="int">
+								<view class="icon ioc" style="background-color: #f0dcfc; color: #b064d8">&#xe628;</view>
+								<view class="tit">一级订单</view>
+							</view>
+						</view>
+					</view>
+					<view class="msn" @click="go('/pages/market/two/leader/order')">
+						<view class="out">
+							<view class="int">
+								<view class="icon ioc" style="background-color: #f0dcfc; color: #b064d8">&#xe628;</view>
+								<view class="tit">二级订单</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				
+				<!--收购商-->
+				<view class="menu" v-if="user.userType == 3">
+					<view class="msn" @click="go('/pages/market/two/purchaser/order/cart')">
+						<view class="out">
+							<view class="int">
+								<view class="icon ioc" style="background-color: #fff6e0; color: #f1ba41">&#xe604;</view>
+								<view class="tit">购物车</view>
+							</view>
+						</view>
+					</view>
+					
+					<view class="msn" @click="go('/pages/market/two/purchaser/address/list')">
+						<view class="out">
+							<view class="int">
+								<view class="icon ioc" style="background-color: #fff6e0; color: #f1ba41">&#xe623;</view>
+								<view class="tit">地址管理</view>
+							</view>
+						</view>
+					</view>
+					<view class="msn" @click="go('/pages/market/two/purchaser/order/list')">
+						<view class="out">
+							<view class="int">
+								<view class="icon ioc" style="background-color: #f0dcfc; color: #b064d8">&#xe628;</view>
+								<view class="tit">我的订单</view>
+							</view>
+						</view>
+					</view>
+					<view class="msn" @click="go('/pages/authentication/purchaser/info')">
+						<view class="out">
+							<view class="int">
+								<view class="icon ioc" style="background-color: #e0ffff; color: #00bfff">&#xe660;</view>
+								<view class="tit">我的认证</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				
+				<!--合作社-->
+				<view class="menu" v-if="user.userType == 6">
+					<view class="msn" @click="go('/pages/market/one/cooperative/order')">
+						<view class="out">
+							<view class="int">
+								<view class="icon ioc" style="background-color: #e1f6e9; color: #47cf74">&#xe634;</view>
+								<view class="tit">结算单</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			
 			<!--最新资讯-->
 			<view class="news">
 				<view class="vlabel">

pages/market/one/leader/order.vue

@@ -52,6 +52,9 @@
 						v-if="item.peopleConfirmStatus == 1 && item.Sxb010Status == 1 && item.finishStatus == 0 && item.refundStatus == 0">
 						<view class="an" style="color: #f44336" @click.stop="orderRefund(item.id)">退款</view>
 					</template>
+						v-if="item.peopleConfirmStatus == 1 && item.sxb010Status == 1 && item.finishStatus == 0 && item.refundStatus == 0">
+						<view class="an" style="color: #f44336" @click.stop="orderRefund(item.id)">退款</view>
+					</template>
 					<!-- 	<template v-if="item.resaleStatus == 1 && item.beingOrder == 0">
 						<view class="an" style="color: #f44336"  @click.stop="updateResalePrice(item.id)">修改转售价格</view>
 					</template> -->
@@ -264,4 +267,4 @@
 	.state {
 		margin-right: -70px;
 	}
-</style>
+</style>

pages/market/two/leader/resale.vue

@@ -30,22 +30,20 @@
 					<text class="label">订单金额</text>
 					<text class="desc">¥ {{ item.totalPrice }}</text>
 				</view>
-				<view class="item">
+				<!-- <view class="item">
 					<text class="label">上架金额(元)</text>
 					<text class="desc">
 						<input type="number" v-model="resalePrice" placeholder="请输入" />
 					</text>
-				</view>
+				</view> -->
 				<!-- <view class="item">
 					<text class="label">利润</text>
 					<text class="desc">50元</text>
 				</view> -->
-				<!-- <view class="item">
+				<view class="item">
-					<text class="label">计算总金额</text>
+					<text class="label">上架金额</text>
-					<text class="desc">
+					<text class="desc">¥ {{ resalePrice }}</text>
-						<input type="number" v-model="resalePrice"  :disabled="true"/>
+				</view>
-					</text>
-				</view> -->
 			</view>
 			<u-divider text="费项明细"></u-divider>
 			<view>总费用：{{fee.totalFee}}<span style="color: coral;margin-left: 5px;font-size: 16px;">元</span></view>
@@ -118,19 +116,20 @@ export default {
 					// this.resalePrice = (res.data.data.sumPrice + 50).toFixed(2)
 					// this.newRuleList = res.data.data.newRuleList
 					this.fee=res.data.data;
+					this.resalePrice = (this.fee.totalFee + this.item.totalPrice).toFixed(2);
 				}
 			});
 		},
 		ok() {
 			let resalePrice=this.resalePrice;
-			if(!resalePrice){
+			/* if(!resalePrice){
 					uni.showToast({title: '请填写上架金额',icon:'error'});
 				return;
 			}
 			if(resalePrice<this.item.totalPrice){
 				uni.showToast({title: '上架金额不能小于订单金额',icon:'error'});
 				return;
-			}
+			} */
 			uni.showModal({
 				title: '提示',
 				content: '确定上架？',

pages/market/two/list.vue

@@ -17,7 +17,7 @@
 				</view>
 			</view>
 			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
-				<view class="title">{{ item.leaderName }}</view>
+				<view class="title">{{ item.LeaderName }}</view>
 				<view class="check" @click.stop="selected(item)" v-if="user.userType == 3">
 					<text class="check icon" v-if="item.check" style="color: #4581fb">&#xe631;</text>
 					<text class="check icon" v-else>&#xe60c;</text>

pages/personal/personal.vue

@@ -50,15 +50,15 @@
 				</view>
 			</view> -->
 			<!--边民菜单与组长菜单-->
-			<view class="menu" v-if="user.userType == 1 || user.userType == 2">
+			<!-- <view class="menu" v-if="user.userType == 1 || user.userType == 2">
-				<!-- <view class="msn" @click="go('/pages/market/one/leader/cart')">
+				<view class="msn" @click="go('/pages/market/one/leader/cart')">
 					<view class="out">
 						<view class="int">
 							<view class="icon ioc" style="background-color: #fff6e0; color: #f1ba41">&#xe604;</view>
 							<view class="tit">购物车</view>
 						</view>
 					</view>
-				</view> -->
+				</view>
 				<view class="msn" @click="go('/pages/market/one/leader/order')">
 					<view class="out">
 						<view class="int">
@@ -75,9 +75,9 @@
 						</view>
 					</view>
 				</view>
-			</view>
+			</view> -->
 			<!--收购商-->
-			<view class="menu" v-if="user.userType == 3">
+			<!-- <view class="menu" v-if="user.userType == 3">
 				<view class="msn" @click="go('/pages/market/two/purchaser/order/cart')">
 					<view class="out">
 						<view class="int">
@@ -86,14 +86,14 @@
 						</view>
 					</view>
 				</view>
-				<!-- <view class="msn" @click="go('/pages/market/two/purchaser/buy/list')">
+				<view class="msn" @click="go('/pages/market/two/purchaser/buy/list')">
 					<view class="out">
 						<view class="int">
 							<view class="icon ioc" style="background-color: #e1f6e9; color: #47cf74">&#xe634;</view>
 							<view class="tit">采购需求</view>
 						</view>
 					</view>
-				</view> -->
+				</view>
 				<view class="msn" @click="go('/pages/market/two/purchaser/address/list')">
 					<view class="out">
 						<view class="int">
@@ -118,7 +118,7 @@
 						</view>
 					</view>
 				</view>
-			</view>
+			</view> -->
 			<!--外籍商户-->
 			<!-- <view class="menu" v-if="user.userType == 5">
 				<view class="msn" @click="go('/pages/market/one/merchant/goods/list')">
@@ -147,7 +147,7 @@
 				</view>
 			</view> -->
 			<!--合作社-->
-			<view class="menu" v-if="user.userType == 6">
+			<!-- <view class="menu" v-if="user.userType == 6">
 				<view class="msn" @click="go('/pages/market/one/cooperative/order')">
 					<view class="out">
 						<view class="int">
@@ -156,7 +156,7 @@
 						</view>
 					</view>
 				</view>
-			</view>
+			</view> -->
 			<view class="cmd">
 				<view class="s_item" @click="go('/pages/personal/bankInfo')">
 					<text class="icon ic">&#xe662;</text>