Browse Source

Merge branch 'zhangrenyuan/feature-20250817091555-金币优化' into milestone-20250815-金币优化

zhangyong/feature-20250815160302-金币优化
zhangrenyuan 2 months ago
parent
commit
7070218d81
  1. 2
      src/views/consume/bean/addBeanConsume.vue
  2. 13
      src/views/home.vue
  3. 2
      src/views/login.vue
  4. 3
      src/views/recharge/gold/addCoinRecharge.vue

2
src/views/consume/bean/addBeanConsume.vue

@ -289,7 +289,7 @@ const throttledHandleConsumeFormt = _.throttle(handleConsumeForm, 5000, {
</div> </div>
</div> </div>
</template> </template>
<style scoped>
<style scoped lang="scss">
.userAndform { .userAndform {
width: 100%; width: 100%;
height: 100%; height: 100%;

13
src/views/home.vue

@ -69,12 +69,17 @@ const message = function () {
// //
const showPasswordDialog = ref(false) const showPasswordDialog = ref(false)
const pwdRef = ref()
// //
const openChangePassword = () => { const openChangePassword = () => {
showPasswordDialog.value = true showPasswordDialog.value = true
} }
//
function onPwdDialogClosed () {
// resetFields
pwdRef.value?.resetFields()
}
function logout() { function logout() {
const machineId = localStorage.getItem('machineId') const machineId = localStorage.getItem('machineId')
@ -229,8 +234,12 @@ function logout() {
v-model="showPasswordDialog" v-model="showPasswordDialog"
:center="true" :center="true"
width="470px" width="470px"
@closed="onPwdDialogClosed"
> >
<ChangePassword @confirm="showPasswordDialog = false"/>
<ChangePassword
ref="pwdRef"
@confirm="showPasswordDialog = false"
/>
</el-dialog> </el-dialog>

2
src/views/login.vue

@ -185,7 +185,7 @@ onMounted(() => {
</el-row> </el-row>
</template> </template>
<style scoped>
<style scoped lang="scss">
.bg { .bg {
border-radius: 0 20px 20px 0; border-radius: 0 20px 20px 0;
height: 110vh; height: 110vh;

3
src/views/recharge/gold/addCoinRecharge.vue

@ -906,7 +906,8 @@ onMounted(() => {
</div> </div>
</template> </template>
<style scoped>
<style scoped lang="scss">
.userAndForm { .userAndForm {
width: 100%; width: 100%;
height: 100%; height: 100%;

Loading…
Cancel
Save