绑数据

src/App.vue

@@ -59,7 +59,7 @@ export default {
 
 <style>
 @import './assets/global/font.css';
-@import '//at.alicdn.com/t/font_863923_wzxnabnk91k.css';
+@import '//at.alicdn.com/t/font_863923_59ny99vyyvp.css';
 @import './assets/global/global.css';
 body,html{
   padding: 0px;

src/components/IntegralMall/OrderCompleted.vue

@@ -135,7 +135,7 @@
                     <img src="../../assets/img/ticket/icons8-tick-box-96.png" alt=""/>
                     <div class="OC_riContent">
                         <div class="OC_paySuccsss">支付成功！</div>
-                        <div class="OC_dianhua">如有任何疑问可致电028-56540254，点击 <span class="Order_more">查看订单>></span></div>
+                        <div class="OC_dianhua">如有任何疑问可致电028-56540254，点击 <span class="Order_more" @click="goUrl('OrderdetailsCompleted')">查看订单>></span></div>
                     </div>
                   </div>
                   <div class="OC_btmList">
@@ -176,7 +176,9 @@ export default {
       
     }
   },methods: {
-
+    goUrl: function (path) {
+      this.$router.push({name: path,query: { id: this.$route.query.id}});
+    }
   }
 }
 </script>

src/components/IntegralMall/OrderdetailsCompleted.vue

@@ -160,7 +160,7 @@
                   支付积分：￥9900
                 </div>
                 <div>
-                  剩余积分：￥190010
+                  剩余积分：￥{{score}}
                 </div>
             </div>
             <div class="Order_Top_right">
@@ -195,7 +195,7 @@
         <table class="myPointTable">
             <tr>
                 <td colspan="3">
-                    <span class="pointOrderTime">2019-04-28 08:25:23</span>
+                    <span class="pointOrderTime">{{orderTime | YMDHMS}}</span>
                     <span class="pointOrderTitle">订单号：</span><span class="pointOrderNum">451648</span>
                 </td>
             </tr>
@@ -203,10 +203,10 @@
                 <td width="325px">
                   <div class="po_info">
                       <div class="po_left">
-
+                          <img :src="imageUrl" alt=""/>
                       </div>
                       <div class="po_right">
-                          天空大容量抽绳化妆包+防水防潮+便携耐用 暗兜设计
+                          {{orderTitle}}
                       </div>
                   </div>
                 </td>
@@ -238,6 +238,16 @@ export default {
   data(){
     return {
       num:1,
+      id:0,
+      //时间
+      orderTime:'',
+      //订单号
+      orderNum:'',
+      //图片
+      imageUrl:'',
+      //标题
+      orderTitle:'',
+      score:'',
       data:[
         {
           time:"2019-08-08",
@@ -264,14 +274,39 @@ export default {
       if(num==2){
         this.num=1;
       }else{
-        this.num=this.data.length;
-       console.log("this.num",this.num)
-        
+        this.num=this.data.length;        
       }
-    }
-
+    },
+    getInfo(){
+      let msg = {
+        goodId:this.id
+      }
+       this.apiJavaPost('/api/goodsMarket/getGoodsDetail',msg,res=>{
+          if(res.data.resultCode==1){
+              this.dataList = res.data.data;
+              this.orderTime = dataList.updateTime;
+              this.imageUrl = dataList.images.images.split(',')[0];
+              this.orderTitle = dataList.name;
+          }else{
+              this.Error(res.data.message);
+          }
+      });
+    },
+    //获取积分
+    getScore(){
+      this.apiJavaPost('/api/orderForm/getTotalIntegrals',{},res=>{
+          if(res.data.resultCode==1){
+              this.score = res.data.data;
+          }else{
+              this.Error(res.data.message);
+          }
+      });
+    },
   },mounted(){
-
+    this.getInfo();
+    this.getScore();
+  },created(){
+    this.id = this.$route.query.id;
   }
 }
 </script>

src/components/IntegralMall/confirOrder.vue

@@ -182,7 +182,7 @@
 }
 </style>
 <template>
-  <el-row class="confirOrder">
+  <el-row class="confirOrder" v-loading="loading">
     <el-row class="w1180">
       <!-- top -->
       <el-row class="bar_box">
@@ -210,19 +210,19 @@
             <el-row :gutter="20">
               <el-col
                 :span="6"
-                v-for="(item, index) in addList"
+                v-for="(item, index) in OrderAddList"
                 :key="index"
                 :class="{'_active': addListActive === index}"
               >
                 <div class="address_info_item" @click="addListActive = index">
-                  <p class="item_name">{{item.city}}（{{item.name}}）</p>
-                  <p class="item_add">{{item.addr}}</p>
-                  <p class="item_tel">{{item.tel}}</p>
+                  <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>
               </el-col>
             </el-row>
             <div class="edit_addr">
-              <span class="edit_addr_btn" @click="addressShow = false">修改地址</span>
+              <span class="edit_addr_btn" v-if="OrderAddList.length>0" @click="addressShow = false,getUpAddress()">修改地址</span>
             </div>
           </div>
           <div v-else class="form_box">
@@ -246,7 +246,7 @@
                 <el-input v-model="form.tel" size="mini" :disabled="true"></el-input>
               </el-form-item>
               <div class="edit_addr">
-                <span class="edit_addr_btn edit_addr_btn2" @click="addressShow = true">确认修改</span>
+                <span class="edit_addr_btn edit_addr_btn2" @click="addressShow = true,sureUpdate()">确认修改</span>
               </div>
             </el-form>
           </div>
@@ -255,49 +255,49 @@
       <!-- product -->
       <el-row class="product_box">
         <el-table :data="tableData" border style="width: 100%">
-          <el-table-column prop="date" label="商品信息">
+          <el-table-column prop="images" label="商品信息">
             <template slot-scope="scope">
               <div class="product_item">
                 <div class="img_box">
-                  <img src="../../assets/img/img-01.png" alt="">
+                  <img :src="scope.row.imgUrl" alt=""/>
                 </div>
                 <div>
                   <p class="product_name">{{scope.row.date}}</p>
-                  <p class="product_color">颜色：{{scope.row.color}}</p>
+                  <!-- <p class="product_color">颜色：{{scope.row.color}}</p> -->
                 </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.name }} 积分</span>
+              <span style="margin-left: 10px">{{scope.row.score }} 积分</span>
             </template>
           </el-table-column>
-          <el-table-column prop="address" label="数量" width="80">
+          <el-table-column prop="num" label="数量" width="80">
             <template slot-scope="scope">
-              <span style="margin-left: 10px">* {{scope.row.address }}</span>
+              <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.name * scope.row.address }}</span>
+              <span style="margin-left: 10px">{{ scope.row.score * scope.row.num }}</span>
             </template>
           </el-table-column>
         </el-table>
         <div class="sunm">
-          <p>合计：<span class="small_s">￥ <span>9900</span>积分</span></p>
+          <p>合计：<span class="small_s">￥ <span>{{tableData[0].score*tableData[0].num}}</span>积分</span></p>
         </div>
       </el-row>
       <!-- details -->
       <el-row class="details_box">
         <div class="details_box_info">
-          <p>商品金额 <span>¥ 9900积分</span></p>
-          <p>总积分 <span>¥ 229900积分</span></p>
+          <p>商品金额 <span>¥ {{tableData[0].score*tableData[0].num}}积分</span></p>
+          <p>总积分 <span>¥ {{score}}积分</span></p>
           <p>运费 <span>0元</span></p>
-          <p>应付 <span class="_pay">¥ <span>9900</span> 积分</span></p>
+          <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="">确认并兑换</span>
+          <span class="edit_addr_btn" @click="exchangeGood()">确认并兑换</span>
         </div>
       </el-row>
     </el-row>
@@ -323,43 +323,12 @@ export default {
     return {
       addressShow: true,
       addListActive: 0,
-      addList: [
-        {
-          name: "李瀚文",
-          city: "四川成都",
-          addr: "锦江区 阳光新业大厦2号楼 2302",
-          tel: "13800138000"
-        },
-        {
-          name: "王三",
-          city: "新疆乌鲁木齐",
-          addr: "新疆乌鲁木齐新平区北巷街250号",
-          tel: "13800138000"
-        },
-        {
-          name: "李吴",
-          city: "四川德阳",
-          addr: "旌阳区华山南路北段266号",
-          tel: "13800138000"
-        },
-        {
-          name: "郑秀儿",
-          city: "河南郑州",
-          addr: "管城回族区二胖大道666号",
-          tel: "13800138000"
-        },
-        {
-          name: "李瀚文",
-          city: "四川成都",
-          addr: "锦江区 阳光新业大厦2号楼 2302",
-          tel: "13800138000"
-        }
-      ],
+      loading:false,
       form: {
-        name: "张三四",
-        tel: "17602885454",
-        desc: "成华区光华路665号",
-        addr: "四川省 成都市 成华区"
+        name: "",
+        tel: "",
+        desc: "",
+        addr: ""
       },
       rule: {
         name: [{ required: true, message: "请输入姓名", trigger: "blur" }],
@@ -369,13 +338,19 @@ export default {
       },
       tableData: [
         {
-          date: "印象推荐款--大容量抽绳化妆包+防水防潮+便携耐用+暗兜设计",
-          name: 20,
-          address: 1,
-          color: '白色'
+          date: "",
+          imgUrl:'',
+          color: '白色',
+          score:0,
+          num:0
         },
       ],
       OrderAddList: [],
+      upAddressId:0,
+      addressObj:[],
+      id:0,
+      //个人总积分
+      score:0,
     };
   },
   methods: {
@@ -393,10 +368,114 @@ export default {
         },
         null
       );
+    },
+    //获取当前收货地址详情
+    getUpAddress(){
+      this.addressObj = this.OrderAddList[this.addListActive];
+      this.form.addr = this.addressObj.province+" "+ this.addressObj.city+" "+ this.addressObj.district;
+      this.form.desc = this.addressObj.address;
+      this.form.name = this.addressObj.uname;
+      this.form.tel = this.addressObj.uphone;
+      this.upAddressId = this.addressObj.id;
+    },
+    //确认修改收货地址
+    sureUpdate(){
+      var msg = {
+        id:this.addressObj.id,
+        province:this.addressObj.province,
+        city:this.addressObj.city,
+        district:this.addressObj.district,
+        address:this.form.desc,
+        uname:this.addressObj.uname,
+        uphone:this.addressObj.uphone,
+        postcode:''
+      }
+      this.apiJavaPost(
+        "/api/orderForm/saveOrUpdateOrderAdd",msg,
+        res => {
+          if (res.data.resultCode === 1) {
+            this.Success(res.data.message);
+            this.getOrderAdd();
+          } else {
+            this.Error(res.data.message);
+          }
+        },
+        null
+      );
+    },
+    //获取详情
+    getDetail: function () {
+      this.loading = true;
+      this.apiJavaPost(
+        "/api/goodsMarket/getGoodsDetail",
+        {goodId: this.id},
+        res => {
+          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);
+          }
+        },
+        null
+      );
+    },
+    //获取积分
+    getScore(){
+      this.apiJavaPost('/api/orderForm/getTotalIntegrals',{},res=>{
+          if(res.data.resultCode==1){
+              this.score = res.data.data;
+          }else{
+              this.Error(res.data.message);
+          }
+      });
+    },
+    //兑换商品
+    exchangeGood(){
+      if(this.score<this.tableData[0].score){
+        this.Error("积分太少，无法兑换");
+        return;
+      }
+      var msg = {
+        goodsName:this.tableData[0].date,
+        goodsPrice:this.tableData[0].score,
+        goodsImg:this.tableData[0].imgUrl,
+        shippingAdd:this.OrderAddList[this.addListActive].id,
+        goodsInfoId:this.id,
+        buyNum:this.tableData[0].num,
+        orderTotalPrice:this.tableData[0].num*this.tableData[0].score,
+      }
+      this.apiJavaPost('/api/orderForm/confirmOrder',msg,res=>{
+          if(res.data.resultCode==1){
+              this.Success(res.data.message);
+              var dataList = res.data.data;
+              this.$router.push({ 
+                path:'/OrderCompleted',
+                query:{
+                  // id:this.id,
+                  //payScore:dataList.
+                } 
+              })
+
+          }else{
+              this.Error(res.data.message);
+          }
+      });
+
     }
   },
   mounted() {
-    this.getOrderAdd()
+    this.getOrderAdd();
+    this.getDetail();
+    this.getScore();
+  },created(){
+    this.id = this.$route.query.id;
+    this.tableData[0].num = this.$route.query.num;
   }
 };
 </script>

src/components/IntegralMall/productDetail.vue

@@ -217,7 +217,7 @@
             <p><i class="iconfont icon-tixing"></i>这里是相关的一些比较重要一点的提示说明，比如平台的一些简单规则等等。。。</p>
           </div>
           <div class="_btn_dui">
-            <span @click="PlacingOrder(1)">立即兑换</span>
+            <span @click="PlacingOrder()">立即兑换</span>
           </div>
         </el-col>
       </el-row>
@@ -304,8 +304,8 @@ export default {
         null
       );
     },
-    PlacingOrder: function (id) {
-      this.$router.push({name: 'confirOrder', query: { id: id, num: this.numbers}})
+    PlacingOrder: function () {
+      this.$router.push({name: 'confirOrder', query: { id: this.id, num: this.numbers}})
     }
   },mounted(){
     this.getDetail()

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

@@ -77,7 +77,7 @@
 <template>
   <el-row class="commodity">
     <el-col :span="10" class="com_BigDiv">
-      <div class="info" v-if="index==0" v-for="(item,index) in message">
+      <div @click="goDetail(item.Id)" class="info" v-if="index==0" v-for="(item,index) in message">
         <div>
           <img class="com_bigImg" :src="getImgUrl(message[0].Images)" alt>
         </div>

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

@@ -108,6 +108,10 @@
     color:rgba(255,1,1,1);
     margin-top: 12px;
   }
+  .font_bla:hover{
+    text-decoration: underline;
+    cursor: pointer;
+  }
 </style>
 
 <template>
@@ -122,7 +126,7 @@
             <img v-else src="../../../../assets/img/head_normal1.png" alt="">
           </div>
           <p class="_tit">我的积分</p>
-          <p class="_number">1288</p>
+          <p class="_number">{{score}}</p>
         </el-col>
         <el-col :span="20" class="head_ban">
           <img src="../../../../assets/img/ps/jifenban.png" alt="">
@@ -155,7 +159,7 @@
         <el-col :span="6">
           <div>
             <div>
-              <p  class="font_bla">积分商城任你选</p>
+              <p  class="font_bla" @click="goUrl('IntegralMall')">积分商城任你选</p>
               <p>大牌随心兑</p>
             </div>
             <div>
@@ -232,6 +236,7 @@ export default {
       StorageInfo: {},
       list: [1,2,3,4,5,6,7,8,9,10],
       dataList:[],
+      score:0,
     }
   },
   created(){
@@ -277,9 +282,12 @@ export default {
     //获取积分
     getScore(){
       this.apiJavaPost('/api/orderForm/getTotalIntegrals',{},res=>{
-        console.log(res,'ressss');
+          if(res.data.resultCode==1){
+              this.score = res.data.data;
+          }else{
+              this.Error(res.data.message);
+          }
       });
-
     }
   },mounted(){
     this.getScore();