diff --git a/src/plugins/index.js b/src/plugins/index.js
index d000f2d..373de48 100644
--- a/src/plugins/index.js
+++ b/src/plugins/index.js
@@ -1,20 +1,21 @@
-import tab from './tab'
-import auth from './auth'
-import cache from './cache'
-import modal from './modal'
-import download from './download'
+import tab from "./tab";
+import auth from "./auth";
+import cache from "./cache";
+import modal from "./modal";
+import download from "./download";
+import "./platform";
export default {
install(Vue) {
// 页签操作
- Vue.prototype.$tab = tab
+ Vue.prototype.$tab = tab;
// 认证对象
- Vue.prototype.$auth = auth
+ Vue.prototype.$auth = auth;
// 缓存对象
- Vue.prototype.$cache = cache
+ Vue.prototype.$cache = cache;
// 模态框对象
- Vue.prototype.$modal = modal
+ Vue.prototype.$modal = modal;
// 下载文件
- Vue.prototype.$download = download
- }
-}
+ Vue.prototype.$download = download;
+ },
+};
diff --git a/src/plugins/platform.js b/src/plugins/platform.js
new file mode 100644
index 0000000..4c4581b
--- /dev/null
+++ b/src/plugins/platform.js
@@ -0,0 +1,29 @@
+import router from "@/router";
+
+function meta(to, type, desc) {
+ to.meta.manufacturer = {
+ name: to.fullPath.split("/").at(1),
+ //1:厂商管理,2:经销商管理,3:门店管理
+ type,
+ //1:厂商/经销商/商店列表,2:审核
+ subType: to.fullPath.split("/").at(-1),
+ desc,
+ };
+}
+
+router.beforeEach((to, from, next) => {
+ switch (to.fullPath.split("/").at(1)) {
+ case "manufacturer":
+ meta(to, "1", "厂商");
+ break;
+ case "dealer":
+ meta(to, "2", "经销商");
+ break;
+ case "store":
+ meta(to, "3", "门店");
+ break;
+ }
+
+ // your logic
+ next();
+});
diff --git a/src/views/platform/manufacturer/base.vue b/src/views/platform/manufacturer/base.vue
index 36c2232..345b371 100644
--- a/src/views/platform/manufacturer/base.vue
+++ b/src/views/platform/manufacturer/base.vue
@@ -6,10 +6,10 @@
-
+
-
+
@@ -19,10 +19,11 @@
-
+
-
+
@@ -32,7 +33,7 @@
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期">
-
+
@@ -56,35 +57,70 @@
}}
-
-
-
-
- {{
+
+
+ {{
item.label
}}
-
-
-
+
+
-
+
+
+
+ {{
+ item.label
+ }}
+
+
+
+
+
+
+
+
+
+
授权厂商
+
+
+
+
+ 总订单交易额(元)
+ 12333.00
+
+
+ 提现支出(元)
+ 12333.00
+
+
+ 本月订单交易额(元)
+ 12333.00
+
+
+ 本月提现支出(元)
+ 12333.00
+
+
+
-
+
-
+
保存
关闭
@@ -97,7 +133,7 @@ import Authorized from "./authorized"
export default {
name: 'Base',
components: { userAvatar, Authorized },
- dicts: ['manufacturer_type_1', 'audit_status'],
+ dicts: ['manufacturer_type_1', 'audit_status', 'sys_yes_no'],
data() {
return {
width: 100,
@@ -116,23 +152,38 @@ export default {
address: '光明路128号'
},
status: '0',
+ isPlatformOwned: 'Y',
audit: undefined
}
}
- },
- computed: {
- // 1:列表,2:审核
- type() {
- return this.$route.fullPath.split('/').at(-1)
- },
- // 1:厂商,2:经销商
- manufacturerType() {
- return this.$route.fullPath.includes('manufacturer') ? 1 : 2
- }
}
}
\ No newline at end of file
diff --git a/src/views/platform/manufacturer/index.vue b/src/views/platform/manufacturer/index.vue
index b86461d..f492880 100644
--- a/src/views/platform/manufacturer/index.vue
+++ b/src/views/platform/manufacturer/index.vue
@@ -1,12 +1,12 @@
-
+
-
+
-
+
@@ -24,9 +24,12 @@
-
+
+
+
+
-
+
批量锁定
批量开启
@@ -60,25 +63,51 @@
CS000001
-
-
- 联想厂商
+
+
+
+ 联想经销商
-
+
+
电子产品
-
- 联想经销商
-
+
+
+
+ 联想厂商
+
+
+ 电子产品
+
+
+
+
+
+ 门店名称
+
+
+
+ 加盟店
+
+
+ 入驻申请
+
+
+
+
+
+
+
张三
18888888888
-
-
+
+
125
@@ -86,12 +115,18 @@
1
-
+
1125
+
+ 直营门店
+
1125
+
+ 1125
+
2022-12-31 12:31
@@ -110,11 +145,12 @@
详情
锁定
- 审核
+ 审核
-
+
@@ -137,6 +173,7 @@
diff --git a/src/views/system/user/profile/baseForm.vue b/src/views/system/user/profile/baseForm.vue
index b885394..8e6ec20 100644
--- a/src/views/system/user/profile/baseForm.vue
+++ b/src/views/system/user/profile/baseForm.vue
@@ -95,7 +95,7 @@
-
+
diff --git a/src/views/system/user/profile/userAvatar.vue b/src/views/system/user/profile/userAvatar.vue
index 770068b..81283ca 100644
--- a/src/views/system/user/profile/userAvatar.vue
+++ b/src/views/system/user/profile/userAvatar.vue
@@ -1,11 +1,11 @@
+ :title="'点击上传' + title" class="img-lg" :class="{ 'img-circle': circle }" />
-
头像
-
{{ title }}
+
@@ -68,6 +68,9 @@ export default {
showBottomLabel: {
type: Boolean,
default: false
+ },
+ title: {
+ type: String
}
},
data() {
@@ -76,8 +79,7 @@ export default {
open: false,
// 是否显示cropper
visible: false,
- // 弹出层标题
- title: "修改头像",
+
options: {
img: store.getters.avatar, //裁剪图片的地址
autoCrop: true, // 是否默认生成截图框
@@ -91,7 +93,7 @@ export default {
};
},
methods: {
- // 编辑头像
+ // 编辑
editCropper() {
this.open = true;
},
@@ -142,6 +144,8 @@ export default {
this.$refs.cropper.getCropBlob(data => {
let formData = new FormData();
formData.append("avatarfile", data);
+
+ // TODO:厂商修改LOGO需要更换接口,目前未实现
uploadAvatar(formData).then(response => {
this.open = false;
this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;