diff --git a/pages/index/components/advertisement.vue b/pages/index/components/advertisement.vue
index da5433e..f9f4fc8 100644
--- a/pages/index/components/advertisement.vue
+++ b/pages/index/components/advertisement.vue
@@ -1,7 +1,10 @@
- 现有{{bannervo.coupons==null?116:bannervo.coupons}}人已免单
+ 现有
+ {{bannervo.coupons==null?116:bannervo.coupons}}人
+
+ 已免单
@@ -128,7 +131,7 @@
.onecontentleft {
font-family: Source Han Sans CN, Source Han Sans CN;
- font-weight: 400;
+ font-weight: 700;
font-size: 24rpx;
color: #333333;
@@ -147,7 +150,7 @@
.onecontentrightimage {
- width: 90rpx;
+ width: 65rpx;
position: relative;
overflow: hidden;
height: 28rpx;
@@ -155,7 +158,7 @@
.swiperPanel {
height: 28rpx;
- width: 100%;
+ width: 100rpx;
overflow: hidden;
position: relative;
@@ -225,7 +228,7 @@
width: 100rpx;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
- font-size: 24rpx;
+ font-size: 20rpx;
color: #333333;
overflow: hidden; //超出的文本隐藏
text-overflow: ellipsis; //溢出用省略号显示
diff --git a/pages/index/components/todaylist.vue b/pages/index/components/todaylist.vue
index 58b5f89..9f12c29 100644
--- a/pages/index/components/todaylist.vue
+++ b/pages/index/components/todaylist.vue
@@ -205,7 +205,10 @@
.therecontent_box_itembox_itemviewthere {
margin-top: 4rpx;
- align-items: flex-end;
+ // align-items: flex-end;
+ // display: flex;
+ // align-items: center;
+ // justify-content: center;
text:nth-child(1) {
font-family: Source Han Sans CN, Source Han Sans CN;
@@ -220,6 +223,7 @@
font-size: 16rpx;
color: #999999;
text-decoration-line: line-through;
+ margin-top: 10rpx;
}
}
}
diff --git a/pages/index/drinks.vue b/pages/index/drinks.vue
index 89fbca0..07dcb3b 100644
--- a/pages/index/drinks.vue
+++ b/pages/index/drinks.vue
@@ -135,6 +135,7 @@
size: 10, //页容量
status: 'loadmore'
},
+ type:''
};
},
onPageScroll(e) {
diff --git a/pages/index/freedaily.vue b/pages/index/freedaily.vue
index e325931..2ac488a 100644
--- a/pages/index/freedaily.vue
+++ b/pages/index/freedaily.vue
@@ -72,7 +72,6 @@
-
-->
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 020a0d0..efe8456 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -74,7 +74,7 @@
{{item.shopName}}
- 龙首.{{item.distances}}km
+ {{item.districts}}{{item.distances}}
@@ -128,7 +128,7 @@
:day="item.end_times.d" :hour="item.end_times.h"
:minute="item.end_times.m" :second="item.end_times.s"
:indexs='index' color="#FFFFFF" border-color="#00B26A"
- splitorColor="#FFFFFF" :font-size="7">
+ splitorColor="#FFFFFF" :font-size="8">
@@ -385,7 +385,7 @@
this.seighT = data.windowHeight;
this.$u.getRect('.fourcontent').then(res => {
console.log(res.top)
- this.Topdistance = res.top - res.height -20 //滚动距离
+ this.Topdistance = res.top - res.height - 20 //滚动距离
})
}
})
@@ -692,14 +692,14 @@
}
.fourcontent {
- padding: 32rpx 28rpx 32rpx 28rpx;
+ padding: 32rpx 28rpx;
overflow-x: auto;
flex-wrap: nowrap;
.fourcontent_item {
flex-wrap: nowrap;
margin-left: 22rpx;
- padding: 4rpx 14rpx;
+ padding: 8rpx 28rpx;
background: #FFFFFF;
border-radius: 8rpx 8rpx 8rpx 8rpx;
@@ -762,6 +762,7 @@
.fivecontent {
padding: 0 28rpx;
height: 100vh;
+
.fivecontent_item:nth-child(1) {
margin-top: 0;
}
@@ -844,8 +845,8 @@
text {
font-family: Source Han Sans CN, Source Han Sans CN;
- font-weight: 400;
- font-size: 24rpx;
+ font-weight: 700;
+ font-size: 28rpx;
color: #999999;
}
@@ -856,7 +857,7 @@
white-space: nowrap; //溢出不换行white-space:nowrap; //溢出不换行
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 500;
- font-size: 28rpx;
+ font-size: 32rpx;
color: #333333;
}
}
@@ -900,6 +901,8 @@
background: url(https://czg-qr-order.oss-cn-beijing.aliyuncs.com/index/qinggou.png) no-repeat;
background-size: 100% 100%;
+
+
.indexboxitemleftthereabsolute {
position: absolute;
top: 14rpx;
@@ -913,10 +916,15 @@
.indexboxitemlefttheretext {
// width: 100%;
margin-top: 12rpx;
- align-items: flex-end;
+
+ display: flex;
+ justify-content: center;
+ align-items: center;
.fivecontent_item_boxitemlefthere_one {
- align-items: flex-end;
+ display: flex;
+ justify-content: center;
+ align-items: center;
.flex_startone {
font-family: Source Han Sans CN, Source Han Sans CN;
@@ -946,6 +954,7 @@
.fivecontent_item_boxitemlefthere_there {
margin-left: 6rpx;
+ line-height: 24rpx;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
font-size: 16rpx;
diff --git a/pages/index/tothestore.vue b/pages/index/tothestore.vue
index 364a2be..55e77ab 100644
--- a/pages/index/tothestore.vue
+++ b/pages/index/tothestore.vue
@@ -20,7 +20,7 @@
{{item.shopName}}
-
+
@@ -81,11 +81,15 @@
this.distiricttopCommon()
},
methods: {
- goMap() {
+ goMap(d) {
uni.openLocation({
- longitude: uni.cache.get('getLocationstorage').lng,
- latitude: uni.cache.get('getLocationstorage').lat
+ longitude: (d.lng * 1),
+ latitude: (d.lat * 1)
})
+ // uni.openLocation({
+ // longitude: uni.cache.get('getLocationstorage').lng,
+ // latitude: uni.cache.get('getLocationstorage').lat
+ // })
},
init_fn(e) {
this.list = []
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 1dab5cf..4d8134b 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -52,7 +52,7 @@
- 阅读并同意银收客
+ 阅读并同意{{uni.cache.set('NAME', '零点八零')}}
《用户协议》
及
《隐私政策》
diff --git a/pages/login/register.vue b/pages/login/register.vue
index 8476191..78e0750 100644
--- a/pages/login/register.vue
+++ b/pages/login/register.vue
@@ -2,7 +2,7 @@
您好,
- 欢迎使用银收客
+ 欢迎使用{{uni.cache.set('NAME', '零点八零')}}
@@ -15,7 +15,8 @@
密码
-
+
@@ -25,10 +26,14 @@
验证码
-
+
{{ Recapture }}
- {{ second }}s重新发送
+
+ {{ second }}s重新发送
注册
-
+
阅读并同意银收客
《用户协议》
及
@@ -51,295 +57,319 @@
+
\ No newline at end of file
diff --git a/pages/product/index.vue b/pages/product/index.vue
index d927169..655026a 100644
--- a/pages/product/index.vue
+++ b/pages/product/index.vue
@@ -64,11 +64,11 @@
营业时间:{{listdata.businessTime}}
-
+
- {{listdata.distances}}km
+ {{listdata.distances}}
{{listdata.address}}
@@ -403,10 +403,10 @@
name
})
},
- goMap(){
+ goMap(d) {
uni.openLocation({
- longitude: uni.cache.get('getLocationstorage').lng,
- latitude: uni.cache.get('getLocationstorage').lat
+ longitude: (d.lng * 1),
+ latitude: (d.lat * 1)
})
},
// 跳转