From f905b98c3530310d5ab58c656101b5e0095a84ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E5=90=8C=E5=AD=A6?= <2495967527@qq.com>
Date: Fri, 15 Nov 2024 16:34:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/mer_admin.js             | 10 ++-
 src/views/common/login.vue               |  2 +-
 src/views/modules/brand/config/index.vue | 78 +++++++++++++++++++-----
 3 files changed, 74 insertions(+), 16 deletions(-)

diff --git a/src/api/modules/mer_admin.js b/src/api/modules/mer_admin.js
index b7e7607..ad3bcd0 100644
--- a/src/api/modules/mer_admin.js
+++ b/src/api/modules/mer_admin.js
@@ -15,7 +15,7 @@ export const mer_admin = {
    * @returns
    */
   loginByAccount: (params) => {
-    return $http.post(`/admin-api/auth/login`, {
+    return $http.post(`/merchant-api/auth/login`, {
       ...params,
     });
   },
@@ -154,4 +154,12 @@ export const mer_admin = {
       params: { id },
     });
   },
+  //获取品牌信息
+  getBrandInfo: () => {
+    return $http.request({
+      method: "get",
+      url: `/merchant-api/brand/info`,
+      params: {},
+    });
+  },
 };
diff --git a/src/views/common/login.vue b/src/views/common/login.vue
index 8b921b9..ab04ccd 100644
--- a/src/views/common/login.vue
+++ b/src/views/common/login.vue
@@ -315,7 +315,7 @@ export default {
         this.$api.mer_admin
           .loginByAccount({
             // role: _loginTypeMapper[this.loginType],
-            userName: this.dataForm.userName,
+            mobile: this.dataForm.userName,
             password: this.dataForm.password,
           })
           .then(({ data }) => {
diff --git a/src/views/modules/brand/config/index.vue b/src/views/modules/brand/config/index.vue
index 9b9989d..97e8367 100644
--- a/src/views/modules/brand/config/index.vue
+++ b/src/views/modules/brand/config/index.vue
@@ -10,13 +10,51 @@
       <span @click="infoUpdate" class="brandInfo-update">编辑</span>
     </div>
     <div class="info-content">
-      <div class="info-item">品牌名称：</div>
-      <div class="info-item">品牌ID:</div>
-      <div class="info-item">品牌LOGO:</div>
-      <div class="info-item">品牌背景:</div>
-      <div class="info-item">品牌首页:</div>
-      <div class="info-item">宣传语:</div>
-      <div class="info-item">宣传视频:</div>
+      <div class="info-item">品牌名称：{{ list.name }}</div>
+      <div class="info-item">品牌ID: {{ list.id }}</div>
+      <div class="info-item" style="display: flex">
+        <div>品牌LOGO:</div>
+        <div v-if="list.logo" style="margin-left: 20px">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="list.logo"
+            :preview-src-list="[list.logo]"
+          >
+          </el-image>
+        </div>
+      </div>
+      <div class="info-item" style="display: flex">
+        <div>品牌背景:</div>
+        <div v-if="list.background" style="margin-left: 20px">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="list.background"
+            :preview-src-list="[list.background]"
+          >
+          </el-image>
+        </div>
+      </div>
+      <div class="info-item">
+        品牌首页: {{ list.homepageStatus == 0 ? "禁用" : "启用" }}
+      </div>
+      <div class="info-item">宣传语: {{ list.tagline }}</div>
+      <div class="info-item" style="display: flex">
+        <div>宣传视频:</div>
+        <div v-if="list.video" style="margin-left: 20px">
+          <video
+            id="videoPlayer"
+            width="200px"
+            height="100px"
+            object-fit="fill"
+            autoplay="true"
+            muted="muted"
+            loop
+            controls
+          >
+            <source :src="list.video" type="video/mp4" />
+          </video>
+        </div>
+      </div>
     </div>
     <div class="brandInfo">
       <span class="pattern"></span>
@@ -24,11 +62,13 @@
     </div>
     <div class="info-content">
       <div class="info-item">
-        管理员账号：
+        管理员账号：{{ list.administrator.substr(0, 3) }}****{{
+          list.administrator.substr(7)
+        }}
         <span @click="passwordUpdate(true)" class="brandInfo-update">修改</span>
       </div>
       <div class="info-item">
-        管理员密码:
+        管理员密码: ******
         <span @click="passwordUpdate(false)" class="brandInfo-update"
           >修改</span
         >
@@ -39,8 +79,8 @@
       其他信息
     </div>
     <div class="info-content">
-      <div class="info-item">品牌联系人：</div>
-      <div class="info-item">联系方式:</div>
+      <div class="info-item">品牌联系人：{{ list.contact }}</div>
+      <div class="info-item">联系方式: {{ list.contactPhone }}</div>
     </div>
     <div class="brandInfo">
       <span class="pattern"></span>
@@ -58,19 +98,29 @@
     <changePassword ref="changePassword"></changePassword>
   </div>
 </template>
-
 <script>
 import changePassword from "./popup/change-password.vue";
 import addOrUpdate from "./popup/add-or-update.vue";
 export default {
   components: { addOrUpdate, changePassword },
   data() {
-    return {};
+    return {
+      list: [],
+    };
+  },
+  created() {
+    this.getList();
   },
   methods: {
+    getList() {
+      this.$api.mer_admin.getBrandInfo().then((res) => {
+        console.log(res);
+        this.list = res.data.data;
+      });
+    },
     infoUpdate() {
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.toggle().update();
+        this.$refs.addOrUpdate.toggle().update(this.list);
       });
       console.log("123");
     },