Merge branch 'v4' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into v4

config/prod.js

@@ -3,8 +3,8 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
-    HOST: '"http://192.168.0.172:8080"',
-    WSS_HOST: '"wss://192.168.0.172:8080"',
+    HOST: '"http://192.168.0.84:8080"',
+    WSS_HOST: '"wss://192.168.0.84:8080"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
   },

src/app.js

@@ -40,9 +40,10 @@ class App extends Component {
       }
     },
     pages: [
+      'pages/activity/activity',
       'pages/shop/index',
       'pages/project/index',
-      'pages/activity/activity',
+     
       'pages/project/detail/index',
       'pages/person/index',
       'pages/activity/assemblePage',

src/components/ListView/index.js

@@ -17,9 +17,9 @@ export default class ListView extends Component {
     distanceToRefresh: 30,
     isEmpty: false,
     emptyText: '',
-    noMore: '暂无更多内容',
+    noMore: '已经到底了~',
     footerLoadingText: '加载中...',
-    footerLoadedText: '暂无更多内容',
+    footerLoadedText: '已经到底了~',
     scrollTop: 0,
     touchScrollTop: 0,
     onScrollToLower: () => { },

src/components/ListView/index.scss

@@ -17,7 +17,9 @@
 .loading,
 .loaded {
   text-align: center;
-  padding: 12px;
+  padding: 50px;
+  color: #999;
+  font-size:28px;
   //animation: loading infinite 1000ms ease;
 }
 

src/components/achievePhone/index.js

@@ -0,0 +1,92 @@
+import Taro, { Component } from '@tarojs/taro'
+import getUserPhone from '@utils/getUserPhone'
+import './index.scss'
+
+export default class Index extends Component {
+
+  state = {
+    // maskVisible: false,
+  }
+
+  componentDidMount() {
+    // this.setState({
+    //   maskVisible: true
+    // })
+    if (this.props.user.phone) {
+      this.props.onSuccess();
+    }
+
+  }
+  getPhoneNumber(e) {
+    console.log(e, "eeeeeeeeeeeee")
+    getUserPhone(e, (phoneNumber) => {
+      if (!phoneNumber) {
+        Taro.showToast({
+          title: '获取手机号失败',
+          icon: 'none'
+        })
+        return
+      } else {
+        this.props.onSuccess();
+
+      }
+    })
+  }
+  renderMaskBanner() {
+    const { maskBanner } = this.state
+    return (
+      <View>
+        <Image src={require('@assets/helpgroup/bg.png')} className='bg_img'></Image>
+        <View className="phone-page">
+
+          <View className="content">
+            <Image src={require('@assets/index/logo.png')} className='logo_img'></Image>
+            <View className="text">
+              授权手机后,可享受以下功能
+          </View>
+            <View className="flex">
+              <View className="item">
+                <Image className="shouquan" src={require('@assets/helpgroup/shouquan.png')} ></Image>在线咨询
+            </View>
+              <View className="item">
+                <Image className="shouquan" src={require('@assets/helpgroup/shouquan.png')} ></Image>收藏分享楼盘
+            </View>
+            </View>
+            <View className="flex">
+              <View className="item">
+                <Image className="shouquan" src={require('@assets/helpgroup/shouquan.png')} ></Image>专属顾问
+            </View>
+              <View className="item">
+                <Image className="shouquan" src={require('@assets/helpgroup/shouquan.png')} ></Image>参与助力活动            </View>
+            </View>
+            <View className="flex">
+              <View className="item">
+                <Image className="shouquan" src={require('@assets/helpgroup/shouquan.png')} ></Image>推荐客户
+            </View>
+              <View className="item">
+                <Image className="shouquan" src={require('@assets/helpgroup/shouquan.png')} ></Image>参与拼团活动
+            </View>
+            </View>
+            <View className="flex">
+              <View className="item">
+                <Image className="shouquan" src={require('@assets/helpgroup/shouquan.png')} ></Image>获取积分好礼
+            </View>
+              <View className="item">
+                <Image className="shouquan" src={require('@assets/helpgroup/shouquan.png')} ></Image>更多精彩权益
+            </View>
+            </View>
+            <Button className="btn" open-type="getPhoneNumber" lang="zh_CN" onGetphonenumber={this.getPhoneNumber}>授权手机</Button>
+          </View>
+        </View>
+      </View>
+    )
+  }
+  render() {
+
+    return (
+      <Block>
+        {!this.props.user.phone && this.renderMaskBanner()}
+      </Block>
+    )
+  }
+}

src/components/achievePhone/index.scss

@@ -0,0 +1,72 @@
+.bg_img{
+  width: 100vw;
+  height: 100vh;
+}
+.phone-page{
+  position: fixed;
+  width: 100vw;
+  height: 100vh;
+  left: 0;
+  top: 0;
+  z-index: 9999;
+  background: rgba(0, 0, 0, 0.22);
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  
+  .content {
+    width: 94vw;
+    height: 640px;
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    margin-left: -47vw;
+    transform: translateY(-50%);
+    background-color: #fff;
+    border-radius: 12px;
+    padding: 0 40px;
+    .logo_img{
+      width: 132px;
+      height: 106px;
+      display: block;
+      margin: 30px auto 24px auto;
+    }
+    .text{
+      font-size: 34px;
+      color:#333;
+      margin-bottom: 38px;
+    }
+    .flex{
+      display: flex;
+      align-items: center;
+      padding: 0 70px;
+      justify-content: space-between;
+      margin-bottom:28px; 
+      .item{
+        display: flex;
+        align-items: center;
+        font-size: 28px;
+        color: #666;
+        .shouquan{
+          width: 28px;
+          height: 28px;
+          margin-right: 16px;
+          margin-top: 4px;
+        }
+
+      }
+     
+    }
+    .btn{
+      width:310px;
+      height:100px;
+      background:rgba(187,156,121,1);
+      border-radius:12px;
+      font-size: 36px;
+      color: #fff;
+      line-height: 100px;
+      margin-top: 6px;
+    }
+  }
+}

src/pages/activity/activity.js

@@ -9,6 +9,8 @@ import News from '../news/index'
 import { savePoint, updatePoint } from '@services/common'
 import { connect } from '@tarojs/redux'
 
+
+
 let pageIndex = 1
 
 @connect(state => state.city)
@@ -31,20 +33,22 @@ export default class active extends Component {
 
   render() {
     const { isEmpty, hasMore, list } = this.state
-
     return (
-      <AtTabs className="tab-box" scroll current={this.state.current} tabList={[{ title: '热门活动' }, { title: '最新资讯' }]} onClick={this.handleClick.bind(this)}>
-        <AtTabsPane current={this.state.current} index={0} >
-          <View >
-            <Activity ></Activity >
-          </View>
-        </AtTabsPane>
-        <AtTabsPane current={this.state.current} index={1}>
-          <View >
-            <News ></News>
-          </View>
-        </AtTabsPane>
-      </AtTabs>
+
+      <View style="height:100vh">
+        <AtTabs className="tab-box" scroll current={this.state.current} tabList={[{ title: '热门活动' }, { title: '最新资讯' }]} onClick={this.handleClick.bind(this)}>
+          <AtTabsPane current={this.state.current} index={0} >
+            <View >
+              <Activity ></Activity >
+            </View>
+          </AtTabsPane>
+          <AtTabsPane current={this.state.current} index={1}>
+            <View >
+              <News ></News>
+            </View>
+          </AtTabsPane>
+        </AtTabs>
+      </View>
     );
   }
 }

src/pages/activity/detail/index.scss

@@ -95,6 +95,7 @@
   }
 
   &-con {
+    margin-bottom: 100px;
     &__title {
       font-size: 32px;
       font-weight: bold;

src/pages/activity/item/index.js

@@ -17,14 +17,20 @@ export default class Item extends Component {
       <View className="item" style={style} onClick={this.handleClick.bind(this, data)}>
         <Image className="pic" mode="aspectFill" src={data.mainImg}></Image>
         <View className="box">
-
           <View className="title">{data.title}</View>
+          {
+            data.weight == '1' &&
+            <Image className="hot-tip" src={require('@assets/shop/hottip.png')}></Image>
+          }
+          {(data.type == 'help' || data.type == 'group') &&
+            <View className={data.type == 'help' ? 'type' : 'type2'}>{data.type == 'help' ? '助力' : '拼团'}</View>
+          }
 
           {/* <View className="time">活动开始时间：{`${dayjs(data.startDate).format('YYYY-MM-DD hh:mm:ss')}`}</View> */}
 
           <View className="left">
-            <View className="time">参与截止时间：{`${dayjs(data.endDate).format('YYYY-MM-DD hh:mm:ss')}`}</View>
-            <View className={data.isSign ? "alreay-btn" : "btn"}>{data.isSign ? "已参与" : "立即参与"}</View>
+            <View className="time">参与截止时间：{`${dayjs(data.endDate).format('YYYY年MM月DD日 hh:mm:ss')}`}</View>
+            <View className={data.activityStatus == 0 ? "btn jionin " : data.activityStatus == 1 ? "btn nostart" : data.activityStatus == 2 ? "btn jioned" : "btn"}>{data.activityStatus == 0 ? "立即参与" : data.activityStatus == 1 ? "未开始" : data.activityStatus == 2 ? "已参与" : "已结束"}</View>
           </View>
         </View>
       </View >

src/pages/activity/item/index.scss

@@ -8,23 +8,53 @@
 }
 
 .item {
-  border-radius: 10px;
+  border-radius: 12px;
   box-shadow: 0 2px 10px #EAEAEA;
   overflow: hidden;
-  margin-bottom: 50px;
+  margin-bottom: 20px;
   width: 100%;
+  position: relative;
+  padding-bottom: 4px;
+  .type{
+    position: absolute;
+    left:0;
+    top:0;
+    color: #fff;
+    background: #F6B61D;
+    padding: 10px 36px;
+    border-radius: 12px 0 12px 0;
+    font-size: 24px;
+  }
+  .type2{
+    position: absolute;
+    left:0;
+    top:0;
+    color: #fff;
+    background: #BB9C79;
+    padding: 12px 36px;
+    border-radius: 12px 0 12px 0;
+    font-size: 24px;
+
+  }
+  .hot-tip{
+    position: absolute;
+    right:0;
+    top:0;
+    width: 76px;
+    height: 68px;
 
+  }
   .pic {
     width: 100%;
-    height:260px;
+    height:332px;
     display: block;
   }
 
   .box {
     padding:30px;
     .title {
-      font-size: 30px;
-      width: 390px;
+      font-size: 28px;
+      width: 620px;
       @include text-ellipsis;
     }
 
@@ -36,14 +66,15 @@
 
 
       .time {
-        margin-top: 15px;
-        font-size: 26px;
+        margin-top: 20px;
+        font-size: 24px;
         color: #8E8E8E;
       }
     }
 
     .btn {
-      background:#FF6A6A;
+  
+      background:#DADADA;
       border-radius:30px;
       text-align: center;
       color: white;
@@ -52,18 +83,17 @@
       font-size: 26px;
       height: 48px;
       line-height: 48px;
+      margin-top: 14px;
+    }
+    .jionin{
+      background:#FF6A6A;
+    }
+		.nostart {
+      
+      background:#FDC080;
+    }
+    .jioned{
+      background: #9B9B9B;
     }
-		.alreay-btn {
-		  background:#9B9B9B;
-		  border-radius:30px;
-		  text-align: center;
-		  color: white;
-		  display: block;
-		  padding: 10px 0;
-      width: 148px;
-      font-size: 26px;
-      height: 48px;
-      line-height: 48px;
-		}
   }
 }

src/pages/news/item.scss

@@ -1,17 +1,14 @@
 @import "@styles/theme.scss";
 .item {
-  padding: 50px 0;
-  border-bottom: solid 1px $border-color-light;
+  border-bottom: solid 2px $border-color-light;
   display: flex;
   justify-content: space-between;
   align-items: center;
-	margin:0 30px;
-
   &-img {
-    width: 400px;
-    height: 200px;
-    margin-right: 30px;
-    border-radius: 10px;
+    width: 300px;
+    height: 160px;
+    margin-right: 24px;
+    border-radius: 4px;
   }
 
   &-con {
@@ -22,14 +19,14 @@
     height: 200px;
 
     &__title {
-      font-size: $font-size-title;
-			margin-top: 20px;
+      font-size: 28px;
+			margin-top: 32px;
     }
 
     &__date {
-      font-size: $font-size-content;
-      color: $text-color-lighter;
-			margin-bottom: 20px;
+      font-size: 24px;
+      color: #999;
+			margin-bottom: 32px;
     }
   }
 }

src/pages/person/index.js

@@ -161,20 +161,20 @@ export default class Person extends Component {
         <View className="info">
           <Image className="bg" src={require('@assets/mine/background.png')} mode='widthFix'></Image>
           <View className="content">
-            <View className="info-block" onClick={this.goPersonDetail}>
-              <View className="avatar">
+            <View className="info-block">
+              <View className="avatar" onClick={this.goPersonDetail}>
                 <Image className="info__headimg" src={user.avatar} />
                 <View className="info-intro">{this.getRoleName(user.personType)}</View>
               </View>
 
-              <View className="info-text">
+              <View className="info-text" onClick={this.goPersonDetail}>
                 <View className="info-text__name">{user.name ? user.name : user.nickname} {/* <Text className="iconfont icon-more"></Text> */}</View>
                 <View className="info-text__intro">积分 {user.points || 0}</View>
               </View>
-              <View className="tuiguang">
+              <Navigator url={`/pages/person/spread/index`}  className="tuiguang">
                 <Image style="width:40px;height:36px" src={require('@assets/mine/tuiguangma.png')} ></Image>
                 <View className="info-text__intro" style="margin:4px 0 0 4px">推广码</View>
-              </View>
+              </Navigator>
             </View>
             {/* <View
               className={`sign__btn ${user.havaSigned && 'signed'}`}