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

Compare commits

base: root:2dd765350621e371ee8887eef3fb907fe6b6308c
Branches Tags
root:master
...
compare: root:87bfaf94cf492f86e89c0bb0b30eba93ce3bd6ba
Branches Tags
root:master

5 Commits
2dd7653506 ... 87bfaf94cf

Author SHA1 Message Date
tianyi 87bfaf94cf 1
4 weeks ago
tianyi 98f0548397 1
4 weeks ago
tianyi 21c6b10952 1
4 weeks ago
tianyi ba9de1a8e7 1
4 weeks ago
tianyi 76eb5852c3 1
4 weeks ago
11 changed files with 220 additions and 147 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. 11
      components/tab-bar/delivery.vue
  2. 4
      components/tab-bar/myCenter.vue
  3. 1
      components/tab-bar/postList.vue
  4. 6
      package1/order/orderList.vue
  5. 3
      package2/IdleTrad/chat.vue
  6. 10
      package2/group/groupBuyDetail.vue
  7. 1
      package2/group/groupBuyList.vue
  8. 162
      package2/group/groupBuySingle.vue
  9. 2
      package2/partTimeJob/workerOrderList.vue
  10. 6
      pages.json
  11. 23
      pages/index/index.vue

11
components/tab-bar/delivery.vue
View File

@ -462,7 +462,6 @@
if (worker == '' || worker == undefined || worker == null) { if (worker == '' || worker == undefined || worker == null) {
this.tui.toast('您还没有注册兼职') this.tui.toast('您还没有注册兼职')
} }
console.log("配送初始化")
this.menuButtonInfo = uni.getMenuButtonBoundingClientRect() this.menuButtonInfo = uni.getMenuButtonBoundingClientRect()
this.isOnLine = uni.getStorageSync('worker').isOnLine this.isOnLine = uni.getStorageSync('worker').isOnLine
if (uni.getStorageSync('area')) { if (uni.getStorageSync('area')) {
@ -482,7 +481,6 @@
type: 'gcj02', type: 'gcj02',
isHighAccuracy: true, isHighAccuracy: true,
success: (res) => { success: (res) => {
console.log('位置', res)
that.latitude = res.latitude; that.latitude = res.latitude;
that.longitude = res.longitude; that.longitude = res.longitude;
@ -492,14 +490,10 @@
}, false, false, true).then((res) => { }, false, false, true).then((res) => {
}).catch((res) => {}); }).catch((res) => {});
},
fail: (err) => {
console.log('获取位置失败', err);
} }
}); });
}, },
onReachPage() { onReachPage() {
console.log("11111")
if (this.searchForm.pageNum >= this.totalPages) return; if (this.searchForm.pageNum >= this.totalPages) return;
this.searchForm.pageNum++; this.searchForm.pageNum++;
this.getDelivery(); this.getDelivery();
@ -538,7 +532,6 @@
}, },
getDelivery() { getDelivery() {
let that = this let that = this
console.log('1111', uni.getStorageSync('worker'))
this.tui.request("/mall/delivery/pagebyworker", "POST", this.searchForm, false, false).then((res) => { this.tui.request("/mall/delivery/pagebyworker", "POST", this.searchForm, false, false).then((res) => {
that.loadStatus = 'nomore'; that.loadStatus = 'nomore';
if (res.code == 200) { if (res.code == 200) {
@ -824,7 +817,6 @@
this.$forceUpdate() this.$forceUpdate()
}, },
ceshi(e) { ceshi(e) {
console.log("11111111", e)
if (e.detail.code) { if (e.detail.code) {
// 将 code 发送给后端 // 将 code 发送给后端
this.tui.request("/social/wechat/getPhone", "POST", { this.tui.request("/social/wechat/getPhone", "POST", {
@ -837,9 +829,6 @@
} }
}) })
} else {
// 用户拒绝授权
console.log('用户取消授权');
} }
} }
} }

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

@ -4,7 +4,7 @@
<view style="margin-top: 80px;" @click="navigatorTo('merchantCenter')">商家中心-{{shopCounts}}</view> <view style="margin-top: 80px;" @click="navigatorTo('merchantCenter')">商家中心-{{shopCounts}}</view>
<view style="margin-top: 80px;" @click="navigatorTo('jianzhizhuce')">兼职注册</view> <view style="margin-top: 80px;" @click="navigatorTo('jianzhizhuce')">兼职注册</view>
<view style="margin-top: 80px;" v-if="worker" @click="navigatorTo('jianzhizhuye')">兼职主页-{{workerCounts}}</view> <view style="margin-top: 80px;" v-if="worker" @click="navigatorTo('jianzhizhuye')">兼职主页-{{workerCounts}}</view>
<view style="margin-top: 80px;" @click="navigatorTo('qianbao')">钱包余额-{{balance}}</view> <view style="margin-top: 80px;" @click="navigatorTo('qianbao')">钱包余额 ￥{{balance}}</view>
<view style="margin-top: 80px;" @click="navigatorTo('dingdan')">我的订单</view> <view style="margin-top: 80px;" @click="navigatorTo('dingdan')">我的订单</view>
<!-- 未注册兼职弹窗 --> <!-- 未注册兼职弹窗 -->
<uni-popup ref="jianzhiPopup" background-color="rgba(2, 171, 255, 1)" borderRadius="40px 40px 40px 40px"> <uni-popup ref="jianzhiPopup" background-color="rgba(2, 171, 255, 1)" borderRadius="40px 40px 40px 40px">
@ -50,7 +50,6 @@
init(){ init(){
this.schoolShop = uni.getStorageSync('schoolShop') this.schoolShop = uni.getStorageSync('schoolShop')
console.log("我的初始化",this.schoolShop)
this.worker = uni.getStorageSync('worker') this.worker = uni.getStorageSync('worker')
let shopId = uni.getStorageSync('shopId') let shopId = uni.getStorageSync('shopId')
let worker = uni.getStorageSync('worker') let worker = uni.getStorageSync('worker')
@ -151,7 +150,6 @@
}else if(e == 'partTimeReg'){ }else if(e == 'partTimeReg'){
let worker = uni.getStorageSync('worker') let worker = uni.getStorageSync('worker')
let that = this let that = this
console.log("111",worker)
//当前人不是配送员身份 //当前人不是配送员身份
if(worker == undefined || worker == '' || worker == null){ if(worker == undefined || worker == '' || worker == null){
that.tui.request("/worker/admin/add", "POST", {userId:uni.getStorageSync('id'),isChangeArea:1,region:JSON.parse(uni.getStorageSync('area')).id}, false, true).then((res) => { that.tui.request("/worker/admin/add", "POST", {userId:uni.getStorageSync('id'),isChangeArea:1,region:JSON.parse(uni.getStorageSync('area')).id}, false, true).then((res) => {

1
components/tab-bar/postList.vue
View File

@ -221,7 +221,6 @@
}, },
methods: { methods: {
init() { init() {
console.log("配送初始化")
this.menuButtonInfo = uni.getMenuButtonBoundingClientRect() this.menuButtonInfo = uni.getMenuButtonBoundingClientRect()
this.$forceUpdate() this.$forceUpdate()
}, },

6
package1/order/orderList.vue
View File

@ -50,7 +50,7 @@
</view> </view>
<view class="tabs1" @tap="checkTab1('ershou')" <view class="tabs1" @tap="checkTab1('ershou')"
:style="{'color':tab1Checked == 'ershou'?'#000':'#777','font-size':tab1Checked== 'ershou'?'36rpx':'30rpx'}"> :style="{'color':tab1Checked == 'ershou'?'#000':'#777','font-size':tab1Checked== 'ershou'?'36rpx':'30rpx'}">
咸鱼 鱼塘
<img v-if="tab1Checked == 'ershou'" <img v-if="tab1Checked == 'ershou'"
src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4bb5fc7725cb4a7a84d1d3a15f05b39c.png" alt="" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4bb5fc7725cb4a7a84d1d3a15f05b39c.png" alt=""
style="width: 80rpx;height: 14rpx;position: absolute;bottom: 8rpx;left: 32rpx;" /> style="width: 80rpx;height: 14rpx;position: absolute;bottom: 8rpx;left: 32rpx;" />
@ -143,9 +143,9 @@
</view> </view>
<view style="width: 100%;line-height: 70rpx;font-size: 28rpx;font-weight: 700;display: flex;"> <view style="width: 100%;line-height: 70rpx;font-size: 28rpx;font-weight: 700;display: flex;">
<view style="height: 40rpx;line-height: 40rpx;background: linear-gradient(90deg, rgba(255, 77, 0, 1), rgba(255, 184, 84, 1));padding: 0 16rpx;border-radius: 40rpx;color: #fff;margin: 14rpx 20rpx 0 0;"> <view style="height: 40rpx;line-height: 40rpx;background: linear-gradient(90deg, rgba(255, 77, 0, 1), rgba(255, 184, 84, 1));padding: 0 16rpx;border-radius: 40rpx;color: #fff;margin: 14rpx 20rpx 0 0;">
{{item.otherOrder == 1 ? '快递/跑腿' : item.otherOrder == 2 ? '团购' : item.otherOrder == 3 ? '咸鱼' :"饭团"}} {{item.otherOrder == 1 ? '快递/跑腿' : item.otherOrder == 2 ? '团购' : item.otherOrder == 3 ? '鱼塘' :"饭团"}}
</view> </view>
{{item.otherOrder == 1 ? '快递/跑腿' : item.otherOrder == 2 ? '团购订单' : item.otherOrder == 3 ? '咸鱼订单' : item.shopName}} {{item.otherOrder == 1 ? '快递/跑腿' : item.otherOrder == 2 ? '团购订单' : item.otherOrder == 3 ? '鱼塘订单' : item.shopName}}
</view> </view>
<view v-if="item.otherOrder == 1" style="display: flex;padding: 20rpx;background: rgba(247, 248, 248, 0.6);border-radius: 20rpx;"> <view v-if="item.otherOrder == 1" style="display: flex;padding: 20rpx;background: rgba(247, 248, 248, 0.6);border-radius: 20rpx;">
<view class="goods-img"> <view class="goods-img">

3
package2/IdleTrad/chat.vue
View File

@ -193,9 +193,12 @@
}, },
methods: { methods: {
isOpen(type) { isOpen(type) {
if (type == 'photo') { if (type == 'photo') {
this.isIcon = false
this.isPhoto = !this.isPhoto this.isPhoto = !this.isPhoto
} else if (type == 'icon') { } else if (type == 'icon') {
this.isPhoto = false
this.isIcon = !this.isIcon this.isIcon = !this.isIcon
} else { } else {
this.isInput = !this.isInput this.isInput = !this.isInput

10
package2/group/groupBuyDetail.vue
View File

@ -28,16 +28,18 @@
</view> </view>
</view> </view>
<view class="right"> <view class="right">
<img @tap="makeCall(shopItem.contactPhone)" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png" alt="" style="width: 80rpx;height: 80rpx;position: absolute;top: 64rpx;right: 60rpx;"/> <img @tap="makeCall(shopItem.contactPhone)" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png" alt="" style="width: 60rpx;height: 60rpx;position: absolute;top: 64rpx;right: 60rpx;"/>
</view> </view>
</view> </view>
<view class="box1"> <view class="box1">
<view style="display: flex;"> <view style="display: flex;">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/86004fa6b60e477ea1622fc0bf4c99de.png" alt="" style="width: 48rpx;height: 48rpx;" /> <img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/86004fa6b60e477ea1622fc0bf4c99de.png" alt="" style="width: 48rpx;height: 48rpx;" />
<text style="height: 48rpx;line-height: 48rpx;font-size: 28rpx;font-weight: 700;margin-left: 10rpx;">商家资质</text> <text style="height: 48rpx;line-height: 48rpx;font-size: 28rpx;font-weight: 700;margin-left: 10rpx;">
商家资质
</text>
</view> </view>
<view style="display: flex;margin-top: 20rpx;"> <view style="display: flex;margin-top: 20rpx;">
<img @tap="largeImg" :src="item" v-for="(item,index) in shopImages" :key="index" alt="" style="width: 156rpx;height: 48rpx;margin-right: 40rpx;" /> <img @tap="largeImg(item)" :src="item" v-for="(item,index) in shopImages" :key="index" alt="" style="width: 156rpx;height: 48rpx;margin-right: 40rpx;" />
</view> </view>
</view> </view>
<view class="box1"> <view class="box1">
@ -83,7 +85,7 @@
methods: { methods: {
//查看大图 //查看大图
largeImg(img) { largeImg(img) {
this.bigImg = 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/00b1f011787c4549bbea650d95a4eb39.png' this.bigImg = img
this.$refs.imgPopup.open() this.$refs.imgPopup.open()
}, },
//拨打电话 //拨打电话

1
package2/group/groupBuyList.vue
View File

@ -557,6 +557,7 @@
return currentMinutes >= startMinutes && currentMinutes <= endMinutes; return currentMinutes >= startMinutes && currentMinutes <= endMinutes;
}, },
goDetail(type, item) { goDetail(type, item) {
console.log('数据',item)
if (type == 'shop') { if (type == 'shop') {
uni.navigateTo({ uni.navigateTo({
url: '/package2/group/groupBuySingle?type=shop&item=' + JSON.stringify(item) url: '/package2/group/groupBuySingle?type=shop&item=' + JSON.stringify(item)

162
package2/group/groupBuySingle.vue
View File

@ -72,8 +72,7 @@
</view> </view>
<view class="pintuan group-live-card" :class="{'group-live-card-empty': orderListWait.length === 0}" <view class="pintuan group-live-card" :class="{'group-live-card-empty': orderListWait.length === 0}"
style="padding: 0;margin-top:20rpx;display: flex;" style="padding: 0;margin-top:20rpx;display: flex;" @tap="openOrderWait('')">
@tap="openOrderWait('')">
<view class="live-card-header"> <view class="live-card-header">
<view class="live-title-wrap"> <view class="live-title-wrap">
<image class="live-title-gif" src="/static/images/img/loading.gif" mode="aspectFit"></image> <image class="live-title-gif" src="/static/images/img/loading.gif" mode="aspectFit"></image>
@ -81,8 +80,9 @@
</view> </view>
<view class="live-pill" v-if="orderListWait.length > 0">去凑团</view> <view class="live-pill" v-if="orderListWait.length > 0">去凑团</view>
</view> </view>
<swiper v-if="orderListWait.length > 0" class="zaixian-swiper" vertical circular :autoplay="orderListWait.length > 0" <swiper v-if="orderListWait.length > 0" class="zaixian-swiper" vertical circular
:interval="onlineWorkerInterval" :duration="onlineWorkerDuration"> :autoplay="orderListWait.length > 0" :interval="onlineWorkerInterval"
:duration="onlineWorkerDuration">
<swiper-item v-for="(item,index) in orderListWait" :key="index"> <swiper-item v-for="(item,index) in orderListWait" :key="index">
<view class="live-swiper-item"> <view class="live-swiper-item">
<view class="pintuan-left"> <view class="pintuan-left">
@ -100,8 +100,7 @@
</view> </view>
<view class="pintuan-right"> <view class="pintuan-right">
<view class="pintuan-right-img"> <view class="pintuan-right-img">
<img src="/static/images/img/songshu.png" <img src="/static/images/img/songshu.png" alt="" />
alt="" />
<view class="weipincheng">+</view> <view class="weipincheng">+</view>
</view> </view>
<view class="pintuan-right-cha"> <view class="pintuan-right-cha">
@ -152,7 +151,9 @@
<view class="goods-deal1"> <view class="goods-deal1">
销量 <text> {{item.tailWarn != null ? item.tailWarn : 0}}</text> 销量 <text> {{item.tailWarn != null ? item.tailWarn : 0}}</text>
</view> </view>
<view style="width: 40%;text-align: right;font-size: 14px;color: #777;font-weight: 700;text-decoration: line-through;" v-if="groupId && item.isMoreBuy != 0"> <view
style="width: 40%;text-align: right;font-size: 14px;color: #777;font-weight: 700;text-decoration: line-through;"
v-if="groupId && item.isMoreBuy != 0">
¥{{item.attributeListPrice | sliceMsg}} ¥{{item.attributeListPrice | sliceMsg}}
</view> </view>
</view> </view>
@ -160,8 +161,7 @@
<view class="goods-tag" @tap.stop="openOrderWait(item)" <view class="goods-tag" @tap.stop="openOrderWait(item)"
v-if="item.orderListWait != undefined && item.orderListWait.length > 0"> v-if="item.orderListWait != undefined && item.orderListWait.length > 0">
<view class="pintuan-right-img"> <view class="pintuan-right-img">
<img src="/static/images/img/songshu.png" <img src="/static/images/img/songshu.png" alt="" />
alt="" />
<view class="weipincheng">+</view> <view class="weipincheng">+</view>
</view> </view>
<view class="pintuan-right-cha"> <view class="pintuan-right-cha">
@ -303,7 +303,8 @@
<uni-icons type="close" size="30" color="#fff"></uni-icons> <uni-icons type="close" size="30" color="#fff"></uni-icons>
</view> </view>
<view class="popup-rally-title" v-if="isPintuan"> <view class="popup-rally-title" v-if="isPintuan">
<view class="popup-rally-main">{{isStoreGroupOrder ? '到店团购搭子哪里找-同校同学一起省！' : '拼团搭子哪里找-隔壁宿舍全是宝！'}}</view> <view class="popup-rally-main">{{isStoreGroupOrder ? '到店团购搭子哪里找-同校同学一起省！' : '拼团搭子哪里找-隔壁宿舍全是宝！'}}
</view>
</view> </view>
<view class="goods-top popup-product-card"> <view class="goods-top popup-product-card">
<view class="goods-img"> <view class="goods-img">
@ -424,12 +425,11 @@
<view class="bottom popup-bottom-bar" style="padding-bottom: 40rpx;height: 160rpx;z-index: 10;"> <view class="bottom popup-bottom-bar" style="padding-bottom: 40rpx;height: 160rpx;z-index: 10;">
<view v-if="isPintuan" class="pintuan1"> <view v-if="isPintuan" class="pintuan1">
<template v-if="!groupId"> <template v-if="!groupId">
<view class="pintuan2 group-face-btn" <view class="pintuan2 group-face-btn" @tap.stop="submitPintuan(true)">
@tap.stop="submitPintuan(true)"> <uni-icons type="help" size="16" style="padding-right: 20rpx;margin-top: 4rpx;"
<uni-icons type="help" size="16" style="padding-right: 20rpx;margin-top: 4rpx;" @tap.stop="openMianRemark"></uni-icons>面对面团 @tap.stop="openMianRemark"></uni-icons>面对面团
</view> </view>
<view class="pintuan2 group-submit-btn" <view class="pintuan2 group-submit-btn" @tap.stop="submitPintuan(false)">
@tap.stop="submitPintuan(false)">
{{isStoreGroupOrder ? '发起到店团' : '发起拼团'}}￥{{selectedGroupRule && selectedGroupRule.groupPrice ? parseFloat(selectedGroupRule.groupPriceAndMore).toFixed(2) : '0.00'}} {{isStoreGroupOrder ? '发起到店团' : '发起拼团'}}￥{{selectedGroupRule && selectedGroupRule.groupPrice ? parseFloat(selectedGroupRule.groupPriceAndMore).toFixed(2) : '0.00'}}
</view> </view>
</template> </template>
@ -464,8 +464,7 @@
:key="index"> :key="index">
<view class="list-right"> <view class="list-right">
<view class="list-right-img"> <view class="list-right-img">
<img src="/static/images/img/songshu.png" <img src="/static/images/img/songshu.png" alt="" />
alt="" />
<view class="list-weipincheng">+</view> <view class="list-weipincheng">+</view>
</view> </view>
<view class="list-right-cha"> <view class="list-right-cha">
@ -505,10 +504,12 @@
</view> </view>
<view style="height: 40rpx;text-align: center;color: #777;"> <view style="height: 40rpx;text-align: center;color: #777;">
<text v-if="groupId != '' && isFaceToFaceGroup && groupdeliveryType == 1">配送费(均摊) {{tuanzhangOrder.deliveryFee}} 元 <text v-if="groupId != '' && isFaceToFaceGroup && groupdeliveryType == 1">配送费(均摊)
{{tuanzhangOrder.deliveryFee}} 元
</text> </text>
<text v-if="groupdeliveryType == 1 && currentItem.lunchBox > 0"> 打包费 {{currentItem.lunchBox}} 元</text> <text v-if="groupdeliveryType == 1 && currentItem.lunchBox > 0"> 打包费
{{currentItem.lunchBox}} 元</text>
</view> </view>
<view style="height: 40rpx;text-align: center;color: #ff5722;" v-if="selectedCoupon"> <view style="height: 40rpx;text-align: center;color: #ff5722;" v-if="selectedCoupon">
优惠券抵扣 -￥{{selectedCoupon.discountAmount.toFixed(2)}} 优惠券抵扣 -￥{{selectedCoupon.discountAmount.toFixed(2)}}
@ -517,7 +518,8 @@
若拼团失败，将会为您自动退款 若拼团失败，将会为您自动退款
</view> </view>
</view> </view>
<view class="box1" style="display: flex;padding: 40rpx;" v-if="groupdeliveryType == 2 && !isStoreGroupOrder"> <view class="box1" style="display: flex;padding: 40rpx;"
v-if="groupdeliveryType == 2 && !isStoreGroupOrder">
<view style="flex: 1;"> <view style="flex: 1;">
<view style="height: 42rpx;line-height: 42rpx;display: flex;"> <view style="height: 42rpx;line-height: 42rpx;display: flex;">
<!-- <img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4c8e0cc311db4d38ab43e019673c4b8c.png" <!-- <img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4c8e0cc311db4d38ab43e019673c4b8c.png"
@ -608,8 +610,7 @@
</view> </view>
<view class="kaituan2" style="display: flex;justify-content: center;margin-top: 60rpx;"> <view class="kaituan2" style="display: flex;justify-content: center;margin-top: 60rpx;">
<view class="kaituan22"> <view class="kaituan22">
<img src="/static/images/img/songshu.png" <img src="/static/images/img/songshu.png" alt=""
alt=""
style="width: 90rpx;height: 90rpx;border-radius: 90rpx;margin: 0 auto;display: block;" /> style="width: 90rpx;height: 90rpx;border-radius: 90rpx;margin: 0 auto;display: block;" />
</view> </view>
</view> </view>
@ -636,7 +637,8 @@
<view <view
style="flex: 1; display: flex; flex-direction: column; justify-content: center; margin-left: 20rpx;"> style="flex: 1; display: flex; flex-direction: column; justify-content: center; margin-left: 20rpx;">
<view style="font-size: 28rpx; font-weight: bold; color: #333; margin-bottom: 6rpx;"> <view style="font-size: 28rpx; font-weight: bold; color: #333; margin-bottom: 6rpx;">
{{item.couponName}}</view> {{item.couponName}}
</view>
<view style="font-size: 22rpx; color: #999;" v-if="item.minAmount > 0"> <view style="font-size: 22rpx; color: #999;" v-if="item.minAmount > 0">
满{{item.minAmount}}可用</view> 满{{item.minAmount}}可用</view>
<view style="font-size: 22rpx; color: #999;" v-else>无门槛使用</view> <view style="font-size: 22rpx; color: #999;" v-else>无门槛使用</view>
@ -881,8 +883,7 @@
this.getCategory(this.shopItem.id); this.getCategory(this.shopItem.id);
this.getProduct(''); this.getProduct('');
}, },
onReady() { onReady() {},
},
onPageScroll(e) { onPageScroll(e) {
this.lastScrollTop = e.scrollTop; this.lastScrollTop = e.scrollTop;
// 节流：80ms 内不重复检测，避免频繁的 selectorQuery // 节流：80ms 内不重复检测，避免频繁的 selectorQuery
@ -1803,7 +1804,9 @@
if (pages.length > 1) { if (pages.length > 1) {
uni.navigateBack(); uni.navigateBack();
} else { } else {
uni.switchTab({ url: '/pages/index/index' }); uni.switchTab({
url: '/pages/index/index'
});
} }
} }
} }
@ -2089,6 +2092,7 @@
border-radius: 20rpx; border-radius: 20rpx;
overflow: hidden; overflow: hidden;
} }
.fee-value { .fee-value {
color: #00231C; color: #00231C;
font-weight: 800; font-weight: 800;
@ -2562,6 +2566,7 @@
top: 110rpx; top: 110rpx;
left: 80rpx; left: 80rpx;
} }
.tishi-popup { .tishi-popup {
background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/629843c61a014d69bf3a1195f51a898b.png') no-repeat; background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/629843c61a014d69bf3a1195f51a898b.png') no-repeat;
width: 300px; width: 300px;
@ -2601,6 +2606,7 @@
color: #ff7043; color: #ff7043;
font-weight: 900; font-weight: 900;
} }
.spark-b { .spark-b {
width: 24rpx; width: 24rpx;
height: 24rpx; height: 24rpx;
@ -3093,9 +3099,12 @@
} }
@keyframes checkoutTextShine { @keyframes checkoutTextShine {
0%, 40% {
0%,
40% {
transform: translateX(0) rotate(18deg); transform: translateX(0) rotate(18deg);
} }
100% { 100% {
transform: translateX(480rpx) rotate(18deg); transform: translateX(480rpx) rotate(18deg);
} }
@ -3594,8 +3603,13 @@
} }
@keyframes freeMaskFade { @keyframes freeMaskFade {
0% { opacity: 0; } 0% {
100% { opacity: 1; } opacity: 0;
}
100% {
opacity: 1;
}
} }
@keyframes freeCardPop { @keyframes freeCardPop {
@ -3615,43 +3629,101 @@
} }
@keyframes freeRaysSpin { @keyframes freeRaysSpin {
0% { transform: rotate(0deg) scale(1); } 0% {
100% { transform: rotate(360deg) scale(1.06); } transform: rotate(0deg) scale(1);
}
100% {
transform: rotate(360deg) scale(1.06);
}
} }
@keyframes freeTitlePop { @keyframes freeTitlePop {
0%, 100% { transform: scale(1); }
50% { transform: scale(1.025); } 0%,
100% {
transform: scale(1);
}
50% {
transform: scale(1.025);
}
} }
@keyframes freeAmountBeat { @keyframes freeAmountBeat {
0%, 100% { transform: scale(1); }
50% { transform: scale(1.045); } 0%,
100% {
transform: scale(1);
}
50% {
transform: scale(1.045);
}
} }
@keyframes freeAmountAura { @keyframes freeAmountAura {
0% { background-position: 0% 50%; } 0% {
100% { background-position: 260% 50%; } background-position: 0% 50%;
}
100% {
background-position: 260% 50%;
}
} }
@keyframes rewardBtnFloat { @keyframes rewardBtnFloat {
0%, 100% { transform: translateY(0) scale(1); }
50% { transform: translateY(-8rpx) scale(1.025); } 0%,
100% {
transform: translateY(0) scale(1);
}
50% {
transform: translateY(-8rpx) scale(1.025);
}
} }
@keyframes orbFloat { @keyframes orbFloat {
0%, 100% { transform: translateY(0) scale(1); opacity: 0.72; }
50% { transform: translateY(-24rpx) scale(1.08); opacity: 1; } 0%,
100% {
transform: translateY(0) scale(1);
opacity: 0.72;
}
50% {
transform: translateY(-24rpx) scale(1.08);
opacity: 1;
}
} }
@keyframes confettiFloat { @keyframes confettiFloat {
0%, 100% { transform: translateY(0) rotate(0deg); opacity: 0.4; }
50% { transform: translateY(44rpx) rotate(150deg); opacity: 1; } 0%,
100% {
transform: translateY(0) rotate(0deg);
opacity: 0.4;
}
50% {
transform: translateY(44rpx) rotate(150deg);
opacity: 1;
}
} }
@keyframes starTwinkle { @keyframes starTwinkle {
0%, 100% { transform: scale(0.6); opacity: 0.35; }
50% { transform: scale(1.45); opacity: 1; } 0%,
100% {
transform: scale(0.6);
opacity: 0.35;
}
50% {
transform: scale(1.45);
opacity: 1;
}
} }
.store-group-page { .store-group-page {

2
package2/partTimeJob/workerOrderList.vue
View File

@ -161,7 +161,7 @@
}, },
delPlus(data){ delPlus(data){
if (data.endsWith("+")) { if (data.endsWith("+")) {
data = data.slice(0, -1); // 删除最后一个字符 data = data.slice(0, -1);
} }
return data; return data;
} }

6
pages.json
View File

@ -403,6 +403,12 @@
"navigationBarTitleText": "兼职主页", "navigationBarTitleText": "兼职主页",
"navigationStyle": "custom" "navigationStyle": "custom"
} }
},{
"path": "partTimeJob/workerOrderList",
"style": {
"navigationBarTitleText": "配送员订单列表",
"navigationStyle": "custom"
}
}] }]
}, { }, {
"root": "package3", "root": "package3",

23
pages/index/index.vue
View File

@ -5,16 +5,6 @@
<view style="position: relative;height: 545rpx;"> <view style="position: relative;height: 545rpx;">
<view style="width:100%;height: 260rpx;position: fixed;top: 0;background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/8bc15960c2dc40268e295d6dd23aecce.png') no-repeat;z-index: 90;" <view style="width:100%;height: 260rpx;position: fixed;top: 0;background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/8bc15960c2dc40268e295d6dd23aecce.png') no-repeat;z-index: 90;"
v-if="lastScrollTop>583"></view> v-if="lastScrollTop>583"></view>
<!-- <view style="position: absolute;top: 110rpx;left: 20rpx;z-index: 999;">
<view @click="checkArea" v-if="areaName == ''">
点击选择区域
<uni-icons type="right" size="12" style="margin-left: 10rpx;"></uni-icons>
</view>
<view @click="checkArea" v-else>
{{areaName}}
<uni-icons type="right" size="12" style="margin-left: 10rpx;"></uni-icons>
</view>
</view> -->
<view class="campus-hero campus-hero--ad"> <view class="campus-hero campus-hero--ad">
<swiper class="swiper hero-bg-swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay" <swiper class="swiper hero-bg-swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay"
:interval="interval" :duration="duration"> :interval="interval" :duration="duration">
@ -974,6 +964,7 @@
isSwipeOrderActive(item, index) { isSwipeOrderActive(item, index) {
return this.swipeOrder.id === item.id && this.swipeOrder.index === index && this.swipeOrder.progress > 0 return this.swipeOrder.id === item.id && this.swipeOrder.index === index && this.swipeOrder.progress > 0
}, },
//滑动开始
startSwipeOrder(event, item, index) { startSwipeOrder(event, item, index) {
const touch = event.touches && event.touches[0] const touch = event.touches && event.touches[0]
if (!touch) return if (!touch) return
@ -1004,6 +995,7 @@
const progress = Math.min(100, Math.round(deltaX / (trackWidth * 0.72) * 100)) const progress = Math.min(100, Math.round(deltaX / (trackWidth * 0.72) * 100))
this.setSwipeOrderProgress(progress) this.setSwipeOrderProgress(progress)
}, },
//滑动结束
endSwipeOrder(item, index) { endSwipeOrder(item, index) {
if (this.swipeOrder.id !== item.id || this.swipeOrder.index !== index) return if (this.swipeOrder.id !== item.id || this.swipeOrder.index !== index) return
if (this.swipeOrder.progress >= 92 && !this.swipeOrder.confirmed) { if (this.swipeOrder.progress >= 92 && !this.swipeOrder.confirmed) {
@ -1174,6 +1166,7 @@
uni.hideLoading(); uni.hideLoading();
}).catch((res) => {}); }).catch((res) => {});
}, },
//广告跳转
goAdPage(item) { goAdPage(item) {
uni.navigateTo({ uni.navigateTo({
url: item.linkUrl + item.linkParams url: item.linkUrl + item.linkParams
@ -1208,6 +1201,7 @@
url: '/package2/seckill/seckillGroup' url: '/package2/seckill/seckillGroup'
}) })
}, },
//跳转到子页面
goDetail(type) { goDetail(type) {
let url = '' let url = ''
switch (type) { switch (type) {
@ -1231,11 +1225,13 @@
url: url url: url
}) })
}, },
//跳转到订单详情
goOrderDetail(item) { goOrderDetail(item) {
uni.navigateTo({ uni.navigateTo({
url: '/package1/order/orderDetail?id=' + item.id url: '/package1/order/orderDetail?id=' + item.id
}); });
}, },
//选择区域
onClickArea(item) { onClickArea(item) {
uni.setStorageSync('area', JSON.stringify(item)) uni.setStorageSync('area', JSON.stringify(item))
this.areaName = item.title this.areaName = item.title
@ -1272,6 +1268,7 @@
} }
}) })
}, },
//获取筛选条件列表
getShopArea() { getShopArea() {
let that = this let that = this
that.tui.request("/app/shopArea/getByParentId/" + that.searchForm.regionId, "GET", {}, false, true).then(( that.tui.request("/app/shopArea/getByParentId/" + that.searchForm.regionId, "GET", {}, false, true).then((
@ -1287,6 +1284,7 @@
} }
}).catch((res) => {}) }).catch((res) => {})
}, },
//获取用户当前未完成订单
getUserOrders() { getUserOrders() {
let that = this let that = this
that.tui.request("/mall/order/getOrdersByUserId/" + uni.getStorageSync('id'), "GET", {}, false, true).then( that.tui.request("/mall/order/getOrdersByUserId/" + uni.getStorageSync('id'), "GET", {}, false, true).then(
@ -1302,6 +1300,7 @@
} }
}).catch((res) => {}) }).catch((res) => {})
}, },
//点击下拉框中某一条筛选条件
searchOrder(type, value) { searchOrder(type, value) {
if (type == 'getarea') { if (type == 'getarea') {
if (this.searchForm.getAreaId == value.id) { if (this.searchForm.getAreaId == value.id) {
@ -1358,6 +1357,7 @@
fail: (err) => {} fail: (err) => {}
}); });
}, },
//配送单列表切换
checkTab1(type) { checkTab1(type) {
this.checked = type this.checked = type
if (type == 'waimai') { if (type == 'waimai') {
@ -1395,6 +1395,7 @@
}); });
}).exec(); }).exec();
}, },
//拨打电话
makeCall(phone) { makeCall(phone) {
uni.makePhoneCall({ uni.makePhoneCall({
phoneNumber: phone phoneNumber: phone
@ -1406,9 +1407,11 @@
clearInterval(this.deliveryTimer); clearInterval(this.deliveryTimer);
} }
}, },
//筛选条件
checkAdd() { checkAdd() {
this.isgetArea = !this.isgetArea this.isgetArea = !this.isgetArea
}, },
//筛选条件
checkAdd1() { checkAdd1() {
this.isputArea = !this.isputArea this.isputArea = !this.isputArea
}, },

Write Preview
Loading…
Cancel
Save