From f5b4b8d8f6f354487734d01ca429e4710f072af2 Mon Sep 17 00:00:00 2001
From: lukaijie <lukaijie@shopex.cn>
Date: Thu, 24 Nov 2022 15:53:04 +0800
Subject: [PATCH] merge

---
 companys.conf                            | 6 +++---
 src/ext.json                             | 4 ++--
 src/pages/cart/comps/comp-goodsitem.scss | 8 ++++----
 src/subpage/pages/trade/after-sale.js    | 9 ++-------
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/companys.conf b/companys.conf
index a82177b76..f3b31c4d5 100644
--- a/companys.conf
+++ b/companys.conf
@@ -780,7 +780,7 @@ map_key = 1ccc1ebc947719886f0cd766d70241fe
 map_name = oneX新零售门店定位
 image_cdn = https://b-img-cdn.yuanyuanke.cn/ecshopx-vshop
 dianwu_url=https://ecshopx-dianwu.ex-sandbox.com/
-merchant_url = https://ecshopx-h5.ex-sandbox.com
+merchant_url = https://ecshopx-shop.ex-sandbox.com
 
 [Ecshopx合版测试环境--标准版]
 appid = wx53715b0ccd15204f
@@ -795,7 +795,7 @@ map_key = 1ccc1ebc947719886f0cd766d70241fe
 map_name = oneX新零售门店定位
 image_cdn = https://b-img-cdn.yuanyuanke.cn/ecshopx-vshop
 dianwu_url = https://ecshopx-dianwu.ex-sandbox.com
-merchant_url = https://ecshopx-h5.ex-sandbox.com
+merchant_url = https://ecshopx-shop.ex-sandbox.com
 
 [Ecshopx合版测试环境--平台版]
 appid = wxcd40cac7764e570b
@@ -810,7 +810,7 @@ map_key = 1ccc1ebc947719886f0cd766d70241fe
 map_name = oneX新零售门店定位
 image_cdn = https://b-img-cdn.yuanyuanke.cn/ecshopx-vshop
 dianwu_url = https://ecshopx-dianwu.ex-sandbox.com
-merchant_url = https://ecshopx-h5.ex-sandbox.com
+merchant_url = https://ecshopx-shop.ex-sandbox.com
 
 [Ecshopx合版测试环境--品牌版]
 appid = wxdff0772aeb2e1f89
diff --git a/src/ext.json b/src/ext.json
index f192accd8..418229bf3 100644
--- a/src/ext.json
+++ b/src/ext.json
@@ -1,9 +1,9 @@
 {
   "extEnable": true,
-  "extAppid": "wx5e27f0cc25fa9898",
+  "extAppid": "wx3e1c17c88abf3e45",
   "ext": {
     "company_id": "1",
-    "appid": "wx5e27f0cc25fa9898",
+    "appid": "wx3e1c17c88abf3e45",
     "wxa_name": "通用小程序",
     "ali_isvid":""
   },
diff --git a/src/pages/cart/comps/comp-goodsitem.scss b/src/pages/cart/comps/comp-goodsitem.scss
index 5b9fbe93e..ed3fc5489 100644
--- a/src/pages/cart/comps/comp-goodsitem.scss
+++ b/src/pages/cart/comps/comp-goodsitem.scss
@@ -17,10 +17,10 @@
     align-items: center;
   }
   .item-ft {
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    right: 0;
+    // position: absolute;
+    // bottom: 0;
+    // left: 0;
+    // right: 0;
 
     .goods-price-wrap {
       display: flex;
diff --git a/src/subpage/pages/trade/after-sale.js b/src/subpage/pages/trade/after-sale.js
index 784630d6b..b7c846dba 100644
--- a/src/subpage/pages/trade/after-sale.js
+++ b/src/subpage/pages/trade/after-sale.js
@@ -75,6 +75,7 @@ export default class AfterSale extends Component {
 
     let nList = pickBy(list, {
       id: 'aftersales_bn',
+      order_id: 'order_id',
       status_desc: ({ aftersales_status }) => AFTER_SALE_STATUS[aftersales_status],
       totalItems: 'num',
       payment: ({ refund_fee }) => (refund_fee / 100).toFixed(2),
@@ -107,16 +108,10 @@ export default class AfterSale extends Component {
 
   detailFilter(nList){
     const {order_id} = this.$instance.router.params
-
     let nFList = JSON.parse(JSON.stringify(nList))
-
     if(order_id){
-      nFList = nList.filter(item => {
-        item.order = item.order.filter(oItem => oItem.order_id === order_id)
-        return item.order?.length
-      })
+      nFList = nList.filter(item => item.order_id == order_id)
     }
-
     return nFList
   }