团长订单详情页修改

api/groupon.js

@@ -23,6 +23,12 @@ export function afterSalesSubmit(data) {
 }
 
 
+//同意售后
+export function agreeAfterSales(data) {
+    let url = "?afterSalesNo="+data.afterSalesNo
+    return request.post("/v1/after-sales/agree" + url,data);
+}
+
 //绑定物流单号
 export function bindLogisticsNo(data) {
     let url = "?afterSalesNo="+data.afterSalesNo + "&logisticsNo="+data.logisticsNo

pages/groupbuying/leader_order_details/index.vue

@@ -27,10 +27,14 @@
 			<view class="good_info">
 				<view class="all-products-body" v-for="(item, index) in grouponData.grouponOrderList" :key="index">
 					<view class="order-number">
-						<image referrerpolicy="no-referrer" src="http://www.gzzzyd.com/groupon/home_slices/出厂编号-线@2x.png" />
-						<text>
+<!--						<image referrerpolicy="no-referrer" src="http://www.gzzzyd.com/groupon/home_slices/出厂编号-线@2x.png" />-->
+						<text v-if="state == 8">
+							售后编号: {{item.orderNo}}
+						</text>
+						<text v-else>
 							订单编号: {{item.orderNo}}
 						</text>
+						<view class="status">{{item.orderStateDesc}}</view>
 					</view>
 
 					<view class="all-products-item" v-for="(item2, index2) in item.goodsList" :key="index2">
@@ -55,7 +59,6 @@
 					</view>
 
 					<view class="self-pickup-point">
-
 						<view class="a-b">
 							<view class="a-b1">
 								自提点:
@@ -63,11 +66,12 @@
 									{{item.selfTake.name}}
 								</text>
 							</view>
-							<view class="a-b2">
-
-							</view>
 						</view>
 					</view>
+
+					<view class="op-area" v-if="state == 8">
+						<button v-if="item.orderStateDesc == '申请中'" class="action-btn" @click="agreeAfterSales(item.orderNo)">同意</button>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -97,6 +101,9 @@ import authorize from '@/components/Authorize';
 // #endif
 import emptyPage from '@/components/emptyPage.vue';
 import colors from '@/mixins/color.js';
+import {agreeAfterSales} from '@/api/groupon.js'
+
+
 export default {
 	components: {
 		home,
@@ -108,7 +115,10 @@ export default {
 	mixins: [colors],
 	data () {
 		return {
-			grouponData: {}
+			grouponData: {},
+			state: 0,
+			grouponId: 0,
+			queryType: 0,
 		};
 	},
 	computed: mapGetters(['isLogin']),
@@ -116,9 +126,30 @@ export default {
 
 	},
 	onLoad(options) {
+		this.state = options.state;
+		this.grouponId = options.grouponId;
+		this.queryType = options.queryType;
 		this.getCommanderOrderDetail(options.grouponId, options.queryType, options.state)
 	},
 	methods: {
+		agreeAfterSales(afterSalesNo) {
+			let that = this;
+			console.log(that.wlNo)
+			if (!afterSalesNo) {
+				return that.$util.Tips({
+					title: '售后编号不能为空'
+				});
+			}
+			agreeAfterSales({
+				afterSalesNo: afterSalesNo
+			}).then(res => {
+				this.getCommanderOrderDetail(that.grouponId, that.queryType, that.state)
+				return that.$util.Tips({
+					title: '操作成功',
+					icon: 'success'
+				});
+			})
+		},
 		getCommanderOrderDetail(grouponId, queryType, state) {
 			let that = this;
 			getCommanderOrderDetail({
@@ -257,12 +288,21 @@ export default {
 	color: #999999;
 	line-height: 44rpx;
 	margin-bottom: 20rpx;
+	display: flex;
+	justify-content: space-between;
 
 	image {
 		width: 24rpx;
 		height: 24rpx;
 		margin-right: 20rpx;
 	}
+
+	.status {
+		min-width: 100rpx;
+		text-align: right;
+		margin-right: 30rpx;
+		color: #666666;
+	}
 }
 
 
@@ -322,7 +362,7 @@ export default {
 }
 
 .a-b {
-	padding: 0 30rpx;
+	padding: 0 20rpx;
 	width: 100%;
 	background: #FFF7F8;
 	border: 1px solid dashed #333333;
@@ -346,8 +386,8 @@ export default {
 	.a-b2 {
 		image {
 			vertical-align: middle;
-			margin-right: 30rpx;
-			margin-left: 30rpx;
+			/*margin-right: 30rpx;*/
+			/*margin-left: 30rpx;*/
 			height: 34rpx;
 			width: 34rpx;
 		}
@@ -356,15 +396,15 @@ export default {
 
 .self-pickup-point {
 	background: #FFF7F8;
-	margin: 0 30rpx;
+	/*margin: 0 30rpx;*/
 }
 
 .op-area {
-	height: 120rpx;
+	height: 80rpx;
 	display: flex;
 	justify-content: flex-end;
-	line-height: 120rpx;
-	padding: 20rpx 0;
+	line-height: 80rpx;
+	padding: 20rpx 0 0 0;
 	text-align: right;
 
 	.action-btn {
@@ -372,7 +412,6 @@ export default {
 		background: #FFF7F8;
 		border-radius: 32rpx;
 		border: 2rpx solid #B22338;
-		margin-right: 30rpx;
 		height: 64rpx;
 		font-size: 24rpx;
 		font-weight: 400;

pages/order/index.vue

@@ -691,14 +691,13 @@ export default {
 
 	.myclient_list_name {
 		display: flex;
-    justify-content: space-between;
+    	justify-content: space-between;
 		margin-bottom: 15rpx;
 		min-height: 44rpx;
 		font-size: 28rpx;
 		font-weight: 500;
 		color: #111111;
 		line-height: 44rpx;
-		display: flex;
 
 		.nv {
 			flex-grow: 1;