修改积分商城

src/components/IntegralMall/IntegralMall.vue

@@ -37,7 +37,7 @@
         </el-row>
         <commodity v-bind:message="item.list"/>
       </div>
-      <div class="_block">
+      <!-- <div class="_block">
         <el-row class="tit">
           <div>
             <img src="../../assets/img/ps/jifenhot.png" alt="">
@@ -45,7 +45,7 @@
           </div>
         </el-row>
         <recommend/>
-      </div>
+      </div> -->
       <div class="_block" v-for="item in ClassifyGoodsList">
         <el-row class="tit">
           <div>

src/components/IntegralMall/OrderdetailsCompleted.vue

@@ -98,6 +98,9 @@
         border:1px solid #ECECEC;
         display: inline-block;
    }
+  .OrderdetailCompleted .po_left img{
+      width:100%;
+  }
    .OrderdetailCompleted .po_right{
        color: #666666;
        font-size: 14px;
@@ -137,6 +140,10 @@
     text-decoration: underline;
     cursor: pointer;
   }
+  .OrderDetails_Status{
+    text-align: center;
+    font-size:18px;
+  }
  </style>
 
 <template>
@@ -154,7 +161,7 @@
             <div class="Order_Top_left">
                 <div class="Order_Complate">
                     <img src="../../assets/img/ticket/icons8-tick-box-96.png" alt=""/>
-                    <span>完成</span>
+                    <span>支付成功</span>
                 </div>
                 <div class="Order_jifen">
                   支付积分：￥{{dataList.goodsPrice*dataList.buyNum}}
@@ -162,30 +169,33 @@
             </div>
             <div class="Order_Top_right">
                 <div class="Submit_Orders">
-                    <i class="iconfont icon-order_icon"/>
-                      提交订单
+                    <i class="iconfont icon-order_icon" v-if="dataList.orderStatus==1"/>
+                    <i class="iconfont icon-order_icon" v-else style="color:gray"/>
+                      待处理
                 </div>
                 <div class="SubmitComLine">
                   <img src="../../assets/img/orderLins.png" alt=""/>
                 </div>
                 <div class="Submit_Orders">
-                    <i class="iconfont icon-xunhuan"/>
-                      确认兑换
+                    <i class="iconfont icon-xunhuan" v-if="dataList.orderStatus==2"/>
+                    <i class="iconfont icon-xunhuan" v-else style="color:gray"/>
+                      待配送
                 </div>
                 <div class="SubmitComLine">
                   <img src="../../assets/img/orderLins.png" alt=""/>
                 </div>
                 <div class="Submit_Orders">
-                    <i class="iconfont icon-gerenzhongxindingdandaishouhuo"></i>
-                      等待收货
+                    <i class="iconfont icon-gerenzhongxindingdandaishouhuo" v-if="dataList.orderStatus==3"></i>
+                    <i class="iconfont icon-gerenzhongxindingdandaishouhuo" v-else style="color:gray"></i>
+                      配送中
                 </div>
                 <div class="SubmitComLine">
                   <img src="../../assets/img/orderLins.png" alt=""/>
                 </div>
                 <div class="Submit_Orders">
-                    <div v-if="dataList.orderStatus==3"><img src="../../assets/img/ticket/icons8-tick-box-96.png" alt=""/></div>
+                    <div v-if="dataList.orderStatus==4"><img src="../../assets/img/ticket/icons8-tick-box-96.png" alt=""/></div>
                     <div v-else><img src="../../assets/img/ticket/huigou.png" alt=""/></div>
-                      订单完成
+                      交易成功
                 </div>
             </div>
         </div>
@@ -220,10 +230,11 @@
                           </div>
                       </div>
                   </div> -->
-                  <div>
-                      <span v-if="dataList.orderStatus==1">待发货</span>
-                      <span v-if="dataList.orderStatus==2">待收货</span>
-                      <span v-if="dataList.orderStatus==3">交易成功</span>
+                  <div class="OrderDetails_Status">
+                      <span v-if="dataList.orderStatus==1">待处理</span>
+                      <span v-if="dataList.orderStatus==2">待配送</span>
+                      <span v-if="dataList.orderStatus==3">配送中</span>
+                      <span v-if="dataList.orderStatus==4">交易成功</span>
                   </div>
                 </td>
                 <td width="132px" style="text-align:center;">
@@ -281,6 +292,7 @@ export default {
        this.apiJavaPost('/api/orderForm/getOrderDetail',msg,res=>{
           if(res.data.resultCode==1){
               this.dataList = res.data.data;
+              console.log(this.dataList,'dataListsssss');
           }else{
               this.Error(res.data.message);
           }

src/components/IntegralMall/block/detailsLeftHot.vue

@@ -40,7 +40,7 @@
 <template>
   <div class="detailsLeftHot">
     <el-row>
-      <el-col :span="12" class="d_tit">
+      <!-- <el-col :span="12" class="d_tit">
         <div :class="{'_ative': tabActive === 1}" @click="tabActive = 1">
           同类热卖
         </div>
@@ -49,15 +49,30 @@
         <div :class="{'_ative': tabActive === 2}" @click="tabActive = 2">
           商城热卖
         </div>
+      </el-col> -->
+      <el-col :span="24" class="d_tit">
+        <div class="_ative">
+            <span v-if="showList==1">同类热卖</span>
+            <span v-else>商城热卖</span>
+        </div>
       </el-col>
     </el-row>
-    <ul>
-      <li class="list_item">
+    <ul v-if="showList==1">
+      <li class="list_item" v-for="item in dataList">
         <div>
-          <img src="../../../assets/img/img-01.png" alt="">
+          <img :src="getImgUrl(item.images)" alt="">
         </div>
-        <p class="_name">夏日必备神器</p>
-        <p class="_num">1900分兑换</p>
+        <p class="_name">{{item.name}}</p>
+        <p class="_num">{{item.price}}分兑换</p>
+      </li>
+    </ul>
+    <ul v-else>
+      <li class="list_item" v-for="item in dataList">
+        <div>
+          <img :src="getImgUrl(item.Images)" alt="">
+        </div>
+        <p class="_name">{{item.name}}</p>
+        <p class="_num">{{item.Price}}分兑换</p>
       </li>
     </ul>
   </div>
@@ -65,15 +80,57 @@
 
 <script>
 export default {
+  props:['Type','showList'],
   data(){
     return{
       tabActive: 1,
+      dataList:[]
     }
   },methods:{
-    
+      getList(){
+        var msg = {
+          ranks: '',
+          type: this.Type,
+          pageSize: 15,
+          pageIndex: 1,
+        }
+        this.apiJavaPost(
+          "/api/goodsMarket/getGoodsList",msg,res => {
+            console.log(res,'resssss');
+            if (res.data.resultCode === 1) {
+              this.dataList = res.data.data.pageData;
+            } else {
+              this.Error(res.data.message);
+            }
+          },
+          null
+        );
+      },
+      getImgUrl(imgUrl){
+        var url= imgUrl.split(",")[0];
+        return url;
+      },
+      //获取活动分类展示
+      getActivesList(){
+        this.apiJavaPost('/api/goodsMarket/getActivityClassifyGoods',{},res=>{
+            if(res.data.resultCode==1){
+                var DataList = res.data.data;
+                DataList.forEach(x => {
+                  if(x.activityId==1){
+                    this.dataList = x.list;
+                  }
+                });
+            }else{
+                this.Error(res.data.message);
+            }
+        },null)
+      },
   },mounted(){
-
+    if(this.showList==1){
+       this.getList();
+    }else{
+      this.getActivesList();
+    }
   }
-
 }
 </script>

src/components/IntegralMall/confirOrder.vue

@@ -210,19 +210,17 @@
             <el-row :gutter="20">
               <el-col
                 :span="6"
-                v-for="(item, index) in OrderAddList"
-                :key="index"
-                :class="{'_active': addListActive === index}"
+                :class="{'_active': addListActive === 1}"
               >
-                <div class="address_info_item" @click="addListActive = index">
-                  <p class="item_name">{{item.city}}（{{item.uname}}）</p>
-                  <p class="item_add">{{item.district}} {{item.address}}</p>
-                  <p class="item_tel">{{item.uphone}}</p>
+                <div class="address_info_item" @click="addListActive = 1">
+                  <p class="item_name">{{OrderAddList.city}}（{{OrderAddList.uname}}）</p>
+                  <p class="item_add">{{OrderAddList.district}} {{OrderAddList.address}}</p>
+                  <p class="item_tel">{{OrderAddList.uphone}}</p>
                 </div>
               </el-col>
             </el-row>
             <div class="edit_addr">
-              <span class="edit_addr_btn" v-if="OrderAddList.length>0" @click="addressShow = false,getUpAddress()">修改地址</span>
+              <span class="edit_addr_btn" v-if="OrderAddList" @click="getUpAddress()">修改地址</span>
             </div>
           </div>
           <div v-else class="form_box">
@@ -297,6 +295,7 @@
           <p>应付 <span class="_pay">¥ <span>{{tableData[0].score*tableData[0].num}}</span> 积分</span></p>
         </div>
         <div class="details_box_btn">
+          <span class="edit_addr_btn" @click="goDetail(id)" style="margin-right:20px;">取消</span>
           <span class="edit_addr_btn" @click="exchangeGood()">确认并兑换</span>
         </div>
       </el-row>
@@ -371,7 +370,12 @@ export default {
     },
     //获取当前收货地址详情
     getUpAddress(){
-      this.addressObj = this.OrderAddList[this.addListActive];
+      if(this.addListActive==0){
+        this.Error('请选择收货地址');
+        return;
+      }
+      this.addressShow = false,
+      this.addressObj = this.OrderAddList;
       this.form.addr = this.addressObj.province+" "+ this.addressObj.city+" "+ this.addressObj.district;
       this.form.desc = this.addressObj.address;
       this.form.name = this.addressObj.uname;
@@ -445,7 +449,7 @@ export default {
         goodsName:this.tableData[0].date,
         goodsPrice:this.tableData[0].score,
         goodsImg:this.tableData[0].imgUrl,
-        shippingAdd:this.OrderAddList[this.addListActive].id,
+        shippingAdd:this.OrderAddList.id,
         goodsInfoId:this.id,
         buyNum:this.tableData[0].num,
         orderTotalPrice:this.tableData[0].num*this.tableData[0].score,
@@ -468,8 +472,10 @@ export default {
               this.Error(res.data.message);
           }
       });
-
-    }
+    },
+    goDetail: function (id) {
+      this.$router.push({ path: 'productDetail', query: {id: id}})
+    },
   },
   mounted() {
     this.getOrderAdd();

src/components/IntegralMall/myPointOrder.vue

@@ -220,13 +220,13 @@
                     <div class="myPo_left">
                         <el-row>
                             <el-col :span="8" class="d_tit">
-                                <div :class="{'pActive':tabActive==1}" @click="tabActive = 1,msg.queType='',getList()">
+                                <div :class="{'pActive':tabActive==1}" @click="tabActive = 1,msg.queName='',msg.queType='',getList()">
                                     全部订单
                                     <i class="myPoint_line"></i>
                                 </div>
                             </el-col>
                             <el-col :span="8" class="d_tit">
-                                <div :class="{'pActive':tabActive==2}" @click="tabActive = 2,msg.queType=3,getList()">
+                                <div :class="{'pActive':tabActive==2}" @click="tabActive = 2,msg.queType=4,msg.queName='',getList()">
                                     交易成功
                                     <i class="myPoint_line"></i>
                                 </div>
@@ -291,9 +291,10 @@
                             <span style="color:#FF0101">￥{{item.goodsPrice}}</span>
                         </td>
                         <td width="150px">
-                            <span v-if="item.orderStatus==1">待发货</span>
-                            <span v-if="item.orderStatus==2">待收货</span>
-                            <span v-if="item.orderStatus==3">交易成功</span>
+                            <span v-if="item.orderStatus==1">待处理</span>
+                            <span v-if="item.orderStatus==2">待配送</span>
+                            <span v-if="item.orderStatus==3">配送中</span>
+                            <span v-if="item.orderStatus==4">交易成功</span>
                         </td>
                         <td width="150px">
                            <input type="button" class="pointDetailBtn"  @click="goUrl('OrderdetailsCompleted',item.id)" value="查看详情">
@@ -330,7 +331,7 @@ export default {
   },
   data(){
     return {
-        tabActive:2,
+        tabActive:1,
         currentPage: 1,
         totalCount: 0,
         orderTime:'近三个月订单',
@@ -339,7 +340,7 @@ export default {
             pageIndex: 1,
             pageSize: 5,
             queName:'',
-            queType:3
+            queType:''
         },
         OrderTimeList: [
             {
@@ -360,7 +361,7 @@ export default {
   },methods:{
     //获取数据
     getList(){
-        this.apiJavaPost('/api/orderForm/orderDetailList',this.msg,res=>{
+        this.apiJavaPost('/api/orderForm/orderDetailListByUid',this.msg,res=>{
           if(res.data.resultCode==1){
               this.dataList = res.data.data.pageData;
               this.totalCount = res.data.data.pageCount;

src/components/IntegralMall/productDetail.vue

@@ -165,6 +165,11 @@
   .pd_bottom_detail_right img{
     max-width: 100%;
   }
+  .pd_quota{
+    font-size:12px;
+    color:#666666;
+    margin:10px 0 0 53px;
+  }
 </style>
 
 <template>
@@ -199,6 +204,9 @@
             <span class="_numbers_name">数量</span>
             <el-input-number v-model="numbers" :min="1" :max="detail.quota === 0 ? '' : detail.quota" size="mini"></el-input-number>
           </div>
+          <div class="pd_quota">
+              限购数量：{{detail.quota}}
+          </div>
           <div class="_yunfei">
             <span class="_yunfei_name">运费</span>
             <div>
@@ -216,7 +224,7 @@
       </el-row>
       <el-row class="pd_bottom_detail" :gutter="20">
         <el-col :span="5">
-          <detailsLeftHot/>
+          <detailsLeftHot v-if="detail.type" :Type="detail.type" :showList="1" />
         </el-col>
         <el-col :span="19" class="pd_bottom_detail_right">
           <el-row>
@@ -260,11 +268,7 @@ export default {
         imgArr: [],
         deImgArr: [],
       },
-      colors: [
-        '黑色',
-        '红色',
-        '白色'
-      ],
+      isActivityType:1,
       configs: {
         width:650,
         height:350,
@@ -289,7 +293,9 @@ export default {
             let deImgArr = detail.descripImg.split(',')
             detail.imgArr = imgArr
             detail.deImgArr = deImgArr
-            this.detail = detail
+            this.detail = detail;
+            this.isActivityType = detail.isActivityType;
+            console.log(detail,'detailsss');
           } else {
             this.Error(res.data.message);
           }
@@ -298,8 +304,12 @@ export default {
       );
     },
     PlacingOrder: function () {
+      if(this.isActivityType!=0){
+        this.Error('该商品为活动商品，不能兑换');
+      }else{
         this.$router.push({name: 'confirOrder', query: { id: this.id, num: this.numbers}})
       }
+    }
   },mounted(){
     this.getDetail()
   },created(){

src/components/IntegralMall/productList.vue

@@ -231,84 +231,6 @@ export default {
         pageSize: 15,
         pageIndex: 1,
       },
-      typeList: [
-        {
-          id: 0,
-          name: '全部',
-        },{
-          id: 1,
-          name: '出行用品',
-        },{
-          id: 2,
-          name: '居家用品',
-        },{
-          id: 3,
-          name: '母婴用品',
-        },{
-          id: 4,
-          name: '健康保证',
-        },{
-          id: 5,
-          name: '家居日用',
-        }
-      ],
-      brandList: [
-        {
-          id: 0,
-          name: '全部',
-        },{
-          id: 1,
-          name: '迪士尼',
-        },{
-          id: 2,
-          name: '卡西欧',
-        },{
-          id: 3,
-          name: '哈撒给',
-        },{
-          id: 4,
-          name: '撸啊撸',
-        },{
-          id: 5,
-          name: '红烧肉',
-        },{
-          id: 6,
-          name: '卡西欧',
-        },{
-          id: 7,
-          name: '哈撒给',
-        },{
-          id: 8,
-          name: '撸啊撸',
-        },{
-          id: 9,
-          name: '红烧肉',
-        },{
-          id: 10,
-          name: '卡西欧',
-        },{
-          id: 11,
-          name: '哈撒给',
-        },{
-          id: 12,
-          name: '撸啊撸',
-        },{
-          id: 13,
-          name: '红烧肉',
-        },{
-          id: 14,
-          name: '撸啊撸',
-        },{
-          id: 15,
-          name: '红烧肉',
-        },{
-          id: 16,
-          name: '撸啊撸',
-        },{
-          id: 17,
-          name: '红烧肉',
-        }
-      ],
       dataList: [],
       goodsTypeManagerList: [],
       loading: false,
@@ -373,6 +295,8 @@ export default {
     },
     handleCurrentChange(val) {
       // 翻页
+      this.msg.pageIndex = parseInt(val);
+      this.getList();
     }
   },mounted(){
     this.getGoodsTypeManager();