diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue
index 336897b14..0a982d520 100644
--- a/gasStation-uni/pages/index/index.vue
+++ b/gasStation-uni/pages/index/index.vue
@@ -30,7 +30,7 @@
领券中心
-
+
邀请有礼
@@ -261,6 +261,11 @@
tabbar
},
methods: {
+ goInvite() {
+ uni.navigateTo({
+ url: '/pagesMy/invite/invite'
+ })
+ },
goMyCard() {
uni.navigateTo({
url: '/pagesHome/MyCard/MyCard'
diff --git a/gasStation-uni/pagesHome/Address/Address.vue b/gasStation-uni/pagesHome/Address/Address.vue
index f111ca8d0..ffd585ca0 100644
--- a/gasStation-uni/pagesHome/Address/Address.vue
+++ b/gasStation-uni/pagesHome/Address/Address.vue
@@ -7,29 +7,34 @@
-
-
+
+
- {{item.address || '小王'}}
- {{item.name || '先生'}}
- {{item.mobile || '15426886361'}}
+ {{item.name || '--'}}
+ 先生
+ 女士
+ {{item.mobile || '--'}}
-
-
+
+
+
+
+
+ 默认信息
编辑
-
-
+
+
删除
-
+
@@ -51,7 +56,8 @@
return {
title: '',
dataList: '',
- checked: false,
+ checkboxValue1: [],
+ checked: true,
}
},
onShow() {
@@ -61,13 +67,40 @@
},
methods: {
+ chooseDefault(data) {
+ console.log(data);
+ if (data.checked == false) {
+ data.ifDefault = 1
+ } else {
+ data.ifDefault = 2
+ }
+ request({
+ url: '/business/userManager/mtUserExpressAddress',
+ method: 'put',
+ data: data
+ }).then((res) => {
+ if (res.code == 200) {
+ this.getList()
+ console.log(res, 81);
+ }
+ })
+ },
getList() {
request({
- url: 'business/userManager/mtUserExpressAddress/getList',
+ url: '/business/userManager/mtUserExpressAddress/getList',
method: 'get',
}).then((res) => {
if (res.code == 200) {
this.dataList = res.data
+ this.dataList.forEach(item => {
+ item.checked = false
+ if (item.ifDefault == 1) {
+ item.checked = true
+ }
+ this.$set(item, 'checked', item.checked); // 正确更新响应式属性
+ })
+ console.log(res, this.dataList, 98);
+ this.$forceUpdate()
}
})
},
@@ -84,6 +117,20 @@
url: '/pagesHome/editress/editress'
})
},
+ // 删除
+ delInfo(data) {
+ request({
+ url: '/business/userManager/mtUserExpressAddress',
+ method: 'delete',
+ params: {
+ id: data.id
+ }
+ }).then((res) => {
+ if (res.code == 200) {
+ this.getList()
+ }
+ })
+ },
choose(data) {
//传值
uni.$on('unChooseAddr', function() {
@@ -156,7 +203,10 @@
box-sizing: border-box;
}
- .box-left {}
+ .box-left {
+ display: flex;
+ align-items: center;
+ }
.box-right {
width: 30%;
@@ -184,4 +234,28 @@
justify-content: space-between;
margin-top: 20px;
}
+
+ .acvf {
+ border-radius: 50%;
+ border: 1px solid #eee;
+ height: 16px;
+ width: 16px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-right: 10px;
+ }
+
+ .acv {
+ border-radius: 50%;
+ border: 1px solid #1678ff;
+ height: 16px;
+ width: 16px;
+ background: #1678ff;
+ color: #fff;
+ margin-right: 10px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
\ No newline at end of file
diff --git a/gasStation-uni/pagesHome/editress/editress.vue b/gasStation-uni/pagesHome/editress/editress.vue
index 38f708ddd..2b59d0cdc 100644
--- a/gasStation-uni/pagesHome/editress/editress.vue
+++ b/gasStation-uni/pagesHome/editress/editress.vue
@@ -12,13 +12,13 @@
性别
-
-
- 先生
- 女士
+
+
+
+
-
+
电话
@@ -52,12 +52,12 @@
title: '',
value: true,
dataForm: {
- id: null,
name: '',
mobile: '',
address: '',
- ifDefault: '',
fullAddress: '',
+ sex: "",
+ storeId: uni.getStorageSync("storeId")
}
}
@@ -75,6 +75,7 @@
}
})
uni.$emit('unAddressInfo')
+ console.log(this.dataForm,78);
},
components: {
@@ -87,13 +88,8 @@
uni.navigateBack()
},
goedit() {
- if (this.value) {
- this.dataForm.ifDefault = 1
- } else {
- this.dataForm.ifDefault = 2
- }
- let url = 'business/userManager/mtUserExpressAddress'
- if (this.dataForm.id != null) {
+ let url = '/business/userManager/mtUserExpressAddress'
+ if (this.dataForm.id) {
request({
url: url,
method: 'put',
@@ -123,7 +119,6 @@
})
}
- console.log("123123", this.dataForm)
}
}
}
diff --git a/gasStation-uni/pagesHome/order/order.vue b/gasStation-uni/pagesHome/order/order.vue
index 5841f00a7..e78db4fda 100644
--- a/gasStation-uni/pagesHome/order/order.vue
+++ b/gasStation-uni/pagesHome/order/order.vue
@@ -13,7 +13,7 @@
-->
-
+
+
+
+
+
+
@@ -64,7 +69,7 @@
storeId: '',
status: 0,
page: 1,
- pageSize: 10
+ pageSize: 1000
},
title: '',
tabindex: 0,
@@ -190,7 +195,7 @@
this.tabindex = index
console.log(index);
this.cardsList = []
- this.query.useStatus = index
+ this.query.status = index
this.getGiftRecords()
@@ -213,7 +218,6 @@
if (res.code == 200) {
this.cardsList = res.data.records
}
- console.log(res.data, this.cardsList, 226);
})
}
}
diff --git a/gasStation-uni/pagesMy/invite/invite.vue b/gasStation-uni/pagesMy/invite/invite.vue
index bc11379a9..a0ba378a6 100644
--- a/gasStation-uni/pagesMy/invite/invite.vue
+++ b/gasStation-uni/pagesMy/invite/invite.vue
@@ -14,7 +14,7 @@
分享二维码
-
+
奖励记录
@@ -25,7 +25,7 @@
推荐会员消费有礼
-
+
详情
@@ -56,7 +56,7 @@
适用门店
-
+
导航
@@ -65,11 +65,55 @@
-
-
+
@@ -90,13 +134,13 @@
title: '',
userId: '',
storeId: '',
- show: false,
+ show: true,
options: {
code: 'https://oilapi.youkerr.com/oily?storeId=' + uni.getStorageSync('storeId') + '&userId=' + uni
.getStorageSync('userId') + '&type=yaoqingyouli',
// code: 'https://www.tuofeng.cc/oily?storeId=' + uni.getStorageSync('storeId') + ' &userId=' + uni
// .getStorageSync('userId'), // 生成二维码的值
- size: 500, // 460代表生成的二维码的宽高均为460rpx
+ size: 400, // 460代表生成的二维码的宽高均为460rpx
},
}
@@ -166,6 +210,16 @@
this.getActiveRecommendRecords();
},
methods: {
+ goList() {
+ uni.navigateTo({
+ url: '/pagesMy/invite/list'
+ })
+ },
+ goDetails() {
+ uni.navigateTo({
+ url: '/pagesMy/invite/details'
+ })
+ },
// https://www.tuofeng.cc/oilStation?storeId=19&staffId=45
close() {
this.show = false
@@ -466,6 +520,8 @@
.d-s {
display: flex;
align-items: center;
+ justify-content: center;
+ margin: 15px auto;
}
.backf {
@@ -485,4 +541,68 @@
border-bottom: 1px solid #EEEEEE;
width: 100%;
}
-
+
+ .warp {
+ width: 100%;
+ height: 100vh;
+ position: relative;
+ }
+
+ .warp-bottom {
+ position: absolute;
+ left: 0px;
+ bottom: 0px;
+ background: #fff;
+ width: 100%;
+ box-sizing: border-box;
+ padding: 10px;
+ border-radius: 10px 10px 10px 10px;
+ text-align: center;
+
+ }
+
+ .bott-box {
+ display: flex;
+ align-items: center;
+ justify-content: space-around;
+ box-sizing: border-box;
+ padding-bottom: 15px;
+ border-top: 1px solid #eee;
+ padding-top: 10px;
+ }
+
+ .bott_box {
+ box-sizing: border-box;
+ padding: 5px;
+ padding-bottom: 15px;
+
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ }
+
+ .warp-cent {
+ width: 85%;
+ background: #333;
+ position: absolute;
+ color: #fff;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ bottom: -5%;
+ box-sizing: border-box;
+ padding: 10px;
+ padding-bottom: 60px;
+ }
+
+ .tiitle_ {
+ font-weight: 600;
+ font-size: 16px;
+ color: #FFFFFF;
+ }
+
+ .title_or {
+ color: #eeb668;
+ text-align: center;
+ font-size: 28px;
+ }
+
\ No newline at end of file
diff --git a/gasStation-uni/pagesMy/invite/list.vue b/gasStation-uni/pagesMy/invite/list.vue
index 4cd7bccc8..9beca08e8 100644
--- a/gasStation-uni/pagesMy/invite/list.vue
+++ b/gasStation-uni/pagesMy/invite/list.vue
@@ -12,8 +12,25 @@
- {{item.name}}
+ {{item.name}}
+
+
+
+ 券名称
+ 2024-8-7
+
+
+
+
+
+
+
+
+ 名字
+
+ 2024-8-7
+
@@ -67,6 +84,9 @@
},
methods: {
+ setIndex(num) {
+ this.tindex = num
+ },
//滞空方法
resetting() {
this.pageNo = 1
@@ -151,11 +171,50 @@
font-weight: 600;
font-size: 16px;
color: #333333;
+ box-sizing: border-box;
+ padding-bottom: 10px;
border-bottom: 1px solid transparent;
+
}
.orsize {
color: #FA6400;
border-bottom: 1px solid #FA6400;
}
+
+ .whit-box {
+ width: 95%;
+ background: #fff;
+ margin: 15px;
+
+ }
+
+ .one_h {
+ width: 100%;
+ box-sizing: border-box;
+ padding: 10px;
+ border-bottom: 1px solid #eee;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ }
+
+ .touxiang {
+ width: 40px;
+ height: 40px;
+ overflow: hidden;
+ border-radius: 50%;
+ margin-right: 10px;
+
+ image {
+ width: 40px;
+ height: 40px;
+
+ }
+ }
+
+ .d-s {
+ display: flex;
+ align-items: center;
+ }
\ No newline at end of file
diff --git a/gasStation-uni/static/my/fzlj.png b/gasStation-uni/static/my/fzlj.png
new file mode 100644
index 000000000..a0f3ed1a0
Binary files /dev/null and b/gasStation-uni/static/my/fzlj.png differ
diff --git a/gasStation-uni/static/my/fztp.png b/gasStation-uni/static/my/fztp.png
new file mode 100644
index 000000000..3f48c9ef5
Binary files /dev/null and b/gasStation-uni/static/my/fztp.png differ