ecshop/ECShopX_mobile-frontend
1
0
Fork 0
mirror of https://gitee.com/ShopeX/ECShopX_mobile-frontend synced 2026-08-13 14:45:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
lukaijie
2022-11-24 15:53:04 +08:00
parent 561bb093f4
commit f5b4b8d8f6
4 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
companys.conf
View File

@@ -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

4
src/ext.json
View File

@@ -1,9 +1,9 @@
{
"extEnable": true,
"extAppid": "wx5e27f0cc25fa9898",
"extAppid": "wx3e1c17c88abf3e45",
"ext": {
"company_id": "1",
"appid": "wx5e27f0cc25fa9898",
"appid": "wx3e1c17c88abf3e45",
"wxa_name": "通用小程序",
"ali_isvid":""
},

8
src/pages/cart/comps/comp-goodsitem.scss
View File

@@ -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;

9
src/subpage/pages/trade/after-sale.js
View File

@@ -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
}