Merge branch 'zhengjei' of pplokijuhyg/deguodaigou into master
This commit is contained in:
		
						commit
						73baa9b246
					
				@ -43,5 +43,9 @@
 | 
			
		||||
    - chooseaddr/address  地址列表(单个)
 | 
			
		||||
    - chooseaddr/addradd  添加按钮
 | 
			
		||||
 | 
			
		||||
- pages/addaddress/addaddress 选择地址 <br>
 | 
			
		||||
- pages/addaddress/addaddress 添加地址 <br>
 | 
			
		||||
    - addaddress/shuru  添加地址的输入的每一项
 | 
			
		||||
 | 
			
		||||
- pages/member/member 会员商品 <br>
 | 
			
		||||
    - member/membertop 会员商品顶部的字
 | 
			
		||||
    - member/membershop  单个商品
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										43
									
								
								app.json
									
									
									
									
									
								
							
							
						
						
									
										43
									
								
								app.json
									
									
									
									
									
								
							@ -1,24 +1,25 @@
 | 
			
		||||
{
 | 
			
		||||
  "pages": [
 | 
			
		||||
    "pages/addaddress/addaddress",
 | 
			
		||||
    "pages/chooseaddr/chooseaddr",
 | 
			
		||||
    "pages/order/order",
 | 
			
		||||
    "pages/orderconfirm/orderconfirm",
 | 
			
		||||
    "pages/message/message",
 | 
			
		||||
    "pages/personal/personal",
 | 
			
		||||
    "pages/product/product",
 | 
			
		||||
    "pages/classify/classify",
 | 
			
		||||
    "pages/shopping/shopping",
 | 
			
		||||
    "pages/search/search",
 | 
			
		||||
    "pages/index/index"
 | 
			
		||||
  ],
 | 
			
		||||
  "window": {
 | 
			
		||||
    "backgroundTextStyle": "light",
 | 
			
		||||
    "navigationBarBackgroundColor": "#fff",
 | 
			
		||||
    "navigationBarTitleText": "WeChat",
 | 
			
		||||
    "navigationBarTextStyle": "black"
 | 
			
		||||
  },
 | 
			
		||||
  "style": "v2",
 | 
			
		||||
  "sitemapLocation": "sitemap.json"
 | 
			
		||||
    "pages": [
 | 
			
		||||
        "pages/member/member",
 | 
			
		||||
        "pages/addaddress/addaddress",
 | 
			
		||||
        "pages/chooseaddr/chooseaddr",
 | 
			
		||||
        "pages/order/order",
 | 
			
		||||
        "pages/orderconfirm/orderconfirm",
 | 
			
		||||
        "pages/message/message",
 | 
			
		||||
        "pages/personal/personal",
 | 
			
		||||
        "pages/product/product",
 | 
			
		||||
        "pages/classify/classify",
 | 
			
		||||
        "pages/shopping/shopping",
 | 
			
		||||
        "pages/search/search",
 | 
			
		||||
        "pages/index/index"
 | 
			
		||||
    ],
 | 
			
		||||
    "window": {
 | 
			
		||||
        "backgroundTextStyle": "light",
 | 
			
		||||
        "navigationBarBackgroundColor": "#fff",
 | 
			
		||||
        "navigationBarTitleText": "WeChat",
 | 
			
		||||
        "navigationBarTextStyle": "black"
 | 
			
		||||
    },
 | 
			
		||||
    "style": "v2",
 | 
			
		||||
    "sitemapLocation": "sitemap.json"
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										23
									
								
								components/member/membershop/membershop.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										23
									
								
								components/member/membershop/membershop.js
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,23 @@
 | 
			
		||||
// components/member/membershop/membershop.js
 | 
			
		||||
Component({
 | 
			
		||||
  /**
 | 
			
		||||
   * 组件的属性列表
 | 
			
		||||
   */
 | 
			
		||||
  properties: {
 | 
			
		||||
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * 组件的初始数据
 | 
			
		||||
   */
 | 
			
		||||
  data: {
 | 
			
		||||
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * 组件的方法列表
 | 
			
		||||
   */
 | 
			
		||||
  methods: {
 | 
			
		||||
 | 
			
		||||
  }
 | 
			
		||||
})
 | 
			
		||||
							
								
								
									
										4
									
								
								components/member/membershop/membershop.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										4
									
								
								components/member/membershop/membershop.json
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,4 @@
 | 
			
		||||
{
 | 
			
		||||
  "component": true,
 | 
			
		||||
  "usingComponents": {}
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										29
									
								
								components/member/membershop/membershop.scss
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										29
									
								
								components/member/membershop/membershop.scss
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,29 @@
 | 
			
		||||
.membershop {
 | 
			
		||||
    width: 373rpx;
 | 
			
		||||
    height: 557rpx;
 | 
			
		||||
    background-color: #FBFBFB;
 | 
			
		||||
    .pic {
 | 
			
		||||
        width: 113rpx;
 | 
			
		||||
        height: 256rpx;
 | 
			
		||||
        background-color: white;
 | 
			
		||||
        margin: 0 auto;
 | 
			
		||||
        position: relative;
 | 
			
		||||
        top: 64rpx;
 | 
			
		||||
    }
 | 
			
		||||
    .shopname {
 | 
			
		||||
        width: 273rpx;
 | 
			
		||||
        color: #333333;
 | 
			
		||||
        font-size: 30rpx;
 | 
			
		||||
        text-align: center;
 | 
			
		||||
        position: relative;
 | 
			
		||||
        top: 111rpx;
 | 
			
		||||
        margin: 0 auto;
 | 
			
		||||
    }
 | 
			
		||||
    .pri {
 | 
			
		||||
        position: relative;
 | 
			
		||||
        top: 127rpx;
 | 
			
		||||
        text-align: center;
 | 
			
		||||
        font-size: 30rpx;
 | 
			
		||||
        color: #09BB07;
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										6
									
								
								components/member/membershop/membershop.wxml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								components/member/membershop/membershop.wxml
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,6 @@
 | 
			
		||||
<view class="membershop">
 | 
			
		||||
    <view class="pic"></view>
 | 
			
		||||
    <view class="shopname">产品名产品名产品名
 | 
			
		||||
产品名产品名</view>
 | 
			
		||||
<view class="pri">$123</view>
 | 
			
		||||
</view>
 | 
			
		||||
							
								
								
									
										32
									
								
								components/member/membershop/membershop.wxss
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										32
									
								
								components/member/membershop/membershop.wxss
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,32 @@
 | 
			
		||||
.membershop {
 | 
			
		||||
  width: 373rpx;
 | 
			
		||||
  height: 557rpx;
 | 
			
		||||
  background-color: #FBFBFB;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.membershop .pic {
 | 
			
		||||
  width: 113rpx;
 | 
			
		||||
  height: 256rpx;
 | 
			
		||||
  background-color: white;
 | 
			
		||||
  margin: 0 auto;
 | 
			
		||||
  position: relative;
 | 
			
		||||
  top: 64rpx;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.membershop .shopname {
 | 
			
		||||
  width: 273rpx;
 | 
			
		||||
  color: #333333;
 | 
			
		||||
  font-size: 30rpx;
 | 
			
		||||
  text-align: center;
 | 
			
		||||
  position: relative;
 | 
			
		||||
  top: 111rpx;
 | 
			
		||||
  margin: 0 auto;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.membershop .pri {
 | 
			
		||||
  position: relative;
 | 
			
		||||
  top: 127rpx;
 | 
			
		||||
  text-align: center;
 | 
			
		||||
  font-size: 30rpx;
 | 
			
		||||
  color: #09BB07;
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										23
									
								
								components/member/membertop/membertop.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										23
									
								
								components/member/membertop/membertop.js
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,23 @@
 | 
			
		||||
// components/member/membertop/membertop.js
 | 
			
		||||
Component({
 | 
			
		||||
  /**
 | 
			
		||||
   * 组件的属性列表
 | 
			
		||||
   */
 | 
			
		||||
  properties: {
 | 
			
		||||
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * 组件的初始数据
 | 
			
		||||
   */
 | 
			
		||||
  data: {
 | 
			
		||||
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * 组件的方法列表
 | 
			
		||||
   */
 | 
			
		||||
  methods: {
 | 
			
		||||
 | 
			
		||||
  }
 | 
			
		||||
})
 | 
			
		||||
							
								
								
									
										4
									
								
								components/member/membertop/membertop.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										4
									
								
								components/member/membertop/membertop.json
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,4 @@
 | 
			
		||||
{
 | 
			
		||||
  "component": true,
 | 
			
		||||
  "usingComponents": {}
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										9
									
								
								components/member/membertop/membertop.scss
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								components/member/membertop/membertop.scss
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,9 @@
 | 
			
		||||
.membertop {
 | 
			
		||||
    width: 100%;
 | 
			
		||||
    height: 86rpx;
 | 
			
		||||
    border-top: 2rpx solid #E8E8E8;
 | 
			
		||||
    color: #999999;
 | 
			
		||||
    font-size: 24rpx;
 | 
			
		||||
    line-height: 86rpx;
 | 
			
		||||
    text-indent: 30rpx;
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										3
									
								
								components/member/membertop/membertop.wxml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								components/member/membertop/membertop.wxml
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,3 @@
 | 
			
		||||
<view class="membertop">
 | 
			
		||||
        购买下方商品成为会员
 | 
			
		||||
</view>
 | 
			
		||||
							
								
								
									
										9
									
								
								components/member/membertop/membertop.wxss
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								components/member/membertop/membertop.wxss
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,9 @@
 | 
			
		||||
.membertop {
 | 
			
		||||
  width: 100%;
 | 
			
		||||
  height: 86rpx;
 | 
			
		||||
  border-top: 2rpx solid #E8E8E8;
 | 
			
		||||
  color: #999999;
 | 
			
		||||
  font-size: 24rpx;
 | 
			
		||||
  line-height: 86rpx;
 | 
			
		||||
  text-indent: 30rpx;
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										66
									
								
								pages/member/member.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										66
									
								
								pages/member/member.js
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,66 @@
 | 
			
		||||
// pages/member/member.js
 | 
			
		||||
Page({
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * 页面的初始数据
 | 
			
		||||
   */
 | 
			
		||||
  data: {
 | 
			
		||||
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * 生命周期函数--监听页面加载
 | 
			
		||||
   */
 | 
			
		||||
  onLoad: function (options) {
 | 
			
		||||
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * 生命周期函数--监听页面初次渲染完成
 | 
			
		||||
   */
 | 
			
		||||
  onReady: function () {
 | 
			
		||||
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * 生命周期函数--监听页面显示
 | 
			
		||||
   */
 | 
			
		||||
  onShow: function () {
 | 
			
		||||
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * 生命周期函数--监听页面隐藏
 | 
			
		||||
   */
 | 
			
		||||
  onHide: function () {
 | 
			
		||||
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * 生命周期函数--监听页面卸载
 | 
			
		||||
   */
 | 
			
		||||
  onUnload: function () {
 | 
			
		||||
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * 页面相关事件处理函数--监听用户下拉动作
 | 
			
		||||
   */
 | 
			
		||||
  onPullDownRefresh: function () {
 | 
			
		||||
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * 页面上拉触底事件的处理函数
 | 
			
		||||
   */
 | 
			
		||||
  onReachBottom: function () {
 | 
			
		||||
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * 用户点击右上角分享
 | 
			
		||||
   */
 | 
			
		||||
  onShareAppMessage: function () {
 | 
			
		||||
 | 
			
		||||
  }
 | 
			
		||||
})
 | 
			
		||||
							
								
								
									
										6
									
								
								pages/member/member.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								pages/member/member.json
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,6 @@
 | 
			
		||||
{
 | 
			
		||||
    "usingComponents": {
 | 
			
		||||
        "membertop": "/components/member/membertop/membertop",
 | 
			
		||||
        "membershop": "/components/member/membershop/membershop"
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										11
									
								
								pages/member/member.scss
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								pages/member/member.scss
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,11 @@
 | 
			
		||||
.membershops {
 | 
			
		||||
    display: flex;
 | 
			
		||||
    flex-wrap: wrap;
 | 
			
		||||
    .membershop {
 | 
			
		||||
        // margin-right: 4rpx;
 | 
			
		||||
        margin-bottom: 4rpx;
 | 
			
		||||
    }
 | 
			
		||||
    .membershop:nth-child(odd) {
 | 
			
		||||
        margin-right: 4rpx;
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										32
									
								
								pages/member/member.wxml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										32
									
								
								pages/member/member.wxml
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,32 @@
 | 
			
		||||
<view class="top">
 | 
			
		||||
    <membertop></membertop>
 | 
			
		||||
    <view class="membershops">
 | 
			
		||||
         <view class="membershop">
 | 
			
		||||
            <membershop></membershop>
 | 
			
		||||
    </view>
 | 
			
		||||
      <view class="membershop">
 | 
			
		||||
            <membershop></membershop>
 | 
			
		||||
    </view>
 | 
			
		||||
      <view class="membershop">
 | 
			
		||||
            <membershop></membershop>
 | 
			
		||||
    </view>
 | 
			
		||||
      <view class="membershop">
 | 
			
		||||
            <membershop></membershop>
 | 
			
		||||
    </view>
 | 
			
		||||
 | 
			
		||||
      <view class="membershop">
 | 
			
		||||
            <membershop></membershop>
 | 
			
		||||
    </view>
 | 
			
		||||
      <view class="membershop">
 | 
			
		||||
            <membershop></membershop>
 | 
			
		||||
    </view>
 | 
			
		||||
      <view class="membershop">
 | 
			
		||||
            <membershop></membershop>
 | 
			
		||||
    </view>
 | 
			
		||||
      <view class="membershop">
 | 
			
		||||
            <membershop></membershop>
 | 
			
		||||
    </view>
 | 
			
		||||
    </view>
 | 
			
		||||
   
 | 
			
		||||
 | 
			
		||||
</view>
 | 
			
		||||
							
								
								
									
										12
									
								
								pages/member/member.wxss
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								pages/member/member.wxss
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,12 @@
 | 
			
		||||
.membershops {
 | 
			
		||||
  display: flex;
 | 
			
		||||
  flex-wrap: wrap;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.membershops .membershop {
 | 
			
		||||
  margin-bottom: 4rpx;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.membershops .membershop:nth-child(odd) {
 | 
			
		||||
  margin-right: 4rpx;
 | 
			
		||||
}
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user