root
/
school_uni
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: root:ed1b2d816476bd393255d535c31c2a8ddb536b04
Branches Tags
root:master
...
compare: root:2576b2da9f89399cf59e9ed5bc6c01ad89e2cdd9
Branches Tags
root:master

7 Commits
ed1b2d8164 ... 2576b2da9f

Author SHA1 Message Date
tianyi 2576b2da9f 11
1 week ago
tianyi eb8cd82315 11
1 week ago
tianyi ab16952d67 11
1 week ago
tianyi b62851e377 11
1 week ago
tianyi 654f7feced 11
1 week ago
tianyi 08cc4a64c9 11
1 week ago
tianyi c354da9821 11
1 week ago
10 changed files with 203 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats
  1. 4
      components/tab-bar/myCenter.vue
  2. 9
      package1/myCenter/shopSettlementDetail.vue
  3. 6
      package2/shop/merchantCenter.vue
  4. 0
      package2/shop/merchantRegister.vue
  5. 1
      package2/shop/orderDetail.vue
  6. 7
      package2/shop/shopBill.vue
  7. 0
      package2/shop/shopOrderList.vue
  8. 157
      package2/shop/shopSettlementDetail.vue
  9. 60
      pages.json
  10. 5
      pages/index/index.vue

4
components/tab-bar/myCenter.vue
View File

@ -52,7 +52,7 @@
uni.setStorageSync('shopIcon',item.shopIcon) uni.setStorageSync('shopIcon',item.shopIcon)
uni.setStorageSync('shopScore',item.shopScore) uni.setStorageSync('shopScore',item.shopScore)
uni.navigateTo({ uni.navigateTo({
url: '/package1/myCenter/merchantCenter' url: '/package2/shop/merchantCenter'
}) })
}, },
navigatorTo(e){ navigatorTo(e){
@ -68,7 +68,7 @@
uni.setStorageSync('shopName',this.schoolShop[0].shopName) uni.setStorageSync('shopName',this.schoolShop[0].shopName)
uni.setStorageSync('shopIcon',this.schoolShop[0].shopIcon) uni.setStorageSync('shopIcon',this.schoolShop[0].shopIcon)
uni.setStorageSync('shopScore',this.schoolShop[0].shopScore) uni.setStorageSync('shopScore',this.schoolShop[0].shopScore)
url = '/package1/myCenter/merchantCenter' url = '/package2/shop/merchantCenter'
}else{ }else{
url = '/package1/myCenter/myMerchant' url = '/package1/myCenter/myMerchant'
} }

9
package1/myCenter/shopSettlementDetail.vue
View File

@ -1,9 +0,0 @@
<template>
<!-- 商家订单结算详情 -->
</template>
<script>
</script>
<style>
</style>

6
package1/myCenter/merchantCenter.vue → package2/shop/merchantCenter.vue
View File

@ -243,7 +243,7 @@
url = '/package1/myCenter/dataStatistics' url = '/package1/myCenter/dataStatistics'
break; break;
case 'db': case 'db':
url = '/package1/myCenter/shopOrderList?index=' + index url = '/package1/shop/shopOrderList?index=' + index
break; break;
case 'sp': case 'sp':
url = '/package1/myCenter/goodsList' url = '/package1/myCenter/goodsList'
@ -252,10 +252,10 @@
url = '' url = ''
break; break;
case 'dd': case 'dd':
url = '/package1/myCenter/shopOrderList' url = '/package1/shop/shopOrderList'
break; break;
case 'zd': case 'zd':
url = '/package1/myCenter/shopBill' url = '/package2/shop/shopBill'
break; break;
case 'pj': case 'pj':
let item = { let item = {

0
package1/myCenter/merchantRegister.vue → package2/shop/merchantRegister.vue
View File

1
package2/shop/orderDetail.vue
View File

@ -1,4 +1,5 @@
<template> <template>
<!-- 商家订单详情 -->
<view class="page1"> <view class="page1">
<view class="title"> <view class="title">
<view class="title-sreach"> <view class="title-sreach">

7
package1/myCenter/shopBill.vue → package2/shop/shopBill.vue
View File

@ -16,7 +16,7 @@
<view class="content11"> <view class="content11">
2026 2026
</view> </view>
<view class="box1"> <view class="box1" @tap="goDetail">
<view class="content22"> <view class="content22">
<view class=""> <view class="">
10/25-10/25账单 10/25-10/25账单
@ -106,6 +106,11 @@
}, },
methods: { methods: {
goDetail(){
uni.navigateTo({
url:'/package2/shop/shopSettlementDetail'
})
},
back() { back() {
uni.navigateBack() uni.navigateBack()
}, },

0
package1/myCenter/shopOrderList.vue → package2/shop/shopOrderList.vue
View File

157
package2/shop/shopSettlementDetail.vue
View File

@ -0,0 +1,157 @@
<template>
<!-- 商家订单详情 -->
<view class="page1">
<view class="title">
<view class="title-sreach">
<view class="back-btn" @tap="back" :style="{'top': menuButtonInfo.top +'px'}">
<uni-icons type="left" size="28"></uni-icons>
</view>
<view class="title-name" :style="{'padding-top': menuButtonInfo.top +'px'}">
账单详情
</view>
</view>
</view>
<view class="content">
<view class="box1">
<view style="font-size: 14px;font-weight: 700;margin-bottom: 10px;">
2026-04-09
</view>
<view style="display: flex;font-weight: 700;">
<view style="flex: 1;">
结算金额：￥100.00
</view>
<view style="flex: 1;">
实际打款金额：￥100.00
</view>
</view>
</view>
<view class="box1">
<uni-table border stripe emptyText="暂无更多数据" >
<!-- 表头行 -->
<uni-tr>
<uni-th width="90" align="center">订单编号</uni-th>
<uni-th width="90" align="center">商品金额</uni-th>
<uni-th width="90" align="center">餐盒费</uni-th>
<uni-th width="90" align="center">平台抽佣</uni-th>
<uni-th width="90" align="center">结算金额</uni-th>
</uni-tr>
<!-- 表格数据行 -->
<uni-tr>
<uni-td align="center">5154564164654</uni-td>
<uni-td align="center">24</uni-td>
<uni-td align="center">1</uni-td>
<uni-td align="center">1</uni-td>
<uni-td align="center">22</uni-td>
</uni-tr>
<uni-tr>
<uni-td align="center">5154564164654</uni-td>
<uni-td align="center">24</uni-td>
<uni-td align="center">1</uni-td>
<uni-td align="center">1</uni-td>
<uni-td align="center">22</uni-td>
</uni-tr>
<uni-tr>
<uni-td align="center">5154564164654</uni-td>
<uni-td align="center">24</uni-td>
<uni-td align="center">1</uni-td>
<uni-td align="center">1</uni-td>
<uni-td align="center">22</uni-td>
</uni-tr>
<uni-tr>
<uni-td align="center">5154564164654</uni-td>
<uni-td align="center">24</uni-td>
<uni-td align="center">1</uni-td>
<uni-td align="center">1</uni-td>
<uni-td align="center">22</uni-td>
</uni-tr>
</uni-table>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
menuButtonInfo: {},
}
},
filters:{
formatISOTime(isoString) {
const date = new Date(isoString);
const year = date.getFullYear();
const month = (date.getMonth() + 1).toString().padStart(2, '0');
const day = date.getDate().toString().padStart(2, '0');
const hours = date.getHours().toString().padStart(2, '0');
const minutes = date.getMinutes().toString().padStart(2, '0');
const seconds = date.getSeconds().toString().padStart(2, '0');
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
}
},
onShow() {
this.menuButtonInfo = uni.getMenuButtonBoundingClientRect()
},
onLoad() {
},
methods: {
back() {
uni.navigateBack()
}
}
}
</script>
<style>
page {
width: 100%;
height: 100%;
font-size: 24rpx;
background: #F5F8F5;
color: #00231C;
}
.page1 {
width: 100%;
height: 100%;
font-size: 24rpx;
position: relative;
}
.title {
background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/8bc15960c2dc40268e295d6dd23aecce.png') no-repeat;
width: 100%;
height: 20%;
}
.title-sreach {
width: 100%;
display: flex;
height: 200rpx;
position: relative;
}
.back-btn {
position: absolute;
bottom: 0;
left: 0;
}
.title-name {
padding-top: 110rpx;
font-size: 36rpx;
font-weight: 700;
flex: 1;
text-align: center;
}
.content{
margin: -140rpx auto;
}
.box1 {
width: 95%;
margin: 20rpx auto;
background: #fff;
border-radius: 20rpx;
padding: 20rpx;
}
</style>

60
pages.json
View File

@ -154,12 +154,6 @@
"navigationBarTitleText": "兼职注册", "navigationBarTitleText": "兼职注册",
"navigationStyle": "custom" "navigationStyle": "custom"
} }
},{
"path": "myCenter/shopSettlementDetail",
"style": {
"navigationBarTitleText": "商家订单结算详情",
"navigationStyle": "custom"
}
},{ },{
"path": "myCenter/partTimeJob", "path": "myCenter/partTimeJob",
"style": { "style": {
@ -196,12 +190,6 @@
"navigationBarTitleText": "个人中心", "navigationBarTitleText": "个人中心",
"navigationStyle": "custom" "navigationStyle": "custom"
} }
},{
"path": "myCenter/merchantRegister",
"style": {
"navigationBarTitleText": "商家注册",
"enablePullDownRefresh": false
}
},{ },{
"path": "myCenter/addGoods", "path": "myCenter/addGoods",
"style": { "style": {
@ -214,30 +202,12 @@
"navigationBarTitleText": "新增分类", "navigationBarTitleText": "新增分类",
"navigationStyle": "custom" "navigationStyle": "custom"
} }
},{
"path": "myCenter/merchantCenter",
"style": {
"navigationBarTitleText": "商家中心",
"navigationStyle": "custom"
}
},{
"path": "myCenter/shopBill",
"style": {
"navigationBarTitleText": "商家账单",
"navigationStyle": "custom"
}
},{ },{
"path": "myCenter/dataStatistics", "path": "myCenter/dataStatistics",
"style": { "style": {
"navigationBarTitleText": "数据统计", "navigationBarTitleText": "数据统计",
"navigationStyle": "custom" "navigationStyle": "custom"
} }
},{
"path": "myCenter/shopOrderList",
"style": {
"navigationBarTitleText": "商家订单",
"navigationStyle": "custom"
}
},{ },{
"path": "myCenter/goodsList", "path": "myCenter/goodsList",
"style": { "style": {
@ -269,6 +239,36 @@
"navigationBarTitleText": "商家订单详情", "navigationBarTitleText": "商家订单详情",
"navigationStyle": "custom" "navigationStyle": "custom"
} }
},{
"path": "shop/shopSettlementDetail",
"style": {
"navigationBarTitleText": "商家订单结算详情",
"navigationStyle": "custom"
}
},{
"path": "shop/merchantCenter",
"style": {
"navigationBarTitleText": "商家中心",
"navigationStyle": "custom"
}
},{
"path": "shop/shopBill",
"style": {
"navigationBarTitleText": "商家账单",
"navigationStyle": "custom"
}
},{
"path": "shop/merchantRegister",
"style": {
"navigationBarTitleText": "商家注册",
"enablePullDownRefresh": false
}
},{
"path": "shop/shopOrderList",
"style": {
"navigationBarTitleText": "商家订单",
"navigationStyle": "custom"
}
},{ },{
"path": "partTimeJob/partTimeJobCenter", "path": "partTimeJob/partTimeJobCenter",
"style": { "style": {

5
pages/index/index.vue
View File

@ -370,6 +370,9 @@
data() { data() {
return { return {
pages:[{ pages:[{
name:'商家账单详情111',
url:'/package2/shop/shopSettlementDetail'
},{
name:'商家订单详情111', name:'商家订单详情111',
url:'/package2/shop/orderDetail' url:'/package2/shop/orderDetail'
},{ },{
@ -455,7 +458,7 @@
url:'/package1/myCenter/myCenter' url:'/package1/myCenter/myCenter'
},{ },{
name:'商家注册', name:'商家注册',
url:'/package1/myCenter/merchantRegister' url:'/package2/shop/merchantRegister'
},{ },{
name:'发布', name:'发布',
url:'/package1/tabbar/release' url:'/package1/tabbar/release'

Write Preview
Loading…
Cancel
Save