liujiaxin il y a 1 mois
Parent
commit
022fad6373

+ 6 - 6
api/order.js

@@ -29,8 +29,8 @@ const api = {
 	getStoreOrderItems: '/app/live/storeAfterSales/getStoreOrderItems', // 获取订单项列表
 	applyAfterSales: '/app/live/storeAfterSales/applyAfterSales', // 申请售后
 	revoke: '/app/live/storeAfterSales/revoke', // 撤销售后
-	getStoreAfterSalesList:  (liveId,pageSize,pageNum) =>`/app/live/storeAfterSales/getStoreAfterSalesList?liveId=${liveId}&pageSize=${pageSize}&pageNum=${pageNum}`, // 获取售后列表
-	getStoreAfterSalesById: '/app/live/storeAfterSales/getStoreAfterSalesById', // 获取售后详情
+	getStoreAfterSalesList:  (liveId,pageSize,pageNum,status) =>`/app/live/storeAfterSales/getStoreAfterSalesList?liveId=${liveId}&pageSize=${pageSize}&pageNum=${pageNum}&status=${status}`, // 获取售后列表
+	getStoreAfterSalesById:  (id)=> `/app/live/storeAfterSales/getStoreAfterSalesById?id=${id}`, // 获取售后详情
 
 
 
@@ -165,13 +165,13 @@ export function revoke(data) {
 }
 
 //获取售后列表
-export function getStoreAfterSalesList(liveId,pageSize,pageNum,data={}) {
-	return request(api.getStoreAfterSalesList(liveId,pageSize,pageNum), data, 'GET', 'application/json;charset=UTF-8')
+export function getStoreAfterSalesList(liveId,pageSize,pageNum,status,data={}) {
+	return request(api.getStoreAfterSalesList(liveId,pageSize,pageNum,status), data, 'GET', 'application/json;charset=UTF-8')
 }
 
 // 获取售后详情
-export function getStoreAfterSalesById(data) {
-	return request(api.getStoreAfterSalesById, data, 'GET', 'application/json;charset=UTF-8')
+export function getStoreAfterSalesById(id,data={}) {
+	return request(api.getStoreAfterSalesById(id), data, 'GET', 'application/json;charset=UTF-8')
 }
 
 // 申请原因

+ 24 - 28
pages_shop/storeOrderRefundDetails.vue

@@ -59,7 +59,7 @@
 							<view class="right">
 								<text class="text" >
 										<text  class="text success">
-											{{$getDictLabelName(statusOptions,sales.salesStatus)}}
+											<!-- {{$getDictLabelName(statusOptions,sales.salesStatus)}} -->
 										</text>
 								</text>
 							</view>
@@ -136,7 +136,7 @@
 								</view>
 								 <view class="det-item">
 								 	<text class="label">订单编号</text>
-								 	<text class="text">{{order.orderCode}}</text>
+								 	<text class="text">{{order?.orderCode}}</text>
 								 </view>
 								<view class="det-item">
 									<text class="label">申请时间</text>
@@ -155,6 +155,7 @@
 </template>
 
 <script>
+	import {getStoreAfterSalesById} from '@/api/order.js'
 	// import {getDictByKey} from '@/api/common.js'
 	
 	// import {getStoreAfterSalesById,revoke} from '@/api/storeAfterSales.js'
@@ -177,24 +178,24 @@
 		},
 		onShow() {
 			this.getStoreAfterSalesById()
-			this.getDictByKey("sys_after_sales_status")
+			// this.getDictByKey("sys_after_sales_status")
 		},
 		methods: {
-			getDictByKey(key){
-				var data={key:key}
-				getDictByKey(data).then(
-					res => {
-						if(res.code==200){
-							if(key=="sys_after_sales_status"){
-								this.statusOptions=res.data;
-							}
-						}
-					},
-					err => {
-					}
-				);
+			// getDictByKey(key){
+			// 	var data={key:key}
+			// 	getDictByKey(data).then(
+			// 		res => {
+			// 			if(res.code==200){
+			// 				if(key=="sys_after_sales_status"){
+			// 					this.statusOptions=res.data;
+			// 				}
+			// 			}
+			// 		},
+			// 		err => {
+			// 		}
+			// 	);
 				
-			},
+			// },
 			addDeliverySn(){
 				uni.navigateTo({
 					url: './storeOrderRefundAddDelivery?id=' + this.id
@@ -226,12 +227,7 @@
 			},
 			getStoreAfterSalesById() {
 				//联网加载数据
-				var that = this;
-				var data = {
-					id:this.id,
-
-				};
-				getStoreAfterSalesById(data).then(res => {
+				getStoreAfterSalesById(this.id).then(res => {
 					if(res.code==200){
 						//设置列表数据
 						this.sales=res.sales;
@@ -247,11 +243,11 @@
 				});
 			},
 		 
-			showLogs(status) {
-				uni.navigateTo({
-					url: './refundOrderLogs?orderStatus=' + status
-				})
-			},
+			// showLogs(status) {
+			// 	uni.navigateTo({
+			// 		url: './refundOrderLogs?orderStatus=' + status
+			// 	})
+			// },
 			
 		}
 	}

+ 8 - 8
pages_shop/storeOrderRefundList.vue

@@ -82,12 +82,12 @@
 					// {name:"全部",id:"0"},
 					// {name:"售后中",id:"1"},
 					// {name:"已完成",id:"2"},
-					{name:"全部",id:""},
-					{name:"待平台审核",id:"0"},
-					{name:"待用户发货",id:"1"},
-					{name:"待仓库审核",id:"2"},
-					{name:"财务审核 ",id:"3"},
-					{name:"退款成功 ",id:"4"},
+					{name:"全部",status:""},
+					{name:"待平台审核",status:"0"},
+					{name:"待用户发货",status:"1"},
+					{name:"待仓库审核",status:"2"},
+					{name:"财务审核 ",status:"3"},
+					{name:"退款成功 ",status:"4"},
 					// {name:"已提交等待平台审核",id:"0"},
 					// {name:"平台已审核 等待用户发货",id:"1"},
 					// {name:"用户已发货待仓库审核",id:"2"},
@@ -142,7 +142,7 @@
 				
 			// },
 			tabChange(item) {
-				this.status = item.id
+				this.status = item.status
 				this.mescroll.resetUpScroll()
 			},
 			mescrollInit(mescroll) {
@@ -186,7 +186,7 @@
 			// 查看订单详情
 			showDetail(item) {
 				uni.navigateTo({
-					url: './storeOrderRefundDetails?id=' + item.orderId
+					url: './storeOrderRefundDetails?id=' + item.id
 				})
 			},
 			

+ 8 - 4
unpackage/dist/dev/mp-weixin/api/order.js

@@ -53,9 +53,9 @@ const api = {
   // 申请售后
   revoke: "/app/live/storeAfterSales/revoke",
   // 撤销售后
-  getStoreAfterSalesList: (liveId, pageSize, pageNum) => `/app/live/storeAfterSales/getStoreAfterSalesList?liveId=${liveId}&pageSize=${pageSize}&pageNum=${pageNum}`,
+  getStoreAfterSalesList: (liveId, pageSize, pageNum, status) => `/app/live/storeAfterSales/getStoreAfterSalesList?liveId=${liveId}&pageSize=${pageSize}&pageNum=${pageNum}&status=${status}`,
   // 获取售后列表
-  getStoreAfterSalesById: "/app/live/storeAfterSales/getStoreAfterSalesById"
+  getStoreAfterSalesById: (id) => `/app/live/storeAfterSales/getStoreAfterSalesById?id=${id}`
   // 获取售后详情
 };
 function createliveOrder(data) {
@@ -118,8 +118,11 @@ function getStoreOrderItems(data) {
 function applyAfterSales(data) {
   return request(api.applyAfterSales, data, "POST", "application/json;charset=UTF-8");
 }
-function getStoreAfterSalesList(liveId, pageSize, pageNum, data = {}) {
-  return request(api.getStoreAfterSalesList(liveId, pageSize, pageNum), data, "GET", "application/json;charset=UTF-8");
+function getStoreAfterSalesList(liveId, pageSize, pageNum, status, data = {}) {
+  return request(api.getStoreAfterSalesList(liveId, pageSize, pageNum, status), data, "GET", "application/json;charset=UTF-8");
+}
+function getStoreAfterSalesById(id, data = {}) {
+  return request(api.getStoreAfterSalesById(id), data, "GET", "application/json;charset=UTF-8");
 }
 function Dicts(data) {
   return request("/app/common/getDictByKey", data, "GET", "application/json;charset=UTF-8");
@@ -138,6 +141,7 @@ exports.editAddress = editAddress;
 exports.finishOrder = finishOrder;
 exports.getAddressById = getAddressById;
 exports.getCitys = getCitys;
+exports.getStoreAfterSalesById = getStoreAfterSalesById;
 exports.getStoreAfterSalesList = getStoreAfterSalesList;
 exports.getStoreOrderItems = getStoreOrderItems;
 exports.liveOrderKey = liveOrderKey;

+ 44 - 47
unpackage/dist/dev/mp-weixin/pages_shop/storeOrderRefundDetails.js

@@ -1,5 +1,6 @@
 "use strict";
 const common_vendor = require("../common/vendor.js");
+const api_order = require("../api/order.js");
 const _sfc_main = {
   data() {
     return {
@@ -17,23 +18,22 @@ const _sfc_main = {
   },
   onShow() {
     this.getStoreAfterSalesById();
-    this.getDictByKey("sys_after_sales_status");
   },
   methods: {
-    getDictByKey(key) {
-      var data = { key };
-      getDictByKey(data).then(
-        (res) => {
-          if (res.code == 200) {
-            if (key == "sys_after_sales_status") {
-              this.statusOptions = res.data;
-            }
-          }
-        },
-        (err) => {
-        }
-      );
-    },
+    // getDictByKey(key){
+    // 	var data={key:key}
+    // 	getDictByKey(data).then(
+    // 		res => {
+    // 			if(res.code==200){
+    // 				if(key=="sys_after_sales_status"){
+    // 					this.statusOptions=res.data;
+    // 				}
+    // 			}
+    // 		},
+    // 		err => {
+    // 		}
+    // 	);
+    // },
     addDeliverySn() {
       common_vendor.index.navigateTo({
         url: "./storeOrderRefundAddDelivery?id=" + this.id
@@ -62,10 +62,7 @@ const _sfc_main = {
       });
     },
     getStoreAfterSalesById() {
-      var data = {
-        id: this.id
-      };
-      getStoreAfterSalesById(data).then((res) => {
+      api_order.getStoreAfterSalesById(this.id).then((res) => {
         if (res.code == 200) {
           this.sales = res.sales;
           this.items = res.items;
@@ -77,15 +74,16 @@ const _sfc_main = {
           });
         }
       });
-    },
-    showLogs(status) {
-      common_vendor.index.navigateTo({
-        url: "./refundOrderLogs?orderStatus=" + status
-      });
     }
+    // showLogs(status) {
+    // 	uni.navigateTo({
+    // 		url: './refundOrderLogs?orderStatus=' + status
+    // 	})
+    // },
   }
 };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  var _a;
   return common_vendor.e({
     a: $data.sales.salesStatus == 0
   }, $data.sales.salesStatus == 0 ? {} : {}, {
@@ -99,36 +97,35 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   }, $data.sales.refundAmount != null ? {
     f: common_vendor.t($data.sales.refundAmount.toFixed(2))
   } : {}, {
-    g: common_vendor.t(_ctx.$getDictLabelName($data.statusOptions, $data.sales.salesStatus)),
-    h: $data.sales.status >= 1 && $data.sales.refundType == 1
+    g: $data.sales.status >= 1 && $data.sales.refundType == 1
   }, $data.sales.status >= 1 && $data.sales.refundType == 1 ? {
-    i: common_vendor.t($data.sales.consignee),
-    j: common_vendor.t($data.sales.address),
-    k: common_vendor.t($data.sales.phoneNumber)
+    h: common_vendor.t($data.sales.consignee),
+    i: common_vendor.t($data.sales.address),
+    j: common_vendor.t($data.sales.phoneNumber)
   } : {}, {
-    l: $data.sales.salesStatus == 0
+    k: $data.sales.salesStatus == 0
   }, $data.sales.salesStatus == 0 ? common_vendor.e({
-    m: $data.sales.status == 1
+    l: $data.sales.status == 1
   }, $data.sales.status == 1 ? {
-    n: common_vendor.o(($event) => $options.addDeliverySn())
+    m: common_vendor.o(($event) => $options.addDeliverySn())
   } : {}, {
-    o: $data.sales.status == 0 || $data.sales.status == 1
+    n: $data.sales.status == 0 || $data.sales.status == 1
   }, $data.sales.status == 0 || $data.sales.status == 1 ? {
-    p: common_vendor.o(($event) => $options.revoke())
+    o: common_vendor.o(($event) => $options.revoke())
   } : {}) : {}, {
-    q: $data.sales.status == 0
+    p: $data.sales.status == 0
   }, $data.sales.status == 0 ? {} : {}, {
-    r: $data.sales.status == 1
+    q: $data.sales.status == 1
   }, $data.sales.status == 1 ? {} : {}, {
-    s: $data.sales.status == 2
+    r: $data.sales.status == 2
   }, $data.sales.status == 2 ? {} : {}, {
-    t: $data.sales.status == 3
+    s: $data.sales.status == 3
   }, $data.sales.status == 3 ? {} : {}, {
-    v: $data.sales.status == 4
+    t: $data.sales.status == 4
   }, $data.sales.status == 4 ? {} : {}, {
-    w: $data.sales != null
+    v: $data.sales != null
   }, $data.sales != null ? {
-    x: common_vendor.f($data.items, (item, index, i0) => {
+    w: common_vendor.f($data.items, (item, index, i0) => {
       return {
         a: JSON.parse(item.jsonInfo).image == "" ? "/static/images/drug.svg" : JSON.parse(item.jsonInfo).image,
         b: common_vendor.t(JSON.parse(item.jsonInfo).productName),
@@ -139,14 +136,14 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       };
     })
   } : {}, {
-    y: common_vendor.t($data.sales.reasons),
-    z: common_vendor.t($data.sales.explains),
-    A: $data.sales.refundAmount != null
+    x: common_vendor.t($data.sales.reasons),
+    y: common_vendor.t($data.sales.explains),
+    z: $data.sales.refundAmount != null
   }, $data.sales.refundAmount != null ? {
-    B: common_vendor.t($data.sales.refundAmount.toFixed(2))
+    A: common_vendor.t($data.sales.refundAmount.toFixed(2))
   } : {}, {
-    C: common_vendor.t($data.order.orderCode),
-    D: common_vendor.t($data.sales.createTime)
+    B: common_vendor.t((_a = $data.order) == null ? void 0 : _a.orderCode),
+    C: common_vendor.t($data.sales.createTime)
   });
 }
 const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages_shop/storeOrderRefundDetails.wxml


+ 8 - 8
unpackage/dist/dev/mp-weixin/pages_shop/storeOrderRefundList.js

@@ -12,12 +12,12 @@ const _sfc_main = {
         // {name:"全部",id:"0"},
         // {name:"售后中",id:"1"},
         // {name:"已完成",id:"2"},
-        { name: "全部", id: "" },
-        { name: "待平台审核", id: "0" },
-        { name: "待用户发货", id: "1" },
-        { name: "待仓库审核", id: "2" },
-        { name: "财务审核 ", id: "3" },
-        { name: "退款成功 ", id: "4" }
+        { name: "全部", status: "" },
+        { name: "待平台审核", status: "0" },
+        { name: "待用户发货", status: "1" },
+        { name: "待仓库审核", status: "2" },
+        { name: "财务审核 ", status: "3" },
+        { name: "退款成功 ", status: "4" }
         // {name:"已提交等待平台审核",id:"0"},
         // {name:"平台已审核 等待用户发货",id:"1"},
         // {name:"用户已发货待仓库审核",id:"2"},
@@ -66,7 +66,7 @@ const _sfc_main = {
     // 	);
     // },
     tabChange(item) {
-      this.status = item.id;
+      this.status = item.status;
       this.mescroll.resetUpScroll();
     },
     mescrollInit(mescroll) {
@@ -99,7 +99,7 @@ const _sfc_main = {
     // 查看订单详情
     showDetail(item) {
       common_vendor.index.navigateTo({
-        url: "./storeOrderRefundDetails?id=" + item.orderId
+        url: "./storeOrderRefundDetails?id=" + item.id
       });
     }
   }

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff