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

1

master
tianyi 3 weeks ago
parent
fcff98db19
commit
080b6163f1
3 changed files with 34 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      package1/group/groupBuySingle.vue
  2. 3
      package1/order/returnOrder.vue
  3. 54
      package1/runErrand/runErrand.vue

20
package1/group/groupBuySingle.vue
View File

@ -822,8 +822,7 @@
methods: { methods: {
// 页面touchmove事件：吸顶后阻止页面整体滑动（让goods-list接管滚动） // 页面touchmove事件：吸顶后阻止页面整体滑动（让goods-list接管滚动）
onPageTouchMove(e) { onPageTouchMove(e) {
// 吸顶状态下不需要额外处理，scroll-view会自己处理
console.log(e)
}, },
// goods-list滚动事件：检测分类切换 + 滚回顶部取消吸顶 // goods-list滚动事件：检测分类切换 + 滚回顶部取消吸顶
onGoodsListScroll(e) { onGoodsListScroll(e) {
@ -905,7 +904,7 @@
if (this.productItem[i].sellBeginTime != '' && this.productItem[i].sellEndTime != '') { if (this.productItem[i].sellBeginTime != '' && this.productItem[i].sellEndTime != '') {
let isEndTime = this.isWithinBusinessHours(this.productItem[i].sellBeginTime, this let isEndTime = this.isWithinBusinessHours(this.productItem[i].sellBeginTime, this
.productItem[i].sellEndTime) .productItem[i].sellEndTime)
console.log(isEndTime)
this.productItem[i].status = isEndTime ? 0 : 1 this.productItem[i].status = isEndTime ? 0 : 1
} }
if (that.productItem[i].isMoreBuy == 1) { if (that.productItem[i].isMoreBuy == 1) {
@ -1034,9 +1033,7 @@
}); });
} }
} }
} catch (e) { } catch (e) {}
console.log(e);
}
} }
this.isPintuan = true; this.isPintuan = true;
@ -1169,9 +1166,7 @@
}); });
} }
} }
} catch (e) { } catch (e) {}
console.log(e);
}
} }
if (index == 'pintuan') { if (index == 'pintuan') {
@ -1454,7 +1449,6 @@
const startMinutes = parseTime(begin); const startMinutes = parseTime(begin);
const endMinutes = parseTime(end); const endMinutes = parseTime(end);
console.log(currentMinutes + ',' + startMinutes + ',' + endMinutes)
// 判断是否在区间内（包含端点） // 判断是否在区间内（包含端点）
return currentMinutes >= startMinutes && currentMinutes <= endMinutes; return currentMinutes >= startMinutes && currentMinutes <= endMinutes;
@ -1501,9 +1495,9 @@
}, },
goDetail(type) { goDetail(type) {
if (type == 'goodsDetail') { if (type == 'goodsDetail') {
uni.navigateTo({ // uni.navigateTo({
url: '/package1/goods/goodsDetail' // url: '/package1/goods/goodsDetail'
}) // })
} else if (type == 'shopDetail') { } else if (type == 'shopDetail') {
uni.navigateTo({ uni.navigateTo({
url: '/package1/group/groupBuyDetail?item=' + JSON.stringify(this.shopItem) url: '/package1/group/groupBuyDetail?item=' + JSON.stringify(this.shopItem)

3
package1/order/returnOrder.vue
View File

@ -890,8 +890,7 @@
background: #fff; background: #fff;
max-height: 1200rpx; max-height: 1200rpx;
width: 100%; width: 100%;
border-top-left-radius: 20rpx; border-radius: 20rpx;
border-top-right-radius: 20rpx;
padding: 20rpx; padding: 20rpx;
overflow: scroll; overflow: scroll;
} }

54
package1/runErrand/runErrand.vue
View File

@ -207,41 +207,39 @@
<view class="content-title"> <view class="content-title">
订单备注 订单备注
</view> </view>
<view style="height: 200rpx;background: rgba(247, 248, 248, 0.6);border-radius: 40rpx;padding: 20rpx;width: 70%;margin-top: 20rpx;"> <view style="height: 200rpx;background: rgba(247, 248, 248, 0.6);border-radius: 40rpx;padding: 20rpx;margin-top: 20rpx;flex: 1;">
<textarea v-model="addFormData.remark" cols="30" rows="10" placeholder="请填写备注" style="height: 160rpx;width: 100%;"></textarea> <textarea v-model="addFormData.remark" cols="30" rows="10" placeholder="请填写备注" style="height: 160rpx;width: 100%;"></textarea>
</view> </view>
</view> </view>
</view> <view style="display: flex;height: 80rpx;line-height: 80rpx;font-weight: 700; align-items:center;padding: 0 4%;border-top: 1px solid #eee;margin-top: 10px;" @tap="openCouponPopup">
<view style="flex: 1;">
<view style="display: flex;height: 80rpx;line-height: 80rpx;font-weight: 700; align-items:center;padding: 0 4%;" @tap="openCouponPopup"> 优惠券
<view style="flex: 1;"> </view>
优惠券 <view style="color: #ff5722;" v-if="selectedCoupon">
</view> -￥{{selectedCoupon.discountAmount.toFixed(2)}}
<view style="color: #ff5722;" v-if="selectedCoupon"> </view>
-￥{{selectedCoupon.discountAmount.toFixed(2)}} <view style="color: #0b9b73;" v-else-if="availableCoupons.length > 0">
</view> 有 {{availableCoupons.length}} 张可用
<view style="color: #0b9b73;" v-else-if="availableCoupons.length > 0"> </view>
有 {{availableCoupons.length}} 张可用 <view style="color: #999;" v-else>
</view> 无可用券
<view style="color: #999;" v-else> </view>
无可用券 <uni-icons type="right" size="14" color="#999" style="margin-left:10rpx;"></uni-icons>
</view>
<uni-icons type="right" size="14" color="#999" style="margin-left:10rpx;"></uni-icons>
</view>
<view style="height: 80rpx;line-height: 80rpx;display: flex;padding: 0 4%;">
<view style="flex: 1;font-weight: 700;">
{{isKuaidi?'代取配送费':'跑腿费'}}
</view> </view>
<view style="color: #000;font-weight:700;"> <view style="height: 80rpx;line-height: 80rpx;display: flex;padding: 0 4%;">
￥{{deliveryFeeCalc.toFixed(2)}} <view style="flex: 1;font-weight: 700;">
{{isKuaidi?'代取配送费':'跑腿费'}}
</view>
<view style="color: #000;font-weight:700;">
￥{{deliveryFeeCalc.toFixed(2)}}
</view>
</view> </view>
</view>
<view style="display: flex;height: 80rpx;line-height: 100rpx;font-weight: 700;padding: 0 4%;"> <view style="display: flex;height: 80rpx;line-height: 100rpx;font-weight: 700;padding: 0 4%;">
<view style="flex: 1;">合计</view> <view style="flex: 1;">合计</view>
<view>￥{{totalAmountCalc.toFixed(2)}}</view> <view>￥{{totalAmountCalc.toFixed(2)}}</view>
</view>
</view> </view>
<view style="width: 100%;height: 520rpx;"></view> <view style="width: 100%;height: 520rpx;"></view>
</view> </view>

Write Preview
Loading…
Cancel
Save