Skip to content

7
7-Eleven
Commit 4e5026e9 by 赵雅纹
Options

Merge branch 'feature-zyw-sc' into 'dev_7.1.0' 

Feature zyw sc

See merge request !49
parents 8bc728e2 5703ac4e
Showing with 337 additions and 2 deletions
src/app.json
......@@ -24,7 +24,9 @@
"pages/myShare/myShare",
"pages/user-center/user-center",
"pages/productDetail/productDetail",
"pages/confirmOrder/confirmOrder"
"pages/confirmOrder/confirmOrder",
"pages/myAddress/myAddress",
"pages/addAddress/addAddress"
],
"subPackages": [
{
......
src/app.wxss
/**app.wxss**/
page {
width: 100%;
box-sizing: border-box;
......@@ -22,3 +23,6 @@ page {
}
src/pages/addAddress/addAddress.js 0 → 100644
// pages/addAddress/addAddress.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
src/pages/addAddress/addAddress.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
src/pages/addAddress/addAddress.wxml 0 → 100644
<!--pages/addAddress/addAddress.wxml-->
<view class="page-add-address">
<view class="form-section">
<form>
<view class="form">
<view class="form-label">姓名</view>
<input class="form-input" name="input" placeholder="请输入收货人真实姓名" />
</view>
<view class="form">
<view class="form-label">电话</view>
<input class="form-input" name="input" placeholder="请输入收货人手机号" />
</view>
<view class="form">
<view class="form-label">地区</view>
<input class="form-input" name="input" placeholder="" />
</view>
<view class="form">
<view class="form-label">详细地址</view>
<input class="form-input" name="input" placeholder="请输入街道、楼牌号" />
</view>
<view class="address-bottom">
<button class="address-btn theme-color">保存并使用</button>
</view>
</form>
</view>
</view>
src/pages/addAddress/addAddress.wxss 0 → 100644
/* pages/addAddress/addAddress.wxss */
@import './../../base/base.wxss';
.form-section{
padding: 0 24rpx 0 16rpx;
}
.form{
display: flex;
border-bottom: 1px solid rgba(151,151,151,0.3);
padding-left: 13rpx;
}
.form-label{
color: #808080;
font-size: 26rpx;
line-height: 82rpx;
min-width: 104rpx;
}
.form-input{
font-size: 28rpx;
color: #333333;
height: 82rpx;
line-height: 82rpx;
margin-left: 52rpx;
}
.address-bottom{
position: fixed;
bottom: 0;
left: 0;
width: 750rpx;
}
.address-btn{
width: 100%;
color: #ffffff;
font-size: 25rpx;
height: 88rpx;
line-height: 88rpx;
}
\ No newline at end of file
src/pages/myAddress/myAddress.js 0 → 100644
// pages/myAddress/myAddress.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
},
//获取微信地址
chooseWxAddress() {
wx.chooseAddress({
success: (res) => {
console.log(res)
this.setData({
addressInfo: res
})
},
fail: function (err) {
console.log(err)
}
})
},
})
\ No newline at end of file
src/pages/myAddress/myAddress.json 0 → 100644
{
"navigationBarTitleText": "我的地址",
"usingComponents": {}
}
\ No newline at end of file
src/pages/myAddress/myAddress.wxml 0 → 100644
<!--pages/myAddress/myAddress.wxml-->
<view class="page-my-address">
<view class="wx-address" bindtap="chooseWxAddress">
<image class="wx-icon" src="/assets/imgs/7_1_0/wx-icon.png" mode="widthFix"></image>
<text class="wx-text">使用微信地址</text>
<image class="arrow-right" src="/assets/imgs/7_1_0/arrow-right.png" mode="widthFix"></image>
</view>
<view class="address-wrap">
<view class="address-ul">
<view class="address-list">
<view class="name">
姓名 1839787887
</view>
<view class="address-detail">详细地址</view>
<view class="default-address">设为默认地址</view>
<navigator url="/pages/addAddress/addAddress">
<image class="edit-img" mode="widthFix" src="/assets/imgs/7_1_0/edit.png"></image>
</navigator>
</view>
</view>
</view>
<view class="address-bottom">
<navigator url="/pages/addAddress/addAddress">
<button class="address-btn theme-color">新增收货地址</button>
</navigator>
</view>
</view>
\ No newline at end of file
src/pages/myAddress/myAddress.wxss 0 → 100644
/* pages/myAddress/myAddress.wxss */
@import './../../base/base.wxss';
page{
padding-bottom: 88rpx;
}
.wx-address{
padding: 0 30rpx;
height: 88rpx;
line-height: 88rpx;
background-color: rgba(245, 248, 250, 0.5);
position: relative;
}
.wx-icon{
width: 47rpx;
vertical-align: middle;
}
.arrow-right{
width: 13rpx;
position: absolute;
top: 30rpx;
right: 30rpx;
}
.wx-text{
color: #333333;
font-size: 25rpx;
margin-left: 15rpx;
}
.address-ul{
padding: 0 20rpx;
}
.address-list{
padding: 0 10rpx 37rpx;
border-bottom: 1px solid rgba(151,151,151,0.3);
margin-top: 37rpx;
position: relative;
}
.name{
color: #333333;
}
.address-detail{
width: 600rpx;
font-size: 25rpx;
color: #787878;
margin-top: 8rpx;
}
.default-address{
font-size: 22rpx;
color: #808080;
margin-top: 25rpx;
}
.edit-img{
width: 24rpx;
position: absolute;
top: 0;
right: 10rpx;
}
.address-bottom{
position: fixed;
bottom: 0;
left: 0;
width: 750rpx;
}
.address-btn{
width: 100%;
color: #ffffff;
font-size: 25rpx;
height: 88rpx;
line-height: 88rpx;
}
\ No newline at end of file
src/project.config.json
......@@ -39,7 +39,7 @@
"list": []
},
"miniprogram": {
"current": 19,
"current": 20,
"list": [
{
"id": -1,
......@@ -164,6 +164,13 @@
"id": -1,
"name": "分类",
"pathName": "pages/category/category",
"query": "",
"scene": null
},
{
"id": -1,
"name": "我的地址",
"pathName": "pages/myAddress/myAddress",
"scene": null
}
]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment