Merge remote-tracking branch 'origin/master'

src/api/order.js

@@ -122,3 +122,21 @@ export function confirmReceipt(data) {
     method: 'POST',
   });
 }
+
+// 退换货填写物流单号
+export function fillGoodsInfo(data) {
+  return request({
+    url: '/sgyrdd/sgyOrder/afterSales/goodsInfo',
+    method: 'POST',
+    data,
+  });
+}
+
+// 售后撤销申请
+export function revokeApplication(data) {
+  return request({
+    url: '/sgyrdd/sgyOrder/afterSales/revoke',
+    method: 'POST',
+    data,
+  });
+}

src/pages.json

@@ -269,6 +269,12 @@
 				"navigationBarTitleText": "评论",
 				"enablePullDownRefresh": true
 			}
+		},
+		{
+			"path": "pages/assistingAgriculture/order/afterSales",
+			"style": {
+				"navigationBarTitleText": "售后详情"
+			}
 		}
 	],
 	"globalStyle": {

src/pages/address/addressList.vue

@@ -57,7 +57,11 @@ const getAddressListData = async () => {
   }
 };
 onLoad(() => {});
-getAddressListData();
+
+onShow(() => {
+  getAddressListData();
+});
+
 const addNewAddress = () => {
   xma.navigateTo({ url: '/pages/address/addressEdit?new=true' });
 };