diff --git a/components/order/orderCard.vue b/components/order/orderCard.vue
index a33a659..f9db7de 100644
--- a/components/order/orderCard.vue
+++ b/components/order/orderCard.vue
@@ -20,7 +20,7 @@
-
+
diff --git a/pages/index/category.vue b/pages/index/category.vue
index c9436b4..ffa6f89 100644
--- a/pages/index/category.vue
+++ b/pages/index/category.vue
@@ -14,7 +14,6 @@
v-model="queryParams.title"
placeholder="搜索项目名称"
bgColor="#F5F5F5"
- inputAlign="center"
:showAction="false"
@search="search"
@change="search"
@@ -111,28 +110,18 @@
onShow() {
},
- onLoad({
- search,
- cid
- }) {
+ onLoad() {
+
+ let search = uni.getStorageSync('search')
+ console.log('onLoad', search)
if (search) {
this.queryParams.title = search
+ uni.setStorageSync('search', '')
}
this.initList()
- return
- if(this.category.length > 0 && cid){
- this.category.forEach((n, i) => {
- if(n.id == cid){
- this.current = i
- }
- })
- // this.queryParams.classId = cid
- }else if (this.category.length > 0) {
- // this.queryParams.classId = this.category[0].id
- }
},
methods: {
async fetchCategoryList() {
@@ -190,6 +179,7 @@
align-items: center;
}
+ $body-height: calc(100vh - #{$tabbar-height} - env(safe-area-inset-bottom));
$search-height: 108rpx;
$list-height: calc(#{$body-height} - #{$search-height});
diff --git a/pages/index/center.vue b/pages/index/center.vue
index 294cce7..cda647b 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -9,11 +9,12 @@
-
+
{{ userInfo.nickName }}
+
@@ -32,35 +33,6 @@
-
-
-
-
-
-
-
- 会员福利
- 会员折扣
-
-
-
-
-
-
- 会员积分
- 兑换礼品
-
-
-
-
-
-
- 会员优惠券
- 满减折扣
-
-
-
-
@@ -147,7 +119,6 @@
-
@@ -342,7 +313,7 @@
.header {
height: 550rpx;
background-image: linear-gradient(#84A73F, #D8FF8F);
- justify-content: flex-start;
+ justify-content: flex-end;
position: relative;
}
}
@@ -391,19 +362,31 @@
}
.member {
- width: calc(724rpx);
- position: absolute;
- bottom: 0;
- left: 13rpx;
+ width: calc(100vw - 8rpx);
+ height: 241rpx;
+ // position: absolute;
+ // bottom: 0;
+ // left: 13rpx;
+ position: relative;
+ margin-top: 37rpx;
+ transform: translateY(10rpx);
color: #F5F5F5;
font-size: 22rpx;
- background-color: #2B2C30;
+ // background-color: #2B2C30;
border-top-left-radius: 20rpx;
border-top-right-radius: 20rpx;
+ &-bg {
+ width: 100%;
+ height: 100%;
+ }
+
&-overview {
+ position: absolute;
+ top: 10rpx;
+ left: 30rpx;
min-height: 81rpx;
justify-content: space-between;
@@ -448,39 +431,6 @@
&-tips {
margin-left: 6rpx;
}
-
- &-rights {
- background-color: #37393D;
- position: relative;
- width: 100%;
- height: 142rpx;
- box-sizing: border-box;
-
- &-bg {
- width: 100%;
- height: 100%;
- }
-
- &-content {
- position: absolute;
- bottom: 0;
- width: 100%;
- height: 100%;
- box-sizing: border-box;
- padding: 0 35rpx 6rpx 35rpx;
- justify-content: space-between;
- }
-
- &-label {
- color: #CBAD8F;
- font-size: 22rpx;
- font-weight: 700;
- }
- &-value {
- color: #F5F5F5;
- font-size: 18rpx;
- }
- }
}
.card {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e57a5c8..344651e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -97,8 +97,9 @@
methods: {
// 搜素
search() {
- uni.navigateTo({
- url: '/pages/index/category?search=' + this.keyword
+ uni.setStorageSync('search', this.keyword)
+ uni.switchTab({
+ url: '/pages/index/category'
})
this.keyword = ''
},
diff --git a/pages_order/auth/wxUserInfo.vue b/pages_order/auth/wxUserInfo.vue
index 5d28dc2..3bff0eb 100644
--- a/pages_order/auth/wxUserInfo.vue
+++ b/pages_order/auth/wxUserInfo.vue
@@ -129,6 +129,26 @@
}
})
},
+ validatePhone(phone) {
+
+ // let fixedLindReg = /(\d{3,4}-)?\d{7,8}$/g // 常见座机格式
+ let mobileReg = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/g // 中国大陆手机号
+
+ // if (fixedLindReg.test(phone)) {
+ // return true
+ // }
+
+ if (mobileReg.test(phone)) {
+ return true
+ }
+
+ uni.showToast({
+ title: '请填写正确手机号',
+ icon: "none"
+ })
+
+ return false
+ },
submit() {
let self = this
@@ -149,6 +169,10 @@
return
}
+ if (!this.validatePhone(self.userInfoForm.phone)) {
+ return
+ }
+
self.$api('updateInfo', {
headImage : self.userInfoForm.headImage,
nickName : self.userInfoForm.nickName,
diff --git a/pages_order/components/progress.vue b/pages_order/components/memberProgress.vue
similarity index 100%
rename from pages_order/components/progress.vue
rename to pages_order/components/memberProgress.vue
diff --git a/pages_order/mine/cooperation.vue b/pages_order/mine/cooperation.vue
index 0b76a5b..46f2771 100644
--- a/pages_order/mine/cooperation.vue
+++ b/pages_order/mine/cooperation.vue
@@ -13,13 +13,10 @@
门头照片
-
-
-
-
-
-
+
+
+
+
diff --git a/pages_order/mine/memberCenter.vue b/pages_order/mine/memberCenter.vue
index 3d43e77..5cdc55d 100644
--- a/pages_order/mine/memberCenter.vue
+++ b/pages_order/mine/memberCenter.vue
@@ -28,7 +28,7 @@
-
+
{{ `累积消费达到${3800}元或直接充值即可成为会员` }}
@@ -76,7 +76,7 @@
diff --git a/pages_order/order/verifyOrder.vue b/pages_order/order/verifyOrder.vue
index f4aaa8a..3e6d85d 100644
--- a/pages_order/order/verifyOrder.vue
+++ b/pages_order/order/verifyOrder.vue
@@ -23,8 +23,8 @@
-
-
+
+
{{ `订单号:${orderDetail.id}` }}
@@ -184,8 +184,8 @@
}
&-qr {
- width: 279rpx;
- height: auto;
+ // width: 279rpx;
+ // height: auto;
margin-top: 57rpx;
}
diff --git a/pages_order/static/center/member-bg.png b/pages_order/static/center/member-bg.png
index 39db08e..2b2316a 100644
Binary files a/pages_order/static/center/member-bg.png and b/pages_order/static/center/member-bg.png differ
diff --git a/uni.scss b/uni.scss
index 4939e01..feefc71 100644
--- a/uni.scss
+++ b/uni.scss
@@ -106,5 +106,3 @@ $uni-font-size-paragraph:15px;
$navbar-height: 100rpx;
$tabbar-height: 120rpx;
-
-$body-height: calc(100vh - #{$tabbar-height} - env(safe-area-inset-bottom) - #{$navbar-height} - var(--status-bar-height) - 20rpx);
\ No newline at end of file