From 523d7a54fb07fdf756fbc4faa5eb7fef7263a556 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 07 九月 2023 09:46:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/personal/myInformation/index.vue | 156 +++++++++------------------------------------------
1 files changed, 29 insertions(+), 127 deletions(-)
diff --git a/src/views/personal/myInformation/index.vue b/src/views/personal/myInformation/index.vue
index 3fc95ed..ab660ec 100644
--- a/src/views/personal/myInformation/index.vue
+++ b/src/views/personal/myInformation/index.vue
@@ -7,12 +7,30 @@
<div>鍩烘湰淇℃伅</div>
</div>
<div class="tips-btn">
- <span><i class="el-icon-edit" />鎿嶄綔锛�</span>
<el-button type="text" @click="dialogFormVisible = true">缂栬緫</el-button>
- <el-dialog title="缂栬緫" :visible.sync="dialogFormVisible">
- <el-form ref="form" :model="form" :rules="rules">
- <el-form-item label="璐﹀彿" :label-width="formLabelWidth" prop="account">
+ <el-dialog title="缂栬緫" :visible.sync="dialogFormVisible" >
+ <el-form ref="form" :model="form" :rules="rules" label-position="left">
+ <el-form-item label="鐢ㄦ埛鍚嶏細" :label-width="formLabelWidth" prop="account">
<el-input v-model="form.account" autocomplete="off" />
+ </el-form-item>
+ <el-form-item label="濮撳悕锛�" :label-width="formLabelWidth" prop="name">
+ <el-input v-model="form.name" autocomplete="off" />
+ </el-form-item>
+ <el-form-item label="鐢佃瘽鍙风爜锛�" :label-width="formLabelWidth" prop="phone">
+ <el-input show-word-limit maxlength="11" type="text" v-model="form.phone" autocomplete="off" />
+ </el-form-item>
+ <el-form-item label="閭锛�" :label-width="formLabelWidth" prop="email">
+ <el-input v-model="form.email" autocomplete="off" />
+ </el-form-item>
+ <el-form-item label="绛惧悕锛�" :label-width="formLabelWidth" prop="signature">
+ <el-upload
+ class="upload-demo"
+ action="#"
+ multiple
+ :limit="3">
+ <el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
+ <div slot="tip" class="el-upload__tip">鍙兘涓婁紶jpg/png鏂囦欢锛屼笖涓嶈秴杩�500kb</div>
+ </el-upload>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -38,54 +56,6 @@
<span><i class="el-icon-edit" />绛惧悕锛�</span>
2121212121212121</div>
</div>
- <!-- <el-table
- ref="infoTable"
- :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5'}"
- :data="infoTable"
- style="width: 100%"
- >
- <el-table-column
- prop="username"
- label="鐢ㄦ埛鍚�"
- width="200"
- />
- <el-table-column
- prop="name"
- label="濮撳悕"
- width="460"
- >
- <template slot-scope="scope">
- <el-tag type="info"><i class="el-icon-info" :style="{marginRight:'4px'}" />{{ scope.row.name }}</el-tag>
- </template>
- </el-table-column>
- <el-table-column
- prop="cellPhone"
- label="鐢佃瘽鍙风爜"
- width="400"
- />
- <el-table-column
- prop="email"
- label="閭"
- width="300"
- />
- <el-table-column
- prop="signature"
- label="绛惧悕"
- width="120"
- :filters="[{ text: 0, value: 0 }, { text: 1, value: 1 }]"
- :filter-method="filterTag"
- filter-placement="bottom-end"
- />
- <el-table-column
- label="鎿嶄綔"
- width="120"
- >
- <template slot-scope="scope">
- <el-button @click="handleClick(scope.row)" type="text" size="small">缂栬緫</el-button>
- <el-button type="text" size="small">缂栬緫</el-button>
- </template>
- </el-table-column>
- </el-table> -->
</div>
<div class="my-business">
<div class="tips-main">
@@ -93,65 +63,7 @@
<span />
<div>浼佷笟淇℃伅</div>
</div>
- <div class="tips-btn">
- <span><i class="el-icon-edit" />鎿嶄綔锛�</span>
- <el-button type="text">閫�鍑�</el-button>
- </div>
</div>
- <!-- <el-table
- ref="businessTable"
- :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5'}"
- :data="businessTable"
- style="width: 100%"
- >
- <el-table-column
- prop="businessSmallName"
- label="浼佷笟绠�绉�"
- width="200"
- />
- <el-table-column
- prop="businessBigName"
- label="浼佷笟鍚嶇О"
- width="460"
- />
- <el-table-column
- label="浼佷笟鑱旂郴浜�"
- width="400"
- >
- <template slot-scope="scope">
- <el-tag type="info"><i class="el-icon-info" :style="{marginRight:'4px'}"/>{{ scope.row.businessContact }}</el-tag>
- </template>
- </el-table-column>
- <el-table-column
- prop="businessPhone"
- label="浼佷笟鑱旂郴鍙风爜"
- width="300"
- />
- <el-table-column
- prop="businessStatus"
- label="鍔犲叆鐘舵��"
- width="120"
- :filters="[{ text: 0, value: 0 }, { text: 1, value: 1 }]"
- :filter-method="filterTag"
- filter-placement="bottom-end"
- >
- <template slot-scope="scope">
- <el-tag
- :type="scope.row.businessStatus === 0 ? 'primary' : 'success'"
- disable-transitions
- >{{ scope.row.businessStatus === 0 ? '鏈悓鎰�' : '宸插悓鎰�' }}</el-tag>
- </template>
- </el-table-column>
- <el-table-column
- label="鎿嶄綔"
- width="120"
- >
- <template slot-scope="scope">
- <el-button @click="handleClick(scope.row)" type="text" size="small">閫�鍑�</el-button>
- <el-button type="text" size="small">缂栬緫</el-button>
- </template>
- </el-table-column>
- </el-table> -->
<div class="message">
<div class="message-item"><span><i class="el-icon-edit" />浼佷笟绠�绉帮細</span>{{ businessTable.businessSmallName }}</div>
<div class="message-item">
@@ -196,7 +108,13 @@
businessStatus: 1
},
dialogFormVisible: false,
- form: [],
+ form: {
+ account: "",
+ name: "",
+ phone: "",
+ email: "",
+ signature: ""
+ },
formLabelWidth: 120
}
},
@@ -238,11 +156,9 @@
.my-main{
.my-info,.my-business{
background: #fff;
- // padding: 10px 20px 10px 20px;
margin: 0;
margin-bottom: 12px;
border-radius: 6px;
- overflow: hidden;
.tips-main{
// margin: ;
padding: 10px 20px 0 20px;
@@ -250,22 +166,8 @@
justify-content: space-between;
align-items: center;
height: 50px;
- // height: ;
- &:hover{
- background: #85bff810;
- .tips-btn{
- display: block;
- left: 0;
- opacity:1;
- }
- }
.tips-btn{
height: 100%;
- // display: none;
- position: relative;
- opacity:0;
- left: 100px;
- transition: all 0.3s ease-in-out;
}
.tips{
height: 100%;
--
Gitblit v1.9.3