jufubao-base 1.0.77-beta7 → 1.0.78-beta1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (16) hide show
  1. package/package.json +1 -1
  2. package/src/common/authorize.js +5 -1
  3. package/src/components/JfbBaseAfterOrderList/JfbBaseAfterOrderList.vue +44 -101
  4. package/src/components/JfbBaseCard/JfbBaseCard.vue +65 -75
  5. package/src/components/JfbBaseCardDisabled/JfbBaseCardDisabled.vue +43 -93
  6. package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue +92 -161
  7. package/src/components/JfbBaseCardV2/JfbBaseCardV2.vue +45 -101
  8. package/src/components/JfbBaseCardV3/JfbBaseCardV3.vue +14 -24
  9. package/src/components/JfbBaseEntry/JfbBaseEntry.vue +1 -19
  10. package/src/components/JfbBaseFastLink/JfbBaseFastLink.vue +1 -1
  11. package/src/components/JfbBaseLogin/JfbBaseLogin.vue +1 -42
  12. package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue +0 -3
  13. package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue +107 -176
  14. package/src/components/JfbBaseRechargeOrder/JfbBaseRechargeOrder.vue +30 -95
  15. package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue +0 -3
  16. package/src/components/JfbBaseUserInfo/JfbBaseUserInfo.vue +1 -1
package/src/components/JfbBaseEntry/JfbBaseEntry.vue CHANGED
@@ -14,17 +14,7 @@
14
14
  </view>
15
15
  <!-- #endif -->
16
16
  <view class="jfb-base-entry__body" :style="bodyStyle">
17
- <view v-if="loadingList" class="entry_list skeleton-wrap" :style="entryStyle">
18
- <view v-for="i in 5" :key="i"
19
- :class="'row_num_'+rowNum"
20
- class="entry_item"
21
- >
22
- <image v-if="rowNum == 1" style="height: 260rpx;"/>
23
- <image v-if="rowNum == 2" style="height: 200rpx;"/>
24
- <image v-if="rowNum == 3" style="height: 150rpx;"/>
25
- </view>
26
- </view>
27
- <view v-else class="entry_list" :style="entryStyle">
17
+ <view class="entry_list" :style="entryStyle">
28
18
  <view v-for="(item,i) in entryList" :key="i"
29
19
  class="entry_item"
30
20
  :class="'row_num_'+rowNum"
@@ -62,7 +52,6 @@
62
52
  bgcolor: "",
63
53
  rowNum: 1,
64
54
  paddingInput: 20,
65
- loadingList: true,
66
55
  }
67
56
  },
68
57
  computed: {
@@ -107,7 +96,6 @@
107
96
  vm: this,
108
97
  data: {}
109
98
  }).then(res => {
110
- this.loadingList = false;
111
99
  this.$xdHideLoading();
112
100
  this.entryList = res.list.map(item => {
113
101
  const {dir, path, host} = item['redirect_data'];
@@ -172,15 +160,9 @@
172
160
  &__body{
173
161
  .entry_list{
174
162
  display: grid;
175
- &.skeleton-wrap{
176
- .entry_item{
177
- .skeleton-item(100%, auto);
178
- }
179
- }
180
163
  .entry_item{
181
164
  width: 100%;
182
165
  box-sizing: border-box;
183
-
184
166
  image{
185
167
  width: 100%;
186
168
  display: block;
package/src/components/JfbBaseFastLink/JfbBaseFastLink.vue CHANGED
@@ -196,7 +196,7 @@
196
196
  if(dir) jumpUrl = `//${window.location.host}/${dir}${path}`;
197
197
  else jumpUrl = path;
198
198
  //#endif
199
- jumpUrl = `${jumpUrl}${bus}}`;
199
+ jumpUrl = `${jumpUrl}${bus}`;
200
200
  return { name: item.name, path: jumpUrl, icon: item.icon, size: item.size }
201
201
  }
202
202
  })
package/src/components/JfbBaseLogin/JfbBaseLogin.vue CHANGED
@@ -758,7 +758,7 @@ export default {
758
758
  margin-left: unit(20,rpx) !important;
759
759
  }
760
760
  }
761
-
761
+
762
762
  .form-group {
763
763
  padding: 40rpx 70rpx;
764
764
  }
@@ -908,45 +908,4 @@ export default {
908
908
  .login-pub {
909
909
  margin-top: unit(40, rpx);
910
910
  }
911
- .bottom_btn {
912
- position: fixed;
913
- width: 100%;
914
- display:flex;
915
- justify-content: center;
916
- align-items: center;
917
- height: unit(100, rpx);
918
- background: #ffffff;
919
-
920
- & > view {
921
- height: unit(44, rpx);
922
- line-height: unit(44, rpx);
923
- width: unit(150, rpx);
924
- text-align: center;
925
- cursor: pointer;
926
- font-size: unit(24, rpx);
927
- border-radius: unit(12, rpx);
928
- }
929
- }
930
-
931
- .preview-login {
932
- padding: unit(40, rpx) 0;
933
-
934
- &-input {
935
- height: unit(70, rpx);
936
- border-radius: unit(12, rpx);
937
- padding: 0 unit(20, rpx);
938
- text-align: left;
939
- border: 1px solid #eee;
940
- background: #F7F7F7;
941
- color: #666;
942
- transition: box-shadow 0.5s;
943
- box-shadow: 0 0 0 rgba(0,0,0,0);
944
-
945
- &:hover {
946
- box-shadow: 0 0 unit(10, rpx) rgba(0,0,0,.1);
947
- }
948
- }
949
- }
950
-
951
-
952
911
  </style>
package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue CHANGED
@@ -294,9 +294,6 @@
294
294
  <view class="jfb-base-order-detail__body-cashier-text">
295
295
  {{ info.codes[0].can_read_code }}
296
296
  </view>
297
- <view v-if="info.codes[0].refund_tip_text" style="color:red;font-size:24rpx;text-align:center;margin-top:10rpx">
298
- {{info.codes[0].refund_tip_text}}
299
- </view>
300
297
  <view
301
298
  v-if="info.codes[0].code_end_time"
302
299
  class="jfb-base-order-detail__body-cashier-code"
package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue CHANGED
@@ -29,161 +29,130 @@
29
29
  ></xd-tab>
30
30
  </view>
31
31
  <view style="height: 100rpx;"></view>
32
- <view v-if="loadingList" class="jfb-base-order-list__body-order skeleton-wrap">
33
- <view class="jfb-base-order-list__body-order-item"
34
- v-for="i in 5" :key="i"
32
+ <view
33
+ v-if="orderList && orderList.length > 0"
34
+ class="jfb-base-order-list__body-order"
35
+ :style="{ padding: outMargin }"
36
+ >
37
+ <view
38
+ @click="handleToLink(detailPath, item)"
39
+ class="jfb-base-order-list__body-order-item"
40
+ v-for="item in orderList"
41
+ :key="item.main_order_id"
42
+ :style="{
43
+ background: backgroundColor,
44
+ border: borderBox,
45
+ borderRadius: radius + 'rpx',
46
+ boxShadow: shadowBox,
47
+ marginBottom: padding + 'rpx',
48
+ }"
35
49
  >
36
- <view class="jfb-base-order-list__body-order-item-biz"><view></view></view>
50
+ <view class="jfb-base-order-list__body-order-item-biz">
51
+ <xd-font-icon
52
+ v-if="item.biz_code_icon"
53
+ :icon="item.biz_code_icon"
54
+ :size="item['biz_code_icon_size']"
55
+ ></xd-font-icon>
56
+ <view :class="{ marginLeft: item.biz_code_icon }">{{
57
+ item.biz_code_name
58
+ }}</view>
59
+ </view>
37
60
  <view class="jfb-base-order-list__body-order-item-title">
38
- <view></view>
39
- <view></view>
61
+ <view>订单编号:{{ item.main_order_id }}</view>
62
+ <view
63
+ :style="{color:item.status.status_type !== 'error' ? mainColor : '#999999',}"
64
+ >{{ item.status.status_name }}</view>
40
65
  </view>
41
66
  <view class="order-list">
42
67
  <view
43
- class="jfb-base-order-list__body-order-item-content">
44
- <image></image>
68
+ class="jfb-base-order-list__body-order-item-content"
69
+ v-for="(Sitem, Sindex) in item.products"
70
+ :key="Sitem.product_id + Sindex"
71
+ v-if="(item['isOpen'] === false && Sindex < showLen) || item['isOpen']">
72
+ <image
73
+ :src="Sitem.product_thumb"
74
+ style="background: #ffffff"
75
+ mode="aspectFit"
76
+ ></image>
45
77
  <view class="jfb-base-order-list__body-order-item-content-info">
46
- <view class="jfb-base-order-list__body-order-item-content-info-name"></view>
47
- <view class="jfb-base-order-list__body-order-item-content-info-price">
48
- <view></view>
49
- <view class="info-price"></view>
78
+ <view
79
+ class="jfb-base-order-list__body-order-item-content-info-name"
80
+ >{{ Sitem.product_name }}</view
81
+ >
82
+ <view
83
+ v-if="Sitem.product_sku_name"
84
+ class="jfb-base-order-list__body-order-item-content-info-skuname"
85
+ >规格：{{ Sitem.product_sku_name }}</view
86
+ >
87
+ <view
88
+ class="jfb-base-order-list__body-order-item-content-info-price"
89
+ >
90
+ <view :style="{ fontSize: '32rpx', color: mainColor }">
91
+ <xd-unit
92
+ :isOld="false"
93
+ :price="Sitem.sale_price"
94
+ :color="mainColor"
95
+ :fontSize="32"
96
+ v-if="item.biz_code !== 'gift'"
97
+ ></xd-unit>
98
+ </view>
99
+ <view class="info-price">
100
+ <text>X</text>
101
+ <text>{{ Sitem.product_num }}</text>
102
+ </view>
50
103
  </view>
51
104
  </view>
52
105
  </view>
106
+ <view
107
+ class="order-list-icon"
108
+ :style="{ bottom: item['isOpen'] ? '-30rpx' : '-54rpx' }"
109
+ v-if="item.products.length > showLen"
110
+ @click.stop="item['isOpen'] = !item['isOpen']"
111
+ >
112
+ <view :style="{ background: backgroundColor }">
113
+ <xd-font-icon
114
+ color="#666"
115
+ :icon="item['isOpen'] ? 'iconshang_up' : 'iconxia_down'"
116
+ size="24"
117
+ ></xd-font-icon>
118
+ </view>
119
+ </view>
53
120
  </view>
54
121
  <view class="jfb-base-order-list__body-order-item-bottom">
55
- <view></view>
56
- <view></view>
122
+ <view>下单时间:{{ item.created_time_text }}</view>
123
+ <view v-if="item.biz_code !== 'gift'">
124
+ <text>合计:</text>
125
+ <xd-unit
126
+ :isOld="false"
127
+ :price="item.total_amount"
128
+ :color="mainColor"
129
+ :fontSize="28"
130
+ ></xd-unit>
131
+ </view>
57
132
  </view>
58
- </view>
59
- </view>
60
- <template v-else>
61
- <view
62
- v-if="orderList && orderList.length > 0"
63
- class="jfb-base-order-list__body-order"
64
- :style="{ padding: outMargin }"
65
- >
66
133
  <view
67
- @click="handleToLink(detailPath, item)"
68
- class="jfb-base-order-list__body-order-item"
69
- v-for="item in orderList"
70
- :key="item.main_order_id"
71
- :style="{
72
- background: backgroundColor,
73
- border: borderBox,
74
- borderRadius: radius + 'rpx',
75
- boxShadow: shadowBox,
76
- marginBottom: padding + 'rpx',
77
- }"
134
+ class="jfb-base-order-list__body-order-item-pay"
135
+ v-if="item.buttons.length"
78
136
  >
79
- <view class="jfb-base-order-list__body-order-item-biz">
80
- <xd-font-icon
81
- v-if="item.biz_code_icon"
82
- :icon="item.biz_code_icon"
83
- :size="item['biz_code_icon_size']"
84
- ></xd-font-icon>
85
- <view :class="{ marginLeft: item.biz_code_icon }">{{
86
- item.biz_code_name
87
- }}</view>
88
- </view>
89
- <view class="jfb-base-order-list__body-order-item-title">
90
- <view>订单编号:{{ item.main_order_id }}</view>
91
- <view
92
- :style="{color:item.status.status_type !== 'error' ? mainColor : '#999999',}"
93
- >{{ item.status.status_name }}</view>
94
- </view>
95
- <view class="order-list">
96
- <view
97
- class="jfb-base-order-list__body-order-item-content"
98
- v-for="(Sitem, Sindex) in item.products"
99
- :key="Sitem.product_id + Sindex"
100
- v-if="(item['isOpen'] === false && Sindex < showLen) || item['isOpen']">
101
- <image
102
- :src="Sitem.product_thumb"
103
- style="background: #ffffff"
104
- mode="aspectFit"
105
- ></image>
106
- <view class="jfb-base-order-list__body-order-item-content-info">
107
- <view
108
- class="jfb-base-order-list__body-order-item-content-info-name"
109
- >{{ Sitem.product_name }}</view
110
- >
111
- <view
112
- v-if="Sitem.product_sku_name"
113
- class="jfb-base-order-list__body-order-item-content-info-skuname"
114
- >规格：{{ Sitem.product_sku_name }}</view
115
- >
116
- <view
117
- class="jfb-base-order-list__body-order-item-content-info-price"
118
- >
119
- <view :style="{ fontSize: '32rpx', color: mainColor }">
120
- <xd-unit
121
- :isOld="false"
122
- :price="Sitem.sale_price"
123
- :color="mainColor"
124
- :fontSize="32"
125
- v-if="item.biz_code !== 'gift'"
126
- ></xd-unit>
127
- </view>
128
- <view class="info-price">
129
- <text>X</text>
130
- <text>{{ Sitem.product_num }}</text>
131
- </view>
132
- </view>
133
- </view>
134
- </view>
135
- <view
136
- class="order-list-icon"
137
- :style="{ bottom: item['isOpen'] ? '-30rpx' : '-54rpx' }"
138
- v-if="item.products.length > showLen"
139
- @click.stop="item['isOpen'] = !item['isOpen']"
140
- >
141
- <view :style="{ background: backgroundColor }">
142
- <xd-font-icon
143
- color="#666"
144
- :icon="item['isOpen'] ? 'iconshang_up' : 'iconxia_down'"
145
- size="24"
146
- ></xd-font-icon>
147
- </view>
148
- </view>
149
- </view>
150
- <view class="jfb-base-order-list__body-order-item-bottom">
151
- <view>下单时间:{{ item.created_time_text }}</view>
152
- <view v-if="item.biz_code !== 'gift'">
153
- <text>合计:</text>
154
- <xd-unit
155
- :isOld="false"
156
- :price="item.total_amount"
157
- :color="mainColor"
158
- :fontSize="28"
159
- ></xd-unit>
160
- </view>
161
- </view>
162
- <view
163
- class="jfb-base-order-list__body-order-item-pay"
164
- v-if="item.buttons.length"
165
- >
166
- <view v-for="(btn,index) in item.buttons" :key="btn.action+index">
167
- <xd-button
168
- :type="getBtnType(btn.action)"
169
- size="mini"
170
- @click="handleBtnEvent(btn.action, item)"
171
- >{{ btn.text }}
172
- </xd-button>
173
- </view>
137
+ <view v-for="(btn,index) in item.buttons" :key="btn.action+index">
138
+ <xd-button
139
+ :type="getBtnType(btn.action)"
140
+ size="mini"
141
+ @click="handleBtnEvent(btn.action, item)"
142
+ >{{ btn.text }}
143
+ </xd-button>
174
144
  </view>
175
145
  </view>
176
146
  </view>
177
- <view v-else class="jfb-base-order-list__body-no">
178
- <xd-font-icon
179
- size="120"
180
- color="#ccc"
181
- icon="iconzanwudingdan"
182
- ></xd-font-icon>
183
- <view>暂无订单</view>
184
- </view>
185
- </template>
186
-
147
+ </view>
148
+ <view v-else class="jfb-base-order-list__body-no">
149
+ <xd-font-icon
150
+ size="120"
151
+ color="#ccc"
152
+ icon="iconzanwudingdan"
153
+ ></xd-font-icon>
154
+ <view>暂无订单</view>
155
+ </view>
187
156
  </view>
188
157
  </view>
189
158
  </template>
@@ -223,7 +192,6 @@ export default {
223
192
  payPath: "",
224
193
  status: null, //全部、已完成、已取消
225
194
  initStatus: false,
226
- loadingList: false,
227
195
 
228
196
  //基础
229
197
  radius: 0,
@@ -422,7 +390,6 @@ export default {
422
390
  this.$xdShowLoading({});
423
391
  let tab = "all";
424
392
  if (status) tab = this.tabList[this.tabIndex].status;
425
- this.loadingList = true;
426
393
  jfbRootExec("getBaseOrderList", {
427
394
  vm: this,
428
395
  data: {
@@ -432,7 +399,6 @@ export default {
432
399
  },
433
400
  })
434
401
  .then((res) => {
435
- this.loadingList = false;
436
402
  this.$xdHideLoading();
437
403
  console.log(res.list, "list");
438
404
  let list = res.list.map((item) => {
@@ -541,12 +507,6 @@ export default {
541
507
  }
542
508
  &-order {
543
509
  &-item {
544
- .skeleton-wrap & {
545
- background-color: #FFFFFF;
546
- border: 1px solid #EEEEEE;
547
- border-radius: 10rpx;
548
- margin: 20rpx;
549
- }
550
510
  &-biz {
551
511
  color: #333333;
552
512
  font-size: unit(28, rpx);
@@ -555,12 +515,6 @@ export default {
555
515
  border-bottom: unit(2, rpx) solid #eee;
556
516
  display: flex;
557
517
  align-items: center;
558
-
559
- & > view{
560
- .skeleton-wrap &{
561
- .skeleton-item(100rpx, 28rpx);
562
- }
563
- }
564
518
  }
565
519
 
566
520
  &-title {
@@ -574,15 +528,9 @@ export default {
574
528
 
575
529
  & > view:first-child {
576
530
  color: #333;
577
- .skeleton-wrap &{
578
- .skeleton-item(300rpx, 28rpx);
579
- }
580
531
  }
581
532
 
582
533
  & > view:nth-child(2) {
583
- .skeleton-wrap &{
584
- .skeleton-item(100rpx, 28rpx);
585
- }
586
534
  }
587
535
  }
588
536
 
@@ -597,9 +545,6 @@ export default {
597
545
  height: unit(160, rpx);
598
546
  border-radius: unit(8, rpx);
599
547
  flex-shrink: 0;
600
- .skeleton-wrap &{
601
- .skeleton-item(160rpx, 160rpx);
602
- }
603
548
  }
604
549
 
605
550
  &-info {
@@ -615,10 +560,6 @@ export default {
615
560
  font-weight: 500;
616
561
  .uni-max-cut(1, 64);
617
562
  line-height: unit(64, rpx);
618
-
619
- .skeleton-wrap &{
620
- .skeleton-item(160rpx, 48rpx);
621
- }
622
563
  }
623
564
 
624
565
  &-skuname {
@@ -643,10 +584,6 @@ export default {
643
584
  display: flex;
644
585
  justify-content: space-between;
645
586
  align-items: center;
646
- .skeleton-wrap &{
647
- .skeleton-item(100%, 32rpx);
648
- margin-top: 20rpx;
649
- }
650
587
  }
651
588
  }
652
589
  }
@@ -662,9 +599,6 @@ export default {
662
599
 
663
600
  & > view:first-child {
664
601
  color: #999;
665
- .skeleton-wrap &{
666
- .skeleton-item(300rpx, 28rpx);
667
- }
668
602
  }
669
603
 
670
604
  & > view:nth-child(2) {
@@ -673,9 +607,6 @@ export default {
673
607
  & > view {
674
608
  margin-left: unit(10, rpx);
675
609
  }
676
- .skeleton-wrap &{
677
- .skeleton-item(300rpx, 28rpx);
678
- }
679
610
  }
680
611
  }
681
612