18577375184
/
jimei-hudong-h5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

调整

master
梁欣 1 year ago
parent
2820f3e2c3
commit
03ad470b44
2 changed files with 615 additions and 573 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      pages/goods/detail.vue
  2. 154
      pages/user/shop/order.vue

10
pages/goods/detail.vue
View File

@ -6,7 +6,7 @@
style="position: fixed;z-index: 98;width: 100%;background-color: #fff;padding: 10rpx 0;"
:style="{opacity : !headerClass? 0 : 1}">
<gui-switch-navigation
:items="[{id:1,name:'商品'},{id:2,name:'购买须知'},{id:4,name:'详情'},{id:5,name:'推荐'}]"
:items="[{id:1,name:'商品'},{id:2,name:'购买须知'},{id:3,name:'评论'},{id:4,name:'详情'},{id:5,name:'推荐'}]"
@change="navchange" :currentIndex="navIndex" textAlign="center" :isCenter="true"
activeLineBg="linear-gradient(to right, #9E1A91, #4D0868)" activeDirection="center" :size="0"
:margin="10" padding="30rpx"
@ -121,7 +121,7 @@
</view>
<view style="height: 20rpx;"></view>
</view>
<view class="mainitems">
<view class="mainitems" id="comment">
<view style="border-radius: 10rpx;background-color: #fff;">
<Comment v-if="!isLoading" :goods-id="goodsId" :limit="2"/>
</view>
@ -394,10 +394,14 @@ export default {
}
break;
case 2 : {
which = 'detail'
which = 'comment'
}
break;
case 3 : {
which = 'detail'
}
break;
case 4 : {
which = 'recommended'
}
break;

154
pages/user/shop/order.vue
View File

@ -9,7 +9,7 @@
@down="downCallback" :up="upOption" @up="upCallback">
<!-- tab栏 -->
<u-tabs :list="tabs" font-size="26" :is-scroll="false" :current="curTab"
:active-color="appTheme.mainBg" :duration="0.2" @change="onChangeTab" />
:active-color="appTheme.mainBg" :duration="0.2" @change="onChangeTab"/>
<!-- 订单列表 -->
<view class="order-list">
<view class="order-item" v-for="(item, index) in list.data" :key="index">
@ -17,10 +17,11 @@
<view class="item-top-left">
<!-- <text class="order-time">{{ item.create_time }}</text> -->
<text class="order-time"
style="font-weight: bold;">{{item.goods[0].goods_name}}</text>
style="font-weight: bold;">{{ item.goods[0].goods_name }}
</text>
</view>
<view class="item-top-right" style="display: flex;">
<text class="state-texts">{{ item.state_text }} </text>
<text class="state-texts">{{ item.state_text === '已取消' ? '客户已申请退款' : item.state_text }}</text>
</view>
</view>
<!-- 商品列表 -->
@ -32,12 +33,24 @@
</view>
<!-- 商品信息 -->
<view class="goods-content">
<view class="goods-title"><text
class="oneline-hide">下单时间：{{ item.create_time }}</text></view>
<view class="goods-title"><text
class="oneline-hide">数量：{{ goods.total_num }}</text></view>
<view class="goods-title"><text class="oneline-hide">需付款：<text
class="unit">￥</text>{{ item.pay_price }}</text></view>
<view class="goods-title">
<text
class="oneline-hide">下单时间：{{ item.create_time }}
</text>
</view>
<view class="goods-title">
<text
class="oneline-hide">数量：{{ goods.total_num }}
</text>
</view>
<view class="goods-title">
<text class="oneline-hide">需付款：
<text
class="unit">￥
</text>
{{ item.pay_price }}
</text>
</view>
</view>
<!-- 交易信息 -->
<!-- <view class="goods-trade">
@ -57,14 +70,18 @@
<view class="btn-group clearfix">
<view class="f-28 col-8" style="font-size: 25rpx;line-height: 50rpx;">
下单用户:{{item.extract.linkman}}({{item.extract.phone}})</view>
下单用户:{{ item.extract.linkman }}({{ item.extract.phone }})
</view>
</view>
<view class="btn-group clearfix">
<!-- 订单评价 -->
<block v-if="item.order_status == 21">
<view class="refund-view" v-if="item.order_status == 21">
<text class="refund-tips">客户已发起申请退款</text>
<view class="refund-view-btns">
<view class="btn-item" @click="onCancel(item.order_id)">同意</view>
<view class="btn-item" @click="showReject(item.order_id)">拒绝</view>
</block>
</view>
</view>
</view>
</view>
@ -85,7 +102,7 @@
<view class="qrcode-popup" style="width: 700rpx;">
<view class="title">拒绝理由</view>
<view>
<input class="input" type="text" v-model="reason" placeholder="请输入" />
<input class="input" type="text" v-model="reason" placeholder="请输入"/>
</view>
<view style="padding: 50rpx 30rpx;">
<view class="btn-item" @click="onReject()">确认</view>
@ -99,45 +116,45 @@
</template>
<script>
import CountDown from '@/components/countdown'
import {
import CountDown from '@/components/countdown'
import {
DeliveryStatusEnum,
DeliveryTypeEnum,
OrderStatusEnum,
PayStatusEnum,
PayTypeEnum,
ReceiptStatusEnum
} from '@/common/enum/order'
import MescrollBody from '@/components/mescroll-uni/mescroll-body.vue'
import MescrollMixin from '@/components/mescroll-uni/mescroll-mixins'
import {
} from '@/common/enum/order'
import MescrollBody from '@/components/mescroll-uni/mescroll-body.vue'
import MescrollMixin from '@/components/mescroll-uni/mescroll-mixins'
import {
getEmptyPaginateObj,
getMoreListData
} from '@/core/app'
import * as OrderApi from '@/api/order'
import {
} from '@/core/app'
import * as OrderApi from '@/api/order'
import {
wxPayment
} from '@/core/app'
} from '@/core/app'
// 每页记录数量
const pageSize = 15
// 每页记录数量
const pageSize = 15
// tab栏数据
const tabs = [{
// tab栏数据
const tabs = [{
name: `全部`,
value: 'all'
}, {
}, {
name: `待使用`,
value: 'delivery'
}, {
}, {
name: `已完成`,
value: 'comment'
}, {
}, {
name: `退款/售后`,
value: 'dqx'
}]
}]
export default {
export default {
components: {
MescrollBody,
CountDown
@ -328,16 +345,16 @@
onReject() {
let app = this
let form={}
form.orderId=app.orderId
form.reason=app.reason
let form = {}
form.orderId = app.orderId
form.reason = app.reason
OrderApi.shopReject(app.orderId,form)
OrderApi.shopReject(app.orderId, form)
.then(result => {
// 显示成功信息
app.$toast(result.message)
app.showRejectPopup=false
app.reason=''
app.showRejectPopup = false
app.reason = ''
// 刷新订单列表
app.onRefreshList()
})
@ -400,29 +417,29 @@
},
}
}
</script>
<style lang="scss" scoped>
.input {
.input {
background-color: #f9f9f9;
// height: 70rpx;
padding: 16rpx 20rpx;
font-size: 28rpx;
}
}
// 项目内容
.order-item {
// 项目内容
.order-item {
margin: 20rpx auto 20rpx auto;
padding: 30rpx 30rpx;
width: 94%;
box-shadow: 0 1rpx 5rpx 0px rgba(0, 0, 0, 0.05);
border-radius: 16rpx;
background: #fff;
}
}
// 项目顶部
.item-top {
// 项目顶部
.item-top {
display: flex;
justify-content: space-between;
font-size: 26rpx;
@ -435,10 +452,10 @@
.state-texts {
color: rgba(132, 132, 132, 1);
}
}
}
// 商品列表
.goods-list {
// 商品列表
.goods-list {
// 商品项
.goods-item {
@ -511,10 +528,10 @@
}
}
}
// 订单合计
.order-total {
// 订单合计
.order-total {
font-size: 26rpx;
vertical-align: bottom;
text-align: right;
@ -530,10 +547,10 @@
.money {
font-size: 28rpx;
}
}
}
// 订单操作
.btn-item {
// 订单操作
.btn-item {
padding: 6rpx 25rpx;
margin-left: 20rpx;
font-size: 28rpx;
@ -550,10 +567,10 @@
color: $main-bg;
border: 2px solid $main-bg;
}
}
}
// 弹出层 - 核销二维码
.qrcode-popup {
// 弹出层 - 核销二维码
.qrcode-popup {
padding: 36rpx 30rpx;
.title {
@ -574,5 +591,26 @@
}
}
}
.refund-view {
display: flex;
align-items: center;
justify-content: space-between;
.refund-tips{
font-size: 28rpx;
color: #4D0868;
}
.refund-view-btns {
display: flex;
align-items: flex-end;
justify-content: center;
:last-child{
margin-left: 15rpx;
}
}
}
</style>
Write Preview
Loading…
Cancel
Save