From a75af925681223c92972dc0d8542ae24aef1d976 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Thu, 2 Sep 2021 17:11:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=9C=B0=E5=9D=80=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/styles/theme.css | 8 +-
.../lf-multiColumnAd/lf-multiColumnAd.vue | 63 +++++++++++++++
pages.json | 2 +-
pages/address/add/add.less | 20 +++--
pages/address/add/add.vue | 40 +++++++---
pages/address/list/list.less | 40 +++++++---
pages/address/list/list.vue | 80 ++++++++++++++++---
pages/index/index/index.vue | 58 +++++++++++++-
8 files changed, 264 insertions(+), 47 deletions(-)
create mode 100644 components/lf-multiColumnAd/lf-multiColumnAd.vue
diff --git a/common/styles/theme.css b/common/styles/theme.css
index 5ccb8ac..a80ccff 100644
--- a/common/styles/theme.css
+++ b/common/styles/theme.css
@@ -19,8 +19,8 @@ checkbox .uni-checkbox-input {
radio .uni-radio-input.uni-radio-input-checked,
checkbox .uni-checkbox-input.uni-checkbox-input-checked {
/* border-radius: 50%; */
- border: 1px solid #1998FE !important;
- background: #1998FE !important;
+ border: 1px solid #186c6b !important;
+ background: #186c6b !important;
color: #FFFFFF !important;
}
@@ -45,8 +45,8 @@ checkbox .wx-checkbox-input {
radio .wx-radio-input.wx-radio-input-checked,
checkbox .wx-checkbox-input.wx-checkbox-input-checked {
border-radius: 50%;
- border: 1px solid #1998FE !important;
- background: #1998FE !important;
+ border: 1px solid #186c6b !important;
+ background: #186c6b !important;
color: #FFFFFF !important;
}
diff --git a/components/lf-multiColumnAd/lf-multiColumnAd.vue b/components/lf-multiColumnAd/lf-multiColumnAd.vue
new file mode 100644
index 0000000..14b9668
--- /dev/null
+++ b/components/lf-multiColumnAd/lf-multiColumnAd.vue
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages.json b/pages.json
index 4efd8a4..826d09a 100644
--- a/pages.json
+++ b/pages.json
@@ -744,7 +744,7 @@
},
{
"name": "测试",
- "path": "pages/index/classification/classification",
+ "path": "pages/user/personal/personal",
"query": ""
}
diff --git a/pages/address/add/add.less b/pages/address/add/add.less
index fd5e5fd..8bff22a 100644
--- a/pages/address/add/add.less
+++ b/pages/address/add/add.less
@@ -8,16 +8,20 @@
}
.address-info{
background: #FFFFFF;
-
+ padding: 0 32rpx;
.info-item{
height: 40px;
line-height: 40px;
- padding-left: 15px;
+ // padding-left: 15px;
display: flex;
align-items: center;
color: #333333;
font-size: 13px;
font-weight:bold;
+ border-bottom: 1rpx solid #e5e5e5;
+ &:last-child{
+ border-bottom: none;
+ }
label{
width: 80px;
display: block;
@@ -115,12 +119,18 @@
}
.button-box{
margin-top: 30px;
-
+ display: flex;
+ justify-content: center;
.submit{
- background: @mainColor;
+ // background: @mainColor;
+ width: 550rpx;
+ height: 100rpx;
+ background: #15716E;
+ border-radius: 50rpx;
+ line-height: 100rpx;
}
.delete {
- background: @secColor;
+ // background: @secColor;
}
button{
margin: 0 20px 15px 20px;
diff --git a/pages/address/add/add.vue b/pages/address/add/add.vue
index f028d80..7167610 100644
--- a/pages/address/add/add.vue
+++ b/pages/address/add/add.vue
@@ -4,13 +4,25 @@
-
+
-
+
+
+
+
+
+
+
@@ -18,7 +30,7 @@
-
+
@@ -32,7 +44,7 @@
-
+
@@ -50,13 +62,20 @@
-
+
-
+
+
+
+
+
+
+
+
@@ -80,7 +99,7 @@
-
+
@@ -591,6 +610,9 @@ export default {
watch: {}
};
-
diff --git a/pages/address/list/list.less b/pages/address/list/list.less
index f8e9efc..cea858f 100644
--- a/pages/address/list/list.less
+++ b/pages/address/list/list.less
@@ -1,14 +1,25 @@
#address-list{
.list-box{
- padding-bottom: 20px;
+ // padding-bottom: 20px;
+ padding: 30rpx 32rpx;
+ width: 750rpx;
+ height: max-content;
+ box-sizing: border-box;
.list-item{
font-size:14px;
background:#FFFFFF;
- padding:15px 40px 15px 15px;
- background-image:url("https://uto.ibrand.cc/m/static/img/ic_forward.png");
- background-repeat:no-repeat;
- background-position:100%;
- background-size:20px;
+ // padding:15px 40px 15px 15px;
+ // background-image:url("https://uto.ibrand.cc/m/static/img/ic_forward.png");
+ // background-repeat:no-repeat;
+ // background-position:100%;
+ // background-size:20px;
+ width: 686rpx;
+ height: max-content;
+ background: #FFFFFF;
+ border-radius: 20rpx;
+ padding: 30rpx;
+ box-sizing: border-box;
+ margin-bottom: 30rpx;
.user{
display: flex;
@@ -33,18 +44,23 @@
}
.add-address{
-
- background-color: #ffffff;
+ display: flex;
+ justify-content: center;
+ // background-color: #ffffff;
padding:10px 12px;
.small-btn{
display: flex;
align-items: center;
justify-content:center;
- background-color:#FB5054;
+ // background-color:#FB5054;
color: #FFFFFF;
- border-radius:4px;
- height: 40px;
- line-height: 40px;
+ // border-radius:4px;
+ // height: 40px;
+ line-height: 40rpx;
+ width: 550rpx;
+ height: 100rpx;
+ background: #15716E;
+ border-radius: 50rpx;
.icon{
margin-right: 15px;
}
diff --git a/pages/address/list/list.vue b/pages/address/list/list.vue
index 6cf1c22..d73f5be 100644
--- a/pages/address/list/list.vue
+++ b/pages/address/list/list.vue
@@ -1,8 +1,8 @@
-
-
+
+
+
+
+ {{item.accept_name}}
+ {{item.mobile}}
+
+
+ {{item.address_name}}
+ {{item.address}}
+
+
+
-
-
-
-
- 新增收货地址
-
+
+ 新增收货地址
@@ -33,7 +55,19 @@ import {pageLogin, getUrl,config,is} from '@/common/js/utils.js';
export default {
data() {
return {
- list: [],
+ list: [{
+ accept_name: '加号',
+ mobile: '12373873873',
+ address_name: '广西南宁',
+ address: '细丝里流向17号',
+ is_default: true
+ },{
+ accept_name: '加号',
+ mobile: '12373873873',
+ address_name: '广西南宁',
+ address: '细丝里流向17号',
+ is_default: true
+ }],
order_no: '',
url: '',
id:''
@@ -41,7 +75,8 @@ export default {
},
onShow() {
- this.queryAddressList(); // let app =getApp();
+ this.queryAddressList(); // let app =getApp(); 暂时注释
+
// app.isBirthday().then(()=>{
// if(this.$cookieStorage.get("birthday_gift")){
// var giftData=this.$cookieStorage.get("birthday_gift").data;
@@ -51,6 +86,7 @@ export default {
},
onLoad(e) {
+ // 暂时注释
pageLogin(getUrl());
this.setData({
order_no: e.order_no,
@@ -62,9 +98,10 @@ export default {
props: {},
methods: {
setInfo(e) {
- var from = e.currentTarget.dataset.info;
+ // var from = e.currentTarget.dataset.info;
+ var from = e;
var data = this.$cookieStorage.get('order_form');
- var from=JSON.parse(from);
+ // var from=JSON.parse(from);
if (!data) {
return this.view(from.id);
@@ -152,6 +189,23 @@ export default {
watch: {}
};
+
+
diff --git a/pages/index/index/index.vue b/pages/index/index/index.vue
index 28f2055..4b51049 100644
--- a/pages/index/index/index.vue
+++ b/pages/index/index/index.vue
@@ -90,6 +90,10 @@
+
+
+
+
@@ -115,7 +119,9 @@
-
+
+
+
@@ -386,6 +392,8 @@
import lfIndexFind from '@/components/lf-indexFind/lf-indexFind.vue';
import lfIndexShopMatrix from '@/components/lf-indexShopMatrix/lf-indexShopMatrix.vue';
import lfShopGoodsCard from '@/components/lf-shopGoodsCard/lf-shopGoodsCard.vue';
+ import lfWaterfall from '@/components/lf-waterfall-shopdetails/lf-waterfall.vue';
+ import lfMultiColumnAd from '@/components/lf-multiColumnAd/lf-multiColumnAd.vue';
var app = getApp();
export default {
data() {
@@ -426,7 +434,49 @@
microData:"",
is_login:'',// 是否是登陆状态
show_ad: true, // 是否显示ad广告
- nav_bg_color: 'transparent' // 导航背景颜色
+ nav_bg_color: 'transparent' ,// 导航背景颜色
+ recommend_list: [
+ {
+ id: 10,
+ original_price: "4111.00",
+ picture: "https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png",
+ pictures: ["https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png"],
+ price: "2412.00",
+ product_id: 1008,
+ sale: 0,
+ title: "三亚悦榕庄(Banyan Tree Sanya Resort and Spa)"
+ },
+ {
+ id: 10,
+ original_price: "4111.00",
+ picture: "https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png",
+ pictures: ["https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png"],
+ price: "2412.00",
+ product_id: 1008,
+ sale: 0,
+ title: "三亚悦榕庄(Banyan Tree Sanya Resort and Spa)"
+ },
+ {
+ id: 10,
+ original_price: "4111.00",
+ picture: "https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png",
+ pictures: ["https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png"],
+ price: "2412.00",
+ product_id: 1008,
+ sale: 0,
+ title: "三亚悦榕庄(Banyan Tree Sanya Resort and Spa)"
+ },
+ {
+ id: 10,
+ original_price: "4111.00",
+ picture: "https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png",
+ pictures: ["https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png"],
+ price: "2412.00",
+ product_id: 1008,
+ sale: 0,
+ title: "三亚悦榕庄(Banyan Tree Sanya Resort and Spa)"
+ }
+ ]
};
},
// 注册组件
@@ -451,7 +501,9 @@
lfAdModal,
lfIndexFind,
lfIndexShopMatrix,
- lfShopGoodsCard
+ lfShopGoodsCard,
+ lfWaterfall,
+ lfMultiColumnAd
},
onShow(e) {