tianyi 4 weeks ago
parent
commit
21c6b10952
  1. 3
      package2/IdleTrad/chat.vue
  2. 10
      package2/group/groupBuyDetail.vue
  3. 1
      package2/group/groupBuyList.vue
  4. 292
      package2/group/groupBuySingle.vue
  5. 2
      package2/partTimeJob/workerOrderList.vue

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()
},
//

1
package2/group/groupBuyList.vue

@ -557,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)

292
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() {
@ -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'
});
}
}
}
@ -1850,7 +1853,7 @@
}
.radio-check {
background: linear-gradient(90deg, #e3ff96, #a6ffea);
background: linear-gradient(90deg, #e3ff96, #a6ffea);
width: 42rpx;
height: 42rpx;
border-radius: 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);
}
@ -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 {

2
package2/partTimeJob/workerOrderList.vue

@ -161,7 +161,7 @@
},
delPlus(data){
if (data.endsWith("+")) {
data = data.slice(0, -1); //
data = data.slice(0, -1);
}
return data;
}

Loading…
Cancel
Save