fe / yohoblk-wap · Commits

Go to a project

Authored by 陈峰
Commit b6adef56aa9a05b49740aeb93ceaa465f4232d11 2 parents 1abe42e8 a8a515d8

Merge branch 'release/3.0' of http://git.yoho.cn/fe/yohoblk-wap into release/3.0

Inline Side-by-side
Showing 5 changed files with 20 additions and 11 deletions
... ... @@ -18,9 +18,9 @@ module.exports = {
app_type: 1
},
domains: {
// api: 'http://api-test3.yohops.com:9999/',
// service: 'http://service-test3.yohops.com:9999/',
// singleApi: 'http://api-test3.yohops.com:9999/'
api: 'http://api-test3.yohops.com:9999/',
service: 'http://service-test3.yohops.com:9999/',
singleApi: 'http://api-test3.yohops.com:9999/'
// api: 'http://api-test2.yohops.com:9999/',
// service: 'http://service-test2.yohops.com:9999/',
... ... @@ -29,8 +29,8 @@ module.exports = {
// service: 'http://dev-service.yohops.com:9999/',
// singleApi: 'http://192.168.102.27:8092/'
// //
api: 'http://api.yoho.cn/',
service: 'http://service.yoho.cn/',
// api: 'http://api.yoho.cn/',
// service: 'http://service.yoho.cn/',
// singleApi: 'http://single.yoho.cn/'
},
subDomains: {
... ...
... ... @@ -167,6 +167,11 @@
span {
margin-left: 30px;
}
.right-btn {
font-size: 38px;
margin-right: 30px;
}
}
.blk-header-gap {
... ... @@ -174,5 +179,5 @@
background-color: transparent;
}
</style>
... ...
... ... @@ -168,7 +168,7 @@ export default {
let sku = this.skuList.find(s => s.colorId === this.colorId && s.sizeId === this.sizeId);
if (sku) {
this.reset();
// this.reset();
this.$emit('add-cart', sku);
}
},
... ...
<template>
<div>
<header-box title="换货申请" ref="header"></header-box>
<header-box title="换货申请" ref="header">
<span class="right-btn" slot="right" @click="submit">提交</span>
</header-box>
<div class="return return-exchange">
<product-list :list="goodsArr" :data="exchangeData" type="exchange">
</product-list>
... ... @@ -25,8 +27,8 @@
</div>
</div>
<feature-selector
:is-visible="showFeatureSelector"
<feature-selector
:is-visible="showFeatureSelector"
:entity="entity"
:on-add-to-cart="whenFeatureChange"
button-text="确定">
... ...
<template>
<div>
<header-box title="退货申请" ref="header"></header-box>
<header-box title="退货申请" ref="header">
<span class="right-btn" slot="right" @click="submit">提交</span>
</header-box>
<div class="return return-refund">
<product-list :list="list" :data="refundData" type="refund"></product-list>
<div class="return-amount">
... ...