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

Compare commits

base: root:391b9b3a57c5db813c29514046d6201a0cfe34ce
Branches Tags
root:master
...
compare: root:ed1b2d816476bd393255d535c31c2a8ddb536b04
Branches Tags
root:master

4 Commits
391b9b3a57 ... ed1b2d8164

Author SHA1 Message Date
tianyi ed1b2d8164 11
1 week ago
tianyi 582217bdaf 11
1 week ago
tianyi 01c95b4094 11
1 week ago
tianyi 869a7d2550 11
1 week ago
9 changed files with 166 additions and 15 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. 1
      package1/myCenter/addType.vue
  2. 1
      package1/myCenter/dataStatistics.vue
  3. 1
      package1/myCenter/goodsList.vue
  4. 1
      package1/myCenter/merchantCenter.vue
  5. 1
      package1/myCenter/shopBill.vue
  6. 1
      package1/myCenter/shopOrderList.vue
  7. 9
      package1/myCenter/shopSettlementDetail.vue
  8. 160
      package2/shop/orderDetail.vue
  9. 6
      pages.json

1
package1/myCenter/addType.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">

1
package1/myCenter/dataStatistics.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">

1
package1/myCenter/goodsList.vue
View File

@ -1,4 +1,5 @@
<template> <template>
<!-- 商品列表 -->
<view class="page1"> <view class="page1">
<view class="title" style="z-index: 81;"> <view class="title" style="z-index: 81;">
<view class="title-sreach"> <view class="title-sreach">

1
package1/myCenter/merchantCenter.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">

1
package1/myCenter/shopBill.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">

1
package1/myCenter/shopOrderList.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">

9
package1/myCenter/shopSettlementDetail.vue
View File

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

160
package2/shop/orderDetail.vue
View File

@ -12,34 +12,133 @@
</view> </view>
<view class="content"> <view class="content">
<view class="box1" style="display: flex;font-size: 14px;font-weight: 700;"> <view class="box1" style="display: flex;font-size: 14px;font-weight: 700;">
<text>#0001</text> <text>{{'#'+data.numberCode}}</text>
<text style="margin: 0 10px;">期望送达</text> <text style="margin: 0 10px;">期望送达</text>
<text>明天 06:30</text> <text>明天 06:30</text>
<text style="flex: 1;text-align: right;color: red;">待消费</text> <text style="flex: 1;text-align: right;color: red;">
{{data.status == 0?'待支付':data.status == 1?' 待成团':data.status == 2?'待消费':data.status == 3?'待接单':data.status == 4?'待取货':data.status == 5?'待送达':data.status == 6?'已完成':data.status == 7?'待退款':data.status == 8?'已退款':data.status == 9?'已取消':data.status == 11?'售后中':data.status == 12?'已售后':""}}
</text>
</view> </view>
<view class="box1" style="display: flex;height: 50px;line-height: 50px;padding: 0 10px;"> <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 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;">
配送订单 {{data.deliveryType == 2?'自取订单':'配送订单'}}
<!-- 自取订单 -->
</view> </view>
<view style="display: flex;flex: 1;padding-left: 10px;"> <view v-if="data.deliveryType == 1" style="display: flex;flex: 1;padding-left: 10px;">
<text style="flex: 1;">配送员：张三</text> <text style="flex: 1;">配送员：{{data.deliveryInfo.workerName}}</text>
<view class=""> <view class="">
<img 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: 30px;height: 30px;margin-top: 10px;" />
</view> </view>
</view> </view>
</view> </view>
<view class="box1" style="display: flex;"> <view class="box1" v-if="data.deliveryType == 1" style="display: flex;">
<view class=""> <view style="flex: 1;">
<view style="font-weight: 700;height: 25px;"> <view style="font-weight: 700;height: 25px;">
收货人：田（先生） 收货人：{{data.deliveryInfo.receiverName}}
</view> </view>
<view style="color: #777;height: 35px;"> <view style="color: #777;height: 35px;">
河北省沧州市东川建设集团优先公司5楼右转右手边第一个门 {{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;" />
</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>
<view v-for="(item,index) in data.goodsList" :key="index" style="display: flex;height: 20px;line-height: 20px;">
<view style="flex: 1;">
{{item.productName}}
</view>
<view style="width: 30px;">
{{'x'+ item.quantity}}
</view>
<view style="width: 50px;text-align: right;">
{{'￥'+ item.price}}
</view>
</view>
</view>
<view class="">
<view style="display: flex;height: 30px;line-height: 30px;">
<view style="flex: 1;">
商品金额
</view>
<view class="">
{{'￥' + data.goodsAmount}}
</view>
</view>
<view style="display: flex;height: 30px;line-height: 30px;">
<view style="flex: 1;">
配送费
</view>
<view class="">
{{'￥' + data.deliveryFee}}
</view>
</view>
<view style="display: flex;height: 30px;line-height: 30px;">
<view style="flex: 1;">
客户实际支付
</view>
<view class="">
{{'￥'+ data.totalAmount}}
</view>
</view>
<view style="display: flex;height: 30px;line-height: 30px;">
<view style="flex: 1;">
平台服务费
</view>
<view class="">
￥12.00假的
</view>
</view> </view>
</view> </view>
</view>
<view class="box1">
<view class=""> <view class="">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png" alt="" style="width: 30px;height: 30px;margin-top: 14px;" /> <view style="display: flex;height: 30px;line-height: 30px;">
<view style="width: 70px;">
订单编号
</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>
<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>
<view style="flex: 1;text-align: right;">
13521030111假的
</view>
</view>
</view>
</view>
</view>
<view class="bottom">
<view style="height: 30px;line-height: 30px;display: flex;border-bottom: 1px solid #eee;font-size: 14px;">
<view style="flex: 1;">
预计收入
</view>
<view style="color: red;font-weight: 700;">
￥10.32假的
</view>
</view>
<view style="margin-top: 10px;">
<view class="btn">
打印小票
</view>
<view class="btn" style="background: rgba(0, 35, 28, 1);color: rgba(166, 255, 234, 1);">
取消订单
</view> </view>
</view> </view>
</view> </view>
@ -51,6 +150,7 @@
data() { data() {
return { return {
menuButtonInfo: {}, menuButtonInfo: {},
data:{}
} }
}, },
filters:{ filters:{
@ -70,14 +170,20 @@
}, },
onLoad(option) { onLoad(option) {
this.shopId = option.id this.shopId = option.id
this.getDetail()
}, },
methods: { methods: {
getList(){ getDetail(){
let that = this let that = this
that.tui.request("/mall/order/page", "POST", this.searchForm, false, false).then((res) => { that.tui.request("/mall/order/detail/"+ this.shopId, "get", {}, false, false).then((res) => {
that.loadStatus = 'nomore';
if (res.code == 200) { if (res.code == 200) {
that.data = res.result
that.data.goodsNum = 0
for(let m=0;m<that.data.goodsList.length;m++){
that.data.goodsNum += that.data.goodsList[m].quantity
}
that.$forceUpdate()
} else { } else {
that.tui.toast(res.message); that.tui.toast(res.message);
return; return;
@ -85,6 +191,11 @@
uni.hideLoading(); uni.hideLoading();
}).catch((res) => {}); }).catch((res) => {});
}, },
makeCall(phone){
uni.makePhoneCall({
phoneNumber: phone
});
},
back() { back() {
uni.navigateBack() uni.navigateBack()
}, },
@ -144,4 +255,23 @@
border-radius: 20rpx; border-radius: 20rpx;
padding: 20rpx; padding: 20rpx;
} }
.bottom{
position: fixed;
bottom: 0;
height: 90px;
width: 100%;
background: #fff;
padding: 0 10px;
}
.btn{
height: 25px;
width: 65px;
line-height: 25px;
background: linear-gradient(90deg, #e3ff96, #a6ffea);
text-align: center;
border-radius: 7px;
font-weight: 700;
float: right;
margin-left: 10px;
}
</style> </style>

6
pages.json
View File

@ -154,6 +154,12 @@
"navigationBarTitleText": "兼职注册", "navigationBarTitleText": "兼职注册",
"navigationStyle": "custom" "navigationStyle": "custom"
} }
},{
"path": "myCenter/shopSettlementDetail",
"style": {
"navigationBarTitleText": "商家订单结算详情",
"navigationStyle": "custom"
}
},{ },{
"path": "myCenter/partTimeJob", "path": "myCenter/partTimeJob",
"style": { "style": {

Write Preview
Loading…
Cancel
Save