jufubao-base 1.0.110-beta1 → 1.0.110-beta2

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 (5) hide show
  1. package/package.json +1 -1
  2. package/src/components/JfbBaseSaasBlessDetail/JfbBaseSaasBlessDetail.vue +3 -3
  3. package/src/components/JfbBaseSaasHome/JfbBaseSaasHome.vue +64 -50
  4. package/src/components/JfbBaseSaasLogin/Api.js +6 -40
  5. package/src/components/JfbBaseSaasLogin/JfbBaseSaasLogin.vue +61 -5
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-base",
3
- "version": "1.0.110-beta1",
3
+ "version": "1.0.110-beta2",
4
4
  "private": false,
5
5
  "description": "聚福宝业务组件基础插件包",
6
6
  "main": "index.js",
package/src/components/JfbBaseSaasBlessDetail/JfbBaseSaasBlessDetail.vue CHANGED
@@ -28,7 +28,7 @@
28
28
  <view class="h_sub">请务必由本人签收，字迹工整</view>
29
29
  </view>
30
30
  <view class="sign_box">
31
- <jp-signature ref="signatureRef"></jp-signature>
31
+ <xd-signature ref="signatureRef"></xd-signature>
32
32
  </view>
33
33
  <view slot="btn" class="btn_wrap">
34
34
  <xd-button style="width: 220rpx;" @click="clearSign">重写</xd-button>
@@ -54,7 +54,7 @@
54
54
  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
55
55
  import XdButton from "@/components/XdButton/XdButton";
56
56
  import XdDailog from "@/components/XdDailog/XdDailog"
57
- import JpSignature from "@/components/jp-signature/jp-signature"
57
+ import XdSignature from "@/components/XdSignature/XdSignature"
58
58
  import { jfbRootExec } from "@/utils/xd.event";
59
59
  import JfbBaseSaasBlessDetailMixin from "./JfbBaseSaasBlessDetailMixin";
60
60
  import { getContainerPropsValue } from "@/utils/xd.base";
@@ -66,7 +66,7 @@
66
66
  XdFontIcon,
67
67
  XdButton,
68
68
  XdDailog,
69
- JpSignature
69
+ XdSignature
70
70
  },
71
71
  mixins: [
72
72
  componentsMixins, extsMixins, JfbBaseSaasBlessDetailMixin
package/src/components/JfbBaseSaasHome/JfbBaseSaasHome.vue CHANGED
@@ -15,35 +15,40 @@
15
15
  <!-- #endif -->
16
16
  <view class="jfb-base-saas-home__body">
17
17
  <view class="top_wrap">
18
- <view class="comp_name">
18
+ <!-- <view class="comp_name">
19
19
  <view>企业名称</view>
20
20
  <xd-font-icon icon="iconxia_down" :size="24" style="margin-left: 16rpx;"></xd-font-icon>
21
+ </view> -->
22
+
23
+ </view>
24
+ <view class="banner">
25
+ <swiper class="swiper" circular>
26
+ <swiper-item v-for="i in 3" :key="i">
27
+ <view class="swiper-item">{{ i }}</view>
28
+ </swiper-item>
29
+ </swiper>
30
+ </view>
31
+ <view class="category">
32
+ <view class="cate_item">
33
+ <view class="cate_img"></view>
34
+ <view class="cate_name">员工调研</view>
21
35
  </view>
22
- <view class="banner">
23
- <swiper class="swiper" circular>
24
- <swiper-item v-for="i in 3" :key="i">
25
- <view class="swiper-item">{{ i }}</view>
26
- </swiper-item>
27
- </swiper>
36
+ <view class="cate_item">
37
+ <view class="cate_img"></view>
38
+ <view class="cate_name">福利商城</view>
28
39
  </view>
29
- <view class="category">
30
- <view class="cate_item">
31
- <view class="cate_img"></view>
32
- <view class="cate_name">员工调研</view>
33
- </view>
34
- <view class="cate_item">
35
- <view class="cate_img"></view>
36
- <view class="cate_name">福利商城</view>
37
- </view>
38
- <view class="cate_item">
39
- <view class="cate_img"></view>
40
- <view class="cate_name">学习资料</view>
41
- </view>
42
- <view class="cate_item">
43
- <view class="cate_img"></view>
44
- <view class="cate_name">更多期待</view>
45
- </view>
40
+ <view class="cate_item">
41
+ <view class="cate_img"></view>
42
+ <view class="cate_name">学习资料</view>
46
43
  </view>
44
+ <view class="cate_item">
45
+ <view class="cate_img"></view>
46
+ <view class="cate_name">更多期待</view>
47
+ </view>
48
+ </view>
49
+
50
+ <view class="notice">
51
+ 公告：薄如蝉翼的金华火腿，每一口都是时间的味道
47
52
  </view>
48
53
 
49
54
  <view class="news_wrap">
@@ -159,7 +164,6 @@
159
164
  .jfb-base-saas-home {
160
165
  &__body{
161
166
  .top_wrap{
162
- background-color: #FFFFFF;
163
167
  .comp_name{
164
168
  padding: 24rpx 36rpx;
165
169
  font-size: 24rpx;
@@ -169,39 +173,49 @@
169
173
  display: flex;
170
174
  align-items: center;
171
175
  }
172
- .banner{
173
- padding: 20rpx;
174
- .swiper{
176
+ }
177
+ .banner{
178
+ // padding: 20rpx;
179
+ .swiper{
180
+ height: 300rpx;
181
+ .swiper-item{
175
182
  height: 300rpx;
176
- .swiper-item{
177
- height: 300rpx;
178
- background-color: red;
179
- }
183
+ background-color: red;
180
184
  }
181
-
182
185
  }
183
- .category{
184
- display: flex;
185
- justify-content: space-between;
186
- padding: 40rpx;
187
- .cate_item{
188
- .cate_img{
189
- width: 100rpx;
190
- height: 100rpx;
191
- background-color: #DDD;
192
- }
193
- .cate_name{
194
- font-size: 24rpx;
195
- color: #333333;
196
- font-weight: 400;
197
- margin-top: 16rpx;
198
- }
186
+
187
+ }
188
+ .category{
189
+ display: flex;
190
+ justify-content: space-between;
191
+ padding: 40rpx;
192
+ background: #FFFFFF;
193
+ .cate_item{
194
+ .cate_img{
195
+ width: 100rpx;
196
+ height: 100rpx;
197
+ background-color: #DDD;
198
+ }
199
+ .cate_name{
200
+ font-size: 24rpx;
201
+ color: #333333;
202
+ font-weight: 400;
203
+ margin-top: 16rpx;
199
204
  }
200
205
  }
201
206
  }
207
+ .notice{
208
+ background: #FFF2DE;
209
+ border-radius: 8rpx;
210
+ padding: 24rpx 40rpx;
211
+ color: #FF8D1A;
212
+ font-size: 24rpx;
213
+ margin: 20rpx;
214
+ }
202
215
 
203
216
  .news_wrap{
204
- padding: 20rpx;
217
+ padding: 0 20rpx;
218
+ margin: 20rpx 0;
205
219
  }
206
220
  .news_group{
207
221
  background-color: #FFFFFF;
package/src/components/JfbBaseSaasLogin/Api.js CHANGED
@@ -12,47 +12,13 @@
12
12
  */
13
13
  module.exports = [
14
14
  {
15
- mapFnName: 'getByIdFilmSquate', //自定义方法名字（必选）
16
- title: '获取电影广场列表',
17
- path: '/api/account/film/list-film-square',
15
+ mapFnName: 'sendMsg',
16
+ title: '发送验证码',
17
+ path: '/common/v1/valid_code/sms/send',
18
18
  isRule: false,
19
- params: {
20
- last_key: ['当前页', 'Number', '必选'],
21
- page_size: ['每页数量', 'Number', '必选'],
22
- },
23
- isConsole: true,
24
- disabled: true,
25
- },
26
- {
27
- mapFnName: 'updateFilmPaiqiDate', //自定义方法名字（必选）
28
- title: '更新排期',
29
- path: '/api/account/film/paiqi-date',
30
- isRule: false,
31
- params: {
32
- film_id: ['电影id', 'Number', '必选'],
33
- cinema_id: ['影院id', 'Number', '必选'],
34
- },
35
- isConsole: true,
36
- disabled: true,
37
- },
38
- {
39
- mapFnName: 'removeFilmAddress', //自定义方法名字（必选）
40
- title: '删除我的配送地址',
41
- path: '/api/account/film/paiqi-date',
42
- isRule: false,
43
- params: {
44
- film_id: ['电影id', 'Number', '必选'],
45
- },
46
- isConsole: true,
47
- disabled: true,
48
- },
49
- {
50
- mapFnName: 'addFilmcart', //自定义方法名字（必选）
51
- title: '添加购物车',
52
- path: '/api/account/film/paiqi-date',
53
- isRule: false,
54
- params: {
55
- film_id: ['电影id', 'Number', '必选'],
19
+ data: {
20
+ phone_number: ['手机号', 'String', '必选'],
21
+ biz_name: ['业务名称', 'String', '必选']
56
22
  },
57
23
  isConsole: true,
58
24
  disabled: true,
package/src/components/JfbBaseSaasLogin/JfbBaseSaasLogin.vue CHANGED
@@ -34,6 +34,23 @@
34
34
  />
35
35
  </xd-form-item>
36
36
  <xd-form-item
37
+ label="验证码"
38
+ content-align="left"
39
+ >
40
+ <view class="flex align-center">
41
+ <xd-form-input
42
+ v-model="accountForm.verification_code"
43
+ placeholder="请输入验证码"
44
+ />
45
+ <view
46
+ class="get_code"
47
+ @click="reGetCode"
48
+ :style="{ color: mainColor }"
49
+ >{{ time ? time + "秒后获取" : "获取验证码" }}
50
+ </view>
51
+ </view>
52
+ </xd-form-item>
53
+ <!-- <xd-form-item
37
54
  label="密码"
38
55
  content-align="left"
39
56
  >
@@ -42,7 +59,7 @@
42
59
  v-model="accountForm.password"
43
60
  placeholder="请输入密码"
44
61
  />
45
- </xd-form-item>
62
+ </xd-form-item> -->
46
63
  </xd-form>
47
64
 
48
65
  <view class="form-group" style="padding-bottom:0">
@@ -71,10 +88,10 @@
71
88
  @click="doLoginForm"
72
89
  >登录</xd-button>
73
90
  </view>
74
- <view
91
+ <!-- <view
75
92
  class="forget_password"
76
93
  @click="toValidPhone"
77
- >忘记密码</view>
94
+ >忘记密码</view> -->
78
95
  </view>
79
96
  <view class="not_login">暂不登录，去逛逛</view>
80
97
  </view>
@@ -115,8 +132,10 @@
115
132
  return {
116
133
  accountForm: {
117
134
  phone_number: "",
118
- password: ""
135
+ password: "",
136
+ verification_code: ""
119
137
  },
138
+ time: 0,
120
139
  panel_2_checked: "",
121
140
  redirect_url: "", //401回跳地址
122
141
 
@@ -149,7 +168,7 @@
149
168
  const { phone_number, password } = this.accountForm;
150
169
  let err_tip = "";
151
170
  if (!phone_number) err_tip = "手机号不能为空";
152
- else if (!password) err_tip = "密码不能为空";
171
+ else if (!verification_code) err_tip = "验证码不能为空";
153
172
  if (err_tip) {
154
173
  return uni.showToast({
155
174
  title: err_tip,
@@ -196,6 +215,38 @@
196
215
  url: `/pages/content/content?${params}`
197
216
  })
198
217
  },
218
+ reGetCode() {
219
+ if (this.time > 0) return;
220
+ const { phone_number } = this.accountForm;
221
+ if (!/^1[3-9]\d{9}$/.test(phone_number)) {
222
+ uni.showToast({
223
+ title: "请填写正确的手机号",
224
+ icon: "none",
225
+ });
226
+ return false;
227
+ }
228
+ this.$xdShowLoading({});
229
+ jfbRootExec("sendMsg", {
230
+ vm: this,
231
+ data: {
232
+ phone_number,
233
+ biz_name: "login",
234
+ },
235
+ }).then((res) => {
236
+ this.$xdHideLoading();
237
+ this.time = 120;
238
+ this.interval = setInterval(() => {
239
+ this.time--;
240
+ if (this.time === 0) {
241
+ clearTimeout(this.interval);
242
+ }
243
+ }, 1000);
244
+ }).catch((error) => {
245
+ this.$xdHideLoading();
246
+ console.error(error);
247
+ this.$xdLog.catch(error)
248
+ });
249
+ },
199
250
  onJfbScroll(options) {
200
251
  console.log('event.onJfbScroll', options)
201
252
  },
@@ -262,6 +313,11 @@
262
313
  .form-group {
263
314
  padding: 40rpx 70rpx;
264
315
  }
316
+ .get_code {
317
+ color: @xd-base-color;
318
+ font-size: 24rpx;
319
+ margin-right: unit(20,rpx);
320
+ }
265
321
  .form-item {
266
322
  /deep/ .uni-forms-item {
267
323
  padding-left: unit(30rpx) !important;