hookehuyr

fix

/*
* @Author: hookehuyr hookehuyr@gmail.com
* @Date: 2022-05-27 08:59:09
* @LastEditors: hookehuyr hookehuyr@gmail.com
* @LastEditTime: 2022-06-05 21:49:34
* @FilePath: /tswj/.eslintrc.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
module.exports = {
extends: [
// add more generic rule sets here, such as:
......@@ -10,10 +18,10 @@ module.exports = {
// 'vue/no-unused-vars': 'error'
"vue/max-attributes-per-line": ["error", {
"singleline": {
"max": 10
"max": 20
},
"multiline": {
"max": 5
"max": 10
}
}],
"vue/singleline-html-element-content-newline": 0, // 在单行元素的内容之前和之后需要换行符
......
......@@ -13,3 +13,4 @@ cypress
src/test/mocha/test.js
cypress.json
src/test
.idea
......
......@@ -2,28 +2,31 @@
<van-image width="100%" height="100%" :src="logo_image" />
<div class="login-header">
<van-row align="center">
<van-col span="8">
</van-col>
<van-col span="8" />
<van-col span="8" class="title">
<p>登&nbsp;录</p>
</van-col>
<van-col span="8">
</van-col>
<van-col span="8" />
</van-row>
</div>
<div class="login-section">
<van-config-provider :theme-vars="themeVars">
<van-form ref="form" @submit="onSubmit">
<van-cell-group inset style="border: 1px solid #EAEAEA;">
<van-field v-if="use_widget" v-model="phone" name="phone" label="手机号" placeholder="手机号" readonly clickable
:rules="[{ validator, message: '请输入正确手机号' }]"
@touchstart.stop="showKeyboard" />
<van-field v-if="use_widget" v-model="phone" name="phone" label="手机号" placeholder="手机号"
readonly clickable :rules="[{ validator, message: '请输入正确手机号' }]" @touchstart.stop="showKeyboard"
/>
<van-field v-else v-model="phone" name="validator" label="手机号" placeholder="手机号"
:rules="[{ validator, message: '请输入正确手机号' }]" />
<van-field v-model="code" center clearable name="code" type="digit" label="短信验证码" placeholder="请输入短信验证码"
:formatter="formatter" :rules="[{ required: true, message: '请填写验证码' }]">
:rules="[{ validator, message: '请输入正确手机号' }]"
/>
<van-field v-model="code" center clearable name="code" type="digit"
label="短信验证码" placeholder="请输入短信验证码"
:formatter="formatter" :rules="[{ required: true, message: '请填写验证码' }]"
>
<template #button>
<van-button @click="sendCode" v-if="countDown.current.value.total === limit" size="small" type="primary" :disabled="disabled">
<van-button v-if="countDown.current.value.total === limit" size="small" type="primary"
:disabled="disabled" @click="sendCode"
>
<span>发送验证码</span>
</van-button>
<van-button v-else size="small" type="primary" :disabled="disabled">
......@@ -42,12 +45,7 @@
<van-number-keyboard v-model="phone" :show="keyboard_show" :maxlength="11" @blur="onBlur" />
<!-- 图片滑块验证 -->
<image-slider-verify
:isShow="sliderShow"
@done="handleConfirm"
@on-close="handleClose"
>
</image-slider-verify>
<image-slider-verify :is-show="sliderShow" @done="handleConfirm" @on-close="handleClose" />
</template>
<script setup>
......@@ -104,11 +102,7 @@ onMounted(() => {
* 桌面微信直接输入
* 其他环境弹出输入框
*/
if (wxInfo().isiOS || wxInfo().isAndroid) {
use_widget.value = true;
} else {
use_widget.value = false;
}
use_widget.value = !!(wxInfo().isiOS || wxInfo().isAndroid);
// 判断微信授权状态,进入页面时未授权需要授权跳转
if (!Cookies.get('PHPSESSID')) {
$router.replace({
......
......@@ -2,7 +2,7 @@
* @Author: hookehuyr hookehuyr@gmail.com
* @Date: 2022-04-26 16:06:31
* @LastEditors: hookehuyr hookehuyr@gmail.com
* @LastEditTime: 2022-06-01 21:40:14
* @LastEditTime: 2022-06-03 16:31:30
* @FilePath: /tswj/src/views/client/finishUpload.vue
* @Description: 作品上传成功提示页面
-->
......@@ -11,7 +11,7 @@
<div style="background-color: #F7F7F7; padding-top: 2rem; padding-bottom: 2rem;">
<van-image round width="6rem" height="6rem" style="vertical-align: bottom;" :src="icon_success" />
<p style="font-size: 1.05rem; margin: 0.5rem; font-weight: bold;">提交成功!</p>
<p style="font-size: 0.9rem; margin-bottom: 0.5rem;">您的作品正在等待老师审核</p>
<p style="font-size: 0.9rem; margin-bottom: 0.5rem;">您的作品正在审核中</p>
<p style="font-size: 0.9rem;">请耐心等待~~</p>
</div>
<div style=" padding-top: 2rem; padding-bottom: 2rem; font-size: 0.9rem; color: #713610;">
......
......@@ -4,10 +4,7 @@
<div class="info">
<van-row>
<van-col>
<van-image v-if="userInfo.avatar" @click="handleUser('EDIT')" round width="50" height="50"
:src="userInfo.avatar" style="padding-right: 1rem;" />
<van-image v-else @click="handleUser('EDIT')" round width="50" height="50" :src="icon_avatar"
style="padding-right: 1rem;" />
<van-image round width="50" height="50" :src="userInfo.avatar ? userInfo.avatar : icon_avatar" style="padding-right: 1rem;" @click="handleUser('EDIT')" />
</van-col>
<van-col class="text-wrapper" span="18">
<div>
......@@ -48,13 +45,11 @@
<div class="van-hairline--bottom sub-handle">
<div>
<my-button v-if="userInfo.status === 'apply'" type="custom" :custom-style="styleObject4"
@on-click="go('/me/verifyUser', { kg_id: userInfo.kg_id, kg_name: userInfo.kg_name })">实名认证</my-button>
<my-button v-if="userInfo.status === 'apply'" type="custom" :custom-style="styleObject4" @on-click="go('/me/verifyUser', { kg_id: userInfo.kg_id, kg_name: userInfo.kg_name })">实名认证</my-button>
<my-button v-else type="custom" :custom-style="styleObject5">已认证</my-button>
</div>
<div>
<my-button v-if="userInfo.status === 'enable'" type="custom" :custom-style="styleObject7"
@on-click="handleUser('ADD')">新增儿童</my-button>
<my-button v-if="userInfo.status === 'enable'" type="custom" :custom-style="styleObject7" @on-click="handleUser('ADD')">新增儿童</my-button>
<my-button v-else type="custom" :custom-style="styleObject6" @on-click="showNotice = true">新增儿童</my-button>
</div>
</div>
......