Parcourir la source

供需详情静态页面和供应广场静态页面开发完成

余胜明 il y a 4 ans
Parent
commit
ed388fe292
30 fichiers modifiés avec 818 ajouts et 95 suppressions
  1. 41 11
      Desktop/buwanjia/src/assets/commonCSS/globalCSS.css
  2. BIN
      Desktop/buwanjia/src/assets/images/Supply/cpch.png
  3. BIN
      Desktop/buwanjia/src/assets/images/Supply/mlsj.png
  4. BIN
      Desktop/buwanjia/src/assets/images/Supply/pmsj.png
  5. BIN
      Desktop/buwanjia/src/assets/images/Supply/sypx.png
  6. BIN
      Desktop/buwanjia/src/assets/images/Supply/sysx.png
  7. BIN
      Desktop/buwanjia/src/assets/images/Supply/xzml.png
  8. BIN
      Desktop/buwanjia/src/assets/images/Supply/xzzb.png
  9. 49 8
      Desktop/buwanjia/src/commonCmp/AccountCenter/AccountCenterTop.vue
  10. 5 5
      Desktop/buwanjia/src/components/AccountCenter/AccountCenter.vue
  11. 180 16
      Desktop/buwanjia/src/components/HomePage/Supply/Supply.vue
  12. 117 0
      Desktop/buwanjia/src/components/HomePage/Supply/SupplyAllInfo.vue
  13. 15 0
      Desktop/buwanjia/src/components/HomePage/Supply/SupplyAllInfo/BusinessTraining.vue
  14. 15 0
      Desktop/buwanjia/src/components/HomePage/Supply/SupplyAllInfo/FabricDesign.vue
  15. 21 0
      Desktop/buwanjia/src/components/HomePage/Supply/SupplyAllInfo/FindFabric.vue
  16. 15 0
      Desktop/buwanjia/src/components/HomePage/Supply/SupplyAllInfo/GraphicDesign.vue
  17. 0 0
      Desktop/buwanjia/src/components/HomePage/Supply/SupplyAllInfo/Photography.vue
  18. 15 0
      Desktop/buwanjia/src/components/HomePage/Supply/SupplyAllInfo/ProductPlanning.vue
  19. 15 0
      Desktop/buwanjia/src/components/HomePage/Supply/SupplyAllInfo/SearchingAchor.vue
  20. 13 0
      Desktop/buwanjia/src/components/HomePage/Supply/SupplyConnecting.vue
  21. 15 0
      Desktop/buwanjia/src/components/HomePage/Supply/SupplyDemand.vue
  22. 91 0
      Desktop/buwanjia/src/components/HomePage/Supply/SupplyItem.vue
  23. 82 0
      Desktop/buwanjia/src/components/HomePage/Supply/SupplySquare.vue
  24. 3 3
      Desktop/buwanjia/src/components/HomePage/UserHomePage.vue
  25. 36 2
      Desktop/buwanjia/src/components/SystemLogin/SelectAccount.vue
  26. 1 20
      Desktop/buwanjia/src/progressCmp/UserHomepage/AreaItem.vue
  27. 22 19
      Desktop/buwanjia/src/progressCmp/UserHomepage/LastSupply.vue
  28. 6 1
      Desktop/buwanjia/src/progressCmp/UserHomepage/MyApps.vue
  29. 45 10
      Desktop/buwanjia/src/router/index.js
  30. 16 0
      Desktop/buwanjia/src/store/mutations.js

+ 41 - 11
Desktop/buwanjia/src/assets/commonCSS/globalCSS.css

@@ -103,7 +103,25 @@ body {
     right: 3rem;
 }
 
+/* // 一键联系 */
+.areaItem_contact {
+    position:absolute;
+    bottom: 0;
+    right: 0;
+    height: 3.2rem;
+    width: 8.2rem;
+    margin: 1rem;
+
+    font-size: 16px;
+    font-weight: 500;
+    color: #FFFFFF;
+    background: linear-gradient(180deg, #83E0E9 0%, #4CBECF 100%);
+    text-shadow: 0px 0px 6px rgba(0, 0, 0, 0.1);
 
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
 
 
 
@@ -134,7 +152,10 @@ body {
 .sysLoginCenter_handle_title {
     font-size: 2.6rem;
 }
-.accountCentertop_title, .reviewMsg {
+.accountCentertop_title, 
+.reviewMsg, 
+.supply_othersTitle, 
+.supply_ul_li_title {
     font-size: 2.1rem;
 }
 .loginSubmit {
@@ -165,9 +186,15 @@ body {
 .detail2_account,
 .areaItemSecondP,
 .systemNotice_ul,
-.li_detail_des {
+.li_detail_des,
+.supply_head_detail_contact,
+.supply_head_detail_time,
+.supply_ul_li_detail {
     font-size: 1.6rem;
 }
+.supply_ul_li_count {
+    font-size: 1.4rem;
+}
 
 /*font-weight*/
 .loginTop, 
@@ -181,14 +208,16 @@ body {
 .areaMore,
 .li_detail_name,
 .contact_item_type,
-.supply_head_title  {
+.supply_head_title,
+.supply_othersTitle,
+.supply_ul_li_title  {
     font-weight: 500;
 }
 /*color*/
 .loginTop, .loginSubmit, .copyInfo_bottom, .productBtn{
     color: #ffffff;
 }
-.areaItemSecondP {
+.areaItemSecondP, .supply_head_detail_contact, .supply_ul_li_detail {
     color: #333;
 }
 .sysLoginCenter_handle_title, 
@@ -211,7 +240,7 @@ body {
     color: #4CBECF;
 }
 /*background*/
-.accountCenter {
+.accountCenter, .supply_others_ul_li, .supplyIndex, .userhome, .supplySquare {
     background-color: #F6F7F8;
 }
 .accountCentertop, 
@@ -221,17 +250,15 @@ body {
 .manyRole,
 .myApps,
 .circularArea,
-.supplySquare,
+.lastSupply,
 .systemNotice,
 .lastChatting,
 .partnerAgents,
 .contact,
-.supplyIndex_main {
+.supplyIndex_main,
+.supplyAllInfo_childRouter {
     background-color: #fff;
 }
-.supplyIndex, .userhome {
-    background-color: #F6F7F8;
-}
 /*.sysLoginCenter_form {*/
 /*    background-color: rgb(255, 255, 255);*/
 /*}*/
@@ -251,7 +278,10 @@ body {
 .lastChatting,
 .partnerAgents,
 .contact,
-.supplyIndex_main {
+.supplyIndex_main,
+.supply_others_ul_li,
+.supplySquare_main1,
+.supplyAllInfo_childRouter {
     border-radius: 1rem;
 }
 .item-input-user, .lastChatting_ul_li {

BIN
Desktop/buwanjia/src/assets/images/Supply/cpch.png


BIN
Desktop/buwanjia/src/assets/images/Supply/mlsj.png


BIN
Desktop/buwanjia/src/assets/images/Supply/pmsj.png


BIN
Desktop/buwanjia/src/assets/images/Supply/sypx.png


BIN
Desktop/buwanjia/src/assets/images/Supply/sysx.png


BIN
Desktop/buwanjia/src/assets/images/Supply/xzml.png


BIN
Desktop/buwanjia/src/assets/images/Supply/xzzb.png


+ 49 - 8
Desktop/buwanjia/src/commonCmp/AccountCenter/AccountCenterTop.vue

@@ -9,7 +9,7 @@
             <img src="../../assets/images/AccountCenter/accountNotice.svg" alt="accountNotice" class="accountNotice">
             <img src="../../assets/images/AccountCenter/accountHome.svg" alt="accountHome" class="accountHome">
             <div class="left_avatar">
-                <img src="../../assets/images/SystemLogin/demoAvatar.png" alt="" />
+                <img :src="url ?  url : require('../../assets/images/SystemLogin/demoAvatar.png')" alt="" />
             </div>
             <ul class="logout manyRole">
                 <li @click="accountcenter">账户中心</li>
@@ -25,28 +25,69 @@
         data () {
             return {
                 account_list: this.$store.state.account_list,
+                // 头像地址
+                url: ""
             }
         },
+
+        created() {
+            // 获取头像
+           this.getUserAvatar();     
+        },
+
         methods: {
+            // 发送获取头像
+            async getUserAvatar() {
+                const res = await this.$http.post("", this.getFullItfUserAvatar());
+                if (res.status >= 300 && res.status < 200) return;
+                const {data: {data}} = res;
+                if (data[0].length === 0) return;
+                this.url = data[0].fobsurl
+            },
+
             clickSelectAccount (currentInfo) {
                 this.$store.commit("selectAccount", currentInfo);
-                const url = window.location.href.split('#/')[1]
-                if (url === "userinfo") {
-                    this.$router.go(0)
-                } else {
-                    this.$router.push("accountcenter");
+                const address = window.location.href.split('/');
+                console.log(address[4]);
+                if (address[4] === "accountcenter") {
+                    if (address[5] === "userinfo") {
+                        this.$router.go(0);
+                    }
+                    this.$router.push("/accountcenter")
+                }
+                if (address[4] === "userhomepage") {
+                    if (!address[5]) {
+                        this.$router.go(0);
+                    }
+                    console.log(`/${address[4]}`);
+                    this.$router.push(`/${address[4]}`)
                 }
+
             },
             accountcenter() {
-                this.$router.push("accountcenter")
+                this.$router.push("1")
             },
+
+            // 注销登陆
             async logoutAccount() {
                 const res = await this.$http.post("logout", {
                     accesstoken: this.$store.state.selectAccount.token
                 });
                 console.log(res);
-                this.$router.push("systemlogin")
+                this.$router.push("systemlogin");
+            },
+
+
+            // 请求头像请求体
+            getFullItfUserAvatar() {
+                this.$store.commit("getfUserAvatarAgentLogo", {
+                    ownertable: "tenterprise_users",
+                    ownerid: this.$store.state.selectAccount.userid,
+                })
+
+                const interfaceType = this.$store.state.interfaceData;
 
+                return  interfaceType;
             }
         }
     }

+ 5 - 5
Desktop/buwanjia/src/components/AccountCenter/AccountCenter.vue

@@ -52,11 +52,11 @@
             return {
                 // 列表展示
                 menulist : [
-                    {id: 1, authname: 'userinfo', title: "个人信息"},
-                    {id: 2, authname: 'agentmanagement', title: "商户管理"}, 
-                    {id: 3, authname: 'productmanagement', title: "产品管理"}, 
-                    {id: 4, authname: 'partneragents', title: "合作管理"},
-                    {id: 5, authname: 'teammanagement', title: "团队管理"}
+                    {id: 1, authname: 'accountcenter/userinfo', title: "个人信息"},
+                    {id: 2, authname: 'accountcenter/agentmanagement', title: "商户管理"}, 
+                    {id: 3, authname: 'accountcenter/productmanagement', title: "产品管理"}, 
+                    {id: 4, authname: 'accountcenter/partneragents', title: "合作管理"},
+                    {id: 5, authname: 'accountcenter/teammanagement', title: "团队管理"}
                 ],
                 // 选择标题
                 activePath: '个人信息',

+ 180 - 16
Desktop/buwanjia/src/components/HomePage/Supply/Supply.vue

@@ -5,48 +5,212 @@
             <!-- 头部 -->
             <div class="supplyIndex_main_head">
                 <p class="supply_head_title">各位老板看下有以下料的联系我,高价收!</p>
-                <p>
+                <p class="supply_head_detail">
                     <img src="../../../assets/images/SystemLogin/logo2x.png" alt="logo" class="supply_head_logo">
-                    <span>家纺城-小布</span>
-                    <span>
-                        <img src="../../../assets/images/UserHomepage/timeIcon.svg" alt="timeIconSvg">
-                        <span>12-07 12:34</span>
-                    </span>
+                    <span class="supply_head_detail_contact">家纺城-小布</span>
+                    <img src="../../../assets/images/UserHomepage/timeIcon.svg" alt="timeIconSvg" class="timeIconSvg">
+                    <span class="supply_head_detail_time">12-07 12:34</span>
                 </p>
             </div>
-        </div>        
+            <!-- 分割线 -->
+            <div class="grayLine"></div>
+
+            <!-- 编辑 -->
+            <el-input type="textarea" class="supplyIndex_main_edit"></el-input>
+            <!-- 一键联系 -->
+            <el-button class="areaItem_contact">一键联系</el-button>
+            <!-- 分割线 -->
+            <div class="line1 grayLine"></div>
+            <!-- 其他推荐 -->
+            <div class="supply_others">
+                <span class="supply_othersTitle">其他推荐</span>
+                <!-- <ul class="supply_others_ul">
+                    <li v-for="(item,index) in 18" :key="index" class="supply_others_ul_li">
+                        <p class="supply_ul_li_title"><span>【窗帘布】</span>各位老板看下有以下面料的联系我</p>
+                        <div class="supply_ul_li_detail">
+                            <div class="supply_ul_li_detail_left">
+                                <p>各位老板看下有以下面料的联系我高价收!</p>
+                                <span>手机电话: 15257294120</span>
+                                <span class="supply_ul_li_detail_left_time">2021-11-10 14:23:34</span>
+                            </div>
+                            <div class="supply_ul_li_detail_imgs">
+                                <img src="../../../assets/images/UserHomepage/bedImg.png" alt="prodImg">
+                                <img src="../../../assets/images/UserHomepage/bedImg.png" alt="prodImg">
+                                <img src="../../../assets/images/UserHomepage/bedImg.png" alt="prodImg">
+                            </div>
+                        </div>
+                        <div class="line2 grayLine"></div>
+                        <p class="supply_ul_li_count">
+                            <span>浏览次数: 286次 </span>&nbsp;
+                            <span>意向沟通人数: 125人</span>
+                        </p>
+                        <el-button class="contact1 areaItem_contact">一键联系</el-button>
+                    </li>
+                </ul>      -->
+                <SupplyItem/>
+            </div>
+        </div>       
+        <SystemLoginCopyBottom bgc_blue="background: #4DC2D4"/>
     </div>
 </template>
 
 <script type='text/javascript'>
     import AccountCenterTop from "../../../commonCmp/AccountCenter/AccountCenterTop.vue"
+    import SystemLoginCopyBottom from "../../../commonCmp/WesiteInherentInfo/SystemLoginCopyBottom.vue"
+    import SupplyItem from "../../../components/HomePage/Supply/SupplyItem.vue"
     export default {
         name: "Supply",
         components: {
-            AccountCenterTop
+            AccountCenterTop,
+            SystemLoginCopyBottom,
+            SupplyItem
         }
     }
 </script>
 
 <style lang='scss' scoped>
+    // textArea 修改样式
+    /deep/ .el-textarea__inner {
+        height: 47.1rem;
+        width: 146.8rem !important;
+        padding: 3.7rem 2rem;
+        resize: none;
+        margin-top: 3.8rem !important;
+        border-radius: 1rem;
+        background-color: #F6F7F8 ;
+        width: 1422px;
+        font-size: 18px;
+        color: rgba(0, 0, 0, 0.3);
+    }
     .supplyIndex {
         position: relative;
-        width: 192rem;;
+        width: 192rem;
+        height: 186.5rem;
+        // 主体
+        .supplyIndex_main::-webkit-scrollbar {
+            display: none;
+        }
         .supplyIndex_main {
             position: relative;
-            height: 174.5rem;
+            padding: 3.5rem 5rem;
+            height: 168.5rem;
             width: 156.8rem;
             margin-top: 2.5rem;
             left: 50%;
-            transform: translate(-50%);     
+            transform: translate(-50%); 
+            overflow: hidden;
+            overflow-y: auto;
+
+
+            // 头部
             .supplyIndex_main_head {
-                .supply_head_logo {
-                    height: 2.4rem;
-                    width: 2.4rem;
-                    border-radius: 50%;
+                position: relative;
+
+                .supply_head_detail {
+                    margin-top: 2rem;
+
+                    display: flex;
+                    align-items: center;
+                    .supply_head_logo {
+                        height: 2.4rem;
+                        width: 2.4rem;
+                        border-radius: 50%;
+                    }
+                    .supply_head_detail_contact {
+                        margin-left: .5rem;
+                    }
+                    .timeIconSvg {
+                        margin: 0 .5rem 0 3rem;
+                    }
                 }
-            }       
 
+            }
+            // 分割线
+            .grayLine {
+                    position: absolute;
+                    top: 8%;
+                    left: 50%;
+                    width: 150.8rem;
+                    height: 1px;
+                    border: transparent;
+                    transform: translate(-50%);
+                    border-top: 1px solid rgba(151, 151, 151, 0.1);
+            }
+            // 一键联系
+            .areaItem_contact {
+                width: 11.2rem;
+                height: 4.5rem;
+                font-size: 1.8rem;
+
+                top: 38%;
+                right: 9.5rem;
+            }
+            // 分割线
+            .line1 {
+                top: 42%;
+            }
+            // 其他推荐标题
+            .supply_others {
+                width: 100%;
+                margin-top: 11.5rem;
+                // ul {
+                //     margin-top: 3rem;
+                //     // display: flex;
+                //     // flex-wrap: wrap;
+                //     li {
+                //         display: inline-block;
+                //         position: relative;
+                //         width: 71.9rem;
+                //         height: 18.8rem;
+                //         margin-bottom: 3rem;
+                //         padding: 2rem .9rem;
+                //         .supply_ul_li_title {
+                //             margin-left: -1rem;
+                //         }
+                //         .supply_ul_li_detail {
+                //             margin-top: 1rem;
+
+                //             display: flex;
+                //             justify-content: space-between;
+                //             .supply_ul_li_detail_imgs {
+                //                 display: flex;
+                //                 img {
+                //                     height: 7.2rem;
+                //                     width: 9.6rem;
+                //                     margin-left: 1rem;
+                //                     border-radius: .5rem;
+                //                 }
+                //             }
+                //             .supply_ul_li_detail_left {
+                //                 display: flex;
+                //                 flex-direction: column;
+                //                 .supply_ul_li_detail_left_time {
+                //                     margin-top: .8rem;
+                //                 }
+                //             }
+                //         }
+                //         .line2 {
+                //             width: 98%;
+                //             top: 75%;
+                //         }
+                //         .supply_ul_li_count {
+                //             margin-top: 2.4rem;
+                //         }
+                //         .contact1 {
+                //             padding: 0;
+                //             margin: 0;
+                //             width: 8.2rem;
+                //             height: 3.2rem;
+                //             top: 80%;
+                //             right: 2rem;
+                //             font-size: 1.6rem;
+                //         }
+                //     }
+                //     li:nth-child(2n-1) {
+                //         margin-right: 3rem;
+                //     }
+                // }
+            }
         }
     } 
 </style>

+ 117 - 0
Desktop/buwanjia/src/components/HomePage/Supply/SupplyAllInfo.vue

@@ -0,0 +1,117 @@
+<template>
+    <div class="supplyAllInfo">
+        <!-- <router-view></router-view> -->
+        <el-menu router mode="horizontal">
+            <el-menu-item 
+                :index="'/' + item.authname"
+                v-for="item in menulist"
+                :key="item.id"
+                >
+                <img src="../../../assets/images/UserHomepage/bedImg.png" alt="supplyAreaLogo">
+                <span>{{item.title}}</span>
+            </el-menu-item>
+        </el-menu>
+          <!-- // 断层 -->
+        <div class="fault">
+            <div class="fault1"></div>
+            <div class="fault2"></div>
+        </div>
+        <div class="supplyAllInfo_childRouter">
+            <router-view></router-view>
+        </div>
+    </div>
+</template>
+
+<script type='text/javascript'>
+    export default {
+        name: "SupplyInfo.vue",
+        data () {
+            return {
+                // 列表展示
+                menulist : [
+                    {id: 1, authname: 'userhomepage/supplyallinfo/findfabric', title: "寻找面料"},
+                    {id: 2, authname: 'userhomepage/supplyallinfo/fabricdesign', title: "面料设计"}, 
+                    {id: 3, authname: 'userhomepage/supplyallinfo/graphicdesign', title: "平面设计"},
+                    {id: 4, authname: 'userhomepage/supplyallinfo/productplanning', title: "产品策划"},
+                    {id: 5, authname: 'userhomepage/supplyallinfo/searchingachor', title: "寻找主播"},
+                    {id: 6, authname: 'userhomepage/supplyallinfo/photography', title: "摄影摄像"},
+                    {id: 7, authname: 'userhomepage/supplyallinfo/businesstraining', title: "商业培训"},
+                ],
+            }
+        }
+    }
+</script>
+
+<style lang='scss' scoped>
+    // 修改选中导航的样式
+    /deep/ .el-menu-item.is-active {
+        background: #F6F7F8 !important;
+        font-size: 2.1rem !important;
+        color: #000 !important;
+    }
+
+    // 自定义导航的样式
+    /deep/ .el-menu--horizontal>.el-menu-item {
+        height: 100%;
+        width: 11.6rem;
+        font-size: 1.8rem;
+        display: flex;
+        align-items: center;
+        border-radius: .5rem;
+        justify-content: center;
+    }
+    /deep/ .el-menu--horizontal.el-menu {
+        margin-top: 2.5rem;
+    }
+
+    .el-menu {
+        height: 13.9rem;
+        width: 146.8rem;
+        background-color: #F6F7F8;
+        border-radius: .5rem;
+        display: flex;
+        justify-content: space-around;
+
+        .el-menu-item {
+            margin-top: 0;
+            display: flex;
+            flex-direction: column;
+        }
+        img {
+            height: 6.2rem;
+            width: 6.2rem;
+            border-radius: 50%;
+            margin-top: 1.5rem;
+        }
+    }
+
+    // 断层
+    .fault {
+        background-color: #F6F7F8;
+        height: 7rem;
+        width: 100%;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        .fault1, .fault2 {
+            width: 100%;
+            background-color: #fff;
+            border-radius: 1rem;
+            height: 1rem;
+        }
+        .fault1 {
+            height: 3rem;
+            border-top-left-radius: 0;
+            border-top-right-radius: 0;
+        }
+        .fault2 {
+            border-bottom-left-radius: 0;
+            border-bottom-right-radius: 0;
+        }
+
+    }
+    .supplyAllInfo_childRouter {
+        height: 88.2rem;
+        width:100%
+    }
+</style>

+ 15 - 0
Desktop/buwanjia/src/components/HomePage/Supply/SupplyAllInfo/BusinessTraining.vue

@@ -0,0 +1,15 @@
+<template>
+    <div>
+        
+    </div>
+</template>
+
+<script type='text/javascript'>
+    export default {
+        name: "BusinessTraining.vue"
+    }
+</script>
+
+<style lang='scss' scoped>
+    
+</style>

+ 15 - 0
Desktop/buwanjia/src/components/HomePage/Supply/SupplyAllInfo/FabricDesign.vue

@@ -0,0 +1,15 @@
+<template>
+    <div>
+        
+    </div>
+</template>
+
+<script type='text/javascript'>
+    export default {
+        name: "FabricDesign"
+    }
+</script>
+
+<style lang='scss' scoped>
+    
+</style>

+ 21 - 0
Desktop/buwanjia/src/components/HomePage/Supply/SupplyAllInfo/FindFabric.vue

@@ -0,0 +1,21 @@
+<template>
+    <div class="findFabric">
+        <SupplyItem/>
+    </div>
+</template>
+
+<script type='text/javascript'>
+    import SupplyItem from '../../Supply/SupplyItem.vue'
+    export default {
+        name: "FindFabric",
+        components: {
+            SupplyItem,
+        }
+    }
+</script>
+
+<style lang='scss' scoped>
+    .findFabric {
+        height: 1000px;
+    }
+</style>

+ 15 - 0
Desktop/buwanjia/src/components/HomePage/Supply/SupplyAllInfo/GraphicDesign.vue

@@ -0,0 +1,15 @@
+<template>
+    <div>
+        
+    </div>
+</template>
+
+<script type='text/javascript'>
+    export default {
+        name: "GraphicDesign"
+    }
+</script>
+
+<style lang='scss' scoped>
+    
+</style>

+ 0 - 0
Desktop/buwanjia/src/components/HomePage/Supply/SupplyAllInfo/Photography.vue


+ 15 - 0
Desktop/buwanjia/src/components/HomePage/Supply/SupplyAllInfo/ProductPlanning.vue

@@ -0,0 +1,15 @@
+<template>
+    <div>
+        
+    </div>
+</template>
+
+<script type='text/javascript'>
+    export default {
+        name: "ProductPlanning"
+    }
+</script>
+
+<style lang='scss' scoped>
+    
+</style>

+ 15 - 0
Desktop/buwanjia/src/components/HomePage/Supply/SupplyAllInfo/SearchingAchor.vue

@@ -0,0 +1,15 @@
+<template>
+    <div>
+        
+    </div>
+</template>
+
+<script type='text/javascript'>
+    export default {
+        name: "SearchAchor"
+    }
+</script>
+
+<style lang='scss' scoped>
+    
+</style>

+ 13 - 0
Desktop/buwanjia/src/components/HomePage/Supply/SupplyConnecting.vue

@@ -0,0 +1,13 @@
+<template>
+<div></div>
+</template>
+
+<script type='text/javascript'>
+    export default {
+        name: "SupplyConnecting"
+    }
+</script>
+
+<style lang='scss' scoped>
+    
+</style>

+ 15 - 0
Desktop/buwanjia/src/components/HomePage/Supply/SupplyDemand.vue

@@ -0,0 +1,15 @@
+<template>
+    <div>
+        
+    </div>
+</template>
+
+<script type='text/javascript'>
+    export default {
+        name: "SupplyDemand"
+    }
+</script>
+
+<style lang='scss' scoped>
+    
+</style>

+ 91 - 0
Desktop/buwanjia/src/components/HomePage/Supply/SupplyItem.vue

@@ -0,0 +1,91 @@
+<template>
+    <ul class="supply_others_ul">
+        <li v-for="(item,index) in 18" :key="index" class="supply_others_ul_li">
+            <p class="supply_ul_li_title"><span>【窗帘布】</span>各位老板看下有以下面料的联系我</p>
+            <div class="supply_ul_li_detail">
+                <div class="supply_ul_li_detail_left">
+                    <p>各位老板看下有以下面料的联系我高价收!</p>
+                    <span>手机电话: 15257294120</span>
+                    <span class="supply_ul_li_detail_left_time">2021-11-10 14:23:34</span>
+                </div>
+                <div class="supply_ul_li_detail_imgs">
+                    <img src="../../../assets/images/UserHomepage/bedImg.png" alt="prodImg">
+                    <img src="../../../assets/images/UserHomepage/bedImg.png" alt="prodImg">
+                    <img src="../../../assets/images/UserHomepage/bedImg.png" alt="prodImg">
+                </div>
+            </div>
+            <div class="line2 grayLine"></div>
+            <p class="supply_ul_li_count">
+                <span>浏览次数: 286次 </span>&nbsp;
+                <span>意向沟通人数: 125人</span>
+            </p>
+            <el-button class="contact1 areaItem_contact">一键联系</el-button>
+        </li>
+    </ul> 
+</template>
+
+<script type='text/javascript'>
+    export default {
+        name: "SupplyItem"
+    }
+</script>
+
+<style lang='scss' scoped>
+    ul {
+        margin-top: 3rem;
+        // display: flex;
+        // flex-wrap: wrap;
+        li {
+            display: inline-block;
+            position: relative;
+            width: 71.9rem;
+            height: 18.8rem;
+            margin-bottom: 3rem;
+            padding: 2rem .9rem;
+            .supply_ul_li_title {
+                margin-left: -1rem;
+            }
+            .supply_ul_li_detail {
+                margin-top: 1rem;
+
+                display: flex;
+                justify-content: space-between;
+                .supply_ul_li_detail_imgs {
+                    display: flex;
+                    img {
+                        height: 7.2rem;
+                        width: 9.6rem;
+                        margin-left: 1rem;
+                        border-radius: .5rem;
+                    }
+                }
+                .supply_ul_li_detail_left {
+                    display: flex;
+                    flex-direction: column;
+                    .supply_ul_li_detail_left_time {
+                        margin-top: .8rem;
+                    }
+                }
+            }
+            .line2 {
+                width: 98%;
+                top: 75%;
+            }
+            .supply_ul_li_count {
+                margin-top: 2.4rem;
+            }
+            .contact1 {
+                padding: 0;
+                margin: 0;
+                width: 8.2rem;
+                height: 3.2rem;
+                top: 80%;
+                right: 2rem;
+                font-size: 1.6rem;
+            }
+        }
+        li:nth-child(2n-1) {
+            margin-right: 3rem;
+        }
+    }
+</style>

+ 82 - 0
Desktop/buwanjia/src/components/HomePage/Supply/SupplySquare.vue

@@ -0,0 +1,82 @@
+<template>
+    <div class="supplySquare">
+        <AccountCenterTop/>
+        <div class="supplySquare_main1">
+            <divTitle h_title="供应广场"/>
+            <el-menu router mode="horizontal">
+                <el-menu-item 
+                    :index="'/' + item.authname"
+                    v-for="item in menulist"
+                    :key="item.id"
+                    >{{item.title}}</el-menu-item>
+            </el-menu>
+            <!-- 占位符 -->
+            <router-view></router-view>
+        </div>
+        <SystemLoginCopyBottom bgc_blue="background: #4DC2D4"/>
+    </div>
+</template>
+
+<script type='text/javascript'>
+    import AccountCenterTop from "../../../commonCmp/AccountCenter/AccountCenterTop.vue"
+    import SystemLoginCopyBottom from "../../../commonCmp/WesiteInherentInfo/SystemLoginCopyBottom.vue"
+    import divTitle from "../../../commonCmp/AccountCenter/divTitle.vue"
+
+    export default {
+        name: "SupplySquare",
+        components: {
+            divTitle,
+            AccountCenterTop,
+            SystemLoginCopyBottom
+        },
+        data() {
+            return {
+                // 列表展示
+                menulist : [
+                    {id: 1, authname: 'userhomepage/supplyallinfo', title: "所有信息"},
+                    {id: 2, authname: 'userhomepage/supplyconnecting', title: "正在对接"}, 
+                    {id: 3, authname: 'userhomepage/supplydemand', title: "我的需求"}, 
+                ],
+            }
+        },
+        methods: {
+
+        }
+    }
+</script>
+
+<style lang='scss' scoped>
+    // 修改选中导航的样式
+    /deep/ .el-menu-item.is-active {
+        background: #4CBECF !important;
+        font-size: 2.1rem !important;
+        color: white !important;
+    }
+    // 自定义导航的样式
+    /deep/ .el-menu--horizontal>.el-menu-item {
+        height: 4rem;
+        width: 11.6rem;
+        font-size: 1.8rem;
+        display: flex;
+        align-items: center;
+        border-radius: .5rem;
+        justify-content: center;
+    }
+    /deep/ .el-menu--horizontal.el-menu {
+        margin: 0 5rem;
+        width: 146.8rem;
+    }
+    .supplySquare {
+        position: relative;
+        height: 152rem;
+    }
+    .supplySquare_main1 {
+        margin: 2.5rem 17.6rem 0 17.6rem;
+        background: #fff;
+        .el-menu {
+            padding: 0 5rem;
+            margin-top: 3.2rem;
+            border-bottom: 2px solid #4CBECF;
+        }
+    }
+</style>

+ 3 - 3
Desktop/buwanjia/src/components/HomePage/UserHomePage.vue

@@ -21,7 +21,7 @@
                     <!-- 通告区域 -->
                     <Circular/>
                     <!-- 最新供需 -->
-                    <SupplySquare/>
+                    <LastSupply/>
                 </el-aside>
                 <!-- 右边 -->
                 <el-main>
@@ -54,7 +54,7 @@
     import AccountCenterTop from '../../commonCmp/AccountCenter/AccountCenterTop.vue'
     import MyApps from "../../progressCmp/UserHomepage/MyApps.vue"
     import Circular from "../../progressCmp/UserHomepage/Circular.vue"
-    import SupplySquare from '../../progressCmp/UserHomepage/SupplySquare.vue'
+    import LastSupply from '../../progressCmp/UserHomepage/LastSupply.vue'
     import SystemNotice from "../../progressCmp/UserHomepage/SystemNotice.vue"
     import LastChatting from "../../progressCmp/UserHomepage/LastChatting.vue"
     import PartnerAgents from "../../progressCmp/UserHomepage/PartnerAgents.vue"
@@ -66,7 +66,7 @@
             AccountCenterTop, 
             MyApps, 
             Circular, 
-            SupplySquare, 
+            LastSupply, 
             SystemNotice,
             LastChatting,
             PartnerAgents,

+ 36 - 2
Desktop/buwanjia/src/components/SystemLogin/SelectAccount.vue

@@ -17,7 +17,9 @@
                             v-for="(item, index) in accountList"
                             :key="index" @click="selectAccount(item)">
 <!--                        当前身份头像or LOGO-->
-                        <img src="../../assets/images/SystemLogin/demoAvatar.png" alt="avatar" class="list_i_avatar">
+                        <img :src="urlArr[index] ?  urlArr[index] : require('../../assets/images/SystemLogin/demoAvatar.png')" 
+                            alt="avatar" 
+                            class="list_i_avatar">
 <!--                        当前身份的昵称-->
                         <span class="list_i_name">{{item.fname}}</span>
 <!--                        当前身份的职位-->
@@ -42,24 +44,56 @@
         data() {
             return {
                 //    当前账号的所有角色
-                accountList: []
+                accountList: [],
+
+                // 头像url的数组
+                urlArr: []
             }
 
         },
         created() {
             //获取当前所有角色
             this.getAccountList();
+
         },
         methods: {
             // 获取当前所有角色的方法
             getAccountList() {
                 this.accountList = this.$store.state.account_list
+                this.accountList.forEach( async (item) => {
+                    const res = await this.$http.post("", this.getFullItfUserAvatar(item))
+                    if (res.status >= 300 && res.status < 200) return;
+                    const {data: {data}} = res;
+                    if (data.length === 0) {
+                        this.urlArr.push("");
+                        return;
+                    }
+                    this.urlArr.push(data[0].fobsurl)
+                })
+            },
+            // 获取所有的身份的头像的数组
+            getUrlArr() {
+                console.log(this.accountList);
+
             },
             // 选择当前的角色传给用户主页当面展示的角色的数据
             selectAccount(value) {
                 console.log(value)
                 this.$store.commit('selectAccount', value);
                 this.$router.push('userhomepage')
+            },
+
+
+            // 请求头像请求体
+            getFullItfUserAvatar(item) {
+                this.$store.commit("getfUserAvatarAgentLogo", {
+                    ownertable: "tenterprise_users",
+                    ownerid: item.userid,
+                })
+                const interfaceType = this.$store.state.interfaceData;
+                interfaceType.accesstoken = item.token;
+
+                return interfaceType;
             }
         }
     }

+ 1 - 20
Desktop/buwanjia/src/progressCmp/UserHomepage/AreaItem.vue

@@ -80,25 +80,6 @@
                 }
             }
         }
-
-        // 一键联系
-        .areaItem_contact {
-            position:absolute;
-            bottom: 0;
-            right: 0;
-            height: 3.2rem;
-            width: 8.2rem;
-            margin: 1rem;
-
-            font-size: 16px;
-            font-weight: 500;
-            color: #FFFFFF;
-            background: linear-gradient(180deg, #83E0E9 0%, #4CBECF 100%);
-            text-shadow: 0px 0px 6px rgba(0, 0, 0, 0.1);
-
-            display: flex;
-            justify-content: center;
-            align-items: center;
-        }
+        
     }
 </style>

+ 22 - 19
Desktop/buwanjia/src/progressCmp/UserHomepage/SupplySquare.vue → Desktop/buwanjia/src/progressCmp/UserHomepage/LastSupply.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="supplySquare">
+    <div class="lastSupply">
         <divTitle h_title="最新供需"/>
         <span class="areaMore" @click="jumpSupply">更多</span>
         <div class="supplySquare_main">
@@ -30,9 +30,9 @@
 
 <script type='text/javascript'>
     import divTitle from '../../commonCmp/AccountCenter/divTitle.vue'
-    import AreaItem from '../../progressCmp/UserHomepage/AreaItem.vue'
+    import AreaItem from './AreaItem.vue'
     export default {
-        name:  "SupplySquare",
+        name:  "LastSupply",
         components: {
             divTitle,
             AreaItem
@@ -63,23 +63,26 @@
 </script>
 
 <style lang='scss' scoped>
-    // 把导航基本样式去除
-    /deep/ .el-menu.el-menu--horizontal {
-        border: none;
-    }
-    /deep/ .el-menu--horizontal>.el-menu-item.is-active {
-        background-color: #4DC2D4 !important;
-        border: transparent;
-        color: white !important;
-    }
-    /deep/ .el-menu--horizontal>.el-menu-item.is-active:hover {
-        background-color: #4DC2D4;
-    }
-    /deep/ .el-carousel__indicator--horizontal {
-        display: none;
+    .lastSupply {
+            // 把导航基本样式去除
+        /deep/ .el-menu.el-menu--horizontal {
+            border: none;
+        }
+        /deep/ .el-menu--horizontal>.el-menu-item.is-active {
+            background-color: #4DC2D4 !important;
+            border: transparent;
+            color: white !important;
+        }
+        /deep/ .el-menu--horizontal>.el-menu-item.is-active:hover {
+            background-color: #4DC2D4;
+        }
+        /deep/ .el-carousel__indicator--horizontal {
+            display: none;
+        }
     }
 
-    .supplySquare {
+
+    .lastSupply {
         position: relative;
         width: 100%;
         height: 137.7rem;
@@ -87,7 +90,7 @@
     }
 
     // 供需主体样式
-    .supplySquare_main {
+    .lastSupply_main {
         width: 100%;
         height: 330px;
         margin-top: 2rem;

+ 6 - 1
Desktop/buwanjia/src/progressCmp/UserHomepage/MyApps.vue

@@ -18,7 +18,7 @@
                 <img src="../../assets/images/SystemLogin/demoAvatar.png" alt="">
                 <span class="myApps_ul_li_type">私域直播</span>
             </li>
-            <li class="myApps_ul_li">
+            <li class="myApps_ul_li" @click="jumpSupplySquare">
                 <img src="../../assets/images/SystemLogin/demoAvatar.png" alt="">
                 <span class="myApps_ul_li_type">供需广场</span>
             </li>
@@ -36,6 +36,11 @@
         name: "MyApps",
         components: {
             divTitle
+        },
+        methods: {
+            jumpSupplySquare() {
+                this.$router.push("userhomepage/supplysquare");
+            }
         }
     }
 </script>

+ 45 - 10
Desktop/buwanjia/src/router/index.js

@@ -16,6 +16,18 @@ import PartnerAgents from '../components/AccountCenter/PartnerAgents'
 import TeamManagement from '../components/AccountCenter/TeamManagement'
 import MemberEditor from "../progressCmp/AccountCenter/MemberEditor"
 import Supply from "../components/HomePage/Supply/Supply.vue"
+import SupplySquare from "../components/HomePage/Supply/SupplySquare.vue"
+import SupplyAllInfo from "../components/HomePage/Supply/SupplyAllInfo.vue"
+import SupplyConnecting from "../components/HomePage/Supply/SupplyConnecting.vue"
+import SupplyDemand from "../components/HomePage/Supply/SupplyDemand.vue"
+import BusinessTraining from "../components/HomePage/Supply/SupplyAllInfo/BusinessTraining.vue"
+import FabricDesign from "../components/HomePage/Supply/SupplyAllInfo/FabricDesign.vue"
+import GraphicDesign from "../components/HomePage/Supply/SupplyAllInfo/GraphicDesign.vue"
+import FindFabric from "../components/HomePage/Supply/SupplyAllInfo/FindFabric.vue"
+import Photography from "../components/HomePage/Supply/SupplyAllInfo/Photography.vue"
+import ProductPlanning from "../components/HomePage/Supply/SupplyAllInfo/ProductPlanning.vue"
+import SearchingAchor from "../components/HomePage/Supply/SupplyAllInfo/SearchingAchor.vue"
+
 // 将VueRouter挂载到Vue当中去
 Vue.use(VueRouter)
 
@@ -29,20 +41,43 @@ const router = new VueRouter({
         { path: "/selectaccount", component: SelectAccount },
         { path: "/userlogin", component: UserLogin },
         { path: "/agentlogin", component: AgentLogin },
-        { path: "/userhomepage", component: UserHomePage,},
-        { path: "/userhomepage/supply", component: Supply},
+        { path: "/userhomepage", component: UserHomePage },
+        { path: "/userhomepage/supply", component: Supply },
+        { 
+            path: "/userhomepage/supplysquare", 
+            component: SupplySquare,
+            redirect: "/userhomepage/supplyallinfo",
+            children: [
+                { 
+                    path: "/userhomepage/supplyallinfo", 
+                    component: SupplyAllInfo,
+                    redirect: "/userhomepage/supplyallinfo/businesstraining",
+                    children: [
+                        { path: "/userhomepage/supplyallinfo/findfabric", component: FindFabric },
+                        { path: "/userhomepage/supplyallinfo/fabricdesign", component: FabricDesign },
+                        { path: "/userhomepage/supplyallinfo/graphicdesign", component: GraphicDesign },
+                        { path: "/userhomepage/supplyallinfo/productplanning", component: ProductPlanning },
+                        { path: "/userhomepage/supplyallinfo/searchingachor", component: SearchingAchor },
+                        { path: "/userhomepage/supplyallinfo/photography", component: Photography },
+                        { path: "/userhomepage/supplyallinfo/businesstraining", component: BusinessTraining },
+
+                    ] 
+                },
+                { path: "/userhomepage/supplyconnecting", component: SupplyConnecting },
+                { path: "/userhomepage/supplydemand", component: SupplyDemand },
+            ]
+        },
         { 
             path: "/accountcenter", 
             component: AccountCenter, 
-            redirect: '/userinfo',
+            redirect: '/accountcenter/userinfo',
             children: [
-                { path: "/userinfo", component: UserInfo },
-                { path: '/agentmanagement', component: AgentManagement },
-                { path: '/productmanagement', component: ProductManagement },
-                { path: "/productmanagement/producteditor/:id", component: ProductEditor },
-                { path: '/partneragents', component: PartnerAgents },
-                { path: '/teammanagement', component: TeamManagement },
-                { path: "/teammanagement/membereditor", component: MemberEditor}
+                { path: "/accountcenter/userinfo", component: UserInfo },
+                { path: '/accountcenter/agentmanagement', component: AgentManagement },
+                { path: '/accountcenter/productmanagement', component: ProductManagement },
+                { path: '/accountcenter/partneragents', component: PartnerAgents },
+                { path: '/accountcenter/teammanagement', component: TeamManagement },
+                { path: "/accountcenter/teammanagement/membereditor", component: MemberEditor}
             ]
         }
     ]

+ 16 - 0
Desktop/buwanjia/src/store/mutations.js

@@ -21,5 +21,21 @@ export const getTokenInterfaceBaseType = ({interfaceData, selectAccount}, interf
     interfaceData.accesstoken = selectAccount.token;
     interfaceData.classname = classname;
     interfaceData.method = method;
+    return interfaceData;
+}
+
+
+// 附件品牌logo和个人头像查询
+export const getfUserAvatarAgentLogo = ({interfaceData, selectAccount}, content) => {
+    const {ownertable, ownerid} = content;
+    interfaceData.accesstoken = selectAccount.token;
+    interfaceData.classname = "system.system.docManage",
+    interfaceData.method = "queryDoc"
+    interfaceData.content = {
+        getdatafromdbanyway: true,
+        ownertable,
+        ownerid
+    }
+
     return interfaceData;
 }