diff --git a/pages/index/indexs.vue b/pages/index/indexs.vue
index a1570e1..89998c0 100644
--- a/pages/index/indexs.vue
+++ b/pages/index/indexs.vue
@@ -123,7 +123,7 @@ function toFenxiao() {
function toIntegralMall() {
uni.navigateTo({
- url: "/scoreShop/index/index",
+ url: "/scoreShop/index/index?shopId="+uni.cache.get("shopId"),
});
}
diff --git a/pages/user/member/billDetails.vue b/pages/user/member/billDetails.vue
index 3abc4d2..d9aafd8 100644
--- a/pages/user/member/billDetails.vue
+++ b/pages/user/member/billDetails.vue
@@ -153,7 +153,8 @@
page: formData.form.page,
size: formData.form.size,
// status: formData.form.status,
- shopId: formData.shopId
+ shopId: formData.shopId,
+ id:formData.id
})
}
if (res.totalPage == 0 || res.totalPage == 1 && res.totalRow <= 10) {
@@ -215,6 +216,7 @@
console.log('options',options);
formData.shopId = options.shopId
formData.active = options.type
+ formData.id=options.id||''
console.log(formData.info)
getlist()
getShopUserInfo()
diff --git a/scoreShop/index/index.vue b/scoreShop/index/index.vue
index 1463aec..ddc5930 100644
--- a/scoreShop/index/index.vue
+++ b/scoreShop/index/index.vue
@@ -1,185 +1,190 @@
-
-
-
-
-
-
-
- 73954
-
-
-
-
-
- 积分订单
- 积分明细
-
-
-
-
-
-
-
-
-
-
- 优惠券
- 其他商品
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ {{pointsUser?pointsUser.pointBalance:''}}
+
+
+
+
+
+ 积分订单
+ 积分明细
+
+
+
+
+
+
+
+
+
+
+ 优惠券
+ 其他商品
+
+
+
+
+
+
+
+
+ .huizhang {
+ width: 218rpx;
+ height: 212rpx;
+ }
+
+ .wujiaoxing {
+ width: 68rpx;
+ height: 68rpx;
+ }
+
+ .color1 {
+ color: $color;
+ }
+
+ .number {
+ color: $color;
+ font-size: 64rpx;
+ font-weight: 900;
+ }
+ }
+
+ .layout {
+ width: 36rpx;
+ height: 36rpx;
+ }
+
+ .min-page {
+ display: flex;
+ flex-direction: column;
+ }
+
+ .bottom {
+ width: 750rpx;
+ flex: 1;
+ border-radius: 40rpx 40rpx 0 0;
+ position: relative;
+ transform: translateY(-32rpx);
+ z-index: 1;
+ background: #f7f7f7;
+
+ .tab-box {
+ display: flex;
+ align-items: center;
+ padding: 36rpx 32rpx 14rpx 0;
+
+ .tabs {
+ justify-content: center;
+ gap: 200rpx;
+
+ .tab-item {
+ font-size: 28rpx;
+ color: #666;
+ padding: 16rpx 0;
+ position: relative;
+
+ &::after {
+ display: block;
+ position: absolute;
+ left: 50%;
+ transform: translateX(-50%);
+ bottom: 0;
+ content: "";
+ width: 58rpx;
+ height: 6rpx;
+ background-color: transparent;
+ transition: all 0.3s;
+ }
+
+ &.active::after {
+ background-color: #ffaa62;
+ }
+ }
+ }
+ }
+ }
+
\ No newline at end of file
diff --git a/user/score/list.vue b/user/score/list.vue
index 84e4c44..30b4e47 100644
--- a/user/score/list.vue
+++ b/user/score/list.vue
@@ -41,16 +41,19 @@
}
}
- function toDuihuan() {
- uni.showToast({
- title: '待开放!',
- icon: 'none'
+ function toDuihuan(item) {
+ // uni.showToast({
+ // title: '待开放!',
+ // icon: 'none'
+ // })
+ uni.navigateTo({
+ url:'/scoreShop/index/index?shopId=' + item.shopId+'&id='+item.id
})
}
function toDetail(item) {
uni.navigateTo({
- url: '/pages/user/member/billDetails?type=2&shopId=' + item.shopId
+ url: '/pages/user/member/billDetails?type=2&shopId=' + item.shopId+'&id='+item.id
})
}
onMounted(getData)