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

11

master
tianyi 1 day ago
parent
04f905ebc1
commit
b5a9c9baf4
4 changed files with 95 additions and 104 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 Download Patch File Download Diff File
  1. 2
      package1/group/groupBuyList.vue
  2. 19
      package1/order/orderDetail.vue
  3. 22
      package1/order/orderList.vue
  4. 60
      package1/runErrand/runErrand.vue

2
package1/group/groupBuyList.vue
View File

@ -65,7 +65,7 @@
<view class="shop-list"> <view class="shop-list">
<view class="shop-member" v-for="(item,index) in shopList" :key="index" @tap="goDetail('shop',item)"> <view class="shop-member" v-for="(item,index) in shopList" :key="index" @tap="goDetail('shop',item)">
<view @tap.stop="buyingye" v-if="item.shopTakeaway.status != 0" <view @tap.stop="buyingye" v-if="item.shopTakeaway.status != 0"
style="width: 100%;height:100%;position: absolute;top: 0;background: rgba(0, 0, 0, 0.4);z-index: 999;border-radius: 10px;"> style="width: 100%;height:100%;position: absolute;top: 0;background: rgba(0, 0, 0, 0.1);z-index: 999;border-radius: 10px;">
</view> </view>
<view class="shop-top"> <view class="shop-top">
<view class="shop-img"> <view class="shop-img">

19
package1/order/orderDetail.vue
View File

@ -204,10 +204,8 @@
{{item3.productName}} {{item3.productName}}
</view> </view>
<view class="goods-content-center"> <view class="goods-content-center">
<view class="goods-deal1">
{{item3.specs}} {{item3.specs}}
</view> </view>
</view>
<view class="goods-content-bottom"> <view class="goods-content-bottom">
<view style="width: 50%;"> <view style="width: 50%;">
X{{item3.quantity}} X{{item3.quantity}}
@ -267,11 +265,11 @@
</view> </view>
<view class="box1"> <view class="box1">
<view style="width: 100%;line-height: 70rpx;font-size: 28rpx;font-weight: 700;" v-if="orderDetail.shopName != null"> <view style="width: 100%;line-height: 70rpx;font-size: 28rpx;font-weight: 700;display: flex;" v-if="orderDetail.shopName != null">
{{orderDetail.shopName}} <text style="flex:1">{{orderDetail.shopName}}</text>
<img @tap="makeCall(orderDetail.shopPhone)" <img @tap="makeCall(orderDetail.shopPhone)"
src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png"
alt="" style="width: 60rpx;height: 60rpx;" /> alt="" style="width: 40rpx;height: 40rpx;margin-top: 7px;" />
</view> </view>
<view v-for="(item1,index1) in orderDetail.goodsList" :key="index1" v-if="orderDetail.goodsList != null && orderDetail.goodsList.length > 0" style="display: flex;padding: 20rpx;background: #eee;border-radius: 20rpx;"> <view v-for="(item1,index1) in orderDetail.goodsList" :key="index1" v-if="orderDetail.goodsList != null && orderDetail.goodsList.length > 0" style="display: flex;padding: 20rpx;background: #eee;border-radius: 20rpx;">
@ -283,10 +281,8 @@
{{item1.productName}} {{item1.productName}}
</view> </view>
<view class="goods-content-center"> <view class="goods-content-center">
<view class="goods-deal1">
{{item1.specs}} {{item1.specs}}
</view> </view>
</view>
<view class="goods-content-bottom"> <view class="goods-content-bottom">
<view style="width: 50%;"> <view style="width: 50%;">
X{{item1.quantity}} X{{item1.quantity}}
@ -387,11 +383,11 @@
<view style="flex: 1;color: #777;font-weight: 700;"> <view style="flex: 1;color: #777;font-weight: 700;">
配送员 配送员
</view> </view>
<view style="color: #000;font-weight: 700;" v-if="orderDetail.deliveryInfo && orderDetail.deliveryInfo.workerId != null && orderDetail.deliveryInfo.workerId != ''"> <view style="color: #000;font-weight: 700;display: flex;" v-if="orderDetail.deliveryInfo && orderDetail.deliveryInfo.workerId != null && orderDetail.deliveryInfo.workerId != ''">
{{orderDetail.deliveryInfo.workerName != null ? orderDetail.deliveryInfo.workerName : ''}} {{orderDetail.deliveryInfo.workerName != null ? orderDetail.deliveryInfo.workerName : ''}}
<img @tap="makeCall(orderDetail.deliveryInfo.workerPhone)" <img @tap="makeCall(orderDetail.deliveryInfo.workerPhone)"
src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png"
alt="" style="width: 60rpx;height: 60rpx;" /> alt="" style="width: 40rpx;height: 40rpx;margin: 20rpx 0 0 20rpx;" />
</view> </view>
<view style="color: #000;font-weight: 700;" v-else> <view style="color: #000;font-weight: 700;" v-else>
未指定等待接单中 未指定等待接单中
@ -1122,9 +1118,6 @@
margin: 16rpx 0; margin: 16rpx 0;
color: #777; color: #777;
} }
.goods-deal1 {
width: 60%;
}
.goods-content-bottom { .goods-content-bottom {
display: flex; display: flex;
line-height: 56rpx; line-height: 56rpx;
@ -1176,7 +1169,7 @@
font-size: 20rpx; font-size: 20rpx;
} }
.btn-box{ .btn-box{
height: 120rpx; height: auto;
} }
.btn{ .btn{
width: 90%; width: 90%;

22
package1/order/orderList.vue
View File

@ -86,9 +86,9 @@
已售后</view> 已售后</view>
</view> </view>
</view> </view>
<view class="content"> <view class="content" :style="{top:tab1Checked =='quanbu'?'360rpx':'440rpx'}">
<view class="box1" v-for="(item,index) in orderList" :key="index"> <view class="box1" v-for="(item,index) in orderList" :key="index">
<view class="ziqu-xuanfu" v-if="item.status == 0" style="background:red"> <view class="ziqu-xuanfu" v-if="item.status == 0" style="background:red;color:#fff;">
待支付 待支付
</view> </view>
<view class="ziqu-xuanfu" v-if="item.status == 10" style="background:rgba(166, 255, 234, 1)"> <view class="ziqu-xuanfu" v-if="item.status == 10" style="background:rgba(166, 255, 234, 1)">
@ -103,7 +103,7 @@
<view class="ziqu-xuanfu" v-if="item.status == 3 && item.deliveryType == 2" style="background:rgba(166, 255, 234, 1)"> <view class="ziqu-xuanfu" v-if="item.status == 3 && item.deliveryType == 2" style="background:rgba(166, 255, 234, 1)">
待消费 待消费
</view> </view>
<view class="ziqu-xuanfu" v-if="item.status == 4" style="background:rgba(255, 193, 236, 1)"> <view class="ziqu-xuanfu" v-if="item.status == 4" style="background:rgba(255, 193, 236, 1);color:#fff;">
待送达 待送达
</view> </view>
<view class="ziqu-xuanfu" v-if="item.status == 5"> <view class="ziqu-xuanfu" v-if="item.status == 5">
@ -118,7 +118,7 @@
<view class="ziqu-xuanfu" v-if="item.status == 8"> <view class="ziqu-xuanfu" v-if="item.status == 8">
已退款 已退款
</view> </view>
<view class="ziqu-xuanfu" v-if="item.status == 11"> <view class="ziqu-xuanfu" v-if="item.status == 11" style="background:rgba(227, 255, 150, 1);color:#777;">
售后中 售后中
</view> </view>
<view class="ziqu-xuanfu" v-if="item.status == 12"> <view class="ziqu-xuanfu" v-if="item.status == 12">
@ -175,12 +175,12 @@
</view> </view>
</view> </view>
<view style="height: 100rpx;border-bottom: 1px solid #F5F5F5;display: flex;line-height: 100rpx;"> <view style="height: 100rpx;border-bottom: 1px solid #F5F5F5;display: flex;line-height: 100rpx;">
<view style="font-size: 24rpx;font-weight: 700;"> <view v-if="item.otherOrder == null" style="flex: 1;font-weight: 700;">
实付<text v-if="tab1Checked == 'fantuan'" style="font-size: 20rpx;color: #777;">（含包装/配送费）</text> <text <text v-if="tab1Checked != 'fantuan'">下单时间:</text>{{item.createTime | formatTime}}
</view>
<view style="font-weight: 700;">
<text style="font-size:28rpx;">实付</text><text v-if="tab1Checked == 'fantuan'" style="font-size: 20rpx;color: #777;">（含包装/配送费）</text> <text
style="color: red;">￥{{item.totalAmount}}</text> style="color: red;">￥{{item.totalAmount}}</text>
<text class="goods-content-bottom" style="float: right;" v-if="item.otherOrder == null">
下单时间：{{item.createTime | formatTime}}
</text>
</view> </view>
</view> </view>
<view class="bottom-btn"> <view class="bottom-btn">
@ -652,7 +652,7 @@
} }
.tab2 { .tab2 {
height: 70rpx; height: auto;
width: 100%; width: 100%;
overflow-x: scroll; overflow-x: scroll;
overflow-y: hidden; overflow-y: hidden;
@ -685,7 +685,7 @@
width: 120rpx; width: 120rpx;
text-align: center; text-align: center;
line-height: 56rpx; line-height: 56rpx;
color: #fff; color: #777;
} }
.box1 { .box1 {

60
package1/runErrand/runErrand.vue
View File

@ -33,7 +33,7 @@
</view> </view>
</view> </view>
<view class="content"> <view class="content">
<view class="" style="background: #fff; border-radius: 20rpx; padding: 20rpx; margin-bottom: 20rpx; margin-top: 40rpx;box-shadow: 0 0 10rpx rgba(0,0,0,0.05);"> <view class="" style="background: #fff;padding: 20rpx;">
<!-- 取货地址 --> <!-- 取货地址 -->
<view v-if="isKuaidi" class="dizhi" style="border-bottom: 1px solid #eee; padding-bottom: 20rpx; margin-bottom: 20rpx;"> <view v-if="isKuaidi" class="dizhi" style="border-bottom: 1px solid #eee; padding-bottom: 20rpx; margin-bottom: 20rpx;">
<view class="dizhi-tu"> <view class="dizhi-tu">
@ -101,7 +101,7 @@
</view> </view>
<!-- 配送员模块 --> <!-- 配送员模块 -->
<view style="background: #fff; border-radius: 20rpx; padding: 20rpx; margin-top: 20rpx; box-shadow: 0 0 10rpx rgba(0,0,0,0.05);"> <view style="width: 95%;margin: 10px auto;background: #fff; border-radius: 20rpx; padding: 20rpx; margin-top: 20rpx; box-shadow: 0 0 10rpx rgba(0,0,0,0.05);">
<view style="border-bottom: 1px solid #eee; padding-bottom: 20rpx;"> <view style="border-bottom: 1px solid #eee; padding-bottom: 20rpx;">
<view style="font-size: 28rpx;font-weight: 700;">配送员</view> <view style="font-size: 28rpx;font-weight: 700;">配送员</view>
<view style="font-size: 24rpx;color: #777;margin-top: 10rpx;">指定配送员，如配送员拒绝接单或者下线，订单进入抢单大厅</view> <view style="font-size: 24rpx;color: #777;margin-top: 10rpx;">指定配送员，如配送员拒绝接单或者下线，订单进入抢单大厅</view>
@ -142,8 +142,6 @@
因您的收货楼层在3楼以上，将额外收取配送费 ¥{{highFloorFeeCalc}} 因您的收货楼层在3楼以上，将额外收取配送费 ¥{{highFloorFeeCalc}}
</view> </view>
</view> </view>
</view>
<view class="content-box" style="height: 120rpx;"> <view class="content-box" style="height: 120rpx;">
<view class="content-title"> <view class="content-title">
取件数量<text style="color:red;">*</text> 取件数量<text style="color:red;">*</text>
@ -158,15 +156,15 @@
<view class="content-title"> <view class="content-title">
取件凭证<text v-if="isKuaidi" style="color:red;">*</text> 取件凭证<text v-if="isKuaidi" style="color:red;">*</text>
</view> </view>
<view style="flex: 1;"> <view style="flex: 1;padding-top: 26rpx;">
<view> <view>
<view style="display: flex;">手机尾号</view> <view style="line-height:70rpx;">手机尾号</view>
<view class="check-input"> <view class="check-input">
<input type="text" v-model="addFormData.phoneNumber" style="width: 100%;height: 100%;padding: 0 20rpx;border: 1px solid #eee;border-radius:10rpx;" placeholder="建议填写预留手机尾号4位"> <input type="text" v-model="addFormData.phoneNumber" style="width: 100%;height: 100%;padding: 0 20rpx;border: 1px solid #eee;border-radius:10rpx;" placeholder="建议填写预留手机尾号4位">
</view> </view>
</view> </view>
<view v-if="isKuaidi"> <view v-if="isKuaidi">
<view style="display: flex;">取件码</view> <view style="line-height:70rpx;">取件码</view>
<view class="check-input" v-for="(item,index) in addFormData.codeList" :key="index" style="border: none;display: flex;"> <view class="check-input" v-for="(item,index) in addFormData.codeList" :key="index" style="border: none;display: flex;">
<input type="text" v-model="item.code" style="width: 100%;height: 100%;padding: 0 20rpx;border: 1px solid #eee;border-radius:10rpx;" placeholder="建议填写取件码"> <input type="text" v-model="item.code" style="width: 100%;height: 100%;padding: 0 20rpx;border: 1px solid #eee;border-radius:10rpx;" placeholder="建议填写取件码">
<view @tap="delCode(index)" v-if="addFormData.codeList.length>1" style="width: 90rpx;height: 70rpx;line-height: 70rpx;text-align: center;"> <view @tap="delCode(index)" v-if="addFormData.codeList.length>1" style="width: 90rpx;height: 70rpx;line-height: 70rpx;text-align: center;">
@ -175,8 +173,8 @@
</view> </view>
<view class="check-add" @tap="addCode">+ 添加取件码</view> <view class="check-add" @tap="addCode">+ 添加取件码</view>
</view> </view>
<view> <view style="margin-bottom: 10px;">
<view style="display: flex;">截图凭证</view> <view style="line-height:70rpx;">截图凭证</view>
<view> <view>
<view style="display: flex; flex-wrap: wrap;"> <view style="display: flex; flex-wrap: wrap;">
<view class="upload-img" @tap="pictureAdd" style="background: #eee;text-align: center;line-height: 160rpx;border-radius:10rpx;margin-top:10rpx;"> <view class="upload-img" @tap="pictureAdd" style="background: #eee;text-align: center;line-height: 160rpx;border-radius:10rpx;margin-top:10rpx;">
@ -205,20 +203,14 @@
<view class="content-title"> <view class="content-title">
订单备注 订单备注
</view> </view>
<view style="height: 200rpx;background: #eee;border-radius: 40rpx;padding: 20rpx;width: 70%;"> <view style="height: 200rpx;background: #eee;border-radius: 40rpx;padding: 20rpx;width: 70%;margin-top: 10px;">
<textarea v-model="addFormData.remark" cols="30" rows="10" placeholder="请填写备注" style="height: 160rpx;width: 100%;"></textarea> <textarea v-model="addFormData.remark" cols="30" rows="10" placeholder="请填写备注" style="height: 160rpx;width: 100%;"></textarea>
</view> </view>
</view> </view>
<view style="height: 80rpx;line-height: 80rpx;display: flex;margin-top: 20rpx;">
<view style="flex: 1;color: #777;font-weight: 700;font-size:32rpx;">
{{isKuaidi?'代取配送费':'跑腿费'}}
</view>
<view style="color: #000;font-weight:700;font-size:32rpx;">
￥{{deliveryFeeCalc.toFixed(2)}}
</view>
</view> </view>
<view style="display: flex;height: 80rpx;line-height: 80rpx;border-top: 1px solid #eee;font-size: 28rpx;font-weight: 700; align-items:center;" @tap="openCouponPopup">
<view style="flex: 1; color: #777; font-size:32rpx;"> <view style="display: flex;height: 80rpx;line-height: 80rpx;font-weight: 700; align-items:center;padding: 0 4%;" @tap="openCouponPopup">
<view style="flex: 1;">
优惠券 优惠券
</view> </view>
<view style="color: #ff5722;" v-if="selectedCoupon"> <view style="color: #ff5722;" v-if="selectedCoupon">
@ -232,7 +224,16 @@
</view> </view>
<uni-icons type="right" size="14" color="#999" style="margin-left:10rpx;"></uni-icons> <uni-icons type="right" size="14" color="#999" style="margin-left:10rpx;"></uni-icons>
</view> </view>
<view style="display: flex;height: 80rpx;line-height: 100rpx;border-top: 1px solid #eee;font-size: 32rpx;font-weight: 700;margin-bottom: 20rpx;"> <view style="height: 80rpx;line-height: 80rpx;display: flex;padding: 0 4%;">
<view style="flex: 1;font-weight: 700;">
{{isKuaidi?'代取配送费':'跑腿费'}}
</view>
<view style="color: #000;font-weight:700;">
￥{{deliveryFeeCalc.toFixed(2)}}
</view>
</view>
<view style="display: flex;height: 80rpx;line-height: 100rpx;font-weight: 700;padding: 0 4%;">
<view style="flex: 1;">合计</view> <view style="flex: 1;">合计</view>
<view>￥{{totalAmountCalc.toFixed(2)}}</view> <view>￥{{totalAmountCalc.toFixed(2)}}</view>
</view> </view>
@ -951,12 +952,10 @@
.content { .content {
position: absolute; position: absolute;
top: 280rpx; top: 200rpx;
width: 100%; width: 100%;
overflow: scroll; overflow: scroll;
height: 100%; height: 100%;
padding: 0 4%;
box-sizing: border-box;
} }
.tab1 { .tab1 {
@ -983,7 +982,7 @@
.dizhi-tu { .dizhi-tu {
width: 50rpx; width: 50rpx;
height: 50rpx; height: 50rpx;
margin: 26rpx 20rpx 0 0; margin: 19rpx 20rpx 0 0;
img { img {
width: 100%; width: 100%;
@ -993,15 +992,15 @@
.dizhi1 { .dizhi1 {
flex: 1; flex: 1;
height: 100rpx; height: 80rpx;
line-height: 100rpx; line-height: 80rpx;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
} }
.dizhi-ming { .dizhi-ming {
font-size: 30rpx; font-size: 24rpx;
font-weight: 700; font-weight: 700;
flex: 1; flex: 1;
white-space: nowrap; white-space: nowrap;
@ -1014,11 +1013,8 @@
display: flex; display: flex;
line-height: 120rpx; line-height: 120rpx;
background: #fff; background: #fff;
border-radius: 20rpx;
padding: 0 20rpx; padding: 0 20rpx;
margin-top: 20rpx; border-top: 1px solid #eee;
box-shadow: 0 0 10rpx rgba(0,0,0,0.05);
box-sizing: border-box;
} }
.content-title { .content-title {
@ -1118,6 +1114,8 @@
margin-top: 20rpx; margin-top: 20rpx;
box-shadow: 0 0 10rpx rgba(0,0,0,0.05); box-shadow: 0 0 10rpx rgba(0,0,0,0.05);
box-sizing: border-box; box-sizing: border-box;
width: 95%;
margin: 10px auto;
} }
.time1 { .time1 {

Write Preview
Loading…
Cancel
Save