diff --git a/components/tab-bar/delivery.vue b/components/tab-bar/delivery.vue index ee938c5..854317c 100644 --- a/components/tab-bar/delivery.vue +++ b/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('用户取消授权'); } } } diff --git a/components/tab-bar/myCenter.vue b/components/tab-bar/myCenter.vue index 6a8f413..3fc5b3c 100644 --- a/components/tab-bar/myCenter.vue +++ b/components/tab-bar/myCenter.vue @@ -4,7 +4,7 @@ 商家中心-{{shopCounts}} 兼职注册 兼职主页-{{workerCounts}} - 钱包余额-{{balance}} + 钱包余额 ￥{{balance}} 我的订单 @@ -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) => { diff --git a/components/tab-bar/postList.vue b/components/tab-bar/postList.vue index 49295d7..aa2fc10 100644 --- a/components/tab-bar/postList.vue +++ b/components/tab-bar/postList.vue @@ -221,7 +221,6 @@ }, methods: { init() { - console.log("配送初始化") this.menuButtonInfo = uni.getMenuButtonBoundingClientRect() this.$forceUpdate() }, diff --git a/libs/weapp-qrcode.js b/libs/weapp-qrcode.js index 3026a63..ab14567 100644 --- a/libs/weapp-qrcode.js +++ b/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) } }) diff --git a/package1/buyFood/buyFood.vue b/package1/buyFood/buyFood.vue index 7bb99e7..12bacc3 100644 --- a/package1/buyFood/buyFood.vue +++ b/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}`; diff --git a/package1/index/deliveryPersonList.vue b/package1/index/deliveryPersonList.vue index f4bd8ec..ba02f6e 100644 --- a/package1/index/deliveryPersonList.vue +++ b/package1/index/deliveryPersonList.vue @@ -165,7 +165,7 @@ }, methods: { getLoca(item){ - console.log('aaaaa',item) + this.markers = [{ id: 0, latitude: item.geolocation[0], diff --git a/package1/order/orderDetail.vue b/package1/order/orderDetail.vue index 5a29bc1..0a417e1 100644 --- a/package1/order/orderDetail.vue +++ b/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 { diff --git a/package1/order/orderEvaluate.vue b/package1/order/orderEvaluate.vue index ca8e7dc..e5d704d 100644 --- a/package1/order/orderEvaluate.vue +++ b/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() } diff --git a/package1/order/orderList.vue b/package1/order/orderList.vue index 0f055d9..8253bc0 100644 --- a/package1/order/orderList.vue +++ b/package1/order/orderList.vue @@ -50,7 +50,7 @@ - 咸鱼 + 鱼塘 @@ -143,9 +143,9 @@ - {{item.otherOrder == 1 ? '快递/跑腿' : item.otherOrder == 2 ? '团购' : item.otherOrder == 3 ? '咸鱼' :"饭团"}} + {{item.otherOrder == 1 ? '快递/跑腿' : item.otherOrder == 2 ? '团购' : item.otherOrder == 3 ? '鱼塘' :"饭团"}} - {{item.otherOrder == 1 ? '快递/跑腿' : item.otherOrder == 2 ? '团购订单' : item.otherOrder == 3 ? '咸鱼订单' : item.shopName}} + {{item.otherOrder == 1 ? '快递/跑腿' : item.otherOrder == 2 ? '团购订单' : item.otherOrder == 3 ? '鱼塘订单' : item.shopName}} @@ -502,7 +502,6 @@ } else { that.orderList = [...that.orderList, ...res.result.records] } - console.log(that.orderList) for(let i=0;i - + - 商家资质 + + 商家资质 + - + @@ -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() }, //拨打电话 diff --git a/package2/group/groupBuyList.vue b/package2/group/groupBuyList.vue index bfabf04..cd0945e 100644 --- a/package2/group/groupBuyList.vue +++ b/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) diff --git a/package2/group/groupBuySingle.vue b/package2/group/groupBuySingle.vue index 52a1cb3..a072ac1 100644 --- a/package2/group/groupBuySingle.vue +++ b/package2/group/groupBuySingle.vue @@ -72,8 +72,7 @@ + style="padding: 0;margin-top:20rpx;display: flex;" @tap="openOrderWait('')"> @@ -81,8 +80,9 @@ 去凑团 - + @@ -100,8 +100,7 @@ - + + @@ -152,7 +151,9 @@ 销量 {{item.tailWarn != null ? item.tailWarn : 0}} - + ¥{{item.attributeListPrice | sliceMsg}} @@ -160,8 +161,7 @@ - + + @@ -303,7 +303,8 @@ - {{isStoreGroupOrder ? '到店团购搭子哪里找-同校同学一起省！' : '拼团搭子哪里找-隔壁宿舍全是宝！'}} + {{isStoreGroupOrder ? '到店团购搭子哪里找-同校同学一起省！' : '拼团搭子哪里找-隔壁宿舍全是宝！'}} + @@ -424,12 +425,11 @@ @@ -464,8 +464,7 @@ :key="index"> - + + @@ -505,10 +504,12 @@ - 配送费(均摊) {{tuanzhangOrder.deliveryFee}} 元 + 配送费(均摊) + {{tuanzhangOrder.deliveryFee}} 元 - 打包费 {{currentItem.lunchBox}} 元 + 打包费 + {{currentItem.lunchBox}} 元 优惠券抵扣 -￥{{selectedCoupon.discountAmount.toFixed(2)}} @@ -517,7 +518,8 @@ 若拼团失败，将会为您自动退款 - + {{shouhouCount}} @@ -221,7 +221,7 @@ url = '' break; case 'dd': - url = '/package2/shop/shopOrderList' + url = '/package2/partTimeJob/workerOrderList' break; case 'ph': url = '/package2/shop/ranking' diff --git a/package2/partTimeJob/workerOrderList.vue b/package2/partTimeJob/workerOrderList.vue new file mode 100644 index 0000000..0be3c50 --- /dev/null +++ b/package2/partTimeJob/workerOrderList.vue @@ -0,0 +1,435 @@ + + + + + \ No newline at end of file diff --git a/package2/shop/merchantRegister.vue b/package2/shop/merchantRegister.vue index 1b2e079..1f55dc7 100644 --- a/package2/shop/merchantRegister.vue +++ b/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){ diff --git a/package2/shop/orderDetail.vue b/package2/shop/orderDetail.vue index f08544a..a94eb5a 100644 --- a/package2/shop/orderDetail.vue +++ b/package2/shop/orderDetail.vue @@ -143,9 +143,6 @@ - - 打印小票 - 已出餐 diff --git a/package2/shop/shopOrderList.vue b/package2/shop/shopOrderList.vue index f5281de..bff0fda 100644 --- a/package2/shop/shopOrderList.vue +++ b/package2/shop/shopOrderList.vue @@ -66,6 +66,7 @@ + diff --git a/pages.json b/pages.json index cf59340..47474cc 100644 --- a/pages.json +++ b/pages.json @@ -403,6 +403,12 @@ "navigationBarTitleText": "兼职主页", "navigationStyle": "custom" } + },{ + "path": "partTimeJob/workerOrderList", + "style": { + "navigationBarTitleText": "配送员订单列表", + "navigationStyle": "custom" + } }] }, { "root": "package3", diff --git a/pages/index/index.vue b/pages/index/index.vue index afdc968..6a5c933 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -5,16 +5,6 @@ - @@ -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 },