guhongwei 2 年之前
父節點
當前提交
dcfaa1fce2
共有 99 個文件被更改,包括 3191 次插入1345 次删除
  1. 2 1
      App.vue
  2. 1 1
      common/config.js
  3. 4 2
      manifest.json
  4. 14 1
      pages.json
  5. 1 0
      pages/index/index.vue
  6. 23 0
      pagesAccount/other/vipagree.vue
  7. 308 0
      pagesAccount/vip/index.vue
  8. 9 0
      pagesHome/account/index.vue
  9. 25 0
      pagesHome/home/index.vue
  10. 24 0
      pagesHome/hot/index.vue
  11. 16 0
      pagesVideo/more/index.vue
  12. 26 2
      pagesVideo/search/index.vue
  13. 57 7
      pagesVideo/video/index.vue
  14. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  15. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  16. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/upload/index.js.map
  17. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  18. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/basic/index.js.map
  19. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/collect/index.js.map
  20. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/like/index.js.map
  21. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/login/index.js.map
  22. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/other/agree.js.map
  23. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/other/vipagree.js.map
  24. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/register/index.js.map
  25. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/vip/index.js.map
  26. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/account/index.js.map
  27. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/app/index.js.map
  28. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/components/home-frame.js.map
  29. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/find/index.js.map
  30. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/home/index.js.map
  31. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/hot/index.js.map
  32. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesVideo/components/c-drawer.js.map
  33. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesVideo/more/index.js.map
  34. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesVideo/search/index.js.map
  35. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesVideo/video/index.js.map
  36. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js.map
  37. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.js.map
  38. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map
  39. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map
  40. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map
  41. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
  42. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map
  43. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.js.map
  44. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map
  45. 2 2
      unpackage/dist/dev/app-plus/app-service.js
  46. 602 361
      unpackage/dist/dev/app-plus/app-view.js
  47. 361 232
      unpackage/dist/dev/app-plus/pagesHome/app-sub-service.js
  48. 229 145
      unpackage/dist/dev/app-plus/pagesVideo/app-sub-service.js
  49. 3 1
      unpackage/dist/dev/mp-weixin/app.json
  50. 2 1
      unpackage/dist/dev/mp-weixin/common/main.wxss
  51. 134 106
      unpackage/dist/dev/mp-weixin/common/vendor.js
  52. 15 15
      unpackage/dist/dev/mp-weixin/components/upload/index.js
  53. 1 0
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  54. 21 21
      unpackage/dist/dev/mp-weixin/pagesAccount/basic/index.js
  55. 17 17
      unpackage/dist/dev/mp-weixin/pagesAccount/collect/index.js
  56. 17 17
      unpackage/dist/dev/mp-weixin/pagesAccount/like/index.js
  57. 3 3
      unpackage/dist/dev/mp-weixin/pagesAccount/login/index.js
  58. 192 0
      unpackage/dist/dev/mp-weixin/pagesAccount/other/vipagree.js
  59. 5 0
      unpackage/dist/dev/mp-weixin/pagesAccount/other/vipagree.json
  60. 1 0
      unpackage/dist/dev/mp-weixin/pagesAccount/other/vipagree.wxml
  61. 12 0
      unpackage/dist/dev/mp-weixin/pagesAccount/other/vipagree.wxss
  62. 5 5
      unpackage/dist/dev/mp-weixin/pagesAccount/register/index.js
  63. 461 0
      unpackage/dist/dev/mp-weixin/pagesAccount/vip/index.js
  64. 5 0
      unpackage/dist/dev/mp-weixin/pagesAccount/vip/index.json
  65. 1 0
      unpackage/dist/dev/mp-weixin/pagesAccount/vip/index.wxml
  66. 67 0
      unpackage/dist/dev/mp-weixin/pagesAccount/vip/index.wxss
  67. 1 1
      unpackage/dist/dev/mp-weixin/pagesCommon/test/index.js
  68. 4 2
      unpackage/dist/dev/mp-weixin/pagesHome/account/index.js
  69. 1 1
      unpackage/dist/dev/mp-weixin/pagesHome/account/index.wxml
  70. 3 0
      unpackage/dist/dev/mp-weixin/pagesHome/account/index.wxss
  71. 1 1
      unpackage/dist/dev/mp-weixin/pagesHome/app/index.js
  72. 14 14
      unpackage/dist/dev/mp-weixin/pagesHome/components/home-frame.js
  73. 1 1
      unpackage/dist/dev/mp-weixin/pagesHome/find/index.js
  74. 2 2
      unpackage/dist/dev/mp-weixin/pagesHome/home/index.js
  75. 1 1
      unpackage/dist/dev/mp-weixin/pagesHome/home/index.wxml
  76. 11 0
      unpackage/dist/dev/mp-weixin/pagesHome/home/index.wxss
  77. 2 2
      unpackage/dist/dev/mp-weixin/pagesHome/hot/index.js
  78. 1 1
      unpackage/dist/dev/mp-weixin/pagesHome/hot/index.wxml
  79. 11 0
      unpackage/dist/dev/mp-weixin/pagesHome/hot/index.wxss
  80. 16 16
      unpackage/dist/dev/mp-weixin/pagesVideo/components/c-drawer.js
  81. 20 17
      unpackage/dist/dev/mp-weixin/pagesVideo/more/index.js
  82. 1 1
      unpackage/dist/dev/mp-weixin/pagesVideo/more/index.wxml
  83. 11 0
      unpackage/dist/dev/mp-weixin/pagesVideo/more/index.wxss
  84. 21 21
      unpackage/dist/dev/mp-weixin/pagesVideo/search/index.js
  85. 1 1
      unpackage/dist/dev/mp-weixin/pagesVideo/search/index.wxml
  86. 12 1
      unpackage/dist/dev/mp-weixin/pagesVideo/search/index.wxss
  87. 205 145
      unpackage/dist/dev/mp-weixin/pagesVideo/video/index.js
  88. 1 1
      unpackage/dist/dev/mp-weixin/pagesVideo/video/index.wxml
  89. 6 0
      unpackage/dist/dev/mp-weixin/pagesVideo/video/index.wxss
  90. 16 16
      unpackage/dist/dev/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js
  91. 14 14
      unpackage/dist/dev/mp-weixin/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.js
  92. 15 15
      unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js
  93. 14 14
      unpackage/dist/dev/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js
  94. 16 16
      unpackage/dist/dev/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js
  95. 15 15
      unpackage/dist/dev/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js
  96. 15 15
      unpackage/dist/dev/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js
  97. 16 16
      unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.js
  98. 15 15
      unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js
  99. 11 11
      unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js

+ 2 - 1
App.vue

@@ -96,6 +96,7 @@
 		--rgb161: #161616;
 		--rgbfa4: #FA4343;
 		--rgb67c: #67c23a;
-		--rgb313: #31312e
+		--rgb313: #31312e;
+		--rgbffd: #FFD700;
 	}
 </style>

+ 1 - 1
common/config.js

@@ -1,6 +1,6 @@
 export default {
 	// 接口地址
-	serverUrl: "https://broadcast.waityou24.cn", //https://broadcast.waityou24.cn   http://www.freeskyghw.cn   http://192.168.1.144:10102  
+	serverUrl: "http://192.168.1.144:10102", //https://broadcast.waityou24.cn   http://www.freeskyghw.cn   http://192.168.1.144:10102  
 	fileserverUrl: 'https://broadcast.waityou24.cn',
 	wechatUrl: "https://broadcast.waityou24.cn",
 	// 设备信息

+ 4 - 2
manifest.json

@@ -19,7 +19,8 @@
         /* 模块配置 */
         "modules" : {
             "VideoPlayer" : {},
-            "Share" : {}
+            "Share" : {},
+            "Payment" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
@@ -47,7 +48,8 @@
             /* SDK配置 */
             "sdkConfigs" : {
                 "ad" : {},
-                "share" : {}
+                "share" : {},
+                "payment" : {}
             },
             "icons" : {
                 "android" : {

+ 14 - 1
pages.json

@@ -77,6 +77,13 @@
 						"navigationBarTitleText": "用户协议",
 						"enablePullDownRefresh": false //是否启用下拉刷新
 					}
+				},
+				{
+					"path": "other/vipagree",
+					"style": {
+						"navigationBarTitleText": "会员服务协议",
+						"enablePullDownRefresh": false //是否启用下拉刷新
+					}
 				}, {
 					"path": "like/index",
 					"style": {
@@ -95,11 +102,17 @@
 						"navigationBarTitleText": "账号信息",
 						"enablePullDownRefresh": false //是否启用下拉刷新
 					}
+				}, {
+					"path": "vip/index",
+					"style": {
+						"navigationBarTitleText": "vip",
+						"enablePullDownRefresh": false //是否启用下拉刷新
+					}
 				}
 			]
 		},
 		{
-			"root": "pagesVideo", 
+			"root": "pagesVideo",
 			"pages": [ //
 				{
 					"path": "video/index",

+ 1 - 0
pages/index/index.vue

@@ -38,6 +38,7 @@
 			async search() {
 				const that = this;
 				// let url = '/pagesVideo/video/index';
+				// let url = '/pagesAccount/vip/index';
 				let url = '/pagesHome/home/index';
 				let res = await that.$api('appbasic', 'GET', {});
 				if (res.errcode == '0') {

+ 23 - 0
pagesAccount/other/vipagree.vue

@@ -0,0 +1,23 @@
+<template>
+	<view class="content">
+		会员服务协议
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {};
+		},
+		onLoad() {},
+		onShow() {},
+		methods: {}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		background-color: var(--rgb000);
+		padding: 0 2vw;
+	}
+</style>

+ 308 - 0
pagesAccount/vip/index.vue

@@ -0,0 +1,308 @@
+<template>
+	<view class="content">
+		<view class="one">
+			<scroll-view :scroll-x="true" class="money_scroll_view">
+				<view :class="['list',form.active==index?'active':'']" v-for="(item,index) in moneyList" :key="index"
+					@tap="toChange(item,index)">
+					<view class="title">
+						{{item.title}}
+					</view>
+					<view class="money">
+						<span class="fh">¥</span>{{item.money}}
+					</view>
+					<view class="other">
+						有效期:{{item.days}}天
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+		<view class="two">
+			<view class="two_1">
+				<button @tap="toBuy">确认协议并立即以{{form.money}}元支付</button>
+			</view>
+			<view class="agree">
+				<checkbox-group @change="changeAgree">
+					<label>
+						<checkbox :checked="agree" />
+						<text @tap.stop="toAgree()">我已阅读并同意“会员服务协议”</text>
+					</label>
+				</checkbox-group>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				// 用户信息
+				userInfo: {},
+				// vip信息
+				moneyList: [],
+				form: {
+					active: 0,
+					mongy: 0
+				},
+				// 用戶协议
+				agree: true,
+				// 修改用户信息
+				updateUser: {},
+			}
+		},
+		onLoad() {
+			const that = this;
+			// 查询用户信息
+			that.searchUser();
+			// 查询其他信息
+			that.searchOther();
+		},
+		methods: {
+			// 查询用户信息
+			searchUser() {
+				const that = this;
+				uni.getStorage({
+					key: 'token',
+					success: async (res) => {
+						let user = that.$jwt(res.data);
+						let arr = await that.$api(`user/${user._id}`, 'GET');
+						if (arr.errcode == '0') {
+							that.$set(that, `userInfo`, arr.data)
+						}
+					},
+					fail: (err) => {
+						console.log('暂无登录信息');
+					}
+				})
+			},
+			// 选择
+			toChange(e, index) {
+				const that = this;
+				let form = {
+					active: index,
+					money: e.money,
+					days: e.days
+				}
+				that.$set(that, `form`, form)
+			},
+			// 购买
+			toBuy() {
+				const that = this;
+				let user = that.userInfo;
+				let money = that.form.money;
+				let days = that.form.days;
+				// 1:是否同意协议
+				if (that.agree == true) {
+					if (user && user._id) {
+						let updateUser;
+						if (user && user.is_vip == '0') {
+							let vip_start_time = that.$moment().format('YYYY-MM-DD HH:mm:ss');
+							let vip_end_time = that.$moment().add(days, 'days').format('YYYY-MM-DD HH:mm:ss');
+							updateUser = {
+								id: user._id,
+								is_vip: '1',
+								vip_start_time: vip_start_time,
+								vip_end_time: vip_end_time
+							}
+							// 用户基本信息修改
+							that.$set(that, `updateUser`, updateUser);
+							// 支付
+							that.oneBuy({
+								user_id: user._id,
+								money: money
+							})
+						} else if (user && user.is_vip == '1') {
+							let vip_end_time = that.$moment(user.vip_end_time).add(days, 'days').format(
+								'YYYY-MM-DD HH:mm:ss');
+							updateUser = {
+								id: user._id,
+								vip_end_time: vip_end_time
+							}
+							// 用户基本信息修改
+							that.$set(that, `updateUser`, updateUser);
+							// 支付
+							that.oneBuy({
+								user_id: user._id,
+								money: money
+							})
+						}
+					} else {
+						uni.showToast({
+							title: '暂无用户信息,无法支付!',
+							icon: 'none'
+						})
+					}
+
+				} else {
+					uni.showToast({
+						title: '请阅读并同意“会员服务协议”',
+						icon: 'none'
+					})
+				}
+
+			},
+			// 支付
+			oneBuy(e) {
+				const that = this;
+				// uni.requestPayment--支付
+				uni.showModal({
+					title: '支付',
+					content: `您确认要支付${e.money}元吗?`,
+					success: function(res) {
+						if (res.confirm) {
+							console.log('确认支付');
+							that.toPay(e)
+						} else if (res.cancel) {
+							console.log('取消支付');
+						}
+					}
+				});
+			},
+			// 确认支付
+			async toPay(e) {
+				const that = this;
+				// 支付成功-修改个人信息,创建支付记录
+				let updateUser = that.updateUser;
+				let form = {
+					user_id: that.userInfo._id,
+					user_name: that.userInfo.nick_name,
+					money_no: 'NO' + that.$moment().valueOf(),
+					type: 'VIP',
+					create_time: that.$moment().format('YYYY-MM-DD HH:mm:ss'),
+					money: e.money
+				}
+				let res;
+				res = await that.$api(`user/${updateUser.id}`, 'POST', updateUser);
+				if (res.errcode == '0') {
+					res = await that.$api('moneylog', 'POST', form);
+					if (res.errcode == '0') {
+						uni.showToast({
+							title: '开通成功',
+							icon: 'success'
+						})
+						uni.navigateBack()
+					} else {
+						uni.showToast({
+							title: res.errmsg,
+							icon: 'error'
+						})
+					}
+				}
+
+			},
+			// 同意隐私协议
+			changeAgree() {
+				const that = this;
+				let agree = true;
+				if (that.agree) agree = false;
+				that.$set(that, `agree`, agree);
+			},
+			// 查看会员服务协议
+			toAgree() {
+				const that = this;
+				uni.navigateTo({
+					url: `/pagesAccount/other/vipagree`
+				})
+			},
+			// 查询其他信息
+			async searchOther() {
+				const that = this;
+				let res;
+				// 查询vip信息
+				res = await that.$api('vipsetting', 'GET', {
+					is_use: '0'
+				})
+				if (res.errcode == '0') {
+					that.$set(that, `moneyList`, res.data);
+					if (res.total > 0) {
+						let form = {
+							active: 0,
+							money: res.data[0].money,
+							days: res.data[0].days
+						}
+						console.log(form);
+						that.$set(that, `form`, form)
+					}
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		background-color: var(--rgb000);
+		padding: 0 2vw;
+		overflow-y: auto;
+
+		.one {
+			margin: 10px 0;
+
+			.money_scroll_view {
+				white-space: nowrap;
+
+				.list {
+					display: inline-block;
+					margin: 0 10px 0 0;
+					background-color: var(--rgbfff);
+					padding: 8px;
+					border-radius: 5px;
+					text-align: center;
+
+					.title {
+						font-size: 14px;
+						font-weight: bold;
+						margin: 0 0 10px 0;
+					}
+
+					.money {
+						font-size: 16px;
+						font-weight: bold;
+						color: var(--rgbffd);
+						margin: 0 0 10px 0;
+
+						.fh {
+							font-size: 12px;
+							padding: 0 5px 0 0;
+						}
+					}
+
+					.other {
+						font-size: 12px;
+						font-weight: bold;
+
+					}
+				}
+
+				.list:last-child {
+					margin: 0;
+				}
+
+				.active {
+					background-color: var(--rgbfa4);
+				}
+			}
+
+		}
+
+		.two {
+			.two_1 {
+				margin: 0 0 15px 0;
+
+				button {
+					border-radius: 25px;
+					color: var(--rgbffd);
+					font-family: monospace;
+					font-weight: bold;
+				}
+			}
+		}
+
+		.agree {
+			text-align: center;
+			font-size: 12px;
+			margin: 0 0 2vw 0;
+			color: var(--rgbfff);
+		}
+	}
+</style>

+ 9 - 0
pagesHome/account/index.vue

@@ -15,6 +15,10 @@
 						<uni-icons type="phone-filled" size="15" color="var(--rgbfff)"></uni-icons>
 						:{{userInfo.phone||'暂无'}}
 					</view>
+					<view class="vip" v-if="userInfo&&userInfo.is_vip=='1'">
+						<uni-icons type="vip-filled" size="15" color="var(--rgbffd)"></uni-icons>
+						:{{userInfo.vip_end_time}}
+					</view>
 				</view>
 				<view class="one_3" v-if="!userInfo._id">
 					<button size="mini" @tap="toLogin()">注册/登录</button>
@@ -87,6 +91,8 @@
 							user.phone = aee.data.phone;
 							if (aee.data && aee.data.nick_name) user.name = aee.data.nick_name;
 							if (aee.data && aee.data.logo_url) user.logo_url = aee.data.logo_url;
+							if (aee.data && aee.data.is_vip) user.is_vip = aee.data.is_vip;
+							if (aee.data && aee.data.vip_end_time) user.vip_end_time = aee.data.vip_end_time;
 						}
 					},
 					fail: (err) => {
@@ -229,6 +235,9 @@
 					-webkit-background-clip: text;
 
 				}
+				.vip{
+					color: var(--rgbffd);
+				}
 
 			}
 

+ 25 - 0
pagesHome/home/index.vue

@@ -63,6 +63,9 @@
 											{{item.time_num}}
 										</view>
 									</view>
+									<view class="vip" v-if="item.is_vip=='1'">
+										<span>VIP</span>
+									</view>
 								</view>
 							</view>
 							<view class="btn">
@@ -98,6 +101,9 @@
 											{{item.time_num}}
 										</view>
 									</view>
+									<view class="vip" v-if="item.is_vip=='1'">
+										<span>VIP</span>
+									</view>
 								</view>
 							</view>
 							<view class="btn">
@@ -133,6 +139,9 @@
 											{{item.time_num}}
 										</view>
 									</view>
+									<view class="vip" v-if="item.is_vip=='1'">
+										<span>VIP</span>
+									</view>
 								</view>
 							</view>
 							<view class="btn">
@@ -169,6 +178,9 @@
 											{{item.time_num}}
 										</view>
 									</view>
+									<view class="vip" v-if="item.is_vip=='1'">
+										<span>VIP</span>
+									</view>
 								</view>
 							</view>
 							<view class="btn">
@@ -380,6 +392,7 @@
 					flex-wrap: wrap;
 
 					.list {
+						position: relative;
 						width: 48%;
 						margin: 0 0 10px 0;
 
@@ -402,6 +415,18 @@
 							justify-content: space-between;
 						}
 
+						.vip {
+							position: absolute;
+							top: 0;
+							left: 1vw;
+
+							span {
+								font-size: 14px;
+								font-weight: bold;
+								color: var(--rgbffd);
+							}
+						}
+
 
 					}
 				}

+ 24 - 0
pagesHome/hot/index.vue

@@ -63,6 +63,9 @@
 											{{item.time_num}}
 										</view>
 									</view>
+									<view class="vip" v-if="item.is_vip=='1'">
+										<span>VIP</span>
+									</view>
 								</view>
 							</view>
 							<view class="btn">
@@ -100,6 +103,9 @@
 											{{item.time_num}}
 										</view>
 									</view>
+									<view class="vip" v-if="item.is_vip=='1'">
+										<span>VIP</span>
+									</view>
 								</view>
 							</view>
 							<view class="btn">
@@ -136,6 +142,9 @@
 											{{item.time_num}}
 										</view>
 									</view>
+									<view class="vip" v-if="item.is_vip=='1'">
+										<span>VIP</span>
+									</view>
 								</view>
 							</view>
 							<view class="btn">
@@ -172,6 +181,9 @@
 											{{item.time_num}}
 										</view>
 									</view>
+									<view class="vip" v-if="item.is_vip=='1'">
+										<span>VIP</span>
+									</view>
 								</view>
 							</view>
 							<view class="btn">
@@ -398,6 +410,7 @@
 					flex-wrap: wrap;
 
 					.list {
+						position: relative;
 						width: 48%;
 						margin: 0 0 10px 0;
 
@@ -419,6 +432,17 @@
 							font-size: 12px;
 							justify-content: space-between;
 						}
+						.vip {
+							position: absolute;
+							top: 0;
+							left: 1vw;
+						
+							span {
+								font-size: 14px;
+								font-weight: bold;
+								color: var(--rgbffd);
+							}
+						}
 
 
 					}

+ 16 - 0
pagesVideo/more/index.vue

@@ -23,6 +23,9 @@
 									{{item.time_num}}
 								</view>
 							</view>
+							<view class="vip" v-if="item.is_vip=='1'">
+								<span>VIP</span>
+							</view>
 						</view>
 					</view>
 				</view>
@@ -190,6 +193,7 @@
 				flex-wrap: wrap;
 
 				.list {
+					position: relative;
 					width: 48%;
 					margin: 0 10px 10px 0;
 
@@ -214,6 +218,18 @@
 						font-size: 12px;
 						justify-content: space-between;
 					}
+					
+					.vip {
+						position: absolute;
+						top: 0;
+						left: 1vw;
+					
+						span {
+							font-size: 14px;
+							font-weight: bold;
+							color: var(--rgbffd);
+						}
+					}
 				}
 
 				.list:nth-child(2n) {

+ 26 - 2
pagesVideo/search/index.vue

@@ -28,6 +28,9 @@
 									{{item.time_num}}
 								</view>
 							</view>
+							<view class="vip" v-if="item.is_vip=='1'">
+								<span>VIP</span>
+							</view>
 						</view>
 					</view>
 				</view>
@@ -37,6 +40,15 @@
 			<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">是否VIP</view>
+								<view class="value">
+									<uni-data-checkbox mode="tag" v-model="searchInfo.is_vip" :localdata="isnoList"
+										:map="{text:'label',value:'value'}"></uni-data-checkbox>
+								</view>
+							</template>
+						</uni-forms-item>
 						<uni-forms-item>
 							<template>
 								<view class="label">是否热推</view>
@@ -322,6 +334,7 @@
 				flex-wrap: wrap;
 
 				.list {
+					position: relative;
 					width: 48%;
 					margin: 0 10px 10px 0;
 
@@ -346,6 +359,18 @@
 						font-size: 12px;
 						justify-content: space-between;
 					}
+
+					.vip {
+						position: absolute;
+						top: 0;
+						left: 1vw;
+
+						span {
+							font-size: 14px;
+							font-weight: bold;
+							color: var(--rgbffd);
+						}
+					}
 				}
 
 				.list:nth-child(2n) {
@@ -408,9 +433,8 @@
 
 			button {
 				width: 30%;
-				height: 100%;
 				margin: 0 2vw;
-
+				line-height: 2.5;
 			}
 
 			button:nth-child(1) {

+ 57 - 7
pagesVideo/video/index.vue

@@ -2,7 +2,8 @@
 	<view class="content">
 		<view class="one">
 			<video :src="info.vUrl" :poster="info.iUrl" :title="info.title" controls :show-center-play-btn="false"
-				:show-mute-btn="true" :enable-play-gesture="true" :vslide-gesture-in-fullscreen="true"></video>
+				:show-mute-btn="true" :enable-play-gesture="true" :vslide-gesture-in-fullscreen="true" v-if="video_user_vip==true"></video>
+			<image :src="info.iUrl" mode="" class="image" v-else-if="video_user_vip==false"></image>
 		</view>
 		<view class="two">
 			<view class="two_1">
@@ -41,7 +42,10 @@
 						<span>
 							<uni-icons type="heart-filled" size="15" color="var(--rgbfff)"></uni-icons>:
 						</span>
-						<span>{{info.title}}</span>
+						<span>
+							<uni-icons type="vip-filled" size="15" color="var(--rgbffd)" v-if="info.is_vip=='1'">
+							</uni-icons>{{info.title}}
+						</span>
 					</view>
 					<view class="actor">
 						<span>
@@ -149,6 +153,8 @@
 				basicInfo: {},
 				// 用户信息
 				user: {},
+				// 判断视频为VIP.判断登录是否为VIP,
+				video_user_vip: false,
 				// 获取当前地址
 				locationInfo: {},
 				id: '',
@@ -183,6 +189,7 @@
 				is_bottom: false,
 				scrollTop: 0,
 				// 讨论-end
+
 			}
 		},
 		onShow() {
@@ -238,12 +245,15 @@
 				const that = this;
 				uni.getStorage({
 					key: 'token',
-					success: (res) => {
+					success: async (res) => {
 						let user = that.$jwt(res.data);
-						that.$set(that, `user`, user);
-						// 已有用户信息,查询是否喜欢/收藏
-						that.searchLikes();
-						that.searchCollects();
+						let arr = await that.$api(`user/${user._id}`, 'GET');
+						if (arr.errcode == '0') {
+							that.$set(that, `user`, arr.data);
+							// 已有用户信息,查询是否喜欢/收藏
+							that.searchLikes();
+							that.searchCollects();
+						}
 					},
 					fail: (err) => {
 						console.log('暂无用户信息');
@@ -277,6 +287,7 @@
 			// 详细信息
 			async search() {
 				const that = this;
+				let user = that.user;
 				let res;
 				res = await that.$api(`videos/${that.id}`, 'GET', {})
 				if (res.errcode == '0') {
@@ -297,6 +308,8 @@
 					that.updateNum(data);
 					// 查询相关视频,相同厂商
 					that.searchfirm(data.firm_id);
+					// 判断是否为VIP视频,判断是否登录,判断是否为VIP用户
+					that.judgeVip(data);
 				}
 			},
 			// 领衔演员姓名
@@ -350,6 +363,35 @@
 					that.$set(that, `firmvideoList`, res.data)
 				}
 			},
+			// 判断vip
+			judgeVip(video) {
+				const that = this;
+				let user = that.user;
+				// 1:判断是否为vip视频--0:不是vip 1:是vip
+				if (video && video.is_vip == '1') {
+					// 2:用户是否登录--0:不是vip 1:是vip
+					if (user && user._id) {
+						if (user && user.is_vip == '0') {
+							uni.showToast({
+								title: '当前账号不是VIP用户,无法观看VIP视频',
+								icon: 'none'
+							})
+							that.$set(that, `video_user_vip`, false)
+						} else if (user && user.is_vip == '1') {
+							that.$set(that, `video_user_vip`, true)
+						}
+					} else {
+						uni.showToast({
+							title: '暂无用户信息,无法观看VIP视频',
+							icon: 'none'
+						})
+						that.$set(that, `video_user_vip`, false)
+					}
+				} else {
+					that.$set(that, `video_user_vip`, true)
+				}
+			},
+
 			// 选项卡选择
 			tabChange(e) {
 				const that = this;
@@ -636,6 +678,13 @@
 				overflow: hidden;
 				border: 1px solid var(--rgbf1f);
 			}
+
+			.image {
+				width: 100%;
+				height: 210px;
+				overflow: hidden;
+				border: 1px solid var(--rgbf1f);
+			}
 		}
 
 		.two {
@@ -702,6 +751,7 @@
 						margin: 0 0 2vw 0;
 					}
 
+
 					.actor {
 						font-size: 15px;
 						color: var(--rgbfff);

File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/upload/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/basic/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/collect/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/like/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/login/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/other/agree.js.map


File diff suppressed because it is too large
+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/other/vipagree.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/register/index.js.map


File diff suppressed because it is too large
+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/vip/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/account/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/app/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/components/home-frame.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/find/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/home/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/hot/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesVideo/components/c-drawer.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesVideo/more/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesVideo/search/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesVideo/video/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map


File diff suppressed because it is too large
+ 2 - 2
unpackage/dist/dev/app-plus/app-service.js


File diff suppressed because it is too large
+ 602 - 361
unpackage/dist/dev/app-plus/app-view.js


File diff suppressed because it is too large
+ 361 - 232
unpackage/dist/dev/app-plus/pagesHome/app-sub-service.js


File diff suppressed because it is too large
+ 229 - 145
unpackage/dist/dev/app-plus/pagesVideo/app-sub-service.js


+ 3 - 1
unpackage/dist/dev/mp-weixin/app.json

@@ -25,9 +25,11 @@
         "login/index",
         "register/index",
         "other/agree",
+        "other/vipagree",
         "like/index",
         "collect/index",
-        "basic/index"
+        "basic/index",
+        "vip/index"
       ]
     },
     {

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

@@ -19,6 +19,7 @@ page {
 	--rgb161: #161616;
 	--rgbfa4: #FA4343;
 	--rgb67c: #67c23a;
-	--rgb313: #31312e
+	--rgb313: #31312e;
+	--rgbffd: #FFD700;
 }
 

File diff suppressed because it is too large
+ 134 - 106
unpackage/dist/dev/mp-weixin/common/vendor.js


File diff suppressed because it is too large
+ 15 - 15
unpackage/dist/dev/mp-weixin/components/upload/index.js


+ 1 - 0
unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -198,6 +198,7 @@ var _default = {
             switch (_context.prev = _context.next) {
               case 0:
                 that = _this; // let url = '/pagesVideo/video/index';
+                // let url = '/pagesAccount/vip/index';
                 url = '/pagesHome/home/index';
                 _context.next = 4;
                 return that.$api('appbasic', 'GET', {});

File diff suppressed because it is too large
+ 21 - 21
unpackage/dist/dev/mp-weixin/pagesAccount/basic/index.js


File diff suppressed because it is too large
+ 17 - 17
unpackage/dist/dev/mp-weixin/pagesAccount/collect/index.js


File diff suppressed because it is too large
+ 17 - 17
unpackage/dist/dev/mp-weixin/pagesAccount/like/index.js


+ 3 - 3
unpackage/dist/dev/mp-weixin/pagesAccount/login/index.js

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     uniForms: function () {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 325))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 341))
     },
     uniFormsItem: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 338))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 354))
     },
     uniEasyinput: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 345))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 361))
     },
   }
 } catch (e) {

File diff suppressed because it is too large
+ 192 - 0
unpackage/dist/dev/mp-weixin/pagesAccount/other/vipagree.js


+ 5 - 0
unpackage/dist/dev/mp-weixin/pagesAccount/other/vipagree.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "会员服务协议",
+  "enablePullDownRefresh": false,
+  "usingComponents": {}
+}

+ 1 - 0
unpackage/dist/dev/mp-weixin/pagesAccount/other/vipagree.wxml

@@ -0,0 +1 @@
+<view class="content">会员服务协议</view>

+ 12 - 0
unpackage/dist/dev/mp-weixin/pagesAccount/other/vipagree.wxss

@@ -0,0 +1,12 @@
+.content {
+  display: flex;
+  flex-direction: column;
+  box-sizing: border-box;
+  width: 100vw;
+  height: 100vh;
+}
+.content {
+  background-color: var(--rgb000);
+  padding: 0 2vw;
+}
+

+ 5 - 5
unpackage/dist/dev/mp-weixin/pagesAccount/register/index.js

@@ -101,16 +101,16 @@ var components
 try {
   components = {
     uniForms: function () {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 325))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 341))
     },
     uniFormsItem: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 338))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 354))
     },
     uniEasyinput: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 345))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 361))
     },
     uniDataCheckbox: function () {
-      return Promise.all(/*! import() | uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue */ 352))
+      return Promise.all(/*! import() | uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue */ 368))
     },
   }
 } catch (e) {
@@ -179,7 +179,7 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/r
 var _toConsumableArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/toConsumableArray */ 18));
 var upload = function upload() {
   Promise.all(/*! require.ensure | components/upload/index */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/upload/index")]).then((function () {
-    return resolve(__webpack_require__(/*! @/components/upload/index.vue */ 303));
+    return resolve(__webpack_require__(/*! @/components/upload/index.vue */ 319));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

File diff suppressed because it is too large
+ 461 - 0
unpackage/dist/dev/mp-weixin/pagesAccount/vip/index.js


+ 5 - 0
unpackage/dist/dev/mp-weixin/pagesAccount/vip/index.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "vip",
+  "enablePullDownRefresh": false,
+  "usingComponents": {}
+}

File diff suppressed because it is too large
+ 1 - 0
unpackage/dist/dev/mp-weixin/pagesAccount/vip/index.wxml


+ 67 - 0
unpackage/dist/dev/mp-weixin/pagesAccount/vip/index.wxss

@@ -0,0 +1,67 @@
+.content {
+  display: flex;
+  flex-direction: column;
+  box-sizing: border-box;
+  width: 100vw;
+  height: 100vh;
+}
+.content {
+  background-color: var(--rgb000);
+  padding: 0 2vw;
+  overflow-y: auto;
+}
+.content .one {
+  margin: 10px 0;
+}
+.content .one .money_scroll_view {
+  white-space: nowrap;
+}
+.content .one .money_scroll_view .list {
+  display: inline-block;
+  margin: 0 10px 0 0;
+  background-color: var(--rgbfff);
+  padding: 8px;
+  border-radius: 5px;
+  text-align: center;
+}
+.content .one .money_scroll_view .list .title {
+  font-size: 14px;
+  font-weight: bold;
+  margin: 0 0 10px 0;
+}
+.content .one .money_scroll_view .list .money {
+  font-size: 16px;
+  font-weight: bold;
+  color: var(--rgbffd);
+  margin: 0 0 10px 0;
+}
+.content .one .money_scroll_view .list .money .fh {
+  font-size: 12px;
+  padding: 0 5px 0 0;
+}
+.content .one .money_scroll_view .list .other {
+  font-size: 12px;
+  font-weight: bold;
+}
+.content .one .money_scroll_view .list:last-child {
+  margin: 0;
+}
+.content .one .money_scroll_view .active {
+  background-color: var(--rgbfa4);
+}
+.content .two .two_1 {
+  margin: 0 0 15px 0;
+}
+.content .two .two_1 button {
+  border-radius: 25px;
+  color: var(--rgbffd);
+  font-family: monospace;
+  font-weight: bold;
+}
+.content .agree {
+  text-align: center;
+  font-size: 12px;
+  margin: 0 0 2vw 0;
+  color: var(--rgbfff);
+}
+

+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesCommon/test/index.js

@@ -143,7 +143,7 @@ exports.default = void 0;
 var _toConsumableArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/toConsumableArray */ 18));
 var upload = function upload() {
   Promise.all(/*! require.ensure | components/upload/index */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/upload/index")]).then((function () {
-    return resolve(__webpack_require__(/*! @/components/upload/index.vue */ 303));
+    return resolve(__webpack_require__(/*! @/components/upload/index.vue */ 319));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

+ 4 - 2
unpackage/dist/dev/mp-weixin/pagesHome/account/index.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uniIcons: function () {
-      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 310))
+      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 326))
     },
   }
 } catch (e) {
@@ -187,7 +187,7 @@ var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime
 var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 37));
 var homeFrame = function homeFrame() {
   __webpack_require__.e(/*! require.ensure | pagesHome/components/home-frame */ "pagesHome/components/home-frame").then((function () {
-    return resolve(__webpack_require__(/*! ../components/home-frame.vue */ 318));
+    return resolve(__webpack_require__(/*! ../components/home-frame.vue */ 334));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {
@@ -249,6 +249,8 @@ var _default = {
                       user.phone = aee.data.phone;
                       if (aee.data && aee.data.nick_name) user.name = aee.data.nick_name;
                       if (aee.data && aee.data.logo_url) user.logo_url = aee.data.logo_url;
+                      if (aee.data && aee.data.is_vip) user.is_vip = aee.data.is_vip;
+                      if (aee.data && aee.data.vip_end_time) user.vip_end_time = aee.data.vip_end_time;
                     }
                   case 5:
                   case "end":

File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesHome/account/index.wxml


+ 3 - 0
unpackage/dist/dev/mp-weixin/pagesHome/account/index.wxss

@@ -46,6 +46,9 @@
   background-clip: text;
   -webkit-background-clip: text;
 }
+.main .one .one_2 .vip {
+  color: var(--rgbffd);
+}
 .main .one .one_3 {
   padding: 4vw 0;
   overflow: hidden;

+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesHome/app/index.js

@@ -162,7 +162,7 @@ var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime
 var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 37));
 var homeFrame = function homeFrame() {
   __webpack_require__.e(/*! require.ensure | pagesHome/components/home-frame */ "pagesHome/components/home-frame").then((function () {
-    return resolve(__webpack_require__(/*! ../components/home-frame.vue */ 318));
+    return resolve(__webpack_require__(/*! ../components/home-frame.vue */ 334));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

File diff suppressed because it is too large
+ 14 - 14
unpackage/dist/dev/mp-weixin/pagesHome/components/home-frame.js


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

@@ -172,7 +172,7 @@ var _toConsumableArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/
 var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 37));
 var homeFrame = function homeFrame() {
   __webpack_require__.e(/*! require.ensure | pagesHome/components/home-frame */ "pagesHome/components/home-frame").then((function () {
-    return resolve(__webpack_require__(/*! ../components/home-frame.vue */ 318));
+    return resolve(__webpack_require__(/*! ../components/home-frame.vue */ 334));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

+ 2 - 2
unpackage/dist/dev/mp-weixin/pagesHome/home/index.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uniIcons: function () {
-      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 310))
+      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 326))
     },
   }
 } catch (e) {
@@ -230,7 +230,7 @@ var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime
 var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 37));
 var homeFrame = function homeFrame() {
   __webpack_require__.e(/*! require.ensure | pagesHome/components/home-frame */ "pagesHome/components/home-frame").then((function () {
-    return resolve(__webpack_require__(/*! ../components/home-frame.vue */ 318));
+    return resolve(__webpack_require__(/*! ../components/home-frame.vue */ 334));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesHome/home/index.wxml


+ 11 - 0
unpackage/dist/dev/mp-weixin/pagesHome/home/index.wxss

@@ -65,6 +65,7 @@
   flex-wrap: wrap;
 }
 .main .two .two_0 .info .list {
+  position: relative;
   width: 48%;
   margin: 0 0 10px 0;
 }
@@ -84,6 +85,16 @@
   font-size: 12px;
   justify-content: space-between;
 }
+.main .two .two_0 .info .list .vip {
+  position: absolute;
+  top: 0;
+  left: 1vw;
+}
+.main .two .two_0 .info .list .vip ._span {
+  font-size: 14px;
+  font-weight: bold;
+  color: var(--rgbffd);
+}
 .main .two .two_0 .btn button {
   border-radius: 25px;
   background-color: var(--rgbfa4);

+ 2 - 2
unpackage/dist/dev/mp-weixin/pagesHome/hot/index.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uniIcons: function () {
-      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 310))
+      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 326))
     },
   }
 } catch (e) {
@@ -230,7 +230,7 @@ var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime
 var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 37));
 var homeFrame = function homeFrame() {
   __webpack_require__.e(/*! require.ensure | pagesHome/components/home-frame */ "pagesHome/components/home-frame").then((function () {
-    return resolve(__webpack_require__(/*! ../components/home-frame.vue */ 318));
+    return resolve(__webpack_require__(/*! ../components/home-frame.vue */ 334));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesHome/hot/index.wxml


+ 11 - 0
unpackage/dist/dev/mp-weixin/pagesHome/hot/index.wxss

@@ -65,6 +65,7 @@
   flex-wrap: wrap;
 }
 .main .two .two_0 .info .list {
+  position: relative;
   width: 48%;
   margin: 0 0 10px 0;
 }
@@ -84,6 +85,16 @@
   font-size: 12px;
   justify-content: space-between;
 }
+.main .two .two_0 .info .list .vip {
+  position: absolute;
+  top: 0;
+  left: 1vw;
+}
+.main .two .two_0 .info .list .vip ._span {
+  font-size: 14px;
+  font-weight: bold;
+  color: var(--rgbffd);
+}
 .main .two .two_0 .btn button {
   border-radius: 25px;
   background-color: var(--rgbfa4);

File diff suppressed because it is too large
+ 16 - 16
unpackage/dist/dev/mp-weixin/pagesVideo/components/c-drawer.js


File diff suppressed because it is too large
+ 20 - 17
unpackage/dist/dev/mp-weixin/pagesVideo/more/index.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesVideo/more/index.wxml


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

@@ -27,6 +27,7 @@
   flex-wrap: wrap;
 }
 .content .two .two_1 .list {
+  position: relative;
   width: 48%;
   margin: 0 10px 10px 0;
 }
@@ -49,6 +50,16 @@
   font-size: 12px;
   justify-content: space-between;
 }
+.content .two .two_1 .list .vip {
+  position: absolute;
+  top: 0;
+  left: 1vw;
+}
+.content .two .two_1 .list .vip ._span {
+  font-size: 14px;
+  font-weight: bold;
+  color: var(--rgbffd);
+}
 .content .two .two_1 .list:nth-child(2n) {
   margin: 0 0 10px 0;
 }

File diff suppressed because it is too large
+ 21 - 21
unpackage/dist/dev/mp-weixin/pagesVideo/search/index.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesVideo/search/index.wxml


+ 12 - 1
unpackage/dist/dev/mp-weixin/pagesVideo/search/index.wxss

@@ -38,6 +38,7 @@
   flex-wrap: wrap;
 }
 .content .two .two_1 .list {
+  position: relative;
   width: 48%;
   margin: 0 10px 10px 0;
 }
@@ -60,6 +61,16 @@
   font-size: 12px;
   justify-content: space-between;
 }
+.content .two .two_1 .list .vip {
+  position: absolute;
+  top: 0;
+  left: 1vw;
+}
+.content .two .two_1 .list .vip ._span {
+  font-size: 14px;
+  font-weight: bold;
+  color: var(--rgbffd);
+}
 .content .two .two_1 .list:nth-child(2n) {
   margin: 0 0 10px 0;
 }
@@ -107,8 +118,8 @@
 }
 .drawer_one .drawer_one_2 button {
   width: 30%;
-  height: 100%;
   margin: 0 2vw;
+  line-height: 2.5;
 }
 .drawer_one .drawer_one_2 button:nth-child(1) {
   background-color: var(--rgbfa4);

File diff suppressed because it is too large
+ 205 - 145
unpackage/dist/dev/mp-weixin/pagesVideo/video/index.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesVideo/video/index.wxml


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

@@ -19,6 +19,12 @@
   overflow: hidden;
   border: 1px solid var(--rgbf1f);
 }
+.content .one .image {
+  width: 100%;
+  height: 210px;
+  overflow: hidden;
+  border: 1px solid var(--rgbf1f);
+}
 .content .two {
   position: relative;
   flex-grow: 1;

File diff suppressed because it is too large
+ 16 - 16
unpackage/dist/dev/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js


File diff suppressed because it is too large
+ 14 - 14
unpackage/dist/dev/mp-weixin/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.js


File diff suppressed because it is too large
+ 15 - 15
unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js


File diff suppressed because it is too large
+ 14 - 14
unpackage/dist/dev/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js


File diff suppressed because it is too large
+ 16 - 16
unpackage/dist/dev/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js


File diff suppressed because it is too large
+ 15 - 15
unpackage/dist/dev/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js


File diff suppressed because it is too large
+ 15 - 15
unpackage/dist/dev/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js


File diff suppressed because it is too large
+ 16 - 16
unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.js


File diff suppressed because it is too large
+ 15 - 15
unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js


File diff suppressed because it is too large
+ 11 - 11
unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js