jufubao-base 1.0.119-beta17 → 1.0.119-beta18
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.
package/package.json
CHANGED
|
@@ -297,6 +297,9 @@ export default {
|
|
|
297
297
|
} catch (error) {
|
|
298
298
|
console.log(error, "errorerror");
|
|
299
299
|
}
|
|
300
|
+
console.log(!storage.get(this.containerId) &&
|
|
301
|
+
this.distribution_method !== "paid" &&
|
|
302
|
+
this.distribution_method !== "card_binded",'pppppp');
|
|
300
303
|
if(this.distribution_method === 'card_binded'){
|
|
301
304
|
jfbRootFnExec(this, 'onCustomEvent')("baseConDialog@hasCon", this.containerId);
|
|
302
305
|
}
|
|
@@ -14,96 +14,110 @@
|
|
|
14
14
|
</view>
|
|
15
15
|
<!-- #endif -->
|
|
16
16
|
<view class="jfb-base-con-phone__body" v-if="done">
|
|
17
|
-
<view
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
<view>
|
|
28
|
-
<
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
<input
|
|
40
|
-
v-model="valid_code"
|
|
41
|
-
placeholder="请输入验证码"
|
|
42
|
-
type="text"
|
|
43
|
-
/>
|
|
44
|
-
<XdButton
|
|
45
|
-
:disabled="disabled"
|
|
46
|
-
class="jfb-base-con-phone__body-wrap-input-code-btn"
|
|
47
|
-
type="primary"
|
|
48
|
-
:bg-color="mainColor"
|
|
49
|
-
size="small"
|
|
50
|
-
@click="handleSendCode"
|
|
51
|
-
>{{ message }}</XdButton
|
|
17
|
+
<view v-if="has_times === 'Y'">
|
|
18
|
+
<view
|
|
19
|
+
class="jfb-base-con-phone__body-wrap"
|
|
20
|
+
:style="{
|
|
21
|
+
height: topHeight + 'rpx',
|
|
22
|
+
width: topWidth + 'rpx',
|
|
23
|
+
backgroundImage: `url(${background})`,
|
|
24
|
+
backgroundSize: '100% 100%',
|
|
25
|
+
}"
|
|
26
|
+
>
|
|
27
|
+
<view v-if="showCode" class="jfb-base-con-phone__body-wrap-input">
|
|
28
|
+
<view>
|
|
29
|
+
<input
|
|
30
|
+
@input="filterSpaces"
|
|
31
|
+
v-model="phoneNumber"
|
|
32
|
+
placeholder="请输入手机号"
|
|
33
|
+
type="text"
|
|
34
|
+
/>
|
|
35
|
+
</view>
|
|
36
|
+
<view
|
|
37
|
+
class="jfb-base-con-phone__body-wrap-input-code"
|
|
38
|
+
style="margin-bottom: 54rpx"
|
|
52
39
|
>
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
radius="20rpx"
|
|
59
|
-
size="small"
|
|
60
|
-
:disabled="!phoneNumber || !valid_code"
|
|
61
|
-
@click="handleConfirm"
|
|
62
|
-
>确认领取</XdButton
|
|
63
|
-
>
|
|
64
|
-
</view>
|
|
65
|
-
<view v-else class="jfb-base-con-phone__body-wrap-input">
|
|
66
|
-
<view class="jfb-base-con-phone__body-wrap-input-phone">
|
|
67
|
-
<view class="jfb-base-con-phone__body-wrap-input-phone-change">
|
|
68
|
-
<view>当前登录手机号</view>
|
|
40
|
+
<input
|
|
41
|
+
v-model="valid_code"
|
|
42
|
+
placeholder="请输入验证码"
|
|
43
|
+
type="text"
|
|
44
|
+
/>
|
|
69
45
|
<XdButton
|
|
70
|
-
|
|
46
|
+
:disabled="disabled"
|
|
47
|
+
class="jfb-base-con-phone__body-wrap-input-code-btn"
|
|
71
48
|
type="primary"
|
|
72
49
|
:bg-color="mainColor"
|
|
73
50
|
size="small"
|
|
74
|
-
@click="
|
|
75
|
-
|
|
51
|
+
@click="handleSendCode"
|
|
52
|
+
>{{ message }}</XdButton
|
|
76
53
|
>
|
|
77
54
|
</view>
|
|
78
|
-
<
|
|
55
|
+
<XdButton
|
|
56
|
+
type="primary"
|
|
57
|
+
:bg-color="mainColor"
|
|
58
|
+
width="360rpx"
|
|
59
|
+
radius="20rpx"
|
|
60
|
+
size="small"
|
|
61
|
+
:disabled="!phoneNumber || !valid_code"
|
|
62
|
+
@click="handleConfirm"
|
|
63
|
+
>确认领取</XdButton
|
|
64
|
+
>
|
|
65
|
+
</view>
|
|
66
|
+
<view v-else class="jfb-base-con-phone__body-wrap-input">
|
|
67
|
+
<view class="jfb-base-con-phone__body-wrap-input-phone">
|
|
68
|
+
<view class="jfb-base-con-phone__body-wrap-input-phone-change">
|
|
69
|
+
<view>当前登录手机号</view>
|
|
70
|
+
<XdButton
|
|
71
|
+
style="margin: 0"
|
|
72
|
+
type="primary"
|
|
73
|
+
:bg-color="mainColor"
|
|
74
|
+
size="small"
|
|
75
|
+
@click="showCode = true"
|
|
76
|
+
>切换手机号</XdButton
|
|
77
|
+
>
|
|
78
|
+
</view>
|
|
79
|
+
<view>{{ showOhoneNumber }}</view>
|
|
80
|
+
</view>
|
|
81
|
+
<XdButton
|
|
82
|
+
type="primary"
|
|
83
|
+
:bg-color="mainColor"
|
|
84
|
+
width="360rpx"
|
|
85
|
+
radius="20rpx"
|
|
86
|
+
size="small"
|
|
87
|
+
@click="handleConfirm"
|
|
88
|
+
>直接领取</XdButton
|
|
89
|
+
>
|
|
79
90
|
</view>
|
|
80
|
-
<XdButton
|
|
81
|
-
type="primary"
|
|
82
|
-
:bg-color="mainColor"
|
|
83
|
-
width="360rpx"
|
|
84
|
-
radius="20rpx"
|
|
85
|
-
size="small"
|
|
86
|
-
@click="handleConfirm"
|
|
87
|
-
>直接领取</XdButton
|
|
88
|
-
>
|
|
89
91
|
</view>
|
|
90
|
-
<view
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
:
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
type="primary"
|
|
102
|
-
:bg-color="mainColor"
|
|
103
|
-
radius="20rpx"
|
|
104
|
-
@click="handleTo(btnTwoUrl)"
|
|
105
|
-
>{{ btnTwoName }}</XdButton
|
|
92
|
+
<view
|
|
93
|
+
:style="{
|
|
94
|
+
height: bottomHeight + 'rpx',
|
|
95
|
+
width: bottomWidth + 'rpx',
|
|
96
|
+
backgroundImage: `url(${used_background})`,
|
|
97
|
+
backgroundSize: '100% 100%',
|
|
98
|
+
}"
|
|
99
|
+
>
|
|
100
|
+
<view
|
|
101
|
+
v-if="showBtn === 'Y'"
|
|
102
|
+
class="jfb-base-con-phone__body-wrap-btn"
|
|
106
103
|
>
|
|
104
|
+
<XdButton
|
|
105
|
+
size="small"
|
|
106
|
+
type="primary"
|
|
107
|
+
:bg-color="mainColor"
|
|
108
|
+
radius="20rpx"
|
|
109
|
+
@click="handleTo(btnOneUrl)"
|
|
110
|
+
>{{ btnOneName }}</XdButton
|
|
111
|
+
>
|
|
112
|
+
<XdButton
|
|
113
|
+
size="small"
|
|
114
|
+
type="primary"
|
|
115
|
+
:bg-color="mainColor"
|
|
116
|
+
radius="20rpx"
|
|
117
|
+
@click="handleTo(btnTwoUrl)"
|
|
118
|
+
>{{ btnTwoName }}</XdButton
|
|
119
|
+
>
|
|
120
|
+
</view>
|
|
107
121
|
</view>
|
|
108
122
|
</view>
|
|
109
123
|
<view
|
|
@@ -125,7 +139,7 @@ import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
|
|
|
125
139
|
import XdButton from "@/components/XdButton/XdButton";
|
|
126
140
|
import { jfbRootExec } from "@/utils/xd.event";
|
|
127
141
|
import JfbBaseConPhoneMixin from "./JfbBaseConPhoneMixin";
|
|
128
|
-
import { getContainerPropsValue } from "@/utils/xd.base";
|
|
142
|
+
import { getContainerPropsValue, getImageInfo } from "@/utils/xd.base";
|
|
129
143
|
import componentsMixins from "@/mixins/componentsMixins";
|
|
130
144
|
import extsMixins from "@/mixins/extsMixins";
|
|
131
145
|
import { mapState } from "vuex";
|
|
@@ -171,6 +185,12 @@ export default {
|
|
|
171
185
|
date: 2, //时间底数
|
|
172
186
|
time: 0, //时间幂指数
|
|
173
187
|
timeer: null,
|
|
188
|
+
topHeight: "",
|
|
189
|
+
topWidth: "750",
|
|
190
|
+
used_background: "",
|
|
191
|
+
bottomHeight: "",
|
|
192
|
+
bottomWidth: "750",
|
|
193
|
+
showBtn: "N",
|
|
174
194
|
};
|
|
175
195
|
},
|
|
176
196
|
watch: {
|
|
@@ -234,7 +254,7 @@ export default {
|
|
|
234
254
|
activity_id: this.activity_id,
|
|
235
255
|
},
|
|
236
256
|
})
|
|
237
|
-
.then((res) => {
|
|
257
|
+
.then(async (res) => {
|
|
238
258
|
console.log(res, "res");
|
|
239
259
|
this.has_times = res.has_times;
|
|
240
260
|
this.showBtn = res.phone_button;
|
|
@@ -242,7 +262,15 @@ export default {
|
|
|
242
262
|
this.btnTwoName = res.button_name_two;
|
|
243
263
|
this.btnOneUrl = res.button_url_one;
|
|
244
264
|
this.btnTwoUrl = res.button_url_two;
|
|
265
|
+
let image = await getImageInfo(getServiceUrl(res.background));
|
|
266
|
+
let image1 = await getImageInfo(getServiceUrl(res.used_background));
|
|
267
|
+
console.log({ ...image }, "imageimage");
|
|
268
|
+
this.topHeight = image.imgHeight * 2;
|
|
269
|
+
this.topWidth = image.imgWidth * 2;
|
|
270
|
+
this.bottomHeight = image1.imgHeight * 2;
|
|
271
|
+
this.bottomWidth = image1.imgWidth * 2;
|
|
245
272
|
this.background = getServiceUrl(res.background);
|
|
273
|
+
this.used_background = getServiceUrl(res.used_background);
|
|
246
274
|
this.errmessage = res.message;
|
|
247
275
|
this.done = true;
|
|
248
276
|
})
|
|
@@ -504,8 +532,8 @@ export default {
|
|
|
504
532
|
display: flex;
|
|
505
533
|
justify-content: space-around;
|
|
506
534
|
align-items: center;
|
|
507
|
-
width:
|
|
508
|
-
|
|
535
|
+
width: 750rpx;
|
|
536
|
+
padding-top: 40rpx;
|
|
509
537
|
}
|
|
510
538
|
}
|
|
511
539
|
}
|