shish 2 жил өмнө
parent
commit
cabec92628

+ 10 - 22
ghs/src/service/order/index.js

@@ -4,6 +4,7 @@ import { baseUrl } from '@/config/env';
 
 @Service('order')
 export class OrderService extends BaseService {
+
 	/**
 	 * 发快递配送费计算  姜枫2021.04.19
 	 */
@@ -14,6 +15,7 @@ export class OrderService extends BaseService {
 			data: data
 		});
 	}
+
 	/**
 	 * 开单生成订单  姜枫2021.04.19
 	 */
@@ -24,6 +26,7 @@ export class OrderService extends BaseService {
 			data: data
 		});
 	}
+
 	/**
 	 * 发快递  姜枫2021.05.05
 	 */
@@ -33,27 +36,21 @@ export class OrderService extends BaseService {
 			params: data
 		});
 	}
-	/**
-	 * 本店送  姜枫2021.05.05
-	 */
+
 	orderDeliver(data) {
 		return this.request({
 			url: '/self-send',
 			params: data
 		});
 	}
-	/**
-	 * 确认送达  姜枫2021.05.06
-	 */
+
 	orderAffirmDeliver(data) {
 		return this.request({
 			url: '/reach',
 			params: data
 		});
 	}
-	/**
-	 * 给客户充值 b
-	 */
+
 	orderRelate(data) {
 		return this.request({
 			url: '/order-relate',
@@ -62,9 +59,6 @@ export class OrderService extends BaseService {
 		});
 	}
 
-	/** *
-	 * 发货-填写收花人 b
-	 */
 	orderSheet(data) {
 		return this.request({
 			url: '/update-sheet',
@@ -73,9 +67,6 @@ export class OrderService extends BaseService {
 		});
 	}
 
-	/** *
-	 * 发货-填写收花人 b
-	 */
 	freeShipping(data) {
 		return this.request({
 			url: '/without-send',
@@ -91,14 +82,11 @@ export class OrderService extends BaseService {
 		});
 	}
 
-	down(id) {
-		return baseUrl + `/order/down?id=${id}&token=${store.state.user.token}`;
-	}
-
-	allDown(id) {
-		return baseUrl + `/order/all-down?id=${id}&token=${store.state.user.token}`;
+	//下载表单
+	down(id,all) {
+		return baseUrl + `/order/down?id=${id}&all=${all}&token=${store.state.user.token}`;
 	}
 
 }
 
-export default new OrderService();
+export default new OrderService();

+ 12 - 4
ghs/src/views/member/list.vue

@@ -35,13 +35,21 @@
 			</template>
 						
 			<template #table-column-debt="{scope}">
-				<span v-if="scope.row.debt == 1" style="font-weight:bold;color:green;">允许</span>
-				<span v-else>-</span>
+				
+				<i class="el-icon-success" v-if="scope.row.debt == 1" style="color:green;font-size:18px;"></i>
+				
+				<span v-else>
+					<i class="el-icon-open" style="font-size:16px;"></i>
+				</span>
 			</template>
 
 			<template #table-column-debtLimit="{scope}">
-				<span v-if="scope.row.debt == 1" style="font-weight:bold;color:green;">{{ scope.row.debtLimit ? parseFloat(scope.row.debtLimit) : 0 }}</span>
-				<span v-else>-</span>
+				<span v-if="scope.row.debt == 1" style="font-weight:bold;color:green;">
+					{{ scope.row.debtLimit ? parseFloat(scope.row.debtLimit) : 0 }}
+				</span>
+				<span v-else>
+					<i class="el-icon-edit"></i>
+				</span>
 			</template>
 
 			<template #table-column-buyAmount="{scope}">

+ 4 - 4
ghs/src/views/order/list.vue

@@ -251,11 +251,11 @@ export default {
       });
     },
     down(info){
-			let imgFile = this.$service.order.down(info.id)
+			let imgFile = this.$service.order.down(info.id,0)
       location.href = imgFile
     },
     allDown(info){
-      let imgFile = this.$service.order.allDown(info.id)
+      let imgFile = this.$service.order.down(info.id,1)
       location.href = imgFile
     },
     detailShowFn(item) {
@@ -337,8 +337,8 @@ export default {
                 width: '90'
               },
               {
-                prop: 'sendNum',
-                label: '编号',
+                prop: 'tkPrice',
+                label: '已退',
                 align: 'center',
                 width: 80
               },