Commit 4bfb47db by 肖康

Merge branch 'master' of http://git.ichunt.net/xiaokang/H5_2.0

parents 344f8819 c81726c9
.page-userCoupon { .page-userCoupon {
padding-top: 88rpx;
.go-coupon { .go-coupon {
text-align: right; text-align: right;
font-size: 28rpx; font-size: 28rpx;
color: #1969f9; color: #1969f9;
} }
.tab {
background: #ffffff;
height: 88rpx;
margin-bottom: 16rpx;
.box {
position: relative;
height: 100%;
transition: all 0.4s ease;
.t1 {
font-size: 28rpx;
color: #484b59;
}
.t2 {
font-size: 28rpx;
color: #292b33;
font-weight: bold;
}
.t3 {
font-size: 24rpx;
color: #919399;
}
&.curr {
&::after {
position: absolute;
bottom: 0;
left: 0;
right: 0;
width: 53rpx;
height: 7rpx;
margin: 0 auto;
background: #1969f9;
border-radius: 4rpx;
content: '';
}
}
}
}
.list {
padding: 0 24rpx;
.box {
position: relative;
height: 176rpx;
background: #ffffff;
border-radius: 0px 10rpx 10rpx 0px;
margin-bottom: 16rpx;
.left {
width: 230rpx;
height: 176rpx;
background: url('https://img.ichunt.com/images/ichunt/202305/19/e8f03900544551d09436a542ee7d0ea0.png') no-repeat center;
background-size: cover;
.p1 {
margin-bottom: 8rpx;
.t1 {
font-size: 22rpx;
color: #ffffff;
}
.t2 {
margin-left: 10rpx;
font-size: 60rpx;
color: #ffffff;
}
}
.p2 {
font-size: 20rpx;
color: #ffffff;
}
}
.right {
padding-left: 24rpx;
.p1 {
margin-bottom: 16rpx;
.t1 {
font-size: 22rpx;
color: #484b59;
}
.t2 {
font-size: 22rpx;
color: #1969f9;
}
}
.p2 {
margin-bottom: 16rpx;
}
.p3 {
width: 142rpx;
height: 40rpx;
border-radius: 6rpx;
border: 1px solid #1969f9;
font-size: 22rpx;
color: #1969f9;
}
}
.type-1 {
position: absolute;
right: 0;
top: 0;
width: 82rpx;
height: 68rpx;
background: url('https://img.ichunt.com/images/ichunt/202305/19/f8fb5d9934fd1227ba807378939a5565.png') no-repeat center;
background-size: cover;
z-index: 99;
}
&.disabled {
.left {
background: url('https://img.ichunt.com/images/ichunt/202305/19/ebf691eb49a2a3dffe612baea352a7b6.png') no-repeat center;
background-size: cover;
}
}
}
}
}
.no-data {
image {
width: 356rpx;
height: 356rpx;
}
.tt {
margin-top: 32rpx;
font-size: 28rpx;
color: #292b33;
}
} }
<template> <template>
<view class="h5-nav row avarage verCenter"> <view class="h5-nav row avarage verCenter">
<text class="iconfont icon-arrleft"></text> <text class="iconfont icon-arrleft" v-back></text>
<text class="title">{{ title }}</text> <text class="title">{{ title }}</text>
<view class="bar"><slot name="title-bar"></slot></view> <view class="bar"><slot name="title-bar"></slot></view>
</view> </view>
......
...@@ -23,18 +23,18 @@ ...@@ -23,18 +23,18 @@
"navigationBarTitleText": "购物车" "navigationBarTitleText": "购物车"
} }
}, },
{ {
"path": "pages/classp/map", "path": "pages/classp/map",
"style": { "style": {
"navigationBarTitleText": "分类选型" "navigationBarTitleText": "分类选型"
} }
}, },
{ {
"path": "pages/classp/list", "path": "pages/classp/list",
"style": { "style": {
"navigationBarTitleText": "分类列表" "navigationBarTitleText": "分类列表"
} }
}, },
{ {
"path": "pages/mine/login", "path": "pages/mine/login",
"style": { "style": {
...@@ -70,6 +70,12 @@ ...@@ -70,6 +70,12 @@
"style": { "style": {
"navigationBarTitleText": "优惠券" "navigationBarTitleText": "优惠券"
} }
},
{
"path": "pages/mine/userAddress",
"style": {
"navigationBarTitleText": "收货地址"
}
} }
], ],
"globalStyle": { "globalStyle": {
......
...@@ -84,6 +84,8 @@ ...@@ -84,6 +84,8 @@
<script> <script>
import { Ichunt_Api, Api_Url, Code_Url } from '@/util/api.js'; import { Ichunt_Api, Api_Url, Code_Url } from '@/util/api.js';
import { setCookie, delCookie, startCountdown } from '@/util/util.js'; import { setCookie, delCookie, startCountdown } from '@/util/util.js';
import w_md5 from '@/util/md5.js';
export default { export default {
data() { data() {
return { return {
...@@ -106,7 +108,11 @@ export default { ...@@ -106,7 +108,11 @@ export default {
} }
}; };
}, },
onLoad() {}, onLoad() {
delCookie('Yo4teW_csrf');
delCookie('Yo4teW_gid');
delCookie('Yo4teW_uid');
},
methods: { methods: {
bindPickerChange: function(e) { bindPickerChange: function(e) {
console.log('picker发送选择改变,携带值为', e.detail.value); console.log('picker发送选择改变,携带值为', e.detail.value);
......
...@@ -65,10 +65,10 @@ ...@@ -65,10 +65,10 @@
<view class="list-tool"> <view class="list-tool">
<view class="title">服务与工具</view> <view class="title">服务与工具</view>
<view class="list-tool-wrap"> <view class="list-tool-wrap">
<view class="box column rowCenter verCenter"> <navigator class="box column rowCenter verCenter" url="/userAddress" hover-class="none">
<text class="iconfont icon-dzz"></text> <text class="iconfont icon-dzz"></text>
<text class="tt">地址管理</text> <text class="tt">地址管理</text>
</view> </navigator>
<view class="box column rowCenter verCenter"> <view class="box column rowCenter verCenter">
<text class="iconfont icon-fpp"></text> <text class="iconfont icon-fpp"></text>
<text class="tt">发票管理</text> <text class="tt">发票管理</text>
......
<template> <template>
<view class="page-userCoupon"> <view class="page-userCoupon">
<navElement title="我的优惠券" v-back> <navElement title="我的优惠券">
<template slot="title-bar"> <template slot="title-bar">
<view class="go-coupon">去领券</view> <navigator class="go-coupon" url="/user" hover-class="none">去领券</navigator>
</template> </template>
</navElement> </navElement>
<view class="tab row avarage verCenter">
<view class="box row rowCenter verCenter" @click="tab(index)" :class="{ curr: index == curr }" :key="index" v-for="(item, index) in text_arr">
<text class="t2">{{ item }}</text>
<text class="t3">(0)</text>
</view>
</view>
<template v-if="curr == 0">
<view class="list">
<view class="box row verCenter" v-for="(item, index) in 100" :key="index">
<view class="left column rowCenter verCenter">
<view class="p1">
<text class="t1"></text>
<text class="t2">10</text>
</view>
<view class="p2">满¥200可用</view>
</view>
<view class="right">
<view class="p1">
<text class="t1">适用于</text>
<text class="t2">全站</text>
<text class="t1">商品</text>
</view>
<view class="p2">2023.02.27-2023.04.01</view>
<view class="p3 row rowCenter verCenter">立即使用</view>
</view>
<text class="type-1"></text>
</view>
</view>
</template>
<template v-if="curr == 1">
<view class="list">
<view class="box row verCenter disabled" v-for="(item, index) in 100" :key="index">
<view class="left column rowCenter verCenter">
<view class="p1">
<text class="t1"></text>
<text class="t2">10</text>
</view>
<view class="p2">满¥200可用</view>
</view>
<view class="right">
<view class="p1"><text class="t1">新人优惠券</text></view>
<view class="p2">2023.02.27-2023.04.01</view>
</view>
</view>
</view>
</template>
<template v-if="curr == 2">
<view class="no-data column rowCenter verCenter">
<image src="../../static/nodate.png"></image>
<text class="tt">暂无优惠券信息</text>
</view>
</template>
</view> </view>
</template> </template>
...@@ -16,9 +68,18 @@ export default { ...@@ -16,9 +68,18 @@ export default {
components: { components: {
navElement navElement
}, },
data() {}, data() {
return {
curr: 0,
text_arr: ['未使用', '已使用', '已过期']
};
},
onLoad() {}, onLoad() {},
methods: {} methods: {
tab(index) {
this.curr = index;
}
}
}; };
</script> </script>
......
...@@ -43,20 +43,20 @@ const router = new Router({ ...@@ -43,20 +43,20 @@ const router = new Router({
title: '购物车' title: '购物车'
} }
}, },
{ {
path: '/pages/classp/map', path: '/pages/classp/map',
aliasPath: '/sitmap', aliasPath: '/sitmap',
meta: { meta: {
title: '分类选型' title: '分类选型'
} }
}, },
{ {
path: '/pages/classp/list', path: '/pages/classp/list',
aliasPath: '/optimum', aliasPath: '/optimum',
meta: { meta: {
title: '分类列表' title: '分类列表'
} }
}, },
{ {
path: '/pages/mine/login', path: '/pages/mine/login',
aliasPath: '/login', aliasPath: '/login',
...@@ -98,6 +98,13 @@ const router = new Router({ ...@@ -98,6 +98,13 @@ const router = new Router({
meta: { meta: {
title: '优惠券' title: '优惠券'
} }
},
{
path: '/pages/mine/userAddress',
aliasPath: '/userAddress',
meta: {
title: '收货地址'
}
} }
] ]
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment