Merge pull request 'refund 8.6' (#124) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/124
This commit is contained in:
commit
201f858833
@ -25,8 +25,7 @@
|
||||
</view>
|
||||
</view>
|
||||
<view class="order-btn" v-if="[1, 2, 3, 4, 8].indexOf(order.view_type) >= 0">
|
||||
<!-- @click="toOtherPage('RefundOrder')" -->
|
||||
<view class="cancel" v-if="order.view_type == 3 || order.view_type == 2">申请退款</view>
|
||||
<view class="cancel" v-if="order.view_type == 3 || order.view_type == 2" @click="toOtherPage('RefundOrder')">申请退款</view>
|
||||
<view class="cancel" v-if="order.view_type == 3" @click="toOtherPage('Logistics')">查看物流</view>
|
||||
<view class="logistics" v-if="order.view_type == 3" @click="confirmReceive">确认收货</view>
|
||||
<view class="comment" v-if="order.view_type == 4" @click="toOtherPage('Comment')">立即评价</view>
|
||||
|
||||
@ -2,7 +2,10 @@
|
||||
<view class="group">
|
||||
<view class="top">
|
||||
<text>全部拼团</text>
|
||||
<text @click="viewMore">查看更多></text>
|
||||
<view class="more" @click="viewMore">
|
||||
<text>查看更多</text>
|
||||
<u-icon name="arrow-right" color="#999" size="22"></u-icon>
|
||||
</view>
|
||||
</view>
|
||||
<view class="label">
|
||||
<u-tabs-swiper ref="group" :list="classifyList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="current" font-size="24" :show-bar="false" @change="tabsChange" height="60"></u-tabs-swiper>
|
||||
@ -88,10 +91,12 @@ export default {
|
||||
font-size: 30rpx;
|
||||
color: #333;
|
||||
}
|
||||
>text:last-child{
|
||||
font-size: 18rpx;
|
||||
color: #999;
|
||||
}
|
||||
.more {
|
||||
font-size: 18rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
color: #999;
|
||||
}
|
||||
}
|
||||
.list {
|
||||
box-sizing: border-box;
|
||||
|
||||
@ -6,10 +6,10 @@
|
||||
</view>
|
||||
<swiper class="swiper-box" :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish" :style="{height: swiperHeight}">
|
||||
<swiper-item class="swiper-item" v-for="(_, index) in classifyList" :key="index">
|
||||
<view class="goods-item">
|
||||
<view class="goods-item" v-if="goodsList.length">
|
||||
<item v-for="item in goodsList" :key="item.goods_id" :info="item"></item>
|
||||
</view>
|
||||
<u-empty text="暂无商品" mode="list" color="#000" v-if="!goodsList.length"></u-empty>
|
||||
<u-empty text="暂无商品" mode="list" color="#000" margin-top="20" v-else></u-empty>
|
||||
</swiper-item>
|
||||
</swiper>
|
||||
<!-- 加载更多 -->
|
||||
@ -138,13 +138,13 @@ export default {
|
||||
height: 100%;
|
||||
margin-bottom: 10rpx;
|
||||
.swiper-item {
|
||||
height: 100%;
|
||||
// height: 100%;
|
||||
.goods-item {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: space-between;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
// height: 100%;
|
||||
overflow-y: scroll;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,8 +1,11 @@
|
||||
<template>
|
||||
<view class="recommend">
|
||||
<view class="top">
|
||||
<text>{{ type == 'spike' ? '今日秒杀推荐' : '今日拼团推荐' }}</text>
|
||||
<text>点击查看更多></text>
|
||||
<text>今日秒杀推荐</text>
|
||||
<view class="more" @click="toOthersPage">
|
||||
<text>点击查看更多</text>
|
||||
<u-icon name="arrow-right" color="#999" size="22"></u-icon>
|
||||
</view>
|
||||
</view>
|
||||
<view class="connect">
|
||||
<view class="time" v-if="type == 'spike'">
|
||||
@ -32,12 +35,26 @@ export default {
|
||||
props: ['recommendData', 'type'],
|
||||
created() {
|
||||
this.info = this.recommendData;
|
||||
// console.log(this.recommendData);
|
||||
console.log(this.recommendData);
|
||||
},
|
||||
methods: {
|
||||
toOthersPage() {
|
||||
this.$u.route({
|
||||
url: 'pageB/sdetails/index',
|
||||
params: {
|
||||
id: this.recommendData.groupbuy_id,
|
||||
type: 3,
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
.recommend{
|
||||
margin-bottom: 20rpx;
|
||||
padding: 0 30rpx;
|
||||
background-color: #ffffff;
|
||||
.top{
|
||||
height: 90rpx;
|
||||
display: flex;
|
||||
@ -47,12 +64,14 @@ export default {
|
||||
font-size: 30rpx;
|
||||
color: #333;
|
||||
}
|
||||
>text:last-child{
|
||||
font-size: 18rpx;
|
||||
color: #999;
|
||||
}
|
||||
.more {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
color: #999;
|
||||
}
|
||||
}
|
||||
.connect{
|
||||
padding: 15rpx;
|
||||
display: flex;
|
||||
.time{
|
||||
display: flex;
|
||||
|
||||
@ -2,7 +2,10 @@
|
||||
<view class="recommend">
|
||||
<view class="top">
|
||||
<text>今日拼团推荐</text>
|
||||
<text @click="toDetailsPage">点击查看更多></text>
|
||||
<view class="more" @click="toDetailsPage">
|
||||
<text>点击查看更多</text>
|
||||
<u-icon name="arrow-right" color="#999" size="22"></u-icon>
|
||||
</view>
|
||||
</view>
|
||||
<view class="connect">
|
||||
<view class="user">
|
||||
@ -66,7 +69,7 @@ export default {
|
||||
}
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
.recommend{
|
||||
.recommend {
|
||||
margin-bottom: 20rpx;
|
||||
padding: 0 30rpx;
|
||||
background-color: #ffffff;
|
||||
@ -79,10 +82,11 @@ export default {
|
||||
font-size: 30rpx;
|
||||
color: #333;
|
||||
}
|
||||
>text:last-child{
|
||||
font-size: 18rpx;
|
||||
color: #999;
|
||||
}
|
||||
.more {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
color: #999;
|
||||
}
|
||||
}
|
||||
.connect{
|
||||
padding:10rpx 30rpx 30rpx;
|
||||
|
||||
@ -17,9 +17,10 @@
|
||||
<text class="num">00</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="next" @click="viewMore">
|
||||
查看更多>
|
||||
</view>
|
||||
<view class="next" @click="viewMore">
|
||||
<text>查看更多</text>
|
||||
<u-icon name="arrow-right" color="#999" size="18"></u-icon>
|
||||
</view>
|
||||
</view>
|
||||
<view class="list">
|
||||
<sitem v-for="(item, index) in list.slice(0, 3)" :key="index" :item="item"></sitem>
|
||||
@ -76,8 +77,10 @@ export default {
|
||||
}
|
||||
}
|
||||
.next{
|
||||
font-size: 18rpx;
|
||||
color: #999;
|
||||
font-size: 18rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
color: #999;
|
||||
}
|
||||
}
|
||||
.list{
|
||||
|
||||
@ -443,9 +443,6 @@ export default {
|
||||
break;
|
||||
case 3:
|
||||
title = '秒杀商品详情';
|
||||
break;
|
||||
case 1:
|
||||
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
@ -865,6 +862,7 @@ export default {
|
||||
font-size: 32rpx;
|
||||
color: rgba(255,255,255,1);
|
||||
z-index: 10076;
|
||||
background-color: #FFFFFF;
|
||||
.launch {
|
||||
flex: 1;
|
||||
background: rgba(253,211,96,1);
|
||||
@ -886,6 +884,7 @@ export default {
|
||||
height: 98rpx;
|
||||
display: flex;
|
||||
z-index: 10076;
|
||||
background-color: #FFFFFF;
|
||||
.left {
|
||||
width: 190rpx;
|
||||
display: flex;
|
||||
|
||||
@ -68,8 +68,7 @@
|
||||
</view>
|
||||
</view>
|
||||
<view class="btn" v-if="['1', '2', '4', '6'].indexOf(orderstate) >= 0">
|
||||
<!-- @click="toOtherPage('RefundOrder')" -->
|
||||
<view class="cancel" v-if="orderstate == '4' || orderstate == '1'">申请退款</view>
|
||||
<view class="cancel" v-if="orderstate == '4' || orderstate == '1'" @click="toOtherPage('RefundOrder')">申请退款</view>
|
||||
<view class="cancel" v-if="orderstate == '1'" @click="toOtherPage('Logistics')">查看物流</view>
|
||||
<view class="logistics" v-if="orderstate == '1'" @click="confirmReceive">确认收货</view>
|
||||
<view class="comment" v-if="orderstate == '2'" @click="toOtherPage('Comment')">立即评价</view>
|
||||
@ -211,9 +210,6 @@ export default {
|
||||
}
|
||||
uni.stopPullDownRefresh(); // 结束刷新
|
||||
})
|
||||
},
|
||||
applyRefund() {
|
||||
|
||||
},
|
||||
cancelOrder() {
|
||||
this.$u.api.cancelOrder({
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<u-radio-group v-model="value" @change="radioChange">
|
||||
<label class="radio-view" v-for="(item, index) in goodsList" :key="index">
|
||||
<view class="radio">
|
||||
<u-radio color="#F0AD4E" :name="item.goods_id" active-color="#FF780F" icon-size="34" shape="circle"></u-radio>
|
||||
<u-radio color="#F0AD4E" :name="item.goods_id" active-color="#FF780F" icon-size="24" shape="circle"></u-radio>
|
||||
</view>
|
||||
<view class="store_info">
|
||||
<view class="info_img">
|
||||
@ -26,18 +26,18 @@
|
||||
<view class="refund-details">
|
||||
<view class="goods-number">
|
||||
<view>选择数量</view>
|
||||
<view></view>
|
||||
<u-number-box :input-width="40" :input-height="38" :size="22" bg-color="#FFFFFF" :disabled-input=true color="#FF780F" :max="goods.goods_num" v-model="num"></u-number-box>
|
||||
</view>
|
||||
<view class="refund-price">
|
||||
<view>
|
||||
<view>退款金额</view>
|
||||
<view>￥99.00</view>
|
||||
<view class="price">
|
||||
<view class="title">退款金额</view>
|
||||
<view class="value">￥{{ (goods.goods_pay_price * num).toFixed(2) }}</view>
|
||||
</view>
|
||||
<view>若退款成功，将退还给您￥99.00</view>
|
||||
<view class="tips">若退款成功，将退还给您 ￥{{ (goods.goods_pay_price * num).toFixed(2) }}</view>
|
||||
</view>
|
||||
<view class="refund-text">
|
||||
<view>申请说明</view>
|
||||
<u-input v-model="refundText" type="textarea" />
|
||||
<view class="title">申请说明</view>
|
||||
<u-input v-model="refundText" type="textarea" placeholder="必填，请详细说明退款理由" />
|
||||
</view>
|
||||
</view>
|
||||
<view class="submit-btn">提交申请</view>
|
||||
@ -48,7 +48,13 @@ export default {
|
||||
data() {
|
||||
return {
|
||||
goodsList: [],
|
||||
goods: {
|
||||
goods_num: 0,
|
||||
goods_pay_price: 0,
|
||||
},
|
||||
value: '',
|
||||
refundText: '',
|
||||
num: 0,
|
||||
}
|
||||
},
|
||||
onLoad(option) {
|
||||
@ -56,7 +62,12 @@ export default {
|
||||
},
|
||||
methods: {
|
||||
radioChange(e){
|
||||
console.log(e)
|
||||
const goodsList = this.goodsList.filter(goods => {
|
||||
return e == goods.goods_id;
|
||||
})
|
||||
// console.log(goodsList);
|
||||
this.goods = goodsList[0];
|
||||
console.log(this.goods);
|
||||
},
|
||||
getOrderInfo(id) {
|
||||
this.$u.api.getOrderInfo({
|
||||
@ -65,7 +76,7 @@ export default {
|
||||
if(res.errCode == 0) {
|
||||
// this.orderInfo = res.data;
|
||||
this.goodsList = res.data.extend_order_goods;
|
||||
console.log(this.goodsList);
|
||||
// console.log(this.goodsList);
|
||||
}
|
||||
// uni.stopPullDownRefresh(); // 结束刷新
|
||||
})
|
||||
@ -136,7 +147,73 @@ export default {
|
||||
}
|
||||
.refund-details {
|
||||
background-color: #FFFFFF;
|
||||
.goods-number {}
|
||||
.goods-number {
|
||||
padding: 0 30rpx;
|
||||
height: 100rpx;
|
||||
background: rgba(255,255,255,1);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin-bottom: 2rpx;
|
||||
/deep/ .u-numberbox {
|
||||
border: 1rpx solid rgba(217,215,215,1);
|
||||
border-radius:4px;
|
||||
.u-icon-minus, .u-icon-plus {
|
||||
width: 38rpx;
|
||||
}
|
||||
.u-number-input {
|
||||
margin: 0;
|
||||
color: #333 !important;
|
||||
border: 1rpx #D9D7D7 solid {
|
||||
top: 0px;
|
||||
bottom: 0px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.refund-price {
|
||||
background: rgba(255,255,255,1);
|
||||
padding: 36rpx 30rpx;
|
||||
margin-bottom: 2rpx;
|
||||
.price {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-bottom: 36rpx;
|
||||
.title {
|
||||
font-size: 30rpx;
|
||||
color: rgba(51,51,51,1);
|
||||
margin-right: 56rpx;
|
||||
}
|
||||
.value {
|
||||
font-size: 28rpx;
|
||||
color: rgba(244,14,14,1);
|
||||
}
|
||||
}
|
||||
.tips {
|
||||
font-size: 24rpx;
|
||||
color: rgba(153,153,153,1);
|
||||
}
|
||||
}
|
||||
.refund-text {
|
||||
background: rgba(255,255,255,1);
|
||||
padding: 36rpx 30rpx;
|
||||
.title {
|
||||
font-size: 30rpx;
|
||||
color: rgba(51,51,51,1);
|
||||
margin-bottom: 40rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
.submit-btn {
|
||||
width: 690rpx;
|
||||
height: 98rpx;
|
||||
background: rgba(255,120,15,1);
|
||||
border-radius: 49rpx;
|
||||
font-size: 36rpx;
|
||||
color: rgba(255,255,255,1);
|
||||
line-height: 98rpx;
|
||||
text-align: center;
|
||||
margin: 120rpx auto 0;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
Loading…
Reference in New Issue
Block a user