diff --git a/subPackages/pointsMall/index.vue b/subPackages/pointsMall/index.vue
index 90d3d52..7d0e4d0 100644
--- a/subPackages/pointsMall/index.vue
+++ b/subPackages/pointsMall/index.vue
@@ -73,6 +73,30 @@
搜索
+
+
+
+ 综合
+
+
+
+
+ 销量
+
+
+ 积分
+
+ ▼
+ ▼
+
+
+
+
+
@@ -143,6 +167,8 @@
page: 1,
finish: false,
+
+ search_type: 0,
}
},
onReady () {
@@ -235,11 +261,25 @@
this.getProdListByType()
},
+ changeSearchParm(value) {
+ this.search_type = value
+ this.prodList = [];
+ this.finish = false;
+ this.page = 1;
+ this.getProdListByType()
+ },
+
getProdListByType () {
+ let param = {}
+ if (this.search_type == 1) { param = {order: 'asc',sort:'sales'} }
+ if (this.search_type == 2) { param = {order: 'desc',sort:'sales'} }
+ if (this.search_type == 3) { param = {order: 'asc',sort:'score'} }
+ if (this.search_type == 4) { param = {order: 'desc',sort:'score'} }
this.Post({
tag_id: this.typeList[this.typeIndex].id,
page: this.page,
limit: 10,
+ ...param,
},'/api/score_goods_sku_price/index').then(res => {
this.prodList = [...this.prodList,...res.data.data]
if (res.data.current_page.common-view{
+ display: flex;
+ min-width: 70rpx;
+ align-items: center;
+ justify-content: space-between;
+ height: 100%;
+ }
+ .search-item{
+ display: flex;
+ flex-direction: column;
+ line-height: 16rpx;
+ font-size: 14rpx;
+ }
+ }
+ .triangle-up {
+ transform: rotate(180deg);
+ display: inline-block;
+ }
+ .active-search-item{
+ color: #6A8A2D;
+ }
\ No newline at end of file
diff --git a/subPackages/techan/index.vue b/subPackages/techan/index.vue
index 7409d26..b8cf540 100644
--- a/subPackages/techan/index.vue
+++ b/subPackages/techan/index.vue
@@ -40,7 +40,7 @@
-
+
配送方式
diff --git a/subPackages/user/coupon.vue b/subPackages/user/coupon.vue
index d9755e5..500d05a 100644
--- a/subPackages/user/coupon.vue
+++ b/subPackages/user/coupon.vue
@@ -13,15 +13,21 @@
-
- {{(item.activity.money) / 100}}
-
-
- {{item.activity.fold}}折
-
-
- 满{{item.activity.mini_money/100}}元可用
-
+
+
+
+
+
+
+ {{(item.activity.money) / 100}}
+
+
+ {{item.activity.fold}}折
+
+
+ 满{{item.activity.mini_money/100}}元可用
+
+
@@ -39,7 +45,7 @@
-
+
使用规则：{{item.note}}
使用规则：{{item.note}}
@@ -48,12 +54,11 @@
-
+
@@ -85,10 +90,67 @@
+
+
+
+
+
+
+
+
+
+ 已失效
+
+
+
+
+
+
+
+
+
+
+
+ {{selectInfo.activity.name}}
+
+
+ {{selectInfo.get_date.slice(0,10)}}-{{selectInfo.end_time.slice(0,10)}}可用
+
+
+
+
+
+
+
+
+
+ 使用规则：{{selectInfo.note}}
+
+
+
+
+
+ 券状态
+ {{selectInfo.status==1?"可使用":"已失效"}}
+
+
+ 有效期
+ {{selectInfo.get_date.slice(0,10)}}-{{selectInfo.end_time.slice(0,10)}}可用
+
+
+ 使用须知
+ {{selectInfo.note}}
+
+
+
+
@@ -352,10 +446,13 @@
color: #999;
display: flex;
line-height: 47rpx;
+ flex: 1;
+ width: 1rpx;
+ justify-content: space-between;
}
.item-bottom .rules span {
- width: 569rpx;
+ width: 450rpx;
overflow: hidden; //超出隐藏
white-space: nowrap; //不折行
text-overflow: ellipsis;
@@ -364,7 +461,6 @@
.item-bottom .rules image {
width: 20rpx;
height: 20rpx;
- margin-left: 68rpx;
margin-top: 15rpx;
}
@@ -491,4 +587,93 @@
margin-bottom: 15rpx;
}
}
+
+.info-box {
+ max-height: 100vh;
+ overflow-x: hidden;
+ overflow-y: auto;
+ background: #F7F7F7;
+ border-radius: 27rpx 27rpx 0rpx 0rpx;
+ padding: 90rpx 26rpx 20rpx;
+ box-sizing: border-box;
+ position: relative;
+
+ .cha {
+ width: 31.33rpx;
+ height: 31.33rpx;
+ position: absolute;
+ top: 32rpx;
+ right: 37rpx;
+ }
+
+ .code-box {
+ width: 275rpx;
+ height: 269rpx;
+ background: #FFFFFF;
+ box-shadow: 0rpx 0rpx 33rpx 0rpx rgba(102,102,102,0.26);
+ border-radius: 20rpx;
+ overflow: hidden;
+ margin: 0 auto;
+ position: relative;
+
+ image {
+ width: 243rpx;
+ height: 243rpx;
+ }
+
+ .code-past {
+ width: 275rpx;
+ height: 269rpx;
+ position: absolute;
+ top: 0;
+ left: 0;
+ font-weight: bold;
+ font-size: 25rpx;
+ color: #000000;
+ background-color: rgba(0, 0, 0, .6);
+
+ view {
+ width: 143rpx;
+ height: 143rpx;
+ background: #FFFFFF;
+ border-radius: 71rpx;
+ }
+ }
+ }
+
+ .coupon-box {
+ width: 697rpx;
+ height: auto;
+ background: #FFFFFF;
+ border-radius: 13rpx;
+ padding: 34rpx 18rpx;
+ box-sizing: border-box;
+ margin: 28rpx auto 0;
+
+ &>view {
+ margin-bottom: 25rpx;
+ display: flex;
+ }
+
+ .title {
+ font-weight: 500;
+ font-size: 27rpx;
+ color: #111111;
+ min-width: 130rpx;
+ white-space: nowrap;
+ }
+
+ .subtitle {
+ font-weight: 500;
+ font-size: 25rpx;
+ color: #444444;
+ }
+ }
+}
+
+.mian-dan{
+ width: 133.33rpx;
+ height: 104rpx;
+}
+