Browse Source

签到;签到记录;申请售后;售后列表

home_hotList
whyneedname 2 years ago
parent
commit
55392884c6
  1. 102
      assets/css/style.css
  2. 142
      assets/css/style.less
  3. 9
      pages.json
  4. 167
      pages/order/GoodsReturn/index.vue
  5. 7
      pages/order/MyOrder/index.vue
  6. 5
      pages/order/OrderDetails/index.vue
  7. 116
      pages/order/OrderReturnDetail/index.vue
  8. 3
      pages/order/ReturnList/index.vue
  9. 220
      pages/order/ReturnList/listItem.vue
  10. 2
      pages/user/User/index.vue
  11. 17
      pages/user/signIn/Sign/index.vue
  12. 37
      pages/user/signIn/SignRecord/index.vue

102
assets/css/style.css

@ -3649,70 +3649,70 @@ page {
}
/*签到记录、账单明细列表*/
.sign-record .list .item .data {
font-size: 30rpx;
font-family: PingFang SC;
font-weight: 600;
color: #3A3A3C;
padding: 0rpx 32rpx;
height: 80rpx;
line-height: 80rpx;
padding: 0 30rpx;
font-size: 24rpx;
color: #666;
}
.sign-record .list .item .listn {
background-color: #fff;
font-size: 24rpx;
color: #999;
margin: 0rpx 32rpx;
background: #F5F6F8;
box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0, 0, 0, 0.15);
border-radius: 16rpx;
font-size: 20rpx;
font-family: 'PingFang SC';
font-weight: 500;
color: #999999;
line-height: 24rpx;
}
.sign-record .list .item .listn .itemn {
height: 120rpx;
border-bottom: 1px solid #eee;
padding-right: 30rpx;
margin-left: 30rpx;
height: 100rpx;
border-bottom: 2rpx solid #D8D8D8;
padding: 0rpx 30rpx;
}
.sign-record .list .item .listn .itemn .name {
width: 390rpx;
font-size: 28rpx;
color: #282828;
margin-bottom: 6rpx;
font-size: 24rpx;
font-weight: 500;
color: #3A3A3C;
line-height: 26rpx;
padding-bottom: 2rpx;
}
.sign-record .list .item .listn .itemn .num {
font-size: 36rpx;
font-family: 'GuildfordProBook 5';
color: #16ac57;
font-size: 24rpx;
font-family: 'PingFang SC';
font-weight: 600;
color: #3A3A3C;
line-height: 26rpx;
}
/*申请退货*/
.apply-return .list {
background-color: #fff;
margin-top: 18rpx;
margin: 20rpx 32rpx 46rpx;
padding: 24rpx 20rpx 0rpx;
background: #F5F6F8;
box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0, 0, 0, 0.15);
border-radius: 16rpx;
}
.apply-return .list .item {
margin-left: 30rpx;
padding-right: 30rpx;
min-height: 90rpx;
border-bottom: 1px solid #eee;
padding-bottom: 24rpx;
font-size: 30rpx;
color: #333;
font-family: 'PingFang SC';
font-weight: 600;
color: #3A3A3C;
line-height: 42rpx;
}
.apply-return .list .item .num {
color: #282828;
flex: 1;
text-align: right;
position: relative;
}
.apply-return .list .item .num .picker {
text-align: right;
}
.apply-return .list .item .num .iconfont {
color: #666;
font-size: 30rpx;
position: absolute;
right: 0;
top: 50%;
transform: translateY(-50%);
}
.apply-return .list .item.textarea {
padding: 30rpx 30rpx 30rpx 0;
font-size: 26rpx;
font-weight: 500;
color: #999999;
line-height: 38rpx;
}
.apply-return .list .item textarea {
height: 100rpx;
font-size: 30rpx;
width: 582rpx;
height: 110rpx;
}
.apply-return .list .item textarea::placeholder {
color: #bbb;
@ -3765,14 +3765,16 @@ page {
border: 1px solid #ddd;
}
.apply-return .returnBnt {
font-size: 32rpx;
color: #fff;
width: 690rpx;
height: 86rpx;
border-radius: 50rpx;
width: 686rpx;
height: 70rpx;
border-radius: 16rpx;
font-size: 26rpx;
font-family: PingFang SC;
font-weight: 500;
color: #F5F6F8;
line-height: 70rpx;
text-align: center;
line-height: 86rpx;
margin: 43rpx auto;
margin: 0rpx auto;
}
/*退货列表*/
.return-list .goodWrapper {

142
assets/css/style.less

@ -6582,81 +6582,118 @@ page {
/*签到记录、账单明细列表*/
.sign-record .list .item .data {
font-size: 30rpx;
font-family: PingFang SC;
font-weight: 600;
color: #3A3A3C;
// line-height: 19px;
padding: 0rpx 32rpx;
height: 0.8 * 100rpx;
line-height: 0.8 * 100rpx;
padding: 0 0.3 * 100rpx;
font-size: 0.24 * 100rpx;
color: #666;
}
.sign-record .list .item .listn {
background-color: #fff;
font-size: 0.24 * 100rpx;
color: #999;
margin: 0rpx 32rpx;
background: #F5F6F8;
box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0,0,0,0.15);
border-radius: 16rpx;
font-size: 20rpx;
font-family: 'PingFang SC';
font-weight: 500;
color: #999999;
line-height: 24rpx;
// background-color: #fff;
// font-size: 0.24 * 100rpx;
// color: #999;
}
.sign-record .list .item .listn .itemn {
height: 1.2 * 100rpx;
border-bottom: 1px solid #eee;
padding-right: 0.3 * 100rpx;
margin-left: 0.3 * 100rpx;
height: 100rpx;
border-bottom: 2rpx solid #D8D8D8;
padding: 0rpx 30rpx;
// margin-left: 0.3 * 100rpx;
}
.sign-record .list .item .listn .itemn .name {
width: 3.9 * 100rpx;
font-size: 0.28 * 100rpx;
color: #282828;
margin-bottom: 0.06 * 100rpx;
font-size: 24rpx;
font-weight: 500;
color: #3A3A3C;
line-height: 26rpx;
padding-bottom: 2rpx;
// font-size: 0.28 * 100rpx;
// color: #282828;
// margin-bottom: 0.06 * 100rpx;
}
.sign-record .list .item .listn .itemn .num {
font-size: 0.36 * 100rpx;
font-family: 'GuildfordProBook 5';
color: #16ac57;
font-size: 24rpx;
font-family: 'PingFang SC';
font-weight: 600;
color: #3A3A3C;
line-height: 26rpx;
// font-size: 0.36 * 100rpx;
// font-family: 'GuildfordProBook 5';
// color: #16ac57;
}
/*申请退货*/
.apply-return .list {
background-color: #fff;
margin-top: 0.18 * 100rpx;
margin: 20rpx 32rpx 46rpx;
padding: 24rpx 20rpx 0rpx;
background: #F5F6F8;
box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0,0,0,0.15);
border-radius: 16rpx;
}
.apply-return .list .item {
margin-left: 0.3 * 100rpx;
padding-right: 0.3 * 100rpx;
min-height: 0.9 * 100rpx;
border-bottom: 1px solid #eee;
font-size: 0.3 * 100rpx;
color: #333;
padding-bottom: 24rpx;
font-size: 30rpx;
font-family: 'PingFang SC';
font-weight: 600;
color: #3A3A3C;
line-height: 42rpx;
// margin-left: 0.3 * 100rpx;
// min-height: 0.9 * 100rpx;
// border-bottom: 1px solid #eee;
}
.apply-return .list .item .num {
color: #282828;
flex: 1;
text-align: right;
position: relative;
font-size: 26rpx;
font-weight: 500;
color: #999999;
line-height: 38rpx;
// flex: 1;
// text-align: right;
// position: relative;
}
.apply-return .list .item .num .picker {
text-align: right;
}
// .apply-return .list .item .num .picker {
// text-align: right;
// }
.apply-return .list .item .num .iconfont {
color: #666;
font-size: 0.3 * 100rpx;
position: absolute;
right: 0;
top: 50%;
transform: translateY(-50%);
}
// .apply-return .list .item .num .iconfont {
// color: #666;
// font-size: 0.3 * 100rpx;
// position: absolute;
// right: 0;
// top: 50%;
// transform: translateY(-50%);
// }
.apply-return .list .item.textarea {
padding: 0.3 * 100rpx 0.3 * 100rpx 0.3 * 100rpx 0;
}
// .apply-return .list .item.textarea {
// padding: 0.3 * 100rpx 0.3 * 100rpx 0.3 * 100rpx 0;
// }
.apply-return .list .item textarea {
height: 1 * 100rpx;
font-size: 0.3 * 100rpx;
width: 582rpx;
height: 110rpx;
}
.apply-return .list .item textarea::placeholder {
@ -6720,14 +6757,17 @@ page {
}
.apply-return .returnBnt {
font-size: 0.32 * 100rpx;
color: #fff;
width: 6.9 * 100rpx;
height: 0.86 * 100rpx;
border-radius: 0.5 * 100rpx;
width: 686rpx;
height: 70rpx;
// background: #2DB5AE;
border-radius: 16rpx;
font-size: 26rpx;
font-family: PingFang SC;
font-weight: 500;
color: #F5F6F8;
line-height: 70rpx;
text-align: center;
line-height: 0.86 * 100rpx;
margin: 0.43 * 100rpx auto;
margin: 0rpx auto;
}
/*退货列表*/

9
pages.json

@ -199,7 +199,8 @@
{
"path": "pages/user/signIn/SignRecord/index",
"style": {
"navigationBarTitleText": "签到记录"
"navigationBarTitleText": "签到记录",
"navigationStyle": "custom"
}
},
{
@ -319,7 +320,8 @@
{
"path" : "pages/order/OrderReturnDetail/index",
"style": {
"navigationBarTitleText": "售后详情"
"navigationBarTitleText": "售后详情",
"navigationStyle": "custom"
}
},
{
@ -338,7 +340,8 @@
{
"path": "pages/order/GoodsReturn/index",
"style": {
"navigationBarTitleText": "商品退货"
"navigationBarTitleText": "申请售后",
"navigationStyle": "custom"
}
},
{

167
pages/order/GoodsReturn/index.vue

@ -1,9 +1,22 @@
<!-- 售后提交 -->
<template>
<view class="apply-return">
<view class="header">
<cu-custom :isBack="true" :isCenter="true">
<block slot="backText">
<view class="backImg">
<image src="@/static/images/back-btn.png" mode=""></image>
</view>
</block>
<block slot="content">
<view class="tab-title">申请售后</view>
</block>
</cu-custom>
</view>
<!-- 申请售后 -->
<view class="container" v-if="selected">
<view class="goodsStyle acea-row row-between"
<!-- <view class="goodsStyle acea-row row-between"
v-for="cart in selectProduct"
:key="cart.id"
>
@ -23,40 +36,84 @@
<view class="num">x{{ cart.cartNum }}</view>
</view>
</view>
</view>
</view> -->
<view class="list">
<view v-if="serviceType === 1" class="item acea-row row-between-wrapper">
<view class="item acea-row row-between-wrapper">
<view>退款原因</view>
<picker :value="reason" :range="reasonList" @change="changeReason">
<view class="info acea-row row-between-wrapper">
<view class="num">{{reason || '请选择退货原因'}}</view>
<image src="@/static/images/right-grey.png" mode=""></image>
<!-- <text class="iconfont icon-jiantou"></text> -->
</view>
</picker>
</view>
<view class="item textarea">
<view>问题描述</view>
<view class="info acea-row">
<image src="../../../static/images/write-icon.png" mode=""></image>
<textarea class="num"
placeholder="请告诉我们问题描述吧!"
placeholder-style="font-size:24rpx;color: #999999;line-height:32rpx;font-weight:400;"
maxlength="150"
v-model="refund_reason_wap_explain"
></textarea>
<view class="text-num">{{refund_reason_wap_explain.length}}/150</view>
</view>
</view>
<view class="item">
<view>联系方式</view>
<view class="info-item acea-row row-between-wrapper">
<view>联系方式</view>
<view class="info">
<input type="text" placeholder="请输入姓名" placeholder-style="font-size:26rpx;color:#999999;line-height:62rpx;" v-model="userName">
</view>
</view>
<view class="info-item acea-row row-between-wrapper">
<view>联系电话</view>
<view class="info">
<input type="text" placeholder="请输入联系电话" placeholder-style="font-size:26rpx;color:#999999;line-height:62rpx;" v-model="phoneNumber">
</view>
</view>
</view>
<!-- <view v-if="serviceType === 1" class="item acea-row row-between-wrapper">
<view>退货件数</view>
<view class="num">{{ totalNum || 0 }}</view>
</view>
<view class="item acea-row row-between-wrapper">
<view>退款金额</view>
<view class="num">{{ totalMoney || 0 }}</view>
</view>
<picker :value="reason" :range="reasonList" @change="changeReason">
</view> -->
<!-- <picker :value="reason" :range="reasonList" @change="changeReason">
<view class="item acea-row row-between-wrapper">
<view>退款原因</view>
<view class="num">{{reason}}</view>
<text class="iconfont icon-jiantou"></text>
</view>
</picker>
<view class="item textarea acea-row row-between">
</picker> -->
<!-- <view class="item textarea acea-row row-between">
<view>备注说明</view>
<textarea class="num"
placeholder="填写备注信息,100字以内"
v-model="refund_reason_wap_explain"
></textarea>
</view>
</view> -->
</view>
<view v-if="serviceType === 0"
<view class="returnBnt bg-color-red" @click="submit">提交</view>
<!-- <view v-if="serviceType === 0"
class="returnBnt bg-color-red"
@click="submit"
>申请退款</view>
<view v-if="serviceType === 1"
class="returnBnt bg-color-red"
@click="submit"
>申请退货</view>
>申请退货</view> -->
</view>
<!-- 选择商品 -->
<view class="selectProduct" v-else>
<view class="selectContainer"
@ -66,7 +123,7 @@
<view class="checkbox-wrapper">
<checkbox-group @change="switchSelect(index)">
<label class="well-check">
<checkbox color="#eb3729" value :checked="cart.checked"></checkbox>
<checkbox value :checked="cart.checked"></checkbox>
</label>
</checkbox-group>
</view>
@ -97,7 +154,6 @@
<checkbox-group @change="allChecked">
<label class="well-check">
<checkbox
color="#eb3729"
value="allSelect"
:checked="isAllSelect"
></checkbox>
@ -115,7 +171,7 @@
</view>
<view class="typeBtn">
<view class="button def" @click="chooseType(0)">仅退款</view>
<view class="button redBtn" @click="chooseType(1)">退货退款</view>
<view class="button bg-color-red" @click="chooseType(1)">退货退款</view>
</view>
</view>
</view>
@ -163,7 +219,9 @@ export default {
productParamList: [],
totalNum: 0,
totalMoney: 0,
isAllSelect: false
isAllSelect: false,
userName: '',
phoneNumber: '',
};
},
mounted() {
@ -206,6 +264,8 @@ export default {
});
return
}
this.userName = res.data.realName;
this.phoneNumber = res.data.userPhone;
uni.hideLoading()
})
.catch(err => {
@ -297,7 +357,82 @@ export default {
};
</script>
<style lang="scss" scoped>
<style lang="less" scoped>
.header {
.tab-title {
font-size: 32rpx;
font-family: PingFang SC;
font-weight: 600;
color: #2DB5AE;
line-height: 42rpx;
}
.backImg {
width: 88rpx;
height: 62rpx;
padding-left: 26rpx;
image {
width: 100%;
height: 100%;
}
}
}
.apply-return .list .item {
.info-item {
font-size: 26rpx;
font-weight: 500;
color: #3A3A3C;
line-height: 38rpx;
padding-bottom: 24rpx;
input {
height: 62rpx;
font-size: 26rpx;
font-family: PingFang SC;
font-weight: 500;
color: #999999;
line-height: 62rpx;
}
}
.info-item:first-child {
padding-top: 20rpx;
}
.info {
width: 506rpx;
height: 62rpx;
background: #F1F1F1;
border-radius: 16rpx;
padding: 0rpx 16rpx;
image {
width: 32rpx;
height: 32rpx;
}
}
}
.apply-return .list .item.textarea .info {
margin-top: 20rpx;
width: 646rpx;
height: 170rpx;
box-shadow: inset 0rpx 0rpx 10rpx 0rpx rgba(0,0,0,0.15);
border-radius: 16rpx;
position: relative;
padding: 16rpx;
.num {
font-size: 24rpx;
font-weight: 600;
line-height: 32rpx;
}
.text-num {
position: absolute;
bottom: 16rpx;
right: 16rpx;
font-size: 24rpx;
font-family: PingFang SC;
font-weight: 500;
color: #999999;
line-height: 32rpx;
}
}
.apply-return{
.selectProduct{
margin-bottom: 180rpx;
@ -335,7 +470,7 @@ export default {
margin-top: 10rpx;
display: flex;
view{
color: #EB3729;
color: #2DB5AE;
}
}
}

7
pages/order/MyOrder/index.vue

@ -16,6 +16,9 @@
<view class="content-box" :style="'height:calc(100vh - '+CustomBar+'px);'">
<view class="content">
<view class="nav acea-row row-around" :style="'top:calc('+CustomBar+'px+2px)'">
<view class="item" @click="changeType(-1)">
<view :class="'title ' + (type == -1? 'active' : '')">全部</view>
</view>
<view class="item" @click="changeType(0)">
<view :class="'title ' + (type == 0? 'active' : '')">待付款</view>
</view>
@ -28,9 +31,9 @@
<view class="item" @click="changeType(3)">
<view :class="'title acea-row row-middle ' + (type === 3 ? 'active' : '')">待评价</view>
</view>
<view class="item" @click="changeType(4)">
<!-- <view class="item" @click="changeType(4)">
<view :class="'title acea-row row-middle ' + (type === 4 ? 'active' : '')">已完成</view>
</view>
</view> -->
</view>
<view class="list">

5
pages/order/OrderDetails/index.vue

@ -33,9 +33,10 @@
</view>
<view class="data" :class="refundOrder ? 'on' : ''">
<view class="" v-if="status.type === 0 || status.type === 9">{{ orderInfo._status._msg }}</view>
<view class="" v-else-if="status.type === 1 || status.type === 2">{{ orderInfo.deliveryName }}</view>
<view class="" v-else-if="status.type === 1">{{ orderInfo._status._msg }}</view>
<view class="" v-else-if="status.type === 2">{{ orderInfo.deliveryName }}</view>
<view class="" v-else-if="status.type === 3 || status.type === 4">您已签收</view>
<view class="tip">未付款订单超时将关闭</view>
<view class="tip" v-if="status.type === 0">未付款订单超时将关闭</view>
<!-- <view class="state">{{ orderInfo._status._msg }}</view>
<view>{{ orderInfo.createTime || '' }}</view> -->
</view>

116
pages/order/OrderReturnDetail/index.vue

@ -1,6 +1,46 @@
<template>
<view class="returnList">
<view class="data bgRed">
<view class="returnList">
<view class="header">
<cu-custom :isBack="true" :isCenter="true">
<block slot="backText">
<view class="backImg">
<image src="@/static/images/back-btn.png" mode=""></image>
</view>
</block>
<block slot="content">
<view class="tab-title">售后详情</view>
</block>
</cu-custom>
</view>
<view class="content-box">
<view class="top-info">
<view>服务单号{{orderDetail.orderCode}}</view>
<view>申请时间{{orderDetail.createTime}}</view>
</view>
<view class="current-progress-title acea-row row-between-wrapper">
<view class="progress-title">当前进度</view>
<!-- <view class=""></view> -->
<view v-if="orderDetail.salesState === 0">
<view class="progress-text" v-if="orderDetail.state === 0">已提交申请请耐心等待卖家处理</view>
<view v-if="orderDetail.state === 1">
<view class="progress-text" v-if="orderDetail.serviceType === 0">已通过平台审核,正在退款</view>
<view class="progress-text" v-if="orderDetail.serviceType === 1">已通过平台审核 ,请填写退货物流</view>
</view>
<view class="progress-text" v-if="orderDetail.state === 2">已发货等待商家审核</view>
<view class="progress-text" v-if="orderDetail.state === 3">售后订单已完成</view>
</view>
<view class="progress-text" v-if="orderDetail.salesState === 1">已撤销售后订单</view>
<view class="progress-text" v-if="orderDetail.salesState === 2">商家已拒绝售后申请</view>
</view>
<view class="current-progress">
</view>
</view>
<!-- <view class="data bgRed">
<view v-if="orderDetail.salesState === 0">
<view class="state" v-if="orderDetail.state === 0">
已提交申请请耐心等待卖家处理
@ -26,7 +66,7 @@
<view v-if="orderDetail.salesState === 2">
商家已拒绝售后申请
</view>
</view>
</view> -->
<!-- 退款总金额 -->
<view class="money">
<view class="top">
@ -187,14 +227,74 @@ export default {
}
</script>
<style scoped lang="scss">
$red: #eb3729;
<style scoped lang="less">
.header {
.tab-title {
font-size: 32rpx;
font-family: PingFang SC;
font-weight: 600;
color: #2DB5AE;
line-height: 42rpx;
}
.backImg {
width: 88rpx;
height: 62rpx;
padding-left: 26rpx;
image {
width: 100%;
height: 100%;
}
}
}
.content-box {
margin: 20rpx 32rpx;
padding: 20rpx 20rpx;
// width: 343px;
// height: 427px;
background: #F5F6F8;
box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0,0,0,0.15);
border-radius: 16rpx;
.top-info {
padding-bottom: 30rpx;
font-size: 24rpx;
font-family: PingFang SC;
font-weight: 500;
color: #3A3A3C;
line-height: 32rpx;
view:first-child {
padding-bottom: 6rpx;
}
}
.current-progress-title {
width: 646rpx;
height: 56rpx;
padding: 0rpx 16rpx;
border-radius: 16rpx;
border: 2rpx solid #2DB5AE;
font-size: 24rpx;
font-family: PingFang SC;
font-weight: 600;
color: #2DB5AE;
line-height: 32rpx;
.progress-title {
padding-right: 14rpx;
border-right: 2rpx solid #2DB5AE;
}
.progress-text {
width: 484rpx;
font-weight: 500;
}
}
}
@red: #2DB5AE;
.returnList {
.colorRed {
color: $red;
color: @red;
}
.bgRed {
background-color: $red;
background-color: @red;
}
.data {
width: 100%;
@ -256,7 +356,7 @@ $red: #eb3729;
}
.redBtn {
color: #fff;
background-color: $red;
background-color: @red;
}
}
}

3
pages/order/ReturnList/index.vue

@ -139,6 +139,9 @@ export default {
overflow-y: scroll;
background: #FFFFFF;
border-radius: 28rpx 28rpx 0rpx 0rpx;
.list {
padding-top: 76rpx;
}
}
}

220
pages/order/ReturnList/listItem.vue

@ -1,37 +1,43 @@
<!-- 售后列表内容 -->
<template>
<view class="productItem">
<view class="title">
<view class="shopName">
订单号{{ item.orderCode }}
</view>
<view class="title acea-row row-between-wrapper">
<view class="shopName">订单编号:{{ item.orderCode }}</view>
<view class="">申请时间:{{item.createTime}}</view>
</view>
<view class="content" v-for="(i, index) in item.cartInfo">
<view class="content acea-row" v-for="(i, index) in item.cartInfo" :key="i.id">
<image class="img"
:src="i.productInfo.image"
mode=""
mode="aspectFill"
@click.stop="goGoodsCon(i)"
></image>
<view class="info">
<view class="infoTitle">
<view class="infoTitle line1">
{{ i.productInfo.storeName }}
</view>
<view class="acea-row">
<view class="sku">{{ i.productInfo.attrInfo.sku || '' }}</view>
</view>
<view class="money-num acea-row row-between">
<view>{{ i.productInfo.price }}</view>
<view class="num">x{{ i.cartNum }}</view>
</view>
<view class="infoSku">
<!-- <view class="infoSku">
<view class="sku">
{{ i.productInfo.attrInfo.sku || '' }}
</view>
<view class="num">
x {{ 1 }}
</view>
</view>
<view class="infoMoney">
</view> -->
<!-- <view class="infoMoney">
退款<view class="red">
{{ i.productInfo.price }}
</view>
</view>
</view> -->
</view>
</view>
<view class="money">
<view class="money acea-row row-between-wrapper">
<view class="status">
<view v-if="item.salesState === 0">
<view v-if="item.state === 0">商家处理中</view>
@ -45,20 +51,24 @@
<view v-if="item.salesState === 2">
商家拒绝
</view>
</view>
<view class="refundMoney">
</view>
<view class="btns">
<view class="button redBtn" @click="toDetail(item)">查看详情</view>
</view>
<!-- <view class="refundMoney">
退款<view class="red">
{{ item.refundAmount }}
</view>
</view>
</view> -->
</view>
<view class="btns">
<!-- <view class="btns">
<view class="button def"
@click="toDetail"
v-if="item.state === 2"
>删除记录</view>
<view class="button redBtn" @click="toDetail(item)">查看详情</view>
</view>
</view> -->
</view>
</template>
@ -97,73 +107,133 @@ export default {
</script>
<style lang="scss" scoped>
.productItem{
margin: 10rpx 0;
background-color: #FFF;
.title{
height: 80rpx;
padding: 0 30rpx;
color: #333;
font-size: 28rpx;
display: flex;
justify-content: space-between;
align-items: center;
.productItem{
margin: 20rpx 32rpx;
padding: 20rpx;
// width: 343px;
// height: 291px;
background: #F5F6F8;
box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0,0,0,0.15);
border-radius: 16rpx;
// background-color: #FFF;
.title{
font-size: 20rpx;
font-family: PingFang SC;
font-weight: 600;
color: #3A3A3C;
line-height: 26rpx;
padding-bottom: 34rpx;
// height: 80rpx;
// padding: 0 30rpx;
// color: #333;
// font-size: 28rpx;
// display: flex;
// justify-content: space-between;
// align-items: center;
}
.content{
padding: 20rpx 30rpx;
border: 2rpx solid #F3F4F5;
display: flex;
.img{
width: 180rpx;
height: 180rpx;
padding-bottom: 20rpx;
// padding: 20rpx 30rpx;
// border: 2rpx solid #F3F4F5;
// display: flex;
.img {
width: 164rpx;
height: 164rpx;
border-radius: 12rpx;
}
.info{
flex: 1;
margin-left: 16rpx;
.info {
// flex: 1;
width: 462rpx;
margin-left: 20rpx;
display: flex;
flex-direction: column;
justify-content: space-around;
.infoTitle{
width: 100%;
height: 80rpx;
font-size: 28rpx;
color: #333333;
overflow: hidden;
text-overflow: ellipsis;
}
.infoSku{
font-size: 24rpx;
color: #999999;
display: flex;
justify-content: space-between;
}
.infoMoney{
font-size: 24rpx;
height: 42rpx;
font-size: 26rpx;
font-family: PingFang SC;
font-weight: 500;
color: #3A3A3C;
line-height: 38rpx;
margin-bottom: 18rpx;
// overflow: hidden;
// text-overflow: ellipsis;
}
.sku {
padding: 0rpx 16rpx;
height: 46rpx;
background: #E3E3E3;
border-radius: 8rpx;
font-size: 20rpx;
color: #999999;
line-height: 46rpx;
}
.money-num {
font-size: 30rpx;
font-family: Futura;
font-weight: 600;
color: #3A3A3C;
line-height: 40rpx;
padding-top: 18rpx;
.num {
font-size: 24rpx;
font-family: PingFang SC;
font-weight: 500;
color: #999999;
line-height: 32rpx;
}
}
// .infoSku{
// font-size: 24rpx;
// color: #999999;
// display: flex;
// justify-content: space-between;
// }
// .infoMoney{
// font-size: 24rpx;
// }
}
}
.money{
height: 80rpx;
padding: 0 30rpx;
font-size: 28rpx;
font-family: PingFang SC;
color: #333333;
border: 2rpx solid #F3F4F5;
display: flex;
justify-content: space-between;
align-items: center;
.money{
font-size: 24rpx;
font-family: PingFang SC;
font-weight: 500;
color: #3A3A3C;
line-height: 32rpx;
// height: 80rpx;
// padding: 0 30rpx;
// font-size: 28rpx;
// font-family: PingFang SC;
// color: #333333;
// border: 2rpx solid #F3F4F5;
// display: flex;
// justify-content: space-between;
// align-items: center;
}
.btns{
padding: 20rpx 30rpx;
display: flex;
justify-content: flex-end;
.button{
width: 160rpx;
height: 58rpx;
margin: 0 10rpx;
border-radius: 180rpx;
font-size: 24rpx;
line-height: 54rpx;
// padding: 20rpx 30rpx;
// display: flex;
// justify-content: flex-end;
.button{
width: 166rpx;
height: 52rpx;
border-radius: 16rpx;
font-size: 24rpx;
font-family: PingFang SC;
font-weight: 500;
color: #2DB5AE;
line-height: 48rpx;
// width: 160rpx;
// height: 58rpx;
// margin: 0 10rpx;
// border-radius: 180rpx;
// font-size: 24rpx;
// line-height: 54rpx;
text-align: center;
}
.def{
@ -171,14 +241,14 @@ export default {
border: 2rpx solid #DDDDDD;
}
.redBtn{
color: #FFF;
background-color: #EB3729;
border: 2rpx solid #EB3729;
// color: #FFF;
// background-color: #2DB5AE;
border: 2rpx solid #2DB5AE;
}
}
.red{
display: inline-block;
color: #EB3729;
color: #2DB5AE;
}
}
</style>

2
pages/user/User/index.vue

@ -119,7 +119,7 @@
<view class="myOrder">
<view class="title acea-row row-between-wrapper">
<text>我的订单</text>
<view @click="goMyOrder()" class="allOrder acea-row row-middle">
<view @click="goMyOrder(-1)" class="allOrder acea-row row-middle">
<view>全部订单</view>
<view class="jiantou-right"></view>
</view>

17
pages/user/signIn/Sign/index.vue

@ -23,7 +23,7 @@
<view class="text">
<view class="">积分</view>
<view class="integral">{{ userInfo.integral || 0 }}</view>
<view class="">今日未签到签到可得40积分</view>
<view class="" v-if="!userInfo.isDaySign">今日未签到签到可得{{signSystemList[sign_index].sign_num || 0}}积分</view>
</view>
<view @click="goSignRecord()" class="right acea-row row-between-wrapper">
<image src="../../../../static/images/mingxi.png" mode=""></image>
@ -33,7 +33,11 @@
<view class="signList-box acea-row row-between-wrapper">
<view class="item" v-for="(item, signSystemListIndex) in signSystemList" :key="signSystemListIndex">
<view :class="signSystemListIndex + 1 === signSystemList.length ? 'rewardTxt day' : 'day'">{{ item.day }}</view>
<view :class="'acea-row row-column row-center day ' + (sign_index >= signSystemListIndex + 1 ? 'rewardTxt' : '')">
<text class="">{{ item.day.split(' ')[0] }}</text>
<text style="font-size: 16rpx;">{{ item.day.split(' ')[1] }}</text>
</view>
<!-- <view :class="signSystemListIndex + 1 === signSystemList.length ? 'rewardTxt day' : 'day'">{{ item.day }}</view> -->
<!-- <view class="venus" :class=" (signSystemListIndex + 1 === signSystemList.length ? 'reward' : '') +' ' + (sign_index >= signSystemListIndex + 1 ? 'venusSelect' : '')"></view> -->
<view class="num" :class="sign_index >= signSystemListIndex + 1 ? 'on' : ''">+{{ item.sign_num }}</view>
</view>
@ -43,10 +47,10 @@
<view class="wrapper acea-row row-column row-middle">
<view class="tip">已累计签到</view>
<view class="num-box acea-row row-center row-bottom">
<view class="item" v-for="(item, signCountIndex) in signCount" :key="signCountIndex">
<view class="item" v-for="(item, signCountIndex) in signCount.length" :key="signCountIndex">
<view class="top"></view>
<view class="bottom"></view>
<view class="num">{{ item || 0 }}</view>
<view class="num">{{ signCount[item] || 0 }}</view>
</view>
<view class="data"></view>
</view>
@ -245,7 +249,7 @@
font-family: Futura;
font-weight: bold;
color: #FFFFFF;
line-height: 76rpx;
// line-height: 76rpx;
}
.day.rewardTxt {
background: linear-gradient(135deg, #39D396 0%, #1B8DCC 100%);
@ -430,7 +434,8 @@
res.data.integral = parseInt(res.data.integral);
var sumSginDay = res.data.sumSignDay;
that.userInfo = res.data;
that.signCount = that.PrefixInteger(sumSginDay, 4);
that.signCount = String(res.data.sumSignDay);
// that.signCount = that.PrefixInteger(sumSginDay, 4);
that.sign_index = parseInt(res.data.signNum);
});
},

37
pages/user/signIn/SignRecord/index.vue

@ -1,5 +1,18 @@
<template>
<view class="sign-record" ref="container">
<view class="header">
<cu-custom :isBack="true" :isCenter="true">
<block slot="backText">
<view class="backImg">
<image src="@/static/images/back-btn.png" mode=""></image>
</view>
</block>
<block slot="content">
<view class="tab-title">签到记录</view>
</block>
</cu-custom>
</view>
<view class="list">
<view class="item" v-for="(item, signListIndex) in signList" :key="signListIndex">
<view class="data">{{ item.time }}</view>
@ -13,7 +26,7 @@
<view class="name line1">{{ itemn.title }}</view>
<view>{{ itemn.addTime }}</view>
</view>
<view class="num font-color-red">+{{ itemn.number }}</view>
<view class="num">积分+{{ itemn.number }}</view>
</view>
</view>
</view>
@ -56,10 +69,30 @@ export default {
that.loading = false;
//apply();js;
that.signList.push.apply(that.signList, res.data.list);
that.loadend = res.data.length < that.limit; //
that.loadend = res.data.list.length < that.limit; //
that.page = that.page + 1;
});
}
}
};
</script>
<style lang="less" scoped>
.header {
.tab-title {
font-size: 32rpx;
font-family: PingFang SC;
font-weight: 600;
color: #2DB5AE;
line-height: 42rpx;
}
.backImg {
width: 88rpx;
height: 62rpx;
padding-left: 26rpx;
image {
width: 100%;
height: 100%;
}
}
}
</style>

Loading…
Cancel
Save