diff --git a/api/user.js b/api/user.js
index c4096e0..6565c05 100644
--- a/api/user.js
+++ b/api/user.js
@@ -687,4 +687,24 @@ export function hasServiceApi(id) {
*/
export function getBankInfo() {
return request.get(`user/extract/history_bank`)
+}
+//获取用户资产明细
+export function getassetsLog(data) {
+ return request.get(`user/assetsLog`,data)
+}
+//配置
+export function getConfig() {
+ return request.get(`exchange/config`)
+}
+//转让惠通宝
+export function changeHuitong(data) {
+ return request.post(`user/send/huitong`,data)
+}
+//惠通宝兑换消费积分
+export function huitongToConsume(data) {
+ return request.post(`user/excange/consume`,data)
+}
+//消费积分兑分红点
+export function jifenToShare(data) {
+ return request.post(`user/excange/share`,data)
}
\ No newline at end of file
diff --git a/components/orderCoupon/index.vue b/components/orderCoupon/index.vue
index f5100a8..0d73139 100644
--- a/components/orderCoupon/index.vue
+++ b/components/orderCoupon/index.vue
@@ -12,9 +12,11 @@
￥{{item.coupon_price}}
满{{item.use_min_price}}元可用
-
- ￥{{item.coupon_price}}
- 满{{item.use_min_price}}元可用
+
+
+
+ ￥{{item.coupon_price}}
+ 满{{item.use_min_price}}元可用
diff --git a/components/rightSlider.vue b/components/rightSlider.vue
index 4fa0be9..297f61c 100644
--- a/components/rightSlider.vue
+++ b/components/rightSlider.vue
@@ -182,7 +182,7 @@
height: 100%;
background-color: #F5F5F5;
.header{
- padding: 50rpx 26rpx 40rpx;
+ padding: 120rpx 26rpx 40rpx;
background-color: #fff;
.title{
font-size: 26rpx;
@@ -196,10 +196,10 @@
margin-top: 28rpx;
input{
width:260rpx;
- height:56rpx;
+ height:70rpx;
padding: 0 10rpx;
background:rgba(242,242,242,1);
- border-radius:28rpx;
+ border-radius:35px;
font-size: 22rpx;
text-align: center;
}
@@ -236,21 +236,21 @@
.item{
display: block;
width:186rpx;
- height:56rpx;
- line-height: 56rpx;
+ height:70rpx;
+ line-height: 70rpx;
text-align: center;
- background:rgba(242,242,242,1);
- border-radius:28rpx;
- margin-top: 25rpx;
+ background:#F2F2F2;
+ border-radius:35px;
+ margin-top: 35px;
padding: 0 10rpx;
margin-right: 12rpx;
&:nth-child(3n){
margin-right: 0;
}
&.on{
- background: var(--view-minorColor);
- border:1px solid var(--view-theme);
- color: var(--view-theme);
+ background: #116636;
+ // border:1px solid var(--view-theme);
+ color:#fff;
}
}
.btns{
@@ -277,15 +277,15 @@
align-items: center;
justify-content: center;
width:286rpx;
- height:68rpx;
+ height:81rpx;
background:rgba(255,255,255,1);
border:1px solid rgba(170,170,170,1);
- border-radius:34rpx;
+ border-radius:34px;
font-size: 26rpx;
color: #282828;
&.confirm{
- background: var(--view-theme);
- border-color: var(--view-theme);
+ background: $btn-color;
+ // border-color: var(--view-theme);
color: #fff;
}
}
@@ -314,11 +314,11 @@
.item{
display: block;
width:186rpx;
- height:56rpx;
- line-height: 56rpx;
+ height:70rpx;
+ line-height: 70rpx;
text-align: center;
background:rgba(242,242,242,1);
- border-radius:28rpx;
+ border-radius:35px;
margin-top: 25rpx;
padding: 0 10rpx;
margin-right: 12rpx;
@@ -326,9 +326,9 @@
margin-right: 0;
}
&.on{
- background: var(--view-minorColor);
- border:1px solid var(--view-theme);
- color: var(--view-theme);
+ background: #116636;
+ // border:1px solid var(--view-theme);
+ color:#fff;
}
}
diff --git a/components/rightSlidera.vue b/components/rightSlidera.vue
index 4063084..82943f5 100644
--- a/components/rightSlidera.vue
+++ b/components/rightSlidera.vue
@@ -9,6 +9,16 @@
+
+ 店铺类型
+
+
+
+ {{item.name}}
+
+
+
+
品牌
@@ -59,6 +69,10 @@
price_off:{
type:String,
default:''
+ },
+ activeIndex:{
+ type:Number,
+ default:0
}
},
computed: mapGetters(['viewColor']),
@@ -72,9 +86,11 @@
storeTypeList: [
{name: '全部', value: '',check: true},
{name: '自营', value: 'trader',check: false},
+ {name: '非自营', value: 'trader',check: false},
],
activeList:[],
- showBox:false
+ showBox:false,
+ index: this.activeIndex
}
},
mounted() {
@@ -83,20 +99,28 @@
this.showBox = this.status
this.min = this.price_on
this.max = this.price_off
+ this.storeTypeList = [
+ {name: '全部', value: '',check: false},
+ {name: '自营', value: 'trader',check: false},
+ {name: '非自营', value: 'trader',check: false}
+ ]
+ this.storeTypeList[this.index]['check'] = true
+ this.is_trader = this.storeTypeList[0]['check'] ? '' : this.storeTypeList[1]['check'] ? 1 : 0
},
methods:{
bindChenck(item){
item.check = !item.check
this.arrFilter()
},
- bindChenckType(item,index){
-
+ bindChenckType(item,index){
this.storeTypeList = [
{name: '全部', value: '',check: false},
{name: '自营', value: 'trader',check: false},
+ {name: '非自营', value: 'trader',check: false},
]
this.storeTypeList[index]['check'] = true
- this.is_trader = this.storeTypeList[0]['check'] ? '' : 1
+ this.is_trader = this.storeTypeList[0]['check'] ? '' : this.storeTypeList[1]['check'] ? 1 : 0
+ this.index = index
},
arrFilter(){
this.activeList = this.list.filter(item=>{
@@ -109,14 +133,14 @@
})
this.storeTypeList = [
{name: '全部', value: '',check: true},
- {name: '自营', value: 'trader',check: false}
+ {name: '自营', value: 'trader',check: false},
+ {name: '非自营', value: 'trader',check: false}
]
this.min = this.max = ''
this.arrFilter()
},
confirm(){
this.arrFilter()
- console.log(this.activeList)
let obj = {
brandList:this.activeList,
price_on:this.min,
@@ -125,13 +149,9 @@
is_trader: this.is_trader
}
this.showBox = false
- this.$emit('confirm',obj)
+ this.$emit('confirm',obj,this.index)
},
close(){
- // this.list.forEach((el,index)=>{
- // el.check = false
- // })
- // this.arrFilter()
this.showBox = false
this.$emit('close')
},
@@ -162,7 +182,7 @@
height: 100%;
background-color: #F5F5F5;
.header{
- padding: 50rpx 26rpx 40rpx;
+ padding: 120rpx 26rpx 40rpx;
background-color: #fff;
.title{
font-size: 26rpx;
@@ -176,10 +196,10 @@
margin-top: 28rpx;
input{
width:260rpx;
- height:56rpx;
+ height:70rpx;
padding: 0 10rpx;
background:rgba(242,242,242,1);
- border-radius:28rpx;
+ border-radius:35px;
font-size: 22rpx;
text-align: center;
}
@@ -216,21 +236,21 @@
.item{
display: block;
width:186rpx;
- height:56rpx;
- line-height: 56rpx;
+ height:70rpx;
+ line-height: 70rpx;
text-align: center;
- background:rgba(242,242,242,1);
+ background:#F2F2F2;
border-radius:28rpx;
- margin-top: 25rpx;
+ margin-top: 35px;
padding: 0 10rpx;
margin-right: 12rpx;
&:nth-child(3n){
margin-right: 0;
}
&.on{
- background: var(--view-minorColor);
- border:1px solid var(--view-theme);
- color: var(--view-theme);
+ background: #116636;
+ // border:1px solid var(--view-theme);
+ color:#fff;
}
}
.btns{
diff --git a/pages.json b/pages.json
index 152b069..954a39c 100644
--- a/pages.json
+++ b/pages.json
@@ -236,6 +236,12 @@
"navigationBarTitleText": "福利积分"
}
},
+ {
+ "path": "user_integral1/fenhong",
+ "style": {
+ "navigationBarTitleText": "分红点"
+ }
+ },
{
"path": "user_integral1/user_contribute",
"style": {
diff --git a/pages/activity/collect_coupons/index.vue b/pages/activity/collect_coupons/index.vue
index 18b6c4f..e20160c 100644
--- a/pages/activity/collect_coupons/index.vue
+++ b/pages/activity/collect_coupons/index.vue
@@ -1,10 +1,11 @@
-
+
+
diff --git a/pages/users/user_integral1/index.vue b/pages/users/user_integral1/index.vue
index 73765e3..4665084 100644
--- a/pages/users/user_integral1/index.vue
+++ b/pages/users/user_integral1/index.vue
@@ -8,12 +8,12 @@
当前福利积分
- {{userInfo.integral || 0}}
+ {{welfare || 0}}
冻结福利积分
- {{userInfo.lockIntegral || 0}}
+ {{welfare_frozen || 0}}