Compare commits

...

2 Commits

Author SHA1 Message Date
tianyi 04f905ebc1 11 6 days ago
tianyi 3df568bff8 11 6 days ago
  1. 2
      components/tab-bar/delivery.vue
  2. 417
      package1/group/groupBuyList.vue
  3. 23
      package1/order/orderEvaluate.vue
  4. 5
      package1/order/orderList.vue

2
components/tab-bar/delivery.vue

@ -184,7 +184,7 @@
<view style="width: 20%;" @tap="changeOthers(item,1)">转单</view> <view style="width: 20%;" @tap="changeOthers(item,1)">转单</view>
<img v-if="item.status == 1 && item.arriveTime != null" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/c318cf292a4f40b296995c30e5e539ea.png" <img v-if="item.status == 1 && item.arriveTime != null" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/c318cf292a4f40b296995c30e5e539ea.png"
alt="" style="width: 80%;height: 100rpx;background-size: 100%;" @tap="changeStatus(item,2)"/> alt="" style="width: 80%;height: 100rpx;background-size: 100%;" @tap="changeStatus(item,2)"/>
<img v-if="item.status == 2 && item.arriveTime != null" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png" <img v-if="item.status == 2 && item.arriveTime != null" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/a8cdd6d86e9140df86d3c3c60356bd53.png"
alt="" style="width: 100%;height: 100rpx;background-size: 100%;" @tap="changeStatus(item,3)" /> alt="" style="width: 100%;height: 100rpx;background-size: 100%;" @tap="changeStatus(item,3)" />
</view> </view>
</view> </view>

417
package1/group/groupBuyList.vue

@ -18,7 +18,8 @@
<swiper class="swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay" <swiper class="swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay"
:interval="interval" :duration="duration"> :interval="interval" :duration="duration">
<swiper-item> <swiper-item>
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/1d1edcc3e39c4a7cafeb64cf3209ed5e.png" alt="" /> <img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/1d1edcc3e39c4a7cafeb64cf3209ed5e.png"
alt="" />
</swiper-item> </swiper-item>
</swiper> </swiper>
</view> </view>
@ -55,17 +56,23 @@
区域选择 <text style="font-size: 20rpx;"></text> 区域选择 <text style="font-size: 20rpx;"></text>
</view> </view>
<view class="sort-value" v-if="isArea"> <view class="sort-value" v-if="isArea">
<view class="sort-value1" v-for="(item,index) in shopArea" :key="index" @tap="searchShop('area',item.id)">{{item.title}}</view> <view class="sort-value1" v-for="(item,index) in shopArea" :key="index"
@tap="searchShop('area',item.id)">{{item.title}}</view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<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"
style="width: 100%;height:100%;position: absolute;top: 0;background: rgba(0, 0, 0, 0.4);z-index: 999;border-radius: 10px;">
</view>
<view class="shop-top"> <view class="shop-top">
<view class="shop-img"> <view class="shop-img">
<img :src="item.shopIcon" alt=""> <img :src="item.shopIcon" alt="">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/6c4ab92a43c842d8bb22035bce1f65cc.png" alt="" style="width:30rpx;height:30rpx;position: absolute;top: 0;left: 0;background-size: 100%;" /> <img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/6c4ab92a43c842d8bb22035bce1f65cc.png"
alt=""
style="width:30rpx;height:30rpx;position: absolute;top: 0;left: 0;background-size: 100%;" />
</view> </view>
<view class="shop-content"> <view class="shop-content">
<view class="shop-name"> <view class="shop-name">
@ -75,29 +82,34 @@
<view class="shop-rate"> <view class="shop-rate">
<view class="shop-rate-num">{{item.shopScore}}</view> <view class="shop-rate-num">{{item.shopScore}}</view>
<view style="padding-top: 4rpx;"> <view style="padding-top: 4rpx;">
<uni-rate :disabled="true" size="16" disabledColor="rgba(255, 184, 84, 1)" :value="item.shopScore" /> <uni-rate :disabled="true" size="16" disabledColor="rgba(255, 184, 84, 1)"
:value="item.shopScore" />
</view> </view>
</view> </view>
<view class="shop-tag"> <view class="shop-tag">
<text style="padding: 4rpx 10rpx;background: rgba(223, 255, 176, 1);color: #777;border-radius: 6rpx;"> <text
style="padding: 4rpx 10rpx;background: rgba(223, 255, 176, 1);color: #777;border-radius: 6rpx;">
{{item.shopTypeTitle == undefined ? '美食' : item.shopTypeTitle}} {{item.shopTypeTitle == undefined ? '美食' : item.shopTypeTitle}}
</text> </text>
</view> </view>
</view> </view>
<view class="shop-content-bottom"> <view class="shop-content-bottom">
<view class="shop-deal"> <view class="shop-deal">
<text v-if = "item.subtitle != null" style="padding: 4rpx 10rpx;background: rgba(223, 255, 176, 1);color: #777;border-radius: 6rpx;"> <text v-if="item.subtitle != null"
style="padding: 4rpx 10rpx;background: rgba(223, 255, 176, 1);color: #777;border-radius: 6rpx;">
{{item.subtitle}} {{item.subtitle}}
</text> </text>
</view> </view>
<view class="shop-deal1"> <view class="shop-deal1">
已拼<text style="color: red;font-weight: 700;"> {{item.saleCount != null ? item.saleCount : 0}} </text> 已拼<text style="color: red;font-weight: 700;">
{{item.saleCount != null ? item.saleCount : 0}} </text>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="shop-bottom" v-if="item.products != null && item.products.length > 0"> <view class="shop-bottom" v-if="item.products != null && item.products.length > 0">
<view class="menu-member" v-if='item1.isPush == 1 && item1.delFlag == 1' v-for="(item1,index1) in item.products" :key="index1" @tap="goDetail('product',item1)"> <view class="menu-member" v-if='item1.isPush == 1 && item1.delFlag == 1'
v-for="(item1,index1) in item.products" :key="index1" @tap="goDetail('product',item1)">
<view class="menu-img"> <view class="menu-img">
<img :src="item1.productPicture" alt=""> <img :src="item1.productPicture" alt="">
</view> </view>
@ -109,7 +121,8 @@
¥{{item1.attributeListPrice | sliceMsg}} ¥{{item1.attributeListPrice | sliceMsg}}
</view> </view>
<view class="shop-menu-purchase"> <view class="shop-menu-purchase">
拼团 <text style="color: red;font-size: 24rpx;padding-left: 10rpx;">¥{{item1.productGroupBuyPrices | slicePrice}}</text> 拼团 <text
style="color: red;font-size: 24rpx;padding-left: 10rpx;">¥{{item1.productGroupBuyPrices | slicePrice}}</text>
</view> </view>
</view> </view>
</view> </view>
@ -139,89 +152,89 @@
data() { data() {
return { return {
loadStatus: 'more', loadStatus: 'more',
isArea:false, isArea: false,
indicatorDots: false, indicatorDots: false,
autoplay: true, autoplay: true,
interval: 4000, interval: 4000,
duration: 1000, duration: 1000,
searchScore: false, searchScore: false,
searchSale: false, searchSale: false,
shopArea:[], shopArea: [],
totalPages:1, totalPages: 1,
searchForm:{ searchForm: {
regionId:JSON.parse(uni.getStorageSync('area')).id, regionId: JSON.parse(uni.getStorageSync('area')).id,
shopType:'', shopType: '',
shopArea:'', shopArea: '',
pageNumber: 1, pageNumber: 1,
keyWord:'', keyWord: '',
pageSize: '10', pageSize: '10',
sort: "shoprank", sort: "shoprank",
order: "desc", order: "desc",
sortOrder:'shoprank', sortOrder: 'shoprank',
orderOrder:'desc', orderOrder: 'desc',
sortScore:'', sortScore: '',
orderScore:'', orderScore: '',
sortSale:'', sortSale: '',
orderSale:'' orderSale: ''
}, },
shopList:[], shopList: [],
menuBtn:[{ menuBtn: [{
name:'美食', name: '美食',
value:'', value: '',
url:'https://jewel-shop.oss-cn-beijing.aliyuncs.com/d6b53eb217644e74bbf957ff7462c27b.png', url: 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/d6b53eb217644e74bbf957ff7462c27b.png',
index:1 index: 1
},{ }, {
name:'甜点饮品', name: '甜点饮品',
value:'', value: '',
url:'https://jewel-shop.oss-cn-beijing.aliyuncs.com/b43aea98962b402f900eca84b2c171ae.png', url: 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/b43aea98962b402f900eca84b2c171ae.png',
index:2 index: 2
},{ }, {
name:'超市便利', name: '超市便利',
value:'', value: '',
url:'https://jewel-shop.oss-cn-beijing.aliyuncs.com/e082a4c10b9a47f0bdb588fb91bc9afb.png', url: 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/e082a4c10b9a47f0bdb588fb91bc9afb.png',
index:3 index: 3
},{ }, {
name:'蔬菜水果', name: '蔬菜水果',
value:'', value: '',
url:'https://jewel-shop.oss-cn-beijing.aliyuncs.com/e6adc80518c24c488522ab19f036af27.png', url: 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/e6adc80518c24c488522ab19f036af27.png',
index:4 index: 4
},{ }, {
name:'看病买药', name: '看病买药',
value:'', value: '',
url:'https://jewel-shop.oss-cn-beijing.aliyuncs.com/766761af471a4f9f90e9a137f9c4f701.png', url: 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/766761af471a4f9f90e9a137f9c4f701.png',
index:5 index: 5
}], }],
menuBtn1:[{ menuBtn1: [{
name:'米粉面馆', name: '米粉面馆',
value:'', value: '',
url:'https://jewel-shop.oss-cn-beijing.aliyuncs.com/8d2f7ffb67a4477ebe663f562b3bd018.png', url: 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/8d2f7ffb67a4477ebe663f562b3bd018.png',
index:6 index: 6
},{ }, {
name:'早点', name: '早点',
value:'', value: '',
url:'https://jewel-shop.oss-cn-beijing.aliyuncs.com/5e4fa14df92942eeb62254c8eb82f122.png', url: 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/5e4fa14df92942eeb62254c8eb82f122.png',
index:7 index: 7
},{ }, {
name:'快餐', name: '快餐',
value:'', value: '',
url:'https://jewel-shop.oss-cn-beijing.aliyuncs.com/05d2286ac1be4ae784858409889690d5.png', url: 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/05d2286ac1be4ae784858409889690d5.png',
index:8 index: 8
},{ }, {
name:'麻辣烫冒菜', name: '麻辣烫冒菜',
value:'', value: '',
url:'https://jewel-shop.oss-cn-beijing.aliyuncs.com/0ac5e0095a5d4097b338ec450df8d3dd.png', url: 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/0ac5e0095a5d4097b338ec450df8d3dd.png',
index:9 index: 9
},{ }, {
name:'汉堡披萨', name: '汉堡披萨',
value:'', value: '',
url:'https://jewel-shop.oss-cn-beijing.aliyuncs.com/14b93d4bce134b3db4b42b13b6993e6c.png', url: 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/14b93d4bce134b3db4b42b13b6993e6c.png',
index:10 index: 10
}], }],
menuButtonInfo:{}, menuButtonInfo: {},
onlineWorkerTotal:0, onlineWorkerTotal: 0,
onlineWorkerAreaList:[], onlineWorkerAreaList: [],
onlineWorkerInterval:2500, onlineWorkerInterval: 2500,
onlineWorkerDuration:500 onlineWorkerDuration: 500
} }
}, },
components: { components: {
@ -238,12 +251,12 @@
} }
return name; return name;
}, },
slicePrice(val){ slicePrice(val) {
let begin = '' let begin = ''
if(val != null){ if (val != null) {
begin = val[0].groupPrice begin = val[0].groupPrice
for(let i = 0;i < val.length;i++){ for (let i = 0; i < val.length; i++) {
if(val[i].groupPrice < begin){ if (val[i].groupPrice < begin) {
begin = val[i].groupPrice begin = val[i].groupPrice
} }
} }
@ -254,7 +267,7 @@
onReachBottom() { onReachBottom() {
if (this.searchForm.pageNumber >= this.totalPages) return; if (this.searchForm.pageNumber >= this.totalPages) return;
// this.status = 'loading'; // this.status = 'loading';
this.searchForm.pageNumber ++; this.searchForm.pageNumber++;
this.getShopList(); this.getShopList();
}, },
@ -272,19 +285,19 @@
// }) // })
}, },
methods: { methods: {
searchShop(type,value){ searchShop(type, value) {
this.searchForm.pageNumber = 1 this.searchForm.pageNumber = 1
if(type == 'area'){ if (type == 'area') {
this.searchForm.shopArea = value this.searchForm.shopArea = value
}else if(type == 'score'){ } else if (type == 'score') {
this.searchScore = !this.searchScore this.searchScore = !this.searchScore
this.searchSale = false this.searchSale = false
this.searchForm.sort = 'shopScore' this.searchForm.sort = 'shopScore'
}else if(type == 'sale'){ } else if (type == 'sale') {
this.searchSale = !this.searchSale this.searchSale = !this.searchSale
this.searchScore = false this.searchScore = false
this.searchForm.sort = 'saleCount' this.searchForm.sort = 'saleCount'
}else if(type == 'all'){ } else if (type == 'all') {
this.searchForm.sortOrder = 'shoprank' this.searchForm.sortOrder = 'shoprank'
this.searchForm.orderOrder = 'desc' this.searchForm.orderOrder = 'desc'
this.searchForm.shopArea = '' this.searchForm.shopArea = ''
@ -292,27 +305,33 @@
this.searchScore = false this.searchScore = false
this.searchScore = false this.searchScore = false
this.searchSale = false this.searchSale = false
}else if(type == 'typeUp'){ } else if (type == 'typeUp') {
//TODO //TODO
} }
this.getShopList(); this.getShopList();
}, },
getEatType(){ buyingye() {
uni.showToast({
title: '店铺不在营业时间!',
icon: 'none'
});
},
getEatType() {
let that = this let that = this
that.tui.request("/dictData/getByCondition", "GET", { that.tui.request("/dictData/getByCondition", "GET", {
sort:'sortOrder', sort: 'sortOrder',
order:'asc', order: 'asc',
dictId:'1712359407444168704' dictId: '1712359407444168704'
}, false, true).then((res) => { }, false, true).then((res) => {
if (res.code == 200) { if (res.code == 200) {
for(let i = 0;i<res.result.content.length;i++){ for (let i = 0; i < res.result.content.length; i++) {
for(let m = 0;m<this.menuBtn.length;m++){ for (let m = 0; m < this.menuBtn.length; m++) {
if(this.menuBtn[m].name == res.result.content[i].title){ if (this.menuBtn[m].name == res.result.content[i].title) {
this.menuBtn[m].value = res.result.content[i].value this.menuBtn[m].value = res.result.content[i].value
} }
} }
for(let m = 0;m<this.menuBtn1.length;m++){ for (let m = 0; m < this.menuBtn1.length; m++) {
if(this.menuBtn1[m].name == res.result.content[i].title){ if (this.menuBtn1[m].name == res.result.content[i].title) {
this.menuBtn1[m].value = res.result.content[i].value this.menuBtn1[m].value = res.result.content[i].value
} }
} }
@ -323,13 +342,14 @@
} }
}).catch((res) => {}) }).catch((res) => {})
}, },
getShopArea(){ getShopArea() {
let that = this let that = this
that.tui.request("/app/shopArea/getByParentId/"+JSON.parse(uni.getStorageSync('area')).id, "GET", {}, false, true).then((res) => { that.tui.request("/app/shopArea/getByParentId/" + JSON.parse(uni.getStorageSync('area')).id, "GET", {},
false, true).then((res) => {
if (res.code == 200) { if (res.code == 200) {
if(res.result != null){ if (res.result != null) {
for(let m = 0;m<res.result.length;m++){ for (let m = 0; m < res.result.length; m++) {
if(res.result[m].isCanteen == 1){ if (res.result[m].isCanteen == 1) {
that.shopArea.push(res.result[m]) that.shopArea.push(res.result[m])
} }
} }
@ -340,9 +360,11 @@
} }
}).catch((res) => {}) }).catch((res) => {})
}, },
getOnlineWorkerCountByCanteenArea(){ getOnlineWorkerCountByCanteenArea() {
let that = this let that = this
that.tui.request("/worker/getOnlineWorkerByArea", "GET", {parentId:JSON.parse(uni.getStorageSync('area')).id}, false, true).then((res) => { that.tui.request("/worker/getOnlineWorkerByArea", "GET", {
parentId: JSON.parse(uni.getStorageSync('area')).id
}, false, true).then((res) => {
if (res.code == 200) { if (res.code == 200) {
const list = Array.isArray(res.result) ? res.result : [] const list = Array.isArray(res.result) ? res.result : []
that.onlineWorkerAreaList = list that.onlineWorkerAreaList = list
@ -353,20 +375,20 @@
} }
}).catch(() => {}) }).catch(() => {})
}, },
getShopList(){ getShopList() {
this.loadStatus = 'loading' this.loadStatus = 'loading'
if(this.searchSale){ if (this.searchSale) {
this.searchForm.sortSale = 'saleCount' this.searchForm.sortSale = 'saleCount'
this.searchForm.orderSale = 'desc' this.searchForm.orderSale = 'desc'
this.searchForm.sortOrder = '' this.searchForm.sortOrder = ''
}else{ } else {
this.searchForm.sortSale = '' this.searchForm.sortSale = ''
} }
if(this.searchScore){ if (this.searchScore) {
this.searchForm.sortScore = 'shopScore' this.searchForm.sortScore = 'shopScore'
this.searchForm.orderScore = 'desc' this.searchForm.orderScore = 'desc'
this.searchForm.sortOrder = '' this.searchForm.sortOrder = ''
}else{ } else {
this.searchForm.sortScore = '' this.searchForm.sortScore = ''
} }
let that = this let that = this
@ -378,6 +400,7 @@
} else { } else {
that.shopList = [...that.shopList, ...res.result.content] that.shopList = [...that.shopList, ...res.result.content]
} }
this.judgeBusinessStatus()
that.totalPages = res.result.totalPages that.totalPages = res.result.totalPages
that.isArea = false that.isArea = false
that.$forceUpdate() that.$forceUpdate()
@ -388,31 +411,60 @@
uni.hideLoading() uni.hideLoading()
}).catch((res) => {}) }).catch((res) => {})
}, },
goDetail(type,item){ judgeBusinessStatus() {
if(type == 'shop'){ for (let i = 0; i < this.shopList.length; i++) {
if (this.shopList[i].shopTakeaway != '') {
if (this.shopList[i].shopTakeaway.status == 0) {
let isEndTime = this.isWithinBusinessHours(this.shopList[i].shopTakeaway.businessHourBegin,this.shopList[i].shopTakeaway.businessHourEnd)
this.shopList[i].shopTakeaway.status = isEndTime ? 0 : 1
}
}
}
},
//
isWithinBusinessHours(begin, end) {
//
const now = new Date();
const currentMinutes = now.getHours() * 60 + now.getMinutes();
// "HH:MM"
const parseTime = (timeStr) => {
const [hours, minutes] = timeStr.split(':').map(Number);
return hours * 60 + minutes;
};
const startMinutes = parseTime(begin);
const endMinutes = parseTime(end);
//
return currentMinutes >= startMinutes && currentMinutes <= endMinutes;
},
goDetail(type, item) {
if (type == 'shop') {
uni.navigateTo({ uni.navigateTo({
url:'/package1/group/groupBuySingle?type=shop&item=' + JSON.stringify(item) url: '/package1/group/groupBuySingle?type=shop&item=' + JSON.stringify(item)
}) })
}else if(type == 'search'){ } else if (type == 'search') {
if(item){ if (item) {
uni.navigateTo({ uni.navigateTo({
url:'/package1/group/searchGroup?shopType=' + (item.value || '') url: '/package1/group/searchGroup?shopType=' + (item.value || '')
}) })
}else{ } else {
uni.navigateTo({ uni.navigateTo({
url:'/package1/group/searchGroup' url: '/package1/group/searchGroup'
}) })
} }
}else{ } else {
uni.navigateTo({ uni.navigateTo({
url:'/package1/group/groupBuySingle?type=product&item=' + JSON.stringify(item) url: '/package1/group/groupBuySingle?type=product&item=' + JSON.stringify(item)
}) })
} }
}, },
back(){ back() {
uni.navigateBack() uni.navigateBack()
}, },
checkArea(){ checkArea() {
this.isArea = !this.isArea this.isArea = !this.isArea
} }
} }
@ -435,13 +487,15 @@
font-size: 24rpx; font-size: 24rpx;
position: relative; position: relative;
} }
.title{
.title {
background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/8bc15960c2dc40268e295d6dd23aecce.png') no-repeat; background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/8bc15960c2dc40268e295d6dd23aecce.png') no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
width: 100%; width: 100%;
height: auto; height: auto;
padding-bottom: 20rpx; padding-bottom: 20rpx;
} }
.swiper { .swiper {
width: 100%; width: 100%;
height: 500rpx; height: 500rpx;
@ -453,6 +507,7 @@
height: 100%; height: 100%;
z-index: 99 !important; z-index: 99 !important;
} }
.menu-box { .menu-box {
width: 100%; width: 100%;
height: 160rpx; height: 160rpx;
@ -477,29 +532,35 @@
font-weight: 700; font-weight: 700;
margin-top: 15rpx; margin-top: 15rpx;
} }
.title-tab{
.title-tab {
width: 95%; width: 95%;
margin: 0 auto; margin: 0 auto;
height: 210rpx; height: 210rpx;
} }
.swiper{
.swiper {
width: 100%; width: 100%;
height: 210rpx; height: 210rpx;
} }
.title-sreach{
.title-sreach {
width: 75%; width: 75%;
display: flex; display: flex;
height: 200rpx; height: 200rpx;
} }
.back-btn{
.back-btn {
padding-top: 110rpx; padding-top: 110rpx;
} }
.title-name{
.title-name {
padding-top: 110rpx; padding-top: 110rpx;
font-size: 36rpx; font-size: 36rpx;
font-weight: 700; font-weight: 700;
} }
.title-search{
.title-search {
margin-top: 110rpx; margin-top: 110rpx;
display: flex; display: flex;
background: #fff; background: #fff;
@ -507,17 +568,20 @@
margin-left: 20rpx; margin-left: 20rpx;
border-radius: 54rpx; border-radius: 54rpx;
flex: 1; flex: 1;
input{
input {
height: 54rpx; height: 54rpx;
line-height: 54rpx; line-height: 54rpx;
} }
} }
.title-sort{
.title-sort {
height: 60rpx; height: 60rpx;
display: flex; display: flex;
margin-top: 20rpx; margin-top: 20rpx;
} }
.sort-member{
.sort-member {
line-height: 60rpx; line-height: 60rpx;
text-align: center; text-align: center;
background: #fff; background: #fff;
@ -525,7 +589,8 @@
margin-left: 4%; margin-left: 4%;
border-radius: 10rpx; border-radius: 10rpx;
} }
.sort-value{
.sort-value {
width: 160rpx; width: 160rpx;
height: auto; height: auto;
max-height: 300rpx; max-height: 300rpx;
@ -538,56 +603,68 @@
color: #fff; color: #fff;
font-size: 22rpx; font-size: 22rpx;
} }
.sort-value1{
.sort-value1 {
border-bottom: 1rpx solid #eee; border-bottom: 1rpx solid #eee;
} }
.shop-list{
.shop-list {
width: 95%; width: 95%;
height: auto; height: auto;
margin: 0 auto; margin: 0 auto;
} }
.shop-member{
.shop-member {
width: 100%; width: 100%;
height: auto; height: auto;
border-radius: 20rpx; border-radius: 20rpx;
background: #fff; background: #fff;
margin-bottom: 20rpx; margin-bottom: 20rpx;
position: relative;
} }
.shop-img{
.shop-img {
width: 160rpx; width: 160rpx;
height: 160rpx; height: 160rpx;
position: relative; position: relative;
img{
img {
width: 100%; width: 100%;
background-size: 100%; background-size: 100%;
height: 100%; height: 100%;
border-radius: 20rpx; border-radius: 20rpx;
} }
} }
.shop-top{
.shop-top {
padding: 20rpx; padding: 20rpx;
display: flex; display: flex;
} }
.shop-content{
.shop-content {
flex: 1; flex: 1;
padding-left: 20rpx; padding-left: 20rpx;
} }
.shop-name{
.shop-name {
font-size: 32rpx; font-size: 32rpx;
font-weight: 900; font-weight: 900;
} }
.shop-content-center{
.shop-content-center {
display: flex; display: flex;
margin: 20rpx 0; margin: 20rpx 0;
} }
.shop-rate{
.shop-rate {
background: rgba(249, 212, 157, 0.34); background: rgba(249, 212, 157, 0.34);
height: 40rpx; height: 40rpx;
display: flex; display: flex;
border-radius: 20rpx; border-radius: 20rpx;
padding: 0 10rpx 0 0; padding: 0 10rpx 0 0;
} }
.shop-rate-num{
.shop-rate-num {
width: 50rpx; width: 50rpx;
height: 100%; height: 100%;
text-align: center; text-align: center;
@ -601,18 +678,22 @@
border-top-right-radius: 10rpx; border-top-right-radius: 10rpx;
font-weight: 700; font-weight: 700;
} }
.shop-tag{
.shop-tag {
flex: 1; flex: 1;
line-height: 40rpx; line-height: 40rpx;
text-align: right; text-align: right;
} }
.shop-content-bottom{
.shop-content-bottom {
display: flex; display: flex;
} }
.shop-deal{
flex:1; .shop-deal {
flex: 1;
} }
.shop-bottom{
.shop-bottom {
border-top: 2rpx solid #eee; border-top: 2rpx solid #eee;
width: 100%; width: 100%;
overflow-x: scroll; overflow-x: scroll;
@ -621,36 +702,43 @@
overflow-y: hidden; overflow-y: hidden;
padding: 10rpx 0 20rpx; padding: 10rpx 0 20rpx;
} }
.menu-member{
.menu-member {
width: 140rpx; width: 140rpx;
height: 100%; height: 100%;
margin: 10rpx 0 0 20rpx; margin: 10rpx 0 0 20rpx;
} }
.menu-img{
.menu-img {
height: 140rpx; height: 140rpx;
width: 140rpx; width: 140rpx;
border-radius: 10px; border-radius: 10px;
img{
img {
width: 100%; width: 100%;
height: 100%; height: 100%;
background-size: 100%; background-size: 100%;
border-radius: 20rpx; border-radius: 20rpx;
} }
} }
.menu-content{
.menu-content {
font-size: 26rpx; font-size: 26rpx;
} }
.shop-menu-name{
.shop-menu-name {
margin-top: 10rpx; margin-top: 10rpx;
font-weight: 700; font-weight: 700;
overflow: hidden; overflow: hidden;
height: 30rpx; height: 30rpx;
} }
.shop-menu-price{
.shop-menu-price {
margin-top: 6rpx; margin-top: 6rpx;
font-weight: 700; font-weight: 700;
} }
.shop-menu-purchase{
.shop-menu-purchase {
display: flex; display: flex;
background: rgba(255, 57, 57, 0.1); background: rgba(255, 57, 57, 0.1);
height: 36rpx; height: 36rpx;
@ -662,7 +750,8 @@
color: #777; color: #777;
font-size: 20rpx; font-size: 20rpx;
} }
.zaixian{
.zaixian {
position: fixed; position: fixed;
bottom: 40rpx; bottom: 40rpx;
left: 10%; left: 10%;
@ -678,22 +767,26 @@
text-align: center; text-align: center;
line-height: normal; line-height: normal;
} }
.zaixian-total{
.zaixian-total {
font-size: 26rpx; font-size: 26rpx;
line-height: 76rpx; line-height: 76rpx;
white-space: nowrap; white-space: nowrap;
} }
.zaixian-divider{
.zaixian-divider {
width: 2rpx; width: 2rpx;
height: 36rpx; height: 36rpx;
background: rgba(0, 35, 28, 0.2); background: rgba(0, 35, 28, 0.2);
margin: 0 18rpx; margin: 0 18rpx;
} }
.zaixian-swiper{
.zaixian-swiper {
flex: 1; flex: 1;
height: 76rpx; height: 76rpx;
} }
.zaixian-item{
.zaixian-item {
height: 76rpx; height: 76rpx;
line-height: 76rpx; line-height: 76rpx;
font-size: 24rpx; font-size: 24rpx;

23
package1/order/orderEvaluate.vue

@ -78,6 +78,7 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="shopData.deliveryType == 1">
<view class="eval-num"> <view class="eval-num">
<view class="eval-num1"> <view class="eval-num1">
您对本次配送人员还满意吗 您对本次配送人员还满意吗
@ -108,6 +109,8 @@
</view> </view>
</view> </view>
</view> </view>
</view>
<view style="border: none;padding: 0 30rpx;display: flex;height: 100rpx;line-height: 100rpx;"> <view style="border: none;padding: 0 30rpx;display: flex;height: 100rpx;line-height: 100rpx;">
<view v-if="selected == 'niming'" @tap="checkVoucher('shiming')" class="radio-check"> <view v-if="selected == 'niming'" @tap="checkVoucher('shiming')" class="radio-check">
<uni-icons type="checkmarkempty" size="12"></uni-icons> <uni-icons type="checkmarkempty" size="12"></uni-icons>
@ -142,6 +145,7 @@
shopRemark:'', shopRemark:'',
manRemark:'', manRemark:'',
shopPicture:'', shopPicture:'',
manId:'',
manPicture:'', manPicture:'',
evalNumList:[{ evalNumList:[{
name:'很糟糕', name:'很糟糕',
@ -174,11 +178,26 @@
}, },
onLoad(option) { onLoad(option) {
this.shopData = JSON.parse(option.item) this.shopData = JSON.parse(option.item)
console.log(this.shopData.deliveryType)
if(this.shopData.deliveryType == 1){
this.getOrderDetail()
}
}, },
onShow() { onShow() {
this.menuButtonInfo = uni.getMenuButtonBoundingClientRect() this.menuButtonInfo = uni.getMenuButtonBoundingClientRect()
}, },
methods: { methods: {
getOrderDetail(){
let that = this
that.tui.request("/mall/order/detail/"+this.shopData.id, "GET", {}, false, true).then((res) => {
if (res.code == 200) {
that.manId = res.result.deliveryInfo.id;
} else {
that.tui.toast(res.message)
}
}).catch((res) => {})
uni.hideLoading();
},
submit(){ submit(){
let that = this; let that = this;
let data = [{ // let data = [{ //
@ -202,9 +221,9 @@
createByIcon:'https://ooo.0o0.ooo/2019/04/28/5cc5a71a6e3b6.png', createByIcon:'https://ooo.0o0.ooo/2019/04/28/5cc5a71a6e3b6.png',
score:this.manEvaluateNum, score:this.manEvaluateNum,
orderId:this.shopData.id, orderId:this.shopData.id,
shopId:this.shopData.shopId, shopId:this.manId,
}] }]
that.tui.request("/app/comment/save", "POST", data, false, true).then((res) => { that.tui.request("/app/comment/save", "POST", data, false, false).then((res) => {
if (res.code == 200) { if (res.code == 200) {
uni.showToast({ uni.showToast({
title: "评论成功", title: "评论成功",

5
package1/order/orderList.vue

@ -369,9 +369,10 @@
} }
}, },
onLoad(option) { onLoad(option) {
this.getOrderList()
}, },
onShow() { onShow() {
this.getOrderList()
this.menuButtonInfo = uni.getMenuButtonBoundingClientRect() this.menuButtonInfo = uni.getMenuButtonBoundingClientRect()
}, },
methods: { methods: {
@ -463,7 +464,7 @@
}); });
}, },
goEvaluate(item){ goEvaluate(item){
uni.redirectTo({ uni.navigateTo({
url: '/package1/order/orderEvaluate?item=' + JSON.stringify(item) url: '/package1/order/orderEvaluate?item=' + JSON.stringify(item)
}); });
}, },

Loading…
Cancel
Save