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

Merge branch 'master' of http://8.140.253.224:3000/root/school_uni

master
tianyi 4 weeks ago
parent
6d180f3e30 7961d0c4ed
commit
56d0b46a0b
4 changed files with 817 additions and 209 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. 788
      package1/buyFood/buyFood.vue
  2. 12
      package1/order/orderList.vue
  3. 2
      package1/runErrand/runErrand.vue
  4. 184
      pages/index/index.vue

788
package1/buyFood/buyFood.vue
View File

File diff suppressed because it is too large

12
package1/order/orderList.vue
View File

@ -13,14 +13,8 @@
</view>
</view>
<view class="order-hero">
<view>
<view style="margin-bottom: 10rpx;;">
<view class="hero-eyebrow">ORDER CENTER</view>
<view class="hero-title">我的校园订单</view>
<view class="hero-sub">饭团、跑腿、售后进度都在这里一眼看清</view>
</view>
<view class="hero-badge">
<view class="hero-num">{{orderList.length}}</view>
<view class="hero-label">当前订单</view>
</view>
</view>
</view>
@ -97,7 +91,7 @@
已售后</view>
</view>
</view>
<view class="content" :style="{top:tab1Checked =='quanbu'?'430rpx':'535rpx'}">
<view class="content" :style="{top:tab1Checked =='quanbu'?'415rpx':'500rpx'}">
<view class="empty-order" v-if="orderList.length <= 0 && loadStatus != 'loading'">
<view class="empty-icon">单</view>
<view class="empty-title">暂时没有相关订单</view>
@ -715,7 +709,7 @@
.nav-tab {
flex-shrink: 0;
position: absolute;
top: 285rpx;
top: 250rpx;
left: 2.5%;
background: rgba(255, 255, 255, 0.92);
width: 95%;

2
package1/runErrand/runErrand.vue
View File

@ -152,7 +152,7 @@
<view @tap="addFormData.num++" style="width: 30%;font-size: 44rpx;font-weight: 700;text-align: center;">+</view>
</view>
</view>
<view class="content-box">
<view class="content-box" v-if="isKuaidi">
<view class="content-title">
取件凭证<text v-if="isKuaidi" style="color:red;">*</text>
</view>

184
pages/index/index.vue
View File

@ -417,12 +417,29 @@
<view class="beizhu" v-if="item.remark != null && item.remark != ''">
备注：{{item.remark}}
</view>
<view class="qiangdan-btn" @tap="getOrder(item,index)">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/1b8b815302a34902ac79a76a469e4ee6.png"
alt="">
<view class="dispatch-action-box" :class="{'dispatch-action-box--single': checked != 'zhipai'}">
<view class="qiangdan-btn" :id="'swipe-order-' + item.id"
@tap.stop="noop"
@touchstart.stop="startSwipeOrder($event,item,index)"
@touchmove.stop.prevent="moveSwipeOrder"
@touchend.stop="endSwipeOrder(item,index)"
@touchcancel.stop="resetSwipeOrder">
<view class="qiangdan-progress"
:style="{'width': getSwipeProgress(item,index) + '%'}"></view>
<view class="qiangdan-text">
<text v-if="!isSwipeOrderActive(item,index)">向右滑动抢单</text>
<text v-else-if="getSwipeProgress(item,index) < 92">继续滑动确认</text>
<text v-else>松手接单</text>
</view>
<view class="qiangdan-thumb"
:style="{'left': getSwipeProgress(item,index) + '%','transform':'translateX(-' + getSwipeProgress(item,index) + '%)'}">
<text>接</text>
</view>
</view>
<view class="reject-order-btn" v-if="checked == 'zhipai'"
@tap.stop="rejectOrder(item,index)">
<text>拒绝接单</text>
</view>
<view class="yongjin" v-if="checked == 'zhipai'">
<text @tap="rejectOrder(item,index)">拒绝接单</text>
</view>
</view>
</view>
@ -675,7 +692,16 @@
isputArea: false,
checkYongjin: false,
getshopArea: [],
putshopArea: []
putshopArea: [],
swipeOrder: {
id: '',
index: -1,
startX: 0,
startProgress: 0,
progress: 0,
trackWidth: 0,
confirmed: false
}
}
},
components: {
@ -841,6 +867,65 @@
this.productData = item;
this.$refs.productPopup.open()
},
getSwipeProgress(item, index) {
if (this.swipeOrder.id === item.id && this.swipeOrder.index === index) {
return this.swipeOrder.progress
}
return 0
},
isSwipeOrderActive(item, index) {
return this.swipeOrder.id === item.id && this.swipeOrder.index === index && this.swipeOrder.progress > 0
},
startSwipeOrder(event, item, index) {
const touch = event.touches && event.touches[0]
if (!touch) return
this.swipeOrder = {
id: item.id,
index,
startX: touch.clientX,
startProgress: 0,
progress: 0,
trackWidth: 0,
confirmed: false
}
this.$nextTick(() => {
uni.createSelectorQuery().in(this).select('#swipe-order-' + item.id).boundingClientRect((rect) => {
if (rect && this.swipeOrder.id === item.id && this.swipeOrder.index === index) {
this.swipeOrder.trackWidth = rect.width
}
}).exec()
})
},
moveSwipeOrder(event) {
const touch = event.touches && event.touches[0]
if (!touch || this.swipeOrder.id === '') return
const trackWidth = this.swipeOrder.trackWidth || uni.getSystemInfoSync().windowWidth * 0.86
const deltaX = Math.max(0, touch.clientX - this.swipeOrder.startX)
const progress = Math.min(100, Math.round(deltaX / (trackWidth * 0.72) * 100))
this.swipeOrder.progress = progress
},
endSwipeOrder(item, index) {
if (this.swipeOrder.id !== item.id || this.swipeOrder.index !== index) return
if (this.swipeOrder.progress >= 92 && !this.swipeOrder.confirmed) {
this.swipeOrder.confirmed = true
this.swipeOrder.progress = 100
this.getOrder(item, index)
return
}
this.resetSwipeOrder()
},
resetSwipeOrder() {
this.swipeOrder = {
id: '',
index: -1,
startX: 0,
startProgress: 0,
progress: 0,
trackWidth: 0,
confirmed: false
}
},
noop() {},
getOrder(item, index) {
let that = this
@ -857,6 +942,7 @@
that.tui.request("/mall/delivery/accept", "POST", data, false, true).then((res) => {
that.loadStatus = 'nomore';
if (res.code == 200) {
that.resetSwipeOrder();
if (!uni.getStorageSync('worker') && res.result != null) {
uni.setStorageSync('worker', res.result)
}
@ -878,6 +964,7 @@
}, 2000)
that.$forceUpdate();
} else {
that.resetSwipeOrder();
that.tui.toast(res.message);
return;
}
@ -1915,7 +2002,6 @@
.list-1 {
width: 98%;
max-height: 640rpx;
background: linear-gradient(180deg, rgba(255, 255, 255, 0.98) 0%, rgba(253, 255, 250, 0.96) 100%);
border: 1px solid rgba(255, 255, 255, 0.86);
border-radius: 34rpx;
@ -2118,19 +2204,89 @@
}
.qiangdan-btn {
width: 95%;
width: 100%;
height: 100rpx;
margin: 20rpx auto;
transition: transform 0.18s ease;
border-radius: 999rpx;
background: linear-gradient(135deg, rgba(246, 255, 252, 0.98) 0%, rgba(235, 255, 249, 0.96) 100%);
border: 1px solid rgba(166, 255, 234, 0.72);
box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.72), 0 12rpx 26rpx rgba(0, 35, 28, 0.06);
position: relative;
overflow: hidden;
}
&:active {
transform: scale(0.97);
.qiangdan-progress {
height: 100%;
border-radius: 999rpx;
background: linear-gradient(90deg, rgba(166, 255, 234, 0.42) 0%, rgba(108, 226, 202, 0.78) 100%);
transition: width 0.16s ease-out;
}
img {
.qiangdan-text {
width: 100%;
height: 100%;
background-size: 100%;
position: absolute;
top: 0;
left: 0;
display: flex;
align-items: center;
justify-content: center;
color: #2a665b;
font-size: 28rpx;
font-weight: 900;
letter-spacing: 2rpx;
}
.qiangdan-thumb {
width: 82rpx;
height: 82rpx;
border-radius: 50%;
position: absolute;
left: 0;
top: 9rpx;
display: flex;
align-items: center;
justify-content: center;
background: rgba(255, 255, 255, 0.96);
border: 1px solid rgba(166, 255, 234, 0.9);
box-shadow: 0 10rpx 22rpx rgba(0, 35, 28, 0.12);
color: #1b7a69;
font-size: 28rpx;
font-weight: 900;
transition: left 0.16s ease-out, transform 0.16s ease-out;
}
.dispatch-action-box {
width: 95%;
margin: 20rpx auto 24rpx;
display: flex;
flex-direction: column;
align-items: center;
}
.dispatch-action-box--single {
margin-bottom: 20rpx;
}
.reject-order-btn {
min-width: 220rpx;
height: 58rpx;
margin-top: 14rpx;
padding: 0 34rpx;
border-radius: 999rpx;
border: 1px solid rgba(255, 108, 96, 0.5);
background: linear-gradient(180deg, rgba(255, 255, 255, 0.96) 0%, rgba(255, 244, 241, 0.96) 100%);
box-shadow: 0 8rpx 18rpx rgba(255, 108, 96, 0.12);
box-sizing: border-box;
color: #e45c50;
font-size: 24rpx;
font-weight: 800;
line-height: 58rpx;
text-align: center;
transition: transform 0.18s ease, box-shadow 0.18s ease;
&:active {
transform: scale(0.96);
box-shadow: 0 4rpx 10rpx rgba(255, 108, 96, 0.1);
}
}

Write Preview
Loading…
Cancel
Save