add

src/main/resources/static/css/product/instruement-list.css

@@ -73,7 +73,7 @@
     }
     .list-container ul li.productItem {
         width: 184px;
-        height: 288px;
+        height: 268px;
         float: left;
         background: #fff;
         position: relative;
@@ -83,11 +83,12 @@
     }
     .list-container ul li img {
         width: 100%;
-        height: 184px;
+        height: 164px;
     }
     .list-container ul li .name{
         display: block;
-        padding: 0 16px;
+        padding: 0 8px;
+        margin-top: 8px;
         height: 40px;
         line-height: 21px;
         vertical-align: middle;
@@ -100,6 +101,10 @@
     }
     .productItem .price{
         border: 0;
+        box-sizing: border-box;
+        padding: 0 8px;
+        height: 54px;
+        width: 100%;
     }
     .productItem .price .icon:before{
         width: 63px;
@@ -140,6 +145,10 @@
     }
     .productItem .price em{font-weight: normal}
     .productItem .price em.bold{font-weight: bold}
+    .productItem .price .price_text_tag{width: 100%;height: 22px;box-sizing: border-box;float: left;margin-top: 3px;}
+    .productItem .price .price_text_tag .listTag{margin: 0;float: left}
+    .productItem .price .main_price_unde { width: 100%;height: 31px;line-height: 31px;font-size: 14px;color: #4a4f58;text-align: left;float: left;}
+    .productItem .price .main_price_show { width: 100%;height: 30px;line-height: 30px;font-size: 14px;color: #f94b4b;text-align: left;float: left;}
 }
 
 

src/main/resources/static/js/product/produce-list.js

@@ -28,6 +28,11 @@ var productList = new Vue({
             pageNum: 1,
             idType:1
         },
+    },
+     filters:{
+         NumFormat:function(value) {//处理金额
+            return Number(value).toFixed(2);
+        },
     },
     computed: {
         pageTotal: function () {
@@ -79,7 +84,6 @@ var productList = new Vue({
                         }else{
                             _self.listData = _self.listData.concat(resultData);
                         }
-
                         _self.listLoading = false;
                         _self.requestFlag = true;
                }else {

src/main/resources/templates/product/instruelist.html

@@ -86,26 +86,40 @@
                                 <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                     <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
                                     <template v-if="p.priceFlag==1">
-                                        <em>￥价格未公开</em>
+                                       <div class="price_text_tag">
+                                            <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                        </div>
+                                        <div class="main_price_unde">￥价格未公开</div>
                                     </template>
                                     <template v-else>
                                         <template v-if="(p.priceFlag==0 && p.userIdentity!=3) || p.userIdentity==2 || (p.userIdentity==3 && p.supplierId==GLOBAL_SHOP_ID)">
-                                            <em class="p" v-text="'￥'+parseFloat(p.price).toFixed(2)"></em>
-                                            <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
+                                           <div class="price_text_tag">
+                                                <p class="listTag" v-if="p.actStatus==1">
+                                                    {{p.promotions.name}}
+                                                    <span v-if="p.priceFlag != 1">:￥{{p.promotions.retailPrice | NumFormat}}</span>
+                                                </p>
+                                            </div>
+                                            <div class="main_price_show" v-text="'￥'+parseFloat(p.price).toFixed(2)"></div>
                                         </template>
                                         <template v-else-if="p.priceFlag==2 && p.userIdentity==4">
-                                            <em>￥会员可见</em>
-                                            <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
+                                             <div class="price_text_tag">
+                                                <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                            </div>
+                                            <div class="main_price_unde">￥会员可见</div>
                                         </template>
                                         <template v-else>
-                                            <em class="bold">￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
-                                            <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
+                                         <div class="price_text_tag">
+                                            <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                        </div>
+                                        <div class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
                                         </template>
                                     </template>
                                 </template>
                                 <template v-else>
-                                    <em class="bold">￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
-                                    <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
+                                     <div class="price_text_tag">
+                                            <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                      </div>
+                                      <div class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
                                 </template>
                             </div>
                         </a>