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