Merge branch 'cyl/master-im'

cyl/master-im
jscyl13849007907 5 months ago
commit 65ac81cf93

@ -70,20 +70,20 @@
<div class="g_flex_column_center" v-if="item.tip == 'slot-code'"> <div class="g_flex_column_center" v-if="item.tip == 'slot-code'">
<div class="g_flex_row_end"> <div class="g_flex_row_end">
<div class="g_flex_1 g_mr_16"> <div class="g_flex_1 g_mr_16">
<u-input maxlength="4" type="number" :custom-style="{ fontSize: item.fontSize || ' 16px' }" :clearable="false" :password-icon="false" :placeholder="item.placeholder" input-align="right" class="g_text_r" placeholder-style="color:#999;font-size:16px;" v-model="item.code" @blur="(e) => handleCode(e, item, index)" /> <u-input maxlength="4" type="number" :custom-style="{ fontSize: item.fontSize || ' 16px' }" :clearable="false" :password-icon="false" :placeholder="item.placeholder" input-align="right" class="g_text_r" placeholder-style="color:#999;font-size:16px;" v-model="item.code" @input="(e) => handleCode(e, item, index)" />
</div> </div>
<div class="btn-text g_flex_column_center g_flex_none" @click="handleSendMsg"> <div class="btn-text g_flex_c g_flex_none" @click="handleSendMsg">
<button class="btn-con g_fs_14 g_c_9 g_w_88 g_flex_row_center">{{ msgCode.btnText }}</button> <button class="btn-con g_fs_14 g_c_9 g_flex_row_center" style="width: 100px;">{{ msgCode.btnText }}</button>
</div> </div>
</div> </div>
</div> </div>
<!-- 新密码 --> <!-- 新密码 -->
<div class="form-new-pwd g_flex_rowRight_columnCenter g_w_all" v-if="item.tip == 'slot-new-pwd'"> <div class="form-new-pwd g_flex_rowRight_columnCenter g_w_all" v-if="item.tip == 'slot-new-pwd'">
<u-input type="password" :custom-style="{ fontSize: item.fontSize || ' 16px' }" :clearable="false" :password-icon="false" :placeholder="item.placeholder" input-align="right" class="g_text_r g_w_all" placeholder-style="color:#999;font-size:16px;line-height:1" v-model="item.value" @blur="(e) => handleNewPwd(e, item, index)" /> <u-input type="password" :custom-style="{ fontSize: item.fontSize || ' 16px' }" :clearable="false" :password-icon="false" :placeholder="item.placeholder" input-align="right" class="g_text_r g_w_all" placeholder-style="color:#999;font-size:16px;line-height:1" v-model="item.value" @input="(e) => handleNewPwd(e, item, index)" />
</div> </div>
<!-- 确认密码 --> <!-- 确认密码 -->
<div class="form-new-conpwd g_flex_rowRight_columnCenter g_w_all" v-if="item.tip == 'slot-confirm-pwd'"> <div class="form-new-conpwd g_flex_rowRight_columnCenter g_w_all" v-if="item.tip == 'slot-confirm-pwd'">
<u-input type="password" :custom-style="{ fontSize: item.fontSize || ' 16px' }" :clearable="false" :password-icon="false" :placeholder="item.placeholder" input-align="right" class="g_text_r g_w_all" placeholder-style="color:#999;font-size:16px;line-height:1" v-model="item.value" @blur="(e) => handleConfirmPwd(e, item, index)" /> <u-input type="password" :custom-style="{ fontSize: item.fontSize || ' 16px' }" :clearable="false" :password-icon="false" :placeholder="item.placeholder" input-align="right" class="g_text_r g_w_all" placeholder-style="color:#999;font-size:16px;line-height:1" v-model="item.value" @input="(e) => handleConfirmPwd(e, item, index)" />
</div> </div>
<!-- 姓名输入框 --> <!-- 姓名输入框 -->
<div class="form-new-name g_flex_rowRight_columnCenter g_w_all" v-if="item.tip == 'slot-name' || item.tip == 'slot-upID' || item.tip == 'slot-weChat'"> <div class="form-new-name g_flex_rowRight_columnCenter g_w_all" v-if="item.tip == 'slot-name' || item.tip == 'slot-upID' || item.tip == 'slot-weChat'">
@ -322,6 +322,10 @@ export default {
handleNewPwd(e, $item, $index) { handleNewPwd(e, $item, $index) {
this.$emit("changeNewPwd", e); this.$emit("changeNewPwd", e);
}, },
handleChangeNewPwd(e, $item, $index) {
// this.$emit("changeNewPwd", e);
console.log(e);
},
// //
handleConfirmPwd(e, $item, $index) { handleConfirmPwd(e, $item, $index) {
this.$emit("changeConfirmPwd", e); this.$emit("changeConfirmPwd", e);
@ -723,9 +727,12 @@ export default {
} }
.btn-text { .btn-text {
background-color: #ededed;
text-align: center;
border-radius: 126px;
.btn-con { .btn-con {
border-left: 1rpx solid #eee; // border-left: 1rpx solid #eee;
padding: 0 0 0 16px; // padding: 0 0 0 16px;
background-color: transparent; background-color: transparent;
border-radius: 0; border-radius: 0;
height: 40rpx; height: 40rpx;

Loading…
Cancel
Save