优化

zhiyangdu
1 parent 1af48dc1
Showing 4 changed files with 48 additions and 26 deletions
src/components/giftGivingItem/giftGivingItem.vue
src/components/receivingGiftsItem/receivingGiftsItem.vue
src/pages/myGiftBox/myGiftBox.less
src/pages/myGiftBox/myGiftBox.vue
@@ -8,27 +8,27 @@
         >
             <!--用户信息-->
             <div class="user_info">
-                <div class="name">{{item.create_time*1000 | datetime('yyyy-MM-dd hh:mm:ss')}}</div>
+                <div class="name" v-if="item&&item.create_time">{{item.create_time*1000 | datetime('yyyy-MM-dd hh:mm:ss')}}</div>
                 <div class="gift_active">
-                    <span v-if="item.status==0">待支付</span>
-                    <span v-else-if="item.status==1">分享</span>
-                    <span v-else-if="item.status==2">已领完</span>
-                    <span v-else-if="item.status==3">已关闭</span>
-                    <span v-else-if="item.status==4">部分退款中(可分享)</span>
-                    <span v-else-if="item.status==5">部分退款中（不可分享</span>
-                    <span v-else-if="item.status==6">退款中</span>
+                    <span v-if="item&&item.status==0">待支付</span>
+                    <span v-else-if="item&&item.status==1">分享</span>
+                    <span v-else-if="item&&item.status==2">已领完</span>
+                    <span v-else-if="item&&item.status==3">已关闭</span>
+                    <span v-else-if="item&&item.status==4">部分退款中(可分享)</span>
+                    <span v-else-if="item&&item.status==5">部分退款中（不可分享</span>
+                    <span v-else-if="item&&item.status==6">退款中</span>
                     </div>
             </div>
             <!--商品信息-->
             <div class="item_info">
-                <img v-lazy="item.goods.simg" />
+                <img v-if="item&&item.goods&&item.goods.simg" v-lazy="item.goods.simg" />
                 <div class="box">
-                    <div class="name">{{ item.goods.title }}</div>
+                    <div v-if="item&&item.goods&&item.goods.create_time" class="name">{{ item.goods.title }}</div>
                     <div class="pirce">
-                        <div class="title">
+                        <div v-if="item&&item.goods&&item.goods.price" class="title">
                             <span>￥</span>{{ item.goods.price }}
                         </div>
-                        <div class="btn">
+                        <div v-if="item&&item.goods&&item.goods.num" class="btn">
                             总数：{{ parseInt(item.goods.num) }}
                         </div>
                     </div>
@@ -36,16 +36,16 @@
             </div>
             <!-- 显示文字 -->
             <div class="text_tip">
-                <span v-show="item.total_num">可分享<num>{{item.total_num}}</num>人,</span>
-                <span v-show="item.give_num">已领 <num>{{item.give_num}}</num> 人,</span>
-                <span v-show="item.no_address_num"><num>{{item.no_address_num}}</num> 人未填写地址,</span>
-                <span v-show="item.refund_num"><num>{{item.refund_num}}</num>人退款中</span>
+                <span v-show="item&&item.total_num">可分享<num>{{item.total_num}}</num>人,</span>
+                <span v-show="item&&item.give_num">已领 <num>{{item.give_num}}</num> 人,</span>
+                <span v-show="item&&item.no_address_num"><num>{{item.no_address_num}}</num> 人未填写地址,</span>
+                <span v-show="item&&item.refund_num"><num>{{item.refund_num}}</num>人退款中</span>
             </div>
             <!-- 按钮 -->
             <div class="btn_list">
                 <div class="box">
                     <div class="btn">取消支付</div>
-                    <div class="active">立即支付</div>
+                    <div @click="jumpToPay(item)" class="active">立即支付</div>
                 </div>
             </div>
         </div>
@@ -54,7 +54,7 @@
 <script>
 export default {
-    name: "name",
+    name: "",
     data() {
         return {};
     },
@@ -64,7 +64,11 @@ export default {
          // 跳转到礼物详情页
         onGiftGiving(item){
              this.$emit('onGiftGiving',item)
-        }
+        },
+        // 跳转到原声生支付
+        jumpToPay(item){
+             this.$emit('jumpToPay',item)
+        },
     }
 };
 </script>
@@ -5,14 +5,16 @@
             v-for="(item, index) in receivingGiftsInfo"
             :key="index"
             @click="onReceivingGifts(item)"
+            v-if="item"
         >
             <!--用户信息-->
             <div class="user_info">
                 <img
+                    v-if="item&&item.user&&item.user.img"
                     v-on:click.stop="onUserInfo(item)"
                     v-lazy="item.user.img"
                 />
-                <div class="name">{{ item.user.username }}(赠礼)</div>
+                <div v-if="item&&item.user&&item.user.username" class="name">{{ item.user.username }}(赠礼)</div>
                 <div v-on:click.stop="giftInReturn(item)" class="btn">
                     回赠礼物
                 </div>
@@ -20,11 +22,11 @@
             </div>
             <!--商品信息-->
             <div class="item_info">
-                <img v-lazy="item.goods.simg" />
+                <img v-if="item&&item.goods&&item.goods.simg" v-lazy="item.goods.simg" />
                 <div class="box">
-                    <div class="name">{{ item.goods.title }}</div>
+                    <div v-if="item&&item.goods&&item.goods.title" class="name">{{ item.goods.title }}</div>
                     <div class="pirce">
-                        <div class="title">
+                        <div v-if="item&&item.goods&&item.goods.price"  class="title">
                             <span>￥</span>{{ item.goods.price }}
                         </div>
                         <div v-if="item.get_gift_state < 6" class="btn">
@@ -6,6 +6,7 @@
     .top_box {
         display: flex;
         justify-content: space-between;
+        height: 45px;
         margin: 0 30px;
         img {
             width: 37px;
@@ -47,10 +48,10 @@
         }
     }
     .item_box{
-        // height: calc(100vh-200px);
+        height: calc(100vh-114px);
         padding-bottom: 40px;
-        // overflow-y: auto;
-        height: auto;
+        overflow-y: auto;
+        box-sizing: border-box;
     }
     .tip_text{
         text-align: center;
@@ -34,6 +34,7 @@
                 <!-- 送礼列表 -->
                 <giftGivingItem
                     @onGiftGiving="onGiftGiving"
+                    @jumpToPay="jumpToPay"
                     v-show="active != 0 && active == 1"
                     :giftGivingItem="giftGivingItem"
                 >
@@ -368,6 +369,20 @@ export default {
                 });
                 this.$parent.gotoDetail(item);
             }
+        },
+        // 跳转原声支付
+        jumpToPay(item){
+            // 判断并调用通用跳转
+            if (typeof this.$parent.gotoDetail === "function") {
+                // 临时，设置跳转商品详情参数
+                Object.assign(item, {
+                    type: "44",
+                    to: item.id,
+                    shop_type: ""
+                });
+                this.$parent.gotoDetail(item);
+            }
+
         }
     }
 };