Authored by yyq

Merge branch 'develop' of git.yoho.cn:fe/xianyu-ufo-app-web into develop

... ... @@ -106,7 +106,8 @@ export default {
await this.delay(1500);
this.payAction({
orderCode: this.orderCode
orderCode: this.orderCode,
payment: this.$xianyu.isAliApp ? 2 : 9
}).then((result) => {
toast.hide();
this.onSuccess(result);
... ...
... ... @@ -7,7 +7,7 @@
<meta name="description" content="" />
<meta
name="viewport"
content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no"
content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no, viewport-fit=cover"
/>
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
<meta content="yes" name="apple-mobile-web-app-capable" />
... ...
... ... @@ -136,6 +136,6 @@ export default {
.cubeic-arrow {
color: #999;
margin-left: 10px;
font-size: 32px;
font-size: 20px;
}
</style>
... ...
... ... @@ -13,6 +13,7 @@
font-size: 36px;
color: #000;
padding: 15px;
font-weight: bold;
border-bottom: solid 1px #eee;
}
.no-data {
... ...
... ... @@ -55,7 +55,6 @@
height: 48px;
}
.assets-record-code-txt {
font-family: PingFang-SC-Regular;
font-size: 28px;
color: #000000;
display: -webkit-box;
... ... @@ -68,19 +67,16 @@
display: inline-block;
}
.assets-record-time-txt {
font-family: SFProText-Regular;
font-size: 22px;
color: #999999;
margin-top: 12px;
}
.assets-record-income-txt {
font-family: SFProText-Medium;
font-weight: bold;
font-size: 28px;
color: #65AB85;
color: #000;
}
.assets-record-income-tip-txt {
font-family: PingFang-SC-Regular;
font-size: 20px;
color: #D0021B;
display: inline-block;
... ...
... ... @@ -96,6 +96,13 @@ export default {
}
},
deep: true
},
watch: {
'yoho.context.isLogin': function(newVal) {
if (newVal) {
this.init();
}
},
}
},
methods: {
... ... @@ -309,6 +316,7 @@ export default {
.product-info {
height: 260px;
display: flex;
}
.tip {
... ...
... ... @@ -39,7 +39,7 @@ export default {
.desc {
font-size: 24px;
color: #3f3f3f;
color: #999;
margin-left: 10px;
}
... ...
... ... @@ -2,7 +2,7 @@
<div class="input-comp">
<div class="input-wrapper">
<div class="price-symbol">¥</div>
<input ref="input" :value="value" class="cube-input-field" type="text" placeholder="定价需以9结尾,例如¥1299" @blur="onBlur"
<input ref="input" :value="value" class="tip" type="text" placeholder="定价需以9结尾,例如¥1299" @blur="onBlur"
@change="onChange"></input>
</div>
<div class="num-wrapper" v-if="superSell">
... ... @@ -91,7 +91,7 @@ export default {
flex: 1;
font-size: 56px;
font-weight: 500;
line-height: 120px;
line-height: 80px;
background: #f5f5f5;
}
... ... @@ -119,7 +119,6 @@ export default {
.count {
color: black;
}
}
</style>
... ...
... ... @@ -28,16 +28,16 @@ export default {
<style lang="scss" scoped>
.product-wrapper {
display: flex;
height: 240px;
overflow: hidden;
}
.product-price {
display: inline-block;
vertical-align: top;
display: flex;
height: 100%;
margin-left: 20px;
padding-top: 3%;
align-items: center;
}
.price {
... ...
... ... @@ -88,7 +88,6 @@ export default {
this.isEntry = false;
this.fetchSellerEntryStatus({})
.then((res)=> {
console.log(res);
if (res) {
this.isEntry = get(res, 'entrySellerType', 0) !== 0;
}
... ...
... ... @@ -2,7 +2,7 @@
<LayoutApp :show-back="true" title="出售" :back-action="backAction">
<div class="body">
<ProductInfo :data="productDetail" class="product-info"></ProductInfo>
<InputPrice @input="changePrice" class="input-price"
<InputPrice @input="changePrice"
:num="num" :value="price"
@on-blur="compute" :super-sell="superSell"
@on-num-change="onNumChange"
... ... @@ -110,9 +110,11 @@ export default {
return {
goodImg: get(state.product.selectedProductInfo, 'product.goods_list[0].image_list[0].image_url', ''),
productName: get(state.product.selectedProductInfo, 'product.product_name', ''),
productId: get(state.product.selectedProductInfo, 'product.product_id', ''),
colorName: get(state.product.selectedProductInfo, 'product.goods_list[0].color_name', ''),
sizeName: get(state.product.selectedProductInfo, 'size.size_name', ''),
skup: get(state.product.selectedProductInfo, 'size.skup', ''),
bidSkup: get(state.product.selectedProductInfo, 'size.bid_skup', ''),
goodPrice,
priceType,
goodBidPrice,
... ... @@ -149,11 +151,21 @@ export default {
disabled: false
},
onCancel: () => {
this.$router.replace({
this.$store.commit('order/sellerAskOrder/SELLER_ASK_SET_PRODUCTINFO', {
goodImg: this.productDetail.goodImg,
colorName: this.productDetail.colorName,
sizeName: this.productDetail.sizeName,
goodPrice: this.productDetail.bidPrice,
productId: this.productDetail.productId,
bid_moster_price: this.productDetail.bidPrice,
});
// 跳转变现
this.$router.push({
name: 'sellAskOrder',
query: {
skup: this.productDetail.skup,
price: this.productDetail.bidPrice
skup: this.productDetail.bidSkup,
price: this.productDetail.bidPrice,
}
});
}
... ... @@ -375,6 +387,11 @@ export default {
padding: 0 50px;
}
.product-info {
height: 240px;
margin-bottom: 20px;
}
.submit-btn {
height: 80px;
line-height: 80px;
... ...
... ... @@ -211,6 +211,7 @@ export default {
.size-info,
.size-price {
font-family: "Alte DIN 1451 Mittelschrift";
color: #fff;
}
}
... ... @@ -218,6 +219,7 @@ export default {
&.disabled {
.size-info,
.size-price {
font-family: "Alte DIN 1451 Mittelschrift";
color: #ccc;
}
}
... ...
... ... @@ -221,6 +221,7 @@ export default {
.title {
font-size: 40px;
line-height: 96px;
font-weight: bold;
i {
float: right;
... ... @@ -253,6 +254,7 @@ export default {
padding-top: 30px;
font-size: 32px;
color: #000;
font-family: "Alte DIN 1451 Mittelschrift";
}
}
}
... ... @@ -344,6 +346,7 @@ export default {
font-size: 28px;
i {
font-family: "Alte DIN 1451 Mittelschrift";
font-size: 20px;
font-style: normal;
}
... ...
... ... @@ -264,10 +264,10 @@ export default function() {
return order;
},
async payAction(ctx, { orderCode }) {
async payAction(ctx, { orderCode, payment = 2 }) {
const payResult = await this.$api.post('/api/order/pay', {
orderCode,
payment: 2
payment
});
if (payResult.code !== 200) {
... ...