Skip to content

E
ElectricitySheep
Commit 20f83abc authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

parents c65384c8 7991f61c
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 19 deletions
src/components/Forgetpassword.vue
View file @ 20f83abc
......@@ -52,7 +52,7 @@
.Forgetpassword .regisLogin {
color: rgb(125, 125, 125);
text-align: center;
margin-top: 15px;
margin-top: 65px;
}
.Forgetpassword .regisMain {
......
src/components/Index.vue
View file @ 20f83abc
......@@ -56,7 +56,7 @@
</el-col>
<el-col class="userinfo" :span="12">
<p class="title">账号有效期</p>
<p class="Spannumber">{{currentUserMsg.AccountStatus}}</p>
<p class="Spannumber">{{currentUserMsg.AccountValidateStr}}</p>
<img class="imgbg" src="../assets/img/end_time.png" alt="">
</el-col>
</el-row>
......@@ -106,7 +106,7 @@
<el-table-column prop="address" label="操作">
<template slot-scope="scope">
<el-button size="mini" type="info" plain @click="EditMall(scope.row)">编辑 </el-button>
<el-button size="mini" type="info" plain>版权</el-button>
<el-button size="mini" type="info" plain @click="upCopyRight=true">版权</el-button>
<el-button size="mini" type="info" plain @click="RemmoveMall(scope.row)">禁用</el-button>
</template>
</el-table-column>
......@@ -248,6 +248,38 @@
</span>
</el-dialog>
<!-- 修改版权 -->
<el-dialog title="修改版权" :visible.sync="upCopyRight" width="500px">
<el-form :model="copyRightMsg" ref="copyRightMsg" label-width="150px">
<el-form-item label="底部版权文字">
<el-input type="text" style="width:250px" size="small" maxlength="100" v-model="copyRightMsg.Name">
</el-input>
</el-form-item>
<el-form-item label="底部版权图标">
<div>
<el-tooltip class="item" effect="dark" content="建议尺寸:160*50" placement="top-start">
<el-upload class="avatar-uploader" action="" accept="image/jpeg,image/gif,image/png,image/bmp"
:show-file-list="false" :http-request="UploadImage">
<el-button size="small">选择图片</el-button>
</el-upload>
</el-tooltip>
</div>
<div class="indexApp_image">
<img v-if="copyRightMsg.img" :src="copyRightMsg.img" alt=""/>
</div>
</el-form-item>
<el-form-item label="底部版权链接">
<el-input type="password" style="width:250px" size="small" maxlength="25" v-model="copyRightMsg.Url">
</el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="upCopyRight = false">取 消</el-button>
<el-button size="small" type="primary" @click="upPassWord()">确 定</el-button>
</span>
</el-dialog>
<!-- 创建商城 -->
<el-dialog title="创建商城" :visible.sync="createMallDig" width="440px">
<el-form :model="creatMallMsg" :rules="creatMallMsgrules" ref="creatMallMsg" label-width="100px">
......@@ -378,6 +410,7 @@
val: '',
dialogVisible: false,
upDatePwd: false,
upCopyRight:false,
addMsg: {},
qMsg: {
pageIndex: 1,
......@@ -399,6 +432,12 @@
Password: '',
Password2: ''
},
//修改版权MSG
copyRightMsg:{
Name:'',
img:'',
Url:''
},
rules: {
name: [{
required: true,
......@@ -455,9 +494,6 @@
this.Info(res.data.message);
}
})
},
UploadImage() {
},
addAdress() {
this.storageDig = true;
......@@ -623,6 +659,14 @@
this.Info(res.data.message);
}
})
},
//选择图片
UploadImage(file){
this.UploadFileToTencent(this.FileType().UserImg, file.file, res => {
if (res.resultCode == 1) {
this.copyRightMsg.img = res.FileUrl;
}
})
}
},
mounted() {
......@@ -806,5 +850,11 @@
display: flex;
justify-content: space-between;
}
.indexApp_image{
width:160px;
height:50px;
}
.indexApp_image img{
width:100%;height:100%;
}
</style>
src/components/Register.vue
View file @ 20f83abc
......@@ -52,7 +52,7 @@
.register .regisLogin {
color: rgb(125, 125, 125);
text-align: center;
margin-top: 15px;
margin-top: 65px;
}
.register .regisMain {
......@@ -262,10 +262,10 @@
:show-file-list="false" :http-request="UploadImage">
<img v-if="msg2.IDCardPositiveImg" :src="msg2.IDCardPositiveImg" class="avatar">
<img v-else src="../assets/img/id-card.png" alt="" />
<button type="button" class="el-button el-button--primary el-button--small is-circle">
<i class="el-icon-plus"></i>
</button>
</el-upload>
<button type="button" class="el-button el-button--primary el-button--small is-circle">
<i class="el-icon-plus"></i>
</button>
</div>
<div>上传身份证正面</div>
</div>
......@@ -275,10 +275,10 @@
:show-file-list="false" :http-request="UploadImage2">
<img v-if="msg2.IDCardReverseImg" :src="msg2.IDCardReverseImg" class="avatar">
<img v-else src="../assets/img/id-card-off.png" alt="" />
<button type="button" class="el-button el-button--primary el-button--small is-circle">
<i class="el-icon-plus"></i>
</button>
</el-upload>
<button type="button" class="el-button el-button--primary el-button--small is-circle">
<i class="el-icon-plus"></i>
</button>
</div>
<div>上传身份证反面</div>
</div>
......@@ -289,10 +289,10 @@
:show-file-list="false" :http-request="UploadImage3">
<img v-if="msg2.BusinessLicenseImg" :src="msg2.BusinessLicenseImg" class="avatar">
<img v-else src="../assets/img/business.png" alt="" />
<button type="button" class="el-button el-button--primary el-button--small is-circle">
<i class="el-icon-plus"></i>
</button>
</el-upload>
<button type="button" class="el-button el-button--primary el-button--small is-circle">
<i class="el-icon-plus"></i>
</button>
</div>
<div>上传营业执照</div>
</div>
......
src/components/mall.vue
View file @ 20f83abc
......@@ -109,7 +109,7 @@
.mainContainer .is-show-menu-1 {
position: absolute;
width: 14px;
width: 30px;
background: #F3F3F3;
color: #A1A4A9;
border-radius: 10px 0 0 10px;
......@@ -169,7 +169,7 @@
.mainLeftMenu .is-show-menu-2 {
position: absolute;
width: 14px;
width: 30px;
background: #F3F3F3;
color: #A1A4A9;
border-radius: 0 10px 10px 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment