Merge branch 'zhengjei' of pplokijuhyg/deguodaigou into master

This commit is contained in:
asd 2019-12-14 17:01:56 +08:00
commit c861afa9af
41 changed files with 860 additions and 1 deletions

View File

@ -1,5 +1,8 @@
{
"pages": [
"pages/share/share",
"pages/yongjin/yongjin",
"pages/yue/yue",
"pages/member/member",
"pages/addaddress/addaddress",
"pages/chooseaddr/chooseaddr",
@ -12,6 +15,7 @@
"pages/shopping/shopping",
"pages/search/search",
"pages/index/index"
],
"window": {
"backgroundTextStyle": "light",
@ -21,5 +25,4 @@
},
"style": "v2",
"sitemapLocation": "sitemap.json"
}

View File

@ -0,0 +1,23 @@
// components/yue/yongjintop/yongjintop.js
Component({
/**
* 组件的属性列表
*/
properties: {
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
}
})

View File

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

View File

@ -0,0 +1,70 @@
.box {
width: 690rpx;
margin: 0 auto;
padding-bottom: 41rpx;
border-bottom: 2rpx solid #EEEEEE;
.img {
width: 40rpx;
height: 39rpx;
background-color: #999999;
float: right;
}
.yongjintop {
width: 317rpx;
// height: 196rpx;
margin-top: 71rpx;
margin-left: 30rpx;
display: flex;
.photo {
width: 130rpx;
height: 130rpx;
background-color: gold;
margin-bottom: 52rpx;
border-radius: 90%;
}
.tel {
color: #333333;
font-size: 28rpx;
margin-top: 33rpx;
margin-left: 35rpx;
.mingpian {
font-size: 24rpx;
color: #999999;
margin-top: 18rpx;
}
}
}
}
.mid {
width: 100%;
height: 175rpx;
border-bottom: 20rpx solid #FBFBFB;
// justify-content: space-around;
color: #333333;
font-size: 28rpx;
text-align: center;
.midbox {
width: 478rpx;
height: 175rpx;
display: flex;
justify-content: space-between;
margin: 0 auto;
}
.way {
margin-top: 46rpx;
margin-bottom: 14rpx;
}
.money {
font-size: 24rpx;
}
.money1 {
color: #F81F1F;
}
.line {
width: 2rpx;
height: 60rpx;
margin: auto 0;
background-color: #EEEEEE;
}
}

View File

@ -0,0 +1,30 @@
<view class="box">
<view class="img"></view>
<view class="yongjintop">
<view class="photo"></view>
<view class="tel">
<view>156***578</view>
<view class="mingpian">我的名片</view>
</view>
</view>
</view>
<view class="mid">
<view class="midbox">
<view>
<view class="way">昨日收益</view>
<view class="money">
<text class="money1">657.00</text>
<text>RMB</text>
</view>
</view>
<view class="line"></view>
<view>
<view class="way">昨日收益</view>
<view class="money">
<text class="money1">657.00</text>
<text>RMB</text>
</view>
</view>
</view>
</view>

View File

@ -0,0 +1,78 @@
.box {
width: 690rpx;
margin: 0 auto;
padding-bottom: 41rpx;
border-bottom: 2rpx solid #EEEEEE;
}
.box .img {
width: 40rpx;
height: 39rpx;
background-color: #999999;
float: right;
}
.box .yongjintop {
width: 317rpx;
margin-top: 71rpx;
margin-left: 30rpx;
display: flex;
}
.box .yongjintop .photo {
width: 130rpx;
height: 130rpx;
background-color: gold;
margin-bottom: 52rpx;
border-radius: 90%;
}
.box .yongjintop .tel {
color: #333333;
font-size: 28rpx;
margin-top: 33rpx;
margin-left: 35rpx;
}
.box .yongjintop .tel .mingpian {
font-size: 24rpx;
color: #999999;
margin-top: 18rpx;
}
.mid {
width: 100%;
height: 175rpx;
border-bottom: 20rpx solid #FBFBFB;
color: #333333;
font-size: 28rpx;
text-align: center;
}
.mid .midbox {
width: 478rpx;
height: 175rpx;
display: flex;
justify-content: space-between;
margin: 0 auto;
}
.mid .way {
margin-top: 46rpx;
margin-bottom: 14rpx;
}
.mid .money {
font-size: 24rpx;
}
.mid .money1 {
color: #F81F1F;
}
.mid .line {
width: 2rpx;
height: 60rpx;
margin: auto 0;
background-color: #EEEEEE;
}

View File

@ -0,0 +1,23 @@
// components/yue/yongjintop/yongjintop.js
Component({
/**
* 组件的属性列表
*/
properties: {
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
}
})

View File

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

View File

@ -0,0 +1,56 @@
.box {
width: 690rpx;
margin: 0 auto;
padding-bottom: 41rpx;
border-bottom: 2rpx solid #EEEEEE;
.yongjintop {
width: 152rpx;
height: 196rpx;
margin: 0 auto;
margin-top: 40rpx;
.photo {
width: 130rpx;
height: 130rpx;
background-color: gold;
margin-bottom: 44rpx;
border-radius: 90%;
}
.tel {
color: #333333;
font-size: 28rpx;
}
}
}
.mid {
width: 100%;
height: 175rpx;
border-bottom: 20rpx solid #FBFBFB;
// justify-content: space-around;
color: #333333;
font-size: 28rpx;
text-align: center;
.midbox {
width: 478rpx;
height: 175rpx;
display: flex;
justify-content: space-between;
margin: 0 auto;
}
.way {
margin-top: 46rpx;
margin-bottom: 14rpx;
}
.money {
font-size: 24rpx;
}
.money1 {
color: #F81F1F;
}
.line {
width: 2rpx;
height: 60rpx;
margin: auto 0;
background-color: #EEEEEE;
}
}

View File

@ -0,0 +1,26 @@
<view class="box">
<view class="yongjintop">
<view class="photo"></view>
<view class="tel">156***578</view>
</view>
</view>
<view class="mid">
<view class="midbox">
<view>
<view class="way">昨日收益</view>
<view class="money">
<text class="money1">657.00</text>
<text>RMB</text>
</view>
</view>
<view class="line"></view>
<view>
<view class="way">昨日收益</view>
<view class="money">
<text class="money1">657.00</text>
<text>RMB</text>
</view>
</view>
</view>
</view>

View File

@ -0,0 +1,63 @@
.box {
width: 690rpx;
margin: 0 auto;
padding-bottom: 41rpx;
border-bottom: 2rpx solid #EEEEEE;
}
.box .yongjintop {
width: 152rpx;
height: 196rpx;
margin: 0 auto;
margin-top: 40rpx;
}
.box .yongjintop .photo {
width: 130rpx;
height: 130rpx;
background-color: gold;
margin-bottom: 44rpx;
border-radius: 90%;
}
.box .yongjintop .tel {
color: #333333;
font-size: 28rpx;
}
.mid {
width: 100%;
height: 175rpx;
border-bottom: 20rpx solid #FBFBFB;
color: #333333;
font-size: 28rpx;
text-align: center;
}
.mid .midbox {
width: 478rpx;
height: 175rpx;
display: flex;
justify-content: space-between;
margin: 0 auto;
}
.mid .way {
margin-top: 46rpx;
margin-bottom: 14rpx;
}
.mid .money {
font-size: 24rpx;
}
.mid .money1 {
color: #F81F1F;
}
.mid .line {
width: 2rpx;
height: 60rpx;
margin: auto 0;
background-color: #EEEEEE;
}

View File

@ -0,0 +1,23 @@
// components/yue/yuedetail/yuedetai;.js
Component({
/**
* 组件的属性列表
*/
properties: {
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
}
})

View File

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

View File

@ -0,0 +1,23 @@
.yuedetail {
width: 100%;
height: 100rpx;
border-bottom: 2rpx solid #EEEEEE;
display: flex;
justify-content: space-between;
.left {
font-size: 28rpx;
margin-left: 30rpx;
.date {
color: #666666;
}
.time {
color: #999999;
margin-top: 5rpx;
}
}
.right {
color: #333333;
font-size: 36rpx;
margin-right: 30rpx;
}
}

View File

@ -0,0 +1,7 @@
<view class="yuedetail">
<view class="left">
<view class="date">2017-02-21</view>
<view class="time">17:23:25</view>
</view>
<view class="right">-1234.00</view>
</view>

View File

@ -0,0 +1,27 @@
.yuedetail {
width: 100%;
height: 100rpx;
border-bottom: 2rpx solid #EEEEEE;
display: flex;
justify-content: space-between;
}
.yuedetail .left {
font-size: 28rpx;
margin-left: 30rpx;
}
.yuedetail .left .date {
color: #666666;
}
.yuedetail .left .time {
color: #999999;
margin-top: 5rpx;
}
.yuedetail .right {
color: #333333;
font-size: 36rpx;
margin-right: 30rpx;
}

View File

@ -0,0 +1,23 @@
// components/yue/yuetitle/yuetitle.js
Component({
/**
* 组件的属性列表
*/
properties: {
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
}
})

View File

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

View File

@ -0,0 +1,6 @@
.yuetitle {
color: #333333;
font-size: 28rpx;
font-weight: bold;
margin-left: 31rpx;
}

View File

@ -0,0 +1,3 @@
<view class="yuetitle">
累计消费
</view>

View File

@ -0,0 +1,6 @@
.yuetitle {
color: #333333;
font-size: 28rpx;
font-weight: bold;
margin-left: 31rpx;
}

View File

@ -0,0 +1,23 @@
// components/yue/yuetop/yuetop.js
Component({
/**
* 组件的属性列表
*/
properties: {
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
}
})

View File

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

View File

@ -0,0 +1,23 @@
.yuetop {
width: 690rpx;
// height: 189rpx;
margin: 0 auto;
border-bottom: 2rpx solid #EEEEEE;
.all {
color: #333333;
font-size: 28rpx;
padding-top: 63rpx;
padding-bottom: 25rpx;
}
.money {
color: #333333;
font-size: 48rpx;
font-weight: 500;
padding-bottom: 37rpx;
.chong {
color: #09BB07;
font-size: 26rpx;
margin-left: 35rpx;
}
}
}

View File

@ -0,0 +1,7 @@
<view class="yuetop">
<view class="all">总资产</view>
<view class="money">
<text>615.96</text>
<text class="chong">充值</text>
</view>
</view>

View File

@ -0,0 +1,25 @@
.yuetop {
width: 690rpx;
margin: 0 auto;
border-bottom: 2rpx solid #EEEEEE;
}
.yuetop .all {
color: #333333;
font-size: 28rpx;
padding-top: 63rpx;
padding-bottom: 25rpx;
}
.yuetop .money {
color: #333333;
font-size: 48rpx;
font-weight: 500;
padding-bottom: 37rpx;
}
.yuetop .money .chong {
color: #09BB07;
font-size: 26rpx;
margin-left: 35rpx;
}

66
pages/share/share.js Normal file
View File

@ -0,0 +1,66 @@
// pages/share/share.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})

6
pages/share/share.json Normal file
View File

@ -0,0 +1,6 @@
{
"usingComponents": {
"share": "/components/yue/share/share",
"yuedetail": "/components/yue/yuedetail/yuedetail"
}
}

7
pages/share/share.scss Normal file
View File

@ -0,0 +1,7 @@
.share {
background-color: white;
}
.detail {
margin-top: 41rpx;
}

15
pages/share/share.wxml Normal file
View File

@ -0,0 +1,15 @@
<view class="share">
<share></share>
<view class="detail">
<yuedetail></yuedetail>
</view>
<view class="detail">
<yuedetail></yuedetail>
</view>
<view class="detail">
<yuedetail></yuedetail>
</view>
<view class="detail">
<yuedetail></yuedetail>
</view>
</view>

7
pages/share/share.wxss Normal file
View File

@ -0,0 +1,7 @@
.share {
background-color: white;
}
.detail {
margin-top: 41rpx;
}

66
pages/yongjin/yongjin.js Normal file
View File

@ -0,0 +1,66 @@
// pages/yongjin/yongjin.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})

View File

@ -0,0 +1,7 @@
{
"usingComponents": {
"yongjintop": "/components/yue/yongjintop/yongjintop",
"yuedetail": "/components/yue/yuedetail/yuedetail",
"yuetitle": "/components/yue/yuetitle/yuetitle"
}
}

View File

@ -0,0 +1,7 @@
.detail {
margin-top: 41rpx;
}
.title {
margin-top: 40rpx
}

View File

@ -0,0 +1,18 @@
<view class="yongjin">
<yongjintop></yongjintop>
<view class="title">
<yuetitle></yuetitle>
</view>
<view class="detail">
<yuedetail></yuedetail>
</view>
<view class="detail">
<yuedetail></yuedetail>
</view>
<view class="detail">
<yuedetail></yuedetail>
</view>
<view class="detail">
<yuedetail></yuedetail>
</view>
</view>

View File

@ -0,0 +1,7 @@
.detail {
margin-top: 41rpx;
}
.title {
margin-top: 40rpx;
}

23
pages/yue/yue.js Normal file
View File

@ -0,0 +1,23 @@
// pages/yue/yue.js
Component({
/**
* 组件的属性列表
*/
properties: {
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
}
})

8
pages/yue/yue.json Normal file
View File

@ -0,0 +1,8 @@
{
"component": true,
"usingComponents": {
"yuetop": "/components/yue/yuetop/yuetop",
"yuetitle": "/components/yue/yuetitle/yuetitle",
"yuedetail": "/components/yue/yuedetail/yuedetail"
}
}

8
pages/yue/yue.scss Normal file
View File

@ -0,0 +1,8 @@
.yue {
.title {
margin-top: 40rpx
}
.detail {
margin-top: 41rpx;
}
}

19
pages/yue/yue.wxml Normal file
View File

@ -0,0 +1,19 @@
<view class="yue">
<yuetop></yuetop>
<view class="title">
<yuetitle></yuetitle>
</view>
<view class="detail">
<yuedetail></yuedetail>
</view>
<view class="detail">
<yuedetail></yuedetail>
</view>
<view class="detail">
<yuedetail></yuedetail>
</view>
<view class="detail">
<yuedetail></yuedetail>
</view>
</view>

7
pages/yue/yue.wxss Normal file
View File

@ -0,0 +1,7 @@
.yue .title {
margin-top: 40rpx;
}
.yue .detail {
margin-top: 41rpx;
}