修改部分样式

src/components/IntegralMall/OrderdetailsCompleted.vue

@@ -169,7 +169,7 @@
             </div>
             <div class="Order_Top_right">
                 <div class="Submit_Orders">
-                    <i class="iconfont icon-order_icon" v-if="dataList.orderStatus==1"/>
+                    <i class="iconfont icon-order_icon" v-if="dataList.orderStatus==1||dataList.orderStatus==2||dataList.orderStatus==3||dataList.orderStatus==4"/>
                     <i class="iconfont icon-order_icon" v-else style="color:gray"/>
                       待处理
                 </div>
@@ -177,7 +177,7 @@
                   <img src="../../assets/img/orderLins.png" alt=""/>
                 </div>
                 <div class="Submit_Orders">
-                    <i class="iconfont icon-xunhuan" v-if="dataList.orderStatus==2"/>
+                    <i class="iconfont icon-xunhuan" v-if="dataList.orderStatus==2||dataList.orderStatus==3||dataList.orderStatus==4"/>
                     <i class="iconfont icon-xunhuan" v-else style="color:gray"/>
                       待配送
                 </div>
@@ -185,7 +185,7 @@
                   <img src="../../assets/img/orderLins.png" alt=""/>
                 </div>
                 <div class="Submit_Orders">
-                    <i class="iconfont icon-gerenzhongxindingdandaishouhuo" v-if="dataList.orderStatus==3"></i>
+                    <i class="iconfont icon-gerenzhongxindingdandaishouhuo" v-if="dataList.orderStatus==3||dataList.orderStatus==4"></i>
                     <i class="iconfont icon-gerenzhongxindingdandaishouhuo" v-else style="color:gray"></i>
                       配送中
                 </div>

src/components/IntegralMall/block/detailsLeftHot.vue

@@ -65,7 +65,7 @@
       </el-col>
     </el-row>
     <ul v-if="showList==1">
-      <li class="list_item" v-for="item in dataList"  @click="goDetail(item.id)">
+      <li class="list_item" v-for="(item,index) in dataList"  @click="goDetail(item.id)" v-if="index<5">
         <div>
           <img :src="getImgUrl(item.images)" alt="">
         </div>
@@ -74,7 +74,7 @@
       </li>
     </ul>
     <ul v-else>
-      <li class="list_item" v-for="item in dataList" @click="goDetail2(item.Id)">
+      <li class="list_item" v-for="(item,index) in dataList" @click="goDetail2(item.Id)" v-if="index<5">
         <div>
           <img :src="getImgUrl(item.Images)" alt="">
         </div>

src/components/IntegralMall/confirOrder.vue

@@ -115,9 +115,11 @@
 }
 .confirOrder .product_box {
   margin-top: 30px;
+  background-color: #fff;
 }
 .confirOrder .product_box .product_item{
   display: flex;
+  margin:30px 0 20px 20px;
 }
 .confirOrder .product_box .product_item .img_box{
   width: 80px;
@@ -131,18 +133,28 @@
 }
 .confirOrder .product_box .product_name {
   color: #333333;
+  display:inline-block;
+  width:400px;
 }
 .confirOrder .product_box .product_color {
   color: #999999;
 }
+.confirOrder .product_box .sunm{
+  width:100%;
+  height:90px;
+  background-color: #fff;
+}
 .confirOrder .product_box .sunm p{
   text-align: right;
-  padding: 20px;
   font-size: 12px;
+  height:60px;
+  line-height: 60px;
+  padding:0 20px;
+  margin:0 20px;
+  position: relative;
+  top:5px;
   color: #333333;
-  border: 1px solid #ECECEC;
-  border-top: none;
-  background-color: white;
+  background-color: #ECECEC;
 }
 .confirOrder .product_box .small_s {
   font-size: 14px;
@@ -175,10 +187,27 @@
   font-size: 18px;
 }
 .confirOrder .details_box .details_box_btn{
-  margin-top: 30px;
+  margin: 40px 0 20px 0;
 }
 .confirOrder .details_box .details_box_btn .edit_addr_btn{
-  padding: 13px 48px;
+  padding: 17px 56px;
+  font-size:20px;
+}
+.confirOrder .confirTable tr th{
+  color:#666666;
+  height:54px;
+  text-align: left;
+  padding:0 20px;
+  border-bottom:1px solid #ECECEC;
+  font-size:16px;
+}
+.confirOrder .confirTable tr th:first-child{
+  color:#333333;
+}
+.confirOrder .confirTable td{
+  color:#333333;
+  font-size:12px;
+  padding:0 20px;
 }
 </style>
 <template>
@@ -252,47 +281,40 @@
       </el-row>
       <!-- product -->
       <el-row class="product_box">
-        <el-table :data="tableData" border style="width: 100%">
-          <el-table-column prop="images" label="商品信息">
-            <template slot-scope="scope">
-              <div class="product_item">
-                <div class="img_box">
-                  <img :src="scope.row.imgUrl" alt=""/>
-                </div>
-                <div>
-                  <p class="product_name">{{scope.row.date}}</p>
-                  <!-- <p class="product_color">颜色：{{scope.row.color}}</p> -->
+        <table class="confirTable">
+            <tr>
+              <th>商品信息</th>
+              <th width="200">单价</th>
+              <th width="200">数量</th>
+              <th width="100">小计</th>
+            </tr>
+            <tr>
+              <td>
+                <div class="product_item">
+                  <div class="img_box">
+                    <img v-if="dataList.images" :src="getImgUrl(dataList.images)" alt=""/>
+                  </div>
+                  <div>
+                    <p class="product_name">{{dataList.name}}</p>
+                  </div>
                 </div>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="name" label="单价" width="180">
-            <template slot-scope="scope">
-              <span style="margin-left: 10px">{{scope.row.score }} 积分</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="num" label="数量" width="80">
-            <template slot-scope="scope">
-              <span style="margin-left: 10px">* {{scope.row.num }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="小计" width="180">
-            <template slot-scope="scope">
-              <span style="margin-left: 10px">{{ scope.row.score * scope.row.num }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
+              </td>
+              <td>{{dataList.price}}积分</td>
+              <td>×{{buyNum}}</td>
+              <td>{{dataList.price*buyNum}}积分</td>
+            </tr>
+        </table>
         <div class="sunm">
-          <p>合计：<span class="small_s">￥ <span>{{tableData[0].score*tableData[0].num}}</span>积分</span></p>
+          <p>合计：<span class="small_s">￥ <span>{{dataList.price*buyNum}}</span>积分</span></p>
         </div>
       </el-row>
       <!-- details -->
       <el-row class="details_box">
         <div class="details_box_info">
-          <p>商品金额 <span>¥ {{tableData[0].score*tableData[0].num}}积分</span></p>
+          <p>商品金额 <span>¥ {{dataList.price*buyNum}}积分</span></p>
           <p>总积分 <span>¥ {{score}}积分</span></p>
           <p>运费 <span>0元</span></p>
-          <p>应付 <span class="_pay">¥ <span>{{tableData[0].score*tableData[0].num}}</span> 积分</span></p>
+          <p>应付 <span class="_pay">¥ <span>{{dataList.price*buyNum}}</span> 积分</span></p>
         </div>
         <div class="details_box_btn">
           <span class="edit_addr_btn" @click="goDetail(id)" style="margin-right:20px;">取消</span>
@@ -335,21 +357,14 @@ export default {
         desc: [{ required: true, message: "请输入详细地址", trigger: "blur" }],
         addr: [{ required: true, message: "请输入地址", trigger: "blur" }]
       },
-      tableData: [
-        {
-          date: "",
-          imgUrl:'',
-          color: '白色',
-          score:0,
-          num:0
-        },
-      ],
       OrderAddList: [],
       upAddressId:0,
       addressObj:[],
       id:0,
       //个人总积分
       score:0,
+      buyNum:0,
+      dataList:{},
     };
   },
   methods: {
@@ -417,11 +432,7 @@ export default {
           this.loading = false;
           if (res.data.resultCode === 1) { 
             let detail = res.data.data;
-            console.log(res,'ressssss');
             this.dataList = res.data.data;
-            this.tableData[0].date = res.data.data.name;
-            this.tableData[0].imgUrl = res.data.data.images.split(',')[0];
-            this.tableData[0].score = res.data.data.price;
           } else {
             this.Error(res.data.message);
           }
@@ -441,18 +452,18 @@ export default {
     },
     //兑换商品
     exchangeGood(){
-      if(this.score<this.tableData[0].score){
+      if(this.score<this.dataList.price){
         this.Error("积分太少，无法兑换");
         return;
       }
       var msg = {
-        goodsName:this.tableData[0].date,
-        goodsPrice:this.tableData[0].score,
-        goodsImg:this.tableData[0].imgUrl,
+        goodsName:this.dataList.name,
+        goodsPrice:this.dataList.price,
+        goodsImg:this.dataList.images.split(',')[0],
         shippingAdd:this.OrderAddList.id,
         goodsInfoId:this.id,
-        buyNum:this.tableData[0].num,
-        orderTotalPrice:this.tableData[0].num*this.tableData[0].score,
+        buyNum:this.buyNum,
+        orderTotalPrice:this.buyNum*this.dataList.price,
       }
       this.apiJavaPost('/api/orderForm/confirmOrder',msg,res=>{
           if(res.data.resultCode==1){
@@ -476,6 +487,11 @@ export default {
     goDetail: function (id) {
       this.$router.push({ path: 'productDetail', query: {id: id}})
     },
+    getImgUrl(imgUrl){
+      var url= imgUrl.split(",")[0];
+      return url;
+    },
+
   },
   mounted() {
     this.getOrderAdd();
@@ -483,7 +499,7 @@ export default {
     this.getScore();
   },created(){
     this.id = this.$route.query.id;
-    this.tableData[0].num = this.$route.query.num;
+    this.buyNum = this.$route.query.num;
   }
 };
 </script>

src/components/IntegralMall/productDetail.vue

@@ -71,7 +71,9 @@
     display: flex;
     align-items: center;
     height: 90px;
-    margin-top: 26px;
+    background-color: #FFF8F9;
+    margin: 26px 0 30px 0;
+    padding:0 20px;
   }
   .pd_top_info_right .jifen{
     color: #FF0101;
@@ -173,6 +175,11 @@
     color:#666666;
     margin:10px 0 0 53px;
   }
+  .proDuiRemind{
+    font-size:12px;
+    color:#666666;
+    margin:10px 0 0 53px;
+  }
 </style>
 
 <template>
@@ -211,6 +218,9 @@
           <div class="pd_quota" v-if="detail.quota!=0">
               限购数量：{{detail.quota}}
           </div>
+          <div class="proDuiRemind">
+            该商品一经兑换，概不退换，请知晓！
+          </div>
           <div class="_yunfei">
             <span class="_yunfei_name">运费</span>
             <div>

src/components/newPersonalCenter/integral/model/commodity.vue

@@ -4,7 +4,7 @@
   border-bottom: 1px solid rgba(236, 236, 236, 1);
 }
 .commodity .info{
-  padding: 26px;
+  padding:0 26px;
   text-align: center;
   border-left: 1px solid rgba(236, 236, 236, 1);
   font-size:14px;
@@ -79,6 +79,7 @@
   -webkit-box-orient: vertical;
   -webkit-line-clamp: 2;
   overflow: hidden;
+  max-height:32px;
 }
 .com_bigImg{
   max-width: 357px;

src/components/newPersonalCenter/integral/model/integralHomeV2.vue

@@ -97,7 +97,7 @@
     border-left: 1px solid rgba(236, 236, 236, 1);
   }
   .integralHomeV2 .class .item img{
-    max-height: 150px;
+    max-height: 135px;
     max-width:100%;
   }
   .integralHomeV2 .class .item ._name{