Merge remote-tracking branch 'remotes/origin/zhoucong' into develop

# Conflicts:
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/vlog/myVlog/myVlog.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/vlog/vlogList/vlogList.js.map

common/request.js

@@ -14,9 +14,11 @@ const request = (url = '', data = {}, type = 'POST') => {
             data:data,
             dataType: 'json',         
         }).then((response) => {
+			uni.hideLoading()
             let [error, res] = response;        
             resolve(res.data);
         }).catch(error => {
+			uni.hideLoading()
             let [err, res] = error;
             reject(err)
         })

pages/vlog/myVlog/myVlog.vue

@@ -28,7 +28,7 @@
 	export default {
 		data() {
 			return {
-				show: true, //显示默认页面
+				show: true, //跳转过渡页面
 				vlogList: [], //我的vlog集合
 			}
 		},
@@ -44,10 +44,10 @@
 				this.$request("wechatUser/myPage/getVlogRecord", {
 					openid: uni.getStorageSync("openid")
 				}).then(res => {
+					this.show = false
 					if(res.code==="00"){
 						this.vlogList = res.data
 						if (this.vlogList.length > 0) { //如果有数据
-							this.show = false
 							uni.setNavigationBarColor({ //动态更改导航条颜色
 								frontColor: '#ffffff',
 								backgroundColor: '#192033',

pages/vlog/vlogList/vlogList.vue

@@ -5,7 +5,7 @@
 				<video class="video" :src="item.productUrl" :poster="item.thumbImageUrl" @error="error" controls
 					play-btn-position="center" :id="index" @play="playing(index)"></video>
 				<view class="">
-					<button v-if="item.shareNumber===4" :data-productUrl="item.productUrl" :data-productId="item.productId" class="btnn"
+					<button v-if="item.shareNumber===0" :data-productUrl="item.productUrl" :data-productId="item.productId" class="btnn"
 						open-type="share">分享下载</button>
 					<button v-else class="btnn" @click="handleDownload">下载视频</button>
 					<text class="price">¥<text>0</text></text>