From 6f4c1b0a6291e45567f401dfeca32b796ef35985 Mon Sep 17 00:00:00 2001
From: dy-hu <dy-hu@haihangyun.com>
Date: Mon, 3 Jun 2024 16:31:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=AE=B6=E7=AB=AF=E6=88=91=E7=9A=84?=
=?UTF-8?q?=E5=BA=97=E9=93=BA=E6=B7=BB=E5=8A=A0=E5=BA=97=E9=93=BAlogo?=
=?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=8A=9F=E8=83=BD=E4=B8=9A=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
canvas-container/locales/en.json | 3 ++-
canvas-container/locales/zh-CN.json | 3 ++-
src/locales/en.json | 1 +
src/locales/zh-CN.json | 3 ++-
src/views/shop/myshop/index.vue | 45 ++++++++++++++++++++++++++++++++++---
5 files changed, 49 insertions(+), 6 deletions(-)
diff --git a/canvas-container/locales/en.json b/canvas-container/locales/en.json
index ec33d32..f3f5c02 100644
--- a/canvas-container/locales/en.json
+++ b/canvas-container/locales/en.json
@@ -55,6 +55,7 @@
"shop.newShop":"New Shop",
"shop.shopCode":"ShopCode",
"shop.shopName":"Shop",
+ "shop.shopLogo":"Logo",
"shop.shopNameHint":"Please input the shop name",
"shop.shopCodeHint":"Please input the shop code",
"shop.shopContactPersonHint":"Please input the shop contact person",
@@ -626,4 +627,4 @@
"common.eq":"等于",
"common.lt":"小于",
"product.productgroupname_empty":"分组名称不能为空"
-}
\ No newline at end of file
+}
diff --git a/canvas-container/locales/zh-CN.json b/canvas-container/locales/zh-CN.json
index 496284b..b0ff333 100644
--- a/canvas-container/locales/zh-CN.json
+++ b/canvas-container/locales/zh-CN.json
@@ -55,6 +55,7 @@
"shop.newShop":"新增店铺",
"shop.shopCode":"店铺编码",
"shop.shopName":"店铺名称",
+ "shop.shopLogo":"店铺Logo",
"shop.shopNameHint":"请输入店铺名称",
"shop.shopCodeHint":"请输入店铺编码",
"shop.shopContactPersonHint":"请输入负责人",
@@ -626,4 +627,4 @@
"common.eq":"等于",
"common.lt":"小于",
"product.productgroupname_empty":"分组名称不能为空"
-}
\ No newline at end of file
+}
diff --git a/src/locales/en.json b/src/locales/en.json
index e12ffa0..e3f3e1f 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -55,6 +55,7 @@
"shop.newShop":"New Shop",
"shop.shopCode":"ShopCode",
"shop.shopName":"Shop",
+ "shop.shopLogo":"Logo",
"shop.shopNameHint":"Please input the shop name",
"shop.shopCodeHint":"Please input the shop code",
"shop.shopContactPersonHint":"Please input the shop contact person",
diff --git a/src/locales/zh-CN.json b/src/locales/zh-CN.json
index 6abf126..1cf64d5 100644
--- a/src/locales/zh-CN.json
+++ b/src/locales/zh-CN.json
@@ -55,6 +55,7 @@
"shop.newShop":"新增店铺",
"shop.shopCode":"店铺编码",
"shop.shopName":"店铺名称",
+ "shop.shopLogo":"店铺Logo",
"shop.shopNameHint":"请输入店铺名称",
"shop.shopCodeHint":"请输入店铺编码",
"shop.shopContactPersonHint":"请输入负责人",
@@ -627,5 +628,5 @@
"common.eq":"等于",
"common.lt":"小于",
"product.productgroupname_empty":"分组名称不能为空"
-
+
}
diff --git a/src/views/shop/myshop/index.vue b/src/views/shop/myshop/index.vue
index af7c26e..5638c51 100644
--- a/src/views/shop/myshop/index.vue
+++ b/src/views/shop/myshop/index.vue
@@ -187,6 +187,26 @@
:disabled="disabled"
/>
</el-form-item>
+ <el-form-item :label="$t('shop.shopLogo')" prop="shopLogo">
+ <el-upload
+ :class="[{ 'avatar-uploader': !ruleForm.shopLogo }]"
+ :headers="headers"
+ :data="dataObj"
+ :action="action"
+ :show-file-list="false"
+ :on-success="handleLogoSuccess"
+ >
+ <img
+ v-if="ruleForm.shopLogo"
+ :src="ruleForm.shopLogo"
+ class="avatar"
+ width="80"
+ height="80"
+ >
+ <i v-else class="el-icon-plus avatar-uploader-icon" />
+ </el-upload>
+ </el-form-item>
+
<el-form-item
:label="$t('shop.shopCode')"
prop="shopCode"
@@ -426,7 +446,8 @@ import {
delshopById
} from '@/api/shop'
import Cookies from 'js-cookie'
-import {getProject} from '@/utils/auth'
+import {getProject, getToken} from '@/utils/auth'
+import {uploadUrl} from "@/utils/request";
export default {
data () {
// 这里存放数据
@@ -445,6 +466,7 @@ export default {
localIsCross :false,
ruleForm: {
shopName: '', // 店铺名称
+ shopLogo: '', //店铺logo
chargePersonName: '', // 店铺负责人
chargePersonPhone: '', // 负责人电话
shopAdress: '', // 地址
@@ -469,6 +491,9 @@ export default {
shopName: [
{ required: true, message: '请输入店铺名称', trigger: 'blur' }
],
+ shopLogo: [
+ { required: true, message: '请上传店铺Logo', trigger: 'blur' }
+ ],
chargePersonName: [
{ required: true, message: '请输入店铺负责人', trigger: 'blur' }
],
@@ -503,7 +528,14 @@ export default {
privacyTime: 0,
cpPhoneShow: true, // 是否显示脱敏负责人手机号
returnPhoneShow: true, // 是否显示脱敏负责人手机号
- shopPhoneShow: true // 是否显示脱敏账号
+ shopPhoneShow: true, // 是否显示脱敏账号
+ headers: {
+ 'Authorization-business': getToken(),
+ },
+ dataObj: {
+ folderId: 1,
+ },
+ action: uploadUrl,
}
},
// 监听属性 类似于data概念
@@ -681,6 +713,7 @@ export default {
this.disabled = false
this.cpPhoneShow = true
const res = await shopListGetById({ shopId: row.shopId })
+ console.log('edit-->', res.data)
this.ruleForm = res.data
this.dialogVisible = true
console.log(this.ruleForm)
@@ -786,7 +819,13 @@ export default {
return (
str.substring(0, frontLen) + xing + str.substring(str.length - endLenData)
)
- }
+ },
+
+ handleLogoSuccess(response) {
+ const { url } = response.data;
+ this.ruleForm.shopLogo = url;
+ console.log('handleLogoSuccess--->', this.ruleForm.shopLogo)
+ },
}
}
</script>