w-front-end / select_good · Commits

Commit 246f60354d00889a5cff9aa13ae726bacef8a14e

Authored by zhiyangdu
1 parent 1af48dc1

优化

Inline Side-by-side
Showing 4 changed files with 48 additions and 26 deletions
src/components/giftGivingItem/giftGivingItem.vue
  View file @246f603
... ... @@ -8,27 +8,27 @@
8 8 >
9 9 <!--用户信息-->
10 10 <div class="user_info">
11   - <div class="name">{{item.create_time*1000 | datetime('yyyy-MM-dd hh:mm:ss')}}</div>
  11 + <div class="name" v-if="item&&item.create_time">{{item.create_time*1000 | datetime('yyyy-MM-dd hh:mm:ss')}}</div>
12 12 <div class="gift_active">
13   - <span v-if="item.status==0">待支付</span>
14   - <span v-else-if="item.status==1">分享</span>
15   - <span v-else-if="item.status==2">已领完</span>
16   - <span v-else-if="item.status==3">已关闭</span>
17   - <span v-else-if="item.status==4">部分退款中(可分享)</span>
18   - <span v-else-if="item.status==5">部分退款中（不可分享</span>
19   - <span v-else-if="item.status==6">退款中</span>
  13 + <span v-if="item&&item.status==0">待支付</span>
  14 + <span v-else-if="item&&item.status==1">分享</span>
  15 + <span v-else-if="item&&item.status==2">已领完</span>
  16 + <span v-else-if="item&&item.status==3">已关闭</span>
  17 + <span v-else-if="item&&item.status==4">部分退款中(可分享)</span>
  18 + <span v-else-if="item&&item.status==5">部分退款中（不可分享</span>
  19 + <span v-else-if="item&&item.status==6">退款中</span>
20 20 </div>
21 21 </div>
22 22 <!--商品信息-->
23 23 <div class="item_info">
24   - <img v-lazy="item.goods.simg" />
  24 + <img v-if="item&&item.goods&&item.goods.simg" v-lazy="item.goods.simg" />
25 25 <div class="box">
26   - <div class="name">{{ item.goods.title }}</div>
  26 + <div v-if="item&&item.goods&&item.goods.create_time" class="name">{{ item.goods.title }}</div>
27 27 <div class="pirce">
28   - <div class="title">
  28 + <div v-if="item&&item.goods&&item.goods.price" class="title">
29 29 <span>￥</span>{{ item.goods.price }}
30 30 </div>
31   - <div class="btn">
  31 + <div v-if="item&&item.goods&&item.goods.num" class="btn">
32 32 总数：{{ parseInt(item.goods.num) }}
33 33 </div>
34 34 </div>
... ... @@ -36,16 +36,16 @@
36 36 </div>
37 37 <!-- 显示文字 -->
38 38 <div class="text_tip">
39   - <span v-show="item.total_num">可分享<num>{{item.total_num}}</num>人,</span>
40   - <span v-show="item.give_num">已领 <num>{{item.give_num}}</num> 人,</span>
41   - <span v-show="item.no_address_num"><num>{{item.no_address_num}}</num> 人未填写地址,</span>
42   - <span v-show="item.refund_num"><num>{{item.refund_num}}</num>人退款中</span>
  39 + <span v-show="item&&item.total_num">可分享<num>{{item.total_num}}</num>人,</span>
  40 + <span v-show="item&&item.give_num">已领 <num>{{item.give_num}}</num> 人,</span>
  41 + <span v-show="item&&item.no_address_num"><num>{{item.no_address_num}}</num> 人未填写地址,</span>
  42 + <span v-show="item&&item.refund_num"><num>{{item.refund_num}}</num>人退款中</span>
43 43 </div>
44 44 <!-- 按钮 -->
45 45 <div class="btn_list">
46 46 <div class="box">
47 47 <div class="btn">取消支付</div>
48   - <div class="active">立即支付</div>
  48 + <div @click="jumpToPay(item)" class="active">立即支付</div>
49 49 </div>
50 50 </div>
51 51 </div>
... ... @@ -54,7 +54,7 @@
54 54  
55 55 <script>
56 56 export default {
57   - name: "name",
  57 + name: "",
58 58 data() {
59 59 return {};
60 60 },
... ... @@ -64,7 +64,11 @@ export default {
64 64 // 跳转到礼物详情页
65 65 onGiftGiving(item){
66 66 this.$emit('onGiftGiving',item)
67   - }
  67 + },
  68 + // 跳转到原声生支付
  69 + jumpToPay(item){
  70 + this.$emit('jumpToPay',item)
  71 + },
68 72 }
69 73 };
70 74 </script>
... ...
src/components/receivingGiftsItem/receivingGiftsItem.vue
  View file @246f603
... ... @@ -5,14 +5,16 @@
5 5 v-for="(item, index) in receivingGiftsInfo"
6 6 :key="index"
7 7 @click="onReceivingGifts(item)"
  8 + v-if="item"
8 9 >
9 10 <!--用户信息-->
10 11 <div class="user_info">
11 12 <img
  13 + v-if="item&&item.user&&item.user.img"
12 14 v-on:click.stop="onUserInfo(item)"
13 15 v-lazy="item.user.img"
14 16 />
15   - <div class="name">{{ item.user.username }}(赠礼)</div>
  17 + <div v-if="item&&item.user&&item.user.username" class="name">{{ item.user.username }}(赠礼)</div>
16 18 <div v-on:click.stop="giftInReturn(item)" class="btn">
17 19 回赠礼物
18 20 </div>
... ... @@ -20,11 +22,11 @@
20 22 </div>
21 23 <!--商品信息-->
22 24 <div class="item_info">
23   - <img v-lazy="item.goods.simg" />
  25 + <img v-if="item&&item.goods&&item.goods.simg" v-lazy="item.goods.simg" />
24 26 <div class="box">
25   - <div class="name">{{ item.goods.title }}</div>
  27 + <div v-if="item&&item.goods&&item.goods.title" class="name">{{ item.goods.title }}</div>
26 28 <div class="pirce">
27   - <div class="title">
  29 + <div v-if="item&&item.goods&&item.goods.price" class="title">
28 30 <span>￥</span>{{ item.goods.price }}
29 31 </div>
30 32 <div v-if="item.get_gift_state < 6" class="btn">
... ...
src/pages/myGiftBox/myGiftBox.less
  View file @246f603
... ... @@ -6,6 +6,7 @@
6 6 .top_box {
7 7 display: flex;
8 8 justify-content: space-between;
  9 + height: 45px;
9 10 margin: 0 30px;
10 11 img {
11 12 width: 37px;
... ... @@ -47,10 +48,10 @@
47 48 }
48 49 }
49 50 .item_box{
50   - // height: calc(100vh-200px);
  51 + height: calc(100vh-114px);
51 52 padding-bottom: 40px;
52   - // overflow-y: auto;
53   - height: auto;
  53 + overflow-y: auto;
  54 + box-sizing: border-box;
54 55 }
55 56 .tip_text{
56 57 text-align: center;
... ...
src/pages/myGiftBox/myGiftBox.vue
  View file @246f603
... ... @@ -34,6 +34,7 @@
34 34 <!-- 送礼列表 -->
35 35 <giftGivingItem
36 36 @onGiftGiving="onGiftGiving"
  37 + @jumpToPay="jumpToPay"
37 38 v-show="active != 0 && active == 1"
38 39 :giftGivingItem="giftGivingItem"
39 40 >
... ... @@ -368,6 +369,20 @@ export default {
368 369 });
369 370 this.$parent.gotoDetail(item);
370 371 }
  372 + },
  373 + // 跳转原声支付
  374 + jumpToPay(item){
  375 + // 判断并调用通用跳转
  376 + if (typeof this.$parent.gotoDetail === "function") {
  377 + // 临时，设置跳转商品详情参数
  378 + Object.assign(item, {
  379 + type: "44",
  380 + to: item.id,
  381 + shop_type: ""
  382 + });
  383 + this.$parent.gotoDetail(item);
  384 + }
  385 +
371 386 }
372 387 }
373 388 };
... ...