首页供应商显示修复！

src/main/resources/static/css/index/index-pc.css

@@ -567,7 +567,7 @@ li{list-style:none;}
     height: 27px;
 }
 .section-content-userbottom .userbottom-column-a .column-item p{
-    font-size: 14px;
+    font-size: 12px;
     line-height: 22px;
     text-align: left;
     color: #666666;

src/main/resources/static/js/index.js

@@ -29,6 +29,7 @@ var homeData = new Vue({
         waitShipmentsCount:0,//待发货
         shipmentsCount:0,//已发货
         salesReturnCount:0,//退货/款
+        shopOrderCount:0,//供应商订单总数
         listQuery:{
             orderNo:'',
             orderState:0,
@@ -38,6 +39,20 @@ var homeData = new Vue({
             pageNum:1,
             pageSize:1
         },
+        shopOrderQuery:{
+            shopId:'',
+            pageNum: 1,
+            pageSize: 10,
+            sendOutStatus: '',//发货状态
+            payStatus:'',//结算状态
+            shopOrderNo:'',//订单编号
+            receiver: '',//收货人
+            receiptStatus:'', // 子订单收款状态
+            refundStatus:'', // 子订单退款状态
+            source:'',
+            organizeId:'',// 订单来源 0 采美 4 丽格
+        },
+
         orders:null,
         categories:[],
         isMenuHovered:false,
@@ -99,6 +114,29 @@ var homeData = new Vue({
                 }
             })
         },
+        getShopInfo(userId){
+            const _self = this;
+            SupplierApi.homePageData({userId:userId,productOrganize:0},function (response) {
+                if(response.code === 0){
+                    var data = response.data;
+                    _self.userInfo = data.user;
+                }
+            })
+        },
+        getShopOrderList(params){
+            const _self = this;
+            SupplierApi.shopOrderList(params,function (response) {
+                if(response.code === 0){
+                    const data = response.data;
+                    if(data.list && data.list.length>0) {
+                        _self.orders = data.list[0].orderProductList[0];
+                        _self.shopOrderCount = data.total
+                    }else{
+                        _self.orders = null;
+                    }
+                }
+            })
+        },
         handleHidePopup(){
             this.isCmPopup = false
         },
@@ -545,9 +583,15 @@ var homeData = new Vue({
 
         if(globalUserData){
             this.userId = this.listQuery.userId = globalUserData.userId;
-            this.GetMyPcCenterInfo(this.userId)
-            this.GetQueryOrderNum(this.userId)
-            this.getOrderList(this.listQuery)
+            if(globalUserData.userIdentity === 3){
+                this.shopOrderQuery.shopId = globalUserData.shopId
+                this.getShopInfo(this.userId)
+                this.getShopOrderList(this.shopOrderQuery)
+            }else{
+                this.GetMyPcCenterInfo(this.userId)
+                this.GetQueryOrderNum(this.userId)
+                this.getOrderList(this.listQuery)
+            }
         }
     },
     computed: {

src/main/resources/templates/index.html

@@ -184,7 +184,7 @@
                                                         <h1 v-text="userInfo.name"></h1>
                                                     </div>
                                                 </div>
-                                                <div class="user-column-c">
+                                                <div class="user-column-c" v-if="GLOBAL_USER_IDENTITY !== 3">
                                                     <div class="column-c-item">
                                                         <h1 v-text="paymentCount"></h1>
                                                         <p>待付款</p>
@@ -202,6 +202,12 @@
                                                         <p>退货/款</p>
                                                     </div>
                                                 </div>
+                                                <div class="user-column-c" v-if="GLOBAL_USER_IDENTITY === 3">
+                                                    <a class="column-c-item" href="/supplier/order/list.html?state=0">
+                                                        <h1 v-text="shopOrderCount"></h1>
+                                                        <p>全部订单</p>
+                                                    </a>
+                                                </div>
                                                 <div class="user-column-d">
                                                     <template v-if="orders">
                                                         <a :href="`/user/order/detail.html?shopOrderId=${orders.shopOrderId}`"
@@ -247,32 +253,62 @@
                                         <div class="section-content-userbottom">
                                             <template v-if="userId > 0">
                                                 <!-- 登录后 -->
-                                                <div class="userbottom-column-a">
-                                                    <a class="column-item" href="/shopping/cart.html" target="_blank">
-                                                        <img src="/img/base/icon-column-1@2x.png" alt="">
-                                                        <p>购物车</p>
-                                                    </a>
-                                                    <a class="column-item" href="/user/collection.html" target="_blank">
-                                                        <img src="/img/base/icon-column-2@2x.png" alt="">
-                                                        <p>收藏夹</p>
-                                                    </a>
-                                                    <a class="column-item" href="/user/message/list.html" target="_blank">
-                                                        <img src="/img/base/icon-column-3@2x.png" alt="">
-                                                        <p>我的消息</p>
-                                                    </a>
-                                                </div>
-                                                <div class="userbottom-column-b">
-                                                    <a class="column-item plus" href="/user/member.html" target="_blank">
-                                                        <h1>PLUS会员</h1>
-                                                        <p>权益升级</p>
-                                                        <span>立即开通></span>
-                                                    </a>
-                                                    <a class="column-item coupon" href="/user/coupon.html" target="_blank">
-                                                        <h1>优惠券</h1>
-                                                        <p>会员专享</p>
-                                                        <span>立即领取></span>
-                                                    </a>
-                                                </div>
+                                                <template v-if="GLOBAL_USER_IDENTITY === 3">
+                                                    <div class="userbottom-column-a">
+                                                        <a class="column-item" :href="`/supplier-${shopOrderQuery.shopId}.html`" target="_blank">
+                                                            <img src="/img/base/icon-column-4@2x.png" alt="">
+                                                            <p>我的店铺</p>
+                                                        </a>
+                                                        <a class="column-item" href="/supplier/goods.html" target="_blank">
+                                                            <img src="/img/base/icon-column-5@2x.png" alt="">
+                                                            <p>我的商品</p>
+                                                        </a>
+                                                        <a class="column-item" href="/supplier/message/list.html" target="_blank">
+                                                            <img src="/img/base/icon-column-6@2x.png" alt="">
+                                                            <p>我的消息</p>
+                                                        </a>
+                                                    </div>
+                                                    <div class="userbottom-column-b">
+                                                        <a class="column-item plus" href="/supplier/task.html" target="_blank">
+                                                            <h1>推广中心</h1>
+                                                            <p>专属推广</p>
+                                                            <span>立即查看></span>
+                                                        </a>
+                                                        <a class="column-item coupon" href="/supplier/attraction.html" target="_blank">
+                                                            <h1>美业参谋</h1>
+                                                            <p>会员专享</p>
+                                                            <span>立即领取></span>
+                                                        </a>
+                                                    </div>
+                                                </template>
+                                                <template v-else>
+                                                    <div class="userbottom-column-a">
+                                                        <a class="column-item" href="/shopping/cart.html" target="_blank">
+                                                            <img src="/img/base/icon-column-1@2x.png" alt="">
+                                                            <p>购物车</p>
+                                                        </a>
+                                                        <a class="column-item" href="/user/collection.html" target="_blank">
+                                                            <img src="/img/base/icon-column-2@2x.png" alt="">
+                                                            <p>收藏夹</p>
+                                                        </a>
+                                                        <a class="column-item" href="/user/message/list.html" target="_blank">
+                                                            <img src="/img/base/icon-column-3@2x.png" alt="">
+                                                            <p>我的消息</p>
+                                                        </a>
+                                                    </div>
+                                                    <div class="userbottom-column-b">
+                                                        <a class="column-item plus" href="/user/member.html" target="_blank">
+                                                            <h1>PLUS会员</h1>
+                                                            <p>权益升级</p>
+                                                            <span>立即开通></span>
+                                                        </a>
+                                                        <a class="column-item coupon" href="/user/coupon.html" target="_blank">
+                                                            <h1>优惠券</h1>
+                                                            <p>会员专享</p>
+                                                            <span>立即领取></span>
+                                                        </a>
+                                                    </div>
+                                                </template>
                                             </template>
                                             <template v-else>
                                                 <!-- 登录前 -->
@@ -1003,6 +1039,7 @@
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/user.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript"
         th:src="@{/js/common/serviceapi/order.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript"
         th:src="@{/js/common/serviceapi/beautyArchive.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/mixins/cmsMixins.js(v=${version})}"></script>