theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'cart' (#20) from zhy into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/20
This commit is contained in:
hansu 2020-06-10 16:08:44 +08:00
commit 19aaa9960e
5 changed files with 659 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

260
pageC/cart/ConfirmOrder.vue
View File

@ -1,6 +1,6 @@
<template>
<view class="order">
<view class="info-address">
<view class="info-address" @click="changeAddress">
<image src="../static/image/2.png" class="address-icon"></image>
<view class="address">
<view class="user-info">
@ -14,8 +14,9 @@
<view class="main">
<view class="goods-info">
<view class="store">
<image></image>
<image class="avatar"></image>
<view>胖胖的店</view>
<image src="../static/image/1.png" class="right"></image>
</view>
<view class="goods">
<view v-for="(goods, g_index) in 1" :key="g_index" class="goods-item">
@ -24,11 +25,7 @@
<view class="name u-line-2">木糖少女小紫薯西装领连衣裙夏季新款女装夏收腰格子格纹裙子</view>
<view class="cart-info">
<view class="price">￥99</view>
<view class="num">
<view class="reduce">-</view>
<view class="value">2</view>
<view class="increase">+</view>
</view>
<u-number-box :input-width="38" :input-height="39" :size="22" bg-color="#FFFFFF" color="#FF780F" :index="g_index"></u-number-box>
</view>
</view>
</view>
@ -36,71 +33,248 @@
</view>
<view class="order-info">
<view>
<view>优惠券折扣</view>
<view>
<view class="title">优惠券折扣</view>
<view class="value">
<view>-￥10.00</view>
<image src="../static/image/1.png"></image>
</view>
</view>
<view>
<view>配送方式</view>
<view>
<view class="title">配送方式</view>
<view class="value">
<view>快递</view>
<image src="../static/image/1.png"></image>
</view>
</view>
<view>
<view>支付方式</view>
<view>
<view class="title">支付方式</view>
<view class="value">
<view>微信</view>
<image src="../static/image/1.png"></image>
</view>
</view>
</view>
</view>
<view class="bottom">
<view class="left">
<view class="title">合计：</view>
<view class="price">￥9.80</view>
</view>
<view class="right">
<view class="num">共1件商品</view>
<view class="btn" @click="settlement">结算</view>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {}
}
},
methods: {
settlement() {
uni.navigateTo({
url: '/pageE/order/Details'
});
},
changeAddress() {
uni.navigateTo({
url: '/pageE/more/Address'
});
}
},
};
</script>
<style lang="scss" scoped>
.order {
min-height: calc(100vh - var(--window-top));
background-color: #ECECEC;
padding-top: 1rpx;
.info-address {
padding: 30rpx;
display: flex;
align-items: center;
margin-bottom: 10rpx;
background:rgba(255,255,255,1);
.address-icon {
width: 28rpx;
height: 34rpx;
margin-right: 31rpx;
flex-shrink: 0;
padding: 30rpx;
display: flex;
align-items: center;
margin-bottom: 10rpx;
background:rgba(255,255,255,1);
.address-icon {
width: 28rpx;
height: 34rpx;
margin-right: 31rpx;
flex-shrink: 0;
}
.address {
width: 570rpx;
.user-info {
display: flex;
align-items: center;
font-size: 28rpx;
color: rgba(51,51,51,1);
margin-bottom: 20rpx;
margin-right: 13rpx;
}
.address-right {
.user-info {
display: flex;
align-items: center;
font-size: 28rpx;
color: rgba(51,51,51,1);
margin-bottom: 20rpx;
margin-right: 13rpx;
}
.address-text {
font-size: 24rpx;
color: rgba(102,102,102,1);
line-height: 42rpx;
}
}
.right {
margin-left: auto;
width: 12rpx;
height: 22rpx;
.address-text {
font-size: 24rpx;
color: rgba(102,102,102,1);
line-height: 42rpx;
}
}
.right {
flex-shrink: 0;
margin-left: auto;
width: 12rpx;
height: 22rpx;
}
}
.main {
.goods-info {
background-color: #ffffff;
padding: 30rpx;
margin-bottom: 2rpx;
.store {
display: flex;
align-items: center;
margin-bottom: 20rpx;
.avatar {
width: 60rpx;
height: 60rpx;
border-radius: 50%;
border: 1rpx solid #000;
margin-right: 15rpx;
}
> view {
font-size: 28rpx;
color: rgba(51,51,51,1);
margin-right: 15rpx;
}
.right {
flex-shrink: 0;
width: 11rpx;
height: 22rpx;
}
}
.goods {
.goods-item {
display: flex;
align-items: center;
&:not(:last-child) {
margin-bottom: 20rpx;
}
> image {
margin-right: 30rpx;
width: 180rpx;
height: 160rpx;
border-radius: 10rpx;
background-color: aqua;
flex-shrink: 0;
}
.info {
// width: 418rpx;
height: 160rpx;
display: flex;
flex-direction: column;
justify-content: space-between;
.name {
font-size: 30rpx;
color: rgba(51,51,51,1);
}
.cart-info {
display: flex;
align-items: center;
justify-content: space-between;
.price {
font-size: 30rpx;
font-weight: 500;
color: rgba(255,49,49,1);
}
.u-numberbox {
border: 1rpx solid rgba(217,215,215,1);
border-radius:4px;
/deep/ .u-number-input {
margin: 0;
color: #333 !important;
border: 1rpx #D9D7D7 solid {
top: 0px;
bottom: 0px;
}
}
}
}
}
}
}
}
.order-info {
> view {
height: 98rpx;
background: rgba(255,255,255,1);
padding: 35rpx 30rpx;
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 2rpx;
.title {
font-size: 28rpx;
color: rgba(102,102,102,1);
}
.value {
display: flex;
align-items: center;
font-size: 30rpx;
color:rgba(51,51,51,1);
> image {
width: 12rpx;
height: 22rpx;
flex-shrink: 0;
margin-left: 20rpx;
}
}
}
}
}
.bottom {
padding: 35rpx 30rpx;
position: fixed;
bottom: 0;
left: 0;
width: 100%;
height: 98rpx;
background-color: rgba(255,255,255,1);
box-shadow: 0rpx 10rpx 14rpx 2rpx rgba(0, 0, 0, 0.34);
display: flex;
align-items: center;
justify-content: space-between;
.left {
display: flex;
align-items: center;
font-size: 30rpx;
.title {
color:rgba(153,153,153,1);
margin-right: 10rpx;
}
.price {
color: #F40E0E;
}
}
.right {
display: flex;
align-items: center;
.num {
font-size: 26rpx;
color: rgba(153,153,153,1);
margin-right: 50rpx;
}
.btn {
width: 160rpx;
height: 60rpx;
background: rgba(255,120,15,1);
border-radius: 30rpx;
font-size: 30rpx;
color: rgba(255,255,255,1);
line-height: 60rpx;
text-align: center;
}
}
}
}
</style>

65
pageC/cart/index.vue
View File

@ -18,11 +18,7 @@
<view class="name u-line-2">木糖少女小紫薯西装领连衣裙夏季新款女装夏收腰格子格纹裙子</view>
<view class="cart-info">
<view class="price">￥99</view>
<view class="num">
<view class="reduce">-</view>
<view class="value">2</view>
<view class="increase">+</view>
</view>
<u-number-box :input-width="38" :input-height="39" :size="22" bg-color="#FFFFFF" color="#FF780F" :index="g_index" @minus="reduce($event, s_index)" @plus="plus($event, s_index)"></u-number-box>
</view>
</view>
</view>
@ -40,7 +36,7 @@
<view class="title">合计：</view>
<view class="value">￥9.80</view>
</view>
<view class="cart-btn" v-if="status == '编辑'">结算</view>
<view class="cart-btn" v-if="status == '编辑'" @click="settlement">结算</view>
<view class="delete-btn" v-if="status == '完成'">删除</view>
</view>
</view>
@ -78,6 +74,17 @@ export default {
}
},
methods: {
reduce(value, store) {
console.log(value, store)
},
plus(value, store) {
console.log(value, store)
},
settlement() {
uni.navigateTo({
url: './ConfirmOrder'
});
},
totalChange(e) {
// 切换所有商品的状态
this.list.forEach(store => {
@ -215,31 +222,43 @@ export default {
font-weight: 500;
color: rgba(255,49,49,1);
}
.num {
display: flex;
width: 118rpx;
height: 39rpx;
.u-numberbox {
border: 1rpx solid rgba(217,215,215,1);
border-radius:4px;
.reduce, .increase {
flex: 1;
font-size: 11rpx;
color: #FF780F;
line-height: 39rpx;
text-align: center;
}
.value {
flex: 1;
font-size: 22rpx;
color:rgba(51,51,51,1);
line-height: 39rpx;
text-align: center;
/deep/ .u-number-input {
margin: 0;
color: #333 !important;
border: 1rpx #D9D7D7 solid {
top: 0px;
bottom: 0px;
}
}
}
// .num {
// display: flex;
// width: 118rpx;
// height: 39rpx;
// border: 1rpx solid rgba(217,215,215,1);
// border-radius:4px;
// .reduce, .increase {
// flex: 1;
// font-size: 11rpx;
// color: #FF780F;
// line-height: 39rpx;
// text-align: center;
// }
// .value {
// flex: 1;
// font-size: 22rpx;
// color:rgba(51,51,51,1);
// line-height: 39rpx;
// text-align: center;
// border: 1rpx #D9D7D7 solid {
// top: 0px;
// bottom: 0px;
// }
// }
// }
}
}
}

129
pageC/merchant/details.vue Normal file
View File

@ -0,0 +1,129 @@
<template>
<view class="details">
<view class="top">
<image></image>
<view class="name">店铺名称</view>
<view class="info">创建时间：2020年04月10日 | 浙江金华市</view>
<view class="num">
<view>
<view class="value">23435</view>
<view class="title">粉丝数</view>
</view>
<view>
<view class="value">23435</view>
<view class="title">评价</view>
</view>
<view>
<view class="value">23435</view>
<view class="title">信用等级</view>
</view>
</view>
</view>
<view class="bottom">
<view class="title">
<view>工商执照</view>
<image></image>
</view>
<view class="image-list">
<image></image>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {}
}
};
</script>
<style lang="scss" scoped>
.details {
min-height: calc(100vh - var(--window-top));
background-color: #ECECEC;
.top {
margin-top: 1rpx;
padding: 40rpx 80rpx;
text-align: center;
background-color: #ffffff;
> image {
width: 140rpx;
height: 140rpx;
border-radius: 70rpx;
margin-bottom: 29rpx;
background-color: aqua;
}
.name {
font-size: 28rpx;
font-weight: 500;
color: rgba(51,51,51,1);
margin-bottom: 29rpx;
}
.info {
font-size: 24rpx;
color: rgba(51,51,51,1);
margin-bottom: 37rpx;
}
.num {
display: flex;
justify-content: space-between;
> view {
text-align: center;
color: rgba(51,51,51,1);
position: relative;
&:not(:last-child)::after {
content: "";
position: absolute;
right: -77rpx;
top: 50%;
transform: translate(0, -50%);
width: 2rpx;
height: 60rpx;
background: rgba(51,51,51,1);
}
.value {
font-size: 32rpx;
font-weight: 500;
margin-bottom: 20rpx;
}
.title {
font-size: 24rpx;
}
}
}
}
.bottom {
.title {
padding: 30rpx;
display: flex;
align-items: center;
justify-content: space-between;
background-color: #ffffff;
margin-bottom: 1rpx;
> view {
font-size: 30rpx;
font-weight: 500;
color: rgba(51,51,51,1);
}
> image {
width: 24rpx;
height: 14rpx;
background-color: aqua;
}
}
.image-list {
background-color: #ffffff;
padding: 20rpx 30rpx;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
> image {
width: 239rpx;
height: 170rpx;
flex-shrink: 0;
background-color: aqua;
}
}
}
}
</style>

222
pageC/merchant/index.vue Normal file
View File

@ -0,0 +1,222 @@
<template>
<view class="merchant">
<view v-if="show">
<view>
<image></image>
<view>消息</view>
</view>
<view>
<image></image>
<view>首页</view>
</view>
<view>
<image></image>
<view>我的</view>
</view>
</view>
<view class="top">
<image></image>
<view class="info">
<view class="name u-line-1">小米官方旗舰店</view>
<view class="num">粉丝数：234</view>
</view>
<view class="btn">
<image></image>
<view>{{ 0 ? "关注" : "已关注" }}</view>
</view>
</view>
<view class="follow">
<view class="title">关注</view>
<scroll-view scroll-x class="list">
<view class="list-items">
<view v-for="(item, index) in 9" :key="index" class="item">
<image></image>
<view class="nickname u-line-1">用户昵称</view>
</view>
</view>
</scroll-view>
</view>
<view class="main">
<view class="classify" v-if="cur==0">
111
</view>
<view class="list" v-if="cur==1">
222
</view>
</view>
<view class="tabbar">
<view @click="cur=0">
<image></image>
<view>商品分类</view>
</view>
<view @click="cur=1">
<image></image>
<view>商品列表</view>
</view>
<view @click="toDetailsPage">
<image></image>
<view>店铺信息</view>
</view>
<view>
<image></image>
<view>联系客服</view>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
show: false,
cur: 0
}
},
methods: {
toDetailsPage() {
uni.navigateTo({
url: './details'
});
}
},
};
</script>
<style lang="scss" scoped>
.merchant {
min-height: 100vh;
background-color: #ECECEC;
padding-top: calc(350rpx - var(--window-top));
.top {
position: fixed;
top: 0;
left: 0;
z-index: 9;
width: 750rpx;
height: 350rpx;
background-color: #999999;
display: flex;
align-items: center;
padding: 168rpx 60rpx 0 30rpx;
> image {
margin-right: 40rpx;
width: 140rpx;
height: 140rpx;
border-radius: 50%;
background-color: aqua;
}
.info {
width: 220rpx;
color: rgba(255,255,255,1);
.name {
margin-bottom: 30rpx;
font-size: 28rpx;
font-weight: 500;
}
.num {
font-size: 24rpx;
}
}
.btn {
margin-left: auto;
width: 162rpx;
height: 60rpx;
border: 2rpx solid rgba(255,255,255,1);
border-radius: 30rpx;
display: flex;
align-items: center;
justify-content: center;
> image {
width: 28rpx;
height: 28rpx;
flex-shrink: 0;
margin-right: 14rpx;
background-color: aqua;
}
> view {
white-space: nowrap;
font-size: 26rpx;
color: rgba(255,255,255,1);
}
}
}
.follow {
background-color: #ffffff;
width: 100%;
margin-bottom: 20rpx;
height: 140rpx;
display: flex;
align-items: center;
padding: 20rpx 30rpx;
.title {
position: relative;
font-size: 30rpx;
font-weight: 500;
color: rgba(51,51,51,1);
margin: 0 30rpx;
&::before {
content: "";
position: absolute;
left: -14rpx;
top: 0;
width: 6rpx;
height: 30rpx;
background: rgba(255,120,15,1);
}
}
.list {
width: 570rpx;
display: flex;
align-items: center;
.list-items {
display: flex;
.item {
&:not(:last-child) {
margin-right: 35rpx;
}
text-align: center;
width: 90rpx;
> image {
width: 60rpx;
height: 60rpx;
border-radius: 50%;
flex-shrink: 0;
margin-bottom: 20rpx;
background-color: aqua;
}
.nickname {
font-size: 22rpx;
color: rgba(51,51,51,1);
}
}
}
}
}
.tabbar {
border-top: 1rpx #DBDADA solid;
width: 100%;
height: 98rpx;
background: rgb(95, 64, 64);
display: flex;
padding: 10rpx 55rpx;
position: fixed;
bottom: 0;
left: 0;
z-index: 9;
> view {
flex: 1;
text-align: center;
> image {
flex-shrink: 0;
width: 40rpx;
height: 40rpx;
margin-bottom: 15rpx;
background-color: aqua;
}
> view {
font-size: 24rpx;
color: rgba(153,153,153,1);
}
}
}
}
</style>

50
pages.json
View File

@ -139,6 +139,54 @@
}
}
},
{
"path": "merchant/index",
"style": {
"app-plus": {
"titleSize": "36px",
"titleNView": {
"titleColor": "#333333",
"backgroundColor": "rgba(255,255,255,0)",
"buttons": [
{
"type":"none",
"text":"...",
"float":"right",
"fontSize":"16"
},
{
"type":"none",
"text":"\ue582",
"float":"right",
"fontSize":"16"
}
],
"searchInput": {
"align": "left",
"borderRadius": "15px",
"placeholder": "搜索您需要的商品",
"backgroundColor": "rgb(236,236,236)",
"disabled": true
}
}
}
}
},
{
"path": "merchant/details",
"style": {
"navigationBarTitleText": "店铺信息",
"app-plus": {
"titleSize": "36px",
"titleNView": {
"titleColor": "#333333",
"backgroundColor": "#FFFFFF"
}
}
}
},
{
"path": "cart/ConfirmOrder",
@ -634,7 +682,7 @@
"selectedIconPath": "static/image/home2.png",
"text": "首页"
}, {
"pagePath": "pageC/classify/index",
"pagePath": "pages/API/index",
"iconPath": "static/image/mall.png",
"selectedIconPath": "static/image/mall2.png",
"text": "商城"