Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

src/components/IntegralMall/confirOrder.vue

+<style>
+.confirOrder{
+  background-color: #f5f5f5
+}
+</style>
+<template>
+  <el-row class="confirOrder">
+     <el-row class="w1180">
+      <el-row>
+        
+      </el-row>
+     </el-row>
+  </el-row>
+</template>
+<script>
+export default {
+  data(){
+    return {
+      
+    }
+  },methods:{
+    
+  },mounted(){
+
+  }
+}
+</script>

src/components/IntegralMall/productDetail.vue

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

src/components/newPersonalCenter/block/model/TcOrder.vue

@@ -20,7 +20,7 @@
       很抱歉，你想要的信息我们真的找不到了
     </div>
     <!-- 分页 -->
-    <el-row class="_pagination">
+    <el-row class="_pagination" v-if="totalCount > 1 && tableData.length>0">
       <el-pagination
         :current-page.sync="currentPage"
         :page-size="getOrderMsg.pageSize"

src/components/trip/waterfall/traffic.vue

@@ -17,7 +17,7 @@
                     <span v-if="o+1==tripItem.childItem.subTraffic.length">{{dns.arrivalCityName}}</span>
                 </span>
             </span>
-            <span class="content" v-html="son.childItem.description"></span>
+            <span class="content" v-html="tripItem.childItem.description"></span>
         </div>
     </div>
 </template>

src/router.js

@@ -176,6 +176,14 @@ export default new Router({
             title: "商品详情-印象之旅~感动与世界同步"
           }
         },
+        {
+          path: "/confirOrder",
+          name: "confirOrder",
+          component: resolve => require(["@/components/IntegralMall/confirOrder"], resolve),
+          meta: {
+            title: "订单确认-印象之旅~感动与世界同步"
+          }
+        },
         {
           path: "/integral",
           name: "integral",