v0.0.2

添加tarbar附近

src/components/base/switchButton/index.js

@@ -4,7 +4,7 @@ Component({
    * 组件的属性列表
    */
   properties: {
-    switching: {
+    checked: {
       type: Boolean,
       value: false
     }
@@ -21,11 +21,11 @@ Component({
   methods: {
     switchButton(){
       this.setData({
-        switching: !this.data.switching
+        checked: !this.data.checked
       })
-      if (this.data.switching){
-        this.triggerEvent('change', this.data.switching)
-      }
+      // if (this.data.switching){
+      this.triggerEvent('change', this.data.checked)
+      // }
     }
   }
 })

src/components/base/switchButton/index.wxml

@@ -1,5 +1,5 @@
 <!--components/base/switchButton/index.wxml-->
 <view class='switchButton rat'>
-  <label bindtap='switchButton' class='label-circle bw' style='left:{{switching?41:2}}rpx'></label>
-  <label class='label-bg' style='background:{{switching?"#F35D60":"#D5D5D5"}}'></label>
+  <label bindtap='switchButton' class='label-circle bw' style='left:{{checked?41:2}}rpx'></label>
+  <label class='label-bg' bindtap='switchButton' style='background:{{checked?"#F35D60":"#D5D5D5"}}'></label>
 </view>

src/components/user/homeBanner/index.wxss

@@ -3,7 +3,8 @@
 swiper{
   border-radius: 10rpx;
   padding-bottom: 32rpx;
-  overflow: hidden
+  overflow: hidden;
+  height: 300rpx;
 }
 .banners{
   padding-left: 32rpx;

src/components/user/limitTimeGetting/index.js

@@ -27,7 +27,8 @@ Component({
         url: '',
         navi: '/views/base/navi/index?city=大连市&cityd=大连市&address=辽宁省大连市沙河口区',
       }
-    }
+    },
+    status: String
   },
   /**
    * 组件的初始数据

src/components/user/limitTimeGetting/index.wxml

@@ -1,9 +1,10 @@
 <!--components/user/limitTimeGetting/index.wxml-->
+<wxs module="filters" src="../../../filters/user/index.wxs" />
 <navigator url='{{info.url}}' class='limitTimeGetting flex border-bottom'>
   <image lazy-load='true' src='{{info.pic}}'></image>
   <view class='info flex_one'>
     <view class='info-header flex flex_ac'>
-      <text class='header-badge font12 tc'>{{info.type}}</text>
+      <image src='{{filters.buyType(status)}}' class='header-badge'></image>
       <text class='font16'>{{info.title}}</text>
     </view>
     <view class='info-price font14'>到店

src/components/user/limitTimeGetting/index.wxss

@@ -16,13 +16,11 @@
   padding-left: 20rpx;
   box-sizing: border-box
 }
- .header-badge{
-  display: inline-block;
-  color: white;
-  width: 58rpx;
-  line-height: 34rpx;
-  border-radius: 6rpx;
-  background: #ff8d24
+ .limitTimeGetting .header-badge{
+  width: 56rpx;
+  height: 32rpx;
+  /* margin-right:12rpx; */
+  border-radius:4rpx
 }
  .header-badge+text{
   color: #333333;

src/components/user/nearByBanner/index.js

@@ -0,0 +1,51 @@
+// components/nearByBanner/index.js
+import { config } from '../../../config.js'
+Component({
+  options: {
+    //组件外样式类能够完全影响组件内部
+    addGlobalClass: true,
+    // 在组件定义时的选项中启用多slot支持
+    multipleSlots: true
+  },
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+
+  },
+  ready: function () {
+    this.initBanners()
+  },
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    circular: true,
+    indicatorDots: true,
+    autoplay: true,
+    interval: 3000,
+    duration: 1000,
+    banners: [],
+    current: 0
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    initBanners(){
+      let banners = []
+      for(let i=0; i < 3; i++){
+        banners.push('../../../images/user/fj_banner@3x.png')
+      }
+      this.setData({
+        banners
+      })
+    },
+    getCurrent(e){
+      // console.log(e.detail.current)
+      this.setData({
+        current: e.detail.current
+      })
+    }
+  }
+})

src/components/user/nearByBanner/index.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

src/components/user/nearByBanner/index.wxml

@@ -0,0 +1,12 @@
+<!--components/nearByBanner/index.wxml-->
+<view class='rat banners bw'>
+    <swiper bindchange="getCurrent" indicator-dots="{{false}}"
+  autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" circular="{{circular}}">
+    <swiper-item wx:for="{{banners}}" wx:key="index">
+      <image lazy-load='true' src="{{item}}" class="slide-image"/>
+    </swiper-item>
+  </swiper>
+  <view wx:if="{{indicatorDots}}" class='dots' style='width:{{banners.length*32}}rpx'>
+      <view wx:for="{{banners}}" wx:key="key" class='dots-item {{index==current?"active":""}}'></view>
+  </view>
+</view>

src/components/user/nearByBanner/index.wxss

@@ -0,0 +1,47 @@
+/* components/nearByBanner/index.wxss */
+@import '../../../app.wxss';
+swiper{
+  border-radius: 10rpx;
+  padding-bottom: 32rpx;
+  overflow: hidden;
+  height: 240rpx;
+}
+.banners{
+  padding-left: 32rpx;
+  box-sizing: border-box
+}
+.banners swiper-item{
+  padding-right: 32rpx;
+  box-sizing: border-box
+}
+.slide-image{
+  width: 690rpx;
+  height: 240rpx;
+  border-radius: 10rpx;
+}
+.rat{
+  position: relative
+}
+.dots{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: absolute;
+  bottom: 40rpx;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 10;
+}
+.dots-item{
+  width: 6rpx;
+  height: 6rpx;
+  border-radius: 6rpx;
+  background: white;
+  margin-right: 6rpx;
+  background: rgba(255, 255, 255, .72)
+}
+.dots-item.active{
+  width: 20rpx;
+  border-radius: 6rpx;
+  background: #ffffff
+}

src/components/user/nearByList/index.js

@@ -0,0 +1,47 @@
+// components/user/nearByList/index.js
+Component({
+  options: {
+    //组件外样式类能够完全影响组件内部
+    addGlobalClass: true,
+    // 在组件定义时的选项中启用多slot支持
+    multipleSlots: true
+  },
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    info: {
+      type: Object,
+      value: {
+        pic: '/images/user/limit-time.jpg',
+        mark: '/icons/user/tickets/limit@3x.png',
+        intro: '美食-火锅',
+        title: '想遇音乐概念火锅',
+        activity: '超值套餐团购、经典单品买单等15个活动',
+        command: '598',
+        oldprice: '¥450',
+        saleprice: '¥5.0',
+        earnprice: '¥1.0',
+        star: 5,
+        discount: '满300减100',
+        oldprice: '¥1030',
+        newprice: '¥450',
+        address: '新都区斑竹园镇海底搂火锅店',
+        distance: '500m'
+      }
+    },
+    status: String
+  },
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+
+  }
+})

src/components/user/nearByList/index.json

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "rate": "/components/base/rate/index"
+  }
+}

src/components/user/nearByList/index.wxml

@@ -0,0 +1,48 @@
+<!--components/user/nearByList/index.wxml-->
+<wxs module="filters" src="../../../filters/user/index.wxs" />
+<view class='bw' style='margin-bottom: 20rpx'>
+    <view class='nearByList flex border-bottom'>
+    <image lazy-load='true' src='{{info.pic}}'></image>
+    <view class='info flex_one'>
+      <text class='font16'>{{info.title}}</text>
+      <view class='info-price font14 flex flex_ac flex_sb'>
+        <view class='flex flex_ac'>
+          <rate class='font14 bold' size="{{20}}"></rate>
+          <text class='font13 command'>{{info.command}}人推荐</text>
+        </view>
+        <text class='header-intro font12 tc'>{{info.intro}}</text>
+      </view>
+      <view class='info-address clearfix'>
+        <image lazy-load='true' class='fl' src='/icons/base/weizhi@3x.png'></image>
+        <text class='fl font12'>{{info.address}}</text>
+        <text class='fr font12'>{{info.distance}}</text>
+      </view>
+    </view>
+  </view>
+  <view class='nearByListInfo bw'>
+    <view class='flex flex_ac flex_sb'>
+      <view class='flex flex_ac'>
+        <image src='{{filters.buyType(status)}}' class='header-badge'></image>
+        <view class='info-price font14'>到店
+            <text class='font14'>{{info.discount}}</text>
+        </view>
+        <image lazy-load='true' src='{{info.mark}}' style='width:75rpx;height:52rpx'></image>
+      </view>
+      <text class='sale font12 tc'>售{{info.saleprice}} 赚{{info.earnprice}}</text>
+    </view>
+    <view class='flex flex_ac flex_sb last'>
+      <view class='flex flex_ac'>
+        <image src='{{filters.buyType(status)}}' class='header-badge'></image>
+        <view class='info-price font14'>到店
+            <text class='font14'>{{info.newprice}}</text>
+            <text class='font14 del'>{{info.oldprice}}</text>
+        </view>
+      </view>
+      <text class='sale font12 tc'>售{{info.saleprice}} 赚{{info.earnprice}}</text>
+    </view>
+    <text class='bc load-more-data bw font13 tc'>
+       <text>更多优惠 </text>
+       <text class='iconfont arrow-down'></text>
+    </text>
+  </view>
+</view>

src/components/user/nearByList/index.wxss

@@ -0,0 +1,90 @@
+/* components/user/nearByList/index.wxss */
+@import '../../../app.wxss';
+.nearByList{
+  padding:40rpx 0 30rpx;
+  margin:0 30rpx;
+}
+.nearByList:nth-last-child(1){
+  border: none
+}
+.nearByList image{
+  width: 150rpx;
+  height: 150rpx;
+  flex-shrink: 0
+}
+ .info{
+  margin-top: -6rpx;
+  padding-left: 20rpx;
+  box-sizing: border-box
+}
+ .header-badge+text{
+  color: #333333;
+  padding-left: 12rpx;
+  box-sizing: border-box
+}
+.info-price text.command{
+  color:#ffa500;
+}
+.info-count{
+  color: #34495e
+}
+.info .getSale{
+  margin-bottom: 26rpx;
+  color: #ff1717
+}
+.nearByListInfo text.sale{
+  width: 186rpx;
+  height: 36rpx;
+  border-radius: 0 10rpx 0 10rpx;
+  background: #ffebd0;
+  color: #895148
+}
+.nearByListInfo>view{
+  margin-bottom: 20rpx
+}
+.nearByListInfo>view.last{
+  margin-bottom: 32rpx
+}
+.info-address{
+  margin-top: 26rpx;
+}
+.info-address image{
+  margin-top: 6rpx;
+  width: 20rpx;
+  height: 24rpx;
+  margin-right: 12rpx
+}
+.info-address text{
+  color: #818181
+}
+.header-intro{
+  color: #4a4a4a
+}
+.nearByListInfo{
+  padding: 30rpx;
+}
+ .nearByListInfo .header-badge{
+  width: 56rpx;
+  height: 32rpx;
+  margin-right: 22rpx;
+  border-radius:4rpx
+}
+.info-price text:nth-child(1){
+  color:#ff0000;
+  margin-right:18rpx
+}
+.info-price text:nth-child(2){
+  color:#818181;
+}
+text.del{
+  text-decoration: line-through
+}
+.load-more-data{
+  padding: 32rpx 32rpx 0;
+  color: #7E7F90;
+  border-top: 1px solid #eee
+}
+.load-more-data .text{
+  display: inline-block;
+  margin: 10rpx
+}

src/components/user/screeningConditions/index.js

@@ -32,12 +32,29 @@ Component({
     sortActive: 0,
     sortList: ['智能推荐', '最多分享','销量最高','收藏最多','佣金最高'],
     lists: ['团购', '满减', '单品', '代金券','免单','满送'],
-    activeOpt: 0
+    activeOpt: 'null'
   },
   /**
    * 组件的方法列表
    */
   methods: {
+    switch1Change(e){
+      console.log(e.detail)
+    },
+    switch2Change(e) {
+      console.log(e.detail)
+    },
+    switch3Change(e) {
+      console.log(e.detail)
+    },
+    reset(){
+      this.setData({
+        checked1: false,
+        checked2: false,
+        checked3: false,
+        activeOpt: 'null'
+      })
+    },
     finish(){
       this.setData({
         activeSort: 'null'

src/components/user/screeningConditions/index.wxml

@@ -60,20 +60,20 @@
 <mask wx:if="{{activeSort==3}}" top="31">
   <view class='bw'>
       <view class='sortBy bw flex flex_ac flex_sb'>
-      限时特惠 <switch-button color='#F35D60' bindchange="switch1Change" ></switch-button>
+      限时特惠 <switch-button checked="{{checked1}}" color='#F35D60' bindchange="switch1Change" ></switch-button>
     </view>
     <view class='sortBy bw flex flex_ac flex_sb'>
-      限量特惠 <switch-button color='#F35D60' bindchange="switch2Change" ></switch-button>
+      限量特惠 <switch-button checked="{{checked2}}" color='#F35D60' bindchange="switch2Change" ></switch-button>
     </view>
     <view class='sortBy bw flex flex_ac flex_sb'>
-      开业特惠 <switch-button color='#F35D60' bindchange="switch3Change" ></switch-button>
+      开业特惠 <switch-button checked="{{checked3}}" color='#F35D60' bindchange="switch3Change" ></switch-button>
     </view>
     <text class='bc bw more-opt font12'>更多选项</text>
     <view class='bw history-list clearfix flex flex_wrap'>
       <text wx:for="{{lists}}" wx:key="index" bindtap='getItem' data-index='{{index}}' class='tc history-list-item fr {{index==activeOpt?"active":""}}'>{{item}}</text>
     </view>
     <view class='btn-group flex bw'>
-      <view class='flex_one tc font15'>重置</view>
+      <view class='flex_one tc font15' bindtap='reset'>重置</view>
       <view class='flex_one tc font15' bindtap='finish'>完成</view>
     </view>
   </view>

src/filters/user/index.wxs

@@ -2,19 +2,46 @@ var ticketSrc = function(status){
   var imgSRc = ''
   switch (status.toString()) {
     case '0':
-      imgSRc = '/images/user/tag_daijinquan@3x.png'
+      imgSRc = '/icons/user/home/tag_daijinquan@3x.png'
       break
     case '1':
-      imgSRc = '/images/user/tag_danpin@3x.png'
+      imgSRc = '/icons/user/home/tag_danpin@3x.png'
       break
     case '2':
-      imgSRc = '/images/user/tag_manjian@3x.png'
+      imgSRc = '/icons/user/home/tag_manjian@3x.png'
       break
     case '3':
-      imgSRc = '/images/user/tag_mansong@3x.png'
+      imgSRc = '/icons/user/home/tag_mansong@3x.png'
       break
     case '4':
-      imgSRc = '/images/user/tag_tuangou@3x.png'
+      imgSRc = '/icons/user/home/tag_miandan@3x.png'
+      break
+    case '5':
+      imgSRc = '/icons/user/home/tag_tuangou@3x.png'
+  }
+  return imgSRc
+}
+
+var buyType = function (status) {
+  var imgSRc = ''
+  switch (status.toString()) {
+    case '0':
+      imgSRc = '/icons/user/home/tag_djq@3x.png'
+      break
+    case '1':
+      imgSRc = '/icons/user/home/tag_dp@3x.png'
+      break
+    case '2':
+      imgSRc = '/icons/user/home/tag_md@3x.png'
+      break
+    case '3':
+      imgSRc = '/icons/user/home/tag_mj@3x.png'
+      break
+    case '4':
+      imgSRc = '/icons/user/home/tag_ms@3x.png'
+      break
+    case '5':
+      imgSRc = '/icons/user/home/tag_tg@3x.png'
   }
   return imgSRc
 }
@@ -29,5 +56,6 @@ var spliceSperate = function (item,len,index) {
 
 module.exports = {
   ticketSrc: ticketSrc,
+  buyType: buyType,
   spliceSperate: spliceSperate
 }

src/styles/iconfont/index.wxss

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1040237 */
-  src: url('//at.alicdn.com/t/font_1040237_4kr792d1dmd.eot');
-  src: url('//at.alicdn.com/t/font_1040237_4kr792d1dmd.eot?#iefix') format('embedded-opentype'),
-  url('//at.alicdn.com/t/font_1040237_4kr792d1dmd.woff2') format('woff2'),
-  url('//at.alicdn.com/t/font_1040237_4kr792d1dmd.woff') format('woff'),
-  url('//at.alicdn.com/t/font_1040237_4kr792d1dmd.ttf') format('truetype'),
-  url('//at.alicdn.com/t/font_1040237_4kr792d1dmd.svg#iconfont') format('svg');
+  src: url('//at.alicdn.com/t/font_1040237_5b0kjkaar8h.eot');
+  src: url('//at.alicdn.com/t/font_1040237_5b0kjkaar8h.eot?#iefix') format('embedded-opentype'),
+  url('//at.alicdn.com/t/font_1040237_5b0kjkaar8h.woff2') format('woff2'),
+  url('//at.alicdn.com/t/font_1040237_5b0kjkaar8h.woff') format('woff'),
+  url('//at.alicdn.com/t/font_1040237_5b0kjkaar8h.ttf') format('truetype'),
+  url('//at.alicdn.com/t/font_1040237_5b0kjkaar8h.svg#iconfont') format('svg');
 }
 .iconfont{
     font-family:"iconfont" !important;
@@ -21,4 +21,8 @@
 .arrow-down-hard::before{
   content: '\e877';
   font-size: 28rpx
+}
+.arrow-down::before{
+  content: '\e625';
+  font-size: 28rpx
 }

src/views/base/home/index.json

@@ -11,5 +11,6 @@
     "limitTime-getting": "/components/user/limitTimeGetting/index",
     "popular-shop-list": "/components/user/popularShopList/index",
     "home-notify": "/components/user/homeNotify/index"
-  }
+  },
+  "navigationBarTitleText": "招财龟"
 }

src/views/base/home/index.wxml

@@ -20,12 +20,12 @@
       <home-notify></home-notify>
       <home-list-container title="超值好券" url="/views/user/tickets/index?from=ticket">
         <scroll-view class='scroll-view' scroll-x scroll-with-animation enable-back-to-top>
-          <value-ticket status="{{index}}" wx:for="01234" wx:key="index"></value-ticket>
+          <value-ticket status="{{index}}" wx:for="012345" wx:key="index"></value-ticket>
         </scroll-view>
       </home-list-container>
       <home-list-container title="限时抢购" url="/views/user/tickets/index?from=limit">
         <scroll-view scroll-y scroll-with-animation enable-back-to-top>
-          <limitTime-getting class='scroll-view-item' wx:for="12345" wx:key="index"></limitTime-getting>
+          <limitTime-getting class='scroll-view-item' wx:for="012345" wx:key="index" status="{{index}}"></limitTime-getting>
         </scroll-view>
       </home-list-container>
       <view class='tickets bw space-top'>

src/views/base/nearBy/index.json

@@ -1,5 +1,11 @@
 {
   "usingComponents": {
-    "page": "/components/base/page/index"
-  }
+    "page": "/components/base/page/index",
+    "search": "/components/base/search/index",
+    "custom-map": "/components/base/map/index",
+    "nearby-banner": "/components/user/nearByBanner/index",
+    "screening-conditions": "/components/user/screeningConditions/index",
+    "nearby-list": "/components/user/nearByList/index"
+  },
+  "navigationBarTitleText": "附近"
 }

src/views/base/nearBy/index.wxml

@@ -1,4 +1,13 @@
 <!--src/views/base/nearBy/index.wxml-->
-<page title="附近">
-  <text>src/views/base/nearBy/index.wxml</text>
+<page title="搜索">
+  <view class='flex flex_ac home-top bw'>
+    <custom-map title="{{title}}" bindarea="getArea"></custom-map>
+    <search content="圣诞套餐" url="/views/user/search/index"></search>
+  </view>
+  <nearby-banner></nearby-banner>
+  <view style='height:20rpx'></view>
+  <screening-conditions city="{{city}}"></screening-conditions>
+  <scroll-view scroll-y scroll-with-animation enable-back-to-top>
+    <nearby-list wx:for="012345" wx:key="index" status="{{index}}" type="{{type}}"></nearby-list>
+  </scroll-view>
 </page>

src/views/base/nearBy/index.wxss

@@ -1 +1,4 @@
-/* src/views/base/nearBy/index.wxss */
+/* src/views/base/nearBy/index.wxss */
+.home-top{
+  padding: 30rpx 0 30rpx 24rpx
+}

src/views/user/tickets/index.wxml

@@ -1,7 +1,7 @@
 <!--src/views/user/tickets/index.wxml-->
 <page title="超值好券">
   <screening-conditions city="{{city}}"></screening-conditions>
-  <scroll-view style='padding-bottom:30rpx;padding-top:30rpx' scroll-x scroll-with-animation enable-back-to-top>
+  <scroll-view style='padding-bottom:30rpx;padding-top:30rpx' scroll-y scroll-with-animation enable-back-to-top>
     <ticket-list status="0" type="{{type}}"></ticket-list>
     <ticket-list status="1" type="{{type}}"></ticket-list>
     <ticket-list status="2" type="{{type}}"></ticket-list>