Commit 5121a32544a3518083b2768c9a8a2e49a2ee61e6
1 parent
f2f829ff
我的、线下订单页增加物流提醒
Showing
5 changed files
with
44 additions
and
4 deletions
pages/user/index/index.js
| @@ -237,8 +237,26 @@ Page({ | @@ -237,8 +237,26 @@ Page({ | ||
| 237 | }); | 237 | }); |
| 238 | } | 238 | } |
| 239 | } | 239 | } |
| 240 | - }) | ||
| 241 | - | 240 | + }); |
| 241 | + | ||
| 242 | + /*-----物流信息提醒-----*/ | ||
| 243 | + rq.get('/api/weshop/order/countDadaOrder', { | ||
| 244 | + isShowLoading:0, | ||
| 245 | + data: { | ||
| 246 | + user_id: e.user_id, | ||
| 247 | + store_id: os.stoid, | ||
| 248 | + }, | ||
| 249 | + success: function(su) { | ||
| 250 | + if (su.data.code == 0) { | ||
| 251 | + th.setData({ | ||
| 252 | + countDadaOrder: su.data.data | ||
| 253 | + }); | ||
| 254 | + } | ||
| 255 | + } | ||
| 256 | + }); | ||
| 257 | + | ||
| 258 | + | ||
| 259 | + | ||
| 242 | 260 | ||
| 243 | //--初始化是否有打勾-- | 261 | //--初始化是否有打勾-- |
| 244 | getApp().request.get("/api/weshop/users/grade/vip/init/get", { | 262 | getApp().request.get("/api/weshop/users/grade/vip/init/get", { |
| @@ -395,6 +413,11 @@ Page({ | @@ -395,6 +413,11 @@ Page({ | ||
| 395 | } | 413 | } |
| 396 | }) | 414 | }) |
| 397 | //th.requestRecommend(); | 415 | //th.requestRecommend(); |
| 416 | + | ||
| 417 | + | ||
| 418 | + | ||
| 419 | + | ||
| 420 | + | ||
| 398 | } | 421 | } |
| 399 | 422 | ||
| 400 | /*-- | 423 | /*-- |
| @@ -817,6 +840,8 @@ Page({ | @@ -817,6 +840,8 @@ Page({ | ||
| 817 | } | 840 | } |
| 818 | }) | 841 | }) |
| 819 | }, | 842 | }, |
| 843 | + | ||
| 844 | + | ||
| 820 | 845 | ||
| 821 | 846 | ||
| 822 | }) | 847 | }) |
pages/user/index/index.wxml
| @@ -97,11 +97,13 @@ | @@ -97,11 +97,13 @@ | ||
| 97 | <view class="xc-after-sale rel"> | 97 | <view class="xc-after-sale rel"> |
| 98 | <!-- 顶上的一栏 --> | 98 | <!-- 顶上的一栏 --> |
| 99 | <view class="xc-equity-title flex-level" bindtap="go_order" data-url="/pages/user/order_list/order_list"> | 99 | <view class="xc-equity-title flex-level" bindtap="go_order" data-url="/pages/user/order_list/order_list"> |
| 100 | - <view class="xc-title-frame flex-space-between"> | 100 | + <view class="xc-title-frame flex ai-center"> |
| 101 | <view class="flex-vertical xc-title-content"> | 101 | <view class="flex-vertical xc-title-content"> |
| 102 | <image class="xc-title-img" src="{{iurl}}/miniapp/images/hdindan.png" style="width: 50rpx; height: 55rpx;margin-right: 5rpx"></image> | 102 | <image class="xc-title-img" src="{{iurl}}/miniapp/images/hdindan.png" style="width: 50rpx; height: 55rpx;margin-right: 5rpx"></image> |
| 103 | <view class="three-level-word">我的订单</view> | 103 | <view class="three-level-word">我的订单</view> |
| 104 | </view> | 104 | </view> |
| 105 | + <!-- 物流信息提醒 --> | ||
| 106 | + <view class="fs26 c-5 pdl60" wx:if="{{countDadaOrder != 0}}"><text class="iconfont icon-dingwei"></text>您有<text class="c-red">{{countDadaOrder}}</text>个同城配送订单</view> | ||
| 105 | </view> | 107 | </view> |
| 106 | <view class="three-level-word xc-more-frame flex-vertical"> | 108 | <view class="three-level-word xc-more-frame flex-vertical"> |
| 107 | <view class="three-level-word xc-more">更多</view> | 109 | <view class="three-level-word xc-more">更多</view> |
pages/user/index/index.wxss
| @@ -725,4 +725,13 @@ button::after{ border: 0} | @@ -725,4 +725,13 @@ button::after{ border: 0} | ||
| 725 | width: 132rpx; | 725 | width: 132rpx; |
| 726 | height: 37rpx; | 726 | height: 37rpx; |
| 727 | margin-right: 10rpx; | 727 | margin-right: 10rpx; |
| 728 | +} | ||
| 729 | + | ||
| 730 | +.icon-dingwei { | ||
| 731 | + color: #EA4F2B; | ||
| 732 | + font-size: 28rpx; | ||
| 733 | +} | ||
| 734 | + | ||
| 735 | +.c-5 { | ||
| 736 | + color: #555; | ||
| 728 | } | 737 | } |
| 729 | \ No newline at end of file | 738 | \ No newline at end of file |
pages/user/order_list/order_list.wxml
| @@ -241,7 +241,10 @@ | @@ -241,7 +241,10 @@ | ||
| 241 | <view class="offline-container" wx:else> | 241 | <view class="offline-container" wx:else> |
| 242 | <view class="offline-list"> | 242 | <view class="offline-list"> |
| 243 | <view class="item" wx:for="{{list2}}"> | 243 | <view class="item" wx:for="{{list2}}"> |
| 244 | - <view class="title"><text class="iconfont icon-order"></text>单号：{{item.No}}</view> | 244 | + <view class="title"> |
| 245 | + <view><text class="iconfont icon-order"></text>单号：{{item.No}}</view> | ||
| 246 | + <view>{{item.states}}</view> | ||
| 247 | + </view> | ||
| 245 | <view class="subtitle"> | 248 | <view class="subtitle"> |
| 246 | <text>{{item.BillDate}}</text> | 249 | <text>{{item.BillDate}}</text> |
| 247 | <view>消费总额：<text class="co-red fs28">￥{{item.Sum}}</text></view> | 250 | <view>消费总额：<text class="co-red fs28">￥{{item.Sum}}</text></view> |
pages/user/order_list/order_list.wxss
| @@ -566,6 +566,7 @@ page { | @@ -566,6 +566,7 @@ page { | ||
| 566 | padding: 20rpx; | 566 | padding: 20rpx; |
| 567 | font-size: 26rpx; | 567 | font-size: 26rpx; |
| 568 | display: flex; | 568 | display: flex; |
| 569 | + justify-content: space-between; | ||
| 569 | align-items: center; | 570 | align-items: center; |
| 570 | } | 571 | } |
| 571 | .icon-order { | 572 | .icon-order { |