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

apps/home/Tpl/default/Home/order_w3g.html

@@ -178,11 +178,6 @@
                     return opt.options ? opt.options[this.innerTab].items : opt.items
                     return opt.options ? opt.options[this.innerTab].items : opt.items
                 }
                 }
             },
             },
-            getOptions: function () {
-                return function (opt) {
-                    return opt.options ? opt.options[this.innerTab] : []
-                }
-            },
             showEmpty: function () {
             showEmpty: function () {
                 let opt = this.options[this.tab]
                 let opt = this.options[this.tab]
                 if (opt.options) {
                 if (opt.options) {
@@ -236,8 +231,6 @@
                     return false;
                     return false;
                 }
                 }
 
 
-                console.log(item, opt);
-                return false;
                 if(item['price'] <= 0){
                 if(item['price'] <= 0){
                     ui.error('不需要您购买');
                     ui.error('不需要您购买');
                     return false;
                     return false;
@@ -246,9 +239,7 @@
                 let url = '';
                 let url = '';
                 let formData2 = {};
                 let formData2 = {};
 
 
-                let option = this.getOptions(opt);
-
-                let type = option.v;
+                let type = opt.v;
                 if (type === 'course') {
                 if (type === 'course') {
                     url = "/pay/"+item['order']+".html";
                     url = "/pay/"+item['order']+".html";
                     formData2 = {
                     formData2 = {
@@ -292,10 +283,9 @@
                 },'json');
                 },'json');
             },
             },
             onCancel: function (item, opt) {
             onCancel: function (item, opt) {
-                let option = this.getOptions(opt);
-                let type = option.v;
+                let type = opt.v;
                 let form, message = '';
                 let form, message = '';
-                if (opt.v == 1) {
+                if (this.innerTab == 0) {
                     message = '取消';
                     message = '取消';
                     form = "{:U('home/Home/delCancel')}";
                     form = "{:U('home/Home/delCancel')}";
                 } else {
                 } else {