dever 4 years ago
parent
commit
f71ce23048
6 changed files with 36 additions and 23 deletions
  1. 1 1
      lib/dever/components/share.vue
  2. 7 2
      lib/dever/config.js
  3. 10 16
      lib/dever/index.js
  4. 6 3
      pages/dream/view.vue
  5. 6 0
      pages/index/index.vue
  6. 6 1
      pages/index/list.vue

+ 1 - 1
lib/dever/components/share.vue

@@ -76,7 +76,7 @@
 			},
 			
 			init : function() {
-				this.Dever.shareInit(wx, 1, 1, this.data);
+				this.Dever.shareInit(wx, 1, false, this.data);
 			},
 			
 			share : function(type) {

+ 7 - 2
lib/dever/config.js

@@ -5,13 +5,17 @@ const base = {
 
 const im = {
 	host : 'ws://he.shemic.com:8282'
+}
+
+const share = {
+	host : 'https://he.shemic.com/package/share/?l=api.'
 }
 
 //http request请求配置
 const request = {
 	//	服务器接口地址
 	host: "https://he.shemic.com/",
-	host: "http://dev.shemic.com/dreamland/",
+	//host: "http://dev.shemic.com/dreamland/",
 	
 	//	请求的参数	
 	data: {},
@@ -47,5 +51,6 @@ export default {
 	request,
 	server,
 	upload,
-	im,
+	im,
+	share,
 }

+ 10 - 16
lib/dever/index.js

@@ -30,7 +30,7 @@ var http = {
 		var self = this;
 		if (vue == 'post') {
 			config.request.method = 'POST';
-			config.request.method = 'GET';
+			//config.request.method = 'GET';
 			vue = false;
 		} else {
 			config.request.method = 'GET';
@@ -630,8 +630,12 @@ var share =
         var self = this;
 		self.wx = wx;
         self.wechat = dever.is_weixin();
-        self.project = project;
-        self.url = host;
+        self.project = project;
+		self.url = host;
+		if (!host) {
+			self.url = config.share.host;
+		}
+        
         self.token = http.getToken();
         self.param = param;
 		self.param.timelineCallback = function() {};
@@ -655,10 +659,9 @@ var share =
 		options.url = location.href.split('#')[0];
 		options.noloading = 1;
 		options.token = this.token;
-		http.request('post', url, options, function(result) {
-			var data = result.data;
-			self.wx.config({
-			    //debug:true,
+		http.request('post', url, options, function(data) {
+			self.wx.config({ 
+			    debug:true,
 			    appId: data.appId,
 			    timestamp: data.timestamp,
 			    nonceStr: data.nonceStr,
@@ -677,15 +680,12 @@ var share =
 			        link: param.link,
 			        imgUrl: param.pic,
 			        success: function(res) {
-			            param.sendMessageCallback('success', res)
 			            self.shareLog(1, 1);
 			        },
 			        cancel: function(res) {
-			            param.sendMessageCallback('cancel', res)
 			            self.shareLog(1, 2);
 			        },
 			        fail: function(res) {
-			            param.sendMessageCallback('fail', res)
 			            self.shareLog(1, 3);
 			        }
 			    });
@@ -694,15 +694,12 @@ var share =
 			        link: param.url,
 			        imgUrl: param.img,
 			        success: function(res) {
-			            param.timelineCallback('success', res)
 			            self.shareLog(2, 1);
 			        },
 			        cancel: function(res) {
-			            param.timelineCallback('cancel', res)
 			            self.shareLog(2, 2);
 			        },
 			        fail: function(res) {
-			            param.timelineCallback('fail', res)
 			            self.shareLog(2, 3);
 			        }
 			    });
@@ -711,15 +708,12 @@ var share =
 			        link: param.url,
 			        imgUrl: param.img,
 			        success: function(res) {
-			            param.shareQQCallback('success', res)
 			            self.shareLog(3, 1);
 			        },
 			        cancel: function(res) {
-			            param.shareQQCallback('cancel', res)
 			            self.shareLog(3, 2);
 			        },
 			        fail: function(res) {
-			            param.shareQQCallback('fail', res)
 			            self.shareLog(3, 3);
 			        }
 			    });

+ 6 - 3
pages/dream/view.vue

@@ -57,7 +57,9 @@
 				
 				<y-Fab v-if="!drawer.show && fetch.user.avatar && show" :bottom="20" :right="20" :btnList="drawer.button" :bgmPlay="bgm.playing" @click="clickDrawerButton" :text="`P`+(swiper.index+1)" :icon_o="fetch.user.avatar"></y-Fab>
 				<y-Fab v-if="!show" :bottom="20" :right="20" @click="goHome" :text="`更多`"></y-Fab>
-			</view>
+			</view>
+			
+			<dever-share ref="share" :data="fetch.share" v-if="fetch.share"></dever-share>
 		</view>
 	</gracePage>
 </template>
@@ -70,7 +72,8 @@ import my from "@/pages/dream/func/my.vue";
 import share from "@/pages/dream/func/share.vue";
 import dream from "@/pages/dream/view/dream.vue";
 import deverDrawerPage from "@/lib/dever/components/drawerPage.vue";
-import deverDrawerWindow from "@/lib/dever/components/drawerWindow.vue";
+import deverDrawerWindow from "@/lib/dever/components/drawerWindow.vue";
+import deverShare from '@/lib/dever/components/share.vue';
 export default{
 	data() {
 		return {
@@ -366,7 +369,7 @@ export default{
 		}
 	},
 	components:{
-		dream,cate,community,times,shop,my,share,deverDrawerPage,deverDrawerWindow
+		dream,cate,community,times,shop,my,share,deverDrawerPage,deverDrawerWindow,deverShare
 	}
 }
 </script>

+ 6 - 0
pages/index/index.vue

@@ -86,11 +86,13 @@
 					
 				</view>
 			</view>
+			<dever-share ref="share" :data="fetch.share" v-if="fetch.share"></dever-share>
 		</view>
 	</view>
 </template>
 
 <script>
+	import deverShare from '@/lib/dever/components/share.vue';
 	export default {
 		data() {
 			return {
@@ -101,9 +103,13 @@
 					},
 					score : {},
 					xuanchuan : [],
+					share : false,
 				},
 			}
 		},
+		components:{
+			deverShare
+		},
 		onShow() {
 			this.getData();
 		},

+ 6 - 1
pages/index/list.vue

@@ -51,11 +51,13 @@
 			<button type="primary" class="drink-btn" size="default" @tap="home">我的家园</button>
 			<view class="font-size-sm text-color-primary" @tap="qun" style="display: none;">加入官方微信群</view>
 		</view>
+		
+		<dever-share ref="share" :data="fetch.share" v-if="fetch.share"></dever-share>
 	</view>
 </template>
 
 <script>
-
+import deverShare from '@/lib/dever/components/share.vue';
 export default {
 	components: {
 		
@@ -74,6 +76,9 @@ export default {
 			view: '',
 		}
 	},
+	components:{
+		deverShare
+	},
 	onLoad() {
 		
 	},