dever 4 years ago
parent
commit
208ccd2f80
2 changed files with 20 additions and 8 deletions
  1. 13 8
      lib/dever/index.js
  2. 7 0
      pages/dream/buy.vue

+ 13 - 8
lib/dever/index.js

@@ -120,18 +120,23 @@ var http = {
 								response.data.data = page.data;
 							} else {
 								page.state = false;
-								resolve(false);
-								/*
-								if (page.key) {
-									resolve(response.data.data[page.key], false);
-								} else {
-									resolve(response.data.data, false);
+								if (page.key) {
+									if (options && options.concat && options.concat == -1) {
+										response.data.data[page.key] = page.data;
+										resolve(response.data.data, false);
+									} else {
+										resolve(response.data.data[page.key], false);
+									}
+								} else {
+									if (options && options.concat && options.concat == -1) {
+										response.data.data = page.data;
+									}
+									resolve(response.data.data, false);
 								}
-								*/
 							   if (options && options.noloading) {
 							   	
 							   } else {
-							   	dever.hideLoading(loading_method, options, url);
+									dever.hideLoading(loading_method, options, url);
 							   }
 								return;
 							}

+ 7 - 0
pages/dream/buy.vue

@@ -78,9 +78,16 @@ export default {
 		//拉起支付
 		buyAct : function() {
 			var self = this;
+			var data = {};
+			data.buy_id = this.fetch.buy[this.index].id;
+			this.Dever.post('app/user/?l=pay.ticket', data, function(t) {
+				console.info(t);
+			});
+			/*
 			this.Dever.alert('拉起支付', 'none', function() {
 				self.$emit('view');
 			});
+			*/
 		},
 		showTip : function() {
 			this.tip = true;