🐛 fixed bugs in share and prepare for release

idealclover · Feb 22, 2020 · 9e8d6c8 · 9e8d6c8
1 parent 708696d
commit 9e8d6c8
Show file tree

Hide file tree

Showing 13 changed files with 123 additions and 115 deletions.
diff --git a/UniTypecho/components/articledetail.vue b/UniTypecho/components/articledetail.vue
@@ -81,9 +81,7 @@
 							that.title = item.title;
 							that.thumb = item.thumb.type == 'self' ? item.thumb.url : null;
 							that.link = item.link;
-							console.log(that.donateQrURL)
-							console.log(that.showDonate)
-							if (!Util.isNull(that.donateQrURL) && that.showDonate  == true)
+							if (!Util.isNull(that.donateQrURL) && that.showDonate == true)
 								that.isShowDonate = true;
 							that.$emit('getInfo', {
 								"title": item.title,

diff --git a/UniTypecho/components/commentdetail.vue b/UniTypecho/components/commentdetail.vue
@@ -64,7 +64,7 @@
 		},
 		watch: {
 			cid: function(cid) {
-				if(this.isPage) this.getdetails(cid);
+				if (this.isPage) this.getdetails(cid);
 			},
 			refresh: function() {
 				this.getdetails(this.cid);
@@ -81,7 +81,7 @@
 		},
 		methods: {
 			getdetails(cid) {
-				if(Util.isNull(cid)) return;
+				if (Util.isNull(cid)) return;
 				let that = this;
 				Net.request({
 					url: API.getLikedNum(cid),
@@ -93,12 +93,12 @@
 							success: function(res) {
 								let datas = res.data.data;
 								let avatarList = [];
-								for(let i in datas){
+								for (let i in datas) {
 									let avatarUrl = datas[i]['avatarUrl'];
 									avatarList.push(avatarUrl);
 								}
 								let leftAvatars = that.likeNum - avatarList.length
-								for(let i = 0; i < leftAvatars; i++){
+								for (let i = 0; i < leftAvatars; i++) {
 									avatarList.push("https://i.loli.net/2020/02/21/suCXpZ4rxQFeMDn.jpg");
 								};
 								avatarList.reverse();
@@ -132,7 +132,7 @@
 			navigate(href, e) {
 				let re = new RegExp("^https:\/\/" + cfg.getdomain + "\/archives\/([0-9]*)\/?");
 				let str = href.match(re);
-				if(!Util.isNull(str)) {
+				if (!Util.isNull(str)) {
 					uni.navigateTo({
 						url: '/pages/post/post?cid=' + str[1]
 					});
@@ -142,16 +142,15 @@
 				window.open(href);
 				// #endif
 				// #ifdef APP-PLUS
-				plus.runtime.openURL(href, function(res) {
-				});
+				plus.runtime.openURL(href, function(res) {});
 				// #endif
 				// #ifdef MP
 				uni.setClipboardData({
 					data: href,
-					success: function(){
+					success: function() {
 						uni.showToast({
-						    title: '链接已复制',
-						    duration: 2000
+							title: '链接已复制',
+							duration: 2000
 						});
 					}
 				});
@@ -164,11 +163,12 @@
 	.cu-bar .action:first-child {
 		margin-left: 0;
 	}
+
 	.cu-avatar-group {
 		white-space: nowrap;
 	}
-	
+
 	.cu-list .cu-item .content {
 		word-break: break-all;
-	}	
+	}
 </style>
diff --git a/UniTypecho/components/commentsender/app.vue b/UniTypecho/components/commentsender/app.vue
@@ -199,12 +199,12 @@
 								0,
 							),
 							success: function(res) {
-								if(res.data.data.status == "waiting"){
+								if (res.data.data.status == "waiting") {
 									uni.showToast({
 										title: "请等待审核",
 										duration: 2000
 									});
-								}else if(res.data.data.status == "approved"){
+								} else if (res.data.data.status == "approved") {
 									uni.showToast({
 										title: "评论成功",
 										duration: 2000

diff --git a/UniTypecho/components/commentsender/h5.vue b/UniTypecho/components/commentsender/h5.vue
@@ -200,12 +200,12 @@
 								0,
 							),
 							success: function(res) {
-								if(res.data.data.status == "waiting"){
+								if (res.data.data.status == "waiting") {
 									uni.showToast({
 										title: "请等待审核",
 										duration: 2000
 									});
-								}else if(res.data.data.status == "approved"){
+								} else if (res.data.data.status == "approved") {
 									uni.showToast({
 										title: "评论成功",
 										duration: 2000

diff --git a/UniTypecho/components/commentsender/qq.vue b/UniTypecho/components/commentsender/qq.vue
@@ -147,12 +147,12 @@
 						getApp().globalData.userInfo.avatarUrl,
 					),
 					success: function(res) {
-						if(res.data.data.status == "waiting"){
+						if (res.data.data.status == "waiting") {
 							uni.showToast({
 								title: "请等待审核",
 								duration: 2000
 							});
-						}else if(res.data.data.status == "approved"){
+						} else if (res.data.data.status == "approved") {
 							uni.showToast({
 								title: "评论成功",
 								duration: 2000

diff --git a/UniTypecho/components/commentsender/toutiao.vue b/UniTypecho/components/commentsender/toutiao.vue
@@ -147,12 +147,12 @@
 						getApp().globalData.userInfo.avatarUrl,
 					),
 					success: function(res) {
-						if(res.data.data.status == "waiting"){
+						if (res.data.data.status == "waiting") {
 							uni.showToast({
 								title: "请等待审核",
 								duration: 2000
 							});
-						}else if(res.data.data.status == "approved"){
+						} else if (res.data.data.status == "approved") {
 							uni.showToast({
 								title: "评论成功",
 								duration: 2000

diff --git a/UniTypecho/components/commentsender/wx.vue b/UniTypecho/components/commentsender/wx.vue
@@ -106,12 +106,12 @@
 					}
 				})
 			},
-			getPoster(){
+			getPoster() {
 				uni.showLoading({
-				  title: "加载中",
-				  mask: false
+					title: "加载中",
+					mask: false
 				});
-				if(!this.isPage) {
+				if (!this.isPage) {
 					this.qrUrl = API.getPosterUrl('/page/index/index?cid=' + this.cid);
 				} else this.qrUrl = API.getPosterUrl('/pages/index/index');
 				this.imgUrl = Util.isNull(this.thumb) ? "https://api.isoyu.com/bing_images.php" : this.thumb;
@@ -123,19 +123,19 @@
 				this.modalName = "DialogModal2"
 				this.posterURL = res.tempFilePath;
 			},
-			savePoster(){
+			savePoster() {
 				let that = this;
 				uni.authorize({
-				    scope: 'scope.writePhotosAlbum',
-				    success() {
-				        uni.saveImageToPhotosAlbum({
-				        	filePath: that.posterURL,
-				        	success: function () {
-				        		that.loadDialogModal2 = false;
-				        		that.modalName = "";
-				        	}
-				        });
-				    }
+					scope: 'scope.writePhotosAlbum',
+					success() {
+						uni.saveImageToPhotosAlbum({
+							filePath: that.posterURL,
+							success: function() {
+								that.loadDialogModal2 = false;
+								that.modalName = "";
+							}
+						});
+					}
 				})
 			},
 			hidePoster() {
@@ -212,12 +212,12 @@
 						getApp().globalData.userInfo.avatarUrl,
 					),
 					success: function(res) {
-						if(res.data.data.status == "waiting"){
+						if (res.data.data.status == "waiting") {
 							uni.showToast({
 								title: "请等待审核",
 								duration: 2000
 							});
-						}else if(res.data.data.status == "approved"){
+						} else if (res.data.data.status == "approved") {
 							uni.showToast({
 								title: "评论成功",
 								duration: 2000
@@ -226,24 +226,24 @@
 						console.log('success');
 						that.$emit('onRefreshComments');
 						that.value = ""
-						if(Util.isNull(getApp().globalData.templateIds)) return;
+						if (Util.isNull(getApp().globalData.templateIds)) return;
 						uni.requestSubscribeMessage({
-						  tmplIds: getApp().globalData.templateIds,
-						  success (res) {
-							  console.log(res);
-							  Net.request({
-								  showLoading: false,
-								  url: API.subscribe(getApp().globalData.userInfo.openid),
-								  success: function(res) {}
-							  });
-							  uni.showToast({
-							  	title: "订阅成功",
-							  	duration: 2000
-							  });
-						  },
-						  fail (e) {
-							  console.log(e);
-						  }
+							tmplIds: getApp().globalData.templateIds,
+							success(res) {
+								console.log(res);
+								Net.request({
+									showLoading: false,
+									url: API.subscribe(getApp().globalData.userInfo.openid),
+									success: function(res) {}
+								});
+								uni.showToast({
+									title: "订阅成功",
+									duration: 2000
+								});
+							},
+							fail(e) {
+								console.log(e);
+							}
 						})
 					}
 				});

diff --git a/UniTypecho/pages/about/about.vue b/UniTypecho/pages/about/about.vue
@@ -6,11 +6,11 @@
 			<image src="/static/images/wave.gif" mode="scaleToFill" class="gif-wave"></image>
 		</view>
 		<view class="margin-xl">
-			<articledetail :cid="cid" :isPage="true" :showTools="false" @getInfo="getInfo"/>
+			<articledetail :cid="cid" :isPage="true" :showTools="false" @getInfo="getInfo" />
 			<commentdetail :cid="cid" :isPage="true" :refresh="refreshComments" v-if="showComments" />
 			<footerinfo />
 		</view>
-		<commentsender :cid="cid" :isPage="true" :title="title" :thumb="thumb" @onRefreshComments="onRefreshComments"  v-if="showComments" />
+		<commentsender :cid="cid" :isPage="true" :title="title" :thumb="thumb" @onRefreshComments="onRefreshComments" v-if="showComments" />
 	</view>
 </template>
 

diff --git a/UniTypecho/pages/index/index.vue b/UniTypecho/pages/index/index.vue
@@ -47,10 +47,9 @@
 				success: function(res) {
 					getApp().globalData.userInfo = res.userInfo;
 					Login.login({
-						success: function() {
-						}
+						success: function() {}
 					});
-					
+
 				}
 			});
 			// #endif
@@ -65,8 +64,8 @@
 					getApp().globalData.showComments = showComments;
 					getApp().globalData.showShare = showShare;
 					getApp().globalData.showDonate = showDonate;
-					if(!Util.isNull(templateIds)) getApp().globalData.templateIds = templateIds;
-					if(!Util.isNull(option.cid)){
+					if (!Util.isNull(templateIds)) getApp().globalData.templateIds = templateIds;
+					if (!Util.isNull(option.cid)) {
 						that.cid = option.cid;
 						uni.navigateTo({
 							url: '../post/post?cid=' + option.cid
@@ -75,13 +74,17 @@
 				}
 			});
 		},
-		// #ifdef MP-QQ
-		onShareAppMessage: function () {
-		    qq.showShareMenu({
+		onShareAppMessage: function() {
+			// #ifdef MP-QQ
+			qq.showShareMenu({
 				showShareItems: ['qq', 'qzone', 'wechatFriends', 'wechatMoment']
-		    })
+			});
+			// #endif
+			return {
+				title: '来看看这个博客小程序！',
+				path: '/pages/index/index?'
+			}
 		}
-		// #endif
 	}
 </script>
 

diff --git a/UniTypecho/pages/post/post.vue b/UniTypecho/pages/post/post.vue
@@ -53,7 +53,7 @@
 			getInfo(e) {
 				this.title = e.title;
 				this.thumb = e.thumb;
-				if(!this.isPage) {
+				if (!this.isPage) {
 					uni.setNavigationBarTitle({
 						title: e.title
 					});
@@ -63,10 +63,17 @@
 				this.refreshComments = !this.refreshComments;
 			}
 		},
-		onShareAppMessage: function () {
-		    qq.showShareMenu({
+		onShareAppMessage: function() {
+			// #ifdef MP-QQ
+			qq.showShareMenu({
 				showShareItems: ['qq', 'qzone', 'wechatFriends', 'wechatMoment']
-		    })
+			});
+			// #endif
+			return {
+				title: this.title,
+				path: '/pages/index/index?cid=' + this.cid,
+				imageUrl: this.thumb
+			}
 		}
 	}
 </script>

diff --git a/UniTypecho/utils/api.js b/UniTypecho/utils/api.js
@@ -154,15 +154,15 @@ module.exports = {
 	},
 	//#endif
 	//#ifndef MP
-	postComment: function(cid, name, mail, website, text, parent){
+	postComment: function(cid, name, mail, website, text, parent) {
 		return this.appendAPISEC(
 			API_URL + "postcomment?cid=" + cid + "&name=" + name + "&mail=" + mail + "&text=" + text + "&parent=" +
 			parent + "&website=" + website + "&type=app"
 		);
 	}
 	//#endif
 	// #ifdef MP-WEIXIN
-	subscribe: function(openid){
+	subscribe: function(openid) {
 		return this.appendAPISEC(
 			API_URL + "subscribe?openid=" + openid
 		);

diff --git a/UniTypecho/utils/login.js b/UniTypecho/utils/login.js
@@ -4,13 +4,13 @@ import Util from './util.js';
 
 function login(handler) {
 	uni.showLoading({
-	  title: "加载中",
-	  mask: false
+		title: "加载中",
+		mask: false
 	});
 	uni.login({
 		provider: 'weixin',
 		success: function(res) {
-			if(Util.isNull(getApp().globalData.userInfo)) {
+			if (Util.isNull(getApp().globalData.userInfo)) {
 				uni.hideLoading();
 				return;
 			}