diff --git a/components/store-staff/store-staff.vue b/components/store-staff/store-staff.vue
index 33e6b85..9f1a4b7 100644
--- a/components/store-staff/store-staff.vue
+++ b/components/store-staff/store-staff.vue
@@ -1,6 +1,25 @@
- 员工
+ 员工啦
+
+
diff --git a/pages/goods/details.vue b/pages/goods/details.vue
index 969bd5c..6d40c86 100644
--- a/pages/goods/details.vue
+++ b/pages/goods/details.vue
@@ -17,7 +17,7 @@
￥{{goodsObj.price.show}}
累计易货{{goodsObj.sales}}次
-
+
{{item.title}}
@@ -28,47 +28,54 @@
热卖{{goodsObj.name}}
-
-
+
+
-
- {{goodsObj.shop.name}}
-
-
-
- 进店
-
+
+ {{goodsObj.shop.name}}
+
+
+
+ 进店
+
区块链证书
+
商品认证
+
商品溯源
+
-
+
-
+
{{goodsObj.skus[0].goods_name}}
-
+
特价商品不可与优惠券叠加使用
- 易货严选自营･30天无忧退换･不可用券･国内部分地区不可配送
+
+
+ {{item.name}}
+
+
@@ -82,6 +89,79 @@
+
+
+
+
+
+
+
+
+
+
@@ -148,7 +228,27 @@
})
}
})
- }
+ },
+
+ // 选择优惠券-显示
+ couponsOpne(){
+ this.$refs.couponsPopup.open('bottom')
+ },
+
+ // 选择优惠券-隐藏
+ couponsClose(){
+ this.$refs.couponsPopup.close()
+ },
+
+ // 查看保障服务-显示
+ serveOpne(){
+ this.$refs.servePopup.open('bottom')
+ },
+
+ // 查看保障服务-隐藏
+ serveClose() {
+ this.$refs.servePopup.close()
+ }
}
}
@@ -268,12 +368,33 @@
}
}
}
+
+ // 新增服务
+ .goods-serve {
+ display: flex;
+ .goods-serve-img {
+ width: 36rpx;
+ height: 36rpx;
+ margin-top: 24rpx;
+ }
+ .goods-serve-name {
+ margin: 0 30rpx 0 20rpx;
+ width: calc(100% - 122rpx);
+ text {
+ padding-right: $padding;
+ position: relative;
+ &:last-child {
+ padding-right: 0;
+ }
+ }
+ }
+ }
+
// 店铺
.store{
position: relative;
margin: 0 $margin;
- // background: #F8F8F8;
- background: #999;
+ background: #F8F8F8;
border-radius: $radius/2;
padding: $padding;
min-height: 160rpx;
@@ -306,8 +427,8 @@
background-color: #fd683e;
border-radius: 8rpx 4rpx 4rpx 6rpx;
color: #FFFFFF;
- height: 52rpx;
- line-height: 52rpx;
+ height: 48rpx;
+ line-height: 48rpx;
padding: 0 $padding - 15;
box-sizing: border-box;
display: inline-block;
@@ -346,25 +467,44 @@
&:first-child::before {
border-color: #fae2b9;
}
+ .tooSee-label-img {
+ position: absolute;
+ right: -34rpx;
+ top: 12rpx;
+ width: 28rpx;
+ height: 28rpx;
+ z-index: 9;
+ }
+ &:first-child .tooSee-label-img {
+ filter: brightness(.2)
+ }
}
}
- .title{
+ .store-title{
font-size: $title-size-lg;
font-weight: bold;
line-height: 60rpx;
color: $text-color;
+ margin-bottom: 10rpx;
}
// rate
.openbtn{
position: absolute;
- right: $margin;
- top: $margin * 3;
+ right: $margin - 10;
+ top: $margin * 3.5;
color: #848484;
height: 60rpx;
line-height: 60rpx;
text-align: center;
font-size: $title-size-m;
margin-top: -30rpx;
+ display: flex;
+ .openbtn-img {
+ width: 32rpx;
+ height: 32rpx;
+ filter: brightness(.5);
+ margin-top: 14rpx;
+ }
}
}
// 产品规格
@@ -374,7 +514,7 @@
border-bottom: solid 20rpx #F8F8F8;
.size-item{
position: relative;
- padding: 0 $padding 0 ($padding + 150);
+ padding: 0 $padding 0 ($padding + 100);
line-height: 90rpx;
font-size: $title-size-m;
&::after{
@@ -430,4 +570,126 @@
margin-bottom: calc(constant(safe-area-inset-bottom) / 2);
}
}
+
+ // 优惠券弹出样式
+ .coupons-popup {
+ background-color: #FFFFFF;
+ border-radius: 40rpx 40rpx 0 0;
+ padding: $padding;
+ box-sizing: border-box;
+ .coupons-header {
+ text-align: center;
+ position: relative;
+ margin-bottom: $margin*1.5;
+ .title {
+ font-weight: 700;
+ }
+ .close {
+ position: absolute;
+ right: 0;
+ top: 0;
+ z-index: 2;
+ width: 38rpx;
+ height: 38rpx;
+ }
+ }
+ .coupons-cont {
+ .coupons-name {
+ color: #616065;
+ font-size: 30rpx;
+ }
+ .coupons-list {
+ border: 2rpx solid #d6b9be;
+ border-radius: 10rpx;
+ overflow: hidden;
+ position: relative;
+ margin-top: $margin;
+ .coupons-tips {
+ background-color: #211e17;
+ color: #efe8d8;
+ position: absolute;
+ border-radius: 0 0 20rpx 0;
+ padding: 0 8rpx;
+ height: 34rpx;
+ line-height: 34rpx;
+ left: 0;
+ top: 0;
+ .coupons-tips-text {
+ font-size: 24rpx;
+ transform:scale(.85);
+ display: block;
+ }
+ }
+ .coupons-left {
+ background-color: #fdedee;
+ color: #e1293f;
+ width: 190rpx;
+ text-align: center;
+ padding: $padding - 10 0;
+ border-right: 2rpx dashed #eccdd4;
+ .coupons-number {
+ font-size: 40rpx;
+ font-weight: 600;
+ text {
+ font-size: 24rpx;
+ }
+ &.coupons-small {
+ font-size: 32rpx;
+ padding: 20rpx 0;
+ }
+ }
+ .coupons-full {
+ font-size: 24rpx;
+ }
+ }
+ .coupons-center {
+ position: absolute;
+ width: 100%;
+ left: 0;
+ top: 0;
+ padding: $padding - 10 130rpx 0 220rpx;
+ box-sizing: border-box;
+ font-size: 28rpx;
+ .coupons-time {
+ font-size: 24rpx;
+ margin-top: 10rpx;
+ color: #514c51;
+ }
+ }
+ .coupons-right {
+ position: absolute;
+ right: 20rpx;
+ top: 36rpx;
+ width: 110rpx;
+ text-align: center;
+ background-color: #e1293f;
+ color: #FFFFFF;
+ border-radius: 80rpx;
+ font-size: 24rpx;
+ line-height: 52rpx;
+ }
+ }
+ }
+ .coupons-true {
+ background-image: linear-gradient(to right, #e1293f, #fd275d);
+ color: #FFFFFF;
+ border-radius: 80rpx;
+ line-height: 84rpx;
+ text-align: center;
+ margin-top: $margin*5;
+ }
+ }
+
+ // 新增服务保障样式
+ .serve-label {
+ margin-top: $margin + 10;
+ font-size: 28rpx;
+ .serve-label-name {
+ font-weight: 700;
+ margin-bottom: $margin - 10;
+ }
+ .serve-label-text {
+ line-height: 44rpx;
+ }
+ }
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 4e85958..5d02017 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -47,7 +47,6 @@
mobileNo: this.phone,
code : this.code
}).then(res => {
- console.log(res)
this.$store.commit('setToken', res.token_type + ' ' + res.access_token)
if(!res.is_company){
this.$Router.replace({name: "Registered"})
diff --git a/pages/property/index.vue b/pages/property/index.vue
index 44c51f4..b610295 100644
--- a/pages/property/index.vue
+++ b/pages/property/index.vue
@@ -96,7 +96,7 @@
我的优惠券
-
+
地址管理
@@ -172,9 +172,9 @@
}
},
methods: {
- // outLogin(){
- // this.$store.commit('setToken', '')
- // }
+ outLogin(){
+ this.$store.commit('setToken', '')
+ },
selectedBanner(item, index) {
console.log('🥒', item, index)
}
diff --git a/pages/store/index.vue b/pages/store/index.vue
index ba93b71..4c3afda 100644
--- a/pages/store/index.vue
+++ b/pages/store/index.vue
@@ -89,6 +89,7 @@
return
}
index().then(res => {
+
if(!res.is_certification){
this.getAppliesQuery()
return
diff --git a/pages/vip/index.vue b/pages/vip/index.vue
index bebb8c8..d22316f 100644
--- a/pages/vip/index.vue
+++ b/pages/vip/index.vue
@@ -1,11 +1,30 @@
-
+
+
+
+
+
+ VIP企业会员
+
+
+
+
+ 普通会员
+
+
+
+
+ 超级会员
+
+
+
+
-
+
-
+
-
+
-
@@ -55,18 +74,18 @@
}
},
created() {
- identities().then(res => {
- this.loding = false
- this.user = res.user
- this.description= res.description
- this.identities = res.identities
- this.rights = res.identities[0].rights
- }).catch(err =>{
- uni.showToast({
- title: err.message,
- icon : 'none'
- })
- })
+ // identities().then(res => {
+ // this.loding = false
+ // this.user = res.user
+ // this.description= res.description
+ // this.identities = res.identities
+ // this.rights = res.identities[0].rights
+ // }).catch(err =>{
+ // uni.showToast({
+ // title: err.message,
+ // icon : 'none'
+ // })
+ // })
},
methods: {
// 切换开通身份
@@ -141,6 +160,20 @@