xiaomeng/wszhyWx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: xiaomeng:bf35b96d0d51e4e3714b23213a488d11c23bcbdd
Branches Tags
xiaomeng:main
xiaomeng:pc-master
xiaomeng:portal
xiaomeng:wx-program
xiaomeng:mini-program
xiaomeng:fix
xiaomeng:master
xiaomeng:wxmaster
xiaomeng:0.0.1
..
compare: xiaomeng:a724fdf585838c6464735a39a367477aa3123b7a
Branches Tags
xiaomeng:pc-master
xiaomeng:portal
xiaomeng:wx-program
xiaomeng:mini-program
xiaomeng:fix
xiaomeng:master
xiaomeng:wxmaster
xiaomeng:main
xiaomeng:0.0.1

No commits in common. "bf35b96d0d51e4e3714b23213a488d11c23bcbdd" and "a724fdf585838c6464735a39a367477aa3123b7a" have entirely different histories.
bf35b96d0d ... a724fdf585

7 changed files with 59 additions and 65 deletions
Show Stats Expand all files Collapse all files

11
src/assets/css/main.css
View File

@ -3438,10 +3438,6 @@ textarea {
margin-bottom: 10px; margin-bottom: 10px;
} }
.manage-textarea.h-180 textarea {
height: 180px;
}
.manage-textarea textarea { .manage-textarea textarea {
width: 100%; width: 100%;
padding: 10px; padding: 10px;
@ -3654,10 +3650,9 @@ textarea {
.vrcode-model.manage-model .manage-img { .vrcode-model.manage-model .manage-img {
width: 380px; width: 380px;
position: relative; position: relative;
height: 260px;
background: rgba(0, 132, 255, 0.15); background: rgba(0, 132, 255, 0.15);
border: 2px solid rgba(0, 132, 255, 0.35); border: 2px solid rgba(0, 132, 255, 0.35);
max-height: 260px; min-height: 200px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
@ -3666,7 +3661,9 @@ textarea {
.vrcode-model.manage-model .manage-img img { .vrcode-model.manage-model .manage-img img {
width: 360px; width: 360px;
height: 240px; height: auto;
min-height: 200px;
max-height: 360px;
} }
.vrcode-model.manage-model .manage-img .upload-img { .vrcode-model.manage-model .manage-img .upload-img {

15
src/assets/css/main.scss
View File

@ -3661,11 +3661,7 @@ textarea {
color: #FFFFFF; color: #FFFFFF;
margin-bottom: 10px; margin-bottom: 10px;
} }
&.h-180{
textarea{
height: 180px;
}
}
textarea { textarea {
width: 100%; width: 100%;
padding: 10px; padding: 10px;
@ -3885,18 +3881,19 @@ textarea {
.manage-img { .manage-img {
width: 380px; width: 380px;
position: relative; position: relative;
height: 260px; // height: 290px;
background: rgba(0, 132, 255, 0.15); background: rgba(0, 132, 255, 0.15);
border: 2px solid rgba(0, 132, 255, 0.35); border: 2px solid rgba(0, 132, 255, 0.35);
min-height: 200px;
max-height: 260px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
img { img {
width: 360px; width: 360px;
height: 240px; height: auto;
min-height: 200px;
max-height: 360px;
} }
.upload-img { .upload-img {

16
src/views/officialWebsite/banner.vue
View File

@ -47,7 +47,7 @@
title="提示" title="提示"
top="10vh" top="10vh"
:visible.sync="addModel" :visible.sync="addModel"
width="900px" width="700px"
class="vrcode-model manage-model" class="vrcode-model manage-model"
:append-to-body="true" :append-to-body="true"
> >
@ -56,7 +56,7 @@
</div> </div>
<div class="vrcode-content" v-if="nowData"> <div class="vrcode-content" v-if="nowData">
<div class="manage-left"> <div class="manage-left">
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">轮播图名字</div> <div class="input-title">轮播图名字</div>
<input <input
type="text" type="text"
@ -64,7 +64,7 @@
placeholder="请输入轮播图名字" placeholder="请输入轮播图名字"
/> />
</div> </div>
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">轮播图文字字号大小</div> <div class="input-title">轮播图文字字号大小</div>
<input <input
type="text" type="text"
@ -72,7 +72,7 @@
placeholder="请输入轮播图文字字号大小" placeholder="请输入轮播图文字字号大小"
/> />
</div> </div>
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">轮播图英文名字</div> <div class="input-title">轮播图英文名字</div>
<input <input
type="text" type="text"
@ -80,7 +80,7 @@
placeholder="请输入轮播图英文名字" placeholder="请输入轮播图英文名字"
/> />
</div> </div>
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">轮播图英文文字字号大小</div> <div class="input-title">轮播图英文文字字号大小</div>
<input <input
type="text" type="text"
@ -88,7 +88,7 @@
placeholder="请输入轮播图英文文字字号大小" placeholder="请输入轮播图英文文字字号大小"
/> />
</div> </div>
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">轮播图间隔时间(毫秒)</div> <div class="input-title">轮播图间隔时间(毫秒)</div>
<input <input
type="number" type="number"
@ -96,7 +96,7 @@
placeholder="请输入轮播图间隔时间(默认3000毫秒)" placeholder="请输入轮播图间隔时间(默认3000毫秒)"
/> />
</div> </div>
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">{{$t('text.sortOrder')}}</div> <div class="input-title">{{$t('text.sortOrder')}}</div>
<input <input
type="number" type="number"
@ -106,7 +106,7 @@
</div> </div>
</div> </div>
<div class="manage-right"> <div class="manage-right">
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">轮播图图片(图片大小不能超过2MB)</div> <div class="input-title">轮播图图片(图片大小不能超过2MB)</div>
</div> </div>
<div class="manage-img" v-loading="loading"> <div class="manage-img" v-loading="loading">

18
src/views/officialWebsite/case.vue
View File

@ -47,7 +47,7 @@
title="提示" title="提示"
top="5vh" top="5vh"
:visible.sync="addModel" :visible.sync="addModel"
width="1300px" width="1000px"
class="vrcode-model manage-model" class="vrcode-model manage-model"
:append-to-body="true" :append-to-body="true"
> >
@ -56,7 +56,7 @@
</div> </div>
<div class="vrcode-content grid-3" v-if="nowData"> <div class="vrcode-content grid-3" v-if="nowData">
<div class="manage-left"> <div class="manage-left">
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">案例名字</div> <div class="input-title">案例名字</div>
<input <input
type="text" type="text"
@ -64,7 +64,7 @@
placeholder="请输入案例名字" placeholder="请输入案例名字"
/> />
</div> </div>
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">案例英文名字</div> <div class="input-title">案例英文名字</div>
<input <input
type="text" type="text"
@ -73,7 +73,7 @@
/> />
</div> </div>
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">{{$t('text.sortOrder')}}</div> <div class="input-title">{{$t('text.sortOrder')}}</div>
<input <input
type="number" type="number"
@ -81,7 +81,7 @@
:placeholder="$t('placeholder.sortOrderPlaceholder')" :placeholder="$t('placeholder.sortOrderPlaceholder')"
/> />
</div> </div>
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">案例小标题</div> <div class="input-title">案例小标题</div>
<input <input
type="text" type="text"
@ -89,7 +89,7 @@
placeholder="请输入产品详情小标题" placeholder="请输入产品详情小标题"
/> />
</div> </div>
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">案例小标题英文</div> <div class="input-title">案例小标题英文</div>
<input <input
type="text" type="text"
@ -99,17 +99,17 @@
</div> </div>
</div> </div>
<div class="manage-left"> <div class="manage-left">
<div class="manage-textarea h-180"> <div class="manage-textarea">
<div class="input-title">案例中文特点(以回车键换行)</div> <div class="input-title">案例中文特点(以回车键换行)</div>
<textarea v-model="nowData.detailedIntroductionText" name="" id="" cols="30" rows="10"></textarea> <textarea v-model="nowData.detailedIntroductionText" name="" id="" cols="30" rows="10"></textarea>
</div> </div>
<div class="manage-textarea h-180"> <div class="manage-textarea">
<div class="input-title">案例英文特点(以回车键换行)</div> <div class="input-title">案例英文特点(以回车键换行)</div>
<textarea v-model="nowData.detailedIntroductionEnText" name="" id="" cols="30" rows="10"></textarea> <textarea v-model="nowData.detailedIntroductionEnText" name="" id="" cols="30" rows="10"></textarea>
</div> </div>
</div> </div>
<div class="manage-right"> <div class="manage-right">
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">案例图片(图片大小不能超过2MB)</div> <div class="input-title">案例图片(图片大小不能超过2MB)</div>
</div> </div>
<div class="manage-img" v-loading="loading"> <div class="manage-img" v-loading="loading">

22
src/views/officialWebsite/detail.vue
View File

@ -47,7 +47,7 @@
title="提示" title="提示"
top="5vh" top="5vh"
:visible.sync="addModel" :visible.sync="addModel"
width="900px" width="700px"
class="vrcode-model manage-model" class="vrcode-model manage-model"
:append-to-body="true" :append-to-body="true"
> >
@ -56,7 +56,7 @@
</div> </div>
<div class="vrcode-content " v-if="nowData"> <div class="vrcode-content " v-if="nowData">
<div class="manage-left"> <div class="manage-left">
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">公司名称</div> <div class="input-title">公司名称</div>
<input <input
type="text" type="text"
@ -64,7 +64,7 @@
placeholder="请输入公司名称" placeholder="请输入公司名称"
/> />
</div> </div>
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">公司英文名称</div> <div class="input-title">公司英文名称</div>
<input <input
type="text" type="text"
@ -73,21 +73,24 @@
/> />
</div> </div>
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">{{$t('text.sortOrder')}}</div> <div class="input-title">{{$t('text.sortOrder')}}</div>
<input <input
type="number" type="number"
v-model="nowData.detailedIntroductionSort" v-model="nowData.detailedIntroductionSort"
:placeholder="$t('placeholder.sortOrderPlaceholder')" :placeholder="$t('placeholder.sortOrderPlaceholder')"
/> />
<div class="manage-textarea h-180" style="margin-top:40px"> <div class="manage-textarea">
<div class="input-title">公司中文简介(以回车键换行)</div> <div class="input-title">公司中文简介(以回车键换行)</div>
<textarea v-model="nowData.detailedIntroductionText" name="" id="" cols="30" rows="10"></textarea> <textarea v-model="nowData.detailedIntroductionText" name="" id="" cols="30" rows="10"></textarea>
</div> </div>
<div class="manage-textarea">
<div class="input-title">公司英文简介(以回车键换行)</div>
<textarea v-model="nowData.detailedIntroductionEnText" name="" id="" cols="30" rows="10"></textarea>
</div>
</div></div> </div></div>
<div class="manage-right"> <div class="manage-right">
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">公司图片(图片大小不能超过2MB)</div> <div class="input-title">公司图片(图片大小不能超过2MB)</div>
</div> </div>
<div class="manage-img" v-loading="loading"> <div class="manage-img" v-loading="loading">
@ -114,10 +117,7 @@
@change="handleImageChange($event, 0)" @change="handleImageChange($event, 0)"
/> />
</div> </div>
<div class="manage-textarea h-180">
<div class="input-title">公司英文简介(以回车键换行)</div>
<textarea v-model="nowData.detailedIntroductionEnText" name="" id="" cols="30" rows="10"></textarea>
</div>
</div> </div>
</div> </div>

16
src/views/officialWebsite/new.vue
View File

@ -55,7 +55,7 @@
title="提示" title="提示"
top="10vh" top="10vh"
:visible.sync="addModel" :visible.sync="addModel"
width="900px" width="700px"
class="vrcode-model manage-model" class="vrcode-model manage-model"
:append-to-body="true" :append-to-body="true"
> >
@ -65,7 +65,7 @@
<div class="vrcode-content" v-if="nowData"> <div class="vrcode-content" v-if="nowData">
<div class="manage-left"> <div class="manage-left">
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">新闻标题</div> <div class="input-title">新闻标题</div>
<input <input
type="text" type="text"
@ -73,7 +73,7 @@
placeholder="请输入新闻标题" placeholder="请输入新闻标题"
/> />
</div> </div>
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">新闻英文标题</div> <div class="input-title">新闻英文标题</div>
<input <input
type="text" type="text"
@ -81,7 +81,7 @@
placeholder="请输入新闻英文标题" placeholder="请输入新闻英文标题"
/> />
</div> </div>
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">{{$t('text.sortOrder')}}</div> <div class="input-title">{{$t('text.sortOrder')}}</div>
<input <input
type="number" type="number"
@ -90,7 +90,7 @@
/> />
</div> </div>
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">新闻日期选择</div> <div class="input-title">新闻日期选择</div>
<el-date-picker <el-date-picker
v-model="nowData.newsTime" v-model="nowData.newsTime"
@ -99,7 +99,7 @@
> >
</el-date-picker> </el-date-picker>
</div> </div>
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">新闻内容编写</div> <div class="input-title">新闻内容编写</div>
<div></div> <div></div>
<input <input
@ -109,7 +109,7 @@
placeholder="点击进行编写内容" placeholder="点击进行编写内容"
/> />
</div> </div>
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">新闻英文内容编写</div> <div class="input-title">新闻英文内容编写</div>
<input <input
@click="openNewsModel(1)" @click="openNewsModel(1)"
@ -121,7 +121,7 @@
</div> </div>
<div class="manage-right"> <div class="manage-right">
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">新闻展示图片(图片大小不能超过2MB)</div> <div class="input-title">新闻展示图片(图片大小不能超过2MB)</div>
</div> </div>
<div class="manage-img" v-loading="loading"> <div class="manage-img" v-loading="loading">

26
src/views/officialWebsite/product.vue
View File

@ -91,7 +91,7 @@
title="提示" title="提示"
top="10vh" top="10vh"
:visible.sync="addModel1" :visible.sync="addModel1"
width="900px" width="700px"
class="vrcode-model manage-model" class="vrcode-model manage-model"
:append-to-body="true" :append-to-body="true"
> >
@ -100,7 +100,7 @@
</div> </div>
<div class="vrcode-content" v-if="nowData1"> <div class="vrcode-content" v-if="nowData1">
<div class="manage-left"> <div class="manage-left">
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">产品列表名字</div> <div class="input-title">产品列表名字</div>
<input <input
type="text" type="text"
@ -108,7 +108,7 @@
placeholder="请输入产品列表名字" placeholder="请输入产品列表名字"
/> />
</div> </div>
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">产品列表英文名字</div> <div class="input-title">产品列表英文名字</div>
<input <input
type="text" type="text"
@ -117,7 +117,7 @@
/> />
</div> </div>
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">{{$t('text.sortOrder')}}</div> <div class="input-title">{{$t('text.sortOrder')}}</div>
<input <input
type="number" type="number"
@ -128,7 +128,7 @@
</div> </div>
<div class="manage-right"> <div class="manage-right">
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">产品列表图片(图片大小不能超过2MB)</div> <div class="input-title">产品列表图片(图片大小不能超过2MB)</div>
</div> </div>
<div class="manage-img" v-loading="loading"> <div class="manage-img" v-loading="loading">
@ -172,7 +172,7 @@
title="提示" title="提示"
top="10vh" top="10vh"
:visible.sync="addModel" :visible.sync="addModel"
width="1350px" width="1050px"
class="vrcode-model manage-model" class="vrcode-model manage-model"
:append-to-body="true" :append-to-body="true"
> >
@ -181,7 +181,7 @@
</div> </div>
<div class="vrcode-content grid-3" v-if="nowData"> <div class="vrcode-content grid-3" v-if="nowData">
<div class="manage-left"> <div class="manage-left">
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">所属产品列表</div> <div class="input-title">所属产品列表</div>
<el-select v-model="nowData.productId" placeholder="请选择"> <el-select v-model="nowData.productId" placeholder="请选择">
<el-option <el-option
@ -192,7 +192,7 @@
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">产品名称</div> <div class="input-title">产品名称</div>
<input <input
type="text" type="text"
@ -200,7 +200,7 @@
placeholder="请输入产品名称" placeholder="请输入产品名称"
/> />
</div> </div>
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">产品英文名称</div> <div class="input-title">产品英文名称</div>
<input <input
type="text" type="text"
@ -209,7 +209,7 @@
/> />
</div> </div>
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">{{$t('text.sortOrder')}}</div> <div class="input-title">{{$t('text.sortOrder')}}</div>
<input <input
type="number" type="number"
@ -217,7 +217,7 @@
:placeholder="$t('placeholder.sortOrderPlaceholder')" :placeholder="$t('placeholder.sortOrderPlaceholder')"
/> />
</div> </div>
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">产品详情小标题</div> <div class="input-title">产品详情小标题</div>
<input <input
type="text" type="text"
@ -225,7 +225,7 @@
placeholder="请输入产品详情小标题" placeholder="请输入产品详情小标题"
/> />
</div> </div>
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">产品详情小标题英文</div> <div class="input-title">产品详情小标题英文</div>
<input <input
type="text" type="text"
@ -279,7 +279,7 @@
</div> </div>
<div class="manage-right"> <div class="manage-right">
<div class="manage-input w-350"> <div class="manage-input">
<div class="input-title">产品详情图片(图片大小不能超过2MB)</div> <div class="input-title">产品详情图片(图片大小不能超过2MB)</div>
</div> </div>
<div class="manage-img" v-loading="loading"> <div class="manage-img" v-loading="loading">