Elbert Chen před 2 roky
rodič
revize
8a9b9194d0

+ 1 - 1
pages/cart/pages/confirmOrder/confirmOrder.js

@@ -445,7 +445,7 @@ Page({
           })
           that.wxPayment(res.data.data.payment, orderId);
         }
-        if (res.data.data.pay_type == 30 || res.data.data.pay_type == 40) {
+        if (res.data.data.pay_type == 30 || res.data.data.pay_type == 40 || res.data.data.pay_type == 50) {
           utils.toast('支付成功');
           app.getCartNumber();
           that.toNextPage(orderId)

+ 1 - 1
pages/cart/pages/confirmOrder/confirmOrder.wxml

@@ -156,7 +156,7 @@
                     <view class='good_num'>共{{item.total_num}}件</view>
                     <view class="price_box">
                         <text class='text'>小计:</text>
-                        <text class='price'><text>¥</text>{{item.total_pay_price}}</text>
+                        <text class='price'><text>¥</text>{{item.total_pay_price||'0.00'}}</text>
                     </view>
                 </view>
             </block>

+ 46 - 0
pages/index/pages/bonusShop/bonusShop.js

@@ -7,6 +7,7 @@ Page({
   data: {
     isLoading: true, //是否处于加载
     goodsList: [], //积分商品
+    exchangeList: [],
     Limitcouponlist: [], //限时抢购优惠券
     couponState: 0, //0:可领取 1:已领取 2:领完啦
     showConfirmModal: false, //是否显示确定激活弹窗
@@ -65,6 +66,8 @@ Page({
     });
     if (index < 2 && tabSelected !== index) {
         this.getPageData()
+    } else if (index == 2) {
+        this.getExchangeList()
     }
   },
   //获取积分产品
@@ -281,4 +284,47 @@ Page({
     let url = "/pages/cart/pages/confirmOrder/confirmOrder?data=" + JSON.stringify(data);
     app.navigateToUrl(url);
   },
+  //列表
+  getExchangeList(){
+    // dataType  //订单类型 (all全部 payment待付款 received待发货 received待收货 comment待评价)
+    let that = this, request_url = '';
+    wx.showLoading({
+			title: "加载中"
+		});
+    http.request({
+      method: 'GET',
+      url: api.URL + '/api/order/list?isExchange=1&dataType=all',
+      token: utils.getStorageSync(storeKeys.TOKEN),
+      success: (res) => {
+				wx.hideLoading();
+        let data_obj = res.data.data.list
+        data_obj.data.forEach((item)=>{
+          item.isShowMoreBtn = false
+          if(item.state_value==30 && item.za){//已完成
+            item.isShowMoreBtn = true
+            item.leftBox = false
+          }
+        })
+        console.log(data_obj.data)
+        let list = [];
+        if (that.data.page == 1) {
+          list = data_obj.data;
+        } else {
+          list = that.data.list.concat(data_obj.data);
+        }
+        that.setData({ 
+          exchangeList: list,
+          isLoading: false
+        });
+        // console.log(that.data.list)
+        if (data_obj.total == 0) {
+          that.setData({ is_bottom: false });
+        }
+        if (data_obj.current_page >= data_obj.last_page && data_obj.total > 0) {
+          that.setData({ is_bottom: true });
+        }
+      },
+      error: (res) => {},
+    })
+  },
 });

+ 2 - 2
pages/index/pages/bonusShop/bonusShop.wxml

@@ -1,5 +1,5 @@
 <wxs module="textUtil" src="../../../../utils/textUtil.wxs" />
-<view class="pageContainer" wx:if="{{!isLoading}}">
+<view class="pageContainer" >
     <view class="top-view">
         <image class="background-image" src="../../static/bonus_shop_bg.png" />
         <view class="my-bonus">
@@ -68,7 +68,7 @@
             </view>
         </view>
         <view class="pageMian" wx:else>
-             <view class="every_box" wx:for="{{list}}" wx:key="order_id"  data-idx='{{index}}' data-id='{{item.order_id}}'>
+             <view class="every_box" wx:for="{{exchangeList}}" wx:key="order_id"  data-idx='{{index}}' data-id='{{item.order_id}}'>
                 <view class="part_1 flex-c">
                     <view class="time">{{item.create_time}}</view>
                     <view class='{{item.state_text=="待付款" || item.state_text=="待收货"?"status status_item":"status"}}'>{{item.state_text}}</view>

+ 297 - 0
pages/index/pages/bonusShop/bonusShop.wxss

@@ -225,6 +225,7 @@ page {
 }
 .pageMian{
   padding: 24rpx 32rpx;
+  background-color: #F7F7F7;
 }
 .goodsList {
   flex-wrap: wrap;
@@ -362,4 +363,300 @@ page {
 .addCartBox image {
   width: 56rpx;
   height: 56rpx;
+}
+
+
+/* 列表页 */
+.has_list{
+    padding: 90rpx 32rpx 0;
+}
+.has_list_card{
+    padding: 0rpx 32rpx 0 !important;
+}
+.every_box{
+    margin-top: 24rpx;
+    padding: 24rpx;
+    background: #fff;
+    width: 686rpx;
+    border-radius: 16rpx;
+}
+.every_box > .part_1 > .time{
+    color: #909297;
+    font-size: 26rpx;
+}
+.every_box > .part_1 > .status{
+    color: #909297;
+    font-size: 30rpx;
+    margin-left: auto;
+}
+.every_box > .part_1 > .refund_status{
+    color: #000000;
+    font-size: 28rpx;
+    margin-left: auto;
+}
+.every_box > .part_1 > .refund_status .icon_1{
+   width: 32rpx;
+   height: 32rpx;
+   margin-right: 8rpx;
+}
+
+.every_box > .part_1 > .status_item{
+    color: #E73E2D!important;
+}
+.every_box > .goods_box{
+    margin-top: 22rpx;
+}
+.every_box > .goods_box > .left{
+    flex: 1;
+    margin-right: 8rpx;
+    overflow-x: auto;
+    white-space:nowrap;
+}
+.every_box > .goods_box > .left > .img_box{
+    overflow-x: auto;
+    white-space:nowrap;
+}
+.every_box > .goods_box > .left > .img_box::-webkit-scrollbar {
+    display:none;
+}
+.every_box > .goods_box > .left > .img_box > image{
+    width: 140rpx;
+    height: 140rpx;
+    background: #edf0f6;
+    border-radius: 8rpx;
+    margin-right: 16rpx;
+    flex-shrink: 0;
+}
+.every_box > .goods_box > .img_1{
+    flex:1;
+    margin-right: 24rpx;
+}
+.every_box > .goods_box > .img_1 > image{
+    width: 140rpx;
+    height: 140rpx;
+    background: #edf0f6;
+    border-radius: 8rpx;
+    margin-right: 16rpx;
+    flex-shrink: 0;
+}
+.every_box > .goods_box > .img_1 > .t{
+    font-size: 30rpx;
+    color: #161719;
+    max-width: 292rpx;
+}
+/* 米卡样式 */
+.every_box > .goods_box > .img_1 > .rice_right > .t{
+    font-size: 30rpx;
+    color: #161719;
+    max-width: 294rpx;
+    line-height: 42rpx;
+    padding-top: 4rpx;
+}
+.every_box > .goods_box > .img_1 > .rice_right > .desc{
+    font-size: 26rpx;
+    color: #909297;
+    max-width: 294rpx;
+    padding-top: 6rpx;
+    line-height: 36rpx;
+}
+.every_box > .goods_box > .right > .t{
+    font-size: 26rpx;
+    color: #909297;
+    margin-top: 8rpx;
+    text-align: right;
+}
+/* 米卡样式区分 */
+.every_box > .goods_box > .right > .rice_t{
+    margin-top: 2rpx !important;
+}
+.every_box > .goods_box > .right > .price_style{
+    color: #161719;
+    font-size: 24rpx;
+}
+.every_box > .goods_box > .right > .price_style > text{
+    font-size: 36rpx;
+}
+/* 米卡支付部分 */
+.every_box > .part_rice_pay{
+    justify-content: flex-end;
+    margin-top: 16rpx;
+    margin-bottom: 24rpx;
+}
+.every_box > .part_rice_pay > .every {
+    color: #909297;
+}
+.every_box > .part_rice_pay > .every > .t{
+    font-size: 20rpx;
+}
+.every_box > .part_rice_pay > .every > .money{
+    font-size: 26rpx;
+}
+.every_box > .part_rice_pay > .every_bold{
+    color: #161719;
+    margin-left: 14rpx;
+}
+/* 按钮 */
+.every_box > .part_btn{
+    margin-top: 16rpx;
+    justify-content: flex-end;
+    align-items: center;
+}
+.every_box > .part_btn > .btn{
+    width: 176rpx;
+    min-width: 176rpx;
+    height: 64rpx;
+    border: 1px solid #e0e1e5;
+    border-radius: 48rpx;
+    color: #161719;
+    font-size: 28rpx;
+    /* margin-left: 16rpx; */
+    margin-right: 16rpx;
+    font-weight: 500;
+}
+.every_box > .part_btn > .btn:last-child{
+    margin-right: 0 !important;
+}
+.every_box > .part_btn > .gray{
+    color: #909297;
+}
+.every_box > .part_btn > .share_btn button{
+    width: 98%;
+    height: 96%;
+    border-radius: 48rpx;
+    font-size: 28rpx;
+    font-weight: 500;
+    color: #E73E2D;
+}
+.every_box > .part_btn > .item{
+    border: 1px solid #E73E2D;
+    color: #E73E2D;
+}
+/* .every_box > .part_btn > .has_comment{
+    font-size: 24rpx;
+    color: #909297;
+    margin-right: auto;
+} */
+.every_box > .part_btn > .part_more{
+    font-size: 24rpx;
+    font-weight: 500;
+    color: #909297;
+    position: relative;
+    margin-right: auto;
+}
+.every_box > .part_btn > .part_more > .out_box{
+    width: 260rpx;
+    background: #fff;
+    border-radius: 16rpx;
+    position: absolute;
+    left: -4rpx;
+    top: 54rpx;
+    z-index: 999;
+    filter: drop-shadow(0px 1px 3px rgba(0, 0, 0, 0.3));
+}
+.every_box > .part_btn > .part_more > .out_box > .icon{
+    width: 0;
+    height: 0;
+    position: absolute;
+    border: 20rpx solid transparent;
+    border-top: none;
+    border-bottom-color: #fff;
+    top: -18rpx;
+    left: 8rpx;
+}
+.every_box > .part_btn > .part_more > .out_box > .btn{
+    padding: 24rpx 0 24rpx 40rpx;
+    font-size: 28rpx;
+    font-weight: 500;
+    color: #000000;
+}
+.more_model{
+    position: fixed;
+    width: 100%;
+    height: 100%;
+    z-index: 99;
+    top: 0;
+    left: 0;
+    background: transparent;
+}
+/* 退款 */
+.every_box > .part_1_refund{
+    padding-bottom: 16rpx;
+    position: relative;
+}
+.every_box > .part_1_refund::after{
+    content: '';
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    background: #E0E1E5;
+    width: 100%;
+    height: 2rpx;
+    -webkit-transform: scaleY(0.5);
+    transform: scaleY(0.5);
+    -webkit-transform-origin: 0 0;
+    transform-origin: 0 0;
+    z-index: 20;
+}
+/* 退款商品 */
+.goods_box_refund_list{
+
+}
+.goods_box_refund{
+    margin-top: 24rpx;
+}
+.goods_box_refund > .refund_image{
+    width: 168rpx;
+    height: 168rpx;
+    background: #f5f5f5;
+    border-radius: 8rpx;
+    flex-shrink: 0;
+}
+.goods_box_refund > .right{
+    padding-left: 16rpx;
+    flex:1;
+    position: relative;
+}
+.goods_box_refund > .right > .t{
+    font-size: 28rpx;
+    color: #161719;
+    line-height: 40rpx;
+}
+.goods_box_refund > .right > .desc{
+    width: 410rpx;
+    font-size: 24rpx;
+    color: #909297;
+    margin-top: 8rpx;
+}
+.goods_box_refund > .right > .bottom_box{
+    font-size: 24rpx;
+    color: #E73E2D;
+    position: absolute;
+    bottom: 0;
+}
+.every_box > .refund_money{
+    /* margin-top: 26rpx; */
+    margin-top: 4rpx;
+    font-size: 24rpx;
+    color: #e73e2d;
+    justify-content: flex-end;
+    line-height: 34rpx;
+}
+.every_box > .refund_money > .every_2{
+    margin-left: 32rpx;
+}
+.every_box > .refund_status_box{
+    width: 638rpx;
+    height: 56rpx;
+    background: #f7f7f7;
+    border-radius: 8rpx;
+    font-size: 28rpx;
+    color: #161719;
+    margin-top: 24rpx;
+    padding: 0 16rpx;
+}
+.every_box > .part_btn_refund{
+    margin-top: 24rpx !important;
+}
+.every_box > .part_btn_refund > .width1{
+    width: 204rpx!important;
 }