Merge branch 'zhengjei' of pplokijuhyg/deguodaigou into master
This commit is contained in:
		
						commit
						23f7415853
					
				
							
								
								
									
										37
									
								
								app.json
									
									
									
									
									
								
							
							
						
						
									
										37
									
								
								app.json
									
									
									
									
									
								
							@ -1,20 +1,21 @@
 | 
			
		||||
{
 | 
			
		||||
  "pages": [
 | 
			
		||||
    "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/chooseaddr/chooseaddr",
 | 
			
		||||
        "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/chooseaddr/address/address.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										23
									
								
								components/chooseaddr/address/address.js
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,23 @@
 | 
			
		||||
// components/chooseaddr/address/address.js
 | 
			
		||||
Component({
 | 
			
		||||
  /**
 | 
			
		||||
   * 组件的属性列表
 | 
			
		||||
   */
 | 
			
		||||
  properties: {
 | 
			
		||||
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * 组件的初始数据
 | 
			
		||||
   */
 | 
			
		||||
  data: {
 | 
			
		||||
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * 组件的方法列表
 | 
			
		||||
   */
 | 
			
		||||
  methods: {
 | 
			
		||||
 | 
			
		||||
  }
 | 
			
		||||
})
 | 
			
		||||
							
								
								
									
										4
									
								
								components/chooseaddr/address/address.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										4
									
								
								components/chooseaddr/address/address.json
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,4 @@
 | 
			
		||||
{
 | 
			
		||||
  "component": true,
 | 
			
		||||
  "usingComponents": {}
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										65
									
								
								components/chooseaddr/address/address.scss
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										65
									
								
								components/chooseaddr/address/address.scss
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,65 @@
 | 
			
		||||
.address {
 | 
			
		||||
    width: 690rpx;
 | 
			
		||||
    height: 192rpx;
 | 
			
		||||
    border-bottom: 2rpx solid #EAEAEA;
 | 
			
		||||
    display: flex;
 | 
			
		||||
    justify-content: space-between;
 | 
			
		||||
    padding-bottom: 27rpx;
 | 
			
		||||
    ;
 | 
			
		||||
    .left {
 | 
			
		||||
        width: 551rpx;
 | 
			
		||||
        height: 119rpx;
 | 
			
		||||
        .userinfo {
 | 
			
		||||
            color: #333333;
 | 
			
		||||
            font-size: 26rpx;
 | 
			
		||||
            text-indent: 30rpx;
 | 
			
		||||
            margin-top: 41rpx;
 | 
			
		||||
            display: flex;
 | 
			
		||||
            justify-content: space-between;
 | 
			
		||||
        }
 | 
			
		||||
        .addr {
 | 
			
		||||
            color: #999999;
 | 
			
		||||
            font-size: 24rpx;
 | 
			
		||||
            text-indent: 30rpx;
 | 
			
		||||
            margin-top: 32rpx;
 | 
			
		||||
            width: 551rpx;
 | 
			
		||||
            margin-left: 20rpx;
 | 
			
		||||
            // display: flex;
 | 
			
		||||
            .select {
 | 
			
		||||
                width: 26rpx;
 | 
			
		||||
                height: 26rpx;
 | 
			
		||||
                margin: auto 0;
 | 
			
		||||
                border-radius: 50%;
 | 
			
		||||
                background-color: #EAEAEA;
 | 
			
		||||
                float: left;
 | 
			
		||||
            }
 | 
			
		||||
            .selected {
 | 
			
		||||
                background-color: #47C877;
 | 
			
		||||
            }
 | 
			
		||||
            .default {
 | 
			
		||||
                // margin-left: 12rpx;
 | 
			
		||||
                font-size: 24rpx;
 | 
			
		||||
                text-indent: 16rpx;
 | 
			
		||||
                line-height: 60rpx;
 | 
			
		||||
                float: left;
 | 
			
		||||
            }
 | 
			
		||||
            .path {
 | 
			
		||||
                // float: left;
 | 
			
		||||
                line-height: 39rpx;
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
    .line {
 | 
			
		||||
        width: 2rpx;
 | 
			
		||||
        height: 75rpx;
 | 
			
		||||
        background: rgba(211, 211, 211, 1);
 | 
			
		||||
        margin: auto 0;
 | 
			
		||||
    }
 | 
			
		||||
    .right {
 | 
			
		||||
        color: #666666;
 | 
			
		||||
        font-size: 24rpx;
 | 
			
		||||
        line-height: 192rpx;
 | 
			
		||||
        margin-left: 30rpx;
 | 
			
		||||
        margin-right: 21rpx;
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										16
									
								
								components/chooseaddr/address/address.wxml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										16
									
								
								components/chooseaddr/address/address.wxml
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,16 @@
 | 
			
		||||
<view class="address">
 | 
			
		||||
    <view class="left">
 | 
			
		||||
        <view class="userinfo">
 | 
			
		||||
            <text class="username">于于宇  15698857895</text>
 | 
			
		||||
            <text>邮政编码:677467</text>
 | 
			
		||||
        </view>
 | 
			
		||||
        <view class="addr">
 | 
			
		||||
            <view class="select selected"></view>
 | 
			
		||||
            <!-- <view class="default"></view> -->
 | 
			
		||||
            <view class="path">默认
 | 
			
		||||
            中国大陆 山东省 青岛市 即墨区 纯阳路 某某某小区</view>
 | 
			
		||||
        </view>
 | 
			
		||||
    </view>
 | 
			
		||||
    <view class="line"></view>
 | 
			
		||||
    <view class="right">删除</view>
 | 
			
		||||
</view>
 | 
			
		||||
							
								
								
									
										70
									
								
								components/chooseaddr/address/address.wxss
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										70
									
								
								components/chooseaddr/address/address.wxss
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,70 @@
 | 
			
		||||
.address {
 | 
			
		||||
  width: 690rpx;
 | 
			
		||||
  height: 192rpx;
 | 
			
		||||
  border-bottom: 2rpx solid #EAEAEA;
 | 
			
		||||
  display: flex;
 | 
			
		||||
  justify-content: space-between;
 | 
			
		||||
  padding-bottom: 27rpx;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.address .left {
 | 
			
		||||
  width: 551rpx;
 | 
			
		||||
  height: 119rpx;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.address .left .userinfo {
 | 
			
		||||
  color: #333333;
 | 
			
		||||
  font-size: 26rpx;
 | 
			
		||||
  text-indent: 30rpx;
 | 
			
		||||
  margin-top: 41rpx;
 | 
			
		||||
  display: flex;
 | 
			
		||||
  justify-content: space-between;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.address .left .addr {
 | 
			
		||||
  color: #999999;
 | 
			
		||||
  font-size: 24rpx;
 | 
			
		||||
  text-indent: 30rpx;
 | 
			
		||||
  margin-top: 32rpx;
 | 
			
		||||
  width: 551rpx;
 | 
			
		||||
  margin-left: 20rpx;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.address .left .addr .select {
 | 
			
		||||
  width: 26rpx;
 | 
			
		||||
  height: 26rpx;
 | 
			
		||||
  margin: auto 0;
 | 
			
		||||
  border-radius: 50%;
 | 
			
		||||
  background-color: #EAEAEA;
 | 
			
		||||
  float: left;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.address .left .addr .selected {
 | 
			
		||||
  background-color: #47C877;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.address .left .addr .default {
 | 
			
		||||
  font-size: 24rpx;
 | 
			
		||||
  text-indent: 16rpx;
 | 
			
		||||
  line-height: 60rpx;
 | 
			
		||||
  float: left;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.address .left .addr .path {
 | 
			
		||||
  line-height: 39rpx;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.address .line {
 | 
			
		||||
  width: 2rpx;
 | 
			
		||||
  height: 75rpx;
 | 
			
		||||
  background: lightgray;
 | 
			
		||||
  margin: auto 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.address .right {
 | 
			
		||||
  color: #666666;
 | 
			
		||||
  font-size: 24rpx;
 | 
			
		||||
  line-height: 192rpx;
 | 
			
		||||
  margin-left: 30rpx;
 | 
			
		||||
  margin-right: 21rpx;
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										66
									
								
								pages/chooseaddr/chooseaddr.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										66
									
								
								pages/chooseaddr/chooseaddr.js
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,66 @@
 | 
			
		||||
// pages/chooseaddr/chooseaddr.js
 | 
			
		||||
Page({
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * 页面的初始数据
 | 
			
		||||
   */
 | 
			
		||||
  data: {
 | 
			
		||||
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * 生命周期函数--监听页面加载
 | 
			
		||||
   */
 | 
			
		||||
  onLoad: function (options) {
 | 
			
		||||
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * 生命周期函数--监听页面初次渲染完成
 | 
			
		||||
   */
 | 
			
		||||
  onReady: function () {
 | 
			
		||||
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * 生命周期函数--监听页面显示
 | 
			
		||||
   */
 | 
			
		||||
  onShow: function () {
 | 
			
		||||
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * 生命周期函数--监听页面隐藏
 | 
			
		||||
   */
 | 
			
		||||
  onHide: function () {
 | 
			
		||||
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * 生命周期函数--监听页面卸载
 | 
			
		||||
   */
 | 
			
		||||
  onUnload: function () {
 | 
			
		||||
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * 页面相关事件处理函数--监听用户下拉动作
 | 
			
		||||
   */
 | 
			
		||||
  onPullDownRefresh: function () {
 | 
			
		||||
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * 页面上拉触底事件的处理函数
 | 
			
		||||
   */
 | 
			
		||||
  onReachBottom: function () {
 | 
			
		||||
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * 用户点击右上角分享
 | 
			
		||||
   */
 | 
			
		||||
  onShareAppMessage: function () {
 | 
			
		||||
 | 
			
		||||
  }
 | 
			
		||||
})
 | 
			
		||||
							
								
								
									
										5
									
								
								pages/chooseaddr/chooseaddr.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										5
									
								
								pages/chooseaddr/chooseaddr.json
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,5 @@
 | 
			
		||||
{
 | 
			
		||||
    "usingComponents": {
 | 
			
		||||
        "address": "/components/chooseaddr/address/address"
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										5
									
								
								pages/chooseaddr/chooseaddr.scss
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										5
									
								
								pages/chooseaddr/chooseaddr.scss
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,5 @@
 | 
			
		||||
.chooseaddress {
 | 
			
		||||
    .addr {
 | 
			
		||||
        margin-left: 30rpx;
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										11
									
								
								pages/chooseaddr/chooseaddr.wxml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								pages/chooseaddr/chooseaddr.wxml
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,11 @@
 | 
			
		||||
<view class="chooseaddress">
 | 
			
		||||
    <view class="addr">
 | 
			
		||||
        <address></address>
 | 
			
		||||
    </view>
 | 
			
		||||
    <view class="addr">
 | 
			
		||||
        <address></address>
 | 
			
		||||
    </view>
 | 
			
		||||
    <view class="addr">
 | 
			
		||||
        <address></address>
 | 
			
		||||
    </view>
 | 
			
		||||
</view>
 | 
			
		||||
							
								
								
									
										3
									
								
								pages/chooseaddr/chooseaddr.wxss
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								pages/chooseaddr/chooseaddr.wxss
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,3 @@
 | 
			
		||||
.chooseaddress .addr {
 | 
			
		||||
  margin-left: 30rpx;
 | 
			
		||||
}
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user