diff --git a/common/config.js b/common/config.js
index 73222e1..49f4e8b 100644
--- a/common/config.js
+++ b/common/config.js
@@ -1,9 +1,9 @@
// 全局配置文件
// let baseUrl = 'http://219.138.32.164:8089';
-// let baseUrl = 'http://localhost:8089';
-// let staticUrl = 'http://localhost:3080';
-let baseUrl = 'https://www.wujiaguotou.com/api';
-let staticUrl = 'https://www.wujiaguotou.com';
+let baseUrl = 'http://localhost:8089';
+let staticUrl = 'http://localhost:3090';
+// let baseUrl = 'https://www.wujiaguotou.com/api';
+// let staticUrl = 'https://www.wujiaguotou.com';
// 版本号 用于更新
let version = 1;
// vuex_version版本号 用于显示
diff --git a/pages-biz/login/login.vue b/pages-biz/login/login.vue
index b6e9f45..25aa7a4 100644
--- a/pages-biz/login/login.vue
+++ b/pages-biz/login/login.vue
@@ -15,14 +15,14 @@
-
+
个人
企业
-
+
我已阅读并同意
《用户协议》
@@ -205,7 +205,7 @@
.login-btn {
width: 100%;
height: 88rpx;
- background: linear-gradient(90deg, #FF2F31 0%, #FF9379 100%);
+ background-color: 0088FE;
border-radius: 49rpx;
font-size: 36rpx;
color: #fff;
diff --git a/pages.json b/pages.json
index 381fd5d..e2d4ed6 100644
--- a/pages.json
+++ b/pages.json
@@ -323,7 +323,7 @@
},
"tabBar": {
"color": "#909399",
- "selectedColor": "#252B44",
+ "selectedColor": "#258AE6",
// "borderStyle": "#909399",
"borderStyle": "white",
"backgroundColor": "#ffffff",
diff --git a/pages/center/center.vue b/pages/center/center.vue
index 03bdd61..3a274f7 100644
--- a/pages/center/center.vue
+++ b/pages/center/center.vue
@@ -129,8 +129,8 @@
data() {
const life = uni.getStorageSync('lifeData') || {}
return {
- bgPath1: '/public/static/center/my-bg.png',
- bgPath2: '/public/static/center/my-bg2.png',
+ bgPath1: '/public/static/center/my-bg2.png',
+ bgPath2: '',
unsignContractNum:0,
handlingReserveNum:0,
// 导航栏样式控制
@@ -183,7 +183,7 @@
},
async onShow() {
try {
- await this.$checkToken(this.$getToken())
+ // await this.$checkToken(this.$getToken())
this.loadUserInfo()
this.countHandlingReserve()
this.countUnHandleContract()
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 937688f..43d914d 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -3,23 +3,39 @@
-
- 伍家国投
+
+ 新望资产
-
+
+
+
+
+
+
+
+
+
-
-
+
+
{{item.name}}
@@ -29,7 +45,7 @@
-
{{item.name}}
@@ -124,24 +140,29 @@
filterActiveConditions: [],
defaultImgUrl: '/public/static/index/assets.jpg',
navList: [{
- name: "住房",
- src: "/static/index/house.png",
- type: "住房"
+ name: "房屋",
+ src: "/public/static/index/house.png",
+ type: "房屋"
},
{
- name: "商铺",
- src: "/static/index/shop.png",
- type: "住房"
+ name: "安置房",
+ src: "/public/static/index/azhouse.png",
+ type: "安置房"
},
{
- name: "厂房",
- src: "/static/index/factory.png",
- type: "厂房"
+ name: "公租房",
+ src: "/public/static/index/gzhouse.png",
+ type: "公租房"
},
{
- name: "停车场",
- src: "/static/index/parking.png",
- type: "停车场"
+ name: "产业园",
+ src: "/public/static/index/cyy.png",
+ type: "产业园"
+ },
+ {
+ name: "土地",
+ src: "/public/static/index/land.png",
+ type: "土地"
}
],
gridList: [{
@@ -189,10 +210,21 @@
}
],
flowList: [],
- uvCode: uni.getStorageSync('uvCode')
+ uvCode: uni.getStorageSync('uvCode'),
+ capsuleTop: 0,
+ capsuleHeight: 32,
+ bannerList: [
+ { src: 'https://7478-tx-cloud-mix-mall-d6944c-1302673523.tcb.qcloud.la/5bfbd58b18200d8e16f6b17a02e6ed9.png' },
+ ]
}
},
onLoad() {
+ // 获取胶囊位置，使标题与胶囊同行
+ const menuButton = wx.getMenuButtonBoundingClientRect ? wx.getMenuButtonBoundingClientRect() : null;
+ if (menuButton) {
+ this.capsuleTop = menuButton.top;
+ this.capsuleHeight = menuButton.height;
+ }
this.getNoticecList();
this.resetAndLoad()
uni.$on('findIndexHouseList', (obj) => {
@@ -368,6 +400,11 @@
console.log("获取招商公告失败：", err)
});
},
+ onBannerTap(item) {
+ if (item.url) {
+ uni.navigateTo({ url: item.url })
+ }
+ },
location() {
this.$u.route('/pages-biz/location/location')
}
@@ -387,19 +424,17 @@
top: 0;
left: 0;
width: 100%;
- height: 550rpx;
+ height: 960rpx;
z-index: 0;
}
.index-title {
position: absolute;
- z-index: 1;
- top: 5%;
- left: 50%;
- transform: translateX(-50%);
+ z-index: 2;
+ left: 30rpx;
font-family: Noto Sans S Chinese;
- font-weight: 400;
- font-size: 34rpx;
+ font-weight: 500;
+ font-size: 54rpx;
color: #FFFFFF;
}
@@ -410,8 +445,29 @@
.search-wrapper {}
+ .banner-wrap {
+ display: flex;
+ justify-content: center;
+ margin-top: 22rpx;
+
+ .banner-swiper {
+ width: 656rpx;
+ height: 218rpx;
+ border-radius: 16rpx;
+ overflow: hidden;
+ }
+
+ .banner-img {
+ width: 100%;
+ height: 100%;
+ border-radius: 16rpx;
+ }
+ }
+
.content-wrapper {
- padding: 197rpx 30rpx 22rpx 30rpx;
+ padding-left: 30rpx;
+ padding-right: 30rpx;
+ padding-bottom: 22rpx;
}
.navbox2 {
@@ -505,8 +561,8 @@
}
.tab-item.active {
- color: #FF2F31;
- border-bottom: 4rpx solid #FF2F31;
+ color: #258AE6;
+ border-bottom: 4rpx solid #258AE6;
}
.filter-tabs {
@@ -528,8 +584,8 @@
}
.filter-item.active {
- background: #FFECEC;
- color: #FF2F31;
+ background: #d4e2ef;
+ color: #258AE6;
}
.demo-warter {
@@ -557,7 +613,7 @@
.item-price {
font-size: 32rpx;
- color: #FF2F31;
+ color: #258AE6;
margin-bottom: 10rpx;
}
@@ -613,7 +669,7 @@
width: 100%;
height: 88rpx;
line-height: 88rpx;
- background: linear-gradient(135deg, #FF2F31, #FF9379);
+ background: linear-gradient(135deg, #258AE6, #79b5ff);
color: #fff;
font-size: 30rpx;
font-weight: 500;
diff --git a/static/center-selected.png b/static/center-selected.png
index 218979c..b4aa950 100644
Binary files a/static/center-selected.png and b/static/center-selected.png differ
diff --git a/static/center.png b/static/center.png
index f4d0502..014afd5 100644
Binary files a/static/center.png and b/static/center.png differ
diff --git a/static/index-selected.png b/static/index-selected.png
index 35f2289..a2a0a9d 100644
Binary files a/static/index-selected.png and b/static/index-selected.png differ
diff --git a/static/index.png b/static/index.png
index 25ca398..104bc71 100644
Binary files a/static/index.png and b/static/index.png differ