root
/
school-peisong
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

11

master
tianyi 10 hours ago
parent
dd6530a460
commit
f8a1fc6c4f
7 changed files with 49 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      pages/goods/gategory.vue
  2. 4
      pages/goods/goodsList.vue
  3. 4
      pages/index/index.vue
  4. 6
      pages/shop/addGoods.vue
  5. 66
      pages/shop/orderDetail.vue
  6. 14
      pages/shop/shopOrderList.vue
  7. 2
      pages/shop/shopSettlementDetail.vue

2
pages/goods/gategory.vue
View File

@ -25,7 +25,7 @@
</uni-popup-dialog>
</uni-popup>
<uni-popup ref="delDialog" type="dialog">
<view class="type-popup" style="width:100%;margin-bottom: 0;border-radius: 0;height: 650rpx;border-radius: 10px;">
<view class="type-popup" style="width:100%;margin-bottom: 0;border-radius: 0;height: 650rpx;border-radius: 20rpx;">
<view style="height: 120rpx;font-size: 36rpx;font-weight: bold;line-height: 120rpx;text-align: center;">
编辑分类
</view>

4
pages/goods/goodsList.vue
View File

@ -534,7 +534,7 @@
.uni-searchbar,
.uni-searchbar__box {
width: 100% !important;
padding: 5px 10px !important
padding: 10rpx 20rpx !important
}
.up-down {
@ -604,7 +604,7 @@
float: left;
position: fixed;
top: 29% !important;
padding-top:50px;
padding-top:100rpx;
}
}

4
pages/index/index.vue
View File

@ -96,7 +96,7 @@
<view class="data2">
<view class="data22">
<view class="data222">
{{shopData.orderRevenueAndCount.count == undefined ?0:shopData.orderRevenueAndCount.count}}
{{shopData.orderRevenueAndCount == undefined ?0:shopData.orderRevenueAndCount.count}}
</view>
<view class="data333">
今日订单
@ -104,7 +104,7 @@
</view>
<view class="data22">
<view class="data222">
{{shopData.orderRevenueAndCount.amount == undefined ?0:shopData.orderRevenueAndCount.amount}}
{{shopData.orderRevenueAndCount == undefined ?0:shopData.orderRevenueAndCount.amount}}
</view>
<view class="data333">
营业额

6
pages/shop/addGoods.vue
View File

@ -781,9 +781,9 @@
}
.formBox {
padding: 10px 13px;
border-radius: 7px;
box-shadow: 0 1px 10px 2px #e2e2e2;
padding: 20rpx 26rpx;
border-radius: 14rpx;
box-shadow: 0 1px 20rpx 4rpx #e2e2e2;
background-color: #fff;
overflow: scroll;
height: 85%;

66
pages/shop/orderDetail.vue
View File

@ -12,57 +12,57 @@
</view>
</view>
<view class="content">
<view class="box1" style="display: flex;font-size: 14px;font-weight: 700;">
<view class="box1" style="display: flex;font-size: 28rpx;font-weight: 700;">
<text>{{'#'+data.numberCode}}</text>
<text style="margin: 0 10px;">期望送达</text>
<text style="margin: 0 20rpx;">期望送达</text>
<text>明天 06:30</text>
<text style="flex: 1;text-align: right;color: red;">
{{data.status == 0?'待支付':data.status == 2?'待配送员接单':(data.status == 3 && data.deliveryType == 1 && data.shopMakeTime == null) || (data.status == 3 && data.deliveryType == 2 && data.userRequireMake == 1)?'待出餐':(data.status == 3 && data.deliveryType == 1 && data.shopMakeTime != null)?'待取货':(data.status == 3 && data.deliveryType == 2)?'待消费':data.status == 4?'待送达':data.status == 5?'已完成':data.status == 7?'待同意退款':data.status == 8?'已退款':data.status == 6?'已取消':data.status == 11?'售后中':data.status == 12?'已售后':""}}
</text>
</view>
<view class="box1" style="display: flex;height: 50px;line-height: 50px;padding: 0 10px;">
<view style="border: 1px solid #48D1CC;height: 25px;line-height: 25px;padding: 0 10px;border-radius: 10px;margin-top: auto;margin-bottom: auto;color: #48D1CC;font-weight: 700;">
<view class="box1" style="display: flex;height: 100rpx;line-height: 100rpx;padding: 0 20rpx;">
<view style="border: 1px solid #48D1CC;height: 50rpx;line-height: 50rpx;padding: 0 20rpx;border-radius: 20rpx;margin-top: auto;margin-bottom: auto;color: #48D1CC;font-weight: 700;">
{{data.deliveryType == 2?'自取订单':'配送订单'}}
</view>
<view v-if="data.deliveryType == 1" style="display: flex;flex: 1;padding-left: 10px;">
<view v-if="data.deliveryType == 1" style="display: flex;flex: 1;padding-left: 20rpx;">
<text style="flex: 1;">配送员：{{data.deliveryInfo.workerName}}</text>
<view class="">
<img @tap="makeCall(data.deliveryInfo.workerPhone)" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png" alt="" style="width: 30px;height: 30px;margin-top: 10px;" />
<img @tap="makeCall(data.deliveryInfo.workerPhone)" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png" alt="" style="width: 60rpx;height: 60rpx;margin-top: 20rpx;" />
</view>
</view>
</view>
<view class="box1" v-if="data.deliveryType == 1" style="display: flex;">
<view style="flex: 1;">
<view style="font-weight: 700;height: 25px;">
<view style="font-weight: 700;height: 50rpx;">
收货人：{{data.deliveryInfo.receiverName}}
</view>
<view style="color: #777;height: 35px;">
<view style="color: #777;height: 70rpx;">
{{data.deliveryInfo.receiverAddress}}
</view>
</view>
<view class="">
<img @tap="makeCall(data.deliveryInfo.receiverPhone)" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png" alt="" style="width: 30px;height: 30px;margin-top: 14px;" />
<img @tap="makeCall(data.deliveryInfo.receiverPhone)" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png" alt="" style="width: 60rpx;height: 60rpx;margin-top: 28rpx;" />
</view>
</view>
<view class="box1">
<view style="border-bottom: 1px solid #eee;padding-bottom: 10px;">
<view style="font-size: 16px;height: 30px;">
商品 <text style="font-size: 14px;color: #777;">共{{data.goodsNum}}件</text>
<view style="border-bottom: 1px solid #eee;padding-bottom: 20rpx;">
<view style="font-size: 32rpx;height: 60rpx;">
商品 <text style="font-size: 28rpx;color: #777;">共{{data.goodsNum}}件</text>
</view>
<view v-for="(item,index) in data.goodsList" :key="index" style="display: flex;height: 20px;line-height: 20px;">
<view v-for="(item,index) in data.goodsList" :key="index" style="display: flex;height: 40rpx;line-height: 40rpx;">
<view style="flex: 1;">
{{item.productName}}
</view>
<view style="width: 30px;">
<view style="width: 60rpx;">
{{'x'+ item.quantity}}
</view>
<view style="width: 50px;text-align: right;">
<view style="width: 100rpx;text-align: right;">
{{'￥'+ item.price}}
</view>
</view>
</view>
<view class="">
<view style="display: flex;height: 30px;line-height: 30px;">
<view style="display: flex;height: 60rpx;line-height: 60rpx;">
<view style="flex: 1;">
商品金额
</view>
@ -70,7 +70,7 @@
{{'￥' + data.goodsAmount}}
</view>
</view>
<view style="display: flex;height: 30px;line-height: 30px;">
<view style="display: flex;height: 60rpx;line-height: 60rpx;">
<view style="flex: 1;">
配送费
</view>
@ -78,7 +78,7 @@
{{'￥' + data.deliveryFee}}
</view>
</view>
<view style="display: flex;height: 30px;line-height: 30px;">
<view style="display: flex;height: 60rpx;line-height: 60rpx;">
<view style="flex: 1;">
客户实际支付
</view>
@ -86,7 +86,7 @@
{{'￥'+ data.totalAmount}}
</view>
</view>
<view style="display: flex;height: 30px;line-height: 30px;">
<view style="display: flex;height: 60rpx;line-height: 60rpx;">
<view style="flex: 1;">
平台服务费
</view>
@ -98,24 +98,24 @@
</view>
<view class="box1">
<view class="">
<view style="display: flex;height: 30px;line-height: 30px;">
<view style="width: 70px;">
<view style="display: flex;height: 60rpx;line-height: 60rpx;">
<view style="width: 140rpx;">
订单编号
</view>
<view style="flex: 1;text-align: right;">
{{data.id}}
</view>
</view>
<view style="display: flex;height: 30px;line-height: 30px;">
<view style="width: 70px;">
<view style="display: flex;height: 60rpx;line-height: 60rpx;">
<view style="width: 140rpx;">
下单时间
</view>
<view style="flex: 1;text-align: right;">
{{data.createTime | formatISOTime}}
</view>
</view>
<view style="display: flex;height: 30px;line-height: 30px;">
<view style="width: 70px;">
<view style="display: flex;height: 60rpx;line-height: 60rpx;">
<view style="width: 140rpx;">
用户账号
</view>
<view style="flex: 1;text-align: right;">
@ -134,7 +134,7 @@
</view>
</view>
<view class="box1 bottom">
<view style="height: 30px;line-height: 30px;display: flex;border-bottom: 1px solid #eee;font-size: 14px;">
<view style="height: 60rpx;line-height: 60rpx;display: flex;border-bottom: 1px solid #eee;font-size: 28rpx;">
<view style="flex: 1;">
预计收入
</view>
@ -142,7 +142,7 @@
￥{{(data.yujishouru).toFixed(2)}}
</view>
</view>
<view style="margin-top: 10px;">
<view style="margin-top: 20rpx;">
<view class="btn">
打印小票
</view>
@ -347,19 +347,19 @@
bottom: 0;
}
.btn{
height: 25px;
width: 65px;
line-height: 25px;
height: 50rpx;
width: 130rpx;
line-height: 50rpx;
background: linear-gradient(90deg, #e3ff96, #a6ffea);
text-align: center;
border-radius: 7px;
border-radius: 14rpx;
font-weight: 700;
float: right;
margin-left: 10px;
margin-left: 20rpx;
}
.group-content{
background: #fff;
width: 300px;
width: 600rpx;
height: auto;
border-radius: 20rpx;
}

14
pages/shop/shopOrderList.vue
View File

@ -51,9 +51,9 @@
</view>
</view>
</view>
<view style="height: 40px;border-top: 1px solid #eee;display: flex;">
<view style="height: 80rpx;border-top: 1px solid #eee;display: flex;">
<view style="flex: 1;"></view>
<view @tap.stop="mealServing(item)" v-if="currentIndex == 13" class="btn" style="margin: 10px 0 0 10px;">
<view @tap.stop="mealServing(item)" v-if="currentIndex == 13" class="btn" style="margin: 20rpx 0 0 20rpx;">
已出餐
</view>
</view>
@ -283,13 +283,13 @@
}
.btn{
background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
padding:0 5px;
height: 30px;
border-radius: 7px;
line-height: 30px;
padding:0 10rpx;
height: 60rpx;
border-radius: 14rpx;
line-height: 60rpx;
text-align: center;
font-weight: 700;
margin-top: 10px;
margin-top: 20rpx;
}
.title-name {

2
pages/shop/shopSettlementDetail.vue
View File

@ -13,7 +13,7 @@
</view>
<view class="content">
<view class="box1">
<view style="font-size: 14px;font-weight: 700;margin-bottom: 10px;">
<view style="font-size: 28rpx;font-weight: 700;margin-bottom: 20rpx;">
2026-04-09
</view>
<view style="display: flex;font-weight: 700;">

Write Preview
Loading…
Cancel
Save