xujing 5 年前
父节点
当前提交
fcedf5fe1d

+ 2
- 1
src/app.js 查看文件

@@ -116,7 +116,8 @@ class App extends Component {
116 116
     },
117 117
     tabBar: {
118 118
       color: '#666',
119
-      selectedColor: '#BB9C79',
119
+      selectedColor: '#E6380C',
120
+      // selectedColor: '#BB9C79',
120 121
 
121 122
       list: [
122 123
         {

二进制
src/assets/background.png 查看文件


二进制
src/assets/tabbar/activity1.png 查看文件


二进制
src/assets/tabbar/activity2.png 查看文件


二进制
src/assets/tabbar/index1.png 查看文件


二进制
src/assets/tabbar/index2.png 查看文件


二进制
src/assets/tabbar/mine1.png 查看文件


二进制
src/assets/tabbar/mine2.png 查看文件


二进制
src/assets/tabbar/shop1.png 查看文件


二进制
src/assets/tabbar/shop2.png 查看文件


+ 2
- 1
src/pages/activity/item/index.scss 查看文件

@@ -30,7 +30,8 @@
30 30
     left:0;
31 31
     top:0;
32 32
     color: #fff;
33
-    background:#BB9C79;
33
+    // background:#BB9C79;
34
+    background:#FF7D00;
34 35
     padding: 12px 36px;
35 36
     border-radius: 12px 0 12px 0;
36 37
     font-size: 24px;

+ 2
- 1
src/pages/person/customerAnalysis/item/index.scss 查看文件

@@ -31,7 +31,8 @@
31 31
     left:0;
32 32
     top:0;
33 33
     color: #fff;
34
-    background:#BB9C79;
34
+    // background:#BB9C79;
35
+    background:#FF7D00;
35 36
     padding: 12px 36px;
36 37
     border-radius: 12px 0 12px 0;
37 38
     font-size: 24px;

+ 2
- 1
src/pages/project/activity/index.scss 查看文件

@@ -65,7 +65,8 @@
65 65
                 left:0;
66 66
                 top:0;
67 67
                 color: #fff;
68
-                background:#BB9C79;
68
+                background:#FF7D00;
69
+                // background:#BB9C79;
69 70
                 padding: 12px 36px;
70 71
                 border-radius: 12px 0 12px 0;
71 72
                 font-size: 24px;

+ 22
- 20
src/pages/project/index.js 查看文件

@@ -19,6 +19,8 @@ import { getStore, connect } from '@tarojs/redux'
19 19
 import * as actions from '@/actions/project'
20 20
 import { transferImage } from '@/utils/tools'
21 21
 import Notice from '@/components/Notice'
22
+
23
+const bgImg = require('@/assets/background.png')
22 24
 // import { getIndexPreloadData } from '@/utils/preload'
23 25
 // import Authorize from '@/components/authorize'
24 26
 // import * as noticeType from '@/constants/common.js'
@@ -545,29 +547,17 @@ export default class Index extends Component {
545 547
             {!achieve && <ScrollView
546 548
               scrollY
547 549
               className='home'>
548
-              {/* 搜索框 */}
549
-              <View className="top-box">
550
-                <View className="search" onClick={this.handleToHouseList}>
551
-                  <Image className="search-icon" src={require('@/assets/index/search.png')} />
552
-                  <Input className="search-input" placeholder-style="color:#B8B8B8" placeholder="输入你想查询的楼盘"></Input>
553
-                </View>
554
-                <View className="location" onClick={this.handleLocationClick}>
555
-                  <Image className="location-icon" src={require('@/assets/index/location.png')} />
556
-                  <Text className="location-text">{curCity.id ? curCity.shortname : '正在定位'}</Text>
557
-                  <View class="arrow_down"></View>
558
-                </View>
559
-              </View>
560 550
               {/* 头部轮播图 */}
561 551
               <View className="section section-top" style={{ marginTop: 0, paddingTop: 0 }}>
562 552
                 <View
563 553
                   style={{
564
-                    height: '464rpx', position: 'relative'
554
+                    height: '500rpx', position: 'relative'
565 555
                   }}>
566 556
                   {
567 557
                     this.state.visBanner && (
568 558
                       <Banner
569 559
                         style={{
570
-                          height: '464rpx'
560
+                          height: '500rpx'
571 561
                         }}
572 562
                         indicatorDots={false}
573 563
                         list={this.state.bannerList}
@@ -578,17 +568,29 @@ export default class Index extends Component {
578 568
                     )
579 569
                   }
580 570
                 </View>
571
+                {/* 搜索框 */}
572
+                <View className="top-box">
573
+                  <View className="search" onClick={this.handleToHouseList}>
574
+                    <Image className="search-icon" src={require('@/assets/index/search.png')} />
575
+                    <Input className="search-input" placeholder-style="color:#fff" placeholder="输入你想查询的楼盘"></Input>
576
+                  </View>
577
+                  <View className="location" onClick={this.handleLocationClick}>
578
+                    <Image className="location-icon" src={require('@/assets/map.png')} />
579
+                    <Text className="location-text">{curCity.id ? curCity.shortname : '正在定位'}</Text>
580
+                    <View class="arrow_down"></View>
581
+                  </View>
582
+                </View>
581 583
               </View>
582 584
               {/* 菜单栏 */}
583
-              <View className="mune-box" style={personType == ROLE_CODE['CONSULTANT'] ? "padding:0 8%" : ""}>
585
+              <View className="mune-box" style={personType == ROLE_CODE['CONSULTANT'] ? `background: url(${transferImage(bgImg)}) no-repeat center;background-size: 100% 100%;padding:0 8%` : `background: url(${transferImage(bgImg)}) no-repeat center;background-size: 100% 100%`}>
584 586
                 <View className="mune-item" onClick={this.toShopMallPage}>
585
-                  <Image src={require('@/assets/index/mall-icon.png')} className='icon'></Image>
587
+                  <Image src="https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1578709201249-mall.png" className='icon'></Image>
586 588
                   <View className="mune-text">
587 589
                     积分商城
588 590
                   </View>
589 591
                 </View>
590 592
                 <View className="mune-item" onClick={this.toPolicyPage}>
591
-                  <Image src={require('@/assets/index/encyclopedia-icon.png')} className='icon'></Image>
593
+                  <Image src="https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1578708937718-encyclopedia.png" className='icon'></Image>
592 594
                   <View className="mune-text">
593 595
                     购房百科
594 596
                   </View>
@@ -596,14 +598,14 @@ export default class Index extends Component {
596 598
                 {
597 599
                   (personType !== ROLE_CODE['CONSULTANT']) &&
598 600
                   <View className="mune-item" onClick={this.toRecomonedPage}>
599
-                    <Image src={require('@/assets/index/recommend-icon.png')} className='icon'></Image>
601
+                    <Image src="https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1578709234380-recommend.png" className='icon'></Image>
600 602
                     <View className="mune-text">
601 603
                       推荐客户
602 604
                   </View>
603 605
                   </View>
604 606
                 }
605 607
                 <View className="mune-item" onClick={this.toMapHouse}>
606
-                  <Image src={require('@/assets/index/map-icon.png')} className='icon'></Image>
608
+                  <Image src="https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1578709222557-map.png" className='icon'></Image>
607 609
                   <View className="mune-text">
608 610
                     地图找房
609 611
                   </View>
@@ -615,7 +617,7 @@ export default class Index extends Component {
615 617
                   this.state.visPropagandaBanner && propagandaBanner.length > 0 &&
616 618
                   <View
617 619
                     style={{
618
-                      position: 'relative', padding: '20px 15px 0 15px'
620
+                      position: 'relative', padding: '10px 15px 0 15px'
619 621
                     }}>
620 622
                     <BannerTwo
621 623
                       style={{

+ 24
- 19
src/pages/project/index.scss 查看文件

@@ -12,24 +12,27 @@
12 12
   justify-content: space-between;
13 13
   align-items: center;
14 14
 }
15
+
15 16
 .top-box{
16 17
   display: flex;
17 18
   width: 100%;
18 19
   align-items: center;
19 20
   justify-content: space-between;
21
+  position: absolute;
22
+  top: 0;
23
+  left: 0;
20 24
   padding: 20px 30px;
21
-  background-color: #fff;
22 25
   .search {
23 26
     height: 60px;
24 27
     line-height: 60px;
25
-    background:rgba(0,0,0,0.04);
28
+    background:rgba(0,0,0,0.12);
26 29
     -webkit-box-pack: start;
27 30
     -webkit-justify-content: flex-start;
28 31
     -ms-flex-pack: start;
29 32
     border-radius: 30px;
30 33
     @extend .flex;
31 34
     justify-content: flex-start;
32
-    width: 500px;
35
+    width: 530px;
33 36
     &-icon {
34 37
     width: 26px;
35 38
     height: 24px;
@@ -37,27 +40,30 @@
37 40
     }
38 41
     &-input {
39 42
       font-size: 24px;
40
-      color: #B8B8B8;
43
+      color: #fff;
41 44
     }
42 45
   }
43 46
   .location {
44 47
     @extend .flex;
45 48
     justify-content: center;
49
+    padding: 0 12px;
50
+    background:rgba(0,0,0,0.12);
51
+    border-radius:30px;
46 52
     height: 60px;
47 53
     line-height: 60px;
48
-    width: 154px;
49
-    text-align: center;
54
+    
50 55
     &-text {
51
-      font-size: 26px;
52
-      padding: 0 8px;
53
-      color: $primary-color;
56
+      font-size: 25px;
57
+      padding: 0 6px 0 8px;
58
+      color: #fff;
54 59
       @include text-ellipsis; 
55
-      max-width: 120px;
60
+      max-width: 80px;
56 61
       text-align: center;
57 62
     }
63
+  
58 64
     &-icon {
59
-      width: 14px;
60
-      height: 20px;
65
+      width: 12px;
66
+      height: 16px;
61 67
       animation: bigger 1s ease 3 both;
62 68
     }
63 69
     .arrow_down {
@@ -65,21 +71,21 @@
65 71
       height: 0;
66 72
       border-left: 8px solid transparent;
67 73
       border-right: 8px solid transparent;
68
-      border-top: 8px solid $primary-color;
74
+      border-top: 8px solid #fff;
69 75
     }
70 76
   }
71
-
72 77
 }
78
+
73 79
 .mune-box{
74 80
   width:690px;
75
-  height:188px;
76
-  background:#fff;
77
-  box-shadow:0px 4px 12px 0px rgba(0,0,0,0.12);
81
+  height:208px;
82
+  // background:#fff;
83
+  // box-shadow:0px 4px 12px 0px rgba(0,0,0,0.12);
78 84
   border-radius:12px;
79 85
   display: flex;
80 86
   align-items: center;
81 87
   justify-content: space-between;
82
-  margin: -94px auto 0 auto;
88
+  margin: -54px auto 0 auto;
83 89
   position: relative;
84 90
   .mune-item{
85 91
     text-align: center;
@@ -190,7 +196,6 @@
190 196
 .section-top {
191 197
   position: relative;
192 198
   padding: 0 0px;
193
-  // box-shadow:0px 2px 12px 2px rgba(29,29,29,0.09);
194 199
 }
195 200
 
196 201
 .sectionn-news-list {

+ 11118
- 0
yarn-error.log
文件差异内容过多而无法显示
查看文件