Commit 12419959 by 刘海龙

Merge branch 'master' of http://132.232.91.252:9999/ice/eduline

parents b1c8748c 4cee072a
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<span class="text_14_600 color_FF3B3B">¥{{item['price']}}</span> <span class="text_14_600 color_FF3B3B">¥{{item['price']}}</span>
</div> </div>
<div class="layout_h_r"> <div class="layout_h_r">
<div v-if="showSolid(index)" @click="onPay(item, opt)" class="order_action_solid self_center" <div v-if="showSolid()" @click="onPay(item, opt)" class="order_action_solid self_center"
style="margin-left: 0.75rem;">去支付 style="margin-left: 0.75rem;">去支付
</div> </div>
<div v-if="showHollow(index)" @click="onCancel(item, opt)" class="order_action_hollow self_center"> <div v-if="showHollow(index)" @click="onCancel(item, opt)" class="order_action_hollow self_center">
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<span class="text_14_600 color_FF3B3B">¥{{item['price']}}</span> <span class="text_14_600 color_FF3B3B">¥{{item['price']}}</span>
</div> </div>
<div class="layout_h_r"> <div class="layout_h_r">
<div v-if="showSolid(index)" @click="onPay(item, opt)" class="order_action_solid self_center" <div v-if="showSolid()" @click="onPay(item, opt)" class="order_action_solid self_center"
style="margin-left: 0.75rem;">去支付 style="margin-left: 0.75rem;">去支付
</div> </div>
<div v-if="showHollow(index)" @click="onCancel(item, opt)" class="order_action_hollow self_center"> <div v-if="showHollow(index)" @click="onCancel(item, opt)" class="order_action_hollow self_center">
...@@ -159,6 +159,7 @@ ...@@ -159,6 +159,7 @@
}, },
showSolid: function () { showSolid: function () {
return function (index) { return function (index) {
console.log(this.innerTab);
return index == 0 return index == 0
} }
}, },
...@@ -205,7 +206,7 @@ ...@@ -205,7 +206,7 @@
let options = this.options[this.tab]; let options = this.options[this.tab];
let item = options['options'][this.innerTab]; let item = options['options'][this.innerTab];
let _this = this; let _this = this;
$.get(U('home/Home/orderList'), {orderby: options['v'], ordertype: item['v'],}, function (data) { $.get(U('home/Home/orderList'), {orderby: item['v'], ordertype: options['v'],}, function (data) {
_this.options[_this.tab]['options'][_this.innerTab]['items'] = data; _this.options[_this.tab]['options'][_this.innerTab]['items'] = data;
}, 'json'); }, 'json');
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment