fix

virgo.wzfrontend/workark_wx/pages/login/login.vue

@@ -3,42 +3,54 @@
 		<view class="title">
 			<view>欢迎使用WORKARK</view>
 		</view>
-		<view class="form">
-			<view class="tab">
-				<view :class="loginType == 1 ? 'tab-item select type1' : 'tab-item type1'" @click="loginType=1">验证码登录
+		<view class="form-box">
+			<view class="form-tab">
+				<view :class="loginType == 1 ? 'tab-item select type1' : 'tab-item type1'" @click="loginType=1">
+					验证码登录
 				</view>
-				<view :class="loginType == 2 ? 'tab-item select type2' : 'tab-item type2'" @click="loginType=2">账号密码登陆
+				<view :class="loginType == 2 ? 'tab-item select type2' : 'tab-item type2'" @click="loginType=2">
+					账号密码登陆
 				</view>
 			</view>
-			<view class="inputs_button">
-				<view class="inputs">
+			<view class="form-input">
+				<view class="input-box">
 					<view class="account">
-						<input type="number" v-model="account" :adjust-position="false" placeholder="手机号" />
+						<input class="input-inner" type="number" v-model="account" :adjust-position="false"
+							placeholder="手机号" />
 					</view>
 					<view class="password" v-if="loginType==2">
-						<input :type="pwdShow? 'text' : 'password'" v-model="password" :adjust-position="false"
-							placeholder="密码" />
-						<uni-icons :type="pwdShow? 'eye-filled' : 'eye-slash-filled'" size="24" color="#cccccc"
+						<input class="input-inner" :type="pwdShow? 'text' : 'password'" v-model="password"
+							:adjust-position="false" placeholder="密码" />
+						<uv-icon :name="pwdShow? 'eye-fill' : 'eye-off'" size="50rpx" color="#cccccc"
 							@click="pwdShow=!pwdShow">
-						</uni-icons>
+						</uv-icon>
 					</view>
 					<view class="vcode" v-if="loginType==1">
-						<input type="number" v-model="vcode" :adjust-position="false" placeholder="验证码" />
-						<text v-if="vcodeTime==0" style="color:#3264ed" @click="getVcode">获取验证码</text>
-						<text v-else style="color:#ccc">重新获取({{vcodeTime}}s)</text>
+						<input class="input-inner" type="number" v-model="vcode" :adjust-position="false"
+							placeholder="验证码" />
+						<uv-button type="primary" :text="codeTips" @click="getCode" size="small"
+							:disabled="codeDisabled">
+						</uv-button>
 					</view>
 				</view>
 				<view class="button">
-					<view @click="login">
+					<view class="button-item" @click="login">
 						登录
 					</view>
 				</view>
+				<uv-code ref="code" :seconds="seconds" @end="codeDisabled = false" @start="codeDisabled = true"
+					@change="text => codeTips = text">
+				</uv-code>
 			</view>
 		</view>
 		<view class="pact">
-			<radio :checked="pactChecked" activeBackgroundColor="#3264ed" activeBorderColor="#3264ed"
-				borderColor="#3264ed" color="#fff" @click="pactChange" />
-			<view>我已阅读并同意<text @click="toPact">《用户协议》</text>和<text @click="toPact">《隐私协议》</text></view>
+			<uv-checkbox-group v-model="pactChecked" shape="circle" placement="column" customStyle="maxWidth:208rpx;"
+				labelSize="24rpx">
+				<uv-checkbox name="apple" label="我已阅读并同意"></uv-checkbox>
+			</uv-checkbox-group>
+			<uv-text text="《用户协议》" size="24rpx" type="primary" @click="toPact"></uv-text>
+			<uv-text text="和" size="24rpx"></uv-text>
+			<uv-text text="《隐私协议》" size="24rpx" type="primary" @click="toPact"></uv-text>
 		</view>
 	</view>
 </template>
@@ -54,34 +66,38 @@
 				pwdShow: false,
 				pactChecked: false,
 				vcodeTime: 0,
-				vcodeTimer: null
+				vcodeTimer: null,
+				codeTips: '',
+				seconds: 60,
+				codeDisabled: false
 			}
 		},
 		onLoad() {
 
 		},
 		methods: {
+			getCode() {
+				if (this.$refs.code.canGetCode) {
+					// 模拟向后端请求验证码
+					uni.showLoading({
+						title: '正在获取验证码'
+					})
+					setTimeout(() => {
+						uni.hideLoading();
+						// 这里此提示会被this.start()方法中的提示覆盖
+						this.$toast('验证码已发送');
+						// 通知验证码组件内部开始倒计时
+						this.$refs.code.start();
+					}, 2000);
+				}
+			},
 			login() {
 				uni.showToast({
 					title: "登录方式" + this.loginType,
 					icon: 'none'
 				})
 			},
-			getVcode() {
-				this.vcodeTime = 60
-				this.vcodeTimer = setInterval(() => {
-					if (this.vcodeTime > 0) {
-						this.vcodeTime--
-					} else {
-						clearInterval(this.vcodeTimer)
-						this.vcodeTimer = null
-					}
-				}, 1000)
-				uni.showToast({
-					title: "获取验证码",
-					icon: 'none'
-				})
-			},
+			getVcode() {},
 			pactChange() {
 				this.pactChecked = !this.pactChecked
 			},
@@ -103,98 +119,90 @@
 		display: flex;
 		flex-direction: column;
 		justify-content: space-between;
+	}
 
-		.title {
-			padding-top: 180rpx;
-			padding-bottom: 40rpx;
-			padding-left: 64rpx;
-			font-size: 48rpx;
-			font-weight: 700;
-			color: #383838;
-		}
-
-		.form {
-			flex: 1;
-			margin: 0 32rpx;
-			border-radius: 40rpx;
-			background-color: #fff;
-			overflow: hidden;
+	.form-box {
+		flex: 1;
+		margin: 0 30rpx;
+		border-radius: 40rpx;
+		background-color: #fff;
+		overflow: hidden;
+	}
 
-			.inputs_button {
-				background-color: #fff;
+	.form-input {
+		background-color: #fff;
+	}
 
-				.inputs {
-					padding: 150rpx 32rpx 0;
-					margin-bottom: 80rpx;
-
-					.account,
-					.password,
-					.vcode {
-						height: 96rpx;
-						border-radius: 20rpx;
-						padding: 0 48rpx;
-						display: flex;
-						align-items: center;
-						background-color: #f7fafc;
-
-						input {
-							flex: 1;
-						}
-					}
-
-					.account {
-						margin-bottom: 48rpx;
-					}
-
-					.vcode {
-						text {
-							text-wrap: nowrap;
-							font-size: 26rpx;
-							background-color: #fff;
-							padding: 14rpx 30rpx;
-							border-radius: 12rpx;
-						}
-					}
-				}
+	.input-box {
+		padding: 150rpx 32rpx 0;
+		margin-bottom: 80rpx;
+	}
 
-				.button {
-					padding: 0 32rpx;
-
-					view {
-						line-height: 96rpx;
-						border-radius: 20rpx;
-						text-align: center;
-						font-size: 32rpx;
-						background-color: #3264ed;
-						color: #fff;
-					}
-				}
-			}
+	.account,
+	.password,
+	.vcode {
+		height: 96rpx;
+		border-radius: 20rpx;
+		padding: 0 48rpx;
+		display: flex;
+		align-items: center;
+		background-color: #f7fafc;
 
+		.input-inner {
+			flex: 1;
 		}
+	}
 
-		.pact {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			padding-bottom: 120rpx;
-			font-size: 24rpx;
+	.account {
+		margin-bottom: 48rpx;
+	}
 
-			text {
-				color: #3264ed;
-			}
+	.vcode-text {
+		text-wrap: nowrap;
+		font-size: 26rpx;
+		background-color: #fff;
+		padding: 14rpx 30rpx;
+		border-radius: 12rpx;
+	}
 
-			radio {
-				:deep(.uni-radio-input) {
-					border: 1rpx solid #3264ed;
-				}
+	.button {
+		padding: 0 32rpx;
 
-				transform:scale(0.6)
-			}
+		.button-item {
+			line-height: 96rpx;
+			border-radius: 20rpx;
+			text-align: center;
+			font-size: 32rpx;
+			background-color: $uv-primary;
+			color: #fff;
+		}
+	}
+
+	.pact {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding-top: 20rpx;
+		padding-bottom: 120rpx;
+		font-size: 24rpx;
+		height: 40rpx;
+
+		::v-deep .uv-text {
+			width: auto;
+			flex: inherit;
 		}
 	}
 
-	.tab {
+	.title {
+		padding-top: 180rpx;
+		padding-bottom: 40rpx;
+		padding-left: 64rpx;
+		font-size: 48rpx;
+		font-weight: 700;
+		color: #383838;
+	}
+
+	.form-tab {
 		display: flex;
 		align-items: center;
 		justify-content: space-between;

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/pages/login/login.json

@@ -1,4 +1,11 @@
 {
   "navigationBarTitleText": "",
-  "usingComponents": {}
+  "usingComponents": {
+    "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon",
+    "uv-button": "/uni_modules/uv-button/components/uv-button/uv-button",
+    "uv-code": "/uni_modules/uv-code/components/uv-code/uv-code",
+    "uv-checkbox-group": "/uni_modules/uv-checkbox/components/uv-checkbox-group/uv-checkbox-group",
+    "uv-checkbox": "/uni_modules/uv-checkbox/components/uv-checkbox/uv-checkbox",
+    "uv-text": "/uni_modules/uv-text/components/uv-text/uv-text"
+  }
 }

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/pages/login/login.wxss

@@ -6,31 +6,23 @@
   flex-direction: column;
   justify-content: space-between;
 }
-.login-page .title.data-v-b237504c {
-  padding-top: 180rpx;
-  padding-bottom: 40rpx;
-  padding-left: 64rpx;
-  font-size: 48rpx;
-  font-weight: 700;
-  color: #383838;
-}
-.login-page .form.data-v-b237504c {
+.form-box.data-v-b237504c {
   flex: 1;
-  margin: 0 32rpx;
+  margin: 0 30rpx;
   border-radius: 40rpx;
   background-color: #fff;
   overflow: hidden;
 }
-.login-page .form .inputs_button.data-v-b237504c {
+.form-input.data-v-b237504c {
   background-color: #fff;
 }
-.login-page .form .inputs_button .inputs.data-v-b237504c {
+.input-box.data-v-b237504c {
   padding: 150rpx 32rpx 0;
   margin-bottom: 80rpx;
 }
-.login-page .form .inputs_button .inputs .account.data-v-b237504c,
-.login-page .form .inputs_button .inputs .password.data-v-b237504c,
-.login-page .form .inputs_button .inputs .vcode.data-v-b237504c {
+.account.data-v-b237504c,
+.password.data-v-b237504c,
+.vcode.data-v-b237504c {
   height: 96rpx;
   border-radius: 20rpx;
   padding: 0 48rpx;
@@ -38,50 +30,54 @@
   align-items: center;
   background-color: #f7fafc;
 }
-.login-page .form .inputs_button .inputs .account input.data-v-b237504c,
-.login-page .form .inputs_button .inputs .password input.data-v-b237504c,
-.login-page .form .inputs_button .inputs .vcode input.data-v-b237504c {
+.account .input-inner.data-v-b237504c,
+.password .input-inner.data-v-b237504c,
+.vcode .input-inner.data-v-b237504c {
   flex: 1;
 }
-.login-page .form .inputs_button .inputs .account.data-v-b237504c {
+.account.data-v-b237504c {
   margin-bottom: 48rpx;
 }
-.login-page .form .inputs_button .inputs .vcode text.data-v-b237504c {
+.vcode-text.data-v-b237504c {
   text-wrap: nowrap;
   font-size: 26rpx;
   background-color: #fff;
   padding: 14rpx 30rpx;
   border-radius: 12rpx;
 }
-.login-page .form .inputs_button .button.data-v-b237504c {
+.button.data-v-b237504c {
   padding: 0 32rpx;
 }
-.login-page .form .inputs_button .button view.data-v-b237504c {
+.button .button-item.data-v-b237504c {
   line-height: 96rpx;
   border-radius: 20rpx;
   text-align: center;
   font-size: 32rpx;
-  background-color: #3264ed;
+  background-color: #3c9cff;
   color: #fff;
 }
-.login-page .pact.data-v-b237504c {
+.pact.data-v-b237504c {
   display: flex;
   align-items: center;
   justify-content: center;
+  padding-top: 20rpx;
   padding-bottom: 120rpx;
   font-size: 24rpx;
+  height: 40rpx;
 }
-.login-page .pact text.data-v-b237504c {
-  color: #3264ed;
+.pact.data-v-b237504c  .uv-text {
+  width: auto;
+  flex: inherit;
 }
-.login-page .pact radio.data-v-b237504c {
-  -webkit-transform: scale(0.6);
-          transform: scale(0.6);
-}
-.login-page .pact radio.data-v-b237504c :deep(.uni-radio-input) {
-  border: 1rpx solid #3264ed;
+.title.data-v-b237504c {
+  padding-top: 180rpx;
+  padding-bottom: 40rpx;
+  padding-left: 64rpx;
+  font-size: 48rpx;
+  font-weight: 700;
+  color: #383838;
 }
-.tab.data-v-b237504c {
+.form-tab.data-v-b237504c {
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -89,14 +85,14 @@
   height: 100rpx;
   background: linear-gradient(180deg, #e3ebf9 0%, #ffffff 100%);
 }
-.tab .tab-item.data-v-b237504c {
+.form-tab .tab-item.data-v-b237504c {
   width: 340rpx;
   line-height: 100rpx;
   text-align: center;
   color: #9e9e9e;
   position: relative;
 }
-.tab .tab-item.data-v-b237504c::after {
+.form-tab .tab-item.data-v-b237504c::after {
   content: "";
   width: 50rpx;
   height: 8rpx;
@@ -110,16 +106,16 @@
           transform: translateX(-50%);
   opacity: 0;
 }
-.tab .tab-item.select.data-v-b237504c {
+.form-tab .tab-item.select.data-v-b237504c {
   background-color: #fff;
   color: #3c9cff;
 }
-.tab .tab-item.type1.select.data-v-b237504c {
+.form-tab .tab-item.type1.select.data-v-b237504c {
   border-radius: 0 40rpx 0 0;
 }
-.tab .tab-item.type2.select.data-v-b237504c {
+.form-tab .tab-item.type2.select.data-v-b237504c {
   border-radius: 40rpx 0 0;
 }
-.tab .tab-item.select.data-v-b237504c::after {
+.form-tab .tab-item.select.data-v-b237504c::after {
   opacity: 1;
 }

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/pages/workark/workark.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     uvImage: function () {
-      return Promise.all(/*! import() | uni_modules/uv-image/components/uv-image/uv-image */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-image/components/uv-image/uv-image")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-image/components/uv-image/uv-image.vue */ 84))
+      return Promise.all(/*! import() | uni_modules/uv-image/components/uv-image/uv-image */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-image/components/uv-image/uv-image")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-image/components/uv-image/uv-image.vue */ 92))
     },
     uvText: function () {
-      return Promise.all(/*! import() | uni_modules/uv-text/components/uv-text/uv-text */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-text/components/uv-text/uv-text")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-text/components/uv-text/uv-text.vue */ 101))
+      return Promise.all(/*! import() | uni_modules/uv-text/components/uv-text/uv-text */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-text/components/uv-text/uv-text")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-text/components/uv-text/uv-text.vue */ 109))
     },
   }
 } catch (e) {

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-checkbox/components/uv-checkbox-group/uv-checkbox-group.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-checkbox/components/uv-checkbox-group/uv-checkbox-group.wxml

@@ -0,0 +1 @@
+<view class="{{['uv-checkbox-group','data-v-bd2186c2',bemClass]}}" style="{{$root.s0}}"><slot></slot></view>

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-checkbox/components/uv-checkbox-group/uv-checkbox-group.wxss

@@ -0,0 +1,21 @@
+view.data-v-bd2186c2, scroll-view.data-v-bd2186c2, swiper-item.data-v-bd2186c2 {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  flex-grow: 0;
+  flex-basis: auto;
+  align-items: stretch;
+  align-content: flex-start;
+}
+.uv-checkbox-group.data-v-bd2186c2 {
+  flex: 1;
+}
+.uv-checkbox-group--row.data-v-bd2186c2 {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+}
+.uv-checkbox-group--column.data-v-bd2186c2 {
+  display: flex;
+  flex-direction: column;
+}

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-checkbox/components/uv-checkbox/uv-checkbox.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon"
+  },
+  "component": true
+}

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-checkbox/components/uv-checkbox/uv-checkbox.wxss

@@ -0,0 +1,75 @@
+.uv-border-bottom.data-v-c063b28a {
+  border-bottom-width: 0.5px !important;
+  border-color: #dadbde !important;
+  border-bottom-style: solid;
+}
+view.data-v-c063b28a, scroll-view.data-v-c063b28a, swiper-item.data-v-c063b28a {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  flex-grow: 0;
+  flex-basis: auto;
+  align-items: stretch;
+  align-content: flex-start;
+}
+.uv-checkbox.data-v-c063b28a {
+  display: flex;
+  flex-direction: row;
+  overflow: hidden;
+  flex-direction: row;
+  align-items: center;
+}
+.uv-checkbox-label--left.data-v-c063b28a {
+  flex-direction: row;
+}
+.uv-checkbox-label--right.data-v-c063b28a {
+  flex-direction: row-reverse;
+  justify-content: space-between;
+}
+.uv-checkbox__icon-wrap.data-v-c063b28a {
+  box-sizing: border-box;
+  transition-property: border-color, background-color, color;
+  transition-duration: 0.2s;
+  color: #606266;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+  color: transparent;
+  text-align: center;
+  font-size: 6px;
+  border-width: 1px;
+  border-color: #c8c9cc;
+  border-style: solid;
+}
+.uv-checkbox__icon-wrap--circle.data-v-c063b28a {
+  border-radius: 100%;
+}
+.uv-checkbox__icon-wrap--square.data-v-c063b28a {
+  border-radius: 3px;
+}
+.uv-checkbox__icon-wrap--checked.data-v-c063b28a {
+  color: #fff;
+  background-color: red;
+  border-color: #2979ff;
+}
+.uv-checkbox__icon-wrap--disabled.data-v-c063b28a {
+  background-color: #ebedf0 !important;
+}
+.uv-checkbox__icon-wrap--disabled--checked.data-v-c063b28a {
+  color: #c8c9cc !important;
+}
+.uv-checkbox__label.data-v-c063b28a {
+  word-wrap: break-word;
+  margin-left: 5px;
+  margin-right: 12px;
+  color: #606266;
+  font-size: 15px;
+}
+.uv-checkbox__label--disabled.data-v-c063b28a {
+  color: #c8c9cc;
+}
+.uv-checkbox__label-wrap.data-v-c063b28a {
+  flex: 1;
+  padding-left: 6px;
+}

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-code/components/uv-code/uv-code.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-code/components/uv-code/uv-code.wxml

@@ -0,0 +1 @@
+<view class="uv-code"></view>

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-radio/components/uv-radio/uv-radio.js

@@ -0,0 +1 @@
+Component({})

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-radio/components/uv-radio/uv-radio.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon"
+  },
+  "component": true
+}

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-radio/components/uv-radio/uv-radio.wxss

@@ -0,0 +1,75 @@
+.uv-border-bottom.data-v-4c84423e {
+  border-bottom-width: 0.5px !important;
+  border-color: #dadbde !important;
+  border-bottom-style: solid;
+}
+view.data-v-4c84423e, scroll-view.data-v-4c84423e, swiper-item.data-v-4c84423e {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  flex-grow: 0;
+  flex-basis: auto;
+  align-items: stretch;
+  align-content: flex-start;
+}
+.uv-radio.data-v-4c84423e {
+  display: flex;
+  flex-direction: row;
+  overflow: hidden;
+  flex-direction: row;
+  align-items: center;
+}
+.uv-radio-label--left.data-v-4c84423e {
+  flex-direction: row;
+}
+.uv-radio-label--right.data-v-4c84423e {
+  flex-direction: row-reverse;
+  justify-content: space-between;
+}
+.uv-radio__icon-wrap.data-v-4c84423e {
+  box-sizing: border-box;
+  transition-property: border-color, background-color, color;
+  transition-duration: 0.2s;
+  color: #606266;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+  color: transparent;
+  text-align: center;
+  font-size: 20px;
+  border-width: 1px;
+  border-color: #c8c9cc;
+  border-style: solid;
+}
+.uv-radio__icon-wrap--circle.data-v-4c84423e {
+  border-radius: 100%;
+}
+.uv-radio__icon-wrap--square.data-v-4c84423e {
+  border-radius: 3px;
+}
+.uv-radio__icon-wrap--checked.data-v-4c84423e {
+  color: #fff;
+  background-color: red;
+  border-color: #2979ff;
+}
+.uv-radio__icon-wrap--disabled.data-v-4c84423e {
+  background-color: #ebedf0 !important;
+}
+.uv-radio__icon-wrap--disabled--checked.data-v-4c84423e {
+  color: #c8c9cc !important;
+}
+.uv-radio__label.data-v-4c84423e {
+  word-wrap: break-word;
+  margin-left: 5px;
+  margin-right: 12px;
+  color: #606266;
+  font-size: 15px;
+}
+.uv-radio__label--disabled.data-v-4c84423e {
+  color: #c8c9cc;
+}
+.uv-radio__label-wrap.data-v-4c84423e {
+  flex: 1;
+  padding-left: 6px;
+}