guhongwei 2 年之前
父节点
当前提交
f8b26f645d
共有 100 个文件被更改,包括 16038 次插入10905 次删除
  1. 3 0
      App.vue
  2. 2 1
      manifest.json
  3. 31 5
      pages.json
  4. 3 7
      pages/index/index.vue
  5. 1 1
      pagesAccount/login/index.vue
  6. 31 2
      pagesHome/account/index.vue
  7. 33 3
      pagesHome/find/index.vue
  8. 80 74
      pagesHome/home/index.vue
  9. 95 74
      pagesHome/hot/index.vue
  10. 103 0
      pagesVideo/components/c-drawer.vue
  11. 237 0
      pagesVideo/more/index.vue
  12. 421 0
      pagesVideo/search/index.vue
  13. 22 0
      pagesVideo/video/index.vue
  14. 13 0
      uni_modules/uni-drawer/changelog.md
  15. 45 0
      uni_modules/uni-drawer/components/uni-drawer/keypress.js
  16. 183 0
      uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue
  17. 87 0
      uni_modules/uni-drawer/package.json
  18. 10 0
      uni_modules/uni-drawer/readme.md
  19. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  20. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  21. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  22. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/upload/index.js.map
  23. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  24. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/basic/index.js.map
  25. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/collect/index.js.map
  26. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/like/index.js.map
  27. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/login/index.js.map
  28. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/other/agree.js.map
  29. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/register/index.js.map
  30. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesCommon/test/index.js.map
  31. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/account/index.js.map
  32. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/app/index.js.map
  33. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/components/home-frame.js.map
  34. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/find/index.js.map
  35. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/home/index.js.map
  36. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/hot/index.js.map
  37. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesVideo/components/c-drawer.js.map
  38. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesVideo/more/index.js.map
  39. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesVideo/search/index.js.map
  40. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesVideo/video/index.js.map
  41. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js.map
  42. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.js.map
  43. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map
  44. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map
  45. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map
  46. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
  47. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map
  48. 1 1
      unpackage/dist/dev/app-plus/__uniapppicker.js
  49. 2 2
      unpackage/dist/dev/app-plus/app-config-service.js
  50. 320 143
      unpackage/dist/dev/app-plus/app-service.js
  51. 1830 593
      unpackage/dist/dev/app-plus/app-view.js
  52. 1 1
      unpackage/dist/dev/app-plus/manifest.json
  53. 55 55
      unpackage/dist/dev/app-plus/pagesAccount/app-sub-service.js
  54. 9 9
      unpackage/dist/dev/app-plus/pagesCommon/app-sub-service.js
  55. 326 445
      unpackage/dist/dev/app-plus/pagesHome/app-sub-service.js
  56. 865 0
      unpackage/dist/dev/app-plus/pagesVideo/app-sub-service.js
  57. 1 1
      unpackage/dist/dev/app-plus/view.css
  58. 2 2
      unpackage/dist/dev/app-plus/view.umd.min.js
  59. 8 0
      unpackage/dist/dev/mp-weixin/app.json
  60. 5 5
      unpackage/dist/dev/mp-weixin/common/main.js
  61. 1 0
      unpackage/dist/dev/mp-weixin/common/main.wxss
  62. 2 2
      unpackage/dist/dev/mp-weixin/common/runtime.js
  63. 9209 9163
      unpackage/dist/dev/mp-weixin/common/vendor.js
  64. 24 24
      unpackage/dist/dev/mp-weixin/components/upload/index.js
  65. 14 17
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  66. 16 16
      unpackage/dist/dev/mp-weixin/pagesAccount/basic/index.js
  67. 11 11
      unpackage/dist/dev/mp-weixin/pagesAccount/collect/index.js
  68. 11 11
      unpackage/dist/dev/mp-weixin/pagesAccount/like/index.js
  69. 14 14
      unpackage/dist/dev/mp-weixin/pagesAccount/login/index.js
  70. 1 1
      unpackage/dist/dev/mp-weixin/pagesAccount/login/index.wxml
  71. 11 11
      unpackage/dist/dev/mp-weixin/pagesAccount/other/agree.js
  72. 16 16
      unpackage/dist/dev/mp-weixin/pagesAccount/register/index.js
  73. 12 12
      unpackage/dist/dev/mp-weixin/pagesCommon/test/index.js
  74. 43 15
      unpackage/dist/dev/mp-weixin/pagesHome/account/index.js
  75. 12 12
      unpackage/dist/dev/mp-weixin/pagesHome/app/index.js
  76. 23 23
      unpackage/dist/dev/mp-weixin/pagesHome/components/home-frame.js
  77. 55 12
      unpackage/dist/dev/mp-weixin/pagesHome/find/index.js
  78. 1 1
      unpackage/dist/dev/mp-weixin/pagesHome/find/index.wxml
  79. 1 1
      unpackage/dist/dev/mp-weixin/pagesHome/find/index.wxss
  80. 91 49
      unpackage/dist/dev/mp-weixin/pagesHome/home/index.js
  81. 1 1
      unpackage/dist/dev/mp-weixin/pagesHome/home/index.wxml
  82. 111 44
      unpackage/dist/dev/mp-weixin/pagesHome/hot/index.js
  83. 1 1
      unpackage/dist/dev/mp-weixin/pagesHome/hot/index.wxml
  84. 245 0
      unpackage/dist/dev/mp-weixin/pagesVideo/components/c-drawer.js
  85. 7 0
      unpackage/dist/dev/mp-weixin/pagesVideo/components/c-drawer.json
  86. 1 0
      unpackage/dist/dev/mp-weixin/pagesVideo/components/c-drawer.wxml
  87. 46 0
      unpackage/dist/dev/mp-weixin/pagesVideo/components/c-drawer.wxss
  88. 466 0
      unpackage/dist/dev/mp-weixin/pagesVideo/more/index.js
  89. 7 0
      unpackage/dist/dev/mp-weixin/pagesVideo/more/index.json
  90. 1 0
      unpackage/dist/dev/mp-weixin/pagesVideo/more/index.wxml
  91. 76 0
      unpackage/dist/dev/mp-weixin/pagesVideo/more/index.wxss
  92. 6 0
      unpackage/dist/dev/mp-weixin/pagesVideo/search/index-uni-forms-item-default.js
  93. 11 0
      unpackage/dist/dev/mp-weixin/pagesVideo/search/index-uni-forms-item-default.json
  94. 1 0
      unpackage/dist/dev/mp-weixin/pagesVideo/search/index-uni-forms-item-default.wxml
  95. 2 0
      unpackage/dist/dev/mp-weixin/pagesVideo/search/index-uni-forms-item-default.wxss
  96. 500 0
      unpackage/dist/dev/mp-weixin/pagesVideo/search/index.js
  97. 12 0
      unpackage/dist/dev/mp-weixin/pagesVideo/search/index.json
  98. 1 0
      unpackage/dist/dev/mp-weixin/pagesVideo/search/index.wxml
  99. 121 0
      unpackage/dist/dev/mp-weixin/pagesVideo/search/index.wxss
  100. 0 0
      unpackage/dist/dev/mp-weixin/pagesVideo/video/index.js

+ 3 - 0
App.vue

@@ -81,11 +81,13 @@
 
 <style>
 	@import url('@/uni.scss');
+
 	.textOver {
 		overflow: hidden;
 		text-overflow: ellipsis;
 		white-space: nowrap;
 	}
+
 	page {
 		/* 主要背景色 */
 		--rgb000: #000000;
@@ -94,5 +96,6 @@
 		--rgbf1f: #f1f1f1;
 		--rgb161: #161616;
 		--rgbfa4: #FA4343;
+		--rgb67c: #67c23a;
 	}
 </style>

+ 2 - 1
manifest.json

@@ -45,7 +45,8 @@
             },
             /* SDK配置 */
             "sdkConfigs" : {
-                "ad" : {}
+                "ad" : {},
+                "share" : {}
             },
             "icons" : {
                 "android" : {

+ 31 - 5
pages.json

@@ -65,31 +65,31 @@
 						"navigationBarTitleText": "账号登录",
 						"enablePullDownRefresh": false //是否启用下拉刷新
 					}
-				},{
+				}, {
 					"path": "register/index",
 					"style": {
 						"navigationBarTitleText": "账号注册",
 						"enablePullDownRefresh": false //是否启用下拉刷新
 					}
-				},{
+				}, {
 					"path": "other/agree",
 					"style": {
 						"navigationBarTitleText": "用户协议",
 						"enablePullDownRefresh": false //是否启用下拉刷新
 					}
-				},{
+				}, {
 					"path": "like/index",
 					"style": {
 						"navigationBarTitleText": "我的喜欢",
 						"enablePullDownRefresh": true //是否启用下拉刷新
 					}
-				},{
+				}, {
 					"path": "collect/index",
 					"style": {
 						"navigationBarTitleText": "我的收藏",
 						"enablePullDownRefresh": true //是否启用下拉刷新
 					}
-				},{
+				}, {
 					"path": "basic/index",
 					"style": {
 						"navigationBarTitleText": "账号信息",
@@ -97,6 +97,32 @@
 					}
 				}
 			]
+		},
+		{
+			"root": "pagesVideo", 
+			"pages": [ //
+				{
+					"path": "video/index",
+					"style": {
+						"navigationBarTitleText": "详细信息",
+						"enablePullDownRefresh": true //是否启用下拉刷新
+					}
+				},
+				{
+					"path": "search/index",
+					"style": {
+						"navigationBarTitleText": "视频筛选",
+						"enablePullDownRefresh": true //是否启用下拉刷新
+					}
+				},
+				{
+					"path": "more/index",
+					"style": {
+						"navigationBarTitleText": "更多",
+						"enablePullDownRefresh": true //是否启用下拉刷新
+					}
+				}
+			]
 		}
 	],
 	"globalStyle": {

+ 3 - 7
pages/index/index.vue

@@ -37,12 +37,8 @@
 		methods: {
 			async search() {
 				const that = this;
-				let url = '/pagesHome/find/index';
-				// 可返回
-				// uni.navigateTo({
-				// 	url
-				// })
-				let res = await that.$api('appbasic', 'GET');
+				let url = '/pagesVideo/search/index';
+				let res = await that.$api('appbasic', 'GET', {});
 				if (res.errcode == '0') {
 					that.$set(that, `basicInfo`, res.data)
 					uni.setStorage({
@@ -54,7 +50,7 @@
 							// 	url
 							// })
 							// 可返回
-							uni.navigateTo({
+							uni.redirectTo({
 								url
 							})
 						}

+ 1 - 1
pagesAccount/login/index.vue

@@ -9,7 +9,7 @@
 					<uni-easyinput type="text" v-model="form.account" placeholder="请输入登录账号" />
 				</uni-forms-item>
 				<uni-forms-item name="password">
-					<uni-easyinput type="text" v-model="form.password" placeholder="请输入登录密码" />
+					<uni-easyinput type="password" v-model="form.password" placeholder="请输入登录密码" />
 				</uni-forms-item>
 			</uni-forms>
 			<view class="agree">

+ 31 - 2
pagesHome/account/index.vue

@@ -106,7 +106,7 @@
 				const that = this;
 				if (e.is_jump == '0') {
 					if (e.nature == 'share') {
-						console.log('分享');
+						that.share()
 					} else if (e.nature == 'logout') {
 						uni.removeStorage({
 							key: 'token',
@@ -118,7 +118,7 @@
 								that.searchBasic()
 							},
 							fail: (err) => {
-								close(err)
+								console.log(err);
 							}
 						});
 					}
@@ -130,6 +130,35 @@
 					})
 				}
 			},
+			// 分享
+			share() {
+				const that = this;
+				let system = that.$config.system
+				let basicInfo = that.basicInfo;
+				if (system.uniPlatform == 'app') {
+					uni.share({
+						provider: "weixin",
+						scene: "WXSceneSession",
+						type: 0,
+						href: "http://uniapp.dcloud.io/",
+						title: system.appName,
+						summary: "我正在玩益智游戏,赶紧和我一起体验吧",
+						imageUrl: basicInfo.logo_url && basicInfo.logo_url.length > 0 ? basicInfo.logo_url[0].url :
+							'',
+						success: function(res) {
+							console.log("success:" + JSON.stringify(res));
+						},
+						fail: function(err) {
+							console.log("fail:" + JSON.stringify(err));
+						}
+					});
+				} else if (system.uniPlatform == 'mp-weixin') {
+					uni.showToast({
+						title: '小程序未开通分享功能!',
+						icon: "none"
+					})
+				}
+			},
 			// 跳转页面
 			toPath(e) {
 				let url = `/${e.route}`;

+ 33 - 3
pagesHome/find/index.vue

@@ -13,7 +13,8 @@
 							推荐
 						</view>
 						<view class="two_2">
-							<view class="list" v-for="(item,index) in recomList" :key="index">
+							<view class="list" v-for="(item,index) in recomList" :key="index"
+								@tap="toCommon('pagesVideo/more/index',item)">
 								<image class="image"
 									:src="item.img_url&&item.img_url.length>0?item.img_url[0].url:'../../static/error.jpg'"
 									mode="">
@@ -25,7 +26,8 @@
 							全部
 						</view>
 						<view class="two_2">
-							<view class="list" v-for="(item,index) in list" :key="index">
+							<view class="list" v-for="(item,index) in list" :key="index"
+								@tap="toCommon('pagesVideo/more/index',item)">
 								<image class="image"
 									:src="item.img_url&&item.img_url.length>0?item.img_url[0].url:'../../static/error.jpg'"
 									mode="">
@@ -151,6 +153,34 @@
 				let num = Math.sign(up - e.detail.scrollTop);
 				if (num == 1) that.$set(that, `is_bottom`, false);
 			},
+			async toCommon(route, e) {
+				const that = this;
+				let res;
+				let firm_id = '';
+				let type_id = '';
+				let place_id = '';
+				let year = '';
+				let head_actor = '';
+				res = await that.$api(`scenetype/${e.type_id}`, 'GET', {});
+				if (res.errcode == '0') {
+					if (res.data && res.data.title == "厂商") {
+						firm_id = e.id;
+					} else if (res.data && res.data.title == "类型") {
+						type_id = e.id;
+					} else if (res.data && res.data.title == "产地") {
+						place_id = e.id;
+					} else if (res.data && res.data.title == "年份") {
+						year = e.id;
+					} else if (res.data && res.data.title == "演员") {
+						head_actor = e.id;
+					}
+				}
+				let query = firm_id ? `firm_id=${firm_id}` : type_id ? `type_id=${type_id}` : place_id ?
+					`place_id=${place_id}` : year ? `year=${year}` : head_actor ? `head_actor=${head_actor}` : '';
+				uni.navigateTo({
+					url: `/${route}?${query}`
+				})
+			},
 			// 清空列表
 			clearPage() {
 				const that = this;
@@ -247,7 +277,7 @@
 						width: 100%;
 						text-align: center;
 						left: 0;
-						color: var(--rgb000);
+						color: var(--rgbfff);
 						font-size: 12px;
 						font-family: monospace;
 					}

+ 80 - 74
pagesHome/home/index.vue

@@ -3,10 +3,10 @@
 		<view class="main">
 			<view class="one">
 				<view class="one_1">
-					<input type="text" placeholder="搜索视频" @tap="toCommon('')">
+					<input type="text" placeholder="搜索视频" @tap="toCommon('pagesVideo/search/index','')">
 				</view>
 				<view class="one_2">
-					<button size="mini">筛选</button>
+					<button size="mini" @tap="toCommon('pagesVideo/search/index','')">筛选</button>
 				</view>
 			</view>
 			<view class="two">
@@ -39,17 +39,19 @@
 									<span>最新</span>
 								</view>
 								<view class="top_2">
-									<span>更多<uni-icons color="var(--rgbfff)" size="12" type="forward"></uni-icons>
+									<span @tap="toCommon('pagesVideo/more/index',``)">
+										更多
+										<uni-icons color="var(--rgbfff)" size="12" type="forward"></uni-icons>
 									</span>
 								</view>
 							</view>
 							<view class="info">
-								<view class="list" v-for="(item,index) in videoList" :key="index">
+								<view class="list" v-for="(item,index) in nvideoList" :key="index">
 									<image class="image"
 										:src="item.img_url&&item.img_url.length>0?item.img_url[0].url:''" mode="">
 									</image>
 									<view class="name textOver">
-										{{item.name}}
+										{{item.title}}
 									</view>
 									<view class="other">
 										<view class="other_1">
@@ -63,7 +65,7 @@
 								</view>
 							</view>
 							<view class="btn">
-								<button>查看更多</button>
+								<button @tap="toCommon('pagesVideo/more/index',``)">查看更多</button>
 							</view>
 						</view>
 						<view class="two_0 two_5">
@@ -72,17 +74,19 @@
 									<span>Hot</span>
 								</view>
 								<view class="top_2">
-									<span>更多<uni-icons color="var(--rgbfff)" size="12" type="forward"></uni-icons>
+									<span @tap="toCommon('pagesVideo/more/index',`is_hot=1`)">
+										更多
+										<uni-icons color="var(--rgbfff)" size="12" type="forward"></uni-icons>
 									</span>
 								</view>
 							</view>
 							<view class="info">
-								<view class="list" v-for="(item,index) in videoList" :key="index">
+								<view class="list" v-for="(item,index) in hotList" :key="index">
 									<image class="image"
 										:src="item.img_url&&item.img_url.length>0?item.img_url[0].url:''" mode="">
 									</image>
 									<view class="name textOver">
-										{{item.name}}
+										{{item.title}}
 									</view>
 									<view class="other">
 										<view class="other_1">
@@ -96,26 +100,28 @@
 								</view>
 							</view>
 							<view class="btn">
-								<button>查看更多</button>
+								<button @tap="toCommon('pagesVideo/more/index',`is_hot=1`)">查看更多</button>
 							</view>
 						</view>
 						<view class="two_0 two_5">
 							<view class="top">
 								<view class="top_1 textOver">
-									<span>恐怖</span>
+									<span>{{one_title}}</span>
 								</view>
 								<view class="top_2">
-									<span>更多<uni-icons color="var(--rgbfff)" size="12" type="forward"></uni-icons>
+									<span @tap="toCommon('pagesVideo/more/index',`type_id=63f7154721efa85eb49b8bb7`)">
+										更多
+										<uni-icons color="var(--rgbfff)" size="12" type="forward"></uni-icons>
 									</span>
 								</view>
 							</view>
 							<view class="info">
-								<view class="list" v-for="(item,index) in videoList" :key="index">
+								<view class="list" v-for="(item,index) in oneList" :key="index">
 									<image class="image"
 										:src="item.img_url&&item.img_url.length>0?item.img_url[0].url:''" mode="">
 									</image>
 									<view class="name textOver">
-										{{item.name}}
+										{{item.title}}
 									</view>
 									<view class="other">
 										<view class="other_1">
@@ -129,26 +135,29 @@
 								</view>
 							</view>
 							<view class="btn">
-								<button>查看更多</button>
+								<button
+									@tap="toCommon('pagesVideo/more/index',`type_id=63f7154721efa85eb49b8bb7`)">查看更多</button>
 							</view>
 						</view>
 						<view class="two_0 two_6">
 							<view class="top">
 								<view class="top_1 textOver">
-									<span>动作</span>
+									<span>{{two_title}}</span>
 								</view>
 								<view class="top_2">
-									<span>更多<uni-icons color="var(--rgbfff)" size="12" type="forward"></uni-icons>
+									<span @tap="toCommon('pagesVideo/more/index',`type_id=63f7150321efa85eb49b8b7f`)">
+										更多
+										<uni-icons color="var(--rgbfff)" size="12" type="forward"></uni-icons>
 									</span>
 								</view>
 							</view>
 							<view class="info">
-								<view class="list" v-for="(item,index) in videoList" :key="index">
+								<view class="list" v-for="(item,index) in twoList" :key="index">
 									<image class="image"
 										:src="item.img_url&&item.img_url.length>0?item.img_url[0].url:''" mode="">
 									</image>
 									<view class="name textOver">
-										{{item.name}}
+										{{item.title}}
 									</view>
 									<view class="other">
 										<view class="other_1">
@@ -162,40 +171,8 @@
 								</view>
 							</view>
 							<view class="btn">
-								<button>查看更多</button>
-							</view>
-						</view>
-						<view class="two_0 two_6">
-							<view class="top">
-								<view class="top_1 textOver">
-									<span>科幻</span>
-								</view>
-								<view class="top_2">
-									<span>更多<uni-icons color="var(--rgbfff)" size="12" type="forward"></uni-icons>
-									</span>
-								</view>
-							</view>
-							<view class="info">
-								<view class="list" v-for="(item,index) in videoList" :key="index">
-									<image class="image"
-										:src="item.img_url&&item.img_url.length>0?item.img_url[0].url:''" mode="">
-									</image>
-									<view class="name textOver">
-										{{item.name}}
-									</view>
-									<view class="other">
-										<view class="other_1">
-											<uni-icons type="eye" color="var(--rgbfff)" size="12"></uni-icons>
-											{{item.view_num}}
-										</view>
-										<view class="other_2">
-											{{item.time_num}}
-										</view>
-									</view>
-								</view>
-							</view>
-							<view class="btn">
-								<button>查看更多</button>
+								<button
+									@tap="toCommon('pagesVideo/more/index',`type_id=63f7150321efa85eb49b8b7f`)">查看更多</button>
 							</view>
 						</view>
 					</view>
@@ -215,23 +192,12 @@
 			return {
 				bannerList: [],
 				linkList: [],
-				videoList: [ // 视频
-					{
-						name: '哈哈哈哈',
-						img_url: [ //
-							{
-								id: "20230216100918",
-								name: "头像.jpg",
-								status: "success",
-								uid: 1676513358695,
-								uri: "/files/projectadmin/imgurl/20230216100918.jpg",
-								url: "http://47.93.34.200/files/projectadmin/imgurl/20230216100918.jpg"
-							}
-						],
-						view_num: 0,
-						time_num: '00:00:00'
-					},
-				]
+				nvideoList: [],
+				hotList: [],
+				one_title: '',
+				oneList: [],
+				two_title: '',
+				twoList: []
 			};
 		},
 		onLoad() {
@@ -248,16 +214,51 @@
 					place: '0',
 					is_use: '0'
 				});
-				if (res.errcode == '0') {
-					that.$set(that, `bannerList`, res.data)
-				}
+				if (res.errcode == '0') that.$set(that, `bannerList`, res.data)
 				// 热门链接
 				res = await that.$api('hotlink', 'GET', {
 					place: '0',
 					is_use: '0'
 				});
+				if (res.errcode == '0') that.$set(that, `linkList`, res.data)
+				// 最新视频
+				res = await that.$api('videos', 'GET', {
+					skip: 0,
+					limit: 6,
+					is_use: '0'
+				})
+				if (res.errcode == '0') that.$set(that, `nvideoList`, res.data)
+				// 热推视频
+				res = await that.$api('videos', 'GET', {
+					skip: 0,
+					limit: 6,
+					is_use: '0',
+					is_hot: '1'
+				})
+				if (res.errcode == '0') that.$set(that, `hotList`, res.data)
+				// 惊悚
+				res = await that.$api('scenedata/63f7154721efa85eb49b8bb7', 'GET', {});
 				if (res.errcode == '0') {
-					that.$set(that, `linkList`, res.data)
+					that.$set(that, `one_title`, res.data.title);
+					res = await that.$api('videos', 'GET', {
+						skip: 0,
+						limit: 4,
+						is_use: '0',
+						type_id: res.data._id
+					})
+					if (res.errcode == '0') that.$set(that, `oneList`, res.data)
+				}
+				// 动作
+				res = await that.$api('scenedata/63f7150321efa85eb49b8b7f', 'GET', {});
+				if (res.errcode == '0') {
+					that.$set(that, `two_title`, res.data.title);
+					res = await that.$api('videos', 'GET', {
+						skip: 0,
+						limit: 4,
+						is_use: '0',
+						type_id: res.data._id
+					})
+					if (res.errcode == '0') that.$set(that, `twoList`, res.data)
 				}
 			},
 			toWeb(e) {
@@ -272,6 +273,11 @@
 					})
 				}
 			},
+			toCommon(route, query) {
+				uni.navigateTo({
+					url: `/${route}?${query}`
+				})
+			},
 			// 跳转页面
 			toPath(e) {
 				let url = `/${e.route}`;

+ 95 - 74
pagesHome/hot/index.vue

@@ -3,10 +3,10 @@
 		<view class="main">
 			<view class="one">
 				<view class="one_1">
-					<input type="text" placeholder="搜索视频" @tap="toCommon('')">
+					<input type="text" placeholder="搜索视频" @tap="toCommon('pagesVideo/search/index','')">
 				</view>
 				<view class="one_2">
-					<button size="mini">筛选</button>
+					<button size="mini" @tap="toCommon('pagesVideo/search/index','')">筛选</button>
 				</view>
 			</view>
 			<view class="two">
@@ -14,7 +14,8 @@
 					<view class="list-scroll-view">
 						<view class="two_0 two_1">
 							<swiper class="swiper" :autoplay="true" :interval="3000" :duration="1000">
-								<swiper-item class="list" v-for="(item,index) in bannerList" :key="index" @tap="toWeb(item)">
+								<swiper-item class="list" v-for="(item,index) in bannerList" :key="index"
+									@tap="toWeb(item)">
 									<image class="image"
 										:src="item.img_url&&item.img_url.length>0?item.img_url[0].url:''" mode="">
 									</image>
@@ -22,7 +23,8 @@
 							</swiper>
 						</view>
 						<view class="two_0 two_2">
-							<view class="list textOver" v-for="(item,index) in linkList" :key="index" @tap="toWeb(item)">
+							<view class="list textOver" v-for="(item,index) in linkList" :key="index"
+								@tap="toWeb(item)">
 								<image class="image" :src="item.img_url&&item.img_url.length>0?item.img_url[0].url:''"
 									mode="">
 								</image>
@@ -34,20 +36,23 @@
 						<view class="two_0 two_4">
 							<view class="top">
 								<view class="top_1 textOver">
-									<span>最新</span>
+									<span>{{one_title}}</span>
 								</view>
 								<view class="top_2">
-									<span>更多<uni-icons color="var(--rgbfff)" size="12" type="forward"></uni-icons>
+									<span
+										@tap="toCommon('pagesVideo/more/index','head_actor=63f7175721efa85eb49b8ccd')">
+										更多
+										<uni-icons color="var(--rgbfff)" size="12" type="forward"></uni-icons>
 									</span>
 								</view>
 							</view>
 							<view class="info">
-								<view class="list" v-for="(item,index) in videoList" :key="index">
+								<view class="list" v-for="(item,index) in oneList" :key="index">
 									<image class="image"
 										:src="item.img_url&&item.img_url.length>0?item.img_url[0].url:''" mode="">
 									</image>
 									<view class="name textOver">
-										{{item.name}}
+										{{item.title}}
 									</view>
 									<view class="other">
 										<view class="other_1">
@@ -61,26 +66,30 @@
 								</view>
 							</view>
 							<view class="btn">
-								<button>查看更多</button>
+								<button
+									@tap="toCommon('pagesVideo/more/index','head_actor=63f7175721efa85eb49b8ccd')">查看更多</button>
 							</view>
 						</view>
 						<view class="two_0 two_5">
 							<view class="top">
 								<view class="top_1 textOver">
-									<span>Hot</span>
+									<span>{{two_title}}</span>
 								</view>
 								<view class="top_2">
-									<span>更多<uni-icons color="var(--rgbfff)" size="12" type="forward"></uni-icons>
+									<span
+										@tap="toCommon('pagesVideo/more/index','head_actor=63f7177221efa85eb49b8cdd')">
+										更多
+										<uni-icons color="var(--rgbfff)" size="12" type="forward"></uni-icons>
 									</span>
 								</view>
 							</view>
 							<view class="info">
-								<view class="list" v-for="(item,index) in videoList" :key="index">
+								<view class="list" v-for="(item,index) in twoList" :key="index">
 									<image class="image"
 										:src="item.img_url&&item.img_url.length>0?item.img_url[0].url:''" mode="">
 									</image>
 									<view class="name textOver">
-										{{item.name}}
+										{{item.title}}
 									</view>
 									<view class="other">
 										<view class="other_1">
@@ -94,26 +103,27 @@
 								</view>
 							</view>
 							<view class="btn">
-								<button>查看更多</button>
+								<button
+									@tap="toCommon('pagesVideo/more/index','head_actor=63f7177221efa85eb49b8cdd')">查看更多</button>
 							</view>
 						</view>
 						<view class="two_0 two_5">
 							<view class="top">
 								<view class="top_1 textOver">
-									<span>恐怖</span>
+									<span>{{thr_title}}</span>
 								</view>
 								<view class="top_2">
-									<span>更多<uni-icons color="var(--rgbfff)" size="12" type="forward"></uni-icons>
+									<span @tap="toCommon('pagesVideo/more/index','head_actor=63f7177f21efa85eb49b8ced')">更多<uni-icons color="var(--rgbfff)" size="12" type="forward"></uni-icons>
 									</span>
 								</view>
 							</view>
 							<view class="info">
-								<view class="list" v-for="(item,index) in videoList" :key="index">
+								<view class="list" v-for="(item,index) in thrList" :key="index">
 									<image class="image"
 										:src="item.img_url&&item.img_url.length>0?item.img_url[0].url:''" mode="">
 									</image>
 									<view class="name textOver">
-										{{item.name}}
+										{{item.title}}
 									</view>
 									<view class="other">
 										<view class="other_1">
@@ -127,26 +137,26 @@
 								</view>
 							</view>
 							<view class="btn">
-								<button>查看更多</button>
+								<button @tap="toCommon('pagesVideo/more/index','head_actor=63f7177f21efa85eb49b8ced')">查看更多</button>
 							</view>
 						</view>
 						<view class="two_0 two_6">
 							<view class="top">
 								<view class="top_1 textOver">
-									<span>动作</span>
+									<span>{{four_title}}</span>
 								</view>
 								<view class="top_2">
-									<span>更多<uni-icons color="var(--rgbfff)" size="12" type="forward"></uni-icons>
+									<span @tap="toCommon('pagesVideo/more/index','head_actor=63f729ff3271105df0a88859')">更多<uni-icons color="var(--rgbfff)" size="12" type="forward"></uni-icons>
 									</span>
 								</view>
 							</view>
 							<view class="info">
-								<view class="list" v-for="(item,index) in videoList" :key="index">
+								<view class="list" v-for="(item,index) in fourList" :key="index">
 									<image class="image"
 										:src="item.img_url&&item.img_url.length>0?item.img_url[0].url:''" mode="">
 									</image>
 									<view class="name textOver">
-										{{item.name}}
+										{{item.title}}
 									</view>
 									<view class="other">
 										<view class="other_1">
@@ -160,40 +170,7 @@
 								</view>
 							</view>
 							<view class="btn">
-								<button>查看更多</button>
-							</view>
-						</view>
-						<view class="two_0 two_6">
-							<view class="top">
-								<view class="top_1 textOver">
-									<span>科幻</span>
-								</view>
-								<view class="top_2">
-									<span>更多<uni-icons color="var(--rgbfff)" size="12" type="forward"></uni-icons>
-									</span>
-								</view>
-							</view>
-							<view class="info">
-								<view class="list" v-for="(item,index) in videoList" :key="index">
-									<image class="image"
-										:src="item.img_url&&item.img_url.length>0?item.img_url[0].url:''" mode="">
-									</image>
-									<view class="name textOver">
-										{{item.name}}
-									</view>
-									<view class="other">
-										<view class="other_1">
-											<uni-icons type="eye" color="var(--rgbfff)" size="12"></uni-icons>
-											{{item.view_num}}
-										</view>
-										<view class="other_2">
-											{{item.time_num}}
-										</view>
-									</view>
-								</view>
-							</view>
-							<view class="btn">
-								<button>查看更多</button>
+								<button @tap="toCommon('pagesVideo/more/index','head_actor=63f729ff3271105df0a88859')">查看更多</button>
 							</view>
 						</view>
 					</view>
@@ -213,23 +190,14 @@
 			return {
 				bannerList: [],
 				linkList: [],
-				videoList: [ // 视频
-					{
-						name: '哈哈哈哈',
-						img_url: [ //
-							{
-								id: "20230216100918",
-								name: "头像.jpg",
-								status: "success",
-								uid: 1676513358695,
-								uri: "/files/projectadmin/imgurl/20230216100918.jpg",
-								url: "http://47.93.34.200/files/projectadmin/imgurl/20230216100918.jpg"
-							}
-						],
-						view_num: 0,
-						time_num: '00:00:00'
-					}
-				]
+				one_title: '',
+				oneList: [],
+				two_title: '',
+				twoList: [],
+				thr_title: '',
+				thrList: [],
+				four_title: '',
+				fourList: [],
 			};
 		},
 		onLoad() {
@@ -257,6 +225,54 @@
 				if (res.errcode == '0') {
 					that.$set(that, `linkList`, res.data)
 				}
+				// 顾红伟
+				res = await that.$api('scenedata/63f7175721efa85eb49b8ccd', 'GET', {});
+				if (res.errcode == '0') {
+					that.$set(that, `one_title`, res.data.title);
+					res = await that.$api('videos', 'GET', {
+						skip: 0,
+						limit: 6,
+						is_use: '0',
+						head_actor: res.data._id
+					})
+					if (res.errcode == '0') that.$set(that, `oneList`, res.data)
+				}
+				// 成龙
+				res = await that.$api('scenedata/63f7177221efa85eb49b8cdd', 'GET', {});
+				if (res.errcode == '0') {
+					that.$set(that, `two_title`, res.data.title);
+					res = await that.$api('videos', 'GET', {
+						skip: 0,
+						limit: 4,
+						is_use: '0',
+						head_actor: res.data._id
+					})
+					if (res.errcode == '0') that.$set(that, `twoList`, res.data)
+				}
+				// 李连杰
+				res = await that.$api('scenedata/63f7177f21efa85eb49b8ced', 'GET', {});
+				if (res.errcode == '0') {
+					that.$set(that, `thr_title`, res.data.title);
+					res = await that.$api('videos', 'GET', {
+						skip: 0,
+						limit: 6,
+						is_use: '0',
+						head_actor: res.data._id
+					})
+					if (res.errcode == '0') that.$set(that, `thrList`, res.data)
+				}
+				// 李小龙
+				res = await that.$api('scenedata/63f729ff3271105df0a88859', 'GET', {});
+				if (res.errcode == '0') {
+					that.$set(that, `four_title`, res.data.title);
+					res = await that.$api('videos', 'GET', {
+						skip: 0,
+						limit: 4,
+						is_use: '0',
+						head_actor: res.data._id
+					})
+					if (res.errcode == '0') that.$set(that, `fourList`, res.data)
+				}
 			},
 			toWeb(e) {
 				const that = this;
@@ -270,6 +286,11 @@
 					})
 				}
 			},
+			toCommon(route, query) {
+				uni.navigateTo({
+					url: `/${route}?${query}`
+				})
+			},
 			// 跳转页面
 			toPath(e) {
 				let url = `/${e.route}`;

+ 103 - 0
pagesVideo/components/c-drawer.vue

@@ -0,0 +1,103 @@
+<template>
+	<view>
+		<uni-drawer ref="drawerShow" :mode="drawer.mode" :maskClick="false" width="290">
+			<view class="drawer">
+				<view class="drawer_1">
+					<view class="left textOver">
+						{{drawer.title||'弹窗'}}
+					</view>
+					<view class="right">
+						<uni-icons type="clear" size="30" @tap="drawerClose()"></uni-icons>
+					</view>
+				</view>
+				<view class="drawer_2">
+					<scroll-view scroll-y="true" class="scroll-view">
+						<view class="list-scroll-view">
+							<view class="info">
+								<slot></slot>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+		</uni-drawer>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			drawer: {
+				type: Object
+			}
+		},
+		data() {
+			return {};
+		},
+		methods: {
+			drawerOpen() {
+				const that = this;
+				that.$refs.drawerShow.open();
+			},
+			drawerClose() {
+				const that = this;
+				that.$refs.drawerShow.close();
+				that.$emit('toClose')
+			}
+		},
+		watch: {
+			drawer(newVal) {
+				const that = this;
+				if (newVal.show == true) that.drawerOpen();
+				else if (newVal.show == false) that.drawerClose();
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.drawer {
+		display: flex;
+		flex-direction: column;
+		width: 77vw;
+		height: 100vh;
+
+		.drawer_1 {
+			display: flex;
+			justify-content: space-between;
+			padding: 2vw;
+
+			.left {
+				flex-grow: 1;
+				font-weight: bold;
+				padding: 1vw 0;
+				font-size: 16px;
+				font-family: monospace;
+			}
+		}
+
+		.drawer_2 {
+			flex-grow: 1;
+			position: relative;
+			padding: 0 2vw;
+
+			.info {
+				padding: 0 2vw;
+			}
+		}
+	}
+
+	.scroll-view {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+
+		.list-scroll-view {
+			display: flex;
+			flex-direction: column;
+			padding: 0 !important;
+		}
+	}
+</style>

+ 237 - 0
pagesVideo/more/index.vue

@@ -0,0 +1,237 @@
+<template>
+	<view class="content">
+		<view class="one">
+			<input type="text" v-model="searchInfo.title" @blur="toInput" placeholder="请输入视频名称">
+		</view>
+		<view class="two">
+			<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage" @scroll="toScroll">
+				<view class="list-scroll-view">
+					<view class="two_1">
+						<view class="list" v-for="(item,index) in list" :key="index">
+							<image class="image" :src="item.img_url&&item.img_url.length>0?item.img_url[0].url:''"
+								mode="">
+							</image>
+							<view class="name textOver">
+								{{item.title}}
+							</view>
+							<view class="other">
+								<view class="other_1">
+									<uni-icons type="eye" color="var(--rgbfff)" size="12"></uni-icons>
+									{{item.view_num}}
+								</view>
+								<view class="other_2">
+									{{item.time_num}}
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				searchInfo: {},
+				list: [],
+				total: 0,
+				page: 0,
+				skip: 0,
+				limit: 10,
+				// 数据是否触底
+				is_bottom: false,
+				scrollTop: 0
+			}
+		},
+		onLoad(options) {
+			const that = this;
+			that.$set(that, `searchInfo`, options);
+			that.searchOther();
+			that.search();
+		},
+		onHide() {
+			const that = this;
+			// that.clearPage()
+		},
+		onPullDownRefresh: async function() {
+			const that = this;
+			that.clearPage();
+			await that.search();
+			uni.stopPullDownRefresh();
+		},
+		methods: {
+			async search() {
+				const that = this;
+				let info = {
+					skip: that.skip,
+					limit: that.limit,
+				}
+				let res = await that.$api('videos', 'GET', {
+					...info,
+					...that.searchInfo,
+				})
+				if (res.errcode == '0') {
+					let list = [...that.list, ...res.data]
+					that.$set(that, `list`, list);
+					that.$set(that, `total`, res.total);
+				}
+			},
+			async searchOther() {
+				const that = this;
+				if (that.searchInfo.is_hot) {
+					uni.setNavigationBarTitle({
+						title: '热播'
+					});
+				} else {
+					let res;
+					if (that.searchInfo.firm_id) {
+						res = await that.$api(`scenedata/${that.searchInfo.firm_id}`)
+					} else if (that.searchInfo.type_id) {
+						res = await that.$api(`scenedata/${that.searchInfo.type_id}`)
+					} else if (that.searchInfo.place_id) {
+						res = await that.$api(`scenedata/${that.searchInfo.place_id}`)
+					} else if (that.searchInfo.year) {
+						res = await that.$api(`scenedata/${that.searchInfo.year}`)
+					} else if (that.searchInfo.head_actor) {
+						res = await that.$api(`scenedata/${that.searchInfo.head_actor}`)
+					}
+					if (res.errcode == '0') {
+						uni.setNavigationBarTitle({
+							title: res.data.title
+						});
+					}
+				}
+			},
+			toInput(e) {
+				const that = this;
+				let title = e.detail.value;
+				if (title) that.$set(that.searchInfo, `title`, title);
+				else delete that.searchInfo.title;
+				that.clearPage();
+				that.search()
+			},
+			toPage() {
+				const that = this;
+				let list = that.list;
+				let limit = that.limit;
+				if (that.total > list.length) {
+					uni.showLoading({
+						title: '加载中',
+						mask: true
+					})
+					let page = that.page + 1;
+					that.$set(that, `page`, page)
+					let skip = page * limit;
+					that.$set(that, `skip`, skip)
+					that.search();
+					uni.hideLoading();
+
+				} else that.$set(that, `is_bottom`, true)
+			},
+			toScroll(e) {
+				const that = this;
+				let up = that.scrollTop;
+				that.$set(that, `scrollTop`, e.detail.scrollTop);
+				let num = Math.sign(up - e.detail.scrollTop);
+				if (num == 1) that.$set(that, `is_bottom`, false);
+			},
+			// 清空列表
+			clearPage() {
+				const that = this;
+				that.$set(that, `list`, [])
+				that.$set(that, `skip`, 0)
+				that.$set(that, `limit`, 10)
+				that.$set(that, `page`, 0)
+				if (!that.searchInfo.title) delete that.searchInfo.title;
+			},
+		},
+
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		background-color: var(--rgb111);
+
+		.one {
+			padding: 2vw;
+
+			input {
+				border: 1px solid var(--rgbf1f);
+				border-radius: 5px;
+				padding: 5px;
+				font-size: 14px;
+				color: var(--rgbfff);
+			}
+		}
+
+		.two {
+			flex-grow: 1;
+			position: relative;
+
+			.two_1 {
+				display: flex;
+				flex-wrap: wrap;
+
+				.list {
+					width: 48%;
+					margin: 0 10px 10px 0;
+
+					.image {
+						width: 100%;
+						height: 100px;
+						overflow: hidden;
+						border-radius: 5px;
+						box-shadow: 0 0 5px var(--rgbf1f);
+						margin: 0 0 5px 0;
+					}
+
+					.name {
+						font-size: 14px;
+						color: var(--rgbfff);
+						margin: 0 0 5px 0;
+					}
+
+					.other {
+						display: flex;
+						color: var(--rgbfff);
+						font-size: 12px;
+						justify-content: space-between;
+					}
+				}
+
+				.list:nth-child(2n) {
+					margin: 0 0 10px 0;
+				}
+			}
+		}
+	}
+
+	.scroll-view {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+
+		.list-scroll-view {
+			display: flex;
+			flex-direction: column;
+			padding: 0 2vw;
+		}
+	}
+
+	.is_bottom {
+		text-align: center;
+
+		text {
+			padding: 2vw 0;
+			display: inline-block;
+			color: #858585;
+			font-size: 14px;
+		}
+	}
+</style>

+ 421 - 0
pagesVideo/search/index.vue

@@ -0,0 +1,421 @@
+<template>
+	<view class="content">
+		<view class="one">
+			<view class="one_1">
+				<input type="text" v-model="searchInfo.title" @blur="toInput" placeholder="请输入视频名称">
+			</view>
+			<view class="one_2">
+				<button size="mini" @tap="toFilter()">筛选</button>
+			</view>
+		</view>
+		<view class="two">
+			<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage" @scroll="toScroll">
+				<view class="list-scroll-view">
+					<view class="two_1">
+						<view class="list" v-for="(item,index) in list" :key="index">
+							<image class="image" :src="item.img_url&&item.img_url.length>0?item.img_url[0].url:''"
+								mode="">
+							</image>
+							<view class="name textOver">
+								{{item.title}}
+							</view>
+							<view class="other">
+								<view class="other_1">
+									<uni-icons type="eye" color="var(--rgbfff)" size="12"></uni-icons>
+									{{item.view_num}}
+								</view>
+								<view class="other_2">
+									{{item.time_num}}
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+		<c-drawer :drawer="drawer" @toClose="toClose">
+			<view class="drawer_one">
+				<view class="drawer_one_1">
+					<uni-forms ref="searchInfo" :model="searchInfo" label-width="auto">
+						<uni-forms-item>
+							<template>
+								<view class="label">是否热推</view>
+								<view class="value">
+									<uni-data-checkbox mode="tag" v-model="searchInfo.is_hot" :localdata="isnoList"
+										:map="{text:'label',value:'value'}"></uni-data-checkbox>
+								</view>
+							</template>
+						</uni-forms-item>
+						<uni-forms-item>
+							<template>
+								<view class="label">厂商</view>
+								<view class="value">
+									<uni-data-checkbox mode="tag" v-model="searchInfo.firm_id" :localdata="firmList"
+										:map="{text:'title',value:'id'}"></uni-data-checkbox>
+								</view>
+							</template>
+						</uni-forms-item>
+						<uni-forms-item>
+							<template>
+								<view class="label">类型</view>
+								<view class="value">
+									<uni-data-checkbox mode="tag" v-model="searchInfo.type_id" :localdata="typeList"
+										:map="{text:'title',value:'id'}"></uni-data-checkbox>
+								</view>
+							</template>
+						</uni-forms-item>
+						<uni-forms-item>
+							<template>
+								<view class="label">产地</view>
+								<view class="value">
+									<uni-data-checkbox mode="tag" v-model="searchInfo.place_id" :localdata="placeList"
+										:map="{text:'title',value:'id'}"></uni-data-checkbox>
+								</view>
+							</template>
+						</uni-forms-item>
+						<uni-forms-item>
+							<template>
+								<view class="label">年份</view>
+								<view class="value">
+									<uni-data-checkbox mode="tag" v-model="searchInfo.year" :localdata="yearList"
+										:map="{text:'title',value:'id'}"></uni-data-checkbox>
+								</view>
+							</template>
+						</uni-forms-item>
+						<uni-forms-item>
+							<template>
+								<view class="label">领衔演员</view>
+								<view class="value">
+									<uni-data-checkbox mode="tag" v-model="searchInfo.head_actor" :localdata="actorList"
+										:map="{text:'title',value:'id'}"></uni-data-checkbox>
+								</view>
+							</template>
+						</uni-forms-item>
+					</uni-forms>
+				</view>
+				<view class="drawer_one_2">
+					<button size="mini" @tap="toReset()">重置</button>
+					<button size="mini" @tap="toSave()">确认</button>
+				</view>
+			</view>
+		</c-drawer>
+	</view>
+</template>
+
+<script>
+	import cDrawer from "../components/c-drawer.vue";
+	export default {
+		components: {
+			cDrawer
+		},
+		data() {
+			return {
+				searchInfo: {},
+				list: [],
+				total: 0,
+				page: 0,
+				skip: 0,
+				limit: 10,
+				// 数据是否触底
+				is_bottom: false,
+				scrollTop: 0,
+				drawer: {
+					title: '筛选',
+					show: false,
+					mode: 'right'
+				},
+				// 字典表
+				isnoList: [],
+				firmList: [],
+				typeList: [],
+				placeList: [],
+				yearList: [],
+				actorList: [],
+
+			}
+		},
+		async onLoad() {
+			const that = this;
+			await that.searchOther();
+			await that.search();
+		},
+		onHide() {
+			const that = this;
+			// that.clearPage()
+		},
+		onPullDownRefresh: async function() {
+			const that = this;
+			that.clearPage();
+			await that.search();
+			uni.stopPullDownRefresh();
+		},
+		methods: {
+			async search() {
+				const that = this;
+				let info = {
+					skip: that.skip,
+					limit: that.limit,
+				}
+				let res = await that.$api('videos', 'GET', {
+					...info,
+					...that.searchInfo,
+				})
+				if (res.errcode == '0') {
+					let list = [...that.list, ...res.data]
+					that.$set(that, `list`, list);
+					that.$set(that, `total`, res.total);
+				}
+			},
+			toInput(e) {
+				const that = this;
+				let title = e.detail.value;
+				if (title) that.$set(that.searchInfo, `title`, title);
+				else delete that.searchInfo.title;
+				that.clearPage();
+				that.search()
+			},
+			toPage() {
+				const that = this;
+				let list = that.list;
+				let limit = that.limit;
+				if (that.total > list.length) {
+					uni.showLoading({
+						title: '加载中',
+						mask: true
+					})
+					let page = that.page + 1;
+					that.$set(that, `page`, page)
+					let skip = page * limit;
+					that.$set(that, `skip`, skip)
+					that.search();
+					uni.hideLoading();
+
+				} else that.$set(that, `is_bottom`, true)
+			},
+			toScroll(e) {
+				const that = this;
+				let up = that.scrollTop;
+				that.$set(that, `scrollTop`, e.detail.scrollTop);
+				let num = Math.sign(up - e.detail.scrollTop);
+				if (num == 1) that.$set(that, `is_bottom`, false);
+			},
+			// 打开弹框
+			toFilter() {
+				const that = this;
+				that.drawer = {
+					title: '筛选',
+					show: true,
+					mode: 'right'
+				}
+			},
+			// 重置
+			toReset() {
+				const that = this;
+				that.$set(that, `searchInfo`, {})
+				that.clearPage();
+				that.search()
+			},
+			toSave() {
+				const that = this;
+				that.clearPage();
+				that.toClose();
+				that.search()
+			},
+			// 关闭弹框
+			toClose() {
+				const that = this;
+				that.drawer = {
+					title: '筛选',
+					show: false,
+					mode: 'right'
+				}
+			},
+			// 查询其他信息
+			async searchOther() {
+				const that = this;
+				let res;
+				// 是否
+				res = await that.$api('dictdata', 'GET', {
+					type: 'is_no'
+				})
+				if (res.errcode == '0') {
+					that.$set(that, `isnoList`, res.data)
+				}
+				res = await that.$api('scenetype', 'GET', {
+					is_use: '0'
+				})
+				if (res.errcode == '0') {
+					for (const val of res.data) {
+						let arr;
+						let type = '';
+						if (val.title == '厂商') type = 'firm';
+						else if (val.title == '类型') type = 'type';
+						else if (val.title == '产地') type = 'place';
+						else if (val.title == '年份') type = 'year';
+						else if (val.title == '演员') type = 'actor';
+						arr = await that.$api('scenedata', 'GET', {
+							is_use: '0',
+							type_id: val._id
+						})
+						if (arr.errcode == '0') {
+							that.$set(that, `${type}List`, arr.data);
+						}
+					}
+				}
+			},
+			// 清空列表
+			clearPage() {
+				const that = this;
+				that.$set(that, `list`, [])
+				that.$set(that, `skip`, 0)
+				that.$set(that, `limit`, 10)
+				that.$set(that, `page`, 0)
+				if (!that.searchInfo.title) delete that.searchInfo.title;
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		background-color: var(--rgb111);
+
+		.one {
+			background-color: var(--rgb111);
+			display: flex;
+			padding: 2vw;
+
+			.one_1 {
+				flex-grow: 1;
+
+				input {
+					border: 1px solid var(--rgbf1f);
+					height: 30px;
+					border-radius: 2px;
+					padding: 0 5px;
+					font-size: 12px;
+					color: var(--rgbfff);
+				}
+			}
+
+			.one_2 {
+				button {
+					height: 100%;
+					background-color: var(--rgbfa4);
+					color: var(--rgbfff);
+				}
+			}
+		}
+
+		.two {
+			flex-grow: 1;
+			position: relative;
+
+			.two_1 {
+				display: flex;
+				flex-wrap: wrap;
+
+				.list {
+					width: 48%;
+					margin: 0 10px 10px 0;
+
+					.image {
+						width: 100%;
+						height: 100px;
+						overflow: hidden;
+						border-radius: 5px;
+						box-shadow: 0 0 5px var(--rgbf1f);
+						margin: 0 0 5px 0;
+					}
+
+					.name {
+						font-size: 14px;
+						color: var(--rgbfff);
+						margin: 0 0 5px 0;
+					}
+
+					.other {
+						display: flex;
+						color: var(--rgbfff);
+						font-size: 12px;
+						justify-content: space-between;
+					}
+				}
+
+				.list:nth-child(2n) {
+					margin: 0 0 10px 0;
+				}
+			}
+		}
+	}
+
+	.scroll-view {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+
+		.list-scroll-view {
+			display: flex;
+			flex-direction: column;
+			padding: 0 2vw;
+		}
+	}
+
+	.is_bottom {
+		text-align: center;
+
+		text {
+			padding: 2vw 0;
+			display: inline-block;
+			color: #858585;
+			font-size: 14px;
+		}
+	}
+
+	.drawer_one {
+		display: flex;
+		flex-direction: column;
+		width: 77vw;
+		height: 92vh;
+
+		.drawer_one_1 {
+			flex-grow: 1;
+			overflow-y: auto;
+
+			.uni-forms-item {
+				margin: 0;
+			}
+
+			.label {
+				font-weight: bold;
+				margin: 0 0 5px 0;
+			}
+
+			.value {}
+		}
+
+		.drawer_one_2 {
+			text-align: center;
+			padding: 2vw 0;
+
+			button {
+				width: 30%;
+				height: 100%;
+				margin: 0 2vw;
+
+			}
+
+			button:nth-child(1) {
+				background-color: var(--rgbfa4);
+				color: var(--rgbfff);
+			}
+
+			button:nth-child(2) {
+				background-color: var(--rgb67c);
+				color: var(--rgbfff);
+			}
+		}
+	}
+</style>

+ 22 - 0
pagesVideo/video/index.vue

@@ -0,0 +1,22 @@
+<template>
+	<view class="content">
+		更多
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

+ 13 - 0
uni_modules/uni-drawer/changelog.md

@@ -0,0 +1,13 @@
+## 1.2.1(2021-11-22)
+- 修复 vue3中个别scss变量无法找到的问题
+## 1.2.0(2021-11-19)
+- 优化 组件UI,并提供设计资源,详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移,详见:[https://uniapp.dcloud.io/component/uniui/uni-drawer](https://uniapp.dcloud.io/component/uniui/uni-drawer)
+## 1.1.1(2021-07-30)
+- 优化 vue3下事件警告的问题
+## 1.1.0(2021-07-13)
+- 组件兼容 vue3,如何创建vue3项目,详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.7(2021-05-12)
+- 新增 组件示例地址
+## 1.0.6(2021-02-04)
+- 调整为uni_modules目录规范

+ 45 - 0
uni_modules/uni-drawer/components/uni-drawer/keypress.js

@@ -0,0 +1,45 @@
+// #ifdef H5
+export default {
+  name: 'Keypress',
+  props: {
+    disable: {
+      type: Boolean,
+      default: false
+    }
+  },
+  mounted () {
+    const keyNames = {
+      esc: ['Esc', 'Escape'],
+      tab: 'Tab',
+      enter: 'Enter',
+      space: [' ', 'Spacebar'],
+      up: ['Up', 'ArrowUp'],
+      left: ['Left', 'ArrowLeft'],
+      right: ['Right', 'ArrowRight'],
+      down: ['Down', 'ArrowDown'],
+      delete: ['Backspace', 'Delete', 'Del']
+    }
+    const listener = ($event) => {
+      if (this.disable) {
+        return
+      }
+      const keyName = Object.keys(keyNames).find(key => {
+        const keyName = $event.key
+        const value = keyNames[key]
+        return value === keyName || (Array.isArray(value) && value.includes(keyName))
+      })
+      if (keyName) {
+        // 避免和其他按键事件冲突
+        setTimeout(() => {
+          this.$emit(keyName, {})
+        }, 0)
+      }
+    }
+    document.addEventListener('keyup', listener)
+    // this.$once('hook:beforeDestroy', () => {
+    //   document.removeEventListener('keyup', listener)
+    // })
+  },
+	render: () => {}
+}
+// #endif

+ 183 - 0
uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue

@@ -0,0 +1,183 @@
+<template>
+	<view v-if="visibleSync" :class="{ 'uni-drawer--visible': showDrawer }" class="uni-drawer" @touchmove.stop.prevent="clear">
+		<view class="uni-drawer__mask" :class="{ 'uni-drawer__mask--visible': showDrawer && mask }" @tap="close('mask')" />
+		<view class="uni-drawer__content" :class="{'uni-drawer--right': rightMode,'uni-drawer--left': !rightMode, 'uni-drawer__content--visible': showDrawer}" :style="{width:drawerWidth+'px'}">
+			<slot />
+		</view>
+		<!-- #ifdef H5 -->
+		<keypress @esc="close('mask')" />
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	// #ifdef H5
+	import keypress from './keypress.js'
+	// #endif
+	/**
+	 * Drawer 抽屉
+	 * @description 抽屉侧滑菜单
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=26
+	 * @property {Boolean} mask = [true | false] 是否显示遮罩
+	 * @property {Boolean} maskClick = [true | false] 点击遮罩是否关闭
+	 * @property {Boolean} mode = [left | right] Drawer 滑出位置
+	 * 	@value left 从左侧滑出
+	 * 	@value right 从右侧侧滑出
+	 * @property {Number} width 抽屉的宽度 ,仅 vue 页面生效
+	 * @event {Function} close 组件关闭时触发事件
+	 */
+	export default {
+		name: 'UniDrawer',
+		components: {
+			// #ifdef H5
+			keypress
+			// #endif
+		},
+		emits:['change'],
+		props: {
+			/**
+			 * 显示模式(左、右),只在初始化生效
+			 */
+			mode: {
+				type: String,
+				default: ''
+			},
+			/**
+			 * 蒙层显示状态
+			 */
+			mask: {
+				type: Boolean,
+				default: true
+			},
+			/**
+			 * 遮罩是否可点击关闭
+			 */
+			maskClick:{
+				type: Boolean,
+				default: true
+			},
+			/**
+			 * 抽屉宽度
+			 */
+			width: {
+				type: Number,
+				default: 220
+			}
+		},
+		data() {
+			return {
+				visibleSync: false,
+				showDrawer: false,
+				rightMode: false,
+				watchTimer: null,
+				drawerWidth: 220
+			}
+		},
+		created() {
+			// #ifndef APP-NVUE
+			this.drawerWidth = this.width
+			// #endif
+			this.rightMode = this.mode === 'right'
+		},
+		methods: {
+			clear(){},
+			close(type) {
+				// fixed by mehaotian 抽屉尚未完全关闭或遮罩禁止点击时不触发以下逻辑
+				if((type === 'mask' && !this.maskClick) || !this.visibleSync) return
+				this._change('showDrawer', 'visibleSync', false)
+			},
+			open() {
+				// fixed by mehaotian 处理重复点击打开的事件
+				if(this.visibleSync) return
+				this._change('visibleSync', 'showDrawer', true)
+			},
+			_change(param1, param2, status) {
+				this[param1] = status
+				if (this.watchTimer) {
+					clearTimeout(this.watchTimer)
+				}
+				this.watchTimer = setTimeout(() => {
+					this[param2] = status
+					this.$emit('change',status)
+				}, status ? 50 : 300)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	$uni-mask: rgba($color: #000000, $alpha: 0.4) ;
+	// 抽屉宽度
+	$drawer-width: 220px;
+
+	.uni-drawer {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		overflow: hidden;
+		z-index: 999;
+	}
+
+	.uni-drawer__content {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		position: absolute;
+		top: 0;
+		width: $drawer-width;
+		bottom: 0;
+		background-color: $uni-bg-color;
+		transition: transform 0.3s ease;
+	}
+
+	.uni-drawer--left {
+		left: 0;
+		/* #ifdef APP-NVUE */
+		transform: translateX(-$drawer-width);
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		transform: translateX(-100%);
+		/* #endif */
+	}
+
+	.uni-drawer--right {
+		right: 0;
+		/* #ifdef APP-NVUE */
+		transform: translateX($drawer-width);
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		transform: translateX(100%);
+		/* #endif */
+	}
+
+	.uni-drawer__content--visible {
+		transform: translateX(0px);
+	}
+
+
+	.uni-drawer__mask {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		opacity: 0;
+		position: absolute;
+		top: 0;
+		left: 0;
+		bottom: 0;
+		right: 0;
+		background-color: $uni-mask;
+		transition: opacity 0.3s;
+	}
+
+	.uni-drawer__mask--visible {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		opacity: 1;
+	}
+</style>

+ 87 - 0
uni_modules/uni-drawer/package.json

@@ -0,0 +1,87 @@
+{
+  "id": "uni-drawer",
+  "displayName": "uni-drawer 抽屉",
+  "version": "1.2.1",
+  "description": "抽屉式导航,用于展示侧滑菜单,侧滑导航。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "drawer",
+    "抽屉",
+    "侧滑导航"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}

+ 10 - 0
uni_modules/uni-drawer/readme.md

@@ -0,0 +1,10 @@
+
+
+## Drawer 抽屉
+> **组件名:uni-drawer**
+> 代码块: `uDrawer`
+
+抽屉侧滑菜单。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-drawer)
+#### 如使用过程中有任何问题,或者您对uni-ui有一些好的建议,欢迎加入 uni-ui 交流群:871950839 

文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/upload/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/basic/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/collect/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/like/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/login/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/other/agree.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/register/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesCommon/test/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/account/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/app/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/components/home-frame.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/find/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/home/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/hot/index.js.map


文件差异内容过多而无法显示
+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesVideo/components/c-drawer.js.map


文件差异内容过多而无法显示
+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesVideo/more/index.js.map


文件差异内容过多而无法显示
+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesVideo/search/index.js.map


文件差异内容过多而无法显示
+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesVideo/video/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js.map


文件差异内容过多而无法显示
+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/app-plus/__uniapppicker.js


文件差异内容过多而无法显示
+ 2 - 2
unpackage/dist/dev/app-plus/app-config-service.js


文件差异内容过多而无法显示
+ 320 - 143
unpackage/dist/dev/app-plus/app-service.js


文件差异内容过多而无法显示
+ 1830 - 593
unpackage/dist/dev/app-plus/app-view.js


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/app-plus/manifest.json


文件差异内容过多而无法显示
+ 55 - 55
unpackage/dist/dev/app-plus/pagesAccount/app-sub-service.js


文件差异内容过多而无法显示
+ 9 - 9
unpackage/dist/dev/app-plus/pagesCommon/app-sub-service.js


文件差异内容过多而无法显示
+ 326 - 445
unpackage/dist/dev/app-plus/pagesHome/app-sub-service.js


文件差异内容过多而无法显示
+ 865 - 0
unpackage/dist/dev/app-plus/pagesVideo/app-sub-service.js


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/app-plus/view.css


文件差异内容过多而无法显示
+ 2 - 2
unpackage/dist/dev/app-plus/view.umd.min.js


+ 8 - 0
unpackage/dist/dev/mp-weixin/app.json

@@ -29,6 +29,14 @@
         "collect/index",
         "basic/index"
       ]
+    },
+    {
+      "root": "pagesVideo",
+      "pages": [
+        "video/index",
+        "search/index",
+        "more/index"
+      ]
     }
   ],
   "window": {

文件差异内容过多而无法显示
+ 5 - 5
unpackage/dist/dev/mp-weixin/common/main.js


+ 1 - 0
unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -18,5 +18,6 @@ page {
 	--rgbf1f: #f1f1f1;
 	--rgb161: #161616;
 	--rgbfa4: #FA4343;
+	--rgb67c: #67c23a;
 }
 

文件差异内容过多而无法显示
+ 2 - 2
unpackage/dist/dev/mp-weixin/common/runtime.js


文件差异内容过多而无法显示
+ 9209 - 9163
unpackage/dist/dev/mp-weixin/common/vendor.js


文件差异内容过多而无法显示
+ 24 - 24
unpackage/dist/dev/mp-weixin/components/upload/index.js


文件差异内容过多而无法显示
+ 14 - 17
unpackage/dist/dev/mp-weixin/pages/index/index.js


文件差异内容过多而无法显示
+ 16 - 16
unpackage/dist/dev/mp-weixin/pagesAccount/basic/index.js


文件差异内容过多而无法显示
+ 11 - 11
unpackage/dist/dev/mp-weixin/pagesAccount/collect/index.js


文件差异内容过多而无法显示
+ 11 - 11
unpackage/dist/dev/mp-weixin/pagesAccount/like/index.js


文件差异内容过多而无法显示
+ 14 - 14
unpackage/dist/dev/mp-weixin/pagesAccount/login/index.js


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesAccount/login/index.wxml


文件差异内容过多而无法显示
+ 11 - 11
unpackage/dist/dev/mp-weixin/pagesAccount/other/agree.js


文件差异内容过多而无法显示
+ 16 - 16
unpackage/dist/dev/mp-weixin/pagesAccount/register/index.js


文件差异内容过多而无法显示
+ 12 - 12
unpackage/dist/dev/mp-weixin/pagesCommon/test/index.js


文件差异内容过多而无法显示
+ 43 - 15
unpackage/dist/dev/mp-weixin/pagesHome/account/index.js


文件差异内容过多而无法显示
+ 12 - 12
unpackage/dist/dev/mp-weixin/pagesHome/app/index.js


文件差异内容过多而无法显示
+ 23 - 23
unpackage/dist/dev/mp-weixin/pagesHome/components/home-frame.js


文件差异内容过多而无法显示
+ 55 - 12
unpackage/dist/dev/mp-weixin/pagesHome/find/index.js


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesHome/find/index.wxml


+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesHome/find/index.wxss

@@ -64,7 +64,7 @@
   width: 100%;
   text-align: center;
   left: 0;
-  color: var(--rgb000);
+  color: var(--rgbfff);
   font-size: 12px;
   font-family: monospace;
 }

文件差异内容过多而无法显示
+ 91 - 49
unpackage/dist/dev/mp-weixin/pagesHome/home/index.js


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesHome/home/index.wxml


文件差异内容过多而无法显示
+ 111 - 44
unpackage/dist/dev/mp-weixin/pagesHome/hot/index.js


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesHome/hot/index.wxml


文件差异内容过多而无法显示
+ 245 - 0
unpackage/dist/dev/mp-weixin/pagesVideo/components/c-drawer.js


+ 7 - 0
unpackage/dist/dev/mp-weixin/pagesVideo/components/c-drawer.json

@@ -0,0 +1,7 @@
+{
+  "usingComponents": {
+    "uni-drawer": "/uni_modules/uni-drawer/components/uni-drawer/uni-drawer",
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  },
+  "component": true
+}

文件差异内容过多而无法显示
+ 1 - 0
unpackage/dist/dev/mp-weixin/pagesVideo/components/c-drawer.wxml


+ 46 - 0
unpackage/dist/dev/mp-weixin/pagesVideo/components/c-drawer.wxss

@@ -0,0 +1,46 @@
+.content {
+  display: flex;
+  flex-direction: column;
+  box-sizing: border-box;
+  width: 100vw;
+  height: 100vh;
+}
+.drawer {
+  display: flex;
+  flex-direction: column;
+  width: 77vw;
+  height: 100vh;
+}
+.drawer .drawer_1 {
+  display: flex;
+  justify-content: space-between;
+  padding: 2vw;
+}
+.drawer .drawer_1 .left {
+  flex-grow: 1;
+  font-weight: bold;
+  padding: 1vw 0;
+  font-size: 16px;
+  font-family: monospace;
+}
+.drawer .drawer_2 {
+  flex-grow: 1;
+  position: relative;
+  padding: 0 2vw;
+}
+.drawer .drawer_2 .info {
+  padding: 0 2vw;
+}
+.scroll-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view {
+  display: flex;
+  flex-direction: column;
+  padding: 0 !important;
+}
+

文件差异内容过多而无法显示
+ 466 - 0
unpackage/dist/dev/mp-weixin/pagesVideo/more/index.js


+ 7 - 0
unpackage/dist/dev/mp-weixin/pagesVideo/more/index.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "更多",
+  "enablePullDownRefresh": true,
+  "usingComponents": {
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  }
+}

文件差异内容过多而无法显示
+ 1 - 0
unpackage/dist/dev/mp-weixin/pagesVideo/more/index.wxml


+ 76 - 0
unpackage/dist/dev/mp-weixin/pagesVideo/more/index.wxss

@@ -0,0 +1,76 @@
+.content {
+  display: flex;
+  flex-direction: column;
+  box-sizing: border-box;
+  width: 100vw;
+  height: 100vh;
+}
+.content {
+  background-color: var(--rgb111);
+}
+.content .one {
+  padding: 2vw;
+}
+.content .one input {
+  border: 1px solid var(--rgbf1f);
+  border-radius: 5px;
+  padding: 5px;
+  font-size: 14px;
+  color: var(--rgbfff);
+}
+.content .two {
+  flex-grow: 1;
+  position: relative;
+}
+.content .two .two_1 {
+  display: flex;
+  flex-wrap: wrap;
+}
+.content .two .two_1 .list {
+  width: 48%;
+  margin: 0 10px 10px 0;
+}
+.content .two .two_1 .list .image {
+  width: 100%;
+  height: 100px;
+  overflow: hidden;
+  border-radius: 5px;
+  box-shadow: 0 0 5px var(--rgbf1f);
+  margin: 0 0 5px 0;
+}
+.content .two .two_1 .list .name {
+  font-size: 14px;
+  color: var(--rgbfff);
+  margin: 0 0 5px 0;
+}
+.content .two .two_1 .list .other {
+  display: flex;
+  color: var(--rgbfff);
+  font-size: 12px;
+  justify-content: space-between;
+}
+.content .two .two_1 .list:nth-child(2n) {
+  margin: 0 0 10px 0;
+}
+.scroll-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view {
+  display: flex;
+  flex-direction: column;
+  padding: 0 2vw;
+}
+.is_bottom {
+  text-align: center;
+}
+.is_bottom text {
+  padding: 2vw 0;
+  display: inline-block;
+  color: #858585;
+  font-size: 14px;
+}
+

+ 6 - 0
unpackage/dist/dev/mp-weixin/pagesVideo/search/index-uni-forms-item-default.js

@@ -0,0 +1,6 @@
+
+wx.createComponent({
+    generic:true,
+    props: {},
+    render: function(){}
+})

+ 11 - 0
unpackage/dist/dev/mp-weixin/pagesVideo/search/index-uni-forms-item-default.json

@@ -0,0 +1,11 @@
+{
+  "component": true,
+  "usingComponents": {
+    "index-uni-forms-item-default": "/pagesVideo/search/index-uni-forms-item-default",
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
+    "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
+    "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
+    "uni-data-checkbox": "/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox",
+    "c-drawer": "/pagesVideo/components/c-drawer"
+  }
+}

+ 1 - 0
unpackage/dist/dev/mp-weixin/pagesVideo/search/index-uni-forms-item-default.wxml

@@ -0,0 +1 @@
+是否热推

+ 2 - 0
unpackage/dist/dev/mp-weixin/pagesVideo/search/index-uni-forms-item-default.wxss

@@ -0,0 +1,2 @@
+
+@import "./index.wxss"

文件差异内容过多而无法显示
+ 500 - 0
unpackage/dist/dev/mp-weixin/pagesVideo/search/index.js


+ 12 - 0
unpackage/dist/dev/mp-weixin/pagesVideo/search/index.json

@@ -0,0 +1,12 @@
+{
+  "navigationBarTitleText": "视频筛选",
+  "enablePullDownRefresh": true,
+  "usingComponents": {
+    "index-uni-forms-item-default": "/pagesVideo/search/index-uni-forms-item-default",
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
+    "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
+    "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
+    "uni-data-checkbox": "/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox",
+    "c-drawer": "/pagesVideo/components/c-drawer"
+  }
+}

文件差异内容过多而无法显示
+ 1 - 0
unpackage/dist/dev/mp-weixin/pagesVideo/search/index.wxml


+ 121 - 0
unpackage/dist/dev/mp-weixin/pagesVideo/search/index.wxss

@@ -0,0 +1,121 @@
+.content {
+  display: flex;
+  flex-direction: column;
+  box-sizing: border-box;
+  width: 100vw;
+  height: 100vh;
+}
+.content {
+  background-color: var(--rgb111);
+}
+.content .one {
+  background-color: var(--rgb111);
+  display: flex;
+  padding: 2vw;
+}
+.content .one .one_1 {
+  flex-grow: 1;
+}
+.content .one .one_1 input {
+  border: 1px solid var(--rgbf1f);
+  height: 30px;
+  border-radius: 2px;
+  padding: 0 5px;
+  font-size: 12px;
+  color: var(--rgbfff);
+}
+.content .one .one_2 button {
+  height: 100%;
+  background-color: var(--rgbfa4);
+  color: var(--rgbfff);
+}
+.content .two {
+  flex-grow: 1;
+  position: relative;
+}
+.content .two .two_1 {
+  display: flex;
+  flex-wrap: wrap;
+}
+.content .two .two_1 .list {
+  width: 48%;
+  margin: 0 10px 10px 0;
+}
+.content .two .two_1 .list .image {
+  width: 100%;
+  height: 100px;
+  overflow: hidden;
+  border-radius: 5px;
+  box-shadow: 0 0 5px var(--rgbf1f);
+  margin: 0 0 5px 0;
+}
+.content .two .two_1 .list .name {
+  font-size: 14px;
+  color: var(--rgbfff);
+  margin: 0 0 5px 0;
+}
+.content .two .two_1 .list .other {
+  display: flex;
+  color: var(--rgbfff);
+  font-size: 12px;
+  justify-content: space-between;
+}
+.content .two .two_1 .list:nth-child(2n) {
+  margin: 0 0 10px 0;
+}
+.scroll-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view {
+  display: flex;
+  flex-direction: column;
+  padding: 0 2vw;
+}
+.is_bottom {
+  text-align: center;
+}
+.is_bottom text {
+  padding: 2vw 0;
+  display: inline-block;
+  color: #858585;
+  font-size: 14px;
+}
+.drawer_one {
+  display: flex;
+  flex-direction: column;
+  width: 77vw;
+  height: 92vh;
+}
+.drawer_one .drawer_one_1 {
+  flex-grow: 1;
+  overflow-y: auto;
+}
+.drawer_one .drawer_one_1 .uni-forms-item {
+  margin: 0;
+}
+.drawer_one .drawer_one_1 .label {
+  font-weight: bold;
+  margin: 0 0 5px 0;
+}
+.drawer_one .drawer_one_2 {
+  text-align: center;
+  padding: 2vw 0;
+}
+.drawer_one .drawer_one_2 button {
+  width: 30%;
+  height: 100%;
+  margin: 0 2vw;
+}
+.drawer_one .drawer_one_2 button:nth-child(1) {
+  background-color: var(--rgbfa4);
+  color: var(--rgbfff);
+}
+.drawer_one .drawer_one_2 button:nth-child(2) {
+  background-color: var(--rgb67c);
+  color: var(--rgbfff);
+}
+

+ 0 - 0
unpackage/dist/dev/mp-weixin/pagesVideo/video/index.js


部分文件因为文件数量过多而无法显示