供应商

src/main/resources/static/css/supplier-center/operation/list.css

@@ -62,6 +62,7 @@ li{list-style:none}
     .container .section .list .td.td-9 a{margin: 0 5px;}
     .container .section .list .td.td-9 .upd{color: #1890f9;}
     .container .section .list .td.td-9 .del{color: #f94b4b;}
+    input::placeholder{color: #9aa5b5}
 }
 
 /**

src/main/resources/static/js/base.js

@@ -509,6 +509,7 @@ function setProductPrice(productList, productIds, userId, callback){
             productList.map(function(product){
                 priceList.map(function(item){
                     if(product.id*1 === item.productId){
+                        product.supplierId = item.supplierId;
                         product.userIdentity = item.userIdentity;
                         product.price = item.price;
                         product.priceLoaded = true;

src/main/resources/static/js/supplier-center/operation/list.js

@@ -4,7 +4,6 @@ var operationPage = new Vue({
     data: {
         isRequset:true,
         noMore: false,
-        userId: 0,
         StatusList:[
             {value:0,name:'所有'},
             {value:1,name:'已提交'},
@@ -103,6 +102,7 @@ var operationPage = new Vue({
                     }else{
                         _self.operationList = [];
                         _self.operationList = data.results;
+                         _self.listRecord = data.totalRecord;
                     }
                     _self.isRequset = false;
                 }else{
@@ -171,9 +171,8 @@ var operationPage = new Vue({
     },
     mounted: function () {
         if(globalUserData){
-            this.userId = globalUserData.userId;
+            this.listQuery.userID = globalUserData.userId;
             this.listQuery.orderState = CAIMEI.getUrlParam('state');
-            this.listQuery.userId = this.userId;
             this.GetQueryListData();
         }
         console.log(this.listQuery.orderState)

src/main/resources/static/js/supplier-center/order/settlement.js

@@ -7,7 +7,7 @@ var settlement = new Vue({
             pageNum: 1,
             pageSize: 10,
             shopOrderNo:'',
-            userName: '',
+            name: '',
             payStatus:'',
         },
         list:[],
@@ -57,7 +57,7 @@ var settlement = new Vue({
                         _this.list = res.data.results;
                         _this.listRecord = res.data.totalRecord;
                     }else {
-                        _this.results = res.data.results;
+                        _this.list = res.data.results;
                         _this.listRecord = res.data.totalRecord;
                     }
                     _this.requestFlag = true;

src/main/resources/templates/supplier-center/operation/list.html

@@ -77,7 +77,7 @@
                             </div>
                         </div>
                     </div>
-                    <div class="section" v-if="operationList.length > 0&& !isPC">
+                    <div class="section" v-else-if="operationList.length > 0&& !isPC">
                             <div class="list"  v-for="(item, index) in operationList" :key="index">
                                   <div class="list-one">
                                       <span>姓名：<p>{{item.linkName}}</p></span>
@@ -101,7 +101,7 @@
                                   </div>
                             </div>
                     </div>
-                    <div v-else class="empty">
+                    <div class="empty" v-else>
                         <img src="/img/common/empty.png">
                         <div class="msg"><p>暂无数据</p></div>
                     </div>

src/main/resources/templates/supplier-center/order/settlement.html

@@ -26,7 +26,7 @@
                 <div class="head-top">
                     <form action="">
                         <div class='order-border'><span>订单编号：</span><input type="text" class="Buyer" v-model="params.shopOrderNo"  placeholder="请输入订单编号"> </div>
-                        <div class='order-border'><span>买家名称：</span><input type="text" class="Buyer" v-model="params.userName"  placeholder="请输入买家名称"> </div>
+                        <div class='order-border'><span>买家名称：</span><input type="text" class="Buyer" v-model="params.name"  placeholder="请输入买家名称"> </div>
                         <div>
                             结算状态：
                             <select name="" id="settlement-status" class="state" @change="getstatus($event)">
@@ -41,7 +41,7 @@
                             </div>
                     </form>
                 </div>
-                <div class="main-content" v-if="isPC">
+                <div class="main-content" v-if="isPC && list.length>0">
                     <ul class="main-title">
                         <li class="samewidth">订单编号</li>
                         <li class="samewidth">下单时间</li>
@@ -51,7 +51,7 @@
                         <li>总结算金额</li>
                         <li>已结算金额</li>
                     </ul>
-                    <div class="mentlist" v-if="list.length>0">
+                    <div class="mentlist" >
                      <div v-for="res in list">
                         <ul v-for="item in res.orderProductList">
                             <li class="samewidth"><a :href="'/supplier/order/detail.html?shopOrderID='+res.shopOrderID">{{item.shopOrderNo}}</a></li>
@@ -68,11 +68,11 @@
                         </ul>
                         </div>
                     </div>
-                    <div v-else class="air">
-                        <img src="/img/order/air.png"/>
-                    </div>
                 </div>
-
+                <div v-else class="empty">
+                    <img src="/img/order/air.png"/>
+                    <div class="msg"><p>暂无数据</p></div>
+                 </div>
                      <template class="main-content" v-else>
                         <div class="content-list"v-for="res in list">
                             <div v-for="item in res.orderProductList" class="list">

src/main/resources/templates/supplier/index.html

@@ -117,12 +117,12 @@
                                         </template>
                                         <template v-else>
                                             <template v-if="p.priceFlag==0 || p.userIdentity==2 || (p.userIdentity==3 && p.supplierId==GLOBAL_SHOP_ID)">
-                                                <em class="p" v-text="'￥'+parseFloat(p.price).toFixed(2)"></em>
+                                                <em class="p" v-text="'￥'+parseFloat(p.price).toFixed(2)" ></em>
                                                 <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                             </template>
                                             <template v-else-if="p.priceFlag==2 && p.userIdentity!=2">
                                                 <em>￥会员可见</em>
-                                                <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
+                                                <span class="listTag" v-if="p.actStatus==1" >{{p.promotions.name}}</span>
                                                 <div class="btnBox">
                                                     <a href="/upgrade.html" class="btn">升级会员查看价格</a>
                                                 </div>