Merge remote-tracking branch 'origin/master'
# Conflicts: # app.json # pages/personCenter/accountSetting/accountSetting.js # pages/personCenter/mine/mine.wxml
This commit is contained in:
@ -85,7 +85,7 @@ Page({
|
||||
// “结算明细”跳转
|
||||
goToSettlementDetail() {
|
||||
wx.navigateTo({
|
||||
url: '/pages/settlementDetail/settlementDetail' // 替换为你的页面路径
|
||||
url: '/pages/projectModule/subSettlement/subSettlement' // 替换为你的页面路径
|
||||
});
|
||||
},
|
||||
|
||||
|
||||
66
pages/projectModule/settlement/settlement.js
Normal file
66
pages/projectModule/settlement/settlement.js
Normal file
@ -0,0 +1,66 @@
|
||||
// pages/projectModule/settlement/settlement.js
|
||||
Page({
|
||||
|
||||
/**
|
||||
* 页面的初始数据
|
||||
*/
|
||||
data: {
|
||||
items: [null, null],
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面加载
|
||||
*/
|
||||
onLoad(options) {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面初次渲染完成
|
||||
*/
|
||||
onReady() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面显示
|
||||
*/
|
||||
onShow() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面隐藏
|
||||
*/
|
||||
onHide() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面卸载
|
||||
*/
|
||||
onUnload() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 页面相关事件处理函数--监听用户下拉动作
|
||||
*/
|
||||
onPullDownRefresh() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 页面上拉触底事件的处理函数
|
||||
*/
|
||||
onReachBottom() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 用户点击右上角分享
|
||||
*/
|
||||
onShareAppMessage() {
|
||||
|
||||
}
|
||||
})
|
||||
3
pages/projectModule/settlement/settlement.json
Normal file
3
pages/projectModule/settlement/settlement.json
Normal file
@ -0,0 +1,3 @@
|
||||
{
|
||||
"usingComponents": {}
|
||||
}
|
||||
41
pages/projectModule/settlement/settlement.wxml
Normal file
41
pages/projectModule/settlement/settlement.wxml
Normal file
@ -0,0 +1,41 @@
|
||||
<view class="flex-col page">
|
||||
<view class="flex-col justify-start items-start text-wrapper"><text class="text">项目：饿了么-超吃卡</text></view>
|
||||
<view class="flex-col mt-11">
|
||||
<view class="flex-col list-item mt-20" wx:for="{{items}}" wx:for-item="item" wx:for-index="index" wx:key="index">
|
||||
<view class="flex-row items-center group">
|
||||
<view class="flex-row items-center flex-1">
|
||||
<image
|
||||
class="shrink-0 image"
|
||||
src="https://ide.code.fun/api/image?token=68368d354ae84d001230f4d1&name=1ca23eeec01596125d5539fcda13702d.png"
|
||||
/>
|
||||
<text class="font text_2 ml-14">美团神券包-春季活动</text>
|
||||
</view>
|
||||
<text class="font text_3 ml-21">业务员：陈新知</text>
|
||||
</view>
|
||||
<view class="flex-col section">
|
||||
<view class="flex-row justify-between">
|
||||
<text class="font_2">结算标准</text>
|
||||
<text class="font_2 text_4">结算数量</text>
|
||||
<text class="font_2 text_5">结算收益</text>
|
||||
</view>
|
||||
<view class="flex-col justify-start group_2 mt-10">
|
||||
<view class="flex-row justify-center items-center relative section_2">
|
||||
<text class="font_3 text_6 pos">3.6元购买券</text>
|
||||
<text class="font_4">10</text>
|
||||
<text class="font_5 pos_2">￥3.00</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row group_1">
|
||||
<view class="group_3">
|
||||
<text class="font_6 text_7">作业时间：</text>
|
||||
<text class="font_5">2025-05-20</text>
|
||||
</view>
|
||||
<view class="group_4 ml-47">
|
||||
<text class="font_6">结算时间：</text>
|
||||
<text class="font_5">2025-05-22</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
139
pages/projectModule/settlement/settlement.wxss
Normal file
139
pages/projectModule/settlement/settlement.wxss
Normal file
@ -0,0 +1,139 @@
|
||||
.mt-11 {
|
||||
margin-top: 20.63rpx;
|
||||
}
|
||||
.ml-21 {
|
||||
margin-left: 39.38rpx;
|
||||
}
|
||||
.ml-47 {
|
||||
margin-left: 88.13rpx;
|
||||
}
|
||||
.page {
|
||||
padding: 50.63rpx 24.38rpx 608.44rpx;
|
||||
background-image: linear-gradient(180deg, #ff8d1a -7.3%, #f5f5f5 39.3%);
|
||||
width: 100%;
|
||||
overflow-y: auto;
|
||||
overflow-x: hidden;
|
||||
height: 100%;
|
||||
}
|
||||
.text-wrapper {
|
||||
padding: 59.94rpx 0 54.69rpx;
|
||||
background-color: #ffffff;
|
||||
border-radius: 18.75rpx;
|
||||
}
|
||||
.text {
|
||||
margin-left: 32.63rpx;
|
||||
color: #000000;
|
||||
font-size: 30rpx;
|
||||
font-family: SourceHanSansCN;
|
||||
line-height: 27.86rpx;
|
||||
}
|
||||
.list-item {
|
||||
padding-left: 31.88rpx;
|
||||
padding-right: 24.68rpx;
|
||||
background-color: #ffffff;
|
||||
border-radius: 18.75rpx;
|
||||
}
|
||||
.list-item:first-child {
|
||||
margin-top: 0;
|
||||
}
|
||||
.group {
|
||||
padding: 30rpx 0 26.25rpx;
|
||||
}
|
||||
.image {
|
||||
width: 108.75rpx;
|
||||
height: 108.75rpx;
|
||||
}
|
||||
.font {
|
||||
font-size: 26.25rpx;
|
||||
font-family: SourceHanSansCN;
|
||||
line-height: 24.3rpx;
|
||||
color: #000000;
|
||||
}
|
||||
.text_2 {
|
||||
line-height: 24.52rpx;
|
||||
}
|
||||
.text_3 {
|
||||
line-height: 24.47rpx;
|
||||
}
|
||||
.section {
|
||||
margin-right: 5.32rpx;
|
||||
padding: 36.39rpx 19.5rpx 16.88rpx 35.63rpx;
|
||||
background-color: #f5f5f5;
|
||||
border-radius: 10.28rpx;
|
||||
}
|
||||
.font_2 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: SourceHanSansCN;
|
||||
line-height: 24.3rpx;
|
||||
color: #6b6b6b;
|
||||
}
|
||||
.text_4 {
|
||||
line-height: 24.36rpx;
|
||||
}
|
||||
.text_5 {
|
||||
margin-right: 9.71rpx;
|
||||
}
|
||||
.group_2 {
|
||||
margin-right: 14.27rpx;
|
||||
}
|
||||
.section_2 {
|
||||
padding: 39rpx 0 36.69rpx;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
background-color: #ffffff00;
|
||||
}
|
||||
.font_3 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: SourceHanSansCN;
|
||||
line-height: 31.88rpx;
|
||||
color: #000000;
|
||||
}
|
||||
.text_6 {
|
||||
width: 103.13rpx;
|
||||
}
|
||||
.pos {
|
||||
/* position: absolute;
|
||||
left: 0.99rpx;
|
||||
top: 50%;
|
||||
transform: translateY(-50%); */
|
||||
}
|
||||
.font_4 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: SourceHanSansCN;
|
||||
line-height: 19.93rpx;
|
||||
color: #000000;
|
||||
}
|
||||
.font_5 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: SourceHanSansCN;
|
||||
line-height: 19.93rpx;
|
||||
color: #ff8d1a;
|
||||
}
|
||||
.pos_2 {
|
||||
/* position: absolute;
|
||||
right: -14.23rpx;
|
||||
top: 50%;
|
||||
transform: translateY(-50%); */
|
||||
}
|
||||
.group_1 {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
padding: 33.32rpx 0 34.26rpx;
|
||||
}
|
||||
.group_3 {
|
||||
line-height: 24.04rpx;
|
||||
height: 24.04rpx;
|
||||
}
|
||||
.font_6 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: SourceHanSansCN;
|
||||
line-height: 24.3rpx;
|
||||
color: #808080;
|
||||
}
|
||||
.text_7 {
|
||||
line-height: 24.04rpx;
|
||||
}
|
||||
.group_4 {
|
||||
line-height: 24.3rpx;
|
||||
height: 24.3rpx;
|
||||
}
|
||||
66
pages/projectModule/subSettlement/subSettlement.js
Normal file
66
pages/projectModule/subSettlement/subSettlement.js
Normal file
@ -0,0 +1,66 @@
|
||||
// pages/projectModule/settlement/settlement.js
|
||||
Page({
|
||||
|
||||
/**
|
||||
* 页面的初始数据
|
||||
*/
|
||||
data: {
|
||||
items: [null, null],
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面加载
|
||||
*/
|
||||
onLoad(options) {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面初次渲染完成
|
||||
*/
|
||||
onReady() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面显示
|
||||
*/
|
||||
onShow() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面隐藏
|
||||
*/
|
||||
onHide() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面卸载
|
||||
*/
|
||||
onUnload() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 页面相关事件处理函数--监听用户下拉动作
|
||||
*/
|
||||
onPullDownRefresh() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 页面上拉触底事件的处理函数
|
||||
*/
|
||||
onReachBottom() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 用户点击右上角分享
|
||||
*/
|
||||
onShareAppMessage() {
|
||||
|
||||
}
|
||||
})
|
||||
3
pages/projectModule/subSettlement/subSettlement.json
Normal file
3
pages/projectModule/subSettlement/subSettlement.json
Normal file
@ -0,0 +1,3 @@
|
||||
{
|
||||
"usingComponents": {}
|
||||
}
|
||||
41
pages/projectModule/subSettlement/subSettlement.wxml
Normal file
41
pages/projectModule/subSettlement/subSettlement.wxml
Normal file
@ -0,0 +1,41 @@
|
||||
<view class="flex-col page">
|
||||
<view class="flex-col justify-start items-start text-wrapper"><text class="text">业务员：陈新知</text></view>
|
||||
<view class="flex-col mt-11">
|
||||
<view class="flex-col list-item mt-20" wx:for="{{items}}" wx:for-item="item" wx:for-index="index" wx:key="index">
|
||||
<view class="flex-row items-center group">
|
||||
<view class="flex-row items-center flex-1">
|
||||
<image
|
||||
class="shrink-0 image"
|
||||
src="https://ide.code.fun/api/image?token=68368d354ae84d001230f4d1&name=1ca23eeec01596125d5539fcda13702d.png"
|
||||
/>
|
||||
<text class="font text_2 ml-14">美团神券包-春季活动</text>
|
||||
</view>
|
||||
<text class="font text_3 ml-21">业务员：陈新知</text>
|
||||
</view>
|
||||
<view class="flex-col section">
|
||||
<view class="flex-row justify-between">
|
||||
<text class="font_2">结算标准</text>
|
||||
<text class="font_2 text_4">结算数量</text>
|
||||
<text class="font_2 text_5">结算收益</text>
|
||||
</view>
|
||||
<view class="flex-col justify-start group_2 mt-10">
|
||||
<view class="flex-row justify-center items-center relative section_2">
|
||||
<text class="font_3 text_6 pos">3.6元购买券</text>
|
||||
<text class="font_4">10</text>
|
||||
<text class="font_5 pos_2">￥3.00</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row group_1">
|
||||
<view class="group_3">
|
||||
<text class="font_6 text_7">作业时间：</text>
|
||||
<text class="font_5">2025-05-20</text>
|
||||
</view>
|
||||
<view class="group_4 ml-47">
|
||||
<text class="font_6">结算时间：</text>
|
||||
<text class="font_5">2025-05-22</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
139
pages/projectModule/subSettlement/subSettlement.wxss
Normal file
139
pages/projectModule/subSettlement/subSettlement.wxss
Normal file
@ -0,0 +1,139 @@
|
||||
.mt-11 {
|
||||
margin-top: 20.63rpx;
|
||||
}
|
||||
.ml-21 {
|
||||
margin-left: 39.38rpx;
|
||||
}
|
||||
.ml-47 {
|
||||
margin-left: 88.13rpx;
|
||||
}
|
||||
.page {
|
||||
padding: 50.63rpx 24.38rpx 608.44rpx;
|
||||
background-image: linear-gradient(180deg, #ff8d1a -7.3%, #f5f5f5 39.3%);
|
||||
width: 100%;
|
||||
overflow-y: auto;
|
||||
overflow-x: hidden;
|
||||
height: 100%;
|
||||
}
|
||||
.text-wrapper {
|
||||
padding: 59.94rpx 0 54.69rpx;
|
||||
background-color: #ffffff;
|
||||
border-radius: 18.75rpx;
|
||||
}
|
||||
.text {
|
||||
margin-left: 32.63rpx;
|
||||
color: #000000;
|
||||
font-size: 30rpx;
|
||||
font-family: SourceHanSansCN;
|
||||
line-height: 27.86rpx;
|
||||
}
|
||||
.list-item {
|
||||
padding-left: 31.88rpx;
|
||||
padding-right: 24.68rpx;
|
||||
background-color: #ffffff;
|
||||
border-radius: 18.75rpx;
|
||||
}
|
||||
.list-item:first-child {
|
||||
margin-top: 0;
|
||||
}
|
||||
.group {
|
||||
padding: 30rpx 0 26.25rpx;
|
||||
}
|
||||
.image {
|
||||
width: 108.75rpx;
|
||||
height: 108.75rpx;
|
||||
}
|
||||
.font {
|
||||
font-size: 26.25rpx;
|
||||
font-family: SourceHanSansCN;
|
||||
line-height: 24.3rpx;
|
||||
color: #000000;
|
||||
}
|
||||
.text_2 {
|
||||
line-height: 24.52rpx;
|
||||
}
|
||||
.text_3 {
|
||||
line-height: 24.47rpx;
|
||||
}
|
||||
.section {
|
||||
margin-right: 5.32rpx;
|
||||
padding: 36.39rpx 19.5rpx 16.88rpx 35.63rpx;
|
||||
background-color: #f5f5f5;
|
||||
border-radius: 10.28rpx;
|
||||
}
|
||||
.font_2 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: SourceHanSansCN;
|
||||
line-height: 24.3rpx;
|
||||
color: #6b6b6b;
|
||||
}
|
||||
.text_4 {
|
||||
line-height: 24.36rpx;
|
||||
}
|
||||
.text_5 {
|
||||
margin-right: 9.71rpx;
|
||||
}
|
||||
.group_2 {
|
||||
margin-right: 14.27rpx;
|
||||
}
|
||||
.section_2 {
|
||||
padding: 39rpx 0 36.69rpx;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
background-color: #ffffff00;
|
||||
}
|
||||
.font_3 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: SourceHanSansCN;
|
||||
line-height: 31.88rpx;
|
||||
color: #000000;
|
||||
}
|
||||
.text_6 {
|
||||
width: 103.13rpx;
|
||||
}
|
||||
.pos {
|
||||
/* position: absolute;
|
||||
left: 0.99rpx;
|
||||
top: 50%;
|
||||
transform: translateY(-50%); */
|
||||
}
|
||||
.font_4 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: SourceHanSansCN;
|
||||
line-height: 19.93rpx;
|
||||
color: #000000;
|
||||
}
|
||||
.font_5 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: SourceHanSansCN;
|
||||
line-height: 19.93rpx;
|
||||
color: #ff8d1a;
|
||||
}
|
||||
.pos_2 {
|
||||
/* position: absolute;
|
||||
right: -14.23rpx;
|
||||
top: 50%;
|
||||
transform: translateY(-50%); */
|
||||
}
|
||||
.group_1 {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
padding: 33.32rpx 0 34.26rpx;
|
||||
}
|
||||
.group_3 {
|
||||
line-height: 24.04rpx;
|
||||
height: 24.04rpx;
|
||||
}
|
||||
.font_6 {
|
||||
font-size: 26.25rpx;
|
||||
font-family: SourceHanSansCN;
|
||||
line-height: 24.3rpx;
|
||||
color: #808080;
|
||||
}
|
||||
.text_7 {
|
||||
line-height: 24.04rpx;
|
||||
}
|
||||
.group_4 {
|
||||
line-height: 24.3rpx;
|
||||
height: 24.3rpx;
|
||||
}
|
||||
Reference in New Issue
Block a user