Merge branch 'pplok' of pplokijuhyg/deguodaigou into master
This commit is contained in:
		
						commit
						92acccfcd7
					
				@ -14,7 +14,11 @@
 | 
			
		||||
    - index/search 顶部搜索框
 | 
			
		||||
    - index/list 商品列表
 | 
			
		||||
        - index/lsit/commodity 商品单条
 | 
			
		||||
- pages/search/search 搜索页
 | 
			
		||||
- pages/search/search 搜索页 <br>
 | 
			
		||||
    组件
 | 
			
		||||
    - index/search 顶部搜索框
 | 
			
		||||
    - search/hot 热门上搜索列表
 | 
			
		||||
    - search/hot 热门上搜索列表
 | 
			
		||||
- pages/classify/classify 分类页 <br>
 | 
			
		||||
    组件
 | 
			
		||||
    - classify/list 右侧商品列表
 | 
			
		||||
    - classify/navigation 左侧导航列表
 | 
			
		||||
							
								
								
									
										1
									
								
								app.json
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								app.json
									
									
									
									
									
								
							@ -1,5 +1,6 @@
 | 
			
		||||
{
 | 
			
		||||
  "pages": [
 | 
			
		||||
    "pages/classify/classify",
 | 
			
		||||
    "pages/shopping/shopping",
 | 
			
		||||
    "pages/search/search",
 | 
			
		||||
    "pages/index/index"
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										8
									
								
								components/classify/list/index.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										8
									
								
								components/classify/list/index.js
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,8 @@
 | 
			
		||||
Component({
 | 
			
		||||
    properties: {
 | 
			
		||||
    },
 | 
			
		||||
    data: {
 | 
			
		||||
    },
 | 
			
		||||
    methods: {
 | 
			
		||||
    }
 | 
			
		||||
  })
 | 
			
		||||
							
								
								
									
										6
									
								
								components/classify/list/index.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								components/classify/list/index.json
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,6 @@
 | 
			
		||||
{
 | 
			
		||||
    "component": true,
 | 
			
		||||
    "usingComponents": {
 | 
			
		||||
 | 
			
		||||
      }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										52
									
								
								components/classify/list/index.scss
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										52
									
								
								components/classify/list/index.scss
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,52 @@
 | 
			
		||||
.list{
 | 
			
		||||
    padding-left: 20rpx;
 | 
			
		||||
    width: 572rpx;
 | 
			
		||||
    box-sizing: border-box;
 | 
			
		||||
    height: 100vh;
 | 
			
		||||
    .commodity {
 | 
			
		||||
        width: 552rpx;
 | 
			
		||||
        // height: 143rpx;
 | 
			
		||||
        // margin-top: 32rpx;
 | 
			
		||||
        display: flex;
 | 
			
		||||
        align-items: center;
 | 
			
		||||
        .content {
 | 
			
		||||
          width: 552rpx;
 | 
			
		||||
          height: 100%;
 | 
			
		||||
          display: flex;
 | 
			
		||||
          align-items: center;
 | 
			
		||||
        //   box-shadow: 0 0 24rpx 0 rgba(227, 227, 227, 0.4);
 | 
			
		||||
        border-bottom: 2rpx solid #eaeaea;
 | 
			
		||||
        padding: 30rpx 0;
 | 
			
		||||
          .imgthumb {
 | 
			
		||||
            width: 105rpx;
 | 
			
		||||
            height: 105rpx;
 | 
			
		||||
            margin-left: 40rpx;
 | 
			
		||||
            background-color: #333;
 | 
			
		||||
          }
 | 
			
		||||
          .introduce {
 | 
			
		||||
            width: 336rpx;
 | 
			
		||||
            margin-left: 40rpx;
 | 
			
		||||
            display: flex;
 | 
			
		||||
            flex-direction: column;
 | 
			
		||||
            > text {
 | 
			
		||||
              font-size: 22rpx;
 | 
			
		||||
              color: #333;
 | 
			
		||||
              margin-bottom: 22rpx;
 | 
			
		||||
            }
 | 
			
		||||
            > view {
 | 
			
		||||
              display: flex;
 | 
			
		||||
              align-items: center;
 | 
			
		||||
              justify-content: space-between;
 | 
			
		||||
              > text:first-child {
 | 
			
		||||
                font-size: 30rpx;
 | 
			
		||||
                color: #dec499;
 | 
			
		||||
              }
 | 
			
		||||
              > text:last-child {
 | 
			
		||||
                font-size: 22rpx;
 | 
			
		||||
                color: #999;
 | 
			
		||||
              }
 | 
			
		||||
            }
 | 
			
		||||
          }
 | 
			
		||||
        }
 | 
			
		||||
      }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										38
									
								
								components/classify/list/index.wxml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										38
									
								
								components/classify/list/index.wxml
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,38 @@
 | 
			
		||||
<scroll-view class="list" scroll-y="{{true}}" >
 | 
			
		||||
        <view class="commodity">
 | 
			
		||||
            <view class="content">
 | 
			
		||||
                <image class="imgthumb "></image>
 | 
			
		||||
                <view class="introduce">
 | 
			
		||||
                    <text>产品名称产品名称产品名称产品名称产品名称产品</text>
 | 
			
		||||
                    <view>
 | 
			
		||||
                        <text>¥657</text>
 | 
			
		||||
                        <text>加入购物车</text>
 | 
			
		||||
                    </view>
 | 
			
		||||
                </view>
 | 
			
		||||
            </view>
 | 
			
		||||
        </view>
 | 
			
		||||
        <view class="commodity">
 | 
			
		||||
            <view class="content">
 | 
			
		||||
                <image class="imgthumb "></image>
 | 
			
		||||
                <view class="introduce">
 | 
			
		||||
                    <text>产品名称产品名称产品名称产品名称产品名称产品</text>
 | 
			
		||||
                    <view>
 | 
			
		||||
                        <text>¥657</text>
 | 
			
		||||
                        <text>加入购物车</text>
 | 
			
		||||
                    </view>
 | 
			
		||||
                </view>
 | 
			
		||||
            </view>
 | 
			
		||||
        </view>
 | 
			
		||||
        <view class="commodity">
 | 
			
		||||
            <view class="content">
 | 
			
		||||
                <image class="imgthumb "></image>
 | 
			
		||||
                <view class="introduce">
 | 
			
		||||
                    <text>产品名称产品名称产品名称产品名称产品名称产品</text>
 | 
			
		||||
                    <view>
 | 
			
		||||
                        <text>¥657</text>
 | 
			
		||||
                        <text>加入购物车</text>
 | 
			
		||||
                    </view>
 | 
			
		||||
                </view>
 | 
			
		||||
            </view>
 | 
			
		||||
        </view>
 | 
			
		||||
    </scroll-view>
 | 
			
		||||
							
								
								
									
										1
									
								
								components/classify/list/index.wxss
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								components/classify/list/index.wxss
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1 @@
 | 
			
		||||
.list{padding-left:20rpx;width:572rpx;box-sizing:border-box;height:100vh}.list .commodity{width:552rpx;display:flex;align-items:center}.list .commodity .content{width:552rpx;height:100%;display:flex;align-items:center;border-bottom:2rpx solid #eaeaea;padding:30rpx 0}.list .commodity .content .imgthumb{width:105rpx;height:105rpx;margin-left:40rpx;background-color:#333}.list .commodity .content .introduce{width:336rpx;margin-left:40rpx;display:flex;flex-direction:column}.list .commodity .content .introduce>text{font-size:22rpx;color:#333;margin-bottom:22rpx}.list .commodity .content .introduce>view{display:flex;align-items:center;justify-content:space-between}.list .commodity .content .introduce>view>text:first-child{font-size:30rpx;color:#dec499}.list .commodity .content .introduce>view>text:last-child{font-size:22rpx;color:#999}
 | 
			
		||||
							
								
								
									
										8
									
								
								components/classify/navigation/index.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										8
									
								
								components/classify/navigation/index.js
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,8 @@
 | 
			
		||||
Component({
 | 
			
		||||
    properties: {
 | 
			
		||||
    },
 | 
			
		||||
    data: {
 | 
			
		||||
    },
 | 
			
		||||
    methods: {
 | 
			
		||||
    }
 | 
			
		||||
  })
 | 
			
		||||
							
								
								
									
										6
									
								
								components/classify/navigation/index.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								components/classify/navigation/index.json
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,6 @@
 | 
			
		||||
{
 | 
			
		||||
    "component": true,
 | 
			
		||||
    "usingComponents": {
 | 
			
		||||
 | 
			
		||||
      }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										20
									
								
								components/classify/navigation/index.scss
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										20
									
								
								components/classify/navigation/index.scss
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,20 @@
 | 
			
		||||
.navigation {
 | 
			
		||||
    width: 188rpx;
 | 
			
		||||
    // margin-right: 2rpx;
 | 
			
		||||
    border-right: 2rpx solid #eaeaea;
 | 
			
		||||
    max-height: 100vh;
 | 
			
		||||
    view{
 | 
			
		||||
        height: 97rpx;
 | 
			
		||||
        font-size: 28rpx;
 | 
			
		||||
        color: #333;
 | 
			
		||||
        border-bottom: 2rpx solid #eaeaea;
 | 
			
		||||
        line-height: 97rpx;
 | 
			
		||||
        font-weight: bold;
 | 
			
		||||
        text-align: center;
 | 
			
		||||
        box-sizing: border-box;
 | 
			
		||||
    }
 | 
			
		||||
    .on{
 | 
			
		||||
        border-left: 5rpx solid #56CC84;
 | 
			
		||||
        color:#56CC84;
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										10
									
								
								components/classify/navigation/index.wxml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								components/classify/navigation/index.wxml
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,10 @@
 | 
			
		||||
    <scroll-view class="navigation" scroll-y="{{true}}" >
 | 
			
		||||
        <view class="on">热门商品</view>
 | 
			
		||||
        <view>美容健身</view>
 | 
			
		||||
        <view>美容健身</view>
 | 
			
		||||
        <view>美容健身</view>
 | 
			
		||||
        <view>美容健身</view>
 | 
			
		||||
        <view>美容健身</view>
 | 
			
		||||
        <view>美容健身</view>
 | 
			
		||||
        <view>美容健身</view>
 | 
			
		||||
    </scroll-view>
 | 
			
		||||
							
								
								
									
										1
									
								
								components/classify/navigation/index.wxss
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								components/classify/navigation/index.wxss
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1 @@
 | 
			
		||||
.navigation{width:188rpx;border-right:2rpx solid #eaeaea;max-height:100vh}.navigation view{height:97rpx;font-size:28rpx;color:#333;border-bottom:2rpx solid #eaeaea;line-height:97rpx;font-weight:bold;text-align:center;box-sizing:border-box}.navigation .on{border-left:5rpx solid #56CC84;color:#56CC84}
 | 
			
		||||
							
								
								
									
										66
									
								
								pages/classify/classify.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										66
									
								
								pages/classify/classify.js
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,66 @@
 | 
			
		||||
// pages/classify/classify.js
 | 
			
		||||
Page({
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * 页面的初始数据
 | 
			
		||||
   */
 | 
			
		||||
  data: {
 | 
			
		||||
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * 生命周期函数--监听页面加载
 | 
			
		||||
   */
 | 
			
		||||
  onLoad: function (options) {
 | 
			
		||||
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * 生命周期函数--监听页面初次渲染完成
 | 
			
		||||
   */
 | 
			
		||||
  onReady: function () {
 | 
			
		||||
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * 生命周期函数--监听页面显示
 | 
			
		||||
   */
 | 
			
		||||
  onShow: function () {
 | 
			
		||||
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * 生命周期函数--监听页面隐藏
 | 
			
		||||
   */
 | 
			
		||||
  onHide: function () {
 | 
			
		||||
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * 生命周期函数--监听页面卸载
 | 
			
		||||
   */
 | 
			
		||||
  onUnload: function () {
 | 
			
		||||
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * 页面相关事件处理函数--监听用户下拉动作
 | 
			
		||||
   */
 | 
			
		||||
  onPullDownRefresh: function () {
 | 
			
		||||
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * 页面上拉触底事件的处理函数
 | 
			
		||||
   */
 | 
			
		||||
  onReachBottom: function () {
 | 
			
		||||
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * 用户点击右上角分享
 | 
			
		||||
   */
 | 
			
		||||
  onShareAppMessage: function () {
 | 
			
		||||
 | 
			
		||||
  }
 | 
			
		||||
})
 | 
			
		||||
							
								
								
									
										6
									
								
								pages/classify/classify.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								pages/classify/classify.json
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,6 @@
 | 
			
		||||
{
 | 
			
		||||
  "usingComponents": {
 | 
			
		||||
    "list":"../components/classify/list/index",
 | 
			
		||||
    "navigation":"../components/classify/navigation/index"
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										7
									
								
								pages/classify/classify.scss
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								pages/classify/classify.scss
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,7 @@
 | 
			
		||||
.box{
 | 
			
		||||
    width: 750rpx;
 | 
			
		||||
    display: flex;
 | 
			
		||||
    border-top: 1rpx solid #eaeaea;
 | 
			
		||||
    
 | 
			
		||||
   
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										4
									
								
								pages/classify/classify.wxml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										4
									
								
								pages/classify/classify.wxml
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,4 @@
 | 
			
		||||
<view class="box">
 | 
			
		||||
<navigation></navigation>
 | 
			
		||||
<list></list>
 | 
			
		||||
</view>
 | 
			
		||||
							
								
								
									
										1
									
								
								pages/classify/classify.wxss
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								pages/classify/classify.wxss
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1 @@
 | 
			
		||||
.box{width:750rpx;display:flex;border-top:1rpx solid #eaeaea}
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user