wangfukang 4 weeks ago
parent
commit
86b3fbf290
  1. 11
      components/tab-bar/delivery.vue
  2. 4
      components/tab-bar/myCenter.vue
  3. 1
      components/tab-bar/postList.vue
  4. 1
      libs/weapp-qrcode.js
  5. 4
      package1/buyFood/buyFood.vue
  6. 2
      package1/index/deliveryPersonList.vue
  7. 7
      package1/order/orderDetail.vue
  8. 1
      package1/order/orderEvaluate.vue
  9. 7
      package1/order/orderList.vue
  10. 1
      package1/order/returnOrder.vue
  11. 3
      package2/IdleTrad/chat.vue
  12. 10
      package2/group/groupBuyDetail.vue
  13. 4
      package2/group/groupBuyList.vue
  14. 300
      package2/group/groupBuySingle.vue
  15. 1
      package2/group/searchGroup.vue
  16. 1
      package2/group/shopEvaluate.vue
  17. 5
      package2/myCenter/addGoods.vue
  18. 4
      package2/myCenter/goodsList.vue
  19. 6
      package2/partTimeJob/partTimeJobCenter.vue
  20. 435
      package2/partTimeJob/workerOrderList.vue
  21. 2
      package2/shop/merchantRegister.vue
  22. 3
      package2/shop/orderDetail.vue
  23. 1
      package2/shop/shopOrderList.vue
  24. 6
      pages.json
  25. 29
      pages/index/index.vue

11
components/tab-bar/delivery.vue

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

4
components/tab-bar/myCenter.vue

@ -4,7 +4,7 @@
<view style="margin-top: 80px;" @click="navigatorTo('merchantCenter')">商家中心-{{shopCounts}}</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;" @click="navigatorTo('qianbao')">钱包余额-{{balance}}</view>
<view style="margin-top: 80px;" @click="navigatorTo('qianbao')">钱包余额 {{balance}}</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">
@ -50,7 +50,6 @@
init(){
this.schoolShop = uni.getStorageSync('schoolShop')
console.log("我的初始化",this.schoolShop)
this.worker = uni.getStorageSync('worker')
let shopId = uni.getStorageSync('shopId')
let worker = uni.getStorageSync('worker')
@ -151,7 +150,6 @@
}else if(e == 'partTimeReg'){
let worker = uni.getStorageSync('worker')
let that = this
console.log("111",worker)
//
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) => {

1
components/tab-bar/postList.vue

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

1
libs/weapp-qrcode.js

@ -412,7 +412,6 @@ var QRCode;
destHeight: this._htOption.height,
canvasId: this.canvasId,
success: function (res) {
console.log(res.tempFilePath)
callback(res.tempFilePath)
}
})

4
package1/buyFood/buyFood.vue

@ -556,7 +556,7 @@
}
if (option.item) {
this.groupItem = JSON.parse(decodeURIComponent(option.item));
console.log("1111111",this.groupItem)
this.isGroupBuy = this.groupItem.orderType === 2;
this.isFaceToFace = this.groupItem.isFaceToFace || false;
this.orderScene = this.groupItem.orderScene || this.orderScene;
@ -688,7 +688,7 @@
let targetMembers = this.groupItem?.groupRule?.groupCount || 2;
let shopItemStr = encodeURIComponent(JSON.stringify(this.shopItem));
let isFTF = this.isFaceToFace ? 1 : 0;
console.log(shopItemStr)
let sceneQuery = this.isStoreGroupOrder ? '&orderScene=storeGroup' : '';
let path = `/package2/group/groupBuySingle?type=shop&item=${shopItemStr}&groupId=${groupId}&targetMembers=${targetMembers}&isFaceToFace=${isFTF}${sceneQuery}`;

2
package1/index/deliveryPersonList.vue

@ -165,7 +165,7 @@
},
methods: {
getLoca(item){
console.log('aaaaa',item)
this.markers = [{
id: 0,
latitude: item.geolocation[0],

7
package1/order/orderDetail.vue

@ -891,12 +891,10 @@
this.$refs.imgPopup.open()
this.$refs.uqrcode.toTempFilePath({
success: res => {
console.log(res)
that.newQRList = res.tempFilePath
},
fail: err => {
console.log(err)
}
fail: err => {}
});
},
pictureAdd(id, huan) {
@ -991,7 +989,6 @@
});
},
checkEvaluate() {
console.log(this.orderDetail)
if (this.orderDetail.comments != null && this.orderDetail.comments.length > 0) {
this.$refs.evaluatePopup.open()
} else {

1
package1/order/orderEvaluate.vue

@ -179,7 +179,6 @@
},
onLoad(option) {
this.shopData = JSON.parse(option.item)
console.log(this.shopData.deliveryType)
if(this.shopData.deliveryType == 1){
this.getOrderDetail()
}

7
package1/order/orderList.vue

@ -50,7 +50,7 @@
</view>
<view class="tabs1" @tap="checkTab1('ershou')"
:style="{'color':tab1Checked == 'ershou'?'#000':'#777','font-size':tab1Checked== 'ershou'?'36rpx':'30rpx'}">
<img v-if="tab1Checked == 'ershou'"
src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4bb5fc7725cb4a7a84d1d3a15f05b39c.png" alt=""
style="width: 80rpx;height: 14rpx;position: absolute;bottom: 8rpx;left: 32rpx;" />
@ -143,9 +143,9 @@
</view>
<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;">
{{item.otherOrder == 1 ? '快递/跑腿' : item.otherOrder == 2 ? '团购' : item.otherOrder == 3 ? '鱼' :"饭团"}}
{{item.otherOrder == 1 ? '快递/跑腿' : item.otherOrder == 2 ? '团购' : item.otherOrder == 3 ? '鱼' :"饭团"}}
</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 v-if="item.otherOrder == 1" style="display: flex;padding: 20rpx;background: rgba(247, 248, 248, 0.6);border-radius: 20rpx;">
<view class="goods-img">
@ -502,7 +502,6 @@
} else {
that.orderList = [...that.orderList, ...res.result.records]
}
console.log(that.orderList)
for(let i=0;i<that.orderList.length;i++){
that.orderList[i].num = 0
for(let m=0;m<that.orderList[i].goodsList.length;m++){

1
package1/order/returnOrder.vue

@ -510,7 +510,6 @@
this.$refs.returnPopup.open('bottom');
},
changeValue(type, index) {
console.log(this.orderDetail.goodsList[index])
if (!this.orderDetail.goodsList[index].returnCount) {
this.orderDetail.goodsList[index].returnCount = 0
}

3
package2/IdleTrad/chat.vue

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

10
package2/group/groupBuyDetail.vue

@ -28,16 +28,18 @@
</view>
</view>
<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 class="box1">
<view style="display: flex;">
<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 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 class="box1">
@ -83,7 +85,7 @@
methods: {
//
largeImg(img) {
this.bigImg = 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/00b1f011787c4549bbea650d95a4eb39.png'
this.bigImg = img
this.$refs.imgPopup.open()
},
//

4
package2/group/groupBuyList.vue

@ -370,7 +370,6 @@
if (this.searchForm.pageNumber >= this.totalPages) return;
// this.status = 'loading';
this.searchForm.pageNumber+=1;
console.log('1111')
this.getShopList();
},
@ -493,7 +492,6 @@
}).catch(() => {})
},
getShopList() {
console.log("3333")
this.loadStatus = 'loading'
if (this.searchSale) {
this.searchForm.sortSale = 'saleCount'
@ -509,7 +507,6 @@
} else {
this.searchForm.sortScore = ''
}
console.log("2222")
let that = this
that.tui.request("/app/shop/getByCondition", "GET", this.searchForm, false, true).then((res) => {
that.loadStatus = 'nomore';
@ -560,6 +557,7 @@
return currentMinutes >= startMinutes && currentMinutes <= endMinutes;
},
goDetail(type, item) {
console.log('数据',item)
if (type == 'shop') {
uni.navigateTo({
url: '/package2/group/groupBuySingle?type=shop&item=' + JSON.stringify(item)

300
package2/group/groupBuySingle.vue

@ -72,8 +72,7 @@
</view>
<view class="pintuan group-live-card" :class="{'group-live-card-empty': orderListWait.length === 0}"
style="padding: 0;margin-top:20rpx;display: flex;"
@tap="openOrderWait('')">
style="padding: 0;margin-top:20rpx;display: flex;" @tap="openOrderWait('')">
<view class="live-card-header">
<view class="live-title-wrap">
<image class="live-title-gif" src="/static/images/img/loading.gif" mode="aspectFit"></image>
@ -81,8 +80,9 @@
</view>
<view class="live-pill" v-if="orderListWait.length > 0">去凑团</view>
</view>
<swiper v-if="orderListWait.length > 0" class="zaixian-swiper" vertical circular :autoplay="orderListWait.length > 0"
:interval="onlineWorkerInterval" :duration="onlineWorkerDuration">
<swiper v-if="orderListWait.length > 0" class="zaixian-swiper" vertical circular
:autoplay="orderListWait.length > 0" :interval="onlineWorkerInterval"
:duration="onlineWorkerDuration">
<swiper-item v-for="(item,index) in orderListWait" :key="index">
<view class="live-swiper-item">
<view class="pintuan-left">
@ -100,8 +100,7 @@
</view>
<view class="pintuan-right">
<view class="pintuan-right-img">
<img src="/static/images/img/songshu.png"
alt="" />
<img src="/static/images/img/songshu.png" alt="" />
<view class="weipincheng">+</view>
</view>
<view class="pintuan-right-cha">
@ -152,7 +151,9 @@
<view class="goods-deal1">
销量 <text> {{item.tailWarn != null ? item.tailWarn : 0}}</text>
</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}}
</view>
</view>
@ -160,8 +161,7 @@
<view class="goods-tag" @tap.stop="openOrderWait(item)"
v-if="item.orderListWait != undefined && item.orderListWait.length > 0">
<view class="pintuan-right-img">
<img src="/static/images/img/songshu.png"
alt="" />
<img src="/static/images/img/songshu.png" alt="" />
<view class="weipincheng">+</view>
</view>
<view class="pintuan-right-cha">
@ -303,7 +303,8 @@
<uni-icons type="close" size="30" color="#fff"></uni-icons>
</view>
<view class="popup-rally-title" v-if="isPintuan">
<view class="popup-rally-main">{{isStoreGroupOrder ? '到店团购搭子哪里找-同校同学一起省!' : '拼团搭子哪里找-隔壁宿舍全是宝!'}}</view>
<view class="popup-rally-main">{{isStoreGroupOrder ? '到店团购搭子哪里找-同校同学一起省!' : '拼团搭子哪里找-隔壁宿舍全是宝!'}}
</view>
</view>
<view class="goods-top popup-product-card">
<view class="goods-img">
@ -424,12 +425,11 @@
<view class="bottom popup-bottom-bar" style="padding-bottom: 40rpx;height: 160rpx;z-index: 10;">
<view v-if="isPintuan" class="pintuan1">
<template v-if="!groupId">
<view class="pintuan2 group-face-btn"
@tap.stop="submitPintuan(true)">
<uni-icons type="help" size="16" style="padding-right: 20rpx;margin-top: 4rpx;" @tap.stop="openMianRemark"></uni-icons>
<view class="pintuan2 group-face-btn" @tap.stop="submitPintuan(true)">
<uni-icons type="help" size="16" style="padding-right: 20rpx;margin-top: 4rpx;"
@tap.stop="openMianRemark"></uni-icons>
</view>
<view class="pintuan2 group-submit-btn"
@tap.stop="submitPintuan(false)">
<view class="pintuan2 group-submit-btn" @tap.stop="submitPintuan(false)">
{{isStoreGroupOrder ? '发起到店团' : '发起拼团'}}{{selectedGroupRule && selectedGroupRule.groupPrice ? parseFloat(selectedGroupRule.groupPriceAndMore).toFixed(2) : '0.00'}}
</view>
</template>
@ -464,8 +464,7 @@
:key="index">
<view class="list-right">
<view class="list-right-img">
<img src="/static/images/img/songshu.png"
alt="" />
<img src="/static/images/img/songshu.png" alt="" />
<view class="list-weipincheng">+</view>
</view>
<view class="list-right-cha">
@ -505,10 +504,12 @@
</view>
<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 v-if="groupdeliveryType == 1 && currentItem.lunchBox > 0"> 打包费 {{currentItem.lunchBox}} </text>
<text v-if="groupdeliveryType == 1 && currentItem.lunchBox > 0"> 打包费
{{currentItem.lunchBox}} </text>
</view>
<view style="height: 40rpx;text-align: center;color: #ff5722;" v-if="selectedCoupon">
优惠券抵扣 -{{selectedCoupon.discountAmount.toFixed(2)}}
@ -517,7 +518,8 @@
若拼团失败将会为您自动退款
</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="height: 42rpx;line-height: 42rpx;display: flex;">
<!-- <img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4c8e0cc311db4d38ab43e019673c4b8c.png"
@ -608,8 +610,7 @@
</view>
<view class="kaituan2" style="display: flex;justify-content: center;margin-top: 60rpx;">
<view class="kaituan22">
<img src="/static/images/img/songshu.png"
alt=""
<img src="/static/images/img/songshu.png" alt=""
style="width: 90rpx;height: 90rpx;border-radius: 90rpx;margin: 0 auto;display: block;" />
</view>
</view>
@ -636,7 +637,8 @@
<view
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;">
{{item.couponName}}</view>
{{item.couponName}}
</view>
<view style="font-size: 22rpx; color: #999;" v-if="item.minAmount > 0">
{{item.minAmount}}可用</view>
<view style="font-size: 22rpx; color: #999;" v-else>无门槛使用</view>
@ -696,7 +698,7 @@
return {
loadStatus: 'more',
type: '',
isPindan:true,
isPindan: true,
orderScene: '',
shopId: '',
shopItem: {
@ -708,7 +710,7 @@
remark: '',
},
productId: '',
nowMake:true,
nowMake: true,
isPack: 0,
productItem: [],
tuanzhangOrder: {},
@ -723,14 +725,14 @@
pageNum: 1,
total: 1,
chooseWaitType: false,
// sticky top
navBarHeight: 0,
orderListWait: [],
lastScrollTop: 0,
// onPageScroll
isSwitching: false,
// onPageScroll data undefined
_lastDetectTs: 0,
// sticky top
navBarHeight: 0,
orderListWait: [],
lastScrollTop: 0,
// onPageScroll
isSwitching: false,
// onPageScroll data undefined
_lastDetectTs: 0,
searchForm: {
shopId: '',
delFlag: 1,
@ -878,11 +880,10 @@
checked: true
}]
this.productItem = []
this.getCategory(this.shopItem.id);
this.getProduct('');
},
onReady() {
this.getCategory(this.shopItem.id);
this.getProduct('');
},
onReady() {},
onPageScroll(e) {
this.lastScrollTop = e.scrollTop;
// 80ms selectorQuery
@ -892,7 +893,7 @@
this.detectCurrentCategory();
},
methods: {
nowMakeMethod(){
nowMakeMethod() {
this.nowMake = !this.nowMake
},
scrollGoodsListToTop() {
@ -974,7 +975,7 @@
if (this.productItem[i].sellBeginTime != '' && this.productItem[i].sellEndTime != '') {
let isEndTime = this.isWithinBusinessHours(this.productItem[i].sellBeginTime, this
.productItem[i].sellEndTime)
this.productItem[i].status = isEndTime ? 0 : 1
}
if (that.productItem[i].isMoreBuy == 1) {
@ -998,9 +999,9 @@
//
that.getOrderWait();
that.total = res.result.pages; // pages =
that.pageNum = that.searchForm.pageNum;
that.$forceUpdate();
that.total = res.result.pages; // pages =
that.pageNum = that.searchForm.pageNum;
that.$forceUpdate();
} else {
that.tui.toast(res.message);
return;
@ -1028,42 +1029,42 @@
uni.hideLoading()
}).catch((res) => {})
},
checkTab(index) {
this.isSwitching = true;
for (let i = 0; i < this.menuList.length; i++) {
this.menuList[i].checked = (i === index);
}
checkTab(index) {
this.isSwitching = true;
for (let i = 0; i < this.menuList.length; i++) {
this.menuList[i].checked = (i === index);
}
const selectedCategory = this.menuList[index];
if (!selectedCategory.id && selectedCategory.id !== 0) {
this.scrollGoodsListToTop();
return;
}
const selectedCategory = this.menuList[index];
if (!selectedCategory.id && selectedCategory.id !== 0) {
this.scrollGoodsListToTop();
return;
}
// scroll #category-<id> nav-bar 沿
const targetSelector = '#category-' + selectedCategory.id;
this.$nextTick(() => {
const query = uni.createSelectorQuery().in(this);
query.select(targetSelector).boundingClientRect();
query.selectViewport().scrollOffset();
query.exec((res) => {
if (!res || !res[0] || !res[1]) {
this.isSwitching = false;
return;
}
const rect = res[0];
const vp = res[1];
const target = Math.max(vp.scrollTop + rect.top - this.navBarHeight, 0);
uni.pageScrollTo({
scrollTop: target,
duration: 200
// scroll #category-<id> nav-bar 沿
const targetSelector = '#category-' + selectedCategory.id;
this.$nextTick(() => {
const query = uni.createSelectorQuery().in(this);
query.select(targetSelector).boundingClientRect();
query.selectViewport().scrollOffset();
query.exec((res) => {
if (!res || !res[0] || !res[1]) {
this.isSwitching = false;
return;
}
const rect = res[0];
const vp = res[1];
const target = Math.max(vp.scrollTop + rect.top - this.navBarHeight, 0);
uni.pageScrollTo({
scrollTop: target,
duration: 200
});
setTimeout(() => {
this.isSwitching = false;
}, 350);
});
setTimeout(() => {
this.isSwitching = false;
}, 350);
});
});
},
},
openOrderWait(item) {
this.chooseWaitType = false
if (item != '') {
@ -1181,15 +1182,15 @@
}
}
that.$forceUpdate();
} else {
that.tui.toast(res.message);
return;
}
uni.hideLoading();
}).catch((res) => {});
},
chooseOrderWait(item) {
that.$forceUpdate();
} else {
that.tui.toast(res.message);
return;
}
uni.hideLoading();
}).catch((res) => {});
},
chooseOrderWait(item) {
this.$refs.pintuanGroupPopup.close();
this.isPindan = true;
this.$refs.tishiPopup.open();
@ -1690,7 +1691,7 @@
let amountInCents = Math.round(this.backendTotalAmount * 100);
let userRequireMake = 0
if(this.nowMake && this.groupdeliveryType == 2 && !this.isStoreGroupOrder){
if (this.nowMake && this.groupdeliveryType == 2 && !this.isStoreGroupOrder) {
userRequireMake = 1
}
@ -1698,7 +1699,7 @@
openid: uni.getStorageSync('miniProgramOpenid') || 'test-openid',
amount: amountInCents,
description: '商城订单',
userRequireMake:userRequireMake,
userRequireMake: userRequireMake,
isPack: this.groupdeliveryType == 2 ? this.isPack : 1,
outTradeNo: this.currentOrderId
}, false, false).then((res) => {
@ -1782,7 +1783,7 @@
}
});
},
openMianRemark(){
openMianRemark() {
this.isPindan = false;
this.$refs.tishiPopup.open()
},
@ -1803,7 +1804,9 @@
if (pages.length > 1) {
uni.navigateBack();
} else {
uni.switchTab({ url: '/pages/index/index' });
uni.switchTab({
url: '/pages/index/index'
});
}
}
}
@ -1848,9 +1851,9 @@
padding: 16rpx 24rpx;
box-sizing: border-box;
}
.radio-check {
background: linear-gradient(90deg, #e3ff96, #a6ffea);
background: linear-gradient(90deg, #e3ff96, #a6ffea);
width: 42rpx;
height: 42rpx;
border-radius: 42rpx;
@ -1859,7 +1862,7 @@
margin: 0 18rpx 0 0;
box-shadow: 0 6rpx 16rpx rgba(49, 224, 183, 0.22);
}
.radio-no-check {
width: 42rpx;
height: 42rpx;
@ -2089,6 +2092,7 @@
border-radius: 20rpx;
overflow: hidden;
}
.fee-value {
color: #00231C;
font-weight: 800;
@ -2382,7 +2386,7 @@
border-radius: 10px;
float: left;
text-align: center;
margin: 10px 20px 0 0;
margin: 10px 20px 0 0;
padding: 10px 10px 0;
position: relative;
}
@ -2394,7 +2398,7 @@
border-radius: 10px;
float: left;
text-align: center;
margin: 10px 20px 0 0;
margin: 10px 20px 0 0;
padding: 10px 10px 0;
position: relative;
}
@ -2562,8 +2566,9 @@
top: 110rpx;
left: 80rpx;
}
.tishi-popup{
background:url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/629843c61a014d69bf3a1195f51a898b.png') no-repeat;
.tishi-popup {
background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/629843c61a014d69bf3a1195f51a898b.png') no-repeat;
width: 300px;
height: 285px;
box-sizing: border-box;
@ -2601,6 +2606,7 @@
color: #ff7043;
font-weight: 900;
}
.spark-b {
width: 24rpx;
height: 24rpx;
@ -3093,9 +3099,12 @@
}
@keyframes checkoutTextShine {
0%, 40% {
0%,
40% {
transform: translateX(0) rotate(18deg);
}
100% {
transform: translateX(480rpx) rotate(18deg);
}
@ -3138,7 +3147,7 @@
font-weight: 900;
line-height: 34rpx;
}
.fee-label {
flex: 1;
color: #6f7f79;
@ -3594,8 +3603,13 @@
}
@keyframes freeMaskFade {
0% { opacity: 0; }
100% { opacity: 1; }
0% {
opacity: 0;
}
100% {
opacity: 1;
}
}
@keyframes freeCardPop {
@ -3615,43 +3629,101 @@
}
@keyframes freeRaysSpin {
0% { transform: rotate(0deg) scale(1); }
100% { transform: rotate(360deg) scale(1.06); }
0% {
transform: rotate(0deg) scale(1);
}
100% {
transform: rotate(360deg) scale(1.06);
}
}
@keyframes freeTitlePop {
0%, 100% { transform: scale(1); }
50% { transform: scale(1.025); }
0%,
100% {
transform: scale(1);
}
50% {
transform: scale(1.025);
}
}
@keyframes freeAmountBeat {
0%, 100% { transform: scale(1); }
50% { transform: scale(1.045); }
0%,
100% {
transform: scale(1);
}
50% {
transform: scale(1.045);
}
}
@keyframes freeAmountAura {
0% { background-position: 0% 50%; }
100% { background-position: 260% 50%; }
0% {
background-position: 0% 50%;
}
100% {
background-position: 260% 50%;
}
}
@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 {
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 {
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 {
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 {

1
package2/group/searchGroup.vue

@ -257,7 +257,6 @@
that.shopArea.push(res.result[m])
}
}
console.log(that.shopArea)
}
} else {
that.tui.toast(res.message)

1
package2/group/shopEvaluate.vue

@ -238,7 +238,6 @@
}).catch((res) => {})
},
onReachPage(){
console.log("11111")
if (this.searchForm.pageNum >= this.total) return;
this.searchForm.pageNum++;
this.getshopComments(this.shopItem.id);

5
package2/myCenter/addGoods.vue

@ -275,8 +275,6 @@
* @param {Object} e {html,text} 内容的html文本和text文本
*/
inputOver(e) {
//
console.log('==== inputOver :', e)
this.productIntro = e
},
/**
@ -539,7 +537,6 @@
}
let str = JSON.stringify(v);
let data = JSON.parse(str);
console.log('111111',data)
this.formData = data;
// attributeListstring
@ -699,7 +696,6 @@
}
}
}
console.log()
that.$forceUpdate(that.categorySonData)
that.$forceUpdate(that.categoryData)
} else {
@ -715,7 +711,6 @@
if(this.specValueArr[m].id == this.formData.attributeListPrice[index].id){
this.specValueArr.splice(m,1)
this.formData.attributeListPrice.splice(index,1)
console.log("11",this.formData.attributeListPrice)
if(this.formData.attributeListPrice.length == 1){
this.formData.attributeListPrice = []
this.formData.attributeListPrice.push({

4
package2/myCenter/goodsList.vue

@ -218,14 +218,10 @@
}
},
changeShow(index,type){
console.log("1111",index)
console.log("1111",type)
if(type == 'shopList'){
this.shopList[index].isShow = !this.shopList[index].isShow
console.log(this.shopList[index])
}else{
this.shopList1[index].isShow = !this.shopList1[index].isShow
console.log(this.shopList1[index])
}
this.$forceUpdate()
},

6
package2/partTimeJob/partTimeJobCenter.vue

@ -40,7 +40,7 @@
<view class="order2">
<view class="order22">
<view class="order33" @tap="goDetail('db',4)">
<!-- <view class="order33" @tap="goDetail('db',4)">
<view class="order44">
{{daiquCount}}
</view>
@ -55,7 +55,7 @@
<view class="order55">
待送达
</view>
</view>
</view> -->
<view class="order33" @tap="goDetail('tui',11)">
<view class="order44">
{{shouhouCount}}
@ -221,7 +221,7 @@
url = ''
break;
case 'dd':
url = '/package2/shop/shopOrderList'
url = '/package2/partTimeJob/workerOrderList'
break;
case 'ph':
url = '/package2/shop/ranking'

435
package2/partTimeJob/workerOrderList.vue

@ -0,0 +1,435 @@
<template>
<!-- 兼职订单列表 -->
<view class="page1">
<view class="title">
<view class="title-sreach">
<view class="back-btn" @tap="back" :style="{'top': menuButtonInfo.top +'px'}">
<uni-icons type="left" size="28"></uni-icons>
</view>
<view class="title-name" :style="{'padding-top': menuButtonInfo.top +'px'}">
订单列表
</view>
</view>
</view>
<view style="margin-top: -140rpx;">
<view class="box1" @tap="goDetail(item)" v-for="(item,index) in orderList" :key="index">
<view style="display: flex;height: 50rpx;border-bottom: 1px solid #eee;">
<view style="display: flex;padding-right: 20rpx;" v-if="item.numberCode">
{{'#' + item.numberCode | delPlus}}
</view>
<view style="flex: 1;display: flex;">
{{item.createTime | formatISOTime}}
<!-- <text>已退款</text> -->
</view>
<view>
{{item.status == 0?'待支付':item.status == 2?'待配送员接单':(item.status == 3 && item.deliveryType == 1 && item.shopMakeTime == null) || (item.status == 3 && item.deliveryType == 2 && item.userRequireMake == 1)?'待出餐':(item.status == 3 && item.deliveryType == 1 && item.shopMakeTime != null)?'待取货':(item.status == 3 && item.deliveryType == 1 && item.shopMakeTime != null) || (item.status == 3 && item.deliveryType == 2 && item.userRequireMake != 1)?'待消费':item.status == 4?'待送达':item.status == 5?'已完成':item.status == 7?'待同意退款':item.status == 8?'已退款':item.status == 6?'已取消':item.status == 11?'售后中':item.status == 12?'已售后':""}}
</view>
</view>
<view style="height: auto;padding-top: 20rpx;">
<view style="height: 50rpx;line-height: 50rpx;font-size: 28rpx;font-weight: 700;display: flex;">
商品 <text><text>{{item.goodsNum}}</text></text>
</view>
<view style="display: flex;" v-for="(item1,index1) in item.goodsList" :key="index">
<view style="flex: 1;height: 20px;line-height: 20px;">
{{item1.productName}}
</view>
<view style="width: 100rpx;">
{{'X' + item1.quantity}}
</view>
<view>
{{'¥'+ item1.price}}
</view>
</view>
</view>
<view style="height: 80rpx;border-top: 1px solid #eee;display: flex;">
<view class="pinzi" @tap.stop="tanchuang(item.deliveryType)" style="width:auto;font-weight:700;margin-right: 20rpx;color:#00231C;background:linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));padding:0 12rpx;">
{{item.deliveryType == 1?'配送':item.isPack == 1?'自取-打包':item.isPack == 0?'自取-堂食':'自取'}}
</view>
<view v-if="item.orderType != 1 && item.groupInfo != null" @tap.stop="getGroupOrders(item.id)" class="pinzi">
</view>
<view style="flex: 1;"></view>
<view @tap.stop="mealServing(item)" v-if="currentIndex == 13" class="btn" style="margin: 10rpx 0 0 20rpx;">
已出餐
</view>
</view>
</view>
</view>
<view style="width:100%;height:60rpx;"></view>
<!-- 拼团详情弹窗 -->
<uni-popup ref="pintuanPopup" background-color="#fff">
<view class="guize-list">
<view v-for="(item,index) in tuanzhangOrder" :key="index">
<view style="height: 80rpx;line-height: 80rpx;font-size: 36rpx;font-weight: 700;">
订单-{{item.numberCode}}
</view>
<view class="">
<view class="dingdan">
<view style="display:flex">
<view style="width:300rpx;">
订单状态
</view>
<view class="pituan-text">
{{item.status == 0?'待支付':item.status == 2?'待配送员接单':(item.status == 3 && item.deliveryType == 1 && item.shopMakeTime == null) || (item.status == 3 && item.deliveryType == 2 && item.userRequireMake == 1)?'待出餐':(item.status == 3 && item.deliveryType == 1 && item.shopMakeTime != null)?'待取货':(item.status == 3 && item.deliveryType == 2)?'待消费':item.status == 4?'待送达':item.status == 5?'已完成':item.status == 7?'待同意退款':item.status == 8?'已退款':item.status == 6?'已取消':item.status == 11?'售后中':item.status == 12?'已售后':""}}
</view>
</view>
<view style="display:flex">
<view style="width:300rpx;">
订单号
</view>
<view class="pituan-text">
{{item.id}}
</view>
</view>
<view style="display:flex">
<view style="width:300rpx;">
订单时间
</view>
<view class="pituan-text">
{{item.createTime | formatISOTime}}
</view>
</view>
</view>
<view class="dingdan" v-for="(item1,index1) in item.goodsList" :key="index1">
<view class="pt-title">
商品信息
</view>
<view style="display: flex;font-weight: 700;">
<view style="flex:1">
商品名{{item1.productName}}
</view>
<view style="width:100rpx;">
X{{item1.quantity}}
</view>
<view style="width:220rpx;text-align: right;padding-right:20rpx;">
{{item1.price}}
</view>
</view>
</view>
<view class="dingdan">
<view style="text-align: right;padding-right: 20rpx;color: #777;">
餐盒费{{item.packageFee}} 配送费{{item.deliveryFee}}
</view>
<view style="text-align: right;padding-right: 20rpx;font-size: 28rpx;font-weight: 700;color: red;">
总计{{item.totalAmount}}
</view>
</view>
</view>
</view>
</view>
</uni-popup>
</view>
</template>
<script>
export default {
data() {
return {
loadStatus: 'more',
searchForm: {
status: 3,
pageNum: 1,
pageSize: 10,
order: '',
regionId: JSON.parse(uni.getStorageSync('area')).id,
deliveryType: null,
workerId: uni.getStorageSync('worker').workerId
},
totalPages: 1,
tuanzhangOrder:[],
orderList: [],
currentIndex: 10,
menuButtonInfo: {}
}
},
onReachBottom() {
if (this.searchForm.pageNum >= this.totalPages) return;
this.searchForm.pageNum++;
this.getList();
},
filters: {
formatISOTime(isoString) {
const date = new Date(isoString);
const year = date.getFullYear();
const month = (date.getMonth() + 1).toString().padStart(2, '0');
const day = date.getDate().toString().padStart(2, '0');
const hours = date.getHours().toString().padStart(2, '0');
const minutes = date.getMinutes().toString().padStart(2, '0');
const seconds = date.getSeconds().toString().padStart(2, '0');
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
},
delPlus(data){
if (data.endsWith("+")) {
data = data.slice(0, -1);
}
return data;
}
},
onShow() {
this.menuButtonInfo = uni.getMenuButtonBoundingClientRect()
this.searchForm.shopId = uni.getStorageSync('shopId')
this.regionId = JSON.parse(uni.getStorageSync('area')).id
},
onLoad(option) {
if (option.index) {
this.searchForm.searchStatus = option.index
this.currentIndex = option.index
}
this.getList()
},
methods: {
getList() {
this.loadStatus = 'loading'
let that = this
that.tui.request("/mall/delivery/pagebyworker", "POST", this.searchForm, false, false).then((
res) => {
that.loadStatus = 'nomore';
if (res.code == 200) {
if (that.searchForm.pageNum == 1) {
that.orderList = res.result.records;
} else {
that.orderList = [...that.orderList, ...res.result.records]
}
for(let i=0;i<that.orderList.length;i++){
that.orderList[i].goodsNum = 0
for(let m=0;m<that.orderList[i].goodsList.length;m++){
that.orderList[i].goodsNum += that.orderList[i].goodsList[m].quantity
}
}
that.totalPages = res.result.pages;
that.$forceUpdate();
} else {
that.tui.toast(res.message);
return;
}
uni.hideLoading();
}).catch((res) => {});
},
tanchuang(v){
this.tui.toast('该订单为'+(v==1?'配送':'自取')+'单')
},
getGroupOrders(id){
this.tui.request("/mall/order/selectAllOrderByOrderId/"+id, "GET", {}, false, true).then((res) => {
if (res.code == 200) {
this.tuanzhangOrder = res.result;
this.$refs.pintuanPopup.open('bottom')
} else {
that.tui.toast(res.message)
return
}
uni.hideLoading()
}).catch((res) => {})
},
openPopup(){
this.$refs.groupPopup.open()
},
mealServing(item){
let that = this
uni.showModal({
title: '提示',
content: '确定要出餐吗?',
success: function (res) {
if (res.confirm) {
let data = {}
let url = ''
if(item.deliveryType == 2){ //
url = '/mall/order/complete'
}else if(item.deliveryType == 1){ //
url = '/mall/order/shopMakeTime'
}
that.tui.request(url, "post", {
orderId:item.id
}, false, true).then((res) => {
if (res.code == 200) {
that.getList()
} else {
that.tui.toast(res.message);
return;
}
uni.hideLoading();
}).catch((res) => {});
}
}
});
},
goDetail(item) {
uni.navigateTo({
url: '/package2/shop/orderDetail?id=' + item.orderId
})
},
handleStatusClick(index) {
this.searchForm.pageNum = 1
if (this.currentIndex === index) return;
this.currentIndex = index;
this.searchForm.searchStatus = index
this.getList()
},
back() {
uni.navigateBack()
},
}
}
</script>
<style>
page {
width: 100%;
height: 100%;
font-size: 24rpx;
background: #F5F8F5;
color: #00231C;
}
.page1 {
width: 100%;
height: 100%;
font-size: 24rpx;
position: relative;
}
.title {
background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/8bc15960c2dc40268e295d6dd23aecce.png') no-repeat;
width: 100%;
height: 20%;
}
.title-sreach {
width: 100%;
display: flex;
height: 200rpx;
position: relative;
}
.back-btn {
position: absolute;
bottom: 0;
left: 0;
}
.title-name {
padding-top: 110rpx;
font-size: 36rpx;
font-weight: 700;
flex: 1;
text-align: center;
}
.title-tab {
display: flex;
margin: -120rpx auto 0;
}
.status-scroll-view {
width: 100%;
white-space: nowrap;
/* 辅助滚动,与 flex 配合确保不换行 */
height: auto;
}
.status-list {
display: flex;
flex-direction: row;
flex-wrap: nowrap;
align-items: center;
padding: 0 0;
/* 可根据设计添加左右留白,但会影响“一排5个”精准计算,故留白为0 */
min-height: 88rpx;
/* 保证内部项撑开高度 */
}
/* 每个状态项:宽度为屏幕宽度的1/5,保证一行正好显示5个,超出滚动 */
.status-item {
flex-shrink: 0;
width: 20vw;
/* 关键:屏幕宽度的1/5,正好一排5个 */
text-align: center;
padding: 20rpx 0;
position: relative;
box-sizing: border-box;
transition: all 0.2s cubic-bezier(0.25, 0.46, 0.45, 0.94);
/* 点击反馈 */
-webkit-tap-highlight-color: transparent;
}
.status-text {
font-size: 28rpx;
color: #666666;
font-weight: normal;
line-height: 1.4;
transition: color 0.2s, font-weight 0.2s;
}
/* 激活状态样式 */
.status-item.active .status-text {
color: #ff6b35;
font-weight: 500;
}
/* 激活指示条(下划线) */
.status-item.active::after {
content: '';
position: absolute;
bottom: 0;
left: 50%;
transform: translateX(-50%);
width: 40rpx;
height: 4rpx;
background-color: #ff6b35;
border-radius: 2rpx;
transition: width 0.2s ease;
}
.box1 {
width: 95%;
margin: 20rpx auto;
background: #fff;
border-radius: 20rpx;
padding: 20rpx 20rpx 0;
}
.btn{
background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
padding:0 10rpx;
height: 50rpx;
border-radius: 14rpx;
line-height: 50rpx;
text-align: center;
font-weight: 700;
margin-top: 20rpx;
}
.pinzi{
margin: 20rpx 0;
background: linear-gradient(90deg, #FF4500, #FFA07A);
width: 40rpx;
height: 40rpx;
line-height: 40rpx;
text-align: center;
border-radius: 10rpx;
color: #fff;
}
.guize-list {
width: 100%;
padding: 20rpx;
overflow: scroll;
background: #fff;
max-height: 1000rpx;
line-height: 25px;
}
.pt-title{
font-size: 28rpx;
font-weight: 700;
color: #777;
}
.dingdan{
border-top: 1px solid #eee;
}
.uni-popup__wrapper{
border-radius: 20rpx !important;
}
.pituan-text{
flex:1;
text-align:right;
padding-right:20rpx;
font-weight: 700;
}
</style>

2
package2/shop/merchantRegister.vue

@ -284,7 +284,6 @@
mask: true
})
for (let i = 0; i < res.tempFiles.length; i++) {
console.log('type是什么',type)
that.upLoadFile(res.tempFiles[i].tempFilePath,type)
}
@ -383,7 +382,6 @@
text: item.title || item.name || item.regionName || item.areaName || '未命名区域'
}
})
console.log(that.addressList)
})
},
regionChange(e){

3
package2/shop/orderDetail.vue

@ -143,9 +143,6 @@
</view>
</view>
<view style="margin-top: 20rpx;">
<view class="btn">
打印小票
</view>
<view @tap="mealServing(data)" v-if="(data.status == 3 && data.deliveryType == 1 && data.shopMakeTime == null) || (data.status == 3 && data.deliveryType == 2 && data.userRequireMake == 1)" class="btn" style="background: rgba(0, 35, 28, 1);color: rgba(166, 255, 234, 1);">
已出餐
</view>

1
package2/shop/shopOrderList.vue

@ -66,6 +66,7 @@
</view>
</view>
</view>
<view style="width:100%;height:60rpx;"></view>
<!-- 拼团详情弹窗 -->
<uni-popup ref="pintuanPopup" background-color="#fff">
<view class="guize-list">

6
pages.json

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

29
pages/index/index.vue

@ -5,16 +5,6 @@
<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;"
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">
<swiper class="swiper hero-bg-swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay"
:interval="interval" :duration="duration">
@ -974,6 +964,7 @@
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
@ -1004,6 +995,7 @@
const progress = Math.min(100, Math.round(deltaX / (trackWidth * 0.72) * 100))
this.setSwipeOrderProgress(progress)
},
//
endSwipeOrder(item, index) {
if (this.swipeOrder.id !== item.id || this.swipeOrder.index !== index) return
if (this.swipeOrder.progress >= 92 && !this.swipeOrder.confirmed) {
@ -1174,6 +1166,7 @@
uni.hideLoading();
}).catch((res) => {});
},
//广
goAdPage(item) {
uni.navigateTo({
url: item.linkUrl + item.linkParams
@ -1208,6 +1201,7 @@
url: '/package2/seckill/seckillGroup'
})
},
//
goDetail(type) {
let url = ''
switch (type) {
@ -1231,11 +1225,13 @@
url: url
})
},
//
goOrderDetail(item) {
uni.navigateTo({
url: '/package1/order/orderDetail?id=' + item.id
});
},
//
onClickArea(item) {
uni.setStorageSync('area', JSON.stringify(item))
this.areaName = item.title
@ -1272,6 +1268,7 @@
}
})
},
//
getShopArea() {
let that = this
that.tui.request("/app/shopArea/getByParentId/" + that.searchForm.regionId, "GET", {}, false, true).then((
@ -1287,6 +1284,7 @@
}
}).catch((res) => {})
},
//
getUserOrders() {
let that = this
that.tui.request("/mall/order/getOrdersByUserId/" + uni.getStorageSync('id'), "GET", {}, false, true).then(
@ -1302,6 +1300,7 @@
}
}).catch((res) => {})
},
//
searchOrder(type, value) {
if (type == 'getarea') {
if (this.searchForm.getAreaId == value.id) {
@ -1339,7 +1338,6 @@
this.checkYongjin = false
this.searchForm.order = ''
}
console.log("shuaxin")
this.searchForm.pageNum = 1
this.getDelivery();
},
@ -1350,18 +1348,16 @@
type: 'gcj02', //
isHighAccuracy:true,
success: (res) => {
console.log('位置', res)
that.latitude = res.latitude;
that.longitude = res.longitude;
that.tui.request('/worker/admin/editLocation', "POST", {workerId:id,geolocation:that.latitude + ',' + that.longitude}, false, false,true).then((res) => {
}).catch((res) => {});
},
fail: (err) => {
console.log('获取位置失败', err);
}
fail: (err) => {}
});
},
//
checkTab1(type) {
this.checked = type
if (type == 'waimai') {
@ -1399,6 +1395,7 @@
});
}).exec();
},
//
makeCall(phone) {
uni.makePhoneCall({
phoneNumber: phone
@ -1410,9 +1407,11 @@
clearInterval(this.deliveryTimer);
}
},
//
checkAdd() {
this.isgetArea = !this.isgetArea
},
//
checkAdd1() {
this.isputArea = !this.isputArea
},

Loading…
Cancel
Save