静态页面

project.config.json

@@ -27,7 +27,7 @@
 			"outputPath": ""
 		},
 		"useIsolateContext": true,
-		"useCompilerModule": true,
+		"useCompilerModule": false,
 		"userConfirmedUseCompilerModuleSwitch": false
 	},
 	"compileType": "miniprogram",

src/pages/activity/assembleItem/index.js

@@ -2,6 +2,7 @@ import Taro, { Component } from '@tarojs/taro';
 import './index.scss'
 import dayjs from 'dayjs'
 import { transferImage } from '@/utils/tools'
+import { View } from '@tarojs/components';
 
 const groupSuccess = require('@/assets/helpgroup/group/already.png')
 const groupFail = require('@/assets/helpgroup/fail.png')
@@ -11,7 +12,7 @@ export default class Item extends Component {
     data: {},
     style: {}
   }
-  handleClick(data) {
+  handleClick (data) {
 
     this.props.onClick(data)
   }
@@ -67,38 +68,48 @@ export default class Item extends Component {
 
   //   return `${day}天${hour}小时${min}分${sec}秒`
   // }
-  render() {
+  render () {
     const { data, style } = this.props
     return (
-      <View className="item" style={style} onClick={this.handleClick.bind(this, data)}>
-        <Image className="pic" mode="aspectFill" src={transferImage(data.mainImg)} ></Image>
-        <View className="title">{data.activityName}</View>
-        {(!data.verificationCode && data.status == 1) &&
-          <View className="time">参与截止时间: 
-          {data.endDate&&
-            <Text className="count-time">{`${dayjs(data.endDate).format('YYYY-MM-DD HH:mm:ss')}`}</Text>
-          }</View>
-        }
-        {(!data.verificationCode && data.status != 1) &&
-          <View className="time"><Text className="count-time">活动已结束</Text></View>
-        }
-        {data.verificationCode &&
-          <Block>
-            <View className={data.verificationStatus == 0 ? 'type' : 'type2'}>{data.verificationStatus == 0 ? '未核销' : '已核销'}</View>
-            <View className="hexiaoma">核销码：{data.verificationCode}</View>
-          </Block>
-        }
-        {data.createTime&&<View className="start-date">{`${dayjs(data.createTime).format('YYYY-MM-DD HH:mm:ss')}`}</View>}
-        {data.status == 0 &&
-          <Image className="status-icon" src={groupSuccess} ></Image>
-        }
-        {data.status == 1 &&
-          <View className="btn">进行中</View>
-        }
-        {data.status == 2 &&
-          <Image className="status-icon" src={groupFail} ></Image>
-        }
-
+      <View className="item flex-h" style={style} onClick={this.handleClick.bind(this, data)}>
+        <View className='Img'>
+          <Image mode="aspectFill" src={transferImage(data.mainImg)} ></Image>
+          {
+            data.verificationCode &&
+            <Text className={data.verificationStatus == 0 ? 'active' : ''}>{data.verificationStatus == 0 ? '未核销' : '已核销'}</Text>
+          }
+        </View>
+        <View className='flex-item'>
+          <View className="title">{data.activityName}</View>
+          {(!data.verificationCode && data.status == 1) &&
+            <View className="time">参与截止时间:
+          {data.endDate &&
+                <Text className="count-time">{`${dayjs(data.endDate).format('YYYY-MM-DD HH:mm:ss')}`}</Text>
+              }</View>
+          }
+          {(!data.verificationCode && data.status != 1) &&
+            <View className="time"><Text className="count-time">活动已结束</Text></View>
+          }
+          {data.verificationCode &&
+            <Block>
+              <View className="hexiaoma">核销码：{data.verificationCode}</View>
+            </Block>
+          }
+          {data.createTime &&
+            <View className='flex-h'>
+              <View className="start-date flex-item">{`${dayjs(data.createTime).format('YYYY-MM-DD HH:mm:ss')}`}</View>
+              {data.status == 1 &&
+                <View className="btn">进行中</View>
+              }
+            </View>
+          }
+          {data.status == 0 &&
+            <Image className="status-icon" src={groupSuccess} ></Image>
+          }
+          {data.status == 2 &&
+            <Image className="status-icon" src={groupFail} ></Image>
+          }
+        </View>
       </View>
 
     );

src/pages/activity/assembleItem/index.scss

@@ -1,5 +1,6 @@
 @import "@/styles/theme.scss";
 @import "@/styles/mixins.scss";
+@import "@/styles/reset.scss";
 
 .flex {
   display: flex;
@@ -9,85 +10,120 @@
 
 .item {
   overflow: hidden;
-  padding: 20px 10px;
+  padding: 20px 0;
   position: relative;
-  border-bottom:1px solid #eee;
-  .date{
+  border-bottom: 1px solid #eee;
+  align-items: center;
+  > .flex-item {
+    > view {
+      margin-top: 10px;
+      &:first-child {
+        margin-top: 0;
+      }
+    }
+  }
+  .date {
     font-size: 24px;
     margin-bottom: 12px;
   }
-  .type{
+  .type {
     position: absolute;
-    left:10px;
-    top:20px;
+    left: 10px;
+    top: 20px;
     color: #fff;
-    background:#F6B61D;
+    background: #f6b61d;
     padding: 2px 8px;
     border-radius: 12px 0 12px 0;
     font-size: 24px;
   }
-  .type2{
+  .type2 {
     position: absolute;
-    left:10px;
-    top:20px;
+    left: 10px;
+    top: 20px;
     color: #fff;
-    background:#DADADA;
+    background: #dadada;
     padding: 2px 8px;
     border-radius: 12px 0 12px 0;
     font-size: 24px;
-
+  }
+  .Img {
+    width: 220px;
+    height: 176px;
+    position: relative;
+    overflow: hidden;
+    border-radius: 12px;
+    background: #f8f8f8;
+    margin-right: 20px;
+    > image {
+      width: 100%;
+      height: 100%;
+      position: relative;
+      display: block;
+      z-index: 1;
+    }
+    > text {
+      font-size: 24px;
+      display: inline-block;
+      position: absolute;
+      z-index: 2;
+      padding: 0 10px;
+      border-radius: 0 0 12px 0;
+      background: rgba(255, 255, 255, 0.8);
+      left: 0;
+      top: 0;
+      line-height: 40px;
+      color: #999;
+      &.active {
+        color: #1dd100;
+      }
+    }
   }
 
   .pic {
     width: 220px;
-    height:124px;
+    height: 176px;
   }
-  .status-icon{
-    width: 124px;
-    height: 124px;
+  .status-icon {
+    width: 105px;
+    height: 105px;
     position: absolute;
-    right:0;
-    top:22px;
+    right: 0;
+    top: 50%;
+    transform: translateY(-50%);
+    -webkit-transform: translateY(-50%);
+    display: block;
   }
 
   .title {
-    font-size: 30px;
-    width: 320px;
-    @include text-ellipsis;
-    position: absolute;
-    top:20px;
-    left:254px;
+    font-size: 28px;
+    color: #333;
+    font-weight: bold;
+    line-height: 40px;
   }
 
   .time {
     font-size: 26px;
-    color: #666;
-    position: absolute;
-    top:66px;
-    left:254px;
+    color: #fa1e1e;
+    line-height: 40px;
   }
-  .hexiaoma{
-    color: $primary-color;
-    font-size: 26px;
-    position: absolute;
-    top:66px;
-    left:254px;
+  .hexiaoma {
+    color: #1dd100;
+    font-size: 28px;
+    line-height: 40px;
   }
-  .count-time{
-    color:$primary-color;
+  .count-time {
+    color: #fa1e1e;
+    line-height: 40px;
   }
-  .start-date{
+  .start-date {
     color: #999;
-    font-size: 26px;
-    position: absolute;
-    bottom:30px;
-    left:254px;
-  }
+    font-size: 24px;
+    line-height: 40px;
   }
+}
 
-  .btn {
-    color: #E35E44;
-    position: absolute;
-    right:10px;
-    bottom:30px;
-  }
+.btn {
+  color: #1bc5d4;
+  font-size: 24px;
+  line-height: 40px;
+}

src/pages/activity/assemblePage.js

@@ -119,6 +119,9 @@ export default class Index extends Component {
             ))
           }
         </View>
+        <View>
+          <Image className='Logo' mode='widthFix' src={require('@/assets/img/logo.png')}></Image>
+        </View>
       </ListView>
     );
   }

src/pages/activity/assistanceItem/index.js

@@ -11,7 +11,7 @@ export default class Item extends Component {
     data: {},
     style: {}
   }
-  handleClick(data) {
+  handleClick (data) {
 
     this.props.onClick(data)
   }
@@ -67,39 +67,48 @@ export default class Item extends Component {
 
   //   return `${day}天${hour}小时${min}分${sec}秒`
   // }
-  render() {
+  render () {
     const { data, style } = this.props
     return (
-      <View className="item" style={style} onClick={this.handleClick.bind(this, data)}>
-        <Image className="pic" mode="aspectFill" src={transferImage(data.img)} ></Image>
-        <View className="title">{data.title}</View>
-        {(!data.verification && data.status == 1) &&
-          <View className="time">参与截止时间:
+      <View className="item flex-h" style={style} onClick={this.handleClick.bind(this, data)}>
+        <View className='Img'>
+          <Image mode="aspectFill" src={transferImage(data.img)} ></Image>
+          {
+            data.verification &&
+            <Text className={data.verificationStatus == 0 ? 'active' : ''}>{data.verificationStatus == 0 ? '未核销' : '已核销'}</Text>
+          }
+        </View>
+        <View className='flex-item'>
+          <View className="title">{data.title}</View>
+          {(!data.verification && data.status == 1) &&
+            <View className="time">参与截止时间:
           {data.endDate &&
-              <Text className="count-time">{`${dayjs(data.endDate).format('YYYY-MM-DD HH:mm:ss')}`}</Text>
+                <Text className="count-time">{`${dayjs(data.endDate).format('YYYY-MM-DD HH:mm:ss')}`}</Text>
+              }
+            </View>
+          }
+          {(!data.verification && data.status != 1) &&
+            <View className="time"><Text className="count-time">活动已结束</Text></View>
+          }
+          {data.verification &&
+            <Block>
+              <View className="hexiaoma">核销码：{data.verification}</View>
+            </Block>
+          }
+          <View className='flex-h'>
+            {data.createDate && <View className="start-date flex-item">{`${dayjs(data.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</View>}
+            {data.status == 1 &&
+              <View className="btn">进行中</View>
             }
           </View>
-        }
-        {(!data.verification && data.status != 1) &&
-          <View className="time"><Text className="count-time">活动已结束</Text></View>
-        }
-        {data.verification &&
-          <Block>
-            <View className={data.verificationStatus == 0 ? 'type' : 'type2'}>{data.verificationStatus == 0 ? '未核销' : '已核销'}</View>
-            <View className="hexiaoma">核销码：{data.verification}</View>
-          </Block>
-        }
-        {data.createDate && <View className="start-date">{`${dayjs(data.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</View>}
-        {data.status == 0 &&
-          <Image className="status-icon" src={helpSuccess} ></Image>
-        }
-        {data.status == 1 &&
-          <View className="btn">进行中</View>
-        }
-        {data.status == 2 &&
-          <Image className="status-icon" src={helpFail} ></Image>
-        }
 
+          {data.status == 0 &&
+            <Image className="status-icon" src={helpSuccess} ></Image>
+          }
+          {data.status == 2 &&
+            <Image className="status-icon" src={helpFail} ></Image>
+          }
+        </View>
       </View>
 
     );

src/pages/activity/assistanceItem/index.scss

@@ -1,5 +1,6 @@
 @import "@/styles/theme.scss";
 @import "@/styles/mixins.scss";
+@import "@/styles/reset.scss";
 
 .flex {
   display: flex;
@@ -9,85 +10,120 @@
 
 .item {
   overflow: hidden;
-  padding: 20px 10px;
+  padding: 20px 0;
   position: relative;
-  border-bottom:1px solid #eee;
-  .date{
+  border-bottom: 1px solid #eee;
+  align-items: center;
+  > .flex-item {
+    > view {
+      margin-top: 10px;
+      &:first-child {
+        margin-top: 0;
+      }
+    }
+  }
+  .date {
     font-size: 24px;
     margin-bottom: 12px;
   }
-  .type{
+  .type {
     position: absolute;
-    left:10px;
-    top:20px;
+    left: 10px;
+    top: 20px;
     color: #fff;
-    background:#F6B61D;
+    background: #f6b61d;
     padding: 2px 8px;
     border-radius: 12px 0 12px 0;
     font-size: 24px;
   }
-  .type2{
+  .type2 {
     position: absolute;
-    left:10px;
-    top:20px;
+    left: 10px;
+    top: 20px;
     color: #fff;
-    background:#DADADA;
+    background: #dadada;
     padding: 2px 8px;
     border-radius: 12px 0 12px 0;
     font-size: 24px;
-
+  }
+  .Img {
+    width: 220px;
+    height: 176px;
+    position: relative;
+    overflow: hidden;
+    border-radius: 12px;
+    background: #f8f8f8;
+    margin-right: 20px;
+    > image {
+      width: 100%;
+      height: 100%;
+      position: relative;
+      display: block;
+      z-index: 1;
+    }
+    > text {
+      font-size: 24px;
+      display: inline-block;
+      position: absolute;
+      z-index: 2;
+      padding: 0 10px;
+      border-radius: 0 0 12px 0;
+      background: rgba(255, 255, 255, 0.8);
+      left: 0;
+      top: 0;
+      line-height: 40px;
+      color: #999;
+      &.active {
+        color: #1dd100;
+      }
+    }
   }
 
   .pic {
     width: 220px;
-    height:124px;
+    height: 176px;
   }
-  .status-icon{
-    width: 124px;
-    height: 124px;
+  .status-icon {
+    width: 105px;
+    height: 105px;
     position: absolute;
-    right:0;
-    top:22px;
+    right: 0;
+    top: 50%;
+    transform: translateY(-50%);
+    -webkit-transform: translateY(-50%);
+    display: block;
   }
 
   .title {
-    font-size: 30px;
-    width: 320px;
-    @include text-ellipsis;
-    position: absolute;
-    top:20px;
-    left:254px;
+    font-size: 28px;
+    color: #333;
+    font-weight: bold;
+    line-height: 40px;
   }
 
   .time {
     font-size: 26px;
-    color: #666;
-    position: absolute;
-    top:66px;
-    left:254px;
+    color: #fa1e1e;
+    line-height: 40px;
   }
-  .hexiaoma{
-    color: $primary-color;
-    font-size: 26px;
-    position: absolute;
-    top:66px;
-    left:254px;
+  .hexiaoma {
+    color: #1dd100;
+    font-size: 28px;
+    line-height: 40px;
   }
-  .count-time{
-    color:$primary-color;
+  .count-time {
+    color: #fa1e1e;
+    line-height: 40px;
   }
-  .start-date{
+  .start-date {
     color: #999;
-    font-size: 26px;
-    position: absolute;
-    bottom:30px;
-    left:254px;
-  }
+    font-size: 24px;
+    line-height: 40px;
   }
+}
 
-  .btn {
-    color: #E35E44;
-    position: absolute;
-    right:10px;
-    bottom:30px;
-  }
+.btn {
+  color: #1bc5d4;
+  font-size: 24px;
+  line-height: 40px;
+}

src/pages/activity/assistancePage.js

@@ -119,6 +119,9 @@ export default class Index extends Component {
             ))
           }
         </View>
+        <View>
+          <Image className='Logo' mode='widthFix' src={require('@/assets/img/logo.png')}></Image>
+        </View>
       </ListView>
     );
   }

src/pages/activity/detail/assemble.js

@@ -79,7 +79,7 @@ export default class Detail extends Component {
     queryInfo: {}
   }
 
-  componentWillMount() {
+  componentWillMount () {
     ready.queue(() => {
       // 必须授权电话
       if (this.toggleGrantPhone()) {
@@ -89,17 +89,17 @@ export default class Detail extends Component {
     })
   }
 
-  componentWillUnmount() {
+  componentWillUnmount () {
     this.stopTicker()
     this.state.pointRecordId && updatePoint(this.state.pointRecordId)
 
   }
 
-  componentDidShow() {
+  componentDidShow () {
     this.startTicker()
   }
 
-  componentDidHide() {
+  componentDidHide () {
     this.stopTicker()
   }
 
@@ -144,14 +144,14 @@ export default class Detail extends Component {
   }
 
   // 启动 ticker
-  startTicker() {
+  startTicker () {
     if (this.state.ltTicker && !this.state.ltTicker.processing) {
       this.state.ltTicker.start()
     }
   }
 
   // 清除 ticker
-  stopTicker() {
+  stopTicker () {
     if (this.state.ltTicker) {
       this.state.ltTicker.stop()
     }
@@ -269,7 +269,7 @@ export default class Detail extends Component {
   }
 
   // 计时器更新剩余时间
-  getLeftTimeTicker(startDate, endDate) {
+  getLeftTimeTicker (startDate, endDate) {
     let processing = false
     let ticker = undefined
 
@@ -299,7 +299,7 @@ export default class Detail extends Component {
     }
   }
 
-  loadDetail() {
+  loadDetail () {
     let { id, recordId, ltTicker, qrcodeParams, queryInfo } = this.state
     const { userInfo } = this.props
 
@@ -385,7 +385,7 @@ export default class Detail extends Component {
   //   }
   // }
 
-  currentPageAndParams() {
+  currentPageAndParams () {
     // currentPageAndParams(shareFrom) {
     const { id, recordId = '', qrcodeParams } = this.state
     const { userInfo: { person: { personId, personType, userId } } } = this.props
@@ -460,9 +460,9 @@ export default class Detail extends Component {
           const that = this
           wx.requestSubscribeMessage({
             tmplIds: [tplId],
-            success(res) { },
-            fail(res) { },
-            complete() {
+            success (res) { },
+            fail (res) { },
+            complete () {
 
               Taro.showLoading()
               that.setState({ submitting: true }, () => {
@@ -537,9 +537,9 @@ export default class Detail extends Component {
           const that = this
           wx.requestSubscribeMessage({
             tmplIds: [tplId],
-            success(res) { },
-            fail(res) { },
-            complete() {
+            success (res) { },
+            fail (res) { },
+            complete () {
 
 
               // 必须授权头像
@@ -630,7 +630,7 @@ export default class Detail extends Component {
 
   }
 
-  getQRCode() {
+  getQRCode () {
     const [page, scene] = this.currentPageAndParams()
     const payload = { page, scene }
 
@@ -648,7 +648,7 @@ export default class Detail extends Component {
     })
   }
 
-  transTPLs2Configs(tpls, params) {
+  transTPLs2Configs (tpls, params) {
     return tpls.map((tpl) => {
       const conf = getCanvasConfig(tpl.configs, params)
       return { ...conf }
@@ -656,7 +656,7 @@ export default class Detail extends Component {
   }
 
 
-  render() {
+  render () {
     const {
       recordId,
       recordDetail,
@@ -740,9 +740,15 @@ export default class Detail extends Component {
               <View className="detail-banner">
                 <Image mode="widthFix" src={transferImage(detail.mainImg)} className="detail-banner__img"></Image>
 
-                <View className="rest-time">
-                  <Text className="row-label" style={actState === ActBeforeStart || actState === ActInProcess ? 'margin-right: 8px;' : ''}>{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '')} </Text>
-                  <Text className="row-text">{actState != ActFinished ? formateLeftTime(leftTime) : '活动已结束'}</Text>
+                <View className="TimeData">
+                  <Text className="Tips" style={actState === ActBeforeStart || actState === ActInProcess ? 'margin-right: 8px;' : ''}>{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '')} </Text>
+                  {
+                    actState != ActFinished ? (
+                      <Text>{formateLeftTime(leftTime)}</Text>
+                    ) : (
+                        <Text className='Tips'>活动已结束</Text>
+                      )
+                  }
                 </View>
                 {detail.successNum > 0 &&
                   <View className="success-num">

src/pages/activity/myActivity.js

@@ -129,8 +129,8 @@ export default class Index extends Component {
                   <Image mode="widthFix" className='centerLabel cover' src={item.mainImg || item.img || item.listImgUrl || item.imgUrl}></Image>
                 </View>
                 <View className='flex-item'>
-                  <Text>{item.title}</Text>
-                  <Text>据活动结束：{item.endDate}</Text>
+                  <Text style={{ 'font-weight': 'bold' }}>{item.title}</Text>
+                  <Text>参与截止时间：{dayjs(item.endDate).format('YYYY年MM月DD日 HH:mm:ss')}</Text>
                   <View className='flex-h'>
                     <Text className='flex-item'>{dayjs(item.startDate).format('YYYY年MM月DD日 HH:mm:ss')}</Text>
                     <Text className={Date.now() < new Date(item.startDate).getTime() ? 'active' : Date.now() < new Date(item.endDate).getTime() ? 'active' : ''}>{Date.now() < new Date(item.startDate).getTime() ? '即将开始' : Date.now() < new Date(item.endDate).getTime() ? '进行中' : '已结束'}</Text>

src/pages/index/index.js

@@ -20,7 +20,7 @@ export default class Index extends Component {
       { id: 1, img: require('@/assets/img/icon1.png'), name: '雅居宝', router: null },
       { id: 2, img: require('@/assets/img/icon2.png'), name: '乐粉福利', router: `/pages/shop/index` },
       { id: 3, img: require('@/assets/img/icon3.png'), name: '乐趣头条', router: `/pages/activity/activity` },
-      { id: 4, img: require('@/assets/img/icon4.png'), name: '乐客联盟', router: null }
+      { id: 4, img: require('@/assets/img/icon4.png'), name: '乐客联盟', router: `/pages/league/index` }
     ]
   }
   render () {

src/pages/league/index.js

@@ -0,0 +1,127 @@
+import { View } from '@tarojs/components'
+import { Component } from '@tarojs/taro'
+import './index.scss'
+
+export default class Index extends Component {
+  config = {
+    navigationBarTitleText: '乐客联盟',
+    navigationStyle: 'custom'
+  }
+  state = {
+    TestImg: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1604566584132&di=33926cb8407ae341fa1d8cc0d322d392&imgtype=0&src=http%3A%2F%2Fattach.bbs.miui.com%2Fforum%2F201305%2F30%2F220025pxfkhykvkgkvuktq.jpg',
+    BannerData: [
+      { id: 1, img: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1604485078843&di=e50cb70de152bb6b83f7b1d712b509c8&imgtype=0&src=http%3A%2F%2Fattachments.gfan.com%2Fforum%2F201503%2F19%2F211608ztcq7higicydxhsy.jpg' },
+      { id: 2, img: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1604486077351&di=a5320b0e8f2dd45ccdee71f7e1a541d5&imgtype=0&src=http%3A%2F%2Fbenyouhuifile.it168.com%2Fforum%2F201304%2F06%2F11435052yrezzae1bua8ee.jpg' },
+      { id: 3, img: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1604486077351&di=ba0b2021b0dce8807b75bcd81cd44d32&imgtype=0&src=http%3A%2F%2Fbenyouhuifile.it168.com%2Fforum%2Fday_100429%2F1004291840008539c8ac02cd5c.jpg' },
+      { id: 4, img: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1604486077351&di=014ef8ce837f8762c1e982f093286f42&imgtype=0&src=http%3A%2F%2Fattach.bbs.miui.com%2Fforum%2F201306%2F23%2F110328s72xxse7lfis9fnd.jpg' },
+      { id: 5, img: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1604486077349&di=861dfd8adb91ede1c5f6de5abb59638b&imgtype=0&src=http%3A%2F%2Fattach.bbs.miui.com%2Fforum%2F201205%2F15%2F152011zser9o5oa9ee9xx6.jpg' }
+    ],
+    StoreList: ['', '', '', '', ''],
+    NavList: [
+      { id: 1, img: require('@/assets/img/icon1.png'), name: '乐客美食' },
+      { id: 2, img: require('@/assets/img/icon2.png'), name: '乐客教育' },
+      { id: 3, img: require('@/assets/img/icon3.png'), name: '乐客休闲' },
+      { id: 4, img: require('@/assets/img/icon4.png'), name: '乐客便捷' }
+    ]
+  }
+  GoBack () {
+    Taro.navigateBack()
+  }
+  render () {
+    const { NavList, StoreList, BannerData } = this.state
+    return (
+      <View className='Page'>
+
+        <View className='DiyTop'>
+          <Text>乐客联盟</Text>
+          <Image mode='widthFix' src={require('@/assets/img/prev.png')} onClick={this.GoBack} />
+        </View>
+
+        <Image className="TopBg" src='../../assets/img/topbg.jpg' mode='widthFix'></Image>
+
+        {/* 搜索 */}
+        <View className='SearchContainer'>
+          <View>
+            <View className='Placeholder'>
+              <Image src='../../assets/img/icon16.png' mode='widthFix'></Image>
+              <Text>附近热搜：火锅</Text>
+            </View>
+            <Input type='text' />
+          </View>
+        </View>
+
+        {/* banner区域 */}
+        <View className='BannerContainer'>
+
+          {/* banner */}
+          <View className='Banner'>
+            <View>
+              <View>
+                <Swiper className='Swiper' indicatorColor='rgba(0,0,0,0.4)' indicatorActiveColor='#fff' circular indicatorDots autoplay>
+                  {
+                    BannerData.map((item, index) => (
+                      <SwiperItem key={`Swiper-${index}`}>
+                        <Image mode='widthFix' className='centerLabel' src={item.img} />
+                      </SwiperItem>
+                    ))
+                  }
+                </Swiper>
+              </View>
+            </View>
+          </View>
+
+          {/* nav */}
+          <View className='Nav flex-h'>
+            {
+              NavList.map((item, index) => (
+                <View className='flex-item' key={`Nav-${index}`}>
+                  <View>
+                    <Image mode='heightFix' className='centerLabel' src={item.img} />
+                  </View>
+                  <Text>{item.name}</Text>
+                </View>
+              ))
+            }
+          </View>
+
+        </View>
+
+        {/* 乐客商家 */}
+        <View className='LeKeStore'>
+          {
+            StoreList.map((item, index) => (
+              <Navigator key={`Store-${index}`} className='flex-h' url={null}>
+                <View className='Img'>
+                  <Image mode='widthFix' className='centerLabel' src={this.TestImg} />
+                </View>
+                <View className='flex-item'>
+                  <View>
+                    <View className='Title'><View>湖品</View><Text className='Type1'>买</Text><Text className='Type2'>订</Text><Text className='Type3'>外</Text><Text className='Type4'>促</Text></View>
+                    <View className='Score'>
+                      <Image mode='widthFix' src={require('@/assets/img/icon6.png')} />
+                      <Image mode='widthFix' src={require('@/assets/img/icon6.png')} />
+                      <Image mode='widthFix' src={require('@/assets/img/icon6.png')} />
+                      <Image mode='widthFix' src={require('@/assets/img/icon6.png')} />
+                      <Image mode='widthFix' src={require('@/assets/img/icon6.png')} />
+                      <Text>￥97/人</Text>
+                    </View>
+                    <View className='flex-h'>
+                      <View className='flex-item'>
+                        <View>
+                          <Text>淮扬菜</Text>
+                          <Text>徐庄软件园</Text>
+                        </View>
+                      </View>
+                      <Text>10.5km</Text>
+                    </View>
+                  </View>
+                </View>
+              </Navigator>
+            ))
+          }
+        </View>
+
+      </View>
+    )
+  }
+}

src/pages/league/index.scss

@@ -0,0 +1,384 @@
+@import "@/styles/theme.scss";
+@import "@/styles/reset.scss";
+
+.Page {
+  width: 100%;
+  min-height: 100vh;
+  background: #f8f8f8;
+  position: relative;
+  overflow: hidden;
+  > image {
+    width: 100%;
+    display: block;
+    position: absolute;
+    z-index: 1;
+    left: 0;
+    top: 0;
+  }
+  > view {
+    position: relative;
+    overflow: hidden;
+    margin-top: 20px;
+    padding: 0 30px;
+    z-index: 2;
+    &:first-child {
+      margin-top: 0;
+    }
+    > .Title {
+      display: block;
+      font-size: 34px;
+      color: #666;
+      line-height: 40px;
+      text-align: center;
+      margin-top: 20px;
+    }
+  }
+  > .DiyTop {
+    position: fixed;
+    top: 55px;
+    width: 100%;
+    left: 0;
+    z-index: 10;
+    > text {
+      display: block;
+      text-align: center;
+      font-size: 32px;
+      line-height: 64px;
+      color: #333;
+      position: relative;
+      z-index: 1;
+    }
+    > image {
+      display: inline-block;
+      position: absolute;
+      z-index: 2;
+      left: 30px;
+      width: 16px;
+      height: 35px;
+      top: 50%;
+      transform: translateY(-50%);
+      -webkit-transform: translateY(-50%);
+    }
+  }
+  > .SearchContainer {
+    margin-top: 140px;
+    position: relative;
+    overflow: hidden;
+    > view {
+      width: 100%;
+      position: relative;
+      overflow: hidden;
+      border-radius: 68px;
+      background: #fff;
+      > view {
+        width: 100%;
+        position: absolute;
+        left: 0;
+        top: 0;
+        font-size: 0;
+        white-space: nowrap;
+        z-index: 1;
+        height: 68px;
+        text-align: center;
+        > text {
+          display: inline-block;
+          vertical-align: middle;
+          font-size: 24px;
+          line-height: 68px;
+          color: #666;
+          margin-left: 20px;
+        }
+        > image {
+          width: 30px;
+          height: 30px;
+          display: inline-block;
+          vertical-align: middle;
+        }
+      }
+      > input {
+        line-height: 68px;
+        height: 68px;
+        display: block;
+        width: 100%;
+        font-size: 24px;
+        text-align: center;
+        position: relative;
+        z-index: 2;
+      }
+    }
+  }
+  > .BannerContainer {
+    padding-bottom: 20px;
+    > .Banner {
+      position: relative;
+      overflow: hidden;
+      > view {
+        width: 100%;
+        padding-bottom: 50%;
+        position: relative;
+        overflow: hidden;
+        > view {
+          width: 100%;
+          position: absolute;
+          left: 0;
+          top: 0;
+          bottom: 0;
+          > .DingWei {
+            display: inline-block;
+            height: 40px;
+            position: absolute;
+            z-index: 2;
+            right: 0;
+            top: 0;
+            font-size: 0;
+            white-space: nowrap;
+            padding: 0 10px;
+            background: rgba(255, 255, 255, 0.8);
+            > image {
+              width: 24px;
+              display: inline-block;
+              vertical-align: middle;
+              height: 28px;
+            }
+            > text {
+              display: inline-block;
+              vertical-align: middle;
+              font-size: 24px;
+              line-height: 40px;
+              margin-left: 10px;
+            }
+          }
+          > .Swiper {
+            width: 100%;
+            height: 100%;
+            position: relative;
+            overflow: hidden;
+            z-index: 1;
+            image {
+              min-width: 100%;
+              min-height: 100%;
+            }
+          }
+        }
+      }
+    }
+    > .Nav {
+      align-items: center;
+      margin-top: 40px;
+      > .flex-item {
+        > view {
+          width: 60%;
+          padding-bottom: 60%;
+          position: relative;
+          overflow: hidden;
+          margin: 0 auto;
+          > image {
+            height: 100%;
+          }
+        }
+        > text {
+          display: block;
+          font-size: 26px;
+          line-height: 40px;
+          text-align: center;
+          margin-top: 5px;
+        }
+      }
+    }
+  }
+  > .ActivityRecommed {
+    background: #fff;
+    padding-bottom: 20px;
+    > view {
+      width: 100%;
+      position: relative;
+      overflow: hidden;
+      padding-bottom: 33.33%;
+      background: #eee;
+      border-radius: 24px;
+      margin-top: 20px;
+      > image {
+        min-width: 100%;
+        min-height: 100%;
+      }
+    }
+  }
+  > .HousesRecommed {
+    background: #fff;
+    padding-bottom: 30px;
+    > view {
+      width: 100%;
+      position: relative;
+      overflow: hidden;
+      padding-bottom: 56%;
+      background: #eee;
+      border-radius: 24px;
+      margin-top: 20px;
+      > image {
+        min-width: 100%;
+        min-height: 100%;
+        z-index: 1;
+      }
+      > text {
+        width: 100%;
+        display: block;
+        position: absolute;
+        z-index: 2;
+        left: 0;
+        bottom: 0;
+        font-size: 28px;
+        color: #fff;
+        line-height: 80px;
+        text-indent: 15px;
+        background-image: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.5));
+      }
+    }
+  }
+  > .LeKeStore {
+    position: relative;
+    overflow: hidden;
+    padding: 0;
+    > .ListTitle {
+      padding: 0 30px;
+      display: block;
+      width: 100%;
+      font-size: 32px;
+      color: #000;
+      font-weight: bold;
+      line-height: 80px;
+      text-indent: 20px;
+      background: #fff;
+      position: relative;
+      border-bottom: 1px solid #f8f8f8;
+      &::after {
+        content: "";
+        width: 6px;
+        height: 32px;
+        display: block;
+        position: absolute;
+        left: 30px;
+        top: 50%;
+        transform: translateY(-50%);
+        -webkit-transform: translateY(-50%);
+        background: #1bc5d4;
+      }
+      & + .flex-h {
+        margin-top: 0;
+      }
+    }
+    > .flex-h {
+      position: relative;
+      overflow: hidden;
+      margin-top: 20px;
+      background: #fff;
+      padding: 30px;
+      > .Img {
+        width: 242px;
+        height: 182px;
+        position: relative;
+        overflow: hidden;
+        border-radius: 8px;
+        background: #eee;
+      }
+      > .flex-item {
+        position: relative;
+        overflow: hidden;
+        > view {
+          width: 100%;
+          position: relative;
+          overflow: hidden;
+          margin-left: 20px;
+          > .Title {
+            width: 100%;
+            font-size: 0;
+            > view {
+              display: inline-block;
+              vertical-align: middle;
+              font-size: 32px;
+              font-weight: bold;
+              color: #000;
+              line-height: 40px;
+            }
+            > text {
+              font-size: 20px;
+              font-weight: normal;
+              width: 30px;
+              line-height: 30px;
+              display: inline-block;
+              vertical-align: middle;
+              text-align: center;
+              color: #fff;
+              background: #eee;
+              border-radius: 4px;
+              margin-left: 10px;
+              &.Type1 {
+                background: #ff8c1f;
+              }
+              &.Type2 {
+                background: #fccb34;
+              }
+              &.Type3 {
+                background: #1bc5d4;
+              }
+              &.Type4 {
+                background: #1dd100;
+              }
+            }
+          }
+          > .Score {
+            font-size: 0;
+            white-space: nowrap;
+            margin-top: 10px;
+            > image {
+              width: 14px;
+              margin-right: 10px;
+              display: inline-block;
+              vertical-align: middle;
+            }
+            > text {
+              display: inline-block;
+              vertical-align: middle;
+              font-size: 30px;
+              line-height: 40px;
+              color: #fdac2e;
+              margin-left: 20px;
+              font-weight: bold;
+            }
+          }
+          > .flex-h {
+            width: 100%;
+            position: relative;
+            overflow: hidden;
+            align-items: center;
+            margin-top: 10px;
+            > view {
+              position: relative;
+              overflow: hidden;
+              > view {
+                width: 100%;
+                position: relative;
+                overflow: hidden;
+                font-size: 0;
+                white-space: nowrap;
+                > text {
+                  display: inline-block;
+                  vertical-align: middle;
+                  font-size: 24px;
+                  color: #999;
+                  line-height: 32px;
+                  margin-right: 10px;
+                }
+              }
+            }
+            > text {
+              font-size: 26px;
+              color: #666;
+              margin-left: 10px;
+              margin-right: 20px;
+            }
+          }
+        }
+      }
+    }
+  }
+}

src/pages/person/favorite/index.js

@@ -24,17 +24,13 @@ export default class Index extends Component {
         name: '楼盘',
         id: 1
       },
-      // {
-      //   name: '置业顾问',
-      //   id: 2
-      // },
-      {
-        name: '资讯',
-        id: 3
-      },
       {
         name: '活动',
         id: 4
+      },
+      {
+        name: '资讯',
+        id: 3
       }
     ],
     houseList: [],
@@ -153,6 +149,7 @@ export default class Index extends Component {
 
     return (
       <Block>
+        <View style={{ width: '100%', height: '10px' }}></View>
         {
           activityList.length > 0 ? activityList.map(item => (
             <ActivityItem
@@ -170,6 +167,7 @@ export default class Index extends Component {
     const { newsList } = this.state
     return (
       <Block>
+        <View style={{ width: '100%', height: '15px' }}></View>
         {
           newsList.length > 0 ? newsList.map(item => (
             <NewsItem

src/pages/person/index.js

@@ -278,6 +278,13 @@ export default class Person extends Component {
     })
   }
 
+  ToastMsg (msg) {
+    Taro.showToast({
+      title: msg,
+      icon: 'none'
+    })
+  }
+
   goPersonDetail () {
 
     const { users: { personType } } = this.state
@@ -311,9 +318,7 @@ export default class Person extends Component {
       <View className="person">
         <Notice></Notice>
         <View className="info">
-          <Image className="bg" src='../../assets/img/topbg.jpg' mode='widthFix'>
-            {/* <Image className="logo" src={transferImage(waterMark || require('@/assets/logo.png'))} mode='widthFix'></Image> */}
-          </Image>
+          <Image className="bg" src='../../assets/img/topbg.jpg' mode='widthFix'></Image>
 
           <View className="content">
             <View className="info-block">
@@ -370,7 +375,7 @@ export default class Person extends Component {
               <Block key={`grp-${ginx}`}>
                 {
                   group.map((menu, inx) => (
-                    <View onClick={() => this.redirectTo(menu.url)} style={{ color: menu.style }} className="menu-item-con" key={`menu-${inx}`}>
+                    <View onClick={() => { menu.url === null ? this.ToastMsg('敬请期待') : this.redirectTo(menu.url) }} style={{ color: menu.style }} className="menu-item-con" key={`menu-${inx}`}>
                       <Image className="left-icon" src={menu.icon} ></Image>
                       <View className="menu-maintext">
                         <Text className="menu-name" style={menu.style}>{menu.name}</Text>

src/pages/shop/index.js

@@ -34,10 +34,6 @@ export default class Shop extends Component {
     user: {},
     current: 0,
     points: 0,
-    NavList: [
-      { name: '兑换好礼', id: 1 },
-      { name: '金基天著尚居', id: 2 }
-    ],
     CurrentNavId: 1,
     cityId: (this.props.curCity || {}).id
 
@@ -110,6 +106,8 @@ export default class Shop extends Component {
         item.title = item.buildingName
       })
 
+      console.log(res, `----------------------`)
+
       this.setState({
         goodsBuilding: res || []
       }, () => {
@@ -444,31 +442,33 @@ export default class Shop extends Component {
             <AtTabs scroll tabDirection='horizontal' current={current} tabList={goodsBuilding} onClick={this.handleClick.bind(this)}>
               {
                 goodsBuilding.map((pItem, pIndex) => (
-                  <View className='PrizeList' key={`Parent-${pIndex}`}>
-                    {
-                      goodsList.map((item, index) => (
-                        <View className='ListItem' key={item.goodsId}>
-                          <View>
-                            <View onClick={this.onViewDetail.bind(this, item)}>
-                              <View className='Img'>
-                                <Image mode='widthFix' className='centerLabel' src={item.imgUrl} />
-                              </View>
-                              <View className='Title'>
-                                <Text>{item.goodsName}</Text>
-                              </View>
-                              <View className='flex-h'>
-                                <Text className='flex-item'>剩余数量{item.inventory}</Text>
-                                <View>
-                                  <Text>{item.pointPrice}</Text>
-                                  <Text>积分</Text>
+                  <AtTabsPane current={current} key={`pane-${pIndex}`} index={pIndex} >
+                    <View className='PrizeList'>
+                      {
+                        goodsList.map((item, index) => (
+                          <View className='ListItem' key={item.goodsId}>
+                            <View>
+                              <View onClick={this.onViewDetail.bind(this, item)}>
+                                <View className='Img'>
+                                  <Image mode='widthFix' className='centerLabel' src={item.imgUrl} />
+                                </View>
+                                <View className='Title'>
+                                  <Text>{item.goodsName}</Text>
+                                </View>
+                                <View className='flex-h'>
+                                  <Text className='flex-item'>剩余数量{item.inventory}</Text>
+                                  <View>
+                                    <Text>{item.pointPrice}</Text>
+                                    <Text>积分</Text>
+                                  </View>
                                 </View>
                               </View>
                             </View>
                           </View>
-                        </View>
-                      ))
-                    }
-                  </View>
+                        ))
+                      }
+                    </View>
+                  </AtTabsPane>
                 ))
               }
             </AtTabs>

src/pages/shop/index.scss

@@ -298,3 +298,9 @@
     }
   }
 }
+.at-tabs__item--active {
+  color: #333 !important;
+}
+.at-tabs__item-underline {
+  background-color: #333 !important;
+}

src/routes.js

@@ -33,6 +33,13 @@ const routes = [
     isTab: true,
     type: 'center',
   },
+  {
+    name: '乐客联盟',
+    page: 'pages/league/index',
+    pkg: 'main',
+    isTab: true,
+    type: 'center',
+  },
 
   /********************************
    * 项目相关