快手init

components/global/GLoading.vue

@@ -1,23 +1,4 @@
-<template>
+<template />
-  <view
-    v-show="show"
-    class="loading-box"
-    :style="{
-      'background-color': backColor
-    }"
-    @click="dismiss"
-  >
-    <image
-      class="rotateKey"
-      src="@/static/images/loading-svg.png"
-    />
-    <view class="loading">
-      <text class="loading-text">
-        {{ text }}
-      </text>
-    </view>
-  </view>
-</template>
 
 <script>
 export default {

components/global/GNavbar.vue

@@ -0,0 +1,130 @@
+<template>
+  <uni-nav-bar
+    :title="title"
+    :fixed="fixed"
+    :left-icon="leftIcon"
+    :right-icon="rightIcon"
+    :right-text="rightText"
+    :leftText="leftText"
+    :leftWidth="leftWidth"
+    :rightWidth="rightWidth"
+    :border="border"
+    :status-bar="true"
+    :class="title ? '' : 'uni-navbar-hide-title'"
+    :background-color="backgroudColor"
+    :color="color"
+    @clickLeft="clickLeftHandler"
+    @clickRight="clickRightHandler"
+  >
+    <template slot="left">
+      <slot name="left"></slot>
+    </template>
+    <template slot="default">
+      <slot name="default"></slot>
+    </template>
+    <template slot="right">
+      <slot name="right"></slot>
+    </template>
+  </uni-nav-bar>
+</template>
+
+<script>
+/**
+ * 导航栏
+ * @description 这里也是一个组件描述r
+ * @日期 2021-5-28 16:30:56
+ * @property {String} type = [button|input|...值域] 这里是属性描述
+ * @event {Function} tap 这是是事件描述
+ * @example https://ext.dcloud.net.cn/plugin?id=52 参考地址
+ */
+export default {
+  name: 'GNavbar',
+  props: {
+    leftExitMP: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      default: ''
+    },
+    leftText: {
+      type: String,
+      default: ''
+    },
+    leftIcon: {
+      type: String,
+      default: 'arrowleft'
+    },
+    rightIcon: {
+      type: String,
+      default: ''
+    },
+    rightText: {
+      type: String,
+      default: ''
+    },
+    fixed: {
+      type: Boolean,
+      default: true
+    },
+    border: {
+      type: Boolean,
+      default: false
+    },
+    customLeftFn: {
+      type: Boolean,
+      default: false
+    },
+    backgroudColor: {
+      type: String,
+      default: '#fff'
+    },
+    leftWidth: {
+      type: Number | String,
+      default: '120rpx'
+    },
+    rightWidth: {
+      type: Number | String,
+      default: '120rpx'
+    },
+    color: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return { routerLength: [] };
+  },
+  created() {
+    this.routerLength = getCurrentPages().length;
+  },
+  methods: {
+    clickLeftHandler() {
+      if (this.customLeftFn) {
+        this.$emit('clickLeft');
+      } else {
+        // #ifdef H5
+        if (window.history.length > 1) {
+          window.history.back();
+        } else {
+          window.location.href = '/pages/live/index';
+        }
+        // #endif
+        // #ifndef H5
+        uni.navigateBack();
+        // #endif
+      }
+    },
+    /**
+     * @description 右边按钮的事件
+
+     * @日期 2021-5-31 14:23:17
+     * @params {String} 参数描述
+     */
+    clickRightHandler() {
+      this.$emit('clickRight');
+    }
+  }
+};
+</script>

pages.json

@@ -65,7 +65,7 @@
 				"enablePullDownRefresh": false,
 				"navigationBarTextStyle": "black",
 				"backgroundColor": "#fff",
-				"navigationStyle": "custom",
+
 				"disableScroll": true
 			}
 
@@ -77,8 +77,8 @@
 				"enablePullDownRefresh": false,
 				"navigationBarTextStyle": "black",
 				"backgroundColor": "#fff",
-				"disableScroll": true,
+				"disableScroll": true
-				"navigationStyle": "custom"
+
 			}
 
 		},
@@ -133,20 +133,20 @@
 		"list": [{
 				"text": "短剧",
 				"pagePath": "pages/playlet/index",
-				"iconPath": "/static/tabbar/playlet_off.png",
+				"iconPath": "static/tabbar/playlet_off.png",
-				"selectedIconPath": "/static/tabbar/playlet_on.png"
+				"selectedIconPath": "static/tabbar/playlet_on.png"
 			},
 			{
 				"text": "发现",
 				"pagePath": "pages/discover/index",
-				"iconPath": "/static/tabbar/discover_off.png",
+				"iconPath": "static/tabbar/discover_off.png",
-				"selectedIconPath": "/static/tabbar/discover_on.png"
+				"selectedIconPath": "static/tabbar/discover_on.png"
 			},
 			{
 				"text": "我的",
 				"pagePath": "pages/my/index/index",
-				"iconPath": "/static/tabbar/my_off.png",
+				"iconPath": "static/tabbar/my_off.png",
-				"selectedIconPath": "/static/tabbar/my_on.png"
+				"selectedIconPath": "static/tabbar/my_on.png"
 			}
 		]
 	},

pages/discover/index.vue

@@ -1,17 +1,40 @@
 <template>
-  <view class="flex-1">
+  <view style="height: 100vh;">
-    <GLoading />
+    <view
-    <scroll-view
+      :style="{
-     
+        background: `linear-gradient(93deg, rgba(255, 220, 230,1) 45%, rgba(255, 238, 195, 1))`
+      }"
+    >
+      <GNavbar
+        left-width="200rpx"
+        backgroud-color="transparent"
+        :custom-left-fn="true"
+      >
+        <view
+          slot="left"
+          class="flex-row flex-center"
+        >
+          <text
+            class="fs-40"
+            style="color: #1a1a1a;font-weight: bold;"
+          >
+            某某短剧
+          </text>
+        </view>
+      </GNavbar>
+    </view>
+    <GList
       class="flex-1"
       style="z-index: 999;"
       scroll-y="true"
-      lower-threshold="30"
+      lower-threshold="300"
       @scrolltolower="scrollLower"
     >
       <view style="position: relative;">
         <view class="body-bg" />
-        <view class=" px-20 py-20">
+        <view
+          class=" px-20 py-20"
+        >
           <!-- <view class="high mb-20">
 		        <view class="high-title mb-24">
 		          <text class="high-title-text">
@@ -125,13 +148,13 @@
               </text>
             </view>
           </view>
-        </view>
           <u-loadmore :status="status" />
-        <!-- #ifndef H5 -->
-        <u-gap height="80" />
-        <!-- #endif -->
         </view>
-    </scroll-view>
+      </view>
+      <!-- #ifndef H5 -->
+      <u-gap height="160" />
+      <!-- #endif -->
+    </GList>
   </view>
 </template>
 
@@ -287,9 +310,9 @@ export default {
 }
 .body-bg {
 	position: absolute;
-	top: 0;
+	top: -4rpx;
 	width: 750rpx;
-	z-index: 2rpx;
+	
 	height: 434rpx;
 	background: url('https://diyyhdapi.qinjiu8.com/backImg.png');
 	background-size: 100% 100%;

pages/my/history/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="flex-1">
+  <view style="height:100vh;">
     <GList class="flex-1">
       <GLoading />
       <view

pages/my/index/index.vue

@@ -1,15 +1,39 @@
 <template>
   <view
-    class="flex-1"
+    
-    style="position: relative;"
+    style=";height:100vh;"
+  >
+    <view
+      :style="{
+        background: `linear-gradient(93deg, rgba(255, 220, 230,1) 45%, rgba(255, 238, 195, 1))`
+      }"
+    >
+      <GNavbar
+        left-width="200rpx"
+        backgroud-color="transparent"
+        :custom-left-fn="true"
+      >
+        <view
+          slot="left"
+          class="flex-row flex-center"
+        >
+          <text
+            class="fs-40"
+            style="color: #1a1a1a;font-weight: bold;"
+          >
+            某某短剧
+          </text>
+        </view>
+      </GNavbar>
+    </view>
+    
+    <view
+      class="flex-1"
+      style="position: relative"
     >
-    <GLoading />
       <view class="body-bg" />
       <view
-      class="flex-1"
+        style="z-index: 99;"
-      style="position: absolute;z-index: 9999;"
-    >
-      <view
         class="px-28 flex-row pt-48 "
         @click="getUserInfo"
       >
@@ -50,7 +74,10 @@
           </text>
         </view>
       </view>
-      <view class="userInfo mt-48 px-30 flex-row mb-20">
+      <view
+        class="userInfo mt-48 px-30 flex-row mb-20"
+        style="z-index: 99;"
+      >
         <view
           class="flex-row flex-1 "
           style="align-items: center;"
@@ -357,7 +384,7 @@ export default {
 }
 .body-bg {
 	position: absolute;
-	top: 2rpx;
+	top: -4rpx;
 	width: 750rpx;
 	z-index: 0;
 	height: 434rpx;

pages/my/recharge/index.vue

@@ -1,13 +1,10 @@
 <template>
+  <view sytle="height:100%;background: #fff;">
     <GList
-    class="flex-1"
+      v-if="dataList.length !== 0"
-    style="background: #F3F4F6;"
+      style="background: #F3F4F6;height: 100vh;"
-  >
-    <GLoading />
-    <view
-      v-if="dataList.length !==0"
-      class="px-30 py-28"
     >
+      <view class="px-30 py-28">
         <view
           v-for="(item, index) in dataList"
           :key="index"
@@ -49,18 +46,18 @@
           </view>
         </view>
       </view>
+    </GList>
     <view
       v-else
       class="flex-1 flex-center"
       style="height: 100%;background-color: #ffffff;"
     >
       <GNoData
-       
         image="pay-noData"
         text="暂无充值记录~"
       />
     </view>
-  </GList>
+  </view>
 </template>
 
 <script>

pages/playlet/components/pursue.vue

@@ -69,7 +69,7 @@
     </view>
 
     <!-- #ifndef H5 -->
-    <u-gap height="80" />
+    <u-gap height="160" />
     <!-- #endif -->
   </GList>
 </template>

pages/playlet/components/recommend.vue

@@ -141,7 +141,7 @@
       </view>
       <GFooter />
       <!-- #ifndef H5 -->
-      <u-gap height="80" />
+      <u-gap height="160" />
       <!-- #endif -->
     </view>
   </GList>

pages/playlet/index.vue

@@ -1,9 +1,6 @@
 <template>
-  <view class="flex-1">
+	<view  :style="`height:100vh`">
-    <GLoading />
-
 		<view
-      class="header_tabs flex-row px-20"
 			:style="{
 				background: `linear-gradient(93deg, rgba(255, 220, 230, ${
 					swiperIndex === 0 ? backOpacityOne : backOpacity
@@ -12,6 +9,21 @@
 				}))`
 			}"
 		>
+			<GNavbar
+				left-width="200rpx"
+				backgroud-color="transparent"
+				:custom-left-fn="true"
+			>
+				<view slot="left" class="flex-row flex-center">
+					<text
+						class="fs-40"
+						style="color: #1a1a1a;font-weight: bold;"
+					>
+						某某短剧
+					</text>
+				</view>
+			</GNavbar>
+			<view class="header_tabs flex-row px-20">
 				<view class="">
 					<u-tabs
 						:list="tabList"
@@ -27,32 +39,25 @@
 							fontWeight: 'bold'
 						}"
 						:item-style="{
-            'padding-left':0,
+							'padding-left': 0,
-            'padding-right':'50rpx'
+							'padding-right': '50rpx'
 						}"
 						line-height="0"
 						@click="tabsClick"
 					/>
 				</view>
-      <view
+				<view class="search" @click="navSearch">
-        class="search"
-        @click="navSearch"
-      >
 					<view
 						class="search-view flex-row"
 						style="align-items: center;"
 					>
-          <u-icon
+						<u-icon name="/static/icon/search.png" size="24rpx" />
-            name="/static/icon/search.png"
+						<text class="search-text"> 寻找你喜欢的短剧 </text>
-            size="24rpx"
-          />
-          <text class="search-text">
-            寻找你喜欢的短剧
-          </text>
 					</view>
 				</view>
 			</view>
-
+		</view>
+		<view class="flex-1">
 			<swiper
 				class="flex-1"
 				:current="swiperIndex"
@@ -76,6 +81,7 @@
 
 			<GSignMadel ref="GSignMadel" />
 		</view>
+	</view>
 </template>
 
 <script>
@@ -96,10 +102,11 @@ export default {
 				}
 			],
 			keyword: '',
-			swiperIndex:1,
+			swiperIndex: 1,
 			backOpacity: 1,
 			backOpacityOne: 0,
-			time: null
+			time: null,
+			statusBarHeight:''
 		};
 	},
 	computed: {
@@ -108,39 +115,35 @@ export default {
 		}
 	},
 	onShow() {
+		this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight * 2 + 'rpx';
 		setTimeout(() => {
 			this.$showLoading(false);
-			
 		}, 1000);
-		if(this.swiperIndex === 1){
+		if (this.swiperIndex === 1) {
-			setTimeout(()=>{
+			setTimeout(() => {
 				this.$refs.Recommend.getList();
-			},500);
+			}, 500);
 		} else {
-			setTimeout(()=>{
+			setTimeout(() => {
 				this.$refs.Pursue.getList();
-			},500);
+			}, 500);
 		}
 	},
 	onLoad() {
-		const uid = uni.getStorageSync('uid')|| '';
+		// const uid = uni.getStorageSync('uid') || '';
 
-		if(!uid){
+		// if (!uid) {
-			uni.login({
+		// 	uni.login({
-				success: function(loginRes) {
+		// 		success: function(loginRes) {
-					reg({
+		// 			reg({
-						code:loginRes.code
+		// 				code: loginRes.code
-					}).then(res=>{
+		// 			}).then(res => {
 
-							uni.setStorageSync('uid', res.uid );
+		// 			});
-					
+		// 		}
-						
+		// 	});
-						
+		// }
-					});
+		uni.setStorageSync('uid', 3);
-				
-				}
-			});
-		}
 	},
 	methods: {
 		swiperChange(e) {
@@ -185,7 +188,6 @@ export default {
 }
 
 .header_tabs {
-	z-index: 999;
 	height: 90rpx;
 	justify-content: space-between;
 	align-items: center;

pages/video/index.vue

@@ -1,10 +1,11 @@
 <template>
   <view
-    class="flex-1"
+    style="background-color: #000000;height:100vh;"
-    style="background-color: #000000;"
   >
     <GLoading :back-color="'#000'" />
+  
     <swiper
+     
       :duration="500"
       vertical
       class="flex-1"
@@ -16,7 +17,6 @@
         v-for="(item, index) in videoList"
         :key="index"
         class="flex-1"
-        @touchmove.stop="stopTouchMove"
       >
         <!-- 视频 -->
         <video
@@ -31,10 +31,13 @@
           :src="item.video_url"
           :play-strategy="1"
           :show-fullscreen-btn="false"
+          @touchStart="touchStart"
+          @touchEnd="touchEnd"
           @play="videoPlay"
         />
       </swiper-item>
     </swiper>
+ 
     <view
       v-if="watchInfo.order"
       class="jishu1"