Skip to content

S
shop-new
提交 7daf08a7 authored 作者: 王天霸's avatar 王天霸
浏览文件
操作

no message

上级 4995a4be
隐藏空白字符变更
内嵌 并排
正在显示 包含 107 行增加 和 57 行删除
.env.development
浏览文件 @ 7daf08a7
......@@ -2,11 +2,11 @@
ENV = 'development'
# 正式环境
VUE_APP_BASE_API = 'http://sj.jxhh.com/api/v1'
#VUE_APP_BASE_API = 'http://sj.jxhh.com/api/v1'
# 测试环境
#VUE_APP_BASE_API = 'http://192.168.26.179:6605/api/v1'
#VUE_APP_BASE_API = 'http://192.168.111.240:6605/api/v1'
VUE_APP_BASE_API = 'http://192.168.111.240:6605/api/v1'
# 文档模块 直接调用 sys开放接口
VUE_APP_BASE_SYS_API = 'http://sysapi.jxhh.com'
......
src/layout/components/Navbar.vue
浏览文件 @ 7daf08a7
......@@ -79,7 +79,8 @@ export default {
...mapGetters([
'sidebar',
'avatar',
'device'
'device',
'channel_info'
]),
setting: {
get() {
......@@ -109,7 +110,7 @@ export default {
watch: {
channelInfo() {
if (this.channelInfo) {
this.channel_id = this.$store.state.user.channelInfo.channel_id
this.channel_id = this.channel_info.channel_id
}
},
},
......
src/views/entry/fillBrandInf.vue
浏览文件 @ 7daf08a7
......@@ -46,7 +46,7 @@
action="#"
list-type="picture-card"
:http-request="uploadLogoImgs"
:limit="2"
:limit="1"
:on-exceed="showTip"
:before-upload = "beforeUpLogoImg"
:on-preview="handlePictureCardPreview"
......@@ -65,7 +65,7 @@
</span>
</div>
<div style="width:380px;line-height: 24px;padding-top: 6px;">
<span class="tips-text">必须与商标图文一致。文件大小在500KB以内，支持png,jpg格式，最多可上传2张</span>
<span class="tips-text">图片大小在500KB以内，支持png/jpg，限一张，请确保图片清晰</span>
</div>
</div>
</el-form-item>
......@@ -87,6 +87,7 @@
<el-upload
class="uploadData"
action="#"
:limit="1"
list-type="picture-card"
:http-request="uploadFactoryImgs"
:before-upload = "beforeUpImg"
......@@ -106,7 +107,7 @@
</span>
</div>
<div style="width:380px;line-height: 24px;padding-top: 6px;">
<span class="tips-text">品牌方给予企业的授权书。文件大小在2MB以内，支持png,jpg格式</span>
<span class="tips-text">图片大小在500KB以内，支持png/jpg，限一张，请确保图片清晰</span>
</div>
</div>
</el-form-item>
......@@ -127,7 +128,7 @@
action="#"
:http-request="uploadShopImgs"
list-type="picture-card"
:limit="2"
:limit="1"
:on-exceed="showTip"
:before-upload = "beforeUpImg"
:on-preview="handlePictureCardPreview3"
......@@ -146,7 +147,7 @@
</span>
</div>
<div style="width:380px;line-height: 24px;padding-top: 6px;">
<span class="tips-text">授权在云仓平台经营此品牌。文件大小在2MB以内，支持png,jpg格式，最多可上传2张</span>
<span class="tips-text">图片大小在500KB以内，支持png/jpg，限一张</span>
</div>
</div>
</el-form-item>
......@@ -300,7 +301,7 @@
methods: {
// 上传图片格式和大小限制2kb
beforeUpImg(file) {
let isImgSize = (file.size / 1024 /1024) > 2;
let isImgSize = (file.size / 1024 ) > 500;
if(file.type !== "image/png" && file.type !== "image/jpg" && file.type != "image/jpeg") {
this.$message({
message: '上传图片格式只支持jpg/png格式',
......@@ -310,7 +311,7 @@
}
if(isImgSize) {
this.$message({
message: '上传图片大小不能超过2M',
message: '上传图片大小不能超过500k',
type: "warning"
});
return false;
......@@ -339,7 +340,7 @@
this.getBase64(param.file).then((res) => {
let result = res.split(",");
this.Base64img = result[1];
let data = {"img_data": this.Base64img};
let data = {"img_data": this.Base64img,"type":2};
upLoadImg(data).then((res) => {
if (res.code == 1) {
this.brandImgFileList.push({'url': res.data.image_url});
......@@ -357,7 +358,7 @@
this.getBase64(param.file).then((res) => {
let result = res.split(",");
this.Base64img = result[1];
let data = {"img_data":this.Base64img};
let data = {"img_data":this.Base64img,"type":2};
upLoadImg(data).then((res) => {
if(res.code == 1){
this.shopImgFileList.push({'url':res.data.image_url});
......@@ -374,7 +375,7 @@
this.getBase64(param.file).then((res) => {
let result = res.split(",");
this.Base64img = result[1];
let data = {"img_data":this.Base64img};
let data = {"img_data":this.Base64img,"type":2};
upLoadImg(data).then((res) => {
if (res.code == 1){
this.factoryImgFileList.push({'url':res.data.image_url});
......
src/views/entry/fillMainInf.vue
浏览文件 @ 7daf08a7
......@@ -45,7 +45,7 @@
</span>
</div>
<div style="width:380px;line-height: 24px;padding-top: 6px;">
<span class="tips-text">图片大小在2MB以内，支持png,jpg格式，最多可上传1张</span></br>
<span class="tips-text">图片大小为500KB以内，支持png/jpg，限一张，请确保图片清晰</span></br>
<span class="tips-text">请确保营业执照在有效期内</span>
</div>
</div>
......@@ -141,7 +141,7 @@
</span>
</div>
<div style="width:380px;line-height: 24px;padding-top: 6px;">
<span class="tips-text">请按顺序分别上传正面（照片面）和反面（国徽面）电子版图片,文件大小在 2MB以内，支持png,jpg格式，最多可上传2张</span>
<span class="tips-text">图片大小为500KB以内，支持png/jpg，每个上传框限一张，请确保图片清晰</span>
</div>
</div>
<div class="idcard-tips-con">
......@@ -361,6 +361,7 @@
/** 上传 图片大小和格式校验 */
beforeUpImg(file) {
// let isImgSize = (file.size / 1024 / 100) > 5;
let isImgSize = (file.size / 1024 ) > 500;
if(file.type !== "image/png" && file.type !== "image/jpg" && file.type != "image/jpeg") {
this.$message({
message: '上传图片格式只支持png/png格式',
......@@ -368,20 +369,20 @@
});
return false;
}
// if(isImgSize) {
// this.$message({
// message: '上传图片大小不能超过500k',
// type: "warning"
// });
// return false;
// }
if(isImgSize) {
this.$message({
message: '上传图片大小不能超过500k',
type: "warning"
});
return false;
}
},
/** 上传 营业执照图片 */
uploadLicenseImages(param) {
this.getBase64(param.file).then((res) => {
let result = res.split(",");
this.Base64img = result[1];
let data = {"img_data":this.Base64img};
let data = {"img_data":this.Base64img,"type":2};
upLoadImg(data).then((res) => {
if( res.code == 1){
this.licenseImgFileList.push({'url':res.data.image_url});
......@@ -456,7 +457,7 @@
this.getBase64(param.file).then((res) => {
let result = res.split(",");
this.Base64img = result[1];
let data = {"img_data":this.Base64img};
let data = {"img_data":this.Base64img,"type":2};
upLoadImg(data).then((res) => {
if (res.code == 1){
this.idcardImgFileList.push({'url':res.data.image_url});
......@@ -526,7 +527,7 @@
this.getBase64(param.file).then((res) => {
let result = res.split(",");
this.Base64img = result[1];
let data = {"img_data":this.Base64img};
let data = {"img_data":this.Base64img,"type":2};
upLoadImg(data).then((res) => {
if (res.code == 1){
this.idcardBackImgFileList.push({'url':res.data.image_url});
......
src/views/entry/fillShopInf.vue
浏览文件 @ 7daf08a7
......@@ -65,7 +65,7 @@
</span>
</div>
<div style="width:380px;line-height: 24px;padding-top: 6px;">
<span class="tips-text">请上传店铺LOGO，文件大小在500KB以内，支持png,jpg格式，最多可上传1张</span>
<span class="tips-text">图片大小在500KB以内，支持png/jpg，限一张，请确保图片清晰</span>
</div>
</div>
</el-form-item>
......@@ -101,8 +101,15 @@
<input type="file" style="display: none;" :ref=" 'hxz' + index " accept="image/*"
@change="changeIMG(index,item)">
</div>
<!--*** 方法二 end ***-->
</div>
<div style="width:680px;line-height: 24px;padding-top: 6px;">
<span class="tips-text">
<i class="el-icon-warning h-warning"></i>
</span>
<span class="tips-text">图片大小在500KB以内，支持png/jpg，每个上传位置仅限一张，请确保图片清晰</span>
</div>
</el-form-item>
<el-form-item class="confirm-btn">
......@@ -308,7 +315,7 @@
this.getBase64(param.file).then((res) => {
let result = res.split(",");
this.Base64img = result[1];
let data = {"img_data":this.Base64img};
let data = {"img_data":this.Base64img,"type":2};
upLoadImg(data).then((res) => {
if(res.code == 1){
this.logoImgFileList.push({'url':res.data.image_url});
......@@ -502,16 +509,15 @@
let curItem = item;
let inputDom = "hxz" + index;
let file = this.$refs[inputDom][0].files[0];
if( file.size > 1024 * 1024 * 3 ) {
this.$message({ type: 'error',message: '规格图片不能大于 3 M'});
if( file.size > 1024 * 500 ) {
this.$message({ type: 'error',message: '规格图片不能大于 500k'});
return;
}
this.getBase64(file).then((res) => {
let result = res.split(",");
this.Base64img = result[1];
let data = {"img_data": this.Base64img}
let data = {"img_data": this.Base64img,"type":2}
upLoadImg(data).then(res => {
// this.loading = false;
if (res && res.code == 1) {
......
src/views/system/asset/securityFund.vue
浏览文件 @ 7daf08a7
......@@ -647,10 +647,10 @@
});
return false;
}
let isImgSize = (file.size / 1024 / 1024) > 2;
let isImgSize = (file.size / 1024 ) > 500;
if (isImgSize) {
this.$message({
message: '上传图片大小不能超过2MB',
message: '上传图片大小不能超过500k',
type: "warning"
});
return false;
......@@ -696,7 +696,7 @@
this.getBase64(param.file).then((res) => {
let result = res.split(",");
this.Base64img = result[1];
let data = {"img_data": this.Base64img}
let data = {"img_data": this.Base64img,"type":2}
UploadImg(data).then(res => {
if (res && res.code == 1) {
this.ruleFormdialogLogo.push({url: res.data.image_url})
......
src/views/system/asset/wddetails.vue
浏览文件 @ 7daf08a7
......@@ -341,7 +341,7 @@
this.getBase64(param.file).then( res => {
let result = res.split(",");
this.Base64img = result[1];
let data = {"img_data":this.Base64img};
let data = {"img_data":this.Base64img,"type":2};
this.invoiceImgBase64List = [] // 初始化
upLoadImg(data).then( res=> {
let urlObj = {'url': ''};
......
src/views/system/goods/add/components/goodsimg.vue
浏览文件 @ 7daf08a7
......@@ -121,6 +121,21 @@
fileChange() {
const list = this.$refs.file.files;
this.indexall = list.length
if (list.type !== "image/png" && list.type !== "image/jpg" && list.type != "image/jpeg") {
this.$message({
message: '上传图片格式只支持png/png格式',
type: "warning"
});
return false;
}
let isImgSize = (list.size / 1024 ) > 500;
if (isImgSize) {
this.$message({
message: '上传图片大小不能超过500k',
type: "warning"
});
return false;
}
this.uploadImgs()
},
// 向后台 传输 base64的图片数据
......
src/views/system/goods/add/components/goodsimg2.vue
浏览文件 @ 7daf08a7
......@@ -27,8 +27,24 @@ export default {
editor.config.height = 500;
editor.config.uploadImgShowBase64 = true;
editor.config.showLinkImg = false;
// editor.config.uploadImgMaxLength = 1
editor.config.customUploadImg = function (files, insertImgFn) {
if (files[0].type !== "image/png" && files[0].type !== "image/jpg" && files[0].type != "image/jpeg") {
that.$message({
message: '上传图片格式只支持png/jpg格式',
type: "warning"
});
return false;
}
let isImgSize = (files[0].size / 1024 /1024) > 10;
if (isImgSize) {
that.$message({
message: '上传图片大小不能超过10M',
type: "warning"
});
return false;
}
// resultFiles 是 input 中选中的文件列表
// insertImgFn 是获取图片 url 后，插入到编辑器的方法
// 上传图片，返回结果，将图片插入到编辑器中
......@@ -40,7 +56,7 @@ export default {
imgBase = "";
imgBase = res[i].split(",")[1];
if (imgBase) {
data.data.push({ img_data: imgBase });
data.data.push({ img_data: imgBase,type:3});
}
}
......
src/views/system/goods/add/components/goodsinfomation.vue
浏览文件 @ 7daf08a7
......@@ -58,7 +58,7 @@
<span class="tip-span" style="display: block;line-height: 34px;">
<i style="margin: 10px;">{{ goodsImgFileList.length }} / 7</i>
商品图片最多上传7张，默认第一张为主图
<span style="margin-left: 20px;">单张图片需限制在2M以内，可上传png、jpg格式，尺寸要求为800 * 800</span>
<span style="margin-left: 20px;">主图要求为白底，单张图片需限制在2M以内，建议尺寸要求为800*800px，拖拽图片可进行排序</span>
</span>
<draggable :list="goodsImgFileList" group="article" class="dragArea" @end="handchange($event)">
<div v-for="(element,index) in goodsImgFileList" :key="index" class="list-complete-item"
......@@ -558,7 +558,7 @@
this.getBase64(param.file).then(res => {
let result = res.split(",");
this.Base64img = result[1];
let data = { "img_data": this.Base64img };
let data = { "img_data": this.Base64img,type:1 };
UploadImg(data).then(res => {
let urlObj = { 'url': '' };
if (res.data) {
......
src/views/system/goods/add/components/goodsparameter.vue
浏览文件 @ 7daf08a7
......@@ -305,14 +305,14 @@ export default {
let curRow = row;
let file = this.$refs.guideupimg.files[0];
if( file.size > 1024 * 1024 * 3 ) {
this.$message({ type: 'error',message: '规格图片不能大于 3 M'});
if( file.size > 1024 * 1024 * 2 ) {
this.$message({ type: 'error',message: '规格图片不能大于 2 M'});
return;
}
this.getBase64(file).then((res) => {
let result = res.split(",");
this.Base64img = result[1];
let data = {"img_data": this.Base64img}
let data = {"img_data": this.Base64img,type:2}
UploadImg(data).then(res => {
// this.loading = false;
if (res && res.code == 1) {
......
src/views/system/shop/brand.vue
浏览文件 @ 7daf08a7
......@@ -160,7 +160,7 @@
</span>
</div>
<div style="width:380px;line-height: 24px;padding-top: 6px;">
<span class="tips-text">必须与商标图文一致。文件大小在500KB以内，支持png,jpg格式，最多可上传1张</span>
<span class="tips-text">图片大小在500KB以内，支持png/jpg，限一张，请确保图片清晰</span>
</div>
</div>
</el-form-item>
......@@ -196,7 +196,7 @@
</span>
</div>
<div style="width:380px;line-height: 24px;padding-top: 6px;">
<span class="tips-text">请提供有效期内的商标注册证，保持信息清晰可见，支持png,jpg格式，最多可上传1张</span>
<span class="tips-text">图片大小在500KB以内，支持png/jpg，限一张，请确保图片清晰</span>
</div>
</div>
</el-form-item>
......@@ -251,6 +251,7 @@
<el-upload
class="uploadData"
action="#"
:limit="1"
list-type="picture-card"
:http-request="uploadFactoryImgs"
:before-upload="UpImgSizeTwoMb"
......@@ -270,7 +271,7 @@
</span>
</div>
<div style="width:380px;line-height: 24px;padding-top: 6px;">
<span class="tips-text">授权在云仓平台经营此品牌，支持png,jpg格式，文件大小在2MB以内</span>
<span class="tips-text">图片大小在500KB以内，支持png/jpg，限一张，请确保图片清晰</span>
</div>
</div>
<p class="brand-auth-tips">上传完整授权链路，品牌方给予企业的授权书，如果是多级授权，请上传各级授权证书</p>
......@@ -286,6 +287,7 @@
<el-upload
class="uploadData"
action="#"
:limit="1"
:http-request="uploadShopImgs"
list-type="picture-card"
:before-upload="UpImgSizeTwoMb"
......@@ -305,7 +307,7 @@
</span>
</div>
<div style="width:380px;line-height: 24px;padding-top: 6px;">
<span class="tips-text">授权在云仓平台经营此品牌，支持png,jpg格式</span>
<span class="tips-text">图片大小在500KB以内，支持png/jpg，限一张，请确保图片清晰</span>
</div>
</div>
</el-form-item>
......@@ -889,7 +891,7 @@
this.getBase64(param.file).then((res) => {
let result = res.split(",");
this.Base64img = result[1];
let data = {"img_data": this.Base64img};
let data = {"img_data": this.Base64img,"type":2};
upLoadImg(data).then((res) => {
if (res && res.code === 1) {
this.brandImgFileList.push({'url': res.data.image_url});
......@@ -936,7 +938,7 @@
this.getBase64(param.file).then((res) => {
let result = res.split(",");
this.Base64img = result[1];
let data = {"img_data": this.Base64img};
let data = {"img_data": this.Base64img,"type":2};
upLoadImg(data).then((res) => {
if (res && res.code === 1) {
this.certImgFileList.push({'url': res.data.image_url});
......@@ -967,7 +969,7 @@
this.getBase64(param.file).then((res) => {
let result = res.split(",");
this.Base64img = result[1];
let data = {"img_data":this.Base64img};
let data = {"img_data":this.Base64img,"type":2};
upLoadImg(data).then((res) => {
if(res && res.code === 1){
this.factoryImgFileList.push({'url':res.data.image_url});
......@@ -986,10 +988,10 @@
});
return false;
}
let isImgSize = (file.size / 1024 /1024) > 2;
let isImgSize = (file.size / 1024 ) > 500;
if(isImgSize) {
this.$message({
message: '上传图片大小不能超过2M',
message: '上传图片大小不能超过500k',
type: "warning"
});
return false;
......@@ -1013,7 +1015,7 @@
this.getBase64(param.file).then((res) => {
let result = res.split(",");
this.Base64img = result[1];
let data = {"img_data":this.Base64img};
let data = {"img_data":this.Base64img,"type":2};
upLoadImg(data).then((res) => {
if(res && res.code === 1){
this.shopImgFileList.push({'url':res.data.image_url});
......
src/views/system/shop/index.vue
浏览文件 @ 7daf08a7
......@@ -240,6 +240,7 @@
<div class="single-title">{{ authTitleFormatter(item.content) }}</div>
</div>
</div>
</el-form-item>
</el-form>
......@@ -301,7 +302,7 @@
</span>
</div>
<div style="width:380px;line-height: 24px;padding-top: 6px;">
<span class="tips-text">请上传店铺LOGO，文件大小在500KB以内，支持png,jpg格式，最多可上传1张</span>
<span class="tips-text">图片大小在500KB以内，支持png/jpg，限一张，请确保图片清晰</span>
</div>
</div>
</el-form-item>
......@@ -336,6 +337,13 @@
<input type="file" style="display: none;" :ref=" 'hxz' + index " accept="image/*"
@change="changeIMG(index,item)">
</div>
</div>
<div style="width:680px;line-height: 24px;padding-top: 6px;">
<span class="tips-text">
<i class="el-icon-warning h-warning"></i>
</span>
<span class="tips-text">图片大小在500KB以内，支持png/jpg，每个上传位置仅限一张，请确保图片清晰</span>
</div>
</el-form-item>
......@@ -779,7 +787,7 @@
this.getBase64(param.file).then((res) => {
let result = res.split(",");
this.Base64img = result[1];
let data = {"img_data": this.Base64img};
let data = {"img_data": this.Base64img,"type":2};
upLoadImg(data).then((res) => {
if (res && res.code == 1) {
this.logoImgFileList.push({'url': res.data.image_url});
......@@ -814,15 +822,15 @@
let inputDom = "hxz" + index;
let file = this.$refs[inputDom][0].files[0];
if( file.size > 1024 * 1024 * 3 ) {
this.$message({ type: 'error',message: '规格图片不能大于 3 M'});
if( file.size > 1024 * 500 ) {
this.$message({ type: 'error',message: '规格图片不能大于 500k'});
return;
}
this.getBase64(file).then((res) => {
let result = res.split(",");
this.Base64img = result[1];
let data = {"img_data": this.Base64img}
let data = {"img_data": this.Base64img,"type":2}
upLoadImg(data).then(res => {
if (res && res.code == 1) {
curItem.url = res.data.image_url;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论