jufubao-base 1.0.119-beta19 → 1.0.119-beta20

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 (4) hide show
  1. package/package.json +1 -1
  2. package/src/components/JfbBaseConPhone/JfbBaseConPhone.vue +5 -3
  3. package/src/components/JfbBasePay/JfbBasePay.vue +8 -3
  4. package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue +233 -223
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-base",
3
- "version": "1.0.119-beta19",
3
+ "version": "1.0.119-beta20",
4
4
  "private": false,
5
5
  "description": "聚福宝业务组件基础插件包",
6
6
  "main": "index.js",
package/src/components/JfbBaseConPhone/JfbBaseConPhone.vue CHANGED
@@ -265,9 +265,9 @@ export default {
265
265
  let image = await getImageInfo(getServiceUrl(res.background));
266
266
  let image1 = await getImageInfo(getServiceUrl(res.used_background));
267
267
  console.log({ ...image }, "imageimage");
268
- this.topHeight = image.imgHeight * 2;
268
+ this.topHeight = image.imgHeight / this.$rpxNum;
269
269
  this.topWidth = '100%';
270
- this.bottomHeight = image1.imgHeight * 2;
270
+ this.bottomHeight = image1.imgHeight / this.$rpxNum;
271
271
  this.bottomWidth = '100%';
272
272
  this.background = getServiceUrl(res.background);
273
273
  this.used_background = getServiceUrl(res.used_background);
@@ -479,13 +479,15 @@ export default {
479
479
  }
480
480
  &-wrap {
481
481
  display: flex;
482
- justify-content: center;
482
+ justify-content: flex-end;
483
483
  align-items: center;
484
484
  flex-direction: column;
485
485
  &-input {
486
486
  border-radius: 40rpx;
487
487
  background: rgba(255, 255, 255, 0.5);
488
488
  padding: 70rpx 60rpx;
489
+ position: relative;
490
+ bottom: 120rpx;
489
491
  input {
490
492
  margin-bottom: 26rpx;
491
493
  font-size: 28rpx;
package/src/components/JfbBasePay/JfbBasePay.vue CHANGED
@@ -363,6 +363,7 @@ export default {
363
363
  });
364
364
  });
365
365
  },
366
+
366
367
  //第三方支付
367
368
  async doThirdPay() {
368
369
  if (this.$configProject.isPreview) return;
@@ -387,12 +388,16 @@ export default {
387
388
  channel_provider_id,
388
389
  login_providers: login_providers.join(","),
389
390
  };
390
- // #ifdef H5
391
- if (!(!this.$configProject.isPreview && (isWechat() || isWechatTools()))){
391
+
392
+ //设置支付成功页面地址
393
+ if (!this.$configProject.isPreview){
394
+ data['pay_success_url'] = '';
395
+ // #ifdef H5
392
396
  data['pay_success_url'] = `${window.location.protocol}//${window.location.host}/${this.projectAttr.deploy_dir}`;
397
+ // #endif
393
398
  data['pay_success_url'] += this.getSuccessUrl + `?order_id=${this.main_order_id}`;
394
399
  }
395
- // #endif
400
+
396
401
 
397
402
 
398
403
  jfbRootExec("setThirdPlace", {
package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue CHANGED
@@ -19,104 +19,61 @@
19
19
  <view
20
20
  class="jfb-base-success__body"
21
21
  :style="{ margin: jfbListMarginComputed }"
22
- v-if="info !== null"
23
22
  >
24
- <view
25
- class="jfb-base-success__body-icon"
26
- :style="{
27
- marginBottom: jfbListSpacing + 'rpx',
28
- boxShadow: jfbListShadowComputed,
29
- border: jfbListBorderComputed,
30
- backgroundColor: jfbListBgColor,
31
- borderRadius: jfbListRadius + 'rpx',
32
- }"
33
- >
34
- <view class="jfb-base-success__body-icon-item">
35
- <view>
36
- <xd-font-icon
37
- size="80"
38
- :icon="info.status.icon"
39
- :color="info.status.iconColor"
40
- ></xd-font-icon>
41
- </view>
42
- <view>{{ info.status.status_name }}</view>
43
- <view class="jfb-base-success__body-icon-item-tip">{{
44
- info.status.comment
45
- }}</view>
46
- </view>
47
- <view class="jfb-base-success__body-icon-btn">
48
- <view v-for="(item, index) in info['btn']" :key="index">
49
- <xd-button
50
- v-if="item['label']"
51
- size="small"
52
- :type="item['type']"
53
- @click="handleOnBtnClick(item)"
54
- >{{ item["label"] }}
55
- </xd-button>
56
- </view>
57
- </view>
58
- </view>
59
- <!--settle-->
60
- <view class="settle" v-if="info.settleInfo !== null" :style="{marginBottom: jfbListSpacing + 'rpx',}">
61
- <view class="settle-item" v-for="(settle,index) in info.settleInfo" :key="index">
62
- <view>{{settle.label}}：</view>
63
- <view v-if="settle.type === 'price'">
64
- <xd-unit :price="settle.value" unit="" :is-old="false"></xd-unit>
65
- </view>
66
- <view v-else v-html="settle.value"></view>
67
- </view>
23
+ <view v-if="noUserLoding === true">
24
+ 111
68
25
  </view>
69
- <!--settle end-->
70
- <view class="jfb-base-success__body-other">
26
+ <template v-if="noUserLoding === false && info !== null">
71
27
  <view
72
- v-if="info.codes && info.codes.length > 0 && is_show_code === 'Y'"
28
+ class="jfb-base-success__body-icon"
29
+ :style="{
30
+ marginBottom: jfbListSpacing + 'rpx',
31
+ boxShadow: jfbListShadowComputed,
32
+ border: jfbListBorderComputed,
33
+ backgroundColor: jfbListBgColor,
34
+ borderRadius: jfbListRadius + 'rpx',
35
+ }"
73
36
  >
74
- <view
75
- :style="{
76
- marginBottom: jfbListSpacing + 'rpx',
77
- boxShadow: jfbListShadowComputed,
78
- border: jfbListBorderComputed,
79
- backgroundColor: jfbListBgColor,
80
- borderRadius: jfbListRadius + 'rpx',
81
- }"
82
- v-if="
83
- info.codes.length === 1 &&
84
- (info.codes[0].show_type === 'qrcode' ||
85
- info.codes[0].show_type === 'barcode')
86
- "
87
- class="jfb-base-success__body-card jfb-base-success__body-cashier"
88
- >
89
- <view class="jfb-base-success__body-cashier-text"
90
- >{{info.codes[0].show_type === "qrcode" ? "二维码" : "条形码" }}</view>
91
- <view style="position: relative">
92
- <image
93
- :style="{
94
- height: info.codes[0].show_type === 'qrcode' ? '50vw' : '25vw',
95
- width: info.codes[0].show_type === 'qrcode' ? '50vw' : '85vw',
96
- }"
97
- :src="info.codes[0].code_url"
98
- ></image>
99
- <image v-if="info.codes[0].logo&&info.codes[0].show_type === 'qrcode'" class="logo-icon" :src="info.codes[0].logo"></image>
100
- </view>
101
- <view class="jfb-base-success__body-cashier-text">
102
- {{ info.codes[0].can_read_code }}
37
+ <view class="jfb-base-success__body-icon-item">
38
+ <view>
39
+ <xd-font-icon
40
+ size="80"
41
+ :icon="info.status.icon"
42
+ :color="info.status.iconColor"
43
+ ></xd-font-icon>
103
44
  </view>
104
- <view v-if="info.codes[0].refund_tip_text" style="color:red;font-size:24rpx;text-align:center;margin-top:10rpx">
105
- {{info.codes[0].refund_tip_text}}
45
+ <view>{{ info.status.status_name }}</view>
46
+ <view class="jfb-base-success__body-icon-item-tip">{{
47
+ info.status.comment
48
+ }}</view>
49
+ </view>
50
+ <view class="jfb-base-success__body-icon-btn">
51
+ <view v-for="(item, index) in info['btn']" :key="index">
52
+ <xd-button
53
+ v-if="item['label']"
54
+ size="small"
55
+ :type="item['type']"
56
+ @click="handleOnBtnClick(item)"
57
+ >{{ item["label"] }}
58
+ </xd-button>
106
59
  </view>
107
- <view
108
- v-if="info.codes[0].code_end_time"
109
- class="jfb-base-success__body-cashier-code"
110
- :style="{
111
- borderColor: mainColor,
112
- color: mainColor,
113
- background: bgColor,
114
- }"
115
- >
116
- {{ info.codes[0].code_end_time }}
60
+ </view>
61
+ </view>
62
+ <!--settle-->
63
+ <view class="settle" v-if="info.settleInfo !== null" :style="{marginBottom: jfbListSpacing + 'rpx',}">
64
+ <view class="settle-item" v-for="(settle,index) in info.settleInfo" :key="index">
65
+ <view>{{settle.label}}：</view>
66
+ <view v-if="settle.type === 'price'">
67
+ <xd-unit :price="settle.value" unit="" :is-old="false"></xd-unit>
117
68
  </view>
69
+ <view v-else v-html="settle.value"></view>
118
70
  </view>
119
- <view v-else>
71
+ </view>
72
+ <!--settle end-->
73
+ <view class="jfb-base-success__body-other">
74
+ <view
75
+ v-if="info.codes && info.codes.length > 0 && is_show_code === 'Y'"
76
+ >
120
77
  <view
121
78
  :style="{
122
79
  marginBottom: jfbListSpacing + 'rpx',
@@ -125,42 +82,60 @@
125
82
  backgroundColor: jfbListBgColor,
126
83
  borderRadius: jfbListRadius + 'rpx',
127
84
  }"
128
- v-for="(item, index) in info.codes"
129
- :key="index"
85
+ v-if="
86
+ info.codes.length === 1 &&
87
+ (info.codes[0].show_type === 'qrcode' ||
88
+ info.codes[0].show_type === 'barcode')
89
+ "
90
+ class="jfb-base-success__body-card jfb-base-success__body-cashier"
130
91
  >
131
- <view class="codes-index">{{info.codes.length > 10 ? index + 1 : `0${index + 1}` }}</view>
132
- <!--codes-->
92
+ <view class="jfb-base-success__body-cashier-text"
93
+ >{{info.codes[0].show_type === "qrcode" ? "二维码" : "条形码" }}</view>
94
+ <view style="position: relative">
95
+ <image
96
+ :style="{
97
+ height: info.codes[0].show_type === 'qrcode' ? '50vw' : '25vw',
98
+ width: info.codes[0].show_type === 'qrcode' ? '50vw' : '85vw',
99
+ }"
100
+ :src="info.codes[0].code_url"
101
+ ></image>
102
+ <image v-if="info.codes[0].logo&&info.codes[0].show_type === 'qrcode'" class="logo-icon" :src="info.codes[0].logo"></image>
103
+ </view>
104
+ <view class="jfb-base-success__body-cashier-text">
105
+ {{ info.codes[0].can_read_code }}
106
+ </view>
107
+ <view v-if="info.codes[0].refund_tip_text" style="color:red;font-size:24rpx;text-align:center;margin-top:10rpx">
108
+ {{info.codes[0].refund_tip_text}}
109
+ </view>
133
110
  <view
134
- class="jfb-base-success__body-card jfb-base-success__body-num"
135
- v-if="item.show_type === 'text' && !item.password"
111
+ v-if="info.codes[0].code_end_time"
112
+ class="jfb-base-success__body-cashier-code"
113
+ :style="{
114
+ borderColor: mainColor,
115
+ color: mainColor,
116
+ background: bgColor,
117
+ }"
136
118
  >
137
- <view class="jfb-base-success__body-num-info">
138
- <view>{{ item.can_read_code }}</view>
139
- </view>
140
- <view
141
- class="jfb-base-success__body-num-info-copy"
142
- @click="copy(item.code)"
143
- >复制</view>
144
- <view
145
- v-if="item['code_end_time']"
146
- class="jfb-base-success__body-cashier-code"
147
- :style="{
148
- borderColor: mainColor,
149
- color: mainColor,
150
- background: bgColor,
151
- }"
152
- >{{ item['code_end_time'] }}</view>
119
+ {{ info.codes[0].code_end_time }}
153
120
  </view>
121
+ </view>
122
+ <view v-else>
154
123
  <view
155
- class="jfb-base-success__body-card"
156
- v-if="item.show_type === 'text' && item.password"
124
+ :style="{
125
+ marginBottom: jfbListSpacing + 'rpx',
126
+ boxShadow: jfbListShadowComputed,
127
+ border: jfbListBorderComputed,
128
+ backgroundColor: jfbListBgColor,
129
+ borderRadius: jfbListRadius + 'rpx',
130
+ }"
131
+ v-for="(item, index) in info.codes"
132
+ :key="index"
157
133
  >
134
+ <view class="codes-index">{{info.codes.length > 10 ? index + 1 : `0${index + 1}` }}</view>
135
+ <!--codes-->
158
136
  <view
159
- class="jfb-base-success__body-num"
160
- :style="{
161
- 'borderBottom': '1px solid #f2f2f2',
162
- 'paddingBottom': '48rpx'
163
- }"
137
+ class="jfb-base-success__body-card jfb-base-success__body-num"
138
+ v-if="item.show_type === 'text' && !item.password"
164
139
  >
165
140
  <view class="jfb-base-success__body-num-info">
166
141
  <view>{{ item.can_read_code }}</view>
@@ -169,18 +144,6 @@
169
144
  class="jfb-base-success__body-num-info-copy"
170
145
  @click="copy(item.code)"
171
146
  >复制</view>
172
- </view>
173
- <view
174
- class="jfb-base-success__body-num"
175
- :style="{paddingTop: '48rpx'}"
176
- >
177
- <view class="jfb-base-success__body-num-info">
178
- <view>{{ item.can_read_password }}</view>
179
- </view>
180
- <view
181
- class="jfb-base-success__body-num-info-copy"
182
- @click="copy(item.password)"
183
- >复制</view>
184
147
  <view
185
148
  v-if="item['code_end_time']"
186
149
  class="jfb-base-success__body-cashier-code"
@@ -189,48 +152,118 @@
189
152
  color: mainColor,
190
153
  background: bgColor,
191
154
  }"
192
- >
193
- {{ item['code_end_time'] }}
194
- </view>
155
+ >{{ item['code_end_time'] }}</view>
195
156
  </view>
196
- </view>
197
- <view
198
- class="jfb-base-success__body-card"
199
- v-if="item.show_type === 'qrcode'"
200
- >
201
- <view class="jfb-base-success__body-num">
202
- <view class="jfb-base-success__body-num-info">
203
- <view>{{ item.can_read_code }}</view>
204
- </view>
205
- <view
206
- class="jfb-base-success__body-num-info-copy"
207
- @click="handleShowCode(item)"
208
- >查看二维码</view>
157
+ <view
158
+ class="jfb-base-success__body-card"
159
+ v-if="item.show_type === 'text' && item.password"
160
+ >
209
161
  <view
210
- v-if="item['code_end_time']"
211
- class="jfb-base-success__body-cashier-code"
162
+ class="jfb-base-success__body-num"
212
163
  :style="{
213
- borderColor: mainColor,
214
- color: mainColor,
215
- background: bgColor,
164
+ 'borderBottom': '1px solid #f2f2f2',
165
+ 'paddingBottom': '48rpx'
216
166
  }"
217
167
  >
218
- {{ item['code_end_time'] }}
168
+ <view class="jfb-base-success__body-num-info">
169
+ <view>{{ item.can_read_code }}</view>
170
+ </view>
171
+ <view
172
+ class="jfb-base-success__body-num-info-copy"
173
+ @click="copy(item.code)"
174
+ >复制</view>
175
+ </view>
176
+ <view
177
+ class="jfb-base-success__body-num"
178
+ :style="{paddingTop: '48rpx'}"
179
+ >
180
+ <view class="jfb-base-success__body-num-info">
181
+ <view>{{ item.can_read_password }}</view>
182
+ </view>
183
+ <view
184
+ class="jfb-base-success__body-num-info-copy"
185
+ @click="copy(item.password)"
186
+ >复制</view>
187
+ <view
188
+ v-if="item['code_end_time']"
189
+ class="jfb-base-success__body-cashier-code"
190
+ :style="{
191
+ borderColor: mainColor,
192
+ color: mainColor,
193
+ background: bgColor,
194
+ }"
195
+ >
196
+ {{ item['code_end_time'] }}
197
+ </view>
219
198
  </view>
220
199
  </view>
221
- </view>
222
- <view
223
- class="jfb-base-success__body-card"
224
- v-if="item.show_type === 'barcode'"
225
- >
226
- <view class="jfb-base-success__body-num">
227
- <view class="jfb-base-success__body-num-info">
228
- <view>{{ item.can_read_code }}</view>
200
+ <view
201
+ class="jfb-base-success__body-card"
202
+ v-if="item.show_type === 'qrcode'"
203
+ >
204
+ <view class="jfb-base-success__body-num">
205
+ <view class="jfb-base-success__body-num-info">
206
+ <view>{{ item.can_read_code }}</view>
207
+ </view>
208
+ <view
209
+ class="jfb-base-success__body-num-info-copy"
210
+ @click="handleShowCode(item)"
211
+ >查看二维码</view>
212
+ <view
213
+ v-if="item['code_end_time']"
214
+ class="jfb-base-success__body-cashier-code"
215
+ :style="{
216
+ borderColor: mainColor,
217
+ color: mainColor,
218
+ background: bgColor,
219
+ }"
220
+ >
221
+ {{ item['code_end_time'] }}
222
+ </view>
223
+ </view>
224
+ </view>
225
+ <view
226
+ class="jfb-base-success__body-card"
227
+ v-if="item.show_type === 'barcode'"
228
+ >
229
+ <view class="jfb-base-success__body-num">
230
+ <view class="jfb-base-success__body-num-info">
231
+ <view>{{ item.can_read_code }}</view>
232
+ </view>
233
+ <view
234
+ class="jfb-base-success__body-num-info-copy"
235
+ @click="handleShowCode(item)"
236
+ >查看一维码</view>
237
+ <view
238
+ v-if="item['code_end_time']"
239
+ class="jfb-base-success__body-cashier-code"
240
+ :style="{
241
+ borderColor: mainColor,
242
+ color: mainColor,
243
+ background: bgColor,
244
+ }"
245
+ >
246
+ {{ item['code_end_time'] }}
247
+ </view>
248
+ </view>
249
+ </view>
250
+ <view
251
+ class="jfb-base-success__body-card jfb-base-success__body-num"
252
+ v-if="item.show_type === 'url'"
253
+ >
254
+ <view class="code-url">
255
+ <view class="jfb-base-success__body-num-info">
256
+ <view>{{ item.can_read_code }}</view>
257
+ </view>
258
+ <view
259
+ class="jfb-base-success__body-num-info-copy"
260
+ @click="handleToLink(item.code)"
261
+ >访问</view>
229
262
  </view>
230
263
  <view
231
264
  class="jfb-base-success__body-num-info-copy"
232
- @click="handleShowCode(item)"
233
- >查看一维码</view>
265
+ @click="copy(item.code)"
266
+ >复制</view>
234
267
  <view
235
268
  v-if="item['code_end_time']"
236
269
  class="jfb-base-success__body-cashier-code"
@@ -243,64 +276,35 @@
243
276
  {{ item['code_end_time'] }}
244
277
  </view>
245
278
  </view>
279
+ <!--codes end-->
246
280
  </view>
247
- <view
248
- class="jfb-base-success__body-card jfb-base-success__body-num"
249
- v-if="item.show_type === 'url'"
250
- >
251
- <view class="code-url">
252
- <view class="jfb-base-success__body-num-info">
253
- <view>{{ item.can_read_code }}</view>
254
- </view>
255
- <view
256
- class="jfb-base-success__body-num-info-copy"
257
- @click="handleToLink(item.code)"
258
- >访问</view>
259
- </view>
260
- <view
261
- class="jfb-base-success__body-num-info-copy"
262
- @click="copy(item.code)"
263
- >复制</view>
264
- <view
265
- v-if="item['code_end_time']"
266
- class="jfb-base-success__body-cashier-code"
267
- :style="{
268
- borderColor: mainColor,
269
- color: mainColor,
270
- background: bgColor,
271
- }"
272
- >
273
- {{ item['code_end_time'] }}
274
- </view>
275
- </view>
276
- <!--codes end-->
277
281
  </view>
278
282
  </view>
279
- </view>
280
- <view class="jfb-base-success__body-detail" v-if="info.custom_content">
281
- <view class="jfb-base-success__body-detail-title">
282
- <view :style="{ background: mainColor }"></view>
283
- <view>{{ info.custom_content.title }}</view>
284
- </view>
285
- <view class="jfb-base-success__body-detail-html">
286
- <xd-content-xss
287
- v-html="info.custom_content.content"
288
- ></xd-content-xss>
289
- </view>
290
- </view>
291
- <view
292
- class="jfb-base-success__body-detail"
293
- v-if="is_show_product === 'Y' && info.productDetail"
294
- >
295
- <view class="jfb-base-success__body-detail-title">
296
- <view :style="{ background: mainColor }"></view>
297
- <view>商品详情</view>
283
+ <view class="jfb-base-success__body-detail" v-if="info.custom_content">
284
+ <view class="jfb-base-success__body-detail-title">
285
+ <view :style="{ background: mainColor }"></view>
286
+ <view>{{ info.custom_content.title }}</view>
287
+ </view>
288
+ <view class="jfb-base-success__body-detail-html">
289
+ <xd-content-xss
290
+ v-html="info.custom_content.content"
291
+ ></xd-content-xss>
292
+ </view>
298
293
  </view>
299
- <view class="jfb-base-success__body-detail-html">
300
- <xd-content-xss v-html="info.productDetail"></xd-content-xss>
294
+ <view
295
+ class="jfb-base-success__body-detail"
296
+ v-if="is_show_product === 'Y' && info.productDetail"
297
+ >
298
+ <view class="jfb-base-success__body-detail-title">
299
+ <view :style="{ background: mainColor }"></view>
300
+ <view>商品详情</view>
301
+ </view>
302
+ <view class="jfb-base-success__body-detail-html">
303
+ <xd-content-xss v-html="info.productDetail"></xd-content-xss>
304
+ </view>
301
305
  </view>
302
306
  </view>
303
- </view>
307
+ </template>
304
308
  </view>
305
309
  <xd-dailog
306
310
  :show.sync="showCode"
@@ -390,10 +394,9 @@ export default {
390
394
  is_show_product: "",
391
395
  webViewPath: "/pages/webview/webview", //容器路径
392
396
  isPreview: false,
393
-
394
397
  info: null,
395
-
396
398
  timeer: null,
399
+ noUserLoding:null,
397
400
 
398
401
  //请求参数
399
402
  params: null,
@@ -405,8 +408,9 @@ export default {
405
408
  };
406
409
  },
407
410
  watch: {
408
- container(value) {
409
- this.init(value);
411
+ container(value,oloValue) {
412
+ if(JSON.stringify(value) === JSON.stringify(oloValue)) return;
413
+ if (this.$configProject['isPreview']) this.init(value)
410
414
  },
411
415
  },
412
416
  computed: {
@@ -414,9 +418,10 @@ export default {
414
418
  ...styleForm.getComputedItem(),
415
419
  },
416
420
  created() {
417
- console.log(this.$configProject, "$configProject");
418
421
  this.isPreview = this.$configProject.isPreview;
422
+ this.noUserLoding = !this.$root['isLogined']; //判断是否需要已登陆
419
423
  this.init(this.container);
424
+
420
425
  },
421
426
  destroyed() {
422
427
  if (this.timeer) {
@@ -428,7 +433,15 @@ export default {
428
433
  onJfbLoad(options) {
429
434
  this.params = options;
430
435
  this.order_id = options.order_id;
436
+
437
+ //已登陆
438
+ if(this.noUserLoding === false || this.isPreview ) {
439
+ setTimeout(()=>{
440
+ this.getStatus();
441
+ },1000)
442
+ }
431
443
  },
444
+
432
445
  handleShowCode(item) {
433
446
  this.codeSrc = item.code_url;
434
447
  this.showType = item.show_type;
@@ -494,9 +507,6 @@ export default {
494
507
  this.index = this.settings.index;
495
508
  this.packageData = true;
496
509
  styleForm.getInitItem(this, value);
497
- setTimeout(()=>{
498
- this.getStatus();
499
- },1000)
500
510
  },
501
511
 
502
512
  getStatus() {