2

www/vue/src/components/balanceLog.vue

@@ -20,7 +20,7 @@
     </div>
     <div style="position:absolute;top:165px;left:0;right:0;">
       <!-- 消费 -->
-      <div class="recharge-details" v-if="balanceInfo == 1" v-for="(item, index) in consumptionList" @click='show(index)'> 
+      <div class="recharge-details"  v-for="(item, index) in tmp" @click='show(index)'> 
         <div class="time-str">{{item.time}}</div> 
         <div class="arrow active" v-bind:class="{ showHeight: isActive == 1 }"> 
           <span class="red">消费{{item.amount}}</span>元 
@@ -30,18 +30,8 @@
           <div class="type-str"><span class="left">交易类型:</span>{{item.type_str}}</div>
         </div>
       </div>
-      <!-- 充值 -->
-      <div class="recharge-details" v-if="balanceInfo == 2" v-for="item in rechargeList">
-        <div class="time-str">{{ item.time }}</div>
-        <div class="arrow">
-          <span class="green">充值{{ item.amount }}</span>元
-        </div>
-        <div class="extended">
-          <div class="memo"><span class="left">支付用途:</span>{{item.memo}}</div>
-          <div class="type-str"><span class="left">交易类型:</span>{{item.type_str}}</div>
-        </div>
-      </div>
     </div>
+    
 <!--     <div class="show" @click="show(1)">
       <div v-bind:class="{ showHeight: isActive == 1 }"></div>  
     </div> 
@@ -68,7 +58,8 @@
         index: -1, // show 显示隐藏
         balanceInfo: 1,
         rechargeList: [],
-        consumptionList: []
+        consumptionList: [],
+        tmp: []
       }
     },
     components: {
@@ -90,29 +81,32 @@
       consoleIndex (index) {
         this.balanceInfo = index
         console.log(this.balanceInfo)
-        if (this.consumptionList.length === 0 || this.rechargeList.length === 0) {
-          let orderList = {id: config.userId, start_time: '2016-11-01', end_time: '2016-11-30'}
-          orderList = qs.stringify(orderList)
-          axios.post('o2o/user/getUserBalanceLog', orderList).then(res => {
-            // if (index === 1) {
-            // }
-            // if (index === 2) {
-            // }
-            // 消费
-            let j = 0
-            for (let i in res.data.message) {
-              if (res.data.message[i].memo === '微信下订单' || res.data.message[i].memo === '下订单' || res.data.message[i].amount < 0) {
-                this.consumptionList[j++] = res.data.message[i]
-              }
+        let orderList = {id: config.userId, start_time: '2016-11-01', end_time: '2016-11-30'}
+        orderList = qs.stringify(orderList)
+        axios.post('o2o/user/getUserBalanceLog', orderList).then(res => {
+          // if (index === 1) {
+          // }
+          // if (index === 2) {
+          // }
+          // 消费
+          let j = 0
+          for (let i in res.data.message) {
+            if (res.data.message[i].memo === '微信下订单' || res.data.message[i].memo === '下订单' || res.data.message[i].amount < 0) {
+              this.consumptionList[j++] = res.data.message[i]
             }
-            // 消费
-            j = 0
-            for (let i in res.data.message) {
-              if (res.data.message[i].amount > 0 && res.data.message[i].memo !== '微信下订单' && res.data.message[i].memo !== '下订单') {
-                this.rechargeList[j++] = res.data.message[i]
-              }
+          }
+          // 消费
+          j = 0
+          for (let i in res.data.message) {
+            if (res.data.message[i].amount > 0 && res.data.message[i].memo !== '微信下订单' && res.data.message[i].memo !== '下订单') {
+              this.rechargeList[j++] = res.data.message[i]
             }
-          })
+          }
+        })
+        if (index === 2) {
+          this.tmp = this.rechargeList
+        } else {
+          this.tmp = this.consumptionList
         }
       }
     }