소스 검색

代码整理

pansl 2 년 전
부모
커밋
68170cb064
100개의 변경된 파일523개의 추가작업 그리고 16108개의 파일을 삭제
  1. 1 1
      common/apis/common.js
  2. 1 1
      common/apis/index.js
  3. 1 1
      common/apis/my.js
  4. 1 1
      common/apis/recharge.js
  5. 1 1
      common/apis/zju.js
  6. 0 1
      common/city.data.js
  7. 7 20
      common/config.js
  8. 0 169
      common/http.js
  9. 0 116
      common/request.js
  10. 21 21
      common/token.js
  11. 0 170
      components/chunlei-video/chunLei-danmu/chunLei-danmu.nvue
  12. 0 214
      components/chunlei-video/chunLei-slider/chunLei-slider.nvue
  13. 0 280
      components/chunlei-video/chunlei-video.nvue
  14. 0 90
      components/countdown/time.vue
  15. 0 95
      components/dialog/ach.vue
  16. 0 140
      components/dialog/birthday.vue
  17. 0 89
      components/dialog/cardsend.vue
  18. 0 129
      components/dialog/couponshare.vue
  19. 0 137
      components/dialog/couponshareget.vue
  20. 0 140
      components/dialog/dyxx.vue
  21. 0 140
      components/dialog/login.vue
  22. 0 113
      components/dialog/payment.vue
  23. 0 163
      components/dialog/qrcode.vue
  24. 0 138
      components/h-form-alert/h-form-alert.vue
  25. 0 48
      components/h-form-alert/readme.md
  26. 0 166
      components/ming-pop/ming-pop.vue
  27. 0 134
      components/model/model.vue
  28. 0 184
      components/select/address.vue
  29. 0 176
      components/select/birthday.vue
  30. 0 175
      components/select/coupon.vue
  31. 0 280
      components/select/datetime.vue
  32. 0 179
      components/select/mendian.vue
  33. 0 63
      components/select/star.vue
  34. 0 74
      components/show/photo.vue
  35. 0 96
      components/uni-icons1/icons.js
  36. 0 57
      components/uni-icons1/uni-icons.vue
  37. 0 118
      components/upload/face.vue
  38. 0 147
      components/upload/list.vue
  39. 0 20
      components/wyb-pagination/iconfont.css
  40. 0 455
      components/wyb-pagination/wyb-pagination.vue
  41. 0 3
      main.js
  42. 2 1
      manifest.json
  43. 32 332
      pages.json
  44. 0 138
      pages/client/components/home/jqjs.vue
  45. 0 90
      pages/client/consume/consume.vue
  46. 0 82
      pages/client/consume/style/consume.css
  47. 0 363
      pages/client/integral/index.vue
  48. 0 136
      pages/client/integral/role.vue
  49. 0 93
      pages/client/member/birthday.vue
  50. 0 86
      pages/client/member/feedback.vue
  51. 0 252
      pages/client/member/index.vue
  52. 0 66
      pages/client/member/info.vue
  53. 0 381
      pages/client/member/qrshare.vue
  54. 0 115
      pages/client/member/style/index.css
  55. 0 218
      pages/client/member/tx.vue
  56. 0 112
      pages/client/member/txjl.vue
  57. 0 88
      pages/client/orders/orders.vue
  58. 0 82
      pages/client/orders/style/orders.css
  59. 0 318
      pages/client/style/zui.css
  60. 0 482
      pages/client/tuan/buy.vue
  61. 0 852
      pages/client/tuan/detail(原版模板) .nvue
  62. 0 657
      pages/client/tuan/detail.nvue
  63. 0 409
      pages/client/tuan/index.vue
  64. 0 380
      pages/client/tuan/info.vue
  65. 0 746
      pages/client/tuan/infotp.vue
  66. 0 336
      pages/client/tuan/list.vue
  67. BIN
      pages/client/tuan/loading.gif
  68. 0 92
      pages/client/tuan/share.vue
  69. 0 375
      pages/client/tuan/ss.vue
  70. 0 67
      pages/client/tuan/style/zuijin.css
  71. 0 339
      pages/client/tuan/wdxh.vue
  72. 0 66
      pages/client/tuan/zjgk.vue
  73. 0 368
      pages/client/tuan/zjjl.vue
  74. 0 504
      pages/client/video.nvue
  75. 0 59
      pages/client/video/video.nvue
  76. 0 99
      pages/client/vipcard/adviser.vue
  77. 0 76
      pages/client/vipcard/adviserchange.vue
  78. 0 91
      pages/client/vipcard/fxlog.vue
  79. 0 302
      pages/client/vipcard/index.vue
  80. 0 141
      pages/client/vipcard/integraldh.vue
  81. 0 168
      pages/client/vipcard/integrallog.vue
  82. 0 94
      pages/client/vipcard/moneylog.vue
  83. 0 479
      pages/client/vipcard/recharge.vue
  84. 0 210
      pages/client/vipcard/vipcm.vue
  85. 0 24
      pages/client/webva.vue
  86. 0 29
      pages/client/webvazf.vue
  87. 0 314
      pages/client/zui copy.vue
  88. 0 195
      pages/client/zui.vue
  89. 0 0
      pages/components/home/banner.vue
  90. 0 0
      pages/components/home/default.vue
  91. 0 0
      pages/components/home/grid.vue
  92. 0 0
      pages/components/home/vipcard.vue
  93. 1 1
      pages/index/billboard/index.vue
  94. 251 254
      pages/index/index.vue
  95. 1 1
      pages/index/new/index.vue
  96. 77 76
      pages/member/consume.vue
  97. 33 37
      pages/member/index.vue
  98. 89 87
      pages/member/orders.vue
  99. 4 0
      pages/member/style/index.css
  100. 0 0
      pages/pay/pay.vue

+ 1 - 1
common/apis/common.js

@@ -1,4 +1,4 @@
-import http from "../http.js";
+import http from "@/utils/http.js";
 
 // 获取客服
 export const getKefu = () => {

+ 1 - 1
common/apis/index.js

@@ -1,4 +1,4 @@
-import http from "../http.js";
+import http from "@/utils/http.js";
 
 // 获取剧院(首页)
 export const getMiniprogramHall = () => {

+ 1 - 1
common/apis/my.js

@@ -1,4 +1,4 @@
-import http from "../http.js";
+import http from "@/utils/http.js";
 
 // 获取用户信息
 export const getUserInfo = () => {

+ 1 - 1
common/apis/recharge.js

@@ -1,4 +1,4 @@
-import http from "../http.js";
+import http from "@/utils/http.js";
 
 // 获取用户信息
 export const getOptions = () => {

+ 1 - 1
common/apis/zju.js

@@ -1,4 +1,4 @@
-import http from "../http.js";
+import http from "@/utils/http.js";
 // 最近观看
 export const watchRecord = () => {
 	return http.get('/api/user/watchrecord/list');

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 1
common/city.data.js


+ 7 - 20
common/config.js

@@ -1,25 +1,12 @@
 // 配置信息
 export default {
-	apiUrl:"https://api.duanju.dududus.com",
-	webUrl:'http://xjc.demo.hongcd.com',//uni.getStorageSync("config").weburl?uni.getStorageSync("config").weburl:'http://192.168.10.175',
-	imgUrl:'https://xjc.demo.hongcd.com',//uni.getStorageSync("config").imgurl?uni.getStorageSync("config").imgurl:'http://192.168.10.175',
-	staticUrl:'https://xjc.demo.hongcd.com/img/',//静态图片地址https://xjc.demo.hongcd.com
-	zystaticUrl:"",
+	apiUrl: "https://api.duanju.dududus.com",
+	webUrl: 'http://xjc.demo.hongcd.com', //uni.getStorageSync("config").weburl?uni.getStorageSync("config").weburl:'http://192.168.10.175',
+	imgUrl: 'https://xjc.demo.hongcd.com', //uni.getStorageSync("config").imgurl?uni.getStorageSync("config").imgurl:'http://192.168.10.175',
+	staticUrl: 'https://xjc.demo.hongcd.com/img/', //静态图片地址https://xjc.demo.hongcd.com
+	zystaticUrl: "",
 	// websocket地址
 	//websocketUrl:"https://wx.***.com",
 	// 消息提示tabbar索引  websocketUrl:"https://wx.***.com",
-	TabbarIndex:2
-} 
-// 配置信息
-// export default {
-// 	// api请求前缀
-// 	// apiUrl:"http://api.duanju.dududus.com",
-// 	apiUrl:"https://xjc.demo.hongcd.com",
-// 	webUrl:'https://xjc.demo.hongcd.com',//uni.getStorageSync("config").weburl?uni.getStorageSync("config").weburl:'http://192.168.10.175',
-// 	imgUrl:'https://xjc.demo.hongcd.com',//uni.getStorageSync("config").imgurl?uni.getStorageSync("config").imgurl:'http://192.168.10.175',
-// 	staticUrl:'https://xjc.demo.hongcd.com/img/',//静态图片地址https://xjc.demo.hongcd.com
-// 	// websocket地址
-// 	//websocketUrl:"https://wx.***.com",
-// 	// 消息提示tabbar索引  websocketUrl:"https://wx.***.com",
-// 	TabbarIndex:2
-// } 
+	TabbarIndex: 2
+}

+ 0 - 169
common/http.js

@@ -1,169 +0,0 @@
-// 引入配置文件
-import config from "./config.js";
-// #ifdef MP-WEIXIN
-import wxApp from "./wecaht.min.app.js"
-import {
-	getToken,
-	clearToken
-} from './token.js'
-// #endif
-const filterNoToken = ["/api/auth/refreshToken", "/api/auth/login"];
-
-export default {
-	config: {
-		baseUrl: config.apiUrl,
-		header: {
-			'Content-Type': 'application/json;charset=UTF-8',
-		},
-		data: {},
-		method: "GET",
-		dataType: "json",
-	},
-	async request(options = {}) {
-		// 请求拦截器
-		uni.addInterceptor('request', {
-			invoke: (request) => {
-				// 在发送请求之前的处理逻辑,例如添加请求头、请求日志等
-				// request.header = {
-				// 	'Content-Type': 'application/json', // 设置请求头
-				// 	// 在这里可以添加其他自定义请求头
-				// };
-				// console.log('Request:', request);
-				return request;
-			},
-		});
-		// 响应拦截器
-		uni.addInterceptor('response', {
-			invoke: (response) => {
-				// 在接收到响应数据之后的处理逻辑,例如统一处理错误码、响应日志等
-				// console.log('Response:', response);
-				return response;
-			},
-		});
-		options.header = options.header || this.config.header;
-		options.method = options.method || this.config.method;
-		options.dataType = options.dataType || this.config.dataType;
-
-		let version = 'web';
-		// #ifdef MP-WEIXIN  
-		//	微信小程序处理
-		options.header.appid = wxApp.getWXAppId();
-		options.header.source = 'wxapp';
-		// 过滤不需要token的api
-		if (filterNoToken.indexOf(options.url) === -1) {
-			// console.log('getTokenString ',options.url )
-			options.header.Authorization = await (this.getTokenString());
-		}
-		// #endif
-		options.original_url = options.url;
-		options.url = this.config.baseUrl + options.url;
-		
-		console.log('options.url ', options.url)
-		return new  Promise(  (resolve, reject) =>  {
-			options.success = async (e) => {
-				console.log(e, 'successsuccesssuccesssuccesssuccess')
-				let res = e.data;
-				if (e.statusCode === 200) {
-					if (res.code == 500201) {
-						// 未登录
-						clearToken();
-						console.log('111111111');
-					 	await getToken();
-						if (filterNoToken.indexOf(options.original_url) === -1) {
-							console.log('222222222',options);
-							return this.request(options);
-						}
-					} else {
-						if (res.code != 0) {
-							uni.showToast({
-								title: res.msg,
-								duration: 1000,
-								icon: 'none'
-							});
-						}
-					}
-					resolve(res.data);
-				} else {
-					uni.showToast({
-						title: "网络异常,请稍后再试",
-						duration: 1000,
-						icon: 'none'
-					});
-					reject(new Error('Request failed'));
-				}
-			}
-			options.fail = (err) => {
-				console.log(err)
-				reject(err);
-			}
-			uni.request(options)
-		})
-
-	},
-	get(url, data, options = {}) {
-		options.url = url;
-		options.data = data;
-		options.method = 'GET';
-		return this.request(options);
-	},
-	post(url, data, options = {}) {
-		options.url = url;
-		options.data = data;
-		options.method = 'POST';
-		return this.request(options);
-	},
-
-	// 上传图片
-	upload(url, options = {}) {
-		options.url = this.config.baseUrl + url;
-		options.header = options.header || this.config.header;
-		options.fileType = options.fileType || "image";
-		options.formData = options.formData || {};
-		options.filePath = options.filePath;
-		options.name = options.name;
-		// TODO:token增加等操作
-		if (options.token) {
-			// 验证是否登录
-			if (!this.checkToken(options.checkToken)) return;
-			// 验证权限
-			if (!this.checkAuth(options.checkAuth)) return;
-			options.header.token = User.token;
-		}
-
-		return uni.uploadFile(options);
-	},
-	// 错误处理
-	errorCheck(err, res, errfun = false, resfun = false) {
-		if (err) {
-			typeof errfun === 'function' && errfun();
-			uni.showToast({
-				title: '加载失败',
-				icon: "none"
-			});
-			return false;
-		}
-		if (res.data.errorCode) {
-			typeof errfun === 'function' && resfun();
-			uni.showToast({
-				title: res.data.msg,
-				icon: "none"
-			});
-			return false;
-		}
-		return true;
-	},
-	async getTokenString() {
-		// console.log('getTokenString-----start');
-		await getToken();
-		let token = uni.getStorageSync('token');
-		// token格式化
-		if (token && typeof token === "string") {
-			token = JSON.parse(token);
-		}
-		// console.log('getTokenString--end', token);
-		return token.token;
-	},
-	async setRanSe(link_id){
-		
-	}
-}

+ 0 - 116
common/request.js

@@ -1,116 +0,0 @@
-// 引入配置文件
-import config from "./config.js";
-export default{
-	config:{
-		baseUrl:config.webUrl,
-		header:{
-			'Content-Type':'application/json;charset=UTF-8',
-			'Content-Type':'application/x-www-form-urlencoded'
-		},
-		data: {},
-		method: "GET",
-		dataType: "json",
-	},
-	request(options = {}){
-		options.header = options.header || this.config.header;
-		options.method = options.method || this.config.method;
-		options.dataType = options.dataType || this.config.dataType;
-		options.url = this.config.baseUrl+options.url;
-		// TODO:token增加等操作
-		if (options.token) {
-			options.data.token = uni.getStorageSync("userinfo").token;
-			options.data.uid = uni.getStorageSync("userinfo").id;
-		}
-		var version='web';
-		// #ifdef APP-PLUS
-		var version=plus.runtime.version
-		// #endif
-		options.data.version=version
-		return uni.request(options).then(res => {
-			if(res[1].data.msg=='version10001'){
-				uni.showModal({
-					title: '更新提示',
-					content:"当前版本需要更新,请及时更新",
-					showCancel: false,
-					confirmText: "确定",
-					success: function (ress) {
-						plus.runtime.openURL(res[1].data.data);
-						uni.reLaunch({
-							url:'/pages/public/login'
-						})
-					}
-				});
-				return false;
-			}
-			return res;
-		});
-	},
-	get(url,data,options={}){
-		options.url = url;
-		options.data = data;
-		options.method = 'GET';
-		return this.request(options);
-	},
-	post(url,data,options={}){
-		options.url = url;
-		options.data = data;
-		options.method = 'POST';
-		return this.request(options);
-	},
-	
-	// 上传图片
-	upload(url,options = {}){
-		options.url = this.config.baseUrl+url;
-		options.header = options.header || this.config.header;
-		options.fileType = options.fileType || "image";
-		options.formData = options.formData || {};
-		options.filePath = options.filePath;
-		options.name = options.name;
-		// TODO:token增加等操作
-		if (options.token) {
-			// 验证是否登录
-			if (!this.checkToken(options.checkToken)) return;
-			// 验证权限
-			if (!this.checkAuth(options.checkAuth)) return; 
-			options.header.token = User.token;
-		}
-		
-		return uni.uploadFile(options);
-	},
-	// 错误处理
-	errorCheck(err,res,errfun = false,resfun = false){
-		if (err) {
-			typeof errfun === 'function' && errfun();
-			uni.showToast({ title: '加载失败',icon:"none" });
-			return false;
-		}
-		if (res.data.errorCode) {
-			typeof errfun === 'function' && resfun();
-			uni.showToast({ title: res.data.msg,icon:"none" });
-			return false;
-		}
-		return true;
-	},
-	// 验证用户是否登录
-	checkToken(checkToken){
-		if (checkToken && !User.token) {
-			uni.showToast({ title: '请先登录', icon:"none" })
-			uni.navigateTo({
-				url: '/pages/login/login'
-			});
-			return false;
-		}
-		return true;
-	},
-	// 验证用户权限
-	checkAuth(checkAuth){
-		if (checkAuth && !User.userinfo.phone) {
-			uni.showToast({ title: '请先绑定手机号码', icon:"none" })
-			uni.navigateTo({
-				url: '/pages/user-bind-phone/user-bind-phone'
-			});
-			return false;
-		}
-		return true;
-	}
-}

+ 21 - 21
common/token.js

@@ -1,16 +1,16 @@
 import wxApp from "./wecaht.min.app.js";
-import request from "./http.js"
+import request from "@/utils/http.js";
 let token = null;
 let requestLoginTime = 0;
 
 // 获取token
-export const getToken = async () => {
+export const getToken = async () => {
 	// console.log("token-000000000000000000",getToken.promise);
 	if (!token) token = uni.getStorageSync('token');
 	// token格式化
 	if (token && typeof token === "string") {
 		token = JSON.parse(token);
-	}
+	}
 	// console.log("token-1111111111111",token);
 	console.log("checkToken", checkToken(token));
 	if (!token) {
@@ -19,33 +19,33 @@ export const getToken = async () => {
 		return Promise.resolve(token.token);
 	} else {
 		getToken.promise = refreshToken();
-	}
+	}
 
 	getToken.promise = getToken.promise
-		.finally(() => {
+		.finally(() => {
 			getToken.promise = null;
 		})
 		.then(r => {
-			console.log("refresh"); 
-			return setToken(r);
+			console.log("refresh", r, 'rrr');
+			return setToken(r.data);
 		});
 	return getToken.promise;
- 
+
 };
 
 
 // 登录
 export const login = async () => {
-	 requestLoginTime++;
-	  if (requestLoginTime != 1) {
-	    let loginResponed = await loginPromise();
-	  }
+	requestLoginTime++;
+	if (requestLoginTime != 1) {
+		let loginResponed = await loginPromise();
+	}
 	let code = await (wxApp.getWxMinAppUuerCode());
 	let res = await request.post("/api/auth/login", {
 		code: code,
-		appid: wxApp.getWXAppId() 
+		appid: wxApp.getWXAppId()
 	});
-	requestLoginTime = 0;
+	requestLoginTime = 0;
 	return res;
 };
 
@@ -85,14 +85,14 @@ const checkToken = t => {
 
 // 设置token
 const setToken = async t => {
-	try{
-		token = formatToken(t);
-		uni.setStorageSync("token", token);
-		return t.token;
-	}catch(e){
-		console.log('token-set--errr',e);
+	try {
+		token = formatToken(t);
+		uni.setStorageSync("token", token);
+		return t.token;
+	} catch (e) {
+		console.log('token-set--errr', e);
 	}
-	
+
 };
 
 // 清除token  

+ 0 - 170
components/chunlei-video/chunLei-danmu/chunLei-danmu.nvue

@@ -1,170 +0,0 @@
-<template>
-	<div class="danmu" :style="{ width: `${width}px` }">
-		<div class="danmu-row" :style="{ width: `${width}px` }">
-			<div :style="{ left:`${width}px`}" ref="move" :id="item._id" v-for="item in danmuList1" :key="item._id" class="moveDiv">
-				<image :src="item.avatar" class="img" v-if="item.avatar"></image>
-				<text :class="`${platform}-title`" :style="{ color:item.color?item.color:'#fff' }">{{item.text}}</text>
-			</div>
-		</div>
-		<div class="danmu-row" :style="{ width: `${width}px` }">
-			<div :style="{ left:`${width}px`}" ref="move" :id="item._id" v-for="item in danmuList2" :key="item._id" class="moveDiv">
-				<image :src="item.avatar" class="img" v-if="item.avatar"></image>
-				<text :class="`${platform}-title`" :style="{ color:item.color?item.color:'#fff' }">{{item.text}}</text>
-			</div>
-		</div>
-		<div class="danmu-row" :style="{ width: `${width}px` }">
-			<div :style="{ left:`${width}px`}" ref="move" :id="item._id" v-for="item in danmuList3" :key="item._id" class="moveDiv">
-				<image :src="item.avatar" class="img" v-if="item.avatar"></image>
-				<text :class="`${platform}-title`" :style="{ color:item.color?item.color:'#fff' }">{{item.text}}</text>
-			</div>
-		</div>
-		<div class="danmu-row" :style="{ width: `${width}px` }">
-			<div :style="{ left:`${width}px`}" ref="move" :id="item._id" v-for="item in danmuList4" :key="item._id" class="moveDiv">
-				<image :src="item.avatar" class="img" v-if="item.avatar"></image>
-				<text :class="`${platform}-title`" :style="{ color:item.color?item.color:'#fff' }">{{item.text}}</text>
-			</div>
-		</div>
-	</div>
-</template>
-
-<script>
-	const animation = weex.requireModule('animation');
-	const modal = weex.requireModule('modal');
-	export default{
-		props:{
-			width:{
-				type:Number,
-				default:0
-			},
-			danmuList:{ //弹幕
-				type:[Array],
-				default:()=>[]
-			},
-			platform:{
-				type:String,
-				default:'android'
-			},
-			current:{
-				type:Number,
-				default:0
-			}
-		},
-		data(){
-			return{
-				danmuList1:[],
-				danmuList2:[],
-				danmuList3:[],
-				danmuList4:[],
-			}
-		},
-		methods:{
-			promise(){
-				let promise = new Promise((resolve,reject)=>{
-					setTimeout(()=>{
-						resolve()
-					},100)
-				})
-				return promise
-			},
-			cleanDanmu(){
-				this.danmuList1 = []
-				this.danmuList2 = []
-				this.danmuList3 = []
-				this.danmuList4 = []
-			},
-			randomRange(min, max) { // min最小值,max最大值
-			    return Math.floor(Math.random() * (max - min)) + min;
-			},
-			animationText(id,distance,fn){
-				let el
-				let elList = this.$refs.move
-				for (let item of elList) {
-					if(item.attr.id == id){
-						el = item
-					}
-					
-				}
-				animation.transition(el, {
-					styles: {
-						transform: `translate( ${distance}px, 0px)`,
-					},
-					duration: 20000, //ms
-					timingFunction: 'ease',
-					delay: 0 //ms
-					}, () => {
-						fn()
-					}
-				)
-			}
-		},
-		watch:{
-			danmuList:{
-				immediate:true,
-				handler(newVal,oldVal){
-					for (let key in newVal) {
-						newVal[key]._id = key
-					}
-				}
-			},
-			current:{
-				handler:async function(newVal,oldVal){
-					
-					//间隔0.25
-					if(Math.abs(newVal-oldVal)>=0.24){
-						for (let item of this.danmuList) {
-							if( item.time > Math.floor(newVal*1) && item.time <= Math.floor(newVal*1+ 0.25) ) {
-								let num = this.randomRange(1,5)
-								this[`danmuList${num}`].push(item)
-								await this.promise()
-								
-								//开始动画
-								this.animationText(item._id,-this.width*2,()=>{
-									let index
-									//删除动画后的text
-									for (let key in this[`danmuList${num}`]) {
-										if(this[`danmuList${num}`][key]._id==item._id){
-											index = key
-										}
-									}
-									this[`danmuList${num}`].splice(index,1)
-								})
-							}
-						}
-					}
-					
-				}
-			},
-		}
-	}
-</script>
-
-<style>
-.danmu{
-	height: 160px;
-	flex-direction: column;
-	
-}
-.danmu-row{
-	position: relative;
-	height: 40px;
-	flex-direction: row;
-	
-}
-.moveDiv{
-	position: absolute;
-	flex-direction: row;
-	justify-content: center;
-}
-.android-title{
-	font-size: 24px;
-}
-.img{
-	width: 30px;
-	height: 30px;
-	margin-left: 10px;
-	border-radius: 15px;
-}
-.ios-title{
-	font-size: 24px;
-}
-</style>

+ 0 - 214
components/chunlei-video/chunLei-slider/chunLei-slider.nvue

@@ -1,214 +0,0 @@
-<template>
-	<div class="slider flex" id="slider" :style="{ width: `${width}px` }" ref="slider">
-		<div class="slider-left flex" :style="{ width: `${leftWidth}px` }" @touchend.stop="sliderTouch">
-			<div class="left" :style="{backgroundColor:backgroundColor}"></div>
-		</div>
-		<div class="slider-right flex" @touchend.stop="sliderTouch" :style="{ width: `${currentWidth-leftWidth}px` }">
-			<div class="right"></div>
-		</div>
-		<div class="block flex" :style="{backgroundColor:touch?blockOuterColor:'rgba(0,0,0,0)', left: `${leftWidth}px`}"
-			@click.stop="">
-			<div class="block-inner flex" :style="{backgroundColor:blockBackgroundColor}"  @touchmove.stop.prevent="blockTouchMove" @touchend="blockTouchEnd" @touchstart="blockTouchStart">
-				<div class="block-inner-inner" :style="{backgroundColor:blockColor}">
-					
-				</div>
-			</div>
-		</div>
-	</div>
-</template>
-
-<script>
-	export default{
-		props:{
-			min:{
-				type:Number,
-				default:0
-			},
-			max:{
-				type:Number,
-				default:0
-			},
-			value:{
-				type:Number,
-				default:0
-			},
-			width:{
-				type:Number,
-				default:0
-			},
-			ratio:{
-				type:Number,
-				default:1
-			},
-			direction:{
-				type:String,
-				default:'screenX'
-			},
-			backgroundColor:{ //滑块右侧背景条的颜色
-				type:String,
-				default:'#e9e9e9'
-			},
-			blockColor:{ //滑块颜色
-				type:String,
-				default:'#ffffff'
-			},
-			screenLeft:{ //slider距离左边距离
-				type:Number,
-				default:0
-			},
-			iosDirection:{
-				type:Number,
-				default:1
-			}
-		},
-		data(){
-			return{
-				oldToucesX:0,
-				leftWidth:0,
-				oldLeftWidth:0,
-				touch:false
-			}
-		},
-		mounted() {
-			
-			
-		},
-		methods:{
-			sliderTouch(e){
-				console.log(e)
-				let touches = e.changedTouches[0]
-				this.leftWidth = (touches[this.direction]||touches['clientX'])*this.ratio-this.screenLeft
-				this.leftWidth = this.leftWidth > this.currentWidth? this.currentWidth : this.leftWidth
-				this.leftWidth = this.leftWidth < 0? 0 : this.leftWidth
-				this.blockTouchEnd()
-				
-			},
-			// 触摸开始
-			blockTouchStart(e) {
-				this.touch = true
-				this.oldLeftWidth = this.leftWidth
-				this.oldToucesX = e.changedTouches[0][this.direction]||e.changedTouches[0]['clientX'];
-			},
-			// 计算方向
-			blockTouchMove(e) {
-				let newToucesX
-				
-				newToucesX= e.changedTouches[0][this.direction]||e.changedTouches[0]['clientX'];
-				
-				this.leftWidth = this.iosDirection*(newToucesX - this.oldToucesX)*this.ratio+ this.oldLeftWidth
-				this.leftWidth = this.leftWidth > this.currentWidth? this.currentWidth : this.leftWidth
-				this.leftWidth = this.leftWidth < 0? 0 : this.leftWidth
-				
-			},
-			// 结束触摸
-			blockTouchEnd(e) {
-				let current = this.leftWidth / this.currentWidth *this.max
-				const event = {detail:{value:current}}
-				this.$emit('change',event)
-				this.touch = false
-			},
-			colorRgb(string,opacity){
-				var reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/;
-				var sColor = string.toLowerCase();
-				if(sColor && reg.test(sColor)){
-				    if(sColor.length === 4){
-				        var sColorNew = "#";
-				        for(var i=1; i<4; i+=1){
-				            sColorNew += sColor.slice(i,i+1).concat(sColor.slice(i,i+1));   
-				        }
-				        sColor = sColorNew;
-				    }
-				    //处理六位的颜色值
-				    var sColorChange = [];
-				    for(var i=1; i<7; i+=2){
-				        sColorChange.push(parseInt("0x"+sColor.slice(i,i+2)));  
-				    }
-				    return "rgba(" + sColorChange.join(",") +`,${opacity}`+")";
-				}else{
-				    return sColor;  
-				}
-			}
-		},
-		computed:{
-			blockOuterColor(){
-				return this.colorRgb(this.blockColor,0.4)
-			},
-			blockBackgroundColor(){
-				return this.colorRgb(this.blockColor,0.5)
-			},
-			currentWidth(){
-				return this.width - 40
-			}
-		},
-		watch:{
-			value:{
-				immediate:true,
-				handler(newVal,oldVal){
-					if(this.touch) return
-					
-					this.leftWidth = newVal/this.max * this.currentWidth
-					this.leftWidth = this.leftWidth > this.currentWidth? this.currentWidth : this.leftWidth
-				}
-			}
-			
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.flex{
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		
-	}
-	.slider{
-		position: relative;
-		flex-direction: row;
-		height: 40px;
-		align-items: center;
-		
-		justify-content: center;
-	}
-	.slider-left{
-		height: 40px;
-		flex-direction: row;
-		align-items: center;
-	}
-	.left{
-		flex: 1;
-		height: 3px;
-	}
-	.slider-right{
-		height: 40px;
-		flex-direction: row;
-		align-items: center;
-	}
-	.right{
-		height: 3px;
-		background-color: rgba(0,0,0,0.3);
-		flex: 1;
-	}
-	.block{
-		position: absolute;
-		height: 40px;
-		width: 40px;
-		border-radius: 20px;
-		justify-content: center;
-		align-items: center;
-		z-index: 999999;
-	}
-	.block-inner{
-		height: 20px;
-		width: 20px;
-		border-radius: 10px;
-		justify-content: center;
-		align-items: center;
-	}
-	.block-inner-inner{
-		height: 10px;
-		width: 10px;
-		border-radius: 5px;
-		
-	}
-</style>

+ 0 - 280
components/chunlei-video/chunlei-video.nvue

@@ -1,280 +0,0 @@
-<template>
-	<view class="video">
-		<video :src="src" :controls="controls" :show-center-play-btn="controls" :show-play-btn="controls" play-btn-position="center" autoplay="true" :muted="!load||!play"
-			:style="{ height: height }" :loop="true" @controlstoggle="controlstoggle" @fullscreenchange="screenChange" @play="continuePlay"
-			:enable-progress-gesture="false" :objectFit="objectFit" @ended="playEnd" :initial-time="startTime"
-			:id="`video_${src}`" ref="`video_${src}`" class="video" @timeupdate="timeupdate">
-		</video>
-		<cover-view class="icon-view" v-if="!play&&!playFirst">
-			<!-- <text class="icon" style="color:#FFF">&#xe896;</text> -->
-		</cover-view>
-		<cover-image class="img" :style="{ height: height }" :src="poster" v-if="poster!=''&&playFirst"></cover-image>
-		<cover-view class="top"></cover-view>
-		<!-- <cover-view class="bottom"></cover-view> -->
-		<!-- #ifdef APP-PLUS -->
-		<cover-view class="danmu-view">
-			<chunLei-danmu :danmuList="danmuList" :width="750"  :current="time" ref="danmu"></chunLei-danmu>
-		</cover-view>
-		<!-- #endif -->
-		<!-- #ifndef MP-WEIXIN -->
-		<cover-view class="slider-view">
-			<chunLei-slider :max="duration" :value="time" :style="{width:`${100}%`}" :screenLeft="120" :width="380" @change="changeCurrent"></chunLei-slider>
-		</cover-view>
-		<cover-image :src="rotateImg" class="rotate-img" :style="{transform:`rotate(${time*20}deg)`}"></cover-image>
-		<!-- #endif -->
-		<!-- #ifdef MP-WEIXIN -->
-		<!-- <cover-view class="progressBar" :style="{ width: barWidth }"></cover-view> -->
-		<!-- #endif -->
-	</view>
-</template>
-
-<script>
-	
-	import chunLeiSlider from './chunLei-slider/chunLei-slider.nvue';
-	//#ifdef APP-NVUE
-	import chunLeiDanmu from './chunLei-danmu/chunLei-danmu.nvue';
-	//#endif
-	export default{ 
-		components:{
-			chunLeiSlider,
-			//#ifdef APP-NVUE
-			chunLeiDanmu
-			//#endif
-		},
-		props:{
-			controls:{
-				type:Boolean,
-				default:false
-			},
-			src:{
-				type:String,
-				default:''
-			},
-			rotateImg:{
-				type:String,
-				default:''
-			},
-			play:{
-				type:Boolean,
-				default:false
-			},
-			height:{
-				type:String,
-				default:''
-			},
-			width:{
-				type:String,
-				default:''
-			},
-			initialTime:{
-				type:Number,
-				default:0
-			},
-			gDuration:{
-				type:Number,
-				default:999
-			}, //大概时长使进度条更准确
-			objectFit:{
-				type:String,
-				default:'contain'
-			},
-			poster:{ //视频封面的图片
-				type:String,
-				default:''
-			},
-			danmuList:{
-				type:Array,
-				default:[]
-			}
-		},
-		data(){
-			return{
-				time:0,
-				duration:0,
-				playFirst:true,
-				load:false,
-				timer:null
-			}
-		},
-		beforeCreate() {
-			// #ifdef APP-NVUE
-			var domModule = weex.requireModule('dom');
-			domModule.addRule('fontFace', {
-				'fontFamily': "texticons",
-				'src': "url('//static/chunlei-video/text-icon.ttf')"
-			});
-			// #endif
-		},
-		mounted() {
-			this.videoCtx = uni.createVideoContext(`video_${this.src}`,this)
-			//#ifndef MP-WEIXIN
-			setTimeout(()=>{this.videoCtx.play();},200)
-			// #endif
-		},
-		methods:{
-			continuePlay(){
-				if(!this.load){
-					this.load = true
-					this.videoPlay()
-				}
-			},
-			//拖动滑块
-			changeCurrent(e){
-				this.time = e.detail.value
-				this.videoCtx.seek(this.time)
-			},
-			screenChange(e){
-				//console.log(e.detail.fullScreen);
-				this.$emit('screenChange',e.detail.fullScreen)
-			},
-			controlstoggle(e){
-				console.log(e.detail.show);
-				//console.log(99999999);
-				this.$emit('controlstoggle',e.detail.show)
-			},
-			
-			playEnd(){
-				// console.log(2222222);
-				this.videoCtx.exitFullScreen()
-				this.$emit('playEnd')
-			},
-			timeupdate(event){
-				this.duration = event.detail.duration
-				if(this.time>=event.detail.duration) this.time=0
-				this.time = event.detail.currentTime
-				this.$emit('timeupdate',this.time)
-			},
-			videoPlay:function(){
-				if(this.timer) clearTimeout(this.timer)
-				this.timer = setTimeout(()=>{
-					console.log(this.play)
-					if(this.play){
-						this.videoCtx.play();
-						this.playFirst = false
-					}else{
-						this.videoCtx.pause();
-						this.$emit('pause',this.time)
-					}
-				})
-			},
-		},
-		watch:{
-			//防抖 防止视频播放暂停太快
-			play: function (newVal,oldVal){if(this.load) this.videoPlay()},
-			startTime:{
-				immediate: true,
-				handler(newVal,oldVal){
-					this.time = newVal
-				}
-			},
-			gDuration:{
-				immediate: true,
-				handler(newVal,oldVal){
-					this.duration = newVal
-				}
-			}
-		},
-		computed:{
-			barWidth(){
-				let width = this.time/this.duration*parseInt(this.width)
-				return `${width}px`
-			},
-			startTime(){
-				return this.initialTime
-			}
-		}
-	}
-</script>
-
-<style scoped>
-	/* #ifndef APP-PLUS-NVUE */
-	@font-face {
-		font-family: "texticons";
-		src: url('~@/static/chunlei-video/text-icon.ttf') format('truetype');
-	}
-	/* #endif*/
-	.video{
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		width: 750rpx;
-		
-		justify-content: center;
-		align-items: center;
-	}
-	.img{
-		position: absolute;
-		
-		width: 750rpx;
-	}
-	.icon-view{
-		position: absolute;
-	}
-	.top{
-		position: absolute;
-		top:0;
-		background-image: linear-gradient(to top , rgba(0,0,0,0) , rgba(0,0,0,0.7));
-		width: 750rpx;
-		height: 300rpx;
-	}
-	.icon{
-		opacity: 0.6;
-		font-size: 42px;
-		color: #fff;
-		/* #ifndef APP-PLUS-NVUE */
-		font-family: "texticons";
-		/* #endif*/
-		font-family: texticons;
-	}
-	.bottom{
-		position: absolute;
-		bottom: 0;
-		background-image: linear-gradient(to top , rgba(0,0,0,0.7) , rgba(0,0,0,0));
-		width: 750rpx;
-		height: 300rpx;
-	}
-	.slider-view{
-		position: absolute;
-		left: 0;
-		bottom: 0px;
-		width: 750rpx;
-	}
-	.progressBar{
-		border-radius: 2upx;
-		height: 4upx;
-		background-color: #FFFFFF;
-		z-index: 999999;
-		position: absolute;
-		left: 0;
-		bottom: 30px;
-		//#ifndef APP-PLUS-NVUE
-		animation: flicker 4s linear infinite;
-		animation-direction:alternate;
-		//#endif
-	}
-	//#ifndef APP-PLUS-NVUE
-	@keyframes flicker {
-		0% { box-shadow:0 0 0 #FFFFFF; }
-	     /** 暂停效果 */
-		10% { box-shadow:0 0 2upx #FFFFFF; }
-	    50% { box-shadow:0 0 10upx #FFFFFF; }
-	    60% { box-shadow:0 0 12upx #FFFFFF; }
-	    90% { box-shadow:0 0 18upx #FFFFFF; }
-	    100% { box-shadow:0 0 20upx #FFFFFF; }
-	
-	}
-	//#endif
-	.danmu-view{
-		position: absolute;
-		top:0;
-		height: 160px;
-	}
-	.rotate-img{
-		width: 90rpx;
-		height: 90rpx;
-		position: absolute;
-		bottom: 100rpx;
-		right: 20rpx;
-		border-radius: 45rpx;
-	}
-</style>

+ 0 - 90
components/countdown/time.vue

@@ -1,90 +0,0 @@
-<template>
-	<view>
-		<view class="flex alcenter">
-			<text class="order-t"  :class="size" :style="{background:bgColor,color:color}">{{showT.h}}</text><text class="ft12 ftw600 plr5">:</text>
-			<text class="order-t"  :class="size" :style="{background:bgColor,color:color}">{{showT.m}}</text><text class="ft12 ftw600 plr5">:</text>
-			<text class="order-t"   :class="size" :style="{background:bgColor,color:color}">{{showT.s}}</text>
-		</view>
-	</view>
-</template>
-
-<script>
-	import  helper from '@/static/js/helper.js';
-	
-	export default{
-		props:{
-			t:{
-				type:Number,
-				default:0,
-			},
-			size:{
-				type:String,
-				default:''
-			},
-			bgColor:{
-				type:String,
-				default:'#2E2F33'
-			},
-			color:{
-				type:String,
-				default:'#ffffff'
-			}
-		},
-		data(){
-			return {
-				myT:0,
-				timer:null,
-			}
-		},
-		computed:{
-			showT(){
-				let myT = this.myT;
-				
-				return helper.djsFull(myT);
-			}
-		},
-		created(){
-			this.myT = this.t;
-			this.djs();
-		},
-		destroyed(){
-			if(this.timer != null){
-				clearInterval(this.timer);
-			}
-		},
-		methods:{
-			djs(){
-				if(this.timer){
-					clearInterval(this.timer);
-				}	
-				this.timer = setInterval(()=>{
-					if(this.myT == 0){
-						clearInterval(this.timer);
-					}else{
-						this.myT = this.myT - 1;
-					}
-				},1000);
-			}
-		}
-	}
-</script>
-
-<style>
-	.order-t{
-		width:48rpx;
-		height:48rpx;
-		background:#FFFFFF;
-		text-align: center;
-		line-height: 48rpx;
-		font-size:28rpx;
-		font-weight: 500;
-		color: #000000;
-		border-radius: 8rpx;
-	}
-	.order-t.small{
-		width: 40rpx;
-		height: 40rpx;
-		font-size: 24rpx;
-		line-height: 40rpx;
-	}
-</style>

+ 0 - 95
components/dialog/ach.vue

@@ -1,95 +0,0 @@
-<template>
-	<view class="ach-modal">
-		<view  class="modal-bg"></view>
-		<view class="modal-box animated fast"  :class="show   ? 'slideInUp' : 'slideOutDown'">
-			<view class="modal-main">
-				<view class="closed">
-					<text @click="closed()" class="iconfont  ft20 cl-notice iconbtn_close"></text>
-				</view>
-				<view class="lh20 ft16 cl-main ftw600 text-center">不予通过</view>
-				
-				
-				<view class=" pd16_15">
-					<view class="ft14 cl-info2">不过理由</view>
-					<view class="mt16">
-						<textarea placeholder="请输入拒绝的理由" class="ft14 cl-main" placeholder-class="cl-notice"></textarea>
-					</view>
-				</view>
-				
-			</view>
-			<view class="bg-w mt16 pd10_15" style="box-shadow: 0rpx -4rpx 16rpx 0rpx rgba(0, 0, 0, 0.04);">
-				<button class="btn-manage">确定</button>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	
-	
-	export  default{
-		props:{
-			id:{
-				type:Number,
-				default:0
-			},
-		},
-		data(){
-			return {
-			
-				show:false,
-			}
-		},
-		created(){
-			this.show = true;
-		},
-		methods:{
-		
-			closed(){
-				this.show = false;
-				setTimeout(()=>{
-					this.$emit('closed');
-				},400);
-			}
-		}
-	}
-</script>
-
-<style>
-	.ach-modal{
-		position: relative;
-		z-index: 400;
-	}
-	.ach-modal .modal-bg{
-		position: fixed;
-		z-index: 400;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 100vh;
-		background: rgba(0,0,0,.5);
-	}
-	.ach-modal .modal-box{
-		position: fixed;
-		z-index: 401;
-		background:#FFFFFF;
-		left: 0;
-		bottom: 0;
-		width: 100%;
-		padding-bottom:0rpx;
-		padding-bottom:constant(safe-area-inset-bottom);
-		padding-bottom:env(safe-area-inset-bottom);
-		border-radius:32rpx 32rpx 0rpx 0rpx;
-	}
-	.ach-modal .modal-main{
-		position: relative;
-		height: auto;
-		overflow: hidden;
-		padding-top: 64rpx;
-	}
-	.ach-modal .modal-main .closed{
-		position: absolute;
-		right: 40rpx;
-		top: 40rpx;
-	}
-</style>

+ 0 - 140
components/dialog/birthday.vue

@@ -1,140 +0,0 @@
-<template>
-	<view  class="birthday-modal-middle">
-		<view  class="bg"></view>
-		<view class="birthday-modal-middle-main" :class=" show ? 'animated fast zoomInUp' :'animated fast  zoomOutDown'">
-			<view class="middle-main">
-				<view @click="closed" class="middle-closed">
-					<text class="iconfont  iconbtn_close cl-notice ft20"></text>
-				</view>
-				<view class="text-center">
-					<text class="ft16 ftw600 cl-main">{{title}}</text>
-				</view>
-				<view class="text-center mt24">
-					<image :src="statics.birthdayPic" style="width: 412rpx; height: 296rpx;"></image>
-				</view>
-				<view class="mt24" style="max-height: 400rpx; overflow-y: scroll;">
-					<view class="birthday-gift-box pd16_15">
-						<view class="flex alcenter space">
-							<text class="ft14 cl-main">专业洗剪吹3次</text>
-							<text class="ft12 cl-notice">x1</text>
-						</view>
-						<view class="mt8 ft12 cl-orange">价值¥188</view>
-					</view>
-					
-					<view class="birthday-gift-box pd16_15 mt8">
-						<view class="flex alcenter space">
-							<text class="ft14 cl-main">专业洗剪吹3次</text>
-							<text class="ft12 cl-notice">x1</text>
-						</view>
-						<view class="mt8 ft12 cl-orange">价值¥188</view>
-					</view>
-					<view class="birthday-gift-box pd16_15 mt8">
-						<view class="flex alcenter space">
-							<text class="ft14 cl-main">专业洗剪吹3次</text>
-							<text class="ft12 cl-notice">x1</text>
-						</view>
-						<view class="mt8 ft12 cl-orange">价值¥188</view>
-					</view>
-				</view>
-			</view>
-			<view v-if="showOnly ==  false" class="birthday-get-btn" :style="{background:tempColor}">确定领取</view>
-		</view>	
-	</view>
-</template>
-
-<script>
-	export default{
-		props:{
-			title:{
-				type:String,
-				default:'祝你生日快乐'
-			},
-			datas:{
-				type:Array,
-				default:function(){
-					return new Array;
-				}
-			},
-			showOnly:{
-				type:Boolean,
-				default:false
-			}
-		},
-		data(){
-			return {
-				show:false,
-			}
-		},
-		created(){
-			this.show = true;
-		},
-		methods:{
-			closed(){
-				this.show = false;
-				setTimeout(()=>{
-					this.$emit('closed',true);
-				},400)
-			}	
-		}
-	}
-</script>
-
-<style>
-	.birthday-modal-middle{
-		width: 100%;
-		height: 100vh;
-		position: fixed;
-		z-index: 400;
-		left: 0;
-		top: 0;
-		
-	}
-	.birthday-modal-middle .bg{
-		position: fixed;
-		width: 100%;
-		height: 100vh;
-		background: rgba(0,0,0,.5);
-		z-index: 401;
-		left: 0;
-		top: 0;
-	}
-	.birthday-modal-middle-main{
-		width: 690rpx;
-		background: #F5F6FA;
-		border-radius: 32rpx;
-		position: fixed;
-		top: 50%;
-		left: calc(50% - 345rpx);
-		transform:translateY(-50%);
-		z-index: 402;
-		overflow: hidden;
-	}
-	.birthday-modal-middle-main .middle-main{
-		position: relative;
-		padding: 64rpx 30rpx 30rpx 30rpx;
-	}
-	.birthday-modal-middle-main .middle-closed{
-		position: absolute;
-		width: 40rpx;
-		height: 40rpx;
-		right: 50rpx;
-		top: 50rpx;
-		text-align: center;
-		line-height: 40rpx;
-	}
-	.birthday-gift-box{
-		width: 100%;
-		height: 148rpx;
-		background: #FFFFFF;
-		border-radius: 8rpx;
-	}
-	.birthday-get-btn{
-		width: 100%;
-		height: 96rpx;
-		text-align: center;
-		font-size: 32rpx;
-		color:#FFFFFF;
-		font-weight: 500;
-		line-height: 96rpx;
-	}
-</style>

+ 0 - 89
components/dialog/cardsend.vue

@@ -1,89 +0,0 @@
-<template>
-	<view class="cardsend-modal">
-		<view  class="modal-bg"></view>
-		<view class="modal-box animated fast" :class="show   ? 'slideInUp' : 'slideOutDown'">
-			<view class="modal-main">
-				<view class="closed">
-					<text @click="closed()" class="iconfont  ft20 cl-notice iconbtn_close"></text>
-				</view>
-				<view class="lh20 ft16 cl-main ftw600 text-center">赠送好友</view>
-				<view class="text-center ft16 ftw600 text-over mt40">【VIP洗剪吹次卡】</view>
-				<view class="mt32 plr15">
-					<view class="box pd16_15">
-						<input placeholder="输入对方手机号" type="number" placeholder-class="cl-info2"  class="ft16 ftw600 text-center"/>
-					</view>
-					<view class="text-center mt16 ft14 cl-orange lh20">手机号不存在,请重新输入</view>
-				</view>
-			</view>
-			<view class="pd10_15 bg-w mt60">
-				<button class="btn-big" :style="getBtnStyle">确定赠送</button>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	
-	export  default{
-		props:{
-		
-		},
-		data(){
-			return {
-				show:false,
-			}
-		},
-		created(){
-			this.show = true;
-		
-		},
-		methods:{
-			closed(){
-				this.show = false;
-				setTimeout(()=>{
-					this.$emit('closed');
-				},400);
-			}
-		}
-	}
-</script>
-
-<style>
-	.cardsend-modal{
-		position: relative;
-		z-index: 400;
-	}
-	.cardsend-modal .modal-bg{
-		position: fixed;
-		z-index: 400;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 100vh;
-		background: rgba(0,0,0,.5);
-	}
-	.cardsend-modal .modal-box{
-		position: fixed;
-		z-index: 401;
-		background: #F5F6FA;
-		left: 0;
-		bottom: 0;
-		width: 100%;
-		padding-bottom:0rpx;
-		padding-bottom:constant(safe-area-inset-bottom);
-		padding-bottom:env(safe-area-inset-bottom);
-		border-radius:32rpx 32rpx 0rpx 0rpx;
-	}
-	.cardsend-modal .modal-main{
-		position: relative;
-		height: auto;
-		overflow: hidden;
-		padding-top: 64rpx;
-		padding-bottom: 40rpx;
-	}
-	.cardsend-modal .modal-main .closed{
-		position: absolute;
-		right: 40rpx;
-		top: 40rpx;
-	}
-</style>

+ 0 - 129
components/dialog/couponshare.vue

@@ -1,129 +0,0 @@
-<template>
-	<view  class="couponshare-modal-middle">
-		<view  class="bg"></view>
-		<view class="couponshare-modal-middle-main" :class=" show ? 'animated fast zoomInUp' :'animated fast  zoomOutDown'">
-			<view class="middle-main">
-				<view @click="closed" class="middle-closed">
-					<text class="iconfont  iconbtn_close  ft20"></text>
-				</view>
-				<view class="pd20_15">
-					<view class="ft14 cl-w">恭喜您!支付成功</view>
-					<view class="ft16 ftw500 cl-yellow mt8">分享好友一起领券吧</view>
-				</view>
-				<view class="text-center">
-					<image :src="statics.couponAlert[0]" style="width: 260rpx; height: 260rpx;"></image>
-				</view>
-				<image :src="statics.couponAlert[2]" class="footer-bg"></image>
-				<view class="footer-act-main">
-					<button open-type="share" class="share-btn">邀好友领券</button>
-				</view>
-			</view>
-		</view>	
-	</view>
-</template>
-
-<script>
-	export default{
-		props:{
-			
-		},
-		data(){
-			return {
-				show:false,
-			}
-		},
-		created(){
-			this.show = true;
-		},
-		methods:{
-			closed(){
-				this.show = false;
-				setTimeout(()=>{
-					this.$emit('closed',true);
-				},400)
-			}	
-		}
-	}
-</script>
-
-<style>
-	.couponshare-modal-middle{
-		width: 100%;
-		height: 100vh;
-		position: fixed;
-		z-index: 200;
-		left: 0;
-		top: 0;
-		
-	}
-	.couponshare-modal-middle .bg{
-		position: fixed;
-		width: 100%;
-		height: 100vh;
-		background: rgba(0,0,0,.5);
-		z-index: 201;
-		left: 0;
-		top: 0;
-	}
-	.couponshare-modal-middle-main{
-		width: 630rpx;
-		background: #FD4E4A;
-		border-radius: 32rpx;
-		position: fixed;
-		top: 50%;
-		left: calc(50% - 315rpx);
-		transform:translateY(-50%);
-		z-index: 202;
-		overflow: hidden;
-	}
-	.couponshare-modal-middle-main .middle-main{
-		position: relative;
-		height: 576rpx;
-		width: 100%;
-	}
-	.couponshare-modal-middle-main .middle-closed{
-		position: absolute;
-		width: 80rpx;
-		height: 80rpx;
-		right:0rpx;
-		top: 0rpx;
-		text-align: center;
-		line-height: 80rpx;
-		text-align: center;
-		background: rgba(0,0,0,0.5);
-		color:#FFFFFF;
-		border-radius: 0rpx 0rpx 0rpx 32rpx;
-	}
-	.couponshare-modal-middle-main .footer-bg{
-		width: 100%;
-		height: 160rpx;
-		position: absolute;
-		left: 0;
-		bottom: 0;
-	}
-	.couponshare-modal-middle-main .footer-act-main{
-		width: 100%;
-		height: 160rpx;
-		position: absolute;
-		left: 0;
-		bottom: 0;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
-	.couponshare-modal-middle-main .footer-act-main .share-btn{
-		width: 330rpx;
-		height: 80rpx;
-		background: linear-gradient(180deg, #FFF6D6 0%, #FFE388 100%);
-		box-shadow: 0rpx 8rpx 24rpx 0rpx rgba(0, 0, 0, 0.08);
-		border-radius: 40rpx;
-		color:#F14844;
-		font-size: 32rpx;
-		font-weight: 500;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		margin: 0;
-		padding: 0;
-	}
-</style>

+ 0 - 137
components/dialog/couponshareget.vue

@@ -1,137 +0,0 @@
-<template>
-	<view  class="couponshareget-modal-middle">
-		<view  class="bg"></view>
-		<view class="couponshareget-modal-middle-main" :class=" show ? 'animated fast zoomInUp' :'animated fast  zoomOutDown'">
-			<view class="middle-main">
-				<view @click="closed" class="middle-closed">
-					<text class="iconfont  iconbtn_close  ft20"></text>
-				</view>
-				<view class="pd20_15">
-					<view class="flex alcenter"><image :src="statics.defaultFace" class="coupon-share-get-face"></image> <text class="ml10 ft14 cl-w">张华邀请您</text></view>
-					<view class="ft16 ftw500 cl-yellow mt8">一起领取优惠券</view>
-				</view>
-				<view class="text-center">
-					<image :src="statics.couponAlert[1]" style="width: 240rpx; height: 240rpx;"></image>
-				</view>
-				<image :src="statics.couponAlert[2]" class="footer-bg"></image>
-				<view class="footer-act-main">
-					<button @click="getAct" class="share-btn">立即领取</button>
-				</view>
-			</view>
-		</view>	
-	</view>
-</template>
-
-<script>
-	export default{
-		props:{
-			
-		},
-		data(){
-			return {
-				show:false,
-			}
-		},
-		created(){
-			this.show = true;
-		},
-		methods:{
-			getAct(){
-				this.$emit('loginAct');
-			},
-			closed(){
-				this.show = false;
-				setTimeout(()=>{
-					this.$emit('closed',true);
-				},400)
-			}	
-		}
-	}
-</script>
-
-<style>
-	.couponshareget-modal-middle{
-		width: 100%;
-		height: 100vh;
-		position: fixed;
-		z-index: 200;
-		left: 0;
-		top: 0;
-		
-	}
-	.couponshareget-modal-middle .bg{
-		position: fixed;
-		width: 100%;
-		height: 100vh;
-		background: rgba(0,0,0,.5);
-		z-index: 201;
-		left: 0;
-		top: 0;
-	}
-	.couponshareget-modal-middle-main{
-		width: 630rpx;
-		background: #FD4E4A;
-		border-radius: 32rpx;
-		position: fixed;
-		top: 50%;
-		left: calc(50% - 315rpx);
-		transform:translateY(-50%);
-		z-index: 202;
-		overflow: hidden;
-	}
-	.couponshareget-modal-middle-main .middle-main{
-		position: relative;
-		height: 576rpx;
-		width: 100%;
-	}
-	.couponshareget-modal-middle-main .middle-closed{
-		position: absolute;
-		width: 80rpx;
-		height: 80rpx;
-		right:0rpx;
-		top: 0rpx;
-		text-align: center;
-		line-height: 80rpx;
-		text-align: center;
-		background: rgba(0,0,0,0.5);
-		color:#FFFFFF;
-		border-radius: 0rpx 0rpx 0rpx 32rpx;
-	}
-	.couponshareget-modal-middle-main .footer-bg{
-		width: 100%;
-		height: 160rpx;
-		position: absolute;
-		left: 0;
-		bottom: 0;
-	}
-	.couponshareget-modal-middle-main .footer-act-main{
-		width: 100%;
-		height: 160rpx;
-		position: absolute;
-		left: 0;
-		bottom: 0;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
-	.couponshareget-modal-middle-main .footer-act-main .share-btn{
-		width: 330rpx;
-		height: 80rpx;
-		background: linear-gradient(180deg, #FFF6D6 0%, #FFE388 100%);
-		box-shadow: 0rpx 8rpx 24rpx 0rpx rgba(0, 0, 0, 0.08);
-		border-radius: 40rpx;
-		color:#F14844;
-		font-size: 32rpx;
-		font-weight: 500;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		margin: 0;
-		padding: 0;
-	}
-	.couponshareget-modal-middle-main .coupon-share-get-face{
-		width: 48rpx;
-		height: 48rpx;
-		border-radius: 24rpx;
-	}
-</style>

+ 0 - 140
components/dialog/dyxx.vue

@@ -1,140 +0,0 @@
-<template>
-	<view class="login-modal">
-		<view  class="modal-bg" :style="{zIndex:zindex}"></view>
-		<view class="modal-box animated fast" :style="{zIndex:zindex+1,background:bg}" :class="show   ? 'slideInUp' : 'slideOutDown'">
-			<view class="modal-main">
-				<view class="closed">
-					<text @click="closed()" class="iconfont  ft20 cl-notice iconbtn_close"></text>
-				</view>
-				<view class="lh20 ft16 cl-main ftw600 text-center">{{step == 0 ? '授权登录请求' : '授权手机号码'}}</view>
-				<view v-if="step == 0" class="mt60">
-						<view class="text-center ft14 cl-main">
-							点击登录 享受更多会员特惠?
-						</view>
-						<view class="mt40 flex alcenter center">
-							<button class="btn-mid" @click="closed()" :style="{color:tempColor,background:'#F5F6FA'}" style="width: 300rpx;">拒绝</button>
-							<button class="btn-mid" @click="getUserInfo" :style="{background:tempColor}" style="margin-left: 30rpx;width: 300rpx; color: #FFFFFF;">登录</button>
-						</view>
-				</view>
-				<view v-if="step == 1" class="mt60">
-						<view class="text-center ft14 cl-main">
-							点击登录 享受更多会员特惠
-						</view>
-						
-						<view class="plr30 mt40">
-							<button class="btn-big" :style="getBtnStyle">
-								<text class="iconfont iconicon_weixin mr10 ft20"></text>订阅消息
-							</button>
-						</view>
-				</view>
-				
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	
-	
-	export  default{
-		props:{
-			zindex:{
-				type:Number,
-				default:402,
-			},
-			bg:{
-				type:String,
-				default:'#ffffff',
-			},
-			
-		},
-		data(){
-			return {
-				show:false,
-				code:'',
-				mdata:'',
-				miv:'',
-				step:0, // 1
-			}
-		},
-		created(){
-			this.show = true;
-			// uni.login({
-			//   provider: 'weixin',
-			//   success: (loginRes)=> {
-			// 	  console.log(loginRes);
-			// 	this.code = loginRes.code;
-			//   },
-			//   fail:()=>{
-			// 	  uni.showToast({
-			// 	  	icon:'none',
-			// 		title:'小程序登录失败'
-			// 	  });
-			// 	  this.show = false;
-			//   }
-			// });
-		},
-		methods:{
-			getUserInfo(e){
-				// if(!e.detail.userInfo){
-				// 	this.closed();
-				// }else{
-				// 	this.mdata = e.detail.encryptedData;
-				// 	this.miv = e.detail.iv;
-				// 	this.step = 1;
-				// }
-				uni.navigateTo({
-					url:'/pages/login/login'
-				})
-			},
-			closed(){
-				this.show = false;
-				setTimeout(()=>{
-					this.$emit('closed');
-				},400);
-			}
-		}
-	}
-</script>
-
-<style>
-	.login-modal{
-		position: relative;
-		z-index: 400;
-	}
-	.login-modal .modal-bg{
-		position: fixed;
-		z-index: 400;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 100vh;
-		background: rgba(0,0,0,.5);
-	}
-	.login-modal .modal-box{
-		position: fixed;
-		z-index: 401;
-		background:#FFFFFF;
-		left: 0;
-		bottom: 0;
-		width: 100%;
-		padding-bottom:0rpx;
-		padding-bottom:constant(safe-area-inset-bottom);
-		padding-bottom:env(safe-area-inset-bottom);
-		border-radius:32rpx 32rpx 0rpx 0rpx;
-	}
-	.login-modal .modal-main{
-		position: relative;
-		height: auto;
-		overflow: hidden;
-		min-height: 800rpx;
-		padding-top: 64rpx;
-		padding-bottom: 40rpx;
-	}
-	.login-modal .modal-main .closed{
-		position: absolute;
-		right: 40rpx;
-		top: 40rpx;
-	}
-	
-</style>

+ 0 - 140
components/dialog/login.vue

@@ -1,140 +0,0 @@
-<template>
-	<view class="login-modal">
-		<view  class="modal-bg" :style="{zIndex:zindex}"></view>
-		<view class="modal-box animated fast" :style="{zIndex:zindex+1,background:bg}" :class="show   ? 'slideInUp' : 'slideOutDown'">
-			<view class="modal-main">
-				<view class="closed">
-					<text @click="closed()" class="iconfont  ft20 cl-notice iconbtn_close"></text>
-				</view>
-				<view class="lh20 ft16 cl-main ftw600 text-center">{{step == 0 ? '授权登录请求' : '授权手机号码'}}</view>
-				<view v-if="step == 0" class="mt60">
-						<view class="text-center ft14 cl-main">
-							点击登录 享受更多会员特惠?
-						</view>
-						<view class="mt40 flex alcenter center">
-							<button class="btn-mid" @click="closed()" :style="{color:tempColor,background:'#F5F6FA'}" style="width: 300rpx;">拒绝</button>
-							<button class="btn-mid" @click="getUserInfo" :style="{background:tempColor}" style="margin-left: 30rpx;width: 300rpx; color: #FFFFFF;">登录</button>
-						</view>
-				</view>
-				<view v-if="step == 1" class="mt60">
-						<view class="text-center ft14 cl-main">
-							点击登录 享受更多会员特惠
-						</view>
-						
-						<view class="plr30 mt40">
-							<button class="btn-big" :style="getBtnStyle">
-								<text class="iconfont iconicon_weixin mr10 ft20"></text>微信授权手机号
-							</button>
-						</view>
-				</view>
-				
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	
-	
-	export  default{
-		props:{
-			zindex:{
-				type:Number,
-				default:402,
-			},
-			bg:{
-				type:String,
-				default:'#ffffff',
-			},
-			
-		},
-		data(){
-			return {
-				show:false,
-				code:'',
-				mdata:'',
-				miv:'',
-				step:0, // 1
-			}
-		},
-		created(){
-			this.show = true;
-			// uni.login({
-			//   provider: 'weixin',
-			//   success: (loginRes)=> {
-			// 	  console.log(loginRes);
-			// 	this.code = loginRes.code;
-			//   },
-			//   fail:()=>{
-			// 	  uni.showToast({
-			// 	  	icon:'none',
-			// 		title:'小程序登录失败'
-			// 	  });
-			// 	  this.show = false;
-			//   }
-			// });
-		},
-		methods:{
-			getUserInfo(e){
-				// if(!e.detail.userInfo){
-				// 	this.closed();
-				// }else{
-				// 	this.mdata = e.detail.encryptedData;
-				// 	this.miv = e.detail.iv;
-				// 	this.step = 1;
-				// }
-				uni.navigateTo({
-					url:'/pages/login/login'
-				})
-			},
-			closed(){
-				this.show = false;
-				setTimeout(()=>{
-					this.$emit('closed');
-				},400);
-			}
-		}
-	}
-</script>
-
-<style>
-	.login-modal{
-		position: relative;
-		z-index: 400;
-	}
-	.login-modal .modal-bg{
-		position: fixed;
-		z-index: 400;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 100vh;
-		background: rgba(0,0,0,.5);
-	}
-	.login-modal .modal-box{
-		position: fixed;
-		z-index: 401;
-		background:#FFFFFF;
-		left: 0;
-		bottom: 0;
-		width: 100%;
-		padding-bottom:0rpx;
-		padding-bottom:constant(safe-area-inset-bottom);
-		padding-bottom:env(safe-area-inset-bottom);
-		border-radius:32rpx 32rpx 0rpx 0rpx;
-	}
-	.login-modal .modal-main{
-		position: relative;
-		height: auto;
-		overflow: hidden;
-		min-height: 800rpx;
-		padding-top: 64rpx;
-		padding-bottom: 40rpx;
-	}
-	.login-modal .modal-main .closed{
-		position: absolute;
-		right: 40rpx;
-		top: 40rpx;
-	}
-	
-</style>

+ 0 - 113
components/dialog/payment.vue

@@ -1,113 +0,0 @@
-<template>
-	<view class="payment-modal">
-		<view  class="modal-bg"></view>
-		<view class="modal-box animated fast"  :class="show   ? 'slideInUp' : 'slideOutDown'">
-			<view class="modal-main">
-				<view class="closed">
-					<text @click="closed()" class="iconfont  ft20 cl-notice iconbtn_close"></text>
-				</view>
-				<view class="lh20 ft16 cl-main ftw600 text-center">支付订单</view>
-				
-				
-				<view class=" pd16_15">
-					
-					<radio-group @change="changeType">
-					<view class="box pd16_15 flex alcenter space">
-						<view class="flex alcenter">
-							<text class="iconfont iconicon_pay_balance ft32" style="color: #FFBD1E;"></text>
-							<text class="ml15 ft14 ftw500 cl-main">余额支付</text>
-							<text class="ml10 ft12 cl-notice">余额为0,不可用</text>
-						</view>
-						<view>
-							<radio value="money" :checked="payType ==  'money'" :disabled="false" :color="tempColor"  />
-						</view>
-					</view>
-	
-					<view class="box pd16_15 mt16  flex alcenter space">
-						<view class="flex alcenter">
-							<text class="iconfont iconicon_pay_balance ft32 cl-green"></text>
-							<text class="ml15 ft14 ftw500 cl-main">微信支付</text>
-						</view>
-						<view>
-							<radio value="weixin" :checked="payType ==  'weixin'" :color="tempColor"  />
-						</view>
-					</view>
-					</radio-group>
-				</view>
-				
-			</view>
-			<view class="bg-w mt16 pd10_15" style="box-shadow: 0rpx -4rpx 16rpx 0rpx rgba(0, 0, 0, 0.04);">
-				<button class="btn-big" :style="getBtnStyle">确定支付</button>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	
-	
-	export  default{
-		props:{
-			
-		},
-		data(){
-			return {
-				payType:'weixin',
-				show:false,
-			}
-		},
-		created(){
-			this.show = true;
-		},
-		methods:{
-			changeType(e){
-				this.payType = e.detail.value;
-			},
-			closed(){
-				this.show = false;
-				setTimeout(()=>{
-					this.$emit('closed');
-				},400);
-			}
-		}
-	}
-</script>
-
-<style>
-	.payment-modal{
-		position: relative;
-		z-index: 400;
-	}
-	.payment-modal .modal-bg{
-		position: fixed;
-		z-index: 400;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 100vh;
-		background: rgba(0,0,0,.5);
-	}
-	.payment-modal .modal-box{
-		position: fixed;
-		z-index: 401;
-		background:#FFFFFF;
-		left: 0;
-		bottom: 0;
-		width: 100%;
-		padding-bottom:0rpx;
-		padding-bottom:constant(safe-area-inset-bottom);
-		padding-bottom:env(safe-area-inset-bottom);
-		border-radius:32rpx 32rpx 0rpx 0rpx;
-	}
-	.payment-modal .modal-main{
-		position: relative;
-		height: auto;
-		overflow: hidden;
-		padding-top: 64rpx;
-	}
-	.payment-modal .modal-main .closed{
-		position: absolute;
-		right: 40rpx;
-		top: 40rpx;
-	}
-</style>

+ 0 - 163
components/dialog/qrcode.vue

@@ -1,163 +0,0 @@
-<template>
-	<view class="qrocde-modal">
-		<view  class="modal-bg" @click="closed()" :style="{zIndex:zindex}"></view>
-		<view class="modal-box animated fast" :style="{zIndex:zindex+1,background:bg}" :class="show   ? 'slideInUp' : 'slideOutDown'">
-			<!-- #ifdef MP-WEIXIN -->
-			
-			<view style="padding: 100upx 0px;">
-			<button open-type="share" style="width: 80%; background: #ff0000; color: #ffffff; height: 100upx;">点击分享</button>
-			<button @click="closed()" style="width: 80%; background: #ddd; margin-top: 30upx; color: #333; height: 100upx;">取消分享</button>
-			</view>
-			<!-- #endif -->
-			<!-- #ifndef MP-WEIXIN -->
-			<view class="modal-main">
-				<view class="closed">
-					<text @click="closed()" class="iconfont  ft20 cl-notice iconbtn_close"></text>
-				</view>
-				<view class="lh20 ft16 cl-main ftw600 text-center">我的分享二维码</view>
-				<view @click="getp()" class="flex center mt40"  style="height: 400rpx;">
-					<image :src="qrcodeImg" style="width: 400rpx; height: 400rpx;"></image>
-				</view>
-				<view class="text-center ft14 cl-info2" style="padding: 10upx 80upx;white-space:normal; word-break:break-all; word-wrap:break-word;">
-					<view class="text-center ft14" @click="copys()" style="padding-bottom: 20upx;">扫码上面的二维码【ID:{{uid}}】</view>
-					<view class="text-center ft14" @click="copy()">点击复制地址<br>{{qrurl}}</view>
-				</view>
-			</view>
-			<!-- #endif -->
-		</view>
-	</view>
-</template>
-
-<script>
-	import  QR   from '../../static/js/wxqrcode.js';
-	
-	export  default{
-		props:{
-			zindex:{
-				type:Number,
-				default:401,
-			},
-			bg:{
-				type:String,
-				default:'#ffffff',
-			},
-			
-		},
-		data(){
-			return {
-				show:false,
-				qrcodeImg:'',
-				uid:'',
-				qrurl:'',
-			}
-		},
-		created(){
-			this.show = true;
-			this.uid = uni.getStorageSync("userinfo").id;
-			this.qrurl=this.configs.webUrl+'/h5/#/pages/login/reg?uid='+this.uid
-			let img = QR.createQrCodeImg(this.qrurl, {  
-			     size: 300//二维码大小  
-			})
-			this.qrcodeImg = img;
-		},
-		methods:{
-			copy(){
-				var value=this.qrurl
-			  //提示模板
-			  uni.showModal({
-			    content:value,//模板中提示的内容
-			    confirmText:'复制内容',
-			    success:()=>{//点击复制内容的后调函数
-			      //uni.setClipboardData方法就是讲内容复制到粘贴板
-			      uni.setClipboardData({
-			        data:value,//要被复制的内容
-			        success:()=>{//复制成功的回调函数
-			          uni.showToast({//提示
-			            title:'复制成功'
-			          })
-			        }
-			      });
-			    }
-			  });
-			},
-			copys(){
-				console.log(1111)
-				var value=this.uid
-			  //提示模板
-			  uni.showModal({
-			    content:value,//模板中提示的内容
-			    confirmText:'复制内容',
-			    success:()=>{//点击复制内容的后调函数
-			      //uni.setClipboardData方法就是讲内容复制到粘贴板
-			      uni.setClipboardData({
-			        data:value,//要被复制的内容
-			        success:()=>{//复制成功的回调函数
-			          uni.showToast({//提示
-			            title:'复制成功'
-			          })
-			        }
-			      });
-			    }
-			  });
-			},
-			closed(){
-				this.show = false;
-				setTimeout(()=>{
-					this.$emit('closed');
-				},400);
-			},
-			getp(){
-				let thia=this.qrcodeImg
-				//#ifdef APP-PLUS  
-				uni.saveImageToPhotosAlbum({
-				    filePath: thia.qrcodeImg,
-				    success: function () {
-				        console.log('save success');
-				    }
-				});
-				//#endif
-			}
-		}
-	}
-</script>
-
-<style>
-	.qrocde-modal{
-		position: relative;
-		z-index: 400;
-	}
-	.qrocde-modal .modal-bg{
-		position: fixed;
-		z-index: 400;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 100vh;
-		background: rgba(0,0,0,.5);
-	}
-	.qrocde-modal .modal-box{
-		position: fixed;
-		z-index: 401;
-		background:#FFFFFF;
-		left: 0;
-		bottom: 0;
-		width: 100%;
-		padding-bottom:0rpx;
-		padding-bottom:constant(safe-area-inset-bottom);
-		padding-bottom:env(safe-area-inset-bottom);
-		border-radius:32rpx 32rpx 0rpx 0rpx;
-	}
-	.qrocde-modal .modal-main{
-		position: relative;
-		height: auto;
-		overflow: hidden;
-		min-height: 1000rpx;
-		padding-top: 64rpx;
-		padding-bottom: 40rpx;
-	}
-	.qrocde-modal .modal-main .closed{
-		position: absolute;
-		right: 40rpx;
-		top: 40rpx;
-	}
-</style>

+ 0 - 138
components/h-form-alert/h-form-alert.vue

@@ -1,138 +0,0 @@
-<template>
-	<view class="a_mask">
-		<form class="a_box" @submit="formSubmit" @reset="formReset">
-			<view class="a_head">
-				{{title}}
-			</view>
-			<view class="a_input">
-				<input :type="type" :value="value" :placeholder="placeholder" :name="name"/>
-			</view>
-			<view class="a_btn">
-				
-				<button form-type="reset" :style="{color:cancelColor}">{{cancelText}}</button>
-				<button form-type="submit" :style="{color:confirmColor}">{{confirmText}}</button>
-			</view>
-		</form>
-	</view>
-</template>
-
-<script>
-	export default {
-		props:{
-			title:{
-				type:String,
-				default:'提示'
-			},
-			placeholder:{
-				type:String,
-				default:'请点击输入'
-			},
-			name:{
-				type:String,
-				default:'text'
-			},
-			type:{
-				type:String,
-				default:'text'
-			},
-			value:{
-				type:String,
-				default:''
-			},
-			cancelColor:{
-				type:String,
-				default:'#999999'
-			},
-			confirmColor:{
-				type:String,
-				default:'#333333'
-			},
-			cancelText:{
-				type:String,
-				default:'取消'
-			},
-			confirmText:{
-				type:String,
-				default:'确定'
-			},
-		},
-		data() {
-			return {
-
-			};
-		},
-		methods: {
-			formSubmit: function(e) {
-				console.log(e)
-				let _formdata = e.detail.value
-				this.$emit('confirm',_formdata)
-			},
-			formReset: function(e) {
-				this.$emit('cancel')
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.a_mask{
-		position: fixed;
-		z-index: 99999;
-		background-color: rgba(0,0,0,0.5);
-		top: 0;
-		left: 0;
-		bottom: 0;
-		right: 0;
-		.a_box{
-			width: 500upx;
-			overflow: hidden;
-			
-			background-color: #fff;
-			border-radius: 10upx;
-			position: absolute;
-			top: 50%;
-			left: 50%;
-			transform: translate(-50%,-50%);
-			
-			.a_head{
-				text-align: center;
-				font-size: 30upx;
-				line-height: 88upx;
-			}
-			.a_input{
-				padding: 30upx 20upx;
-				font-size: 28upx;
-				input{
-					text-align: center;
-				}
-			}
-			.a_btn{
-				text-align: center;
-				font-size: 30upx;
-				line-height: 88upx;
-				display: flex;
-				justify-content: space-between;
-				border-top: 1upx solid #f5f5f5;
-				button{
-					width: 50%;
-					background-color: #fff;
-					font-size: 30upx;
-					border-radius: 0upx;
-					padding: 0;
-					&::after{
-						border:none
-					}
-					&:first-child{
-						border-right: 1upx solid #f5f5f5;
-						color: #999999;
-						box-sizing: border-box;
-					}
-					&:last-child{
-						color: #333;
-					}
-				}
-				
-			}
-		}
-	}
-</style>

+ 0 - 48
components/h-form-alert/readme.md

@@ -1,48 +0,0 @@
-### 输入弹窗
-
-弹窗组件。
-
-**使用方式:**
-
-在 ``script`` 中引用组件 
-
-```javascript
-import hFormAlert from '@/components/h-form-alert/h-form-alert.vue';
-export default {
-    components: {hFormAlert}
-}
-```
-
-基本用法
-
-```html
-<hFormAlert v-if="控制显示隐藏"  @confirm="确认点击监听" @cancel="取消点击监听"></hFormAlert>
-```
-
-例子
-
-```html
-<hFormAlert v-if="cancelShow"  name="cancel_desc" placeholder="请输入取消原因" @confirm="confirm" @cancel="cancel"></hFormAlert>
-```
-
-
-**属性说明:**
-
-|属性名|类型|默认值	|说明|
-|---|----|---|---|
-|title|String|提示|弹窗头部文字|
-|name|String|text|输入框的name|
-|type|String|text|输入框的类型,就是input组件默认的type|
-|placeholder|String|请点击输入|输入框的占位文字|
-|value|String|‘’|输入框默认值|
-|cancelColor|String|#999999|取消按钮文本颜色|
-|cancelText|String|取消|取消按钮文本|
-|confirmColor|String|#333333|确认按钮文本颜色|
-|confirmText|String|确认|确认按钮文本|
-
-**事件说明:**
-
-|事件称名|说明|返回参数|
-|---|----|---|
-|confirm|确认按钮点击触发事件,返回参数是用户输入内容|{text:输入内容}|
-|cancel|取消按钮点击触发事件,无返回参数|

+ 0 - 166
components/ming-pop/ming-pop.vue

@@ -1,166 +0,0 @@
-<template>
-	<!-- v-if解决center弹窗位置问题 -->
-	<view :class="direction==='center'?'centers':''" v-if="direction==='center'?open:true">
-		<view class="product-window"
-			:style="{width:width+'%',height:height=='fit-content'?height:(open?height:'fit-content')}"
-			:class="(open ? 'on' : '')+' '+direction" @touchmove.stop.prevent="">
-			<!-- 兼容h5顶部导航空位 -->
-			<!-- #ifndef MP -->
-			<view v-if="(direction!=='below'&&direction!=='center')" style="height: 100rpx;"></view>
-			<!-- #endif -->
-			<image src="../../static/ming-pop/close.png" mode=""
-				:class="(direction!=='below'&&direction!=='center')?'iconfont-h5':''" class="iconfont" @click="close"
-				v-if="is_close"></image>
-			<slot></slot>
-		</view>
-		<view class="mask" v-if="is_mask" @touchmove.prevent :hidden="!open" @click="close(1)"></view>
-	</view>
-</template>
-
-<script>
-	export default {
-		props: {
-			direction: {
-				type: String,
-				default: "below"
-			},
-			width: {
-				type: Number,
-				default: 100
-			},
-			height: {
-				type: String,
-				default: "fit-content"
-			},
-			is_close: {
-				type: Boolean,
-				default: true
-			},
-			is_mask: {
-				type: Boolean,
-				default: true
-			},
-			maskFun: {
-				type: Boolean,
-				default: true
-			}
-		},
-		data() {
-			return {
-				open: false
-			};
-		},
-		methods: {
-			show() {
-				this.open = true;
-				this.$emit("watchOpen")
-			},
-			close(e) {
-				if (e == 1 && !this.maskFun) return;
-				this.open = false;
-				this.$emit("watchClose")
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	view {
-		box-sizing: border-box;
-	}
-
-	.centers {
-		width: 100vw;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		// height: 100%;
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-	}
-
-	.product-window {
-		position: fixed;
-		background-color: #fff;
-		z-index: 77;
-		border-radius: 15rpx;
-		padding: 50rpx 30rpx;
-		transition: all .3s cubic-bezier(.25, .5, .5, .9);
-		-webkit-transition: all .3s cubic-bezier(.25, .5, .5, .9);
-	}
-
-	.below {
-		left: 0;
-		bottom: 0;
-		transform: translate3d(0, 100%, 0);
-		-webkit-transform: translate3d(0, 100%, 0);
-	}
-
-	.up {
-		top: 0;
-		left: 0;
-		transform: translate3d(0, -100%, 0);
-		-webkit-transform: translate3d(0, -100%, 0);
-	}
-
-	.right {
-		right: 0;
-		top: 0;
-		height: 100%;
-		transform: translate3d(100vw, 0, 0);
-		-webkit-transform: translate3d(100vw, 0, 0);
-	}
-
-	.left {
-		left: 0;
-		top: 0;
-		height: 100%;
-		transform: translate3d(-100vw, 0, 0);
-		-webkit-transform: translate3d(-100vw, 0, 0);
-	}
-
-	.center {
-		position: static;
-		-webkit-position: static;
-		transform: translate3d(-100vw, -100%, 0);
-		-webkit-transform: translate3d(-100vw, -100%, 0);
-	}
-
-	.product-window.on {
-		transform: translate3d(0, 0, 0);
-		-webkit-transform: translate3d(0, 0, 0);
-	}
-
-	.mask {
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background-color: #000;
-		opacity: .5;
-		z-index: 5;
-	}
-
-
-	.product-window .iconfont {
-		position: fixed;
-		right: 30rpx;
-		top: 20rpx;
-		font-size: 35rpx;
-		color: #8a8a8a;
-		width: 50rpx;
-		height: 50rpx;
-	}
-
-	//兼容h5顶部导航空位
-	// #ifndef MP
-	.product-window .iconfont-h5 {
-		top: 100rpx;
-	}
-
-	// #endif
-</style>

+ 0 - 134
components/model/model.vue

@@ -1,134 +0,0 @@
-<template>
-	<view>
-		<view class="userModel u-flex u-row-center u-col-center">
-			<view class="cont u-flex-col u-col-center" :style="{width: ad?'300px':'520rpx'}">
-				<image src="../../static/icon/jinbi.png"></image>
-				<view class="text u-text-center u-content-color u-p-l-60 u-p-r-60" v-html="title"></view>
-				<view class="" v-if="ad">
-					<view class="u-p-t-20" style="width: 300px;">
-						<!-- #ifdef MP-QQ -->
-						<ad unit-id="8aa061ea8e5bac1c717623a7be7badd8"></ad>
-						<!-- #endif -->
-						<!-- #ifdef MP-WEIXIN -->
-						<ad unit-id="adunit-0d2cf81781c3cd01"></ad>
-						<!-- #endif -->
-					</view>
-					<view class="btn u-text-center adClass" hover-class="hover-class" hover-stay-time="50" style="margin-left: 20%;margin-top: 30rpx;">
-						{{btnText}}
-						<button open-type="share" style="position: absolute;top: 0;left: 0;width: 100%;height: 100%;opacity: 0;"></button>
-					</view>
-				</view>
-				<view class="btn u-text-center" hover-class="hover-class" hover-stay-time="50" v-else @click="save">
-					{{btnText}}
-				</view>
-				<view v-if="closeText!=' '" class="no u-text-center u-p-t-30" @click="close">{{closeText}}</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: 'model',
-		props:{
-			title:{	//显示的内容
-				type: String,
-				default: '为了更好的浏览体验,快去授权登录吧'
-			},
-			authorize:{	//是否授权登录
-				type: Boolean,
-				default: true
-			},
-			ad:{	//广告
-				type: Boolean,
-				default: false
-			},
-			btnText:{	//按钮文字
-				type: String,
-				default: '授权登录'
-			},
-			closeText:{	//关闭文笔
-				type: String,
-				default: '暂时不用'
-			}
-		},
-		data() {
-			return {
-				
-			};
-		},
-		methods: {
-			save(){
-				this.$emit('save');
-			},
-			close(){
-				this.$emit('close');
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.userModel{
-		z-index: 9999999;
-		position: fixed;
-		top: 0;
-		left: 0;
-		width: 100vw;
-		height: 100vh;
-		background-color: rgba(0,0,0,0.6);
-		// backdrop-filter: blur(4rpx);
-		.cont{
-			width: 520rpx;
-			padding: 0px 0 50rpx 0;
-			background-color: #FFFFFF;
-			border-radius: 32rpx;
-			image{
-				width: 128rpx;
-				height: 128rpx;
-				margin-top: -60rpx;
-				margin-bottom: 40rpx;
-			}
-			.text{
-				line-height: 46rpx;
-			}
-			.btn{
-				position: relative;
-				margin-top: 50rpx;
-				color: #FFFFFF;
-				width: 60%;
-				line-height: 80rpx;
-				border-radius: 80rpx;
-				background-image: linear-gradient(to bottom right, #fce03d , #f8c93c);
-			}
-			.no{
-				color: #B8B8B8;
-			}
-		}
-	}
-	.num{
-		font-size: 16px;
-		font-weight: 700;
-		color: #f8c93c;
-		padding: 0 8rpx;
-	}
-	
-	.adClass{
-		animation: tiaobig 1.2s ease-in-out alternate infinite;
-		// animation-iteration-count:1;
-	}
-	@keyframes tiaobig {
-		25% {
-			transform: scale(0.98);
-		}
-		50% {
-			transform: scale(1.08);
-		}
-		75% {
-			transform: scale(0.98);
-		}
-		100% {
-			transform: scale(1.08);
-		}
-	}
-</style>

+ 0 - 184
components/select/address.vue

@@ -1,184 +0,0 @@
-<template>
-	<view>
-		<view @click="showAct" class="pd16_15 flex alcenter">
-			<view style="width: calc(100% - 40rpx);" class="flex">
-				<text class="iconfont iconicon_location02 ft18" :style="{color:tempColor}"></text>
-				<view class="pl10" style="width: calc(100% - 40rpx);">
-					<view v-if="getSelectItem == null" class="ft14 cl-main ftw600">选择收货地址</view> 
-					<view v-if="getSelectItem != null" class="ft14 cl-main ftw600 text-over">{{getSelectItem.address}}</view>
-					<view v-if="getSelectItem != null" class="ft12 mt12 cl-info2">{{getSelectItem.name}} {{getSelectItem.mobile}}</view>
-				</view>
-			</view>
-			<text class="iconfont iconicon_arrow_small ft14 cl-notice"></text>
-		</view>
-		
-		<view v-show="showAddress" class="address-modal">
-			<view  class="modal-bg"></view>
-			<view class="modal-box animated fast"  :class="show   ? 'slideInUp' : 'slideOutDown'">
-				<view class="modal-main">
-					<view class="closed">
-						<text @click="closed()" class="iconfont  ft20 cl-notice iconbtn_close"></text>
-					</view>
-					<view class="lh20 ft16 cl-main ftw600 text-center">选择收货地址</view>
-					
-					<view class="pd16_15">
-						<navigator url="/pages/client/member/address">
-							<view class="box noshadow pd10_15 flex alcenter center" :style="{color:tempColor}">
-								<text class="iconfont iconbtn_add_liner ft20 mr5"></text>
-								<text class="ft16 ftw600">新增地址</text>
-							</view>
-						</navigator>	
-						<radio-group @change="selectAddr">
-							
-						<view v-for="(item,index) in addrs" :key="index" class="box noshadow pd16_15 mt16 flex alcenter space">
-							<view style="width: calc(100% - 60rpx);">
-								<view class="flex alcenter">
-									<view class="tag-default mr10" v-if="item.is_default == 1" :style="{background:tempColor}">默认</view>
-									<text class="ft14 ftw600 cl-main">{{item.name}}  {{item.mobile}}</text>
-								</view>
-								<view class="mt8 ft12 cl-notice text-over">
-									{{item.address}}
-								</view>
-							</view>
-							<radio :value="item.address_id" :checked="item.address_id == getSelectId"  :color="tempColor"  />
-						</view>
-						
-						</radio-group>
-					</view>
-					
-					<view v-if="addrs.length > 0 " class="plr15 mt40">
-						<button class="btn-big" @click="selectYes" :style="getBtnStyle">确定选择</button>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default{
-		props:{
-			value:{
-				type:Number,
-				default:0
-			},
-		},
-		data(){
-			return {
-				show:false,
-				showAddress:false,
-				isSelect:false,
-				selectId:0,
-				addrs:[
-					{address_id:1,name:'张华2',mobile:'13515608638',address:'合肥市包河区万达临湖苑A区16栋1602室',is_default:1},
-					{address_id:2,name:'张华',mobile:'13515608638',address:'合肥市包河区万达临湖苑A区16栋2007室',is_default:0}
-				],
-			}
-		},
-		computed:{
-			getDefaultId(){
-				if(this.addrs.length == 0) return 0;
-				for(var a in this.addrs){
-					if(this.addrs[a].is_default == 1){
-						return this.addrs[a].address_id;
-					}
-				}
-				if(this.addrs[0]){
-					return this.addrs[0].address_id;
-				}
-			},
-			getSelectId(){
-				if(this.isSelect){
-					return this.selectId;
-				}
-				if(this.value > 0){
-					return this.value;
-				}
-				return this.getDefaultId;
-			},
-			getSelectItem(){
-				for(var a  in this.addrs){
-					if(this.addrs[a].address_id == this.value){
-						return this.addrs[a];
-					}
-				}
-				return null;
-			}
-		},
-		created(){
-			
-		},
-		methods:{
-			selectAddr(e){
-				this.isSelect = true;
-				this.selectId = parseInt(e.detail.value);
-			},
-			showAct(){
-				this.showAddress = true;
-				this.show = true;
-			},
-			selectYes(){
-				if(this.getSelectId){
-					this.$emit('input',this.getSelectId);
-					this.closed();
-				}
-			},
-			closed(){
-				this.show = false;
-				setTimeout(()=>{
-					this.showAddress = false;
-				},400);
-			}
-		}
-	}
-</script>
-
-<style>
-	.address-modal{
-		position: relative;
-		z-index: 400;
-	}
-	.address-modal .modal-bg{
-		position: fixed;
-		z-index: 400;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 100vh;
-		background: rgba(0,0,0,.5);
-	}
-	.address-modal .modal-box{
-		position: fixed;
-		z-index: 401;
-		background:#F5F6FA;
-		left: 0;
-		bottom: 0;
-		width: 100%;
-		padding-bottom:0rpx;
-		padding-bottom:constant(safe-area-inset-bottom);
-		padding-bottom:env(safe-area-inset-bottom);
-		border-radius:32rpx 32rpx 0rpx 0rpx;
-	}
-	.address-modal .modal-main{
-		position: relative;
-		height: auto;
-		overflow: hidden;
-		padding-top: 64rpx;
-		padding-bottom: 40rpx;
-	}
-	.address-modal .modal-main .closed{
-		position: absolute;
-		right: 40rpx;
-		top: 40rpx;
-	}
-	
-	.tag-default{
-		width: 64rpx;
-		height: 36rpx;
-		border-radius: 4rpx;
-		text-align: center;
-		line-height: 36rpx;
-		font-size: 24rpx;
-		color:#FFFFFF;
-	}
-</style>

+ 0 - 176
components/select/birthday.vue

@@ -1,176 +0,0 @@
-<template>
-	<view>
-		<view @click="showSelect" class="flex alcenter">
-			<text v-if="value.length == 0" class="ft14 ftw500 cl-main">请选择</text>
-			<text v-else class="ft14 ftw500 cl-main">{{value[0]}}月{{value[1]}}日</text>
-			<text class="iconfont  iconicon_arrow_small ft14 ml10"></text>
-		</view>
-		<view v-show="showBirthday" class="birthday-modal">
-			<view  class="modal-bg"></view>
-			<view class="modal-box animated fast"  :class="show   ? 'slideInUp' : 'slideOutDown'">
-				<view class="modal-main">
-					<view class="closed">
-						<text @click="closed()" class="iconfont  ft20 cl-notice iconbtn_close"></text>
-					</view>
-					<view class="lh20 ft16 cl-main ftw600 text-center">请选择生日</view>
-					<view class="mt30">
-						
-						<picker-view class="picker-view" indicator-style="height:50px" :value="selectVal" @change="bindChange">
-						
-							<picker-view-column>
-								<view class="item text-center" v-for="(item,index) in month" :key="index">{{item}}</view>
-							</picker-view-column>
-							<picker-view-column>
-								<view class="item text-center" v-for="(item,index) in days" :key="index">{{item}}</view>
-							</picker-view-column>
-						</picker-view>	  
-						
-					</view>
-					
-					<view class="plr15 mt40">
-						<button class="btn-big" @click="selectYes" :style="isSelect == false ? getBtnDisStyle :getBtnStyle ">确定选择</button>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	
-	export  default{
-		props:{
-			value:{
-				type:Array,
-				default:function(){
-					return [];
-				}
-			},
-		},
-		computed:{
-			selectVal(){
-				let value = this.value;
-				if(value.length == 0){
-					value = new Array;
-					value = ['01','01'];
-				}
-				let arr = [0,0];
-				for(var a  in this.month){
-					if(this.month[a] == value[0]){
-						arr[0] = a;
-					}
-				}
-				for(var  b  in  this.days){
-					if(this.days[b] == value[1]){
-						arr[1] = b;
-					}
-				}
-				return arr;
-			}
-		},
-		data(){
-			let month = new Array;
-			for(var i= 1;i<=12;i++){
-				var m  = i < 10 ? '0'+i : i;
-				month.push(m);
-			}
-			let days = this.makeDays(this.value[0] ? this.value[0] : '01');
-		
-			return {
-				month:month,
-				days:days,
-				show:false,
-				showBirthday:false,
-				isSelect:false,
-				selectdate:['01','01'],
-			}
-		},
-		created(){
-			
-		},
-		methods:{
-			showSelect(){
-				this.showBirthday = true;
-				this.show = true;
-			},
-			makeDays(m){
-				let dmax = 31;
-				if(m == '02'){
-					dmax = 29;
-				}else{
-					if(m == '04' || m == '06' || m == '09' || m == '11'){
-						dmax = 30;
-					}else{
-						dmax = 31;
-					}
-				}
-				let days  = new Array;
-				for(var i = 1;i<=dmax;i++){
-					var d = i< 10 ? '0'+i : i;
-					days.push(d);
-				}
-				return days;
-			},
-			bindChange(e){
-				let values = e.detail.value;
-				this.days = this.makeDays(this.month[values[0]]);
-				this.selectdate = [this.month[values[0]],this.days[values[1]]];
-				this.isSelect = true;
-			},
-			selectYes(){
-				console.log(this.selectdate);
-				console.log(this.isSelect);
-				if(this.isSelect ){
-					this.$emit('input',this.selectdate);
-					this.closed();
-				}
-			},
-			closed(){
-				this.show = false;
-				setTimeout(()=>{
-					this.showBirthday = false;
-				},400);
-			}
-		}
-	}
-</script>
-
-<style>
-	.birthday-modal{
-		position: relative;
-		z-index: 400;
-	}
-	.birthday-modal .modal-bg{
-		position: fixed;
-		z-index: 400;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 100vh;
-		background: rgba(0,0,0,.5);
-	}
-	.birthday-modal .modal-box{
-		position: fixed;
-		z-index: 401;
-		background:#FFFFFF;
-		left: 0;
-		bottom: 0;
-		width: 100%;
-		padding-bottom:0rpx;
-		padding-bottom:constant(safe-area-inset-bottom);
-		padding-bottom:env(safe-area-inset-bottom);
-		border-radius:32rpx 32rpx 0rpx 0rpx;
-	}
-	.birthday-modal .modal-main{
-		position: relative;
-		height: auto;
-		overflow: hidden;
-		padding-top: 64rpx;
-		padding-bottom: 40rpx;
-	}
-	.birthday-modal .modal-main .closed{
-		position: absolute;
-		right: 40rpx;
-		top: 40rpx;
-	}
-</style>

+ 0 - 175
components/select/coupon.vue

@@ -1,175 +0,0 @@
-<template>
-	<view>
-		<view @click="showAct" >
-			<text v-if="showType == 0" class="ft14 cl-notice">暂无券可用</text>
-			<text v-if="showType == 1" class="ft14 cl-notice">有{{coupons.length}}张可选</text>
-			<text v-if="showType == 2" class="ft14 cl-price">-¥{{getSelectItem.num}}</text>
-			<text v-if="showType != 2"  class="iconfont iconicon_arrow_small cl-notice ft14 ml10"></text>
-		</view>
-		
-		<view v-show="showCoupon" class="coupon-modal">
-			<view  class="modal-bg"></view>
-			<view class="modal-box animated fast"  :class="show   ? 'slideInUp' : 'slideOutDown'">
-				<view class="modal-main">
-					<view class="closed">
-						<text @click="closed()" class="iconfont  ft20 cl-notice iconbtn_close"></text>
-					</view>
-					<view class="lh20 ft16 cl-main ftw600 text-center">选择优惠券</view>
-					
-					<view class="pd16_15" style="min-height:600rpx;max-height: 1000rpx; overflow-y: scroll;">
-						<view v-for="(item,index) in coupons" :key="index" class="coupon-box" :class="index > 0 ? 'mt16' : ''">
-							<view class="pd16_15 bg-w flex alcenter space" style="border-bottom: 2rpx dashed   #E4E6ED;">
-								<view class="flex alcenter">
-									<view class="cl-orange" style="width: 96rpx;">
-										<text class="ft12">¥</text>
-										<text class="ft24 ftw600 ml4">{{item.num}}</text>
-									</view>
-									<view class="ml15">
-										<view class="ft14 ftw600 cl-main">普通洗剪吹优惠券</view>
-										<view class="mt12 ft12 cl-info2">2020-09-22到期</view>
-									</view>
-								</view>
-								<view class="btn-mini" @click="usedAct" :data-id="item.coupon_id" :style="value == item.coupon_id ? getBtnDisStyle : getBtnStyle">{{value == item.coupon_id ? '已选' : '使用'}}</view>
-							</view>
-							<view class="pd16_15 ft12 cl-notice">满50元可用,不可与其他优惠活动同时使用</view>
-							<view class="coupon-yl"></view>
-							<view class="coupon-yr"></view>
-							<view class="coupon-vip-tag">会员专享</view>
-						</view>
-						
-					</view>
-					
-					<view @click="noUseAct" class="pd16_15 mt30 bg-w text-center ft16 cl-main" style="box-shadow: 0rpx -4rpx 16rpx 0rpx rgba(0, 0, 0, 0.04);">不使用优惠</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default{
-		props:{
-			value:{
-				type:Number,
-				default:0
-			},
-			coupons:{
-				type:Array,
-				default:function(){
-					return new Array;
-				}
-			}
-		},
-		data(){
-			return {
-				show:false,
-				showCoupon:false,
-				isSelect:false,
-				selectId:0,
-				
-			}
-		},
-		computed:{
-			showType(){
-				if(this.coupons.length == 0) return 0;
-				if(this.value == 0) return 1;
-				if(this.getSelectItem == null) return 1;
-				return 2;
-			},
-			getSelectItem(){
-				for(var a  in this.coupons){
-					if(this.coupons[a].coupon_id == this.value) return this.coupons[a];
-				}
-				return null;
-			}
-		},
-		created(){
-			
-		},
-		methods:{
-			noUseAct(){
-				this.$emit('input',0);
-				this.closed();
-			},
-			usedAct(e){
-				let id = parseInt(e.currentTarget.dataset.id);
-				if(id == this.value) return;
-				this.$emit('input',id);
-				this.closed();
-			},
-			showAct(){
-				this.showCoupon = true;
-				this.show = true;
-			},
-			
-			closed(){
-				this.show = false;
-				setTimeout(()=>{
-					this.showCoupon = false;
-				},400);
-			}
-		}
-	}
-</script>
-
-<style>
-	.coupon-modal{
-		position: relative;
-		z-index: 400;
-	}
-	.coupon-modal .modal-bg{
-		position: fixed;
-		z-index: 400;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 100vh;
-		background: rgba(0,0,0,.5);
-	}
-	.coupon-modal .modal-box{
-		position: fixed;
-		z-index: 401;
-		background:#F5F6FA;
-		left: 0;
-		bottom: 0;
-		width: 100%;
-		padding-bottom:0rpx;
-		padding-bottom:constant(safe-area-inset-bottom);
-		padding-bottom:env(safe-area-inset-bottom);
-		border-radius:32rpx 32rpx 0rpx 0rpx;
-	}
-	.coupon-modal .modal-main{
-		position: relative;
-		height: auto;
-		overflow: hidden;
-		padding-top: 64rpx;
-	}
-	.coupon-modal .modal-main .closed{
-		position: absolute;
-		right: 40rpx;
-		top: 40rpx;
-	}
-	
-	.coupon-box{
-		background: #FAFAFA;
-		border-radius: 16rpx;
-		overflow: hidden;
-		position: relative;
-		height: 252rpx;
-	}
-	.coupon-box .coupon-yl,.coupon-box .coupon-yr{
-		width: 20rpx;
-		height: 20rpx;
-		border-radius: 10rpx;
-		position: absolute;
-		top: 148rpx;
-		background: #F5F6FA; 
-		z-index: 2;
-	}
-	.coupon-box .coupon-yl{
-		left: -10rpx;
-	}
-	.coupon-box .coupon-yr{
-		right: -10rpx;
-	}
-</style>

+ 0 - 280
components/select/datetime.vue

@@ -1,280 +0,0 @@
-<template>
-	<view>
-		<view @click="showDiv" class="flex alcenter">
-			<text class="ft16  cl-manage">{{value == 0 ? '请选择' : value}}</text>
-			<text class="iconfont  iconicon_arrow_small ml5 ft14 cl-manage"></text>
-		</view>
-		<view v-show="show" class="selecttime-modal">
-			<view class="modal-bg"></view>
-			<view class="modal-box animated fast" :class="show   ? 'slideInUp' : 'slideOutDown'">
-				<view class="modal-main">
-					<view class="closed">
-						<text @click="closed()" class="iconfont  ft20 cl-notice iconbtn_close"></text>
-					</view>
-					<view class="lh20 ft16 cl-main ftw600 text-center">选择时间</view>
-
-					<view class="mt40">
-						<view class="flex">
-							<view class="col2 flex center">
-								<view class="time-type" @click="changeType(0)" :class="selectType == 0 ? 'on' :''">选择日期</view>
-							</view>
-							<view class="col2 flex center">
-								<view class="time-type" @click="changeType(1)" :class="selectType == 1 ? 'on' :''">选择时分</view>
-							</view>
-						</view>
-						<view v-if="selectType == 0 && show == true " class="pd16_15">
-							<picker-view class="picker-view" indicator-style="height:50px" :value="[selectVal[0],selectVal[1],selectVal[2]]"
-							 @change="bindChange">
-								<picker-view-column>
-									<view class="item text-center" v-for="(item,index) in years" :key="index">{{item}}年</view>
-								</picker-view-column>
-								<picker-view-column>
-									<view class="item text-center" v-for="(item,index) in month" :key="index">{{item}}月</view>
-								</picker-view-column>
-								<picker-view-column>
-									<view class="item text-center" v-for="(item,index) in days" :key="index">{{item}}日</view>
-								</picker-view-column>
-							</picker-view>
-						</view>
-						<view v-if="selectType == 1 && show == true" class="pd16_15">
-							<picker-view class="picker-view" indicator-style="height:50px" :value="[selectVal[3],selectVal[4]]" @change="bindChange2">
-								<picker-view-column>
-									<view class="item text-center" v-for="(item,index) in hours" :key="index">{{item}}时</view>
-								</picker-view-column>
-								<picker-view-column>
-									<view class="item text-center" v-for="(item,index) in mins" :key="index">{{item}}分</view>
-								</picker-view-column>
-
-							</picker-view>
-						</view>
-						<view class="pd16_15">
-							<button @click="submitYes" class="btn-manage">确定选择</button>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import helper from '../../static/js/helper.js';
-	export default {
-		props: {
-
-			value: {
-				type: String,
-				default: ''
-			},
-		},
-		data() {
-			let years = new Array;
-			for (var i = 2000; i <= 2030; i++) {
-				years.push(i);
-			}
-			let month = new Array;
-			for (var i = 1; i <= 12; i++) {
-				var m = i < 10 ? '0' + i : i;
-				month.push(m);
-			}
-			let days = this.makeDays([0, 0]);
-			let hours = new Array;
-			for (var i = 0; i <= 23; i++) {
-				var h = i < 10 ? '0' + i : i;
-				hours.push(h);
-			}
-			let mins = new Array;
-			for (var i = 0; i <= 59; i++) {
-				var min = i < 10 ? '0' + i : i;
-				mins.push(min);
-			}
-
-			return {
-
-				selectType: 0,
-				mydateValue: [0, 0, 0, 0, 0],
-				years: years,
-				month: month,
-				days: days,
-				hours: hours,
-				mins: mins,
-				show: false,
-			}
-		},
-
-		computed: {
-			getValue() {
-				let value = this.value;
-				if (value == '' || value == 0) {
-					let today = helper.getTimeArr();
-					value = today.y + '-' + today.m + '-' + today.d + ' ' + today.h + ':' + today.i;
-				}
-				let v = value.replace(/[-|:]/g, ' ');
-				let val = v.split(' ');
-				return val;
-			},
-			selectVal() {
-				let value = this.getValue;
-				let month = this.month;
-				let days = this.days;
-				let hours = this.hours;
-				let mins = this.mins;
-
-				let res = [0, 0, 0, 0, 0];
-				for (var a in this.years) {
-					if (this.years[a] == value[0]) {
-						res[0] = parseInt(a);
-						break;
-					}
-				}
-				for (var a in month) {
-					if (month[a] == value[1]) {
-						res[1] = parseInt(a);
-						break;
-					}
-				}
-				for (var a in days) {
-					if (days[a] == value[2]) {
-						res[2] = parseInt(a);
-						break;
-					}
-				}
-				for (var a in hours) {
-					if (hours[a] == value[3]) {
-						res[3] = parseInt(a);
-						break;
-					}
-				}
-				for (var a in mins) {
-					if (mins[a] == value[4]) {
-						res[4] = parseInt(a);
-						break;
-					}
-				}
-				return res;
-			},
-		},
-		methods: {
-			showDiv() {
-				this.show = true;
-			},
-			makeDays(value) {
-				let years = value[0];
-				let month = value[1];
-				let dmax = 31;
-				if ((years / 4 == 0) && month == '02') {
-					if ((years / 100 == 0) && (years % 400 !== 0)) {
-						dmax = 28;
-					} else {
-						dmax = 29;
-					}
-				} else {
-					if (month == '04' || month == '06' || month == '09' || month == '11') {
-						dmax = 30;
-					} else if (month == '02') {
-						dmax = 28;
-					}
-				}
-				let days = new Array;
-				for (var i = 1; i <= dmax; i++) {
-					var d = i < 10 ? '0' + i : i;
-					days.push(d);
-				}
-				return days;
-			},
-			makeDays2(selectVal) {
-				let values = [this.years[selectVal[0]], this.month[selectVal[1]]];
-				return this.makeDays(values);
-			},
-			bindChange(e) {
-				let values = e.detail.value;
-				this.days = this.makeDays2(values);
-				this.mydateValue[0] = values[0];
-				this.mydateValue[1] = values[1];
-				this.mydateValue[2] = values[2];
-			},
-			bindChange2(e) {
-				let values = e.detail.value;
-				this.mydateValue[3] = values[0];
-				this.mydateValue[4] = values[1];
-			},
-			submitYes() {
-				for (var a in this.mydateValue) {
-					if (this.mydateValue[a] == 0) {
-						this.mydateValue[a] = this.selectVal[a];
-					}
-				}
-				let date = this.years[this.mydateValue[0]] + '-' +
-					this.month[this.mydateValue[1]] + '-' +
-					this.days[this.mydateValue[2]] + ' ' +
-					this.hours[this.mydateValue[3]] + ':' +
-					this.mins[this.mydateValue[4]];
-				if (date == '2000-01-00 00:00') {
-					this.$emit('input', this.value);
-				} else {
-					this.$emit('input', date);
-				}
-				this.selectType = 0;
-				this.show = false;
-			},
-			closedAct() {
-				this.show = false;
-			},
-			changeType(type) {
-				this.selectType = type;
-			},
-		}
-	}
-</script>
-
-<style>
-	.selecttime-modal{
-		position: relative;
-		z-index: 400;
-	}
-	.selecttime-modal .modal-bg{
-		position: fixed;
-		z-index: 400;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 100vh;
-		background: rgba(0,0,0,.5);
-	}
-	.selecttime-modal .modal-box{
-		position: fixed;
-		z-index: 401;
-		background:#FFFFFF;
-		left: 0;
-		bottom: 0;
-		width: 100%;
-		padding-bottom:0rpx;
-		padding-bottom:constant(safe-area-inset-bottom);
-		padding-bottom:env(safe-area-inset-bottom);
-		border-radius:32rpx 32rpx 0rpx 0rpx;
-	}
-	.selecttime-modal .modal-main{
-		position: relative;
-		height: auto;
-		overflow: hidden;
-		padding-top: 64rpx;
-	}
-	.selecttime-modal .modal-main .closed{
-		position: absolute;
-		right: 40rpx;
-		top: 40rpx;
-	}
-	
-	.time-type {
-		height: 66rpx;
-		color: #333333;
-		font-size: 36rpx;
-		font-weight: 600;
-		border-bottom: 6rpx solid #FFFFFF;
-	}
-
-	.time-type.on {
-		border-color: #5E40FF;
-		color: #5E40FF; 
-	}
-</style>

+ 0 - 179
components/select/mendian.vue

@@ -1,179 +0,0 @@
-<template>
-	<view>
-		<view @click="showAct" class="pd16_15 flex alcenter">
-			<view style="width: calc(100% - 40rpx);" class="flex">
-				<text class="iconfont iconicon_location02 ft18" :style="{color:tempColor}"></text>
-				<view class="pl10" style="width: calc(100% - 40rpx);">
-					<view v-if="getSelectItem == null" class="ft14 cl-main ftw600">选择门店</view> 
-					<view v-if="getSelectItem != null" class="ft14 cl-main ftw600 text-over">[{{getSelectItem.name}}]{{getSelectItem.address}}</view>
-					<view v-if="getSelectItem != null" class="ft12 mt12 cl-orange">距离{{getSelectItem.juli}}km</view>
-				</view>
-			</view>
-			<text class="iconfont iconicon_arrow_small ft14 cl-notice"></text>
-		</view>
-		
-		<view v-show="showmendian" class="mendian-modal">
-			<view  class="modal-bg"></view>
-			<view class="modal-box animated fast"  :class="show   ? 'slideInUp' : 'slideOutDown'">
-				<view class="modal-main">
-					<view class="closed">
-						<text @click="closed()" class="iconfont  ft20 cl-notice iconbtn_close"></text>
-					</view>
-					<view class="lh20 ft16 cl-main ftw600 text-center">选择自提门店</view>
-					
-					<view class="pd16_15">
-						
-						<radio-group @change="selectMendian">
-							
-						<view v-for="(item,index) in mendians" :key="index" class="box noshadow pd16_15 mt16 flex alcenter space">
-							<view style="width: calc(100% - 60rpx);">
-								<view class="flex alcenter">
-									<view class="tag-default mr10" v-if="item.is_tuijian == 1" :style="{background:tempColor}">推荐</view>
-									<text class="ft14 ftw600 cl-main text-over" style="width: calc(100% - 88rpx);">[{{item.name}}]{{item.address}}</text>
-								</view>
-								<view class="mt8 ft12 cl-orange ">
-									距离{{item.juli}}km
-								</view>
-							</view>
-							<radio :value="item.mendian_id" :checked="item.mendian_id == getSelectId"  :color="tempColor"  />
-						</view>
-						
-						</radio-group>
-					</view>
-					
-					<view v-if="mendians.length > 0 " class="plr15 mt40">
-						<button class="btn-big" @click="selectYes" :style="getBtnStyle">确定选择</button>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default{
-		props:{
-			value:{
-				type:Number,
-				default:0
-			},
-		},
-		data(){
-			return {
-				show:false,
-				showmendian:false,
-				isSelect:false,
-				selectId:0,
-				mendians:[
-					{mendian_id:1,name:'高速店',address:'合肥市包河区万达临湖苑A区16栋1602室',juli:0.6,is_tuijian:1},
-					{mendian_id:2,name:'万达店',address:'合肥市包河区万达临湖苑A区16栋2007室',juli:11,is_tuijian:0}
-				],
-			}
-		},
-		computed:{
-			getDefaultId(){
-				if(this.mendians.length == 0) return 0;
-				for(var a in this.mendians){
-					if(this.mendians[a].is_tuijian == 1){
-						return this.mendians[a].mendian_id;
-					}
-				}
-				if(this.mendians[0]){
-					return this.mendians[0].mendian_id;
-				}
-			},
-			getSelectId(){
-				if(this.isSelect){
-					return this.selectId;
-				}
-				if(this.value > 0){
-					return this.value;
-				}
-				return this.getDefaultId;
-			},
-			getSelectItem(){
-				for(var a  in this.mendians){
-					if(this.mendians[a].mendian_id == this.value){
-						return this.mendians[a];
-					}
-				}
-				return null;
-			}
-		},
-		created(){
-			
-		},
-		methods:{
-			selectMendian(e){
-				this.isSelect = true;
-				this.selectId = parseInt(e.detail.value);
-			},
-			showAct(){
-				this.showmendian = true;
-				this.show = true;
-			},
-			selectYes(){
-				if(this.getSelectId){
-					this.$emit('input',this.getSelectId);
-					this.closed();
-				}
-			},
-			closed(){
-				this.show = false;
-				setTimeout(()=>{
-					this.showmendian = false;
-				},400);
-			}
-		}
-	}
-</script>
-
-<style>
-	.mendian-modal{
-		position: relative;
-		z-index: 400;
-	}
-	.mendian-modal .modal-bg{
-		position: fixed;
-		z-index: 400;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 100vh;
-		background: rgba(0,0,0,.5);
-	}
-	.mendian-modal .modal-box{
-		position: fixed;
-		z-index: 401;
-		background:#F5F6FA;
-		left: 0;
-		bottom: 0;
-		width: 100%;
-		padding-bottom:0rpx;
-		padding-bottom:constant(safe-area-inset-bottom);
-		padding-bottom:env(safe-area-inset-bottom);
-		border-radius:32rpx 32rpx 0rpx 0rpx;
-	}
-	.mendian-modal .modal-main{
-		position: relative;
-		height: auto;
-		overflow: hidden;
-		padding-top: 64rpx;
-		padding-bottom: 40rpx;
-	}
-	.mendian-modal .modal-main .closed{
-		position: absolute;
-		right: 40rpx;
-		top: 40rpx;
-	}
-	
-	.tag-default{
-		width: 64rpx;
-		height: 36rpx;
-		border-radius: 4rpx;
-		text-align: center;
-		line-height: 36rpx;
-		font-size: 24rpx;
-		color:#FFFFFF;
-	}
-</style>

+ 0 - 63
components/select/star.vue

@@ -1,63 +0,0 @@
-<template>
-	<view class="flex space alcenter star-list" :class="size">
-		<text  v-for="(a,i) in datas" :key="i"  @click="changeStar" :data-value="a" class="star iconfont iconicon_star" :style="{color:a <= getVal ? '#FFD200' : '#E4E6ED' }"></text>
-	</view>
-</template>
-
-<script>
-	export default{
-		props:{
-			type:{
-				type:String,
-				default:'star'
-			},
-			size:{
-				type:String,
-				default:'small'
-			},
-			value:{
-				type:Number,
-				default:0,
-			},
-			readOnly:{
-				type:Boolean,
-				default:false
-			}
-		},
-		computed:{
-			getVal(){
-				return this.value;
-			},
-			
-		},
-		data(){
-			return {
-				myValue:0,
-				datas:[1,2,3,4,5], //不同端 可能存在 a in number 得差异 所以用数组
-			}
-		},
-		methods:{
-			changeStar(e){
-				if(this.readOnly) return;
-				let val = parseInt(e.currentTarget.dataset.value);
-				console.log(val);
-				this.$emit('input',val);
-			}
-		}
-	}
-</script>
-
-<style>
-	.star-list{width: 100%;}
-	.star-list.small{width: 380rpx;}
-	.star-list.mini{width: 200rpx;}
-	.star-list .star{
-		font-size: 80rpx;
-	}
-	.star-list.small .star{
-		font-size: 48rpx;
-	}
-	.star-list.mini .star{
-		font-size: 32rpx;
-	}
-</style>

+ 0 - 74
components/show/photo.vue

@@ -1,74 +0,0 @@
-<template>
-	<view>
-		<view v-if="photos.length > 0">
-			<view v-if="showType == 'big'" class="show-big-photo">
-				<image @click="showPic" v-for="(item,index) in photos" :key="index" :data-index="index" :src="item" mode="aspectFill"></image>
-			</view>
-			<view v-if="showType == 'mid'" class="show-mid-photo flex alcenter space">
-				<image @click="showPic" v-for="(item,index) in photos" :key="index" :data-index="index"  :src="item" mode="aspectFill"></image>
-				
-			</view>
-			<view v-if="showType == 'small'" class="show-small-photo flex space wrap">
-				<image @click="showPic" v-for="(item,index) in photos" :key="index" :data-index="index"  :src="item" mode="aspectFill"></image>
-				
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default{
-		props:{
-			photos:{
-				type:Array,
-				default:function(){
-					return new Array;
-				}
-			}
-		},
-		computed:{
-			showType(){
-				if(this.photos.length == 1) return 'big';
-				if(this.photos.length == 2) return 'mid';
-				return 'small';
-			}
-		},
-		data(){
-			return {
-				
-			}
-		},
-		methods:{
-			showPic(e){
-				let index = parseInt(e.currentTarget.dataset.index);
-				uni.previewImage({
-					current:index,
-					urls:this.photos
-				});
-			}
-		}
-	}
-</script>
-
-<style>
-	
-	.show-big-photo image{
-		width: 100%;
-		height: 400rpx;
-		background: #F2F2F2;
-	}
-	.show-mid-photo image{
-		width: calc(50% - 8rpx);
-		height: 300rpx;
-		background: #F2F2F2;
-	}
-	.show-small-photo image{
-		width: 190rpx;
-		height: 190rpx;
-		background: #F2F2F2;
-		border-radius: 8rpx;
-	}
-	.show-small-photo image:nth-child(n+4){
-		margin-top: 16rpx;
-	}
-</style>

+ 0 - 96
components/uni-icons1/icons.js

@@ -1,96 +0,0 @@
-export default {
-	'contact': '\ue100',
-	'person': '\ue101',
-	'personadd': '\ue102',
-	'contact-filled': '\ue130',
-	'person-filled': '\ue131',
-	'personadd-filled': '\ue132',
-	'phone': '\ue200',
-	'email': '\ue201',
-	'chatbubble': '\ue202',
-	'chatboxes': '\ue203',
-	'phone-filled': '\ue230',
-	'email-filled': '\ue231',
-	'chatbubble-filled': '\ue232',
-	'chatboxes-filled': '\ue233',
-	'weibo': '\ue260',
-	'weixin': '\ue261',
-	'pengyouquan': '\ue262',
-	'chat': '\ue263',
-	'qq': '\ue264',
-	'videocam': '\ue300',
-	'camera': '\ue301',
-	'mic': '\ue302',
-	'location': '\ue303',
-	'mic-filled': '\ue332',
-	'speech': '\ue332',
-	'location-filled': '\ue333',
-	'micoff': '\ue360',
-	'image': '\ue363',
-	'map': '\ue364',
-	'compose': '\ue400',
-	'trash': '\ue401',
-	'upload': '\ue402',
-	'download': '\ue403',
-	'close': '\ue404',
-	'redo': '\ue405',
-	'undo': '\ue406',
-	'refresh': '\ue407',
-	'star': '\ue408',
-	'plus': '\ue409',
-	'minus': '\ue410',
-	'circle': '\ue411',
-	'checkbox': '\ue411',
-	'close-filled': '\ue434',
-	'clear': '\ue434',
-	'refresh-filled': '\ue437',
-	'star-filled': '\ue438',
-	'plus-filled': '\ue439',
-	'minus-filled': '\ue440',
-	'circle-filled': '\ue441',
-	'checkbox-filled': '\ue442',
-	'closeempty': '\ue460',
-	'refreshempty': '\ue461',
-	'reload': '\ue462',
-	'starhalf': '\ue463',
-	'spinner': '\ue464',
-	'spinner-cycle': '\ue465',
-	'search': '\ue466',
-	'plusempty': '\ue468',
-	'forward': '\ue470',
-	'back': '\ue471',
-	'left-nav': '\ue471',
-	'checkmarkempty': '\ue472',
-	'home': '\ue500',
-	'navigate': '\ue501',
-	'gear': '\ue502',
-	'paperplane': '\ue503',
-	'info': '\ue504',
-	'help': '\ue505',
-	'locked': '\ue506',
-	'more': '\ue507',
-	'flag': '\ue508',
-	'home-filled': '\ue530',
-	'gear-filled': '\ue532',
-	'info-filled': '\ue534',
-	'help-filled': '\ue535',
-	'more-filled': '\ue537',
-	'settings': '\ue560',
-	'list': '\ue562',
-	'bars': '\ue563',
-	'loop': '\ue565',
-	'paperclip': '\ue567',
-	'eye': '\ue568',
-	'arrowup': '\ue580',
-	'arrowdown': '\ue581',
-	'arrowleft': '\ue582',
-	'arrowright': '\ue583',
-	'arrowthinup': '\ue584',
-	'arrowthindown': '\ue585',
-	'arrowthinleft': '\ue586',
-	'arrowthinright': '\ue587',
-	'pulldown': '\ue588',
-	'closefill': '\ue589',
-	'sound': '\ue590',
-	'scan': '\ue612'
-}

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 57
components/uni-icons1/uni-icons.vue


+ 0 - 118
components/upload/face.vue

@@ -1,118 +0,0 @@
-<template>
-	<view class="upload-face">
-		<view v-if="value == ''" @click="uploadAct" class="upload-main">
-			<view class="upload-btn">
-				<text class="iconfont iconicon_photo  cl-w"></text>
-			</view>
-		</view>
-		<view v-else class="upload-show">
-			<image @click="uploadAct"></image>
-			<view @click="delPic" class="del">
-				<text class="iconfont iconicon_close12 ft12"></text>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import qiniu from '../../static/js/qiniu.js';
-	export default{
-		props:{
-			value:{
-				type:String,
-				default:'',
-			}
-		},
-		data(){
-			return {
-				
-			}
-		},
-		methods:{
-			delPic(){
-				this.$emit('input','');
-			},
-			uploadAct(){
-				uni.chooseImage({
-					count:1,
-					success:(chooseImageRes)=>{
-						if(chooseImageRes.tempFilePaths.length > 0){
-							 // this.$http.api('child.upload/imageAuth').then(auth=>{
-								//  let domain = auth.url;
-								//  let token = auth.token;
-								//  let region = auth.region_mini;
-								
-								// 	let file  = chooseImageRes.tempFilePaths[0];
-								// 	let index = file.lastIndexOf('/');
-								// 	let len   = file.length
-								// 	let name  = file.substring(index + 1, len);
-								// 	qiniu.upload(file, (res) => {
-								// 		let url = res.imageURL;
-								// 		this.$emit('input',url);
-								// 	}, (error) => {
-								// 		console.log(error);
-								// 	}, {
-								// 		region: region,
-								// 		key: name,
-								// 		domain:domain,
-								// 		uptoken: token, 
-								// 	});
-							
-							 // }).catch(res=>{
-								//  console.log(res);
-							 // });
-						}
-					}
-				})
-			}
-		}
-	}
-</script>
-
-<style>
-	.upload-face{
-		width: 210rpx;
-		height: 210rpx;
-		background: rgba(94, 64, 255, 0.06);
-		border-radius: 110rpx;
-	}
-	.upload-face .upload-main{
-		width: 210rpx;
-		height: 210rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
-	.upload-face .upload-btn{
-		width: 64rpx;
-		height: 64rpx;
-		background: #5E40FF;
-		border-radius: 32rpx;
-		text-align: center;
-		line-height: 64rpx;
-	}
-	.upload-face .upload-show{
-		width: 210rpx;
-		height: 210rpx;
-		border-radius: 110rpx;
-		position: relative;
-	}
-	.upload-face .upload-show image{
-		width: 210rpx;
-		height: 210rpx;
-		border-radius: 110rpx;
-		background: rgba(94, 64, 255, 0.06);
-	}
-	.upload-face .upload-show .del{
-		position: absolute;
-		right: 0;
-		top: 0rpx;
-		width: 56rpx;
-		height: 56rpx;
-		background: rgba(0,0,0,.4);
-		border-radius: 28rpx;
-		text-align: center;
-		line-height: 56rpx;
-		color:#FFFFFF;
-	}
-</style>

+ 0 - 147
components/upload/list.vue

@@ -1,147 +0,0 @@
-<template>
-	<view class="flex wrap">
-		<view @click="uploadAct" v-if="value.length < maxNum" class="upload-list-photo camera flex center alcenter">
-			<view class="upload" :style="{background:isMain ? tempColor : '#5E40FF'}">
-				<text class="iconfont iconicon_photo  cl-w"></text>
-			</view>
-		</view>
-		
-		<view v-for="(item,index) in  value" :key="index" class="upload-list-photo">
-			<image class="photo" :src="item"></image>
-			<view :data-index="index" @click="delPic"  class="del">
-				<text class="iconfont iconbtn_close cl-w"></text>
-			</view>
-		</view>
-		
-	</view>
-</template>
-
-<script>
-	import qiniu from '../../static/js/qiniu.js';
-	export default{
-		props:{
-			value:{
-				type:Array,
-				default:function(){
-					return new Array;
-				}
-			},
-			isMain:{
-				type:Boolean,
-				default:true,
-			},
-			maxNum:{ //最多上传的数量
-				type:Number,
-				default:9
-			}
-		},
-		data(){
-			return {
-				
-			}
-		},
-		computed:{
-			getNum(){
-				return this.maxNum - this.value.length;
-			}
-		},
-		created(){
-			
-		},
-		methods:{
-			delPic(e){
-				let index = parseInt(e.currentTarget.dataset.index);
-				let oldImgs = JSON.parse(JSON.stringify(this.value));
-				oldImgs.splice(index,1);
-				this.$emit('input',oldImgs);
-			},
-			uploadAct(){
-				uni.chooseImage({
-					count:this.getNum,
-					success:(chooseImageRes)=>{
-						if(chooseImageRes.tempFilePaths.length > 0){
-							 // this.$http.api('child.upload/imageAuth').then(auth=>{
-								//  let domain = auth.url;
-								//  let token = auth.token;
-								//  let region = auth.region_mini;
-								// for (var i = 0; i < chooseImageRes.tempFilePaths.length; i++) {
-								// 	let file  = chooseImageRes.tempFilePaths[i];
-								// 	let index = file.lastIndexOf('/');
-								// 	let len   = file.length
-								// 	let name  = file.substring(index + 1, len);
-								// 	qiniu.upload(file, (res) => {
-								// 		let url = res.imageURL;
-								// 		let oldImgs = JSON.parse(JSON.stringify(this.value));
-								// 		oldImgs.push(url);
-								// 		this.$emit('input',oldImgs);
-								// 	}, (error) => {
-								// 		console.log(error);
-								// 	}, {
-								// 		region: region,
-								// 		key: name,
-								// 		domain:domain,
-								// 		uptoken: token, 
-								// 	});
-								// }	
-							 // }).catch(res=>{
-								//  console.log(res);
-							 // });
-						}
-					}
-				})
-			}
-		}
-	}
-</script>
-
-<style>
-	
-	.upload-list-photo{
-		width:190rpx;
-		height:190rpx;
-		border-radius:16rpx;
-		position: relative;
-		margin-right: 30rpx;
-		margin-bottom: 30rpx;
-
-	}
-	
-	
-	.upload-list-photo.camera{
-	
-		background:#FFFFFF;
-		border:2rpx dashed #C5CADB;
-	}
-	.upload-list-photo.camera .upload{
-		width: 64rpx;
-		height: 64rpx;
-		border-radius: 32rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
-	
-	.upload-list-photo:nth-child(3n){
-		margin-right: 0rpx;
-	}
-	.upload-list-photo .photo{
-		width:190rpx;
-		height:190rpx;
-		border-radius:16rpx;
-		background: #f2f2f2;
-	}
-	.upload-list-photo .del{
-		width: 56rpx;
-		height: 56rpx;
-		position: absolute;
-		border-radius: 28rpx;
-		background: rgba(0,0,0,0.5);
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		z-index: 2;
-		right: 0;
-		top: 0;
-	}
-	
-</style>

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 20
components/wyb-pagination/iconfont.css


+ 0 - 455
components/wyb-pagination/wyb-pagination.vue

@@ -1,455 +0,0 @@
-<template>
-	<view class="wyb-pagination-box" :style="{
-		paddingLeft: padding + 'rpx',
-		paddingRight: padding + 'rpx',
-		'--hover': autoHover}">
-		<view class="wyb-pagination-left" :style="{opacity: currentPage === 1 ? 0.5 : 1}">
-			<view
-			 v-if="showFirst"
-			 :class="'wyb-pagination-first-page-' + (showIcon ? 'i' : 't')"
-			 :style="btnStyleStr" 
-			 :hover-class="currentPage === 1 ? '' : 'wyb-pagination-hover'"
-			 @tap="onPageBtnTap('first-page')">
-				<view v-if="showIcon" class="iconfont icon-shuangjiantou left-arrow" />
-				<text v-else>{{firstText}}</text>
-			</view>
-			<view 
-			 :class="'wyb-pagination-prev-page-' + (showIcon ? 'i' : 't')"
-			 :style="btnStyleStr"
-			 :hover-class="currentPage === 1 ? '' : 'wyb-pagination-hover'"
-			 @tap="onPageBtnTap('prev-page')">
-				<view v-if="showIcon" class="iconfont icon-danjiantou left-arrow" />
-				<text v-else>{{prevText}}</text>
-			</view>
-		</view>
-		<view class="wyb-pagination-info" @tap.stop="onInfoTap">
-			<view class="wyb-pagination-num" v-if="!infoClick">
-				<text :style="{color: currentColor}">{{currentPage}}</text>
-				<text class="wyb-pagination-span" :style="{color: pageInfoColor}">/</text>
-				<text :style="{color: pageInfoColor}">{{totalPage}}</text>
-				<text 
-				 v-if="showTotalItem"
-				 class="wyb-pagination-info-total"
-				 :style="{color: RGBChange(pageInfoColor, 0.5, 'light')}">
-					({{totalItems}})
-				</text>
-			</view>
-			<!-- #ifndef MP-WEIXIN || APP-VUE || APP-NVUE || APP-PLUS || APP-PLUS-NVUE -->
-			<view class="wyb-pagination-input" v-else>
-				<input 
-				 type="number" 
-				 v-model="inputPage" 
-				 :onpaste="false"
-				 :focus="infoFocus" 
-				 :value="currentPage"
-				 :style="{color: currentColor}"
-				 :cursor-spacing="cursorSpacing"
-				 @confirm="onInfoConfirm" 
-				 @blur="onInfoBlur" />
-			</view>
-			<!-- #endif -->
-			<!-- #ifdef MP-WEIXIN || APP-VUE || APP-NVUE || APP-PLUS || APP-PLUS-NVUE -->
-			<view class="wyb-pagination-input" v-else>
-				<input 
-				 type="number" 
-				 v-model="inputPage" 
-				 :focus="infoFocus" 
-				 :name="currentPage"
-				 :style="{color: currentColor}"
-				 :cursor-spacing="cursorSpacing"
-				 @confirm="onInfoConfirm" 
-				 @blur="onInfoBlur" />
-			</view>
-			<!-- #endif -->
-		</view>
-		<view class="wyb-pagination-right" :style="{opacity: currentPage === totalPage ? 0.5 : 1}">
-			<view
-			 :class="'wyb-pagination-next-page-' + (showIcon ? 'i' : 't')"
-			 :style="btnStyleStr"
-			 :hover-class="currentPage === totalPage ? '' : 'wyb-pagination-hover'"
-			 @tap="onPageBtnTap('next-page')">
-				<view v-if="showIcon" class="iconfont icon-danjiantou right-arrow" />
-				<text v-else>{{nextText}}</text>
-			</view>
-			<view
-			 v-if="showLast"
-			 :class="'wyb-pagination-last-page-' + (showIcon ? 'i' : 't')"
-			 :style="btnStyleStr"
-			 :hover-class="currentPage === totalPage ? '' : 'wyb-pagination-hover'"
-			 @tap="onPageBtnTap('last-page')">
-				<view v-if="showIcon" class="iconfont icon-shuangjiantou right-arrow" />
-				<text v-else>{{lastText}}</text>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				currentPage: this.current || 1,
-				inputPage: '',
-				infoClick: false,
-				infoFocus: false
-			}
-		},
-		computed: {
-			totalPage() {
-				return Math.ceil(parseFloat(this.totalItems) / parseFloat(this.pageItems))
-			},
-			autoHover() {
-				if (this.btnStyle.backgroundColor) {
-					return this.RGBChange(this.btnStyle.backgroundColor, 0.1, 'dark')
-				} else {
-					return this.RGBChange('#f8f8f8', 0.05, 'dark')
-				}
-			},
-			btnStyleStr() {
-				let styleStr = ''
-				for (let key in this.btnStyle) {
-					styleStr += `${this.sortFieldMatch(key)}: ${this.btnStyle[key]}; `
-				}
-				return styleStr
-			}
-		},
-		watch: {
-			current(val) {
-				const oPage = this.currentPage
-				if (!Object.is(oPage, val)) {
-					this.currentPage = val
-					this.$emit('change', {
-						type: 'prop-page', 
-						current: this.currentPage,
-					})
-				}
-			}
-		},
-		props: {
-			totalItems: {
-				type: [String, Number],
-				default: 20
-			},
-			pageItems: {
-				type: [String, Number],
-				default: 5
-			},
-			current: {
-				type: Number,
-				default: 1
-			},
-			prevText: {
-				type: String,
-				default: '上一页'
-			},
-			nextText: {
-				type: String,
-				default: '下一页'
-			},
-			firstText: {
-				type: String,
-				default: '首页'
-			},
-			lastText: {
-				type: String,
-				default: '尾页'
-			},
-			pageInfoColor: {
-				type: String,
-				default: '#494949'
-			},
-			currentColor: {
-				type: String,
-				default: '#007aff'
-			},
-			padding: {
-				type: [String, Number],
-				default: 15
-			},
-			btnStyle: {
-				type: Object,
-				default () {
-					return {}
-				}
-			},
-			showIcon: {
-				type: Boolean,
-				default: false
-			},
-			showTotalItem: {
-				type: Boolean,
-				default: false
-			},
-			showFirst: {
-				type: Boolean,
-				default: true
-			},
-			showLast: {
-				type: Boolean,
-				default: true
-			},
-			couldInput: {
-				type: Boolean,
-				default: true
-			},
-			cursorSpacing: {
-				type: Number,
-				default: 0
-			}
-		},
-		methods: {
-			onPageBtnTap(type) {
-				switch (type) {
-					case 'first-page':
-						if (!Object.is(this.currentPage, 1)) {
-							this.currentPage = 1
-							this.$emit('change', {type, current: this.currentPage})
-						}
-						break
-					case 'prev-page':
-						if (!Object.is(this.currentPage, 1)) {
-							this.currentPage--
-							this.$emit('change', {type, current: this.currentPage})
-						}
-						break
-					case 'next-page':
-						if (!Object.is(this.currentPage, this.totalPage)) {
-							this.currentPage++
-							this.$emit('change', {type, current: this.currentPage})
-						}
-						break
-					case 'last-page':
-						if (!Object.is(this.currentPage, this.totalPage)) {
-							this.currentPage = this.totalPage
-							this.$emit('change', {type, current: this.currentPage})
-						}
-						break
-				}
-			},
-			onInfoTap() {
-				if (this.couldInput) {
-					this.infoClick = true
-					this.inputPage = this.currentPage
-					setTimeout(() => {
-						this.infoFocus = true
-					}, 10)
-				}
-			},
-			onInfoConfirm(e) {
-				let input = e.detail.value
-				const oPage = this.currentPage
-				if (parseFloat(input) > this.totalPage) {
-					this.currentPage = this.totalPage
-				} else if (parseFloat(input) < 1) {
-					this.currentPage = 1
-				} else if (input === '') {
-					this.currentPage = oPage
-				} else {
-					this.currentPage = parseFloat(input)
-				}
-				if (!Object.is(oPage, this.currentPage)) {
-					this.$emit('change', {
-						type: 'input-page', 
-						current: this.currentPage,
-					})
-				}
-				this.infoClick = false
-				this.$nextTick(() => {
-					this.infoFocus = false
-				})
-			},
-			onInfoBlur(e) {
-				let input = e.detail.value
-				const oPage = this.currentPage
-				if (parseFloat(input) > this.totalPage) {
-					this.currentPage = this.totalPage
-				} else if (parseFloat(input) < 1) {
-					this.currentPage = 1
-				} else if (input === '') {
-					this.currentPage = oPage
-				} else {
-					this.currentPage = parseFloat(input)
-				}
-				if (!Object.is(oPage, this.currentPage)) {
-					this.$emit('change', {
-						type: 'input-page', 
-						current: this.currentPage,
-					})
-				}
-				this.infoClick = false
-				this.$nextTick(() => {
-					this.infoFocus = false
-				})
-			},
-			RGBChange(color, level, type) {
-				// 判断颜色类型
-				let r = 0,
-					g = 0,
-					b = 0,
-					hasAlpha = false,
-					alpha = 1
-				if (color.indexOf('#') !== -1) {
-					// hex转rgb
-					if (color.length === 4) {
-						let arr = color.split('')
-						color = '#' + arr[1] + arr[1] + arr[2] + arr[2] + arr[3] + arr[3]
-					}
-					let color16List = [color.substring(1, 3), color.substring(3, 5), color.substring(5, 7)]
-					r = parseInt(color16List[0], 16)
-					g = parseInt(color16List[1], 16)
-					b = parseInt(color16List[2], 16)
-
-				} else {
-					hasAlpha = color.indexOf('a') !== -1
-					let root = color.slice()
-					let idx = root.indexOf('(') + 1
-					root = root.substring(idx)
-					let firstDotIdx = root.indexOf(',')
-					r = parseFloat(root.substring(0, firstDotIdx))
-					root = root.substring(firstDotIdx + 1)
-					let secondDotIdx = root.indexOf(',')
-					g = parseFloat(root.substring(0, secondDotIdx))
-					root = root.substring(secondDotIdx + 1)
-					if (hasAlpha) {
-						let thirdDotIdx = root.indexOf(',')
-						b = parseFloat(root.substring(0, thirdDotIdx))
-						alpha = parseFloat(root.substring(thirdDotIdx + 1))
-					} else {
-						b = parseFloat(root)
-					}
-				}
-
-				let rgbc = [r, g, b]
-				// 减淡或加深
-				for (var i = 0; i < 3; i++)
-					type === 'light' ? rgbc[i] = Math.floor((255 - rgbc[i]) * level + rgbc[i]) : rgbc[i] = Math.floor(rgbc[i] * (1 -
-						level))
-
-				if (hasAlpha) {
-					return `rgba(${rgbc[0]}, ${rgbc[1]}, ${rgbc[2]}, ${alpha})`
-				} else {
-					return `rgb(${rgbc[0]}, ${rgbc[1]}, ${rgbc[2]})`
-				}
-			},
-			sortFieldMatch(field) {
-				const stringArray = field.split('')
-				let newField = field
-				stringArray.forEach(t => {
-					if (/[A-Z]/.test(t)) {
-						newField = field.replace(t, `-${t.toLowerCase()}`)
-					}
-				})
-				return newField
-			}
-		}
-	}
-</script>
-
-<style>
-	@import 'iconfont.css';
-	.wyb-pagination-box {
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		box-sizing: border-box;
-		justify-content: space-between;
-		flex-wrap: nowrap;
-	}
-	
-	.wyb-pagination-left {
-		flex: 1;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		flex-wrap: nowrap;
-		justify-content: flex-start;
-	}
-	
-	.wyb-pagination-right {
-		flex: 1;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		flex-wrap: nowrap;
-		justify-content: flex-end;
-	}
-
-	.wyb-pagination-first-page-t,
-	.wyb-pagination-prev-page-t,
-	.wyb-pagination-next-page-t,
-	.wyb-pagination-last-page-t {
-		font-size: 27rpx;
-		padding: 14rpx 25rpx;
-		box-sizing: border-box;
-		background-color: #f8f8f8;
-		border: 1px solid #e5e5e5;
-		white-space: nowrap;
-	}
-	
-	.wyb-pagination-first-page-i,
-	.wyb-pagination-prev-page-i,
-	.wyb-pagination-next-page-i,
-	.wyb-pagination-last-page-i {
-		font-size: 27rpx;
-		padding: 14rpx 33rpx;
-		box-sizing: border-box;
-		background-color: #f8f8f8;
-		border: 1px solid #e5e5e5;
-		white-space: nowrap;
-	}
-
-	.wyb-pagination-first-page-t,
-	.wyb-pagination-first-page-i {
-		margin-right: 15rpx;
-	}
-
-	.wyb-pagination-last-page-t,
-	.wyb-pagination-last-page-i {
-		margin-left: 15rpx;
-	}
-
-	.wyb-pagination-info {
-		font-size: 33rpx;
-		white-space: nowrap;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: center;
-		flex: 1;
-	}
-	
-	.wyb-pagination-input input {
-		text-align: center;
-	}
-
-	.wyb-pagination-span {
-		margin: 0 2rpx;
-	}
-	
-	.wyb-pagination-info-total {
-		margin-left: 10rpx;
-	}
-	
-	.wyb-pagination-first-page-t:active,
-	.wyb-pagination-prev-page-t:active,
-	.wyb-pagination-next-page-t:active,
-	.wyb-pagination-last-page-t:active,
-	.wyb-pagination-first-page-i:active,
-	.wyb-pagination-prev-page-i:active,
-	.wyb-pagination-next-page-i:active,
-	.wyb-pagination-last-page-i:active {
-		background-color: var(--hover) !important;
-	}
-	
-	.left-arrow {
-		transform: scale(0.9);
-		margin-right: 5rpx;
-	}
-	
-	.right-arrow {
-		margin-left: 5rpx;
-		transform: scale(0.9) rotate(180deg);
-		-webkit-transform: scale(0.8) rotate(180deg);
-	}
-</style>

+ 0 - 3
main.js

@@ -21,9 +21,6 @@ Vue.prototype.configs=configs
 // import lib from "./common/lib.js"
 // Vue.prototype.lib=lib 
 
-import request from "./common/request.js";
-Vue.prototype.$httpas = request;
-
 Vue.prototype.$mbgColor='#ffffff'
 
 

+ 2 - 1
manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "追书云短剧",
-    "appid" : "__UNI__A930F39",
+    "appid" : "__UNI__EDADE48",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -68,6 +68,7 @@
     "quickapp" : {},
     "mp-weixin" : {
         "appid" : "wx77a5614f34087dc2",
+        "lazyCodeLoading" : "requiredComponents", //按需注入
         "setting" : {
             "urlCheck" : false,
             "postcss" : true,

+ 32 - 332
pages.json

@@ -35,155 +35,6 @@
 			}
 		},
 		{
-			"path": "pages/client/zui",
-			"style": {
-				// #ifdef H5
-				"navigationStyle": "custom",
-				// #endif
-				"navigationBarTitleText": "追剧"
-			}
-		},
-		{
-			"path": "pages/client/tuan/zjgk",
-			"style": {
-				"navigationBarTitleText": "最近观看"
-			}
-		},
-		{
-			"path": "pages/client/tuan/wdxh",
-			"style": {
-				"navigationBarTitleText": "我的喜欢"
-			}
-		},
-		{
-			"path": "pages/client/tuan/zjjl",
-			"style": {
-				"navigationBarTitleText": "追剧记录"
-			}
-		},
-		{
-			"path": "pages/client/video/video",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom",
-				"enablePullDownRefresh": false
-			}
-
-		},
-		{
-			"path": "pages/client/video",
-			"style": {
-				"navigationBarTitleText": "视频",
-				// #ifndef MP-TOUTIAO 
-				"navigationStyle": "custom",
-				// #endif
-				"app-plus": {
-					"titleNView": false,
-					"subNVues": [{
-						"id": "comment",
-						"path": "pages/subnvue/comment",
-						"style": {
-							"height": "100%",
-							"position": "absolute",
-							"bottom": "0",
-							"background": "transparent",
-							"zindex": 1
-						}
-					}, {
-						"id": "input-box",
-						"path": "pages/subnvue/input-box",
-						"style": {
-							"height": "100%",
-							"position": "absolute",
-							"bottom": "0",
-							"background": "transparent",
-							"zindex": 2
-						}
-					}]
-				}
-			}
-		},
-		{
-			"path": "pages/client/webva"
-		},
-		{
-			"path": "pages/client/member/qrshare",
-			"style": {
-				"navigationBarTitleText": "分享"
-			}
-		},
-		{
-			"path": "pages/client/vipcard/index",
-			"style": {
-				"navigationBarTitleText": "会员卡详情"
-			}
-		},
-		{
-			"path": "pages/client/vipcard/vipcm",
-			"style": {
-				"navigationBarTitleText": "会员升级"
-			}
-		},
-		{
-			"path": "pages/client/vipcard/recharge",
-			"style": {
-				"navigationBarTitleText": "充值"
-			}
-		},
-		{
-			"path": "pages/client/vipcard/fxlog",
-			"style": {
-				"navigationBarTitleText": "明细"
-			}
-		},
-		{
-			"path": "pages/client/vipcard/moneylog",
-			"style": {
-				"navigationBarTitleText": "明细"
-			}
-		},
-		{
-			"path": "pages/client/member/tx",
-			"style": {
-				"navigationBarTitleText": "提现",
-				"app-plus": {
-					"titleNView": {
-						"backgroundColor": "#f9f9f9",
-						"buttons": [{
-							"color": "#333",
-							"fontSize": "15px",
-							"width": "90px",
-							"text": "提现记录"
-						}]
-					}
-				}
-			}
-		},
-		{
-			"path": "pages/client/member/txjl",
-			"style": {
-				"navigationBarTitleText": "提现记录",
-				"app-plus": {
-					"titleNView": {
-						"backgroundColor": "#f9f9f9"
-					}
-				}
-			}
-		},
-		{
-			"path": "pages/client/vipcard/integrallog",
-			"style": {
-				"navigationBarTitleText": "我的积分"
-			}
-		},
-		{
-			"path": "pages/client/vipcard/integraldh",
-			"style": {
-				"navigationBarTitleText": "积分兑换"
-			}
-		},
-
-		{
 			"path": "pages/set/set",
 			"style": {
 				"navigationBarTitleText": "设置"
@@ -243,142 +94,6 @@
 			}
 		},
 		{
-			"path": "pages/client/vipcard/adviser",
-			"style": {
-				"navigationBarTitleText": "专属顾问"
-			}
-		},
-		{
-			"path": "pages/client/vipcard/adviserchange",
-			"style": {
-				"navigationBarTitleText": "更换顾问"
-			}
-		},
-		{
-			"path": "pages/client/tuan/index",
-			"style": {
-				"navigationBarTitleText": "全部列表",
-				"app-plus": {
-					"titleNView": {
-						"titleColor": "#3a3a3a",
-						"backgroundColor": "#f9f9f9",
-						"searchInput": {
-							"backgroundColor": "#fff",
-							"borderRadius": "6px",
-							"placeholder": "请输入搜索内容",
-							"autoFocus": false
-						}
-					}
-				}
-			}
-		},
-		{
-			"path": "pages/client/tuan/ss",
-			"style": {
-				"navigationBarTitleText": "搜索列表",
-				"app-plus": {
-					"titleNView": {
-						"titleColor": "#3a3a3a",
-						"backgroundColor": "#f9f9f9",
-						"searchInput": {
-							"backgroundColor": "#fff",
-							"borderRadius": "6px",
-							"placeholder": "请输入关键字",
-							"autoFocus": false
-						}
-					}
-				}
-			}
-		},
-
-		{
-			"path": "pages/client/tuan/list",
-			"style": {
-				"navigationBarTitleText": "详情"
-			}
-		},
-		{
-			"path": "pages/client/tuan/detail",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
-		{
-			"path": "pages/client/tuan/info",
-			"style": {
-				"navigationBarTitleText": "详情"
-			}
-		},
-
-		{
-			"path": "pages/client/tuan/infotp",
-			"style": {
-				"navigationBarTitleText": "壁纸图片",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
-
-		},
-
-		{
-			"path": "pages/client/tuan/buy",
-			"style": {
-				"navigationBarTitleText": "下单"
-			}
-		},
-		{
-			"path": "pages/client/tuan/share",
-			"style": {
-				"navigationBarTitleText": "顾问分享特惠福利"
-			}
-		},
-
-		{
-			"path": "pages/client/member/index",
-			"style": {
-				// #ifdef H5
-				"navigationStyle": "custom",
-				// #endif
-				"navigationBarTitleText": "我的"
-			}
-		},
-		{
-			"path": "pages/client/member/info",
-			"style": {
-				"navigationBarTitleText": "生日设置"
-			}
-		},
-		{
-			"path": "pages/client/member/birthday",
-			"style": {
-				"navigationBarTitleText": "生日礼包记录"
-			}
-		},
-		{
-			"path": "pages/client/member/feedback",
-			"style": {
-				"navigationBarTitleText": "问题反馈"
-			}
-		},
-		{
-			"path": "pages/client/integral/index",
-			"style": {
-				"navigationBarTitleText": "积分商城"
-			}
-		},
-		{
-			"path": "pages/client/integral/role",
-			"style": {
-				"navigationBarTitleText": "赚积分"
-			}
-		},
-		{
 			"path": "pages/login/login",
 			"style": {
 				"navigationBarTitleText": "用户登录",
@@ -434,43 +149,36 @@
 				"enablePullDownRefresh": false
 			}
 
-		},{
-            "path" : "pages/pay/pay",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "充值",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/member/index",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "我的",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/zhuiju/index",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/zhuiju/zjgk",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-    ],
+		}, {
+			"path": "pages/pay/pay",
+			"style": {
+				"navigationBarTitleText": "充值",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/member/index",
+			"style": {
+				"navigationBarTitleText": "我的",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/zhuiju/index",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/zhuiju/zjgk",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}
+	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "正在载入",
@@ -494,12 +202,6 @@
 				"selectedIconPath": "static/icon/xz_jy.png",
 				"text": "小剧场"
 			},
-			// {
-			// 	"pagePath": "pages/client/video", 
-			// 	"iconPath": "static/icon/yzy_zys.png",
-			// 	"selectedIconPath": "static/icon/yzy_zyss.png",
-			// 	"text": "推荐"
-			// }, 
 			{
 				"pagePath": "pages/member/index",
 				"iconPath": "static/icon/wd.png",
@@ -520,9 +222,7 @@
 			"vipcard-(.*)": "@/components/vipcard/$1.vue",
 			"dialog-(.*)": "@/components/dialog/$1.vue",
 			"select-(.*)": "@/components/select/$1.vue",
-			"home-(.*)": "@/pages/client/components/home/$1.vue",
-			"order-(.*)": "@/pages/client/components/order/$1.vue"
-
+			"home-(.*)": "@/pages/components/home/$1.vue"
 		}
-	}
+	}
 }

+ 0 - 138
pages/client/components/home/jqjs.vue

@@ -1,138 +0,0 @@
-<template>
-	<view>
-		<view class="pd16_15" style="margin-bottom: 80upx;">	
-			<view class="" style="">
-				<block v-for="(value,key) in datasa" :key="key">
-				<view @click="detail(value.id,0)" style="" class="flex alcenter mb16 showStyle">
-					<image mode="aspectFill" class="tuan-product-l" :src="value.img"></image>
-					<!-- <view class="btn-mini" style="position: absolute; top: 40upx; left: 280upx; border-radius: 10upx;font-size: 18upx;width: 60upx; height: 36upx;" :style="getBtnStyle">{{value.lxname}}</view> -->
-					<view class="tuan-product-r pl15">
-						<view class="ft16 ftw600 cl-main text-over1">{{value.name}}</view>
-						<view class="mt5">
-							<text class="ft14 cl-main text-over4" style="line-height: 50upx;">{{value.story}}</text>
-						</view>
-						<!-- <view class="mt16 flex space alcenter">
-							<view class="ft14 cl-notice">{{value.mname}}</view>
-							<view class="btn-vip-adviser ml15">继续观看</view>
-						</view> -->
-					</view>
-				</view>
-				</block>
-			</view>
-		</view>
-		<view class="home-main" style="height: 50upx;">
-			<!-- <com-copyright></com-copyright> -->
-		</view>
-		
-		<dialog-couponshareget @loginAct="showLoginCouponShareGet" v-if="showCouponShareGet" @closed="showCouponShareGet = false"></dialog-couponshareget>
-	</view>
-</template>
-
-<script>
-	export default{
-		props: ['datasa'],
-		data(){
-			return {
-				isLogin:false,
-				showBirthday:false,
-				showLogin:false,
-				showQrcode:false,
-				showCouponShareGet:false,
-			}
-		},
-
-		created(){
-			
-			// uni.setNavigationBarTitle({
-			//     title: '夜趣小视频'
-			// });
-			
-			// setTimeout(()=>{
-			// 	this.showCouponShareGet = true;	
-			// },1000);
-		},
-		methods:{
-			//'/pages/video/index?id='+value.id
-			detail(vid,mid){
-				uni.navigateTo({
-					url:'/pages/video/index?vid='+vid+'&mid='+mid
-				})
-			},
-			showLoginAct(){
-				this.showLogin = true;
-			},
-			showLoginCouponShareGet(){
-				this.showLogin = true;
-			},
-			loginYes(){
-				
-			}
-		}
-	}
-</script>
-
-<style>
-	.showStyle::before{
-		content:'';
-		position:'absolute';
-		top: 0;
-		right: 0;
-		bottom: 0;
-		left: 0;
-		background-color: rgba(31, 33, 41, 0.4);
-		z-index:-1;
-		backdrop-filter:blur(80px);
-	}
-	.showStyle{
-		position: relative; 
-	}
-	.home-header{
-		height: 304rpx;
-		width: 100%;
-		position: relative;
-		background: #363B4D;
-		border-radius: 0rpx 0rpx 48rpx 48rpx;
-	}
-	.home-main{
-		width: 100%;
-		position: relative;
-		margin-top: -156rpx;
-		padding: 0 30rpx;
-	}
-	.home-mendian{
-		width: 100%;
-		height: 84rpx;
-		background:rgba(255,255,255,0.1);
-		border-radius: 42rpx;
-	}
-
-	.tuan-product-l{
-		width: 200rpx;
-		height: 260rpx;
-		border-radius: 16rpx;
-		background: #F2F2F2;
-	}
-	.tuan-product-r{
-		width: calc(100% - 200rpx);
-		height:260rpx;
-	}
-	.btn-vip-adviser{
-		width: 200rpx;
-		height: 60rpx;
-		border-radius: 20rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		font-size: 28rpx;
-		/* font-weight: 600; */
-		background: #FF6600;
-		color:#FFFFFF;
-	}
-	.integral-mall-goods{
-		width: 100%;
-		height: 280rpx;
-		background: #F2F2F2;
-		border-radius: 16upx;
-	}
-	
-</style>

+ 0 - 90
pages/client/consume/consume.vue

@@ -1,90 +0,0 @@
-<template>
-	<view class="body pd16_15">
-		<view class="jilu-box" v-show="list.length > 0">
-			<view class="pb10 jilu-item" v-for="(item,key) in list" :key="key">
-				<view class="jilu-item-box">
-					<view class="jilu-items">
-						<view class="lines">
-							<text class="ft14" style="font-weight: bold;">{{item.video_name}}</text>
-							<text class="ft12 jilu-txt">{{item.series_name}}</text>
-							<text class="ft12 jilu-txt">{{item.created_at}}</text>
-						</view>
-					</view>
-					<view class="lines">
-						<text class="ft14 jilu-txt"
-							style="text-align: right;font-weight: bold;color:  #FF9800;">-{{item.charge_coin_cost}}K币</text>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="empty-box" v-if="list.length <  1 && show">
-			<image src="/static/img/orders/emty.png" mode=""></image>
-			<p class="ft14 line-1-txt">暂无消费记录</p>
-			<!-- <p class="ft14 line-2-txt mt10">小充一笔,看更多好剧吧</p>
-			<navigator url="/pages/client/pay/pay">
-				<view class="ft16 btn-box mt10"><text class="ft12 btn-cz">去充值</text> </view>
-			</navigator> -->
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		getUserConsumeRecord
-	} from "@/common/apis/my.js"
-	export default {
-		data() {
-			return {
-				page: 1,
-				hasMore: true,
-				list: [],
-				show: false
-			}
-		},
-		onLoad() {
-
-		},
-		onShow() {
-			this.page = 1;
-			this.hasMore = true;
-			this.getList();
-			uni.hideLoading();
-		},
-		onPullDownRefresh() {
-			this.page = 1;
-			this.list = [];
-			this.getList();
-			uni.stopPullDownRefresh();
-		},
-		onReachBottom() {
-			if (!this.hasMore) {
-				return false;
-			}
-			this.getList();
-		},
-		methods: {
-			async getList() {
-
-				if (this.page <= 1) {
-					this.show = false;
-				}
-				let res = await getUserConsumeRecord(this.page);
-				if (res) {
-					if (this.page >= res.last_page) {
-						this.hasMore = false;
-					} else {
-						this.page++;
-					}
-					res.data.forEach((item, index) => {
-						this.list.push(item);
-					})
-				}
-				this.show = true;
-			},
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	@import url("style/consume.css");
-</style>

+ 0 - 82
pages/client/consume/style/consume.css

@@ -1,82 +0,0 @@
-.body {
-	background-color: #ffffff;
-}
-
-.empty-box {
-	padding: 20px;
-	justify-content: center;
-	text-align: center;
-}
-
-.line-1-txt {
-	text-align: center;
-}
-
-.line-2-txt {
-	text-align: center;
-	color: #9e9e9e;
-}
- 
-.btn-cz {
-	width: 80px;
-	text-align: center;
-	color: #fff;
-	background-color: #FF9800;
-	text-align: center;
-	border-radius: 100px;
-	padding: 3px 15px;
-}
-
-.btn-box {
-	background-color: #fff;
-	width: 100%;
-	text-align: center;
-	display: block;
-	margin-top: 5px;
-}
-
-.jilu-box {
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	border-radius: 0px;
-	background: #FFFFFF;
-}
-
-.jilu-item {
-	margin-top: 10px;
-	display: flex;
-	flex-direction: column;
-	border-bottom: solid 1rpx #d4d4d4;
-}
-
-.jilu-item:first{
-	margin-top: 0px;
-}
-.jilu-item-box{
-	display: flex;
-	justify-content: space-between;
-}
-.jilu-txt {
-	color: #9e9e9e;
-	margin-top: 6rpx;
-}
-.lines{
-	display: flex;
-	flex-direction: column;
-	justify-content:  flex-end;
-
-}
-.jilu-items{
-	display: flex;
-	flex-direction: row;
-	justify-content: center;
-	
-}
-.pay-icon{
-	margin-top: 15px;
-	margin-right: 10px;
-	align-items: center;
-	width: 30px;
-	height: 30px;
-}

+ 0 - 363
pages/client/integral/index.vue

@@ -1,363 +0,0 @@
-<template>
-	<view class="pb30">
-		<view class="integral-mall-header">
-			<image class="bg" :src="statics.integralMallHeader"></image>
-			<view class="main pd24_20">
-				<view class="flex alcenter center">
-					<text class="ft14 cl-w">当前积分</text>
-					<text class="ml10 ft24 ftw600 cl-w">--</text>
-				</view>
-				<view class="mt16">
-					<swiper :indicator-dots="false" class="swiper-integral" :autoplay="true" :vertical="true" :interval="2000" :duration="400">
-						<swiper-item>
-							<view class="flex alcenter">
-								<text class="iconfont iconicon_notice ft14 cl-w"></text>
-								<text class="ml10 ft14 cl-w" style="width: calc(100% - 50rpx); overflow: hidden;">恭喜franckever成功兑换了洗剪吹加护理一次套餐</text>
-							</view>
-						</swiper-item>
-						<swiper-item>
-							<view class="flex alcenter">
-								<text class="iconfont iconicon_notice ft14 cl-w"></text>
-								<text class="ml10 ft14 cl-w" style="width: calc(100% - 50rpx); overflow: hidden;">恭喜111111成功兑换了洗剪吹加护理一次套餐</text>
-							</view>
-						</swiper-item>
-						<swiper-item>
-							<view class="flex alcenter">
-								<text class="iconfont iconicon_notice ft14 cl-w"></text>
-								<text class="ml10 ft14 cl-w" style="width: calc(100% - 50rpx); overflow: hidden;">恭喜22222成功兑换了洗剪吹加护理一次套餐</text>
-							</view>
-						</swiper-item>
-					</swiper>
-				</view>
-			</view>
-		</view>
-	
-		<view class="integral-mall-main plr15">
-			<view class="integal-mall-menu flex pt16 pb16">
-				<view class="col2 text-center" @click="linkTo" data-link="/pages/client/vipcard/integrallog">
-					<view>
-						<image style="width: 60rpx; height: 60rpx;" :src="statics.integralMallMenus[0]"></image>
-					</view>
-					<view class="ft14 ftw600 mt6">积分明细</view>
-				</view>
-				<view class="col2 text-center bd-left"  @click="linkTo"  data-link="/pages/client/integral/role">
-					<view>
-						<image style="width: 60rpx; height: 60rpx;" :src="statics.integralMallMenus[1]"></image>
-					</view>
-					<view class="ft14 ftw600 mt6">赚积分</view>
-				</view>
-			</view>
-			
-			<view class="mt24">
-				<view class="flex alcenter space">
-					<view class="flex alcenter">
-						<image style="width: 40rpx;height: 40rpx;" :src="statics.integralMallCat[0]"></image>
-						<text class="ft16 ftw600 cl-main ml15">特惠套餐</text>
-					</view>
-					<navigator url="/pages/client/integral/list?id=0">
-					<view class="ft14 cl-notice">更多</view>
-					</navigator>
-				</view>
-				
-				<view class="box pd16_15 flex alcenter mt16">
-					<navigator url="/pages/client/integral/tuan">
-						<image class="integral-tuan-l"></image>
-					</navigator>
-					<view class="pl15" style="width: calc(100% - 240rpx);">
-						<navigator url="/pages/client/integral/tuan">
-						<view class="ft14 cl-main ftw600 text-over">洗剪吹加护理一次套餐 会…</view>
-						<view class="flex alcenter space mt12 cl-notice">
-							<view class="flex alcenter">
-								<text class="ft12">门市价:</text>
-								<text class="ft12 text-line">¥88</text>
-							</view>
-							<view class="flex alcenter">
-								<text class="ft12">已兑</text>
-								<text class="ft12">868</text>
-							</view>
-						</view>
-						</navigator>
-						<view class="mt12 flex alend space">
-							<view class="flex alcenter">
-								<image :src="statics.integralImg01" style="width: 32rpx; height: 32rpx;"></image>
-								<text class="ft16 cl-orange ftw600">3000 + ¥10</text>
-							</view>
-							
-							<button  @click="exchange" :data-id="1" class="btn-mini" :style="getBtnStyle">兑换</button>
-							
-						</view>
-					</view>
-				</view>
-				
-				<view class="box pd16_15 flex alcenter mt16">
-					<image class="integral-tuan-l"></image>
-					<view class="pl15" style="width: calc(100% - 240rpx);">
-						<view class="ft14 cl-main ftw600 text-over">洗剪吹加护理一次套餐 会…</view>
-						<view class="flex alcenter space mt12 cl-notice">
-							<view class="flex alcenter">
-								<text class="ft12">门市价:</text>
-								<text class="ft12 text-line">¥88</text>
-							</view>
-							<view class="flex alcenter">
-								<text class="ft12">已兑</text>
-								<text class="ft12">868</text>
-							</view>
-						</view>
-						<view class="mt12 flex alend space">
-							<view class="flex alcenter">
-								<image :src="statics.integralImg01" style="width: 32rpx; height: 32rpx;"></image>
-								<text class="ft16 cl-orange ftw600">3000 + ¥10</text>
-							</view>
-							<button class="btn-mini" :style="getBtnStyle">兑换</button>
-						</view>
-					</view>
-				</view>
-							
-			</view>
-			
-			<view class="mt24">
-				<view class="flex alcenter space">
-					<view class="flex alcenter">
-						<image style="width: 40rpx;height: 40rpx;" :src="statics.integralMallCat[1]"></image>
-						<text class="ft16 ftw600 cl-main ml15">优惠券</text>
-					</view>
-					<navigator url="/pages/client/integral/list?id=1">
-					<view class="ft14 cl-notice">更多</view>
-					</navigator>
-				</view>
-				<view class="mt16 flex space ">
-					
-					<view class="integral-mall-coupon">
-						<view class="top">
-							<view class="text-center ft14 ftw600 cl-main">
-								洗剪吹优惠券
-							</view>
-							<view class="flex center mt12">
-								<view class="coupon-value">
-									<image :src="statics.couponNumBg"></image>
-									<view class="num cl-orange">
-										<text class="ft24 ftw600">¥</text>
-										<text class="ft24 ftw600 ml4">20</text>
-									</view>
-								</view>
-							</view>
-							<view class="text-center mt8 ft12 cl-notice">满50元可用</view>
-							<view class="flex alcenter center mt12">
-								<image :src="statics.integralImg01" style="width: 32rpx; height: 32rpx;"></image>
-								<text class="ft16 cl-orange ftw600">3000 + ¥10</text>
-							</view>
-						</view>
-						<view class="mt12 flex center">
-							<view class="btn-small" :data-id="1" @click="exchange" style="width:250rpx;" :style="getBtnStyle">兑换</view>
-						</view>
-						<view class="y-l"></view>
-						<view class="y-r"></view>
-					</view>
-					<view class="integral-mall-coupon">
-						<view class="top">
-							<view class="text-center ft14 ftw600 cl-main">
-								洗剪吹优惠券
-							</view>
-							<view class="flex center mt12">
-								<view class="coupon-value">
-									<image :src="statics.couponNumBg"></image>
-									<view class="num cl-orange">
-										<text class="ft24 ftw600">¥</text>
-										<text class="ft24 ftw600 ml4">20</text>
-									</view>
-								</view>
-							</view>
-							<view class="text-center mt8 ft12 cl-notice">满50元可用</view>
-							<view class="flex alcenter center mt12">
-								<image :src="statics.integralImg01" style="width: 32rpx; height: 32rpx;"></image>
-								<text class="ft16 cl-orange ftw600">3000 + ¥10</text>
-							</view>
-						</view>
-						<view class="mt12 flex center">
-							<view class="btn-small" :data-id="1" @click="exchange"  style="width: 250rpx;" :style="getBtnStyle">兑换</view>
-						</view>
-						<view class="y-l"></view>
-						<view class="y-r"></view>
-					</view>
-					
-				</view>
-				
-							
-			</view>
-			
-			<view class="mt24">
-				<view class="flex alcenter space">
-					<view class="flex alcenter">
-						<image style="width: 40rpx;height: 40rpx;" :src="statics.integralMallCat[2]"></image>
-						<text class="ft16 ftw600 cl-main ml15">兑换商品</text>
-					</view>
-					<navigator url="/pages/client/integral/list?id=2">
-					<view class="ft14 cl-notice">更多</view>
-					</navigator>
-				</view>
-				
-				<view class="mt16 flex space">
-					
-					<view class="box pd16_15" style="width: 330rpx;">
-						<navigator url="/pages/client/integral/goods">
-						<image class="integral-mall-goods"></image>
-						<view class="mt8 ft14 ftw600 text-over cl-main">专业去屑洗发水-么尚</view>
-						<view class="flex alcenter center mt12">
-							<image :src="statics.integralImg01" style="width: 32rpx; height: 32rpx;"></image>
-							<text class="ft16 cl-orange ftw600">3000 + ¥10</text>
-						</view>
-						</navigator>
-						<view class="mt12 flex center">
-							<view class="btn-small" @click="exchange" :data-id="1" style="width: 250rpx;" :style="getBtnStyle">兑换</view>
-						</view>
-					</view>
-					<view class="box pd16_15" style="width: 330rpx;">
-						<image class="integral-mall-goods"></image>
-						<view class="mt8 ft14 ftw600 text-over cl-main">专业去屑洗发水-么尚</view>
-						<view class="flex alcenter center mt12">
-							<image :src="statics.integralImg01" style="width: 32rpx; height: 32rpx;"></image>
-							<text class="ft16 cl-orange ftw600">3000 + ¥10</text>
-						</view>
-						<view class="mt12 flex center">
-							<view class="btn-small" style="width: 250rpx;" :style="getBtnStyle">兑换</view>
-						</view>
-					</view>
-				</view>
-				
-			</view>	
-		</view>
-		<dialog-login v-if="showLogin" @closed="showLogin = false" @loginYes="loginYes"></dialog-login>
-		<com-footer model="integral"></com-footer>
-	</view>
-</template>
-
-<script>
-	export default{
-		data(){
-			return {
-				isLogin:true,
-				showLogin:false,
-			}
-		},
-		onLoad(){
-			
-		},
-		methods:{
-			loginYes(){
-				
-			},
-			exchange(e){
-				if(this.isLogin == false){
-					this.showLogin = true;
-				}else{
-					let id = e.currentTarget.dataset.id;
-					uni.navigateTo({
-						url:'/pages/client/integral/exchange?id='+id
-					})
-				}
-			},
-			linkTo(e){
-				if(this.isLogin == false){
-					this.showLogin = true;
-				}else{
-					let link = e.currentTarget.dataset.link;
-					uni.navigateTo({
-						url:link
-					})
-				}
-			},
-		}
-	}
-</script>
-
-<style>
-	.integral-mall-header{
-		position: relative;
-		height: 320rpx;
-	}
-	.integral-mall-header .bg{
-		width: 100%;
-		height: 320rpx;
-	}
-	.integral-mall-header .main{
-		position: absolute;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 320rpx;
-	}
-	.swiper-integral{
-		height: 32rpx;
-		width: 100%;
-	}
-	.integral-mall-main{
-		position: relative;
-		margin-top: -104rpx;
-	}
-	.integal-mall-menu{
-		width: 100%;
-		height: 176rpx;
-		background: #FFFFFF;
-		border-radius: 48rpx;
-	}
-	.integral-tuan-l{
-		width: 240rpx;
-		height: 180rpx;
-		background: #f2f2f2;
-	}
-	
-	
-	.integral-mall-coupon{
-		height: 408rpx;
-		width: 330rpx;
-		background: #FFFFFF;
-		position: relative;
-		border-radius: 16rpx;
-		overflow: hidden;
-	}
-	.integral-mall-coupon  .top{
-		padding: 32rpx 40rpx 24rpx 40rpx;
-		border-bottom: 2rpx dashed #FEC675;
-	}
-	.integral-mall-coupon  .y-l,.integral-mall-coupon  .y-r{
-		width: 20rpx;
-		height: 20rpx;
-		border-radius: 10rpx;
-		background: #F5F6FA;
-		position: absolute;
-		z-index: 2;
-		top: 284rpx;
-	}
-	.integral-mall-coupon  .y-l{
-		left: -10rpx;
-	}
-	.integral-mall-coupon  .y-r{
-		right: -10rpx;
-	}
-	.integral-mall-coupon   .coupon-value{
-		width: 190rpx;
-		height: 64rpx;
-		position: relative;
-	}
-	.integral-mall-coupon  .coupon-value image{
-		width: 100%;
-		height: 64rpx;
-	}
-	.integral-mall-coupon  .coupon-value .num{
-		width: 100%;
-		height: 64rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		position: absolute;
-		left: 0;
-		top: 0;
-	}
-	
-	
-	.integral-mall-goods{
-		width: 100%;
-		height: 200rpx;
-		background: #F2F2F2;
-	}
-</style>

+ 0 - 136
pages/client/integral/role.vue

@@ -1,136 +0,0 @@
-<template>
-	<view>
-		<image class="integral-role-header" :src="statics.integralRoleHeader"></image>
-		<view class="integral-role-main pd16_15">
-			<view class="box pd16_15">
-				<view class="flex alcenter space pb16 bd-bottom mb16">
-					<view class="flex alcenter">
-						<image :src="statics.integralRoleImg[0]" style="width: 100rpx;height: 100rpx;"></image>
-						<view class="ml15">
-							<view class="ft14 ftw600">注册完善资料</view>
-							<view class="flex alcenter mt12">
-								<image :src="statics.integralImg01" style="width: 32rpx; height: 32rpx;"></image>
-								<view class="ft12 cl-notice ml5">奖励10积分</view>
-							</view>
-						</view>
-					</view>
-					<view class="btn-small" :style="getBtnDisStyle" style="width: 148rpx;">已赚到</view>
-				</view>
-				<view class="flex alcenter space pb16 bd-bottom mb16">
-					<view class="flex alcenter">
-						<image :src="statics.integralRoleImg[1]" style="width: 100rpx;height: 100rpx;"></image>
-						<view class="ml15">
-							<view class="ft14 ftw600">邀请好友注册</view>
-							<view class="flex alcenter mt12">
-								<image :src="statics.integralImg01" style="width: 32rpx; height: 32rpx;"></image>
-								<view class="ft12 cl-notice ml5">奖励10积分</view>
-							</view>
-						</view>
-					</view>
-					<button open-type="share" class="btn-small" :style="getBtnRoleStyle" style="width: 148rpx;">赚积分</button>
-				</view>
-				<view class="flex alcenter space pb16 bd-bottom mb16">
-					<view class="flex alcenter">
-						<image :src="statics.integralRoleImg[2]" style="width: 100rpx;height: 100rpx;"></image>
-						<view class="ml15">
-							<view class="ft14 ftw600">充值余额</view>
-							<view class="flex alcenter mt12">
-								<image :src="statics.integralImg01" style="width: 32rpx; height: 32rpx;"></image>
-								<view class="ft12 cl-notice ml5">奖励对应充值积分</view>
-							</view>
-						</view>
-					</view>
-					<navigator url="/pages/client/vipcard/recharge">
-					<view class="btn-small" :style="getBtnRoleStyle" style="width: 148rpx;">赚积分</view>
-					</navigator>
-				</view>
-				<view class="flex alcenter space pb16 bd-bottom mb16">
-					<view class="flex alcenter">
-						<image :src="statics.integralRoleImg[3]" style="width: 100rpx;height: 100rpx;"></image>
-						<view class="ml15">
-							<view class="ft14 ftw600">购买次卡</view>
-							<view class="flex alcenter mt12">
-								<image :src="statics.integralImg01" style="width: 32rpx; height: 32rpx;"></image>
-								<view class="ft12 cl-notice ml5">奖励对应次卡积分</view>
-							</view>
-						</view>
-					</view>
-					<navigator url="/pages/client/card/index">
-					<view class="btn-small" :style="getBtnRoleStyle" style="width: 148rpx;">赚积分</view>
-					</navigator>
-				</view>
-				<view class="flex alcenter space pb16 bd-bottom mb16">
-					<view class="flex alcenter">
-						<image :src="statics.integralRoleImg[4]" style="width: 100rpx;height: 100rpx;"></image>
-						<view class="ml15">
-							<view class="ft14 ftw600">购买特惠套餐</view>
-							<view class="flex alcenter mt12">
-								<image :src="statics.integralImg01" style="width: 32rpx; height: 32rpx;"></image>
-								<view class="ft12 cl-notice ml5">奖励对应消费积分</view>
-							</view>
-						</view>
-					</view>
-					<navigator url="/pages/client/tuan/index">
-					<view class="btn-small" :style="getBtnRoleStyle" style="width: 148rpx;">赚积分</view>
-					</navigator>
-				</view>
-				<view class="flex alcenter space pb16 ">
-					<view class="flex alcenter">
-						<image :src="statics.integralRoleImg[5]" style="width: 100rpx;height: 100rpx;"></image>
-						<view class="ml15">
-							<view class="ft14 ftw600">订单评价</view>
-							<view class="flex alcenter mt12">
-								<image :src="statics.integralImg01" style="width: 32rpx; height: 32rpx;"></image>
-								<view class="ft12 cl-notice ml5">奖励10积分</view>
-							</view>
-						</view>
-					</view>
-					<navigator url="/pages/client/order/index">
-					<view class="btn-small" :style="getBtnRoleStyle" style="width: 148rpx;">赚积分</view>
-					</navigator>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default{
-		data(){
-			return {
-				
-			}
-		},
-		computed:{
-			getBtnRoleStyle(){
-				let style = 'background: linear-gradient(135deg, #FFBB00 0%, #FF4D00 100%);color:#ffffff;';
-				return  style;
-			}
-		},
-		onLoad(){
-			
-		},
-		onShareAppMessage(e){
-			
-		},
-		onShareTimeline(e){
-			
-		},
-		methods:{
-			
-		}
-	}
-</script>
-
-<style>
-	.integral-role-header{
-		position: relative;
-		width: 100%;
-		height: 400rpx;
-	}
-	.integral-role-main{
-		position: relative;
-		width: 100%;
-		margin-top: -192rpx;
-	}
-</style>

+ 0 - 93
pages/client/member/birthday.vue

@@ -1,93 +0,0 @@
-<template>
-	<view class="pd16_15">
-		<view class="box pd16_15">
-			<view class="flex alcenter space">
-				<text class="ft14 cl-info2">本年度生日礼包</text>
-				<text class="ft14 ftw600" :style="{color:tempColor}">待领取</text>
-			</view>
-			
-			<view class="mt16">
-				<view class="box pd16_15">
-					<view class="flex alcenter space">
-						<text class="ft14 cl-main">专业洗剪吹3次</text>
-						<text class="ft12 cl-notice">x1</text>
-					</view>
-					<view class="mt8 ft12 cl-orange">价值¥188</view>
-				</view>
-				
-				<view class="box pd16_15 mt8">
-					<view class="flex alcenter space">
-						<text class="ft14 cl-main">专业洗剪吹3次</text>
-						<text class="ft12 cl-notice">x1</text>
-					</view>
-					<view class="mt8 ft12 cl-orange">价值¥188</view>
-				</view>
-				<view class="box pd16_15 mt8">
-					<view class="flex alcenter space">
-						<text class="ft14 cl-main">专业洗剪吹3次</text>
-						<text class="ft12 cl-notice">x1</text>
-					</view>
-					<view class="mt8 ft12 cl-orange">价值¥188</view>
-				</view>
-			</view>
-			
-			<view class="mt16">
-				<button class="btn-big" :style="getBtnStyle">确定领取</button>
-			</view>
-		</view>
-		
-		<view class="box pd16_15 mt16">
-			<view class="flex alcenter space">
-				<text class="ft14 cl-info2">2016-05-07</text>
-				<text class="ft14 ftw600 cl-main">已领取</text>
-			</view>
-			
-			<view class="mt16">
-				<view class="box pd16_15">
-					<view class="flex alcenter space">
-						<text class="ft14 cl-main">专业洗剪吹3次</text>
-						<text class="ft12 cl-notice">x1</text>
-					</view>
-					<view class="mt8 ft12 cl-orange">价值¥188</view>
-				</view>
-				
-				<view class="box pd16_15 mt8">
-					<view class="flex alcenter space">
-						<text class="ft14 cl-main">专业洗剪吹3次</text>
-						<text class="ft12 cl-notice">x1</text>
-					</view>
-					<view class="mt8 ft12 cl-orange">价值¥188</view>
-				</view>
-				<view class="box pd16_15 mt8">
-					<view class="flex alcenter space">
-						<text class="ft14 cl-main">专业洗剪吹3次</text>
-						<text class="ft12 cl-notice">x1</text>
-					</view>
-					<view class="mt8 ft12 cl-orange">价值¥188</view>
-				</view>
-			</view>
-		</view>
-		
-	</view>
-</template>
-
-<script>
-	export default{
-		
-		data(){
-			return {
-				
-			}
-		},
-		onLoad(){
-			
-		},
-		methods:{
-			
-		}
-	}
-</script>
-
-<style>
-	
-</style>

+ 0 - 86
pages/client/member/feedback.vue

@@ -1,86 +0,0 @@
-<template>
-	<view class="pd16_15">
-		
-		<view class="box pd16_15">
-			<view class="flex alcenter">
-				<text class="ft16 cl-main ftw600 ">问题类型</text>
-				<text class="ml10 ft12 cl-notice">(请至少选择一个标签分类)</text>
-			</view>
-			<view class="mt16 flex  wrap">
-				<view v-for="(item,index) in tags" :data-index="index" @click="changeTag" :class="{on:item.select == 1}" :style="{background:item.select == 1 ? tempColor : '#ffffff'}" class="tag-feedback">{{item.name}}</view>
-			</view>
-		</view>
-		
-		<view class="mt16  box pd16_15">
-			<textarea v-model="content" placeholder="我有问题要反馈:" placeholder-class="cl-notice" class="ft14" style="height: 300rpx; width: 100%;" :maxlength="300"></textarea>
-			<view class="mt12 text-right ft12 cl-notice">
-				{{content.length}}/300
-			</view>
-		</view>
-		<view class="mt16">
-			<button class="btn-big" :style="isSubmit ? getBtnStyle : getBtnDisStyle">立即提交</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default{
-		data(){
-			return {
-				content:'',
-				tags:[
-					{name:'充值',select:0},
-					{name:'积分',select:0},
-					{name:'无法观看',select:0},
-					{name:'代理',select:0},
-					{name:'邀请',select:0},
-					{name:'其他',select:0}
-				]
-			}
-		},
-		computed:{
-			isSubmit(){
-				if(this.content.length < 30){
-					return false;
-				}
-				let tag = false;
-				for(var a in this.tags){
-					if(this.tags[a].select == 1){
-						tag = true;
-						break;
-					}
-				}
-				return tag;
-			}
-		},
-		onLoad(){
-			
-		},
-		methods:{
-			changeTag(e){
-				let index = parseInt(e.currentTarget.dataset.index);
-				this.tags[index].select = this.tags[index].select == 1 ? 0 : 1;
-			}
-		}
-	}
-</script>
-
-<style>
-	.tag-feedback{
-		height: 64rpx;
-		border:2rpx solid #E4E6ED;
-		padding: 0 20rpx;
-		line-height: 60rpx;
-		color:#000000;
-		font-size: 28rpx;
-		border-radius: 32rpx;
-		margin-right: 20rpx;
-		margin-bottom: 20rpx;
-	}
-	.tag-feedback.on{
-		border:none;
-		color:#FFFFFF;
-		line-height: 64rpx;
-		padding: 0 22rpx;
-	}
-</style>

+ 0 - 252
pages/client/member/index.vue

@@ -1,252 +0,0 @@
-<template>
-	<view class="body">
-
-		<view class="pd24_20 flex alcenter space user-info">
-			<view class="flex alcenter">
-				<view class="member-face">
-					<image class="face" :src="statics.defaultFace"></image>
-					<!-- <image class="vip-level" :src="userinfo.group_id>1?statics.vipLevelImg[0]:''"></image> -->
-				</view>
-				<view class="ml15">
-					<view class="ft16 cl-main">{{userinfo.type}}</view>
-					<view class="mt12 ft12 cl-notice">ID:{{ userinfo.uid || '' }}
-						<image @click="copyId(userinfo.uid || '')" style="margin-left: 10px; width: 30rpx;height: 15px;"
-							src="../../../static/img/wode/cpoy.png">
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="pd24_20">
-
-			<div class="box pd16_15  creadit-box">
-				<div class="mt16 coin-box">
-					<div class="flex alcenter coin-item">
-						<label class="coin-text">{{userinfo.charge_coin|| 0}}</label>
-						<label class="coin-text">永久看币</label>
-					</div>
-					<label class="box-line">|</label>
-					<div class="flex alcenter coin-item">
-						<label class="coin-text">{{userinfo.free_coin|| 0}}</label>
-						<label class="coin-text">赠送看币</label>
-					</div>
-				</div>
-				<navigator  url="/pages/client/pay/pay">
-				<div class="mt16 box-cj"><label class="btn-cz">去充值</label></div>
-				</navigator>
-
-			</div>
-			<!-- <home-vipcard :userinfo="userinfo" @loginAct="showLoginAct" @qrcode="showQrcode = true"></home-vipcard> -->
-
-			<view class="flex wrap space mt16">
-				<view v-for="(item,index) in getMenus" :key="index" :class="index > 1 ? 'mt16': ''">
-					<view v-if="item.type == 'link'" :data-index="index" @click="memberLinkTo"
-						class="box pd16_15 flex alcenter" style="width: 320rpx;">
-						<image :src="item.icon" style="width: 64rpx;height: 64rpx;"></image>
-						<text class="ml15 ft14 ftw500 cl-main">{{item.name}}</text>
-					</view>
-					<view v-else style="width: 320rpx;" @click="showPopu(item.type)">
-						<button class="box pd16_15 flex alcenter" style="padding: 32rpx 30rpx; margin: 0;">
-							<image :src="item.icon" style="width: 64rpx;height: 64rpx;"></image>
-							<text class="ml15 ft14 ftw500 cl-main">{{item.name}}</text>
-						</button>
-					</view>
-				</view>
-			</view>
-			<com-copyright></com-copyright>
-			<!-- <image src=""></image> -->
-			<!-- <com-footer model="member"></com-footer> -->
-			<uni-popup ref="popup" type="center">
-				<image class="qrcode-img" :src="kefu.url"></image>
-			</uni-popup>
-			<dialog-birthday v-if="showBirthday" @closed="showBirthday = false"></dialog-birthday>
-
-
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		getKefu
-	} from "@/common/apis/common.js"
-	import {
-		getUserInfo
-	} from "@/common/apis/my.js"
-	export default {
-		data() {
-			return {
-				isLogin: false,
-				showLogin: false,
-				isBirthday: true,
-				showBirthday: false,
-				showQrcode: true,
-				avatar: '',
-				userinfo: {
-					type: "微信用户",
-				},
-				kefu: {
-					url: "",
-				},
-				vipLevel: 0,
-				iskq: 0,
-				uid: 0,
-				staticUrl: this.$config.staticUrl,
-				memberMenus: [
-					// {name:'观看历史',type:'link',model:'',link:'/pages/client/tuan/zjgk',icon:this.$config.staticUrl + 'vipcard_icon_my_card@2x.png',show:1},
-					// {name:'我的追剧',type:'link',model:'',link:'/pages/client/tuan/zjjl',icon:this.$config.staticUrl + 'vipcard_icon_my_order@2x.png',show:1},
-					{
-						name: '我的追剧',
-						type: 'link',
-						model: 'tab',
-						link: '/pages/client/zui',
-						icon: this.$config.zystaticUrl + '/static/img/wode/zhuij.png',
-						show: 1
-					},
-					{
-						name: '充值记录',
-						type: 'link',
-						model: '',
-						link: '/pages/client/orders/orders',
-						icon: this.$config.zystaticUrl + '/static/img/wode/wd-cz.png',
-						show: 1
-					},
-					{
-						name: '消费记录',
-						type: 'link',
-						model: '',
-						link: '/pages/client/consume/consume',
-						icon: this.$config.zystaticUrl + '/static/img/wode/xiaofei.png',
-						show: 1
-					},
-					{
-						name: '联系客服',
-						type: 'kefu',
-						model: '',
-						link: '/pages/client/tuan/wdxh',
-						icon: this.$config.zystaticUrl + '/static/img/wode/kefu.png',
-						show: 1
-					},
-
-					// {name:'收货地址',type:'git link',model:'',link:'/pages/client/member/address',icon:this.$config.staticUrl + 'vipcard_icon_my_address@2x.png',show:0},
-					// {name:'官方商城',type:'link',model:'',link:'/pages/client/shop',icon:this.$config.staticUrl + 'vipcard_icon_my_integral@2x.png',show:0},
-					// {name:'联系客服',type:'link',model:'',link:'/pages/client/vipcard/adviser',icon:this.$config.staticUrl + 'vipcard_icon_my_advise@2x.png',show:1},
-					// {name:'我的团队',type:'link',model:'',link:'/pages/client/mytuandui',icon:this.$config.staticUrl + 'vipcard_icon_my_invite@2x.png',show:3},
-					// {name:'分销订单',type:'link',model:'',link:'/pages/client/vipcard/fxlog',icon:this.$config.staticUrl + 'vipcard_icon_my_integral@2x.png',show:3},
-				],
-			}
-		},
-		computed: {
-			getMenus() {
-				let arr = new Array;
-				for (var a in this.memberMenus) {
-					if (this.memberMenus[a].show == 1 || (this.iskq == 1 && this.memberMenus[a].show == 3)) {
-						arr.push(this.memberMenus[a]);
-					}
-				}
-				return arr;
-			}
-		},
-		async onLoad() {
-			this.kefu = await getKefu();
-		},
-		async onShow() {
-			let info = await getUserInfo();
-			this.userinfo = info;
-		},
-		onShareAppMessage: function(res) {
-			// #ifdef MP-WEIXIN 
-			var href = '/pages/login/login?fxpid=' + this.uid
-			console.log(res)
-			let that = this;
-			const obj = {
-				title: "发送给好友",
-				imageUrl: '',
-				path: href,
-				success: function(res) {
-					console.log(res, "转发成功")
-				},
-				fail: function(res) {
-					wx.showToast({
-						title: '发送失败',
-						icon: 'none'
-					})
-				}
-			}
-			return obj
-			// #endif
-		},
-		onShareTimeline(e) {
-
-		},
-		methods: {
-			showPopu(type = "kefu") {
-				if (type == "kefu") {
-					this.$refs.popup.open('center')
-				}
-			},
-			opset() {
-				uni.navigateTo({
-					url: '/pages/set/set'
-				})
-			},
-			opsets() {
-				uni.navigateTo({
-					url: '/pages/set/grzl/grzl'
-				})
-			},
-			memberLinkTo(e) {
-				let index = parseInt(e.currentTarget.dataset.index);
-
-				if (this.getMenus[index].link != '') {
-					if (this.getMenus[index].model == 'integral') {
-						uni.redirectTo({
-							url: this.getMenus[index].link
-						})
-					} else if (this.getMenus[index].model == 'tab') {
-						uni.switchTab({
-							url: this.getMenus[index].link
-						})
-					} else {
-						uni.navigateTo({
-							url: this.getMenus[index].link
-						})
-					}
-				}
-			},
-			birthdayAct() {
-				if (this.isBirthday) {
-					uni.navigateTo({
-						url: '/pages/client/member/birthday'
-					})
-				} else {
-					uni.navigateTo({
-						url: '/pages/client/member/info'
-					})
-				}
-			},
-			copyId(uid) {
-				console.log('uid', uid);
-				uni.setClipboardData({
-					data: uid+"",
-					success: () => {
-						uni.showToast({
-							title: '复制成功',
-							icon: "none"
-						})
-					},
-					fail: function(err) {
-						uni.showToast({
-							title: '复制失败',
-							duration: 2000,
-							icon: 'none'
-						});
-					}
-				})
-			}
-		}
-	}
-</script>
-
-<style>
-	@import url("style/index.css");
-</style>

+ 0 - 66
pages/client/member/info.vue

@@ -1,66 +0,0 @@
-<template>
-	<view class="pd16_15">
-		
-		<view class="box" style="padding: 64rpx 30rpx 30rpx 30rpx;">
-			<view class="flex center">
-				<image class="member-info-face" :src="statics.defaultFace"></image>
-			</view>
-			<view class="text-center ft16 ftw600 mt16">董小姐</view>
-			
-			<view class="mt24  box-form-item plr15 flex alcenter space">
-				<text class="ft14">生日</text>
-				<select-birthday v-model="birthday"></select-birthday>
-			</view>
-			<view class="mt16 flex alcenter">
-				<image style="width: 64rpx; height: 64rpx;" :src="statics.birthdayGift"></image>
-				<view  class="ft12 pl15 lh20 cl-main" style="width: calc(100% - 64rpx);">
-					填写生日后,符合要求的VIP会员将于每年生日当月<text class="ft12" :style="{color:tempColor}">获赠生日礼包~</text>
-				</view>
-			</view>
-		</view>
-		
-		<view class="mt24">
-			<button class="btn-big" :style="isSelect == false ? getBtnDisStyle : getBtnStyle">确定保存</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default{
-		data(){
-			return {
-				birthday:[],
-			}
-		},
-		computed:{
-			isSelect(){
-				let select = false;
-				if(this.birthday.length > 0) {
-					select = true;
-				}
-				return select;
-			}
-		},
-		onLoad(){
-			
-		},
-		methods:{
-			
-		}
-	}
-</script>
-
-<style>
-	.member-info-face{
-		width: 160rpx;
-		height: 160rpx;
-		border-radius: 80rpx;
-	}
-	.box-form-item{
-		height: 100rpx;
-		width: 100%;
-		border-radius: 50rpx;
-		background: #F5F6FA;
-		color:#5C5E66;
-	}
-</style>

+ 0 - 381
pages/client/member/qrshare.vue

@@ -1,381 +0,0 @@
-<template>
-	<view>
-		<view class="canvas">
-			<canvas class="canvasa" @longtap="saveCans(1)" :style="{ width: cansWidth + 'px', height: cansHeight + 'px' }" canvas-id="firstCanvas"></canvas>
-		</view>
-		<view class="imglist">
-			<view :style="[{ width:widths+'upx'}]">
-				<block v-for="(swiperLists,index) in swiperList" :key="index">
-					<image style="padding: 4upx;" @click="selseimg(swiperLists.posterImg)" :src="swiperLists.posterImg" mode="aspectFill"></image>
-				</block>
-			</view>
-		</view>
-		<view class="bottom">
-			<!-- #ifdef H5 -->
-			<view class="bottom3" style="width: 80%; text-align: center;" @click="saveCans(2)">一键分享</view>
-			<!-- #endif -->
-			<!-- #ifdef APP-PLUS -->
-			<view class="bottom3" style="width: 49%; text-align: center;" @click="saveCans(2)">一键分享</view>
-			<view class="bottom1" style="width: 49%; text-align: center;" @click="saveCans(1)">保存海报</view>
-			<!-- #endif -->
-			
-			<!-- <view class="bottom2" style="width: 32%;" @click="upbj()">上传背景</view> -->
-		</view>
-		<uni-popup ref="sharepopup" type="bottom">
-		    <share-btn :sharedataTemp="sharedata"></share-btn>
-		</uni-popup>
-		<avatar @upload="doUpload" @avtinit="doBefore" quality="1" ref="avatar"></avatar>
-	</view>
-</template>
-<script>
-	import avatar from "@/components/yq-avatar/yq-avatar.vue";
-	import  QR   from '@/static/js/wxqrcode.js';
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-	import shareBtn from '@/components/share-btn/share-btn.vue';
-	import { mapMutations} from 'vuex';
-	var that
-	export default {
-		components: {
-			avatar,
-			uniPopup,
-			shareBtn
-		},
-		data() {
-			return {
-				sharedata: {
-					type: 2,
-					strShareUrl: "",
-					strShareTitle: "分享标题",
-					strShareSummary: "分享总结",
-					strShareImageUrl: ""
-				},
-				uid:'',
-				avatar:'',
-				qrcodeImg:'',
-				userinfo:[],
-				cansWidth: 280, //海报宽度
-				cansHeight: 500, //海报高度
-				widths: "", //图片列表动态宽度
-				imgsrc: "", //保存图片的路径
-				userdata: {}, //个人数据
-				swiperList: [] //海报数组
-			};
-		},
-		onLoad: function() {
-			this.show = true;
-			this.userinfo=uni.getStorageSync("userinfo");
-			this.avatar=uni.getStorageSync("avatar")
-			var qrurl=this.configs.webUrl+'/h5/#/pages/login/reg?uid='+this.userinfo.id
-			let img = QR.createQrCodeImg(qrurl, {  
-			     size: 300//二维码大小  
-			})
-			this.qrcodeImg = img;
-			this.sharedata.strShareUrl=qrurl
-			console.log(this.qrcodeImg)
-			that = this
-			that.huizhihaibao() //请求海报数据
-		},
-		methods: {
-			upbj(){
-				console.log(111)
-				var index=0;
-				var that = this
-				this.$refs.avatar.fChooseImg(index,{
-					selWidth: '500upx', selHeight: '893upx', 
-					expWidth: '800upx', expHeight: '1429upx',
-					inner: index ? 'true' : 'false',
-					canRotate:false,
-					quality:1,
-				});
-			},
-
-			doUpload(rsp) {
-				//console.log(rsp);
-				this.selseimg(rsp.path)
-			},
-			doBefore() {
-				console.log('doBefore');
-			},
-			huizhihaibao() {
-				var that = this
-				//数据请求结束
-				uni.showLoading({
-					title: '加载中'
-				});
-				that.userdata = {
-					img: "",
-					text: "测试"
-				}
-				if(this.userinfo.config.fxhb){
-					var swiperList = this.userinfo.config.fxhb
-					let goodsData = [];
-					swiperList.forEach(item=>{
-						if(item.indexOf("http") != -1){
-							item=item
-						}else{
-							item=that.configs.webUrl+item
-						}
-						goodsData.push({
-							posterImg: item 
-						})
-					})
-					that.swiperList=goodsData
-				}else{
-					that.swiperList = []
-				}
-				uni.hideLoading();
-				//数据请求结束
-				that.selseimg(that.swiperList[0].posterImg)
-			},
-			selseimg(e) { //绘制海报
-				if (that.userinfo.nickname > 6) { //昵称太长加省略号
-					that.userinfo.nickname = that.userinfo.nickname.slice(0, 6) + "..."
-				}
-				uni.showLoading({
-					title: '生成海报中'
-				});
-				if(e.indexOf("http") != -1){
-					// #ifdef H5
-					that.selseimging(e)
-					// #endif
-					// #ifdef APP-PLUS || MP-WEIXIN
-					uni.downloadFile({
-						url: e,
-						success: function(res) {
-							if(res.tempFilePath){
-								that.selseimging(res.tempFilePath)
-							}
-						}
-					})
-					// #endif
-				}else{
-					that.selseimging(e)
-				}
-			},
-			selseimging(hbbj){
-				const context = uni.createCanvasContext('firstCanvas')
-				context.drawImage(hbbj, 0, 0, 280, 500) //海报背景
-				var yd=20;//控制y的距离
-				setTimeout(function() { //定时器,海报方法不能立即执行,等页面渲染完成
-					
-					context.shadowColor = '#999999';
-					context.shadowOffsetX = 0;// 设置阴影的横向偏移量
-					context.shadowOffsetY = 0;
-					context.shadowBlur = 5;// 设置模糊等级
-					context.drawImage(that.$config.staticUrl+'zw.png',10, 350+yd, 260, 110) //个人信息背景
-					context.fill()
-					context.save()
-					
-					context.drawImage(that.qrcodeImg, 182, 374+yd, 75, 75) //二维码图片 
-					context.setFillStyle('#333333')
-					context.setFontSize(14)
-					context.fillText('我的邀请码:'+that.userinfo.id, 20, 373+yd)
-					context.fill()
-					
-					context.setFillStyle('#333333')
-					context.setFontSize(12)
-					context.fillText('扫一扫二维码', 183, 368+yd)
-					context.fill()
-					
-					
-					context.setFillStyle('#333333')
-					context.setFontSize(14)
-					context.fillText(that.userinfo.nickname, 80, 405+yd) //昵称
-					context.fill()
-				
-					context.setFillStyle('#666666')
-					context.setFontSize(10)
-					context.fillText('邀请你加入'+that.userinfo.config.name, 80, 425+yd)
-					context.fillText('手机就能赚钱!', 80, 445+yd)
-					context.fill()
-				
-					context.save()
-					context.beginPath()
-					context.arc(44, 420+yd, 25, 0, 2 * Math.PI)
-					context.clip()
-					context.drawImage(that.avatar, 17, 392+yd, 55, 55) //头像
-					context.restore()
-					context.draw()
-				
-					uni.hideLoading();
-				}, 1000);
-			},
-			saveCans(e) { //保存海报
-				console.log(222)
-				if (e == 2) {
-					that.$refs.sharepopup.open();
-				}else{
-					uni.showLoading({
-						title: '保存海报中'
-					});
-
-					console.log('保存');
-					let tempRatio = 1;
-
-					// #ifdef H5 || APP-PLUS
-					tempRatio = 1;
-					// #endif
-
-					uni.canvasToTempFilePath({
-						x: 0,
-						y: 0,
-						width: that.cansWidth * tempRatio* 4,
-						height: that.cansHeight * tempRatio* 4,
-						destWidth: that.cansWidth * tempRatio * 4,
-						destHeight: that.cansHeight * tempRatio * 4,
-						canvasId: 'firstCanvas',
-						success: function(res) {
-							uni.hideLoading()
-							uni.saveImageToPhotosAlbum({
-								filePath: res.tempFilePath,
-								success: function(red) {
-									uni.showToast({
-										title: '保存相册成功'
-									})
-									that.imgsrc = res.tempFilePath
-									that.sharedata.strShareImageUrl= res.tempFilePath
-									
-								},
-								fail(res) {
-									if (res.errMsg == "saveImageToPhotosAlbum:fail auth deny") {
-										uni.showModal({
-											title: '您需要授权相册权限',
-											success(res) {
-												if (res.confirm) {
-													uni.openSetting({
-														success(res) {
-
-														},
-														fail(res) {
-															console.log(res)
-														}
-													})
-												}
-											}
-										})
-									}
-								}
-							});
-						},
-						fail(res) {
-							uni.hideLoading()
-						}
-					}, this)
-				}
-			},
-			
-
-		}
-	}
-</script>
-
-<style>
-	page {
-		background-color: #F1F1F1;
-	}
-
-	.pageHeader {
-		height: var(--status-bar-height);
-		background-color: #FFFFFF;
-	}
-
-	.box-header {
-		position: fixed;
-		top: 0upx;
-		width: 100%;
-		z-index: 100;
-	}
-
-	.top-box {
-		height: 100upx;
-		width: 100%;
-	}
-
-	.canvas {
-		display: flex;
-		justify-content: center;
-		margin-top: 20upx;
-		border-radius: 16upx;
-	}
-
-	.bottom {
-		padding: 20upx 0;
-		width: 100%;
-		display: flex;
-		justify-content: space-around;
-		position: fixed;
-		bottom: 0;
-		background-color: #ffffff;
-	}
-
-	.bottom1 {
-		padding: 20upx 40upx;
-		background: #FF8A00;
-		border-radius: 44upx;
-		font-size: 30upx;
-		color: #FFFFFF;
-	}
-
-	.bottom2 {
-		padding: 20upx 40upx;
-		background: #FF5256;
-		border-radius: 44upx;
-		font-size: 30upx;
-		color: #FFFFFF;
-	}
-	.bottom3 {
-		padding: 20upx 40upx;
-		background: #5E40FF;
-		border-radius: 44upx;
-		font-size: 30upx;
-		color: #FFFFFF;
-	}
-	.imglist {
-		width: 100%;
-		padding: 20upx 0;
-		overflow: auto;
-		/* background-color: #ffffff; */
-	}
-
-	.imglist view {
-		display: flex;
-		justify-content: space-around;
-	}
-
-	.imglist image {
-		width: 200upx;
-		height: 200upx;
-		
-	}
-
-	.tishi-box {
-		display: flex;
-		align-items: center;
-		justify-content: space-around;
-		background-color: #FFFFFF;
-		position: fixed;
-		bottom: 0;
-		width: 100%;
-		height: 260upx;
-		background: #FFFFFF;
-		border-radius: 20upx 20upx 0upx 0upx;
-		text-align: center;
-	}
-
-	.tishi-box view {
-		font-size: 28upx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #333333;
-		line-height: 50upx;
-	}
-
-	.tishi-box image {
-		width: 100upx;
-		height: 100upx;
-		border-radius: 50%;
-	}
-	.canvasa{
-		border-radius: 10upx;
-	}
-</style>

+ 0 - 115
pages/client/member/style/index.css

@@ -1,115 +0,0 @@
-	.body {
-		background-color: #FFFFFF;
-	}
-	.coin-text{
-		font-size: 1rem;
-	}
-	.box-line{
-		font-size: 1px;
-		height: 26px;
-		margin-top: 13px;
-		line-height: 100%;
-		background-color: #000000;
-	}
-	.btn-cz{
-		background-color: #ffc107cc;
-		font-size: 16px;
-		line-height: 24px;
-		color: #fff;
-		padding: 10rpx 30rpx;
-		border-radius: 15rpx;
-		height: 24px;
-		min-width:50px;
-		display: block;
-		text-align: center;
-	}
-	.box-cj{
-		float: right;
-		flex-grow:1;
-	}
-	.qrcode-img{
-		height: 25rem;
-	}
-	.user-info{
-		background-color: #9e9e9e3d;
-	}
-	.creadit-box{
-		display: flex;
-		flex-direction: row;
-		flex-wrap: nowrap;
-	}
-	.coin-item{
-		display: flex;
-		flex-direction: column;
-		flex-grow:2;
-	}
-	.coin-box{
-		display: flex;
-		flex-direction: row;
-		color: #000000;
-		flex-grow:4;
-	}
-	.opsetads {
-		background: #FFFFFF;
-		color: #000000;
-		width: 70upx;
-		line-height: 70upx;
-		height: 70upx;
-		text-align: center;
-		border-radius: 100%;
-		animation: rotate 10s linear infinite;
-	}
-
-	@keyframes rotate {
-		0% {
-			transform: rotate(0deg) skew(0deg) scale(1);
-			-ms-transform: rotate(0deg) skew(0deg) scale(1);
-			/* IE 9 */
-			-moz-transform: rotate(0deg) skew(0deg) scale(1);
-			/* Firefox */
-			-webkit-transform: rotate(0deg) skew(0deg) scale(1);
-			/* Safari  Chrome */
-			-o-transform: rotate(0deg) skew(0deg) scale(1);
-		}
-
-		100% {
-			transform: rotate(360deg) skew(0deg) scale(1);
-			-ms-transform: rotate(360deg) skew(0deg) scale(1);
-			/* IE 9 */
-			-moz-transform: rotate(360deg) skew(0deg) scale(1);
-			/* Firefox */
-			-webkit-transform: rotate(360deg) skew(0deg) scale(1);
-			/* Safari  Chrome */
-			-o-transform: rotate(360deg) skew(0deg) scale(1);
-		}
-	}
-
-	.member-face {
-		position: relative;
-	}
-
-	.member-face .vip-level {
-		height: 48rpx;
-		width: 48rpx;
-		position: absolute;
-		left: calc(50% - 24rpx);
-		top: -30rpx;
-	}
-
-	.member-face .face {
-		width: 160rpx;
-		height: 160rpx;
-		border: 6rpx solid #FFFFFF;
-		background: #FFFFFF;
-		border-radius: 100rpx;
-		box-shadow: 0rpx 24rpx 48rpx 0rpx rgba(197, 202, 219, 0.3);
-	}
-
-	.miniapp-icon {
-		width: 48rpx;
-		height: 48rpx;
-		border-radius: 24rpx;
-		background: #F2F2F2;
-	}
-
-	.creadit-box {}

+ 0 - 218
pages/client/member/tx.vue

@@ -1,218 +0,0 @@
-<template>
-	<view>
-		<view class="czmain">
-			<view class="cztop">
-				<view class="czxx">提现方式:{{type}}</view>
-				<view class="czyebox">
-					<view style="font-size: 36upx; text-align: center;">当前余额 ¥{{urerdata.money}}</view>
-					<view>提现金额</view>
-					<input type="digit" focus class="czye" v-model="money" placeholder="请输入提现金额" />
-					<view>提现姓名</view>
-					<input type="text" class="czye1" v-model="name" placeholder="请输入提现姓名" />
-					<view>提现账号</view>
-					<input type="text" class="czye1" v-model="cord" placeholder="请输入提现账号" />
-					<view style="margin-top: 10upx; font-size: 28upx; color: #ff0000;">备注:{{configsa.txbz}}</view>
-					<view class="uni-btn-v uni-common-mt">
-						<button  class="onstep" @click="butsub()">提交</button>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-    export default {
-        data() {
-            return {
-                loading: false,
-                money: '',
-				name: '',
-				cord:'',
-				type:'支付宝',
-				dbled:true,
-				urerdata:[],
-				configsa:[],
-                providerList: []
-            }
-        },
-        onLoad: function() {
-			
-        },
-		onShow: function() {
-			this.ongrzlTap()
-		},
-        methods: {
-			async butsub(){
-				var thia=this
-				let data = {
-					'token':uni.getStorageSync("userinfo").token,
-					'money':this.money,
-					'name':this.name,
-					'cord':this.cord,
-					'type':this.type,
-					};
-				let [err,res] =await this.$httpas.get('/api/user/tx',data);
-				if (!this.$httpas.errorCheck(err,res)) return;
-				uni.showModal({
-					title: '提示',
-					content: res.data.msg,
-					showCancel: false,
-					success: ress => {
-						if(res.data.code == 1){
-							thia.money=''
-							thia.name=''
-							thia.cord=''
-						}
-						thia.ongrzlTap()
-					}
-				});
-			},
-			async ongrzlTap(){
-				let data = {};
-				data.token = uni.getStorageSync("userinfo").token;
-				data.uid = uni.getStorageSync("userinfo").id;
-				uni.request({
-					url: this.configs.webUrl+'/api/user/index',
-					data: data,
-					success: res =>{
-						if(res.data.code==1){
-							this.urerdata=res.data.data
-							if(res.data.data.config){
-								this.configsa=res.data.data.config
-							}
-						}else{
-							uni.showToast({ title: res.data.msg,icon:"none" });
-						}
-					},
-					fail: (data, code) => {
-						//console.log('fail' + JSON.stringify(data));
-					}
-				});		
-			},
-			// 监听原生标题导航按钮点击事件
-			onNavigationBarButtonTap(e) {
-				const index = e.index;
-					uni.navigateTo({
-						url:"/pages/client/member/txjl"
-					})
-					
-			}
-        }
-    }
-</script>
-
-<style>
-	page{
-		background: #f9f9f9;
-	}
-	.cztop{
-		position: relative;
-	}
-	.czxx{
-		top: 10px;
-		font-size: 32upx;
-		margin-left: 50upx;
-		color: #3a3a3a;
-		font-family: iconfont;
-		line-height: 80upx;
-	}
-	.czyebox{
-		padding: 20upx 50upx;
-	}
-	.czyebox>view:first-child{
-		font-size: 32upx;
-		color: #3a3a3a;
-		line-height: 50px;
-	}
-	.czye{
-		width: 100%;
-		border-bottom: 1upx solid #e5e5e5;
-		font-size: 36upx;
-		font-weight: bold;
-		color: #3a3a3a;
-		position: relative;
-		padding-left: 20px;
-		height: 40px;
-		line-height: 40px;
-	}
-	.czye:after{
-		position: absolute;
-		top: -2px;
-		left: 0;
-		content: '¥';
-		color: #3a3a3a;
-		font-size: 18px;
-	}
-	.czye1{
-		width: 100%;
-		border-bottom: 1upx solid #e5e5e5;
-		font-size: 32upx;
-		color: #3a3a3a;
-		position: relative;
-		height: 40px;
-		line-height: 40px;
-	}
-	.onstep{
-		margin-top: 40upx;
-		background: #007AFF!important;
-	}
-	.czmain{
-		width: 94%;
-		margin: 10px auto;
-		overflow: hidden;
-		background: #fff;
-		border-radius: 16upx;
-		padding-bottom: 20px;
-		-webkit-box-shadow: 0 0 20px rgba(0, 0, 0, 0.08);
-		box-shadow: 0 0 20px rgba(0, 0, 0, 0.08);
-	}
-	.icon-alipay{
-		background: #fbfbfb;
-		padding-bottom: 20upx;
-	}
-	.icon-alipay>view:first-child{
-		margin-top: 10px;
-		font-size: 32upx;
-		padding-left: 0upx;
-		color: #3a3a3a;
-		font-family: iconfont;
-		position: relative;
-		line-height: 30px;
-	}
-	.icon-alipay:before {
-	    content: "\e636";
-		margin-top: 25upx;
-		margin-right: 10upx;
-		color: #007AFF;
-	}
-	.cztype>view:first-child:after{
-		position: absolute;
-		content:"\e66c";
-		top: 0;
-		left: 0;
-		font-size: 26px;
-		color: #05c160;
-	}
-
-
- .rmbLogo {
-        font-size: 40upx;
-    }
-
-    button {
-        background-color: #007aff;
-        color: #ffffff;
-    }
-
-    .uni-h1.uni-center {
-        display: flex;
-        flex-direction: row;
-        justify-content: center;
-        align-items: flex-end;
-    }
-
-    .ipaPayBtn {
-        margin-top: 30upx;
-    }
-</style>

+ 0 - 112
pages/client/member/txjl.vue

@@ -1,112 +0,0 @@
-<template>
-	<view class="pd16_15">
-		<block v-for="(item,index) in listData" :key="index">
-		<view class="box pd16_15 alcenter space" style="margin-bottom: 30upx;">
-			<view class="flex" style="width: 100%;">
-				<view style="width: 60%;">
-					<view class="ft14 cl-main">提现姓名:{{item.name}} </view>
-					<view class="mt8 ft12 cl-notice">帐号:{{item.cord}}</view>
-					<view class="mt8">
-						<text class="ft12 cl-notice">手续费:</text>
-						<text class="ft12 cl-main">{{item.sxf}}</text>
-						<text class="ft12 cl-main" style="float: right;">{{item.createtime}}</text>
-					</view> 
-				</view>
-				<view class="uni-triplex-right" style="width: 40%; text-align: right; line-height: 40upx;">
-					<text class="uni-h5" style="width: 100%; display: block; font-size: 24upx;">{{item.type}}</text>
-					<text class="uni-h5" style="font-size: 24upx; color: #ff0000; width: 100%; display: block;">¥{{item.money}}</text>
-					<text class="uni-h5" style="width: 100%; display: block; font-size: 24upx;" v-if="item.iscl==1">未审核</text>
-					<text class="uni-h5" style="width: 100%; display: block;  font-size: 24upx;" v-if="item.iscl==2">已审核</text>
-					<text class="uni-h5" style="width: 100%; display: block;font-size: 24upx;" v-if="item.iscl==3">已驳回</text>
-				</view>
-			</view>
-			<view v-if="item.memoj" class="mt8" style="width: 100%;">
-				<text class="ft12 cl-notice">备注:</text>
-				<text class="ft12 cl-main">{{item.memoj}}</text>
-			</view>
-		</view>
-		</block>	
-		<uni-load-more :status="status" :content-text="contentText" />
-	</view>
-</template>
-<script>
-	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-	  export default {
-		  components: {
-		  	uniLoadMore
-		  },
-	    data() {
-	        return {
-	            listData: [],
-				last_id: 0,
-				reload: true,
-				status: 'more',
-				contentText: {
-					contentdown: '上拉加载更多',
-					contentrefresh: '加载中',
-					contentnomore: '没有数据了'
-				}
-	        }
-	    },
-	    onReachBottom() {
-	    	this.status = 'more';
-	    	this.getList();
-	    },
-	    onLoad() {
-	    	this.getList();
-	    },
-		methods: {
-			getList() {
-				let data = {
-					//column: 'id,post_id,title,author_name,cover,published_at' //需要的字段名
-				};
-				var limit=10;
-				if (this.last_id>0) {
-					//说明已有数据,目前处于上拉加载
-					this.status = 'loading';
-					data.offset = this.last_id*limit;
-					data._ = new Date().getTime() + '';
-				}
-				data.limit=limit		
-				data.token = uni.getStorageSync("userinfo").token;
-				uni.request({
-					url: this.configs.webUrl+'/api/user/txinfo',
-					data: data,
-					success: data => {
-						console.log(data.data)
-						if (data.data.total>0) {
-							let list = data.data.rows;
-							this.listData = this.reload ? list : this.listData.concat(list);
-							this.reload = false;
-							this.last_id = this.last_id+1;
-							if(data.data.total<this.last_id*limit){
-								this.status = '';
-							}
-						}else{
-							this.contentText.contentdown='没有数据'
-						}
-					},
-					fail: (data, code) => {
-						//console.log('fail' + JSON.stringify(data));
-					}
-				});
-			},
-		}
-	}
-</script>
-
-<style>
-	.uni-title{
-		color: #444;
-		font-size: 32upx;
-		font-weight: normal;
-	}
-	.uni-text{
-		font-size: 28upx;
-	}
-	.uni-h5{
-		font-size: 32upx;
-		color: #3a3a3a;
-		font-weight:500;
-	}
-</style>

+ 0 - 88
pages/client/orders/orders.vue

@@ -1,88 +0,0 @@
-<template>
-	<view class="body pd16_15">
-		<view class="jilu-box" v-show="list.length > 0" >
-			<view class="pb10 jilu-item"  v-for="(item,key) in list" :key="key">
-				<view class="jilu-item-box">
-					<text class="ft12 jilu-txt">订单号:{{item.trade_no}}</text>
-					<text class="ft12 jilu-txt">{{item.status}}</text>
-				</view>
-				<view class="jilu-item-box" >
-					<view class="jilu-items">
-						<image class="pay-icon" src="/static/img/orders/cj-icon.png" mode=""></image>
-						<view class="lines">
-							<text class="ft14" style="font-weight: bold;">{{item.pay_name}}</text>
-							<text class="ft12 jilu-txt">时间:{{item.pay_end_at}}</text>
-						</view>
-					</view>
-					<view class="lines">
-						<text class="ft14 jilu-txt" style="text-align: right;font-weight: bold;color:  #FF9800;">{{item.pay_result}}K币</text>
-						<text class="ft12 jilu-txt">实付金额:&yen;20.00</text>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="empty-box" v-if="list.length <  1 && show">
-			<image src="/static/img/orders/emty.png" mode=""></image>
-			<p class="ft14 line-1-txt">暂无充值记录</p>
-			<p class="ft14 line-2-txt">小充一笔,看更多好剧吧</p>
-			<navigator url="/pages/client/pay/pay">
-				<view class="ft16 btn-box"><text class="ft12 btn-cz">去充值</text> </view>
-			</navigator>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {getOrderList} from "@/common/apis/recharge.js"
-	export default {
-		data() {
-			return {
-				page: 1,
-				hasMore:true,
-				list: [],
-				show:false
-			}
-		},onLoad() {
-			
-		},onShow() {
-			this.page = 1;
-			this.hasMore = true;
-			this.getList();
-			uni.hideLoading();
-		},onPullDownRefresh() {
-			this.page = 1;
-			this.list = [];
-			this.getList();
-			uni.stopPullDownRefresh();
-		},onReachBottom() {
-			if(!this.hasMore){
-				return false;
-			}
-			this.getList();
-		},
-		methods: {
-			async getList() {
-				
-				if(this.page<=1 ){
-					this.show = false;
-				}
-				let res = await getOrderList(this.page);
-				if(res){
-					if(this.page >= res.last_page){
-						this.hasMore =  false;
-					}else{
-						this.page++;
-					}
-					res.data.forEach((item, index) => {
-						this.list.push(item);
-					})
-				}
-				this.show =true;
-			},
-		}
-	}
-</script>
-
-<style>
-	@import url("style/orders.css");
-</style>

+ 0 - 82
pages/client/orders/style/orders.css

@@ -1,82 +0,0 @@
-.body {
-	background-color: #ffffff;
-}
-
-.empty-box {
-	padding: 20px;
-	justify-content: center;
-	text-align: center;
-}
-
-.line-1-txt {
-	text-align: center;
-}
-
-.line-2-txt {
-	text-align: center;
-	color: #9e9e9e;
-}
-
-.btn-cz {
-	width: 80px;
-	text-align: center;
-	color: #fff;
-	background-color: #FF9800;
-	text-align: center;
-	border-radius: 100px;
-	padding: 3px 15px;
-}
-
-.btn-box {
-	background-color: #fff;
-	width: 100%;
-	text-align: center;
-	display: block;
-	margin-top: 5px;
-}
-
-.jilu-box {
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	border-radius: 0px;
-	background: #FFFFFF;
-}
-
-.jilu-item {
-	margin-top: 10px;
-	display: flex;
-	flex-direction: column;
-	border-bottom: solid 1rpx #d4d4d4;
-}
-
-.jilu-item:first{
-	margin-top: 0px;
-}
-.jilu-item-box{
-	display: flex;
-	justify-content: space-between;
-}
-.jilu-txt {
-	color: #9e9e9e;
-	line-height: 30px;
-}
-.lines{
-	display: flex;
-	flex-direction: column;
-	justify-content:  flex-end;
-
-}
-.jilu-items{
-	display: flex;
-	flex-direction: row;
-	justify-content: center;
-	
-}
-.pay-icon{
-	margin-top: 15px;
-	margin-right: 10px;
-	align-items: center;
-	width: 30px;
-	height: 30px;
-}

+ 0 - 318
pages/client/style/zui.css

@@ -1,318 +0,0 @@
-.home-header {
-	height: 300rpx;
-	width: 100%;
-	position: relative;
-	border-radius: 0rpx 0rpx 48rpx 48rpx;
-}
-
-.history-box {
-	display: flex;
-	flex-direction: row;
-	flex-wrap: wrap;
-}
-
-.history-item-box {
-	display: flex;
-	max-width: 22%;
-	margin-left: .5rem;
-	margin-bottom: .5rem;
-	justify-content: center;
-	flex-flow: column;
-}
-
-.history-add-box {
-	height: 200rpx;
-	align-items: center;
-
-}
-
-.history-item-box:first {
-	margin-left: 0px;
-}
-
-.history-item-image {
-	height: 200rpx;
-	max-width: 100%;
-	position: relative;
-	border-radius: 20rpx;
-}
-
-.history-item-title {
-	font-size: 28rpx;
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	text-align: left;
-}
-
-.add-icon {
-	align-items: center;
-	width: 60rpx;
-	height: 60rpx;
-}
-
-.top-show {
-	margin-bottom: .5rem;
-}
-
-.home-main {
-	width: 100%;
-	position: relative;
-	margin-top: -156rpx;
-	padding: 0 30rpx;
-}
-
-.home-mendian {
-	width: 100%;
-	height: 84rpx;
-	background: rgba(255, 255, 255, 0.1);
-	border-radius: 42rpx;
-}
-
-.integral-mall-header {
-	position: relative;
-	height: 320rpx;
-}
-
-.integral-mall-header .bg {
-	width: 100%;
-	height: 320rpx;
-}
-
-.integral-mall-header .main {
-	position: absolute;
-	left: 0;
-	top: 0;
-	width: 100%;
-	height: 320rpx;
-}
-
-.swiper-integral {
-	height: 32rpx;
-	width: 100%;
-}
-
-.integral-mall-main {
-	position: relative;
-	/* margin-top: -104rpx; */
-}
-
-.integal-mall-menu {
-	width: 100%;
-	height: 190rpx;
-	background: #FFFFFF;
-	border-radius: 20rpx;
-}
-
-.integral-tuan-l {
-	width: 100%;
-	height: 280rpx;
-	background: #f2f2f2;
-	border-radius: 16rpx;
-}
-
-
-.integral-mall-coupon {
-	background: #FFFFFF;
-	position: relative;
-	border-radius: 16rpx;
-	overflow: hidden;
-}
-
-.integral-mall-coupon .top {
-	padding: 0rpx 0rpx 24rpx 0rpx;
-	border-bottom: 2rpx dashed #FEC675;
-}
-
-.integral-mall-coupon .y-l,
-.integral-mall-coupon .y-r {
-	width: 20rpx;
-	height: 20rpx;
-	border-radius: 10rpx;
-	background: #F5F6FA;
-	position: absolute;
-	z-index: 2;
-	top: 284rpx;
-}
-
-.integral-mall-coupon .y-l {
-	left: -10rpx;
-}
-
-.integral-mall-coupon .y-r {
-	right: -10rpx;
-}
-
-.integral-mall-coupon .coupon-value {
-	width: 100%;
-}
-
-.integral-mall-coupon .coupon-value image {
-	width: 100%;
-}
-
-.integral-mall-coupon .coupon-value .num {
-	width: 100%;
-	height: 64rpx;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	position: absolute;
-	left: 0;
-	top: 0;
-}
-
-.integral-mall-goods {
-	width: 100%;
-	height: 280rpx;
-	background: #F2F2F2;
-	border-radius: 16upx;
-}
-
-.titleNview-placing {
-	height: var(--status-bar-height);
-	padding-top: 44px;
-	box-sizing: content-box;
-}
-
-.tuan-product-l {
-	width: 150rpx;
-	height: 200rpx;
-	border-radius: 16rpx;
-	background: #F2F2F2;
-}
-
-.tuan-product-r {
-	width: calc(100% - 150rpx);
-}
-
-.btn-vip-adviser {
-	width: 150rpx;
-	height: 60rpx;
-	border-radius: 20rpx;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	font-size: 28rpx;
-	/* font-weight: 600; */
-	background: #FF6600;
-	color: #FFFFFF;
-}
-
-.zuiju-box {
-	display: flex;
-	width: 100%;
-	flex-direction: column;
-
-}
-
-.zuiju-box-item {
-	display: flex;
-	flex-direction: row;
-}
-
-.zuiju-box-item-cover {
-	flex-grow: 1;
-	min-width: 150rpx;
-	max-width: 150rpx;
-	height: 200rpx;
-	border-radius: 16rpx;
-	background: #F2F2F2;
-}
-
-.zuiju-box-item-info {
-	max-width: 70%;
-	display: flex;
-	flex-grow: 4;
-	padding: 0 5px;
-	flex-direction: column;
-}
-
-.zuiju-box-item-info-title {
-	display: block;
-	font-size: 17px;
-	height: 55px;
-	line-height: 25px;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	text-align: left;
-	font-weight: bold;
-	grid-row: 4;
-}
-
-.zuiju-box-item-info-juji {
-	grid-row: 1;
-
-	display: block;
-	font-size: 12px;
-	line-height: 20px;
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	text-align: left;
-}
-
-.zuiju-box-item-info-gx {
-	display: block;
-	font-size: 12px;
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	text-align: left;
-	line-height: 20px;
-	grid-row: 1;
-}
-
-.zuiju-box-item-del-box {
-	height: 100%;
-	min-width: 30rpx;
-	flex-grow: 1;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	height: 220rpx;
-	align-items: center;
-}
-
-.del-icon {
-	width: 20px;
-	height: 20px;
-	align-items: center;
-}
-.guankan{
-	padding-left: 5px;
-	color: #FF6600;
-}
-.update-ji{
-	padding-left: 5px;
-	font-weight: bold;
-}
-.zuiju-box-kong{
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	align-items: center;
-	align-items: center; 
-	padding-bottom: 50rpx;
-}
-.zuiju-box-kong image {
-	width: 100px;
-	height: 100px;
-}
-.zuiju-box-kong text {
-	padding-top: 10rpx;
-	color: #b2b2b2;
-	
-}
-
-.zuiju-box-kong label {
-	margin: 10rpx 0rpx;
-	padding: 15rpx 60rpx;
-	color: #fff;
-	background-color: #FF6600;
-	border-radius: 9rpx;
-}
-
-.body{
-	background-color: #fff;
-}

+ 0 - 482
pages/client/tuan/buy.vue

@@ -1,482 +0,0 @@
-<template>
-	<view class="pd16_15">	
-		<view class="box pd16_15 flex">
-			<image class="tuan-buy-l" :src="buydata.img" mode="aspectFill"></image>
-			<view class="tuan-buy-r pl15">
-				<view v-if="mid>0" class="ft14 ftw600 cl-main">{{buydata.name}}【单集购买】【ID:{{mid}} 】</view>
-				<view v-else class="ft14 ftw600 cl-main">{{buydata.title}}</view>
-				<view v-if="mid>0" class="mt12 alcenter">
-					<view>
-						<text class="ft14 cl-orange">单集会员价:</text>
-						<text class="ft16 cl-orange ftw600">¥{{buydata.vippriced*1}}{{hbmc}}</text>
-					</view>
-					<view>
-						<text class="ft14 cl-notice">单集普通价:</text>
-						<text class="ft14 cl-notice">{{buydata.priced*1}}{{hbmc}}</text>
-					</view>
-				</view>
-				<view v-else class="mt12 alcenter">
-					<view>
-						<text class="ft14 cl-orange">全集会员价:</text>
-						<text class="ft16 cl-orange ftw600">¥{{buydata.vippriceq*1}}{{hbmc}}</text>
-					</view>
-					<view>
-						<text class="ft14 cl-notice">全集普通价:</text>
-						<text class="ft14 cl-notice">¥{{buydata.priceq*1}}{{hbmc}}</text>
-					</view>
-					
-				</view>
-			</view>
-		</view>
-		<view class="box mt16 pd16_15">
-			<!-- <view class="flex alcenter center">
-				<text class="iconfont iconbtn_plus ft32" @click="jianAct" style="color: #5C5E66;"></text>
-				<view class="ft16 ftw600 cl-main" style="width: 100rpx; text-align: center;">{{num}}</view>
-				<text class="iconfont iconbtn_add ft32"   @click="jiaAct"  :style="{color:tempColor}"></text>
-			</view>
-			<view class="bd-line mt16 mb16"></view>
-			<view class="flex alcenter space">
-				<text class="ft14 cl-info2">优惠券</text>
-				<view>
-					<select-coupon v-model="coupon_id" :coupons="coupons"></select-coupon>
-				</view>
-			</view>
-			<view class="bd-line mt16 mb16"></view>
-			<view class="flex alcenter space">
-				<text class="ft14 cl-info2">会员优惠</text>
-				<text class="ft16 cl-main ftw600">-¥20</text>
-			</view>
-			<view class="bd-line mt16 mb16"></view> -->
-			<view class="flex alcenter space">
-				<text class="ft14 cl-info2">需支付</text>
-				<text class="ft16 cl-main ftw600 cl-orange">{{pricebuy*1}}</text>
-			</view>
-		</view>
-	
-		<view class="box mt16 pd16_15">
-			<view class="ft16 pb16 ftw600 cl-main">支付方式</view>
-			<view class="bd-line mt16"></view>
-			<radio-group @change="changeType">
-				<!-- #ifdef MP-TOUTIAO -->
-				<view class="pt16 pb16 flex alcenter space" style="display: none;">
-					<view class="flex alcenter">
-						<text class="iconfont iconicon_pay_balance ft32 cl-green"></text>
-						<text class="ml15 ft14 ftw500 cl-main">抖音支付</text>
-					</view>
-					<view>
-						<radio value="TOUTIAO" :checked="payType == 'TOUTIAO'" :color="tempColor"  />
-					</view>
-				</view>
-				<view class="bd-line" style="display: none;"></view>
-				<!-- #endif -->
-				<!-- #ifdef MP-WEIXIN -->
-				<view class="pt16 pb16 flex alcenter space" style="display: none;">
-					<view class="flex alcenter">
-						<text class="iconfont iconicon_pay_balance ft32 cl-green"></text>
-						<text class="ml15 ft14 ftw500 cl-main">微信支付</text>
-					</view>
-					<view>
-						<radio value="weixin" :checked="payType ==  'weixin'" :color="tempColor"  />
-					</view>
-				</view>
-				<view class="bd-line" style="display: none;"></view>
-				<!-- #endif -->
-			<view class="pt16 flex alcenter space">
-				<view class="flex alcenter">
-					<text class="iconfont iconicon_pay_balance ft32" style="color: #FFBD1E;"></text>
-					<text class="ml15 ft14 ftw500 cl-main">{{hbmc}}支付</text>
-					<!-- <text class="ml10 ft12 cl-notice">余额为0,不可用</text> -->
-				</view>
-				<view>
-					<radio value="money" :checked="payType ==  'money'" :disabled="false" :color="tempColor"  />
-				</view>
-			</view>
-			</radio-group>
-		</view>	
-		<view class="form-footer-h">
-			<view class="form-footer form-footer-h">
-				<view class="form-footer-main pd10_15">
-					<button v-if="mid>0" class="btn-big" @click="okTap" :style="getBtnStyle">支付{{pricebuy*1}}</button>
-					<button v-else class="btn-big" @click="okTap" :style="getBtnStyle">支付 {{pricebuy*1}}</button>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-<script>
-	export default{
-		data(){
-			return {
-				payType:'weixin',
-				num:1,
-				coupon_id:0,
-				buydata:[],
-				buytype:'微信',
-				dataList:[],
-				money:0,
-				mid:0,
-				openid:'',
-				pricebuy:0,
-				wxlx:'wxh5',
-				hbmc:'',
-				coupons:[
-					{coupon_id:1,num:20},
-					{coupon_id:2,num:30},
-					{coupon_id:3,num:40},
-				],
-			}
-		},
-		onLoad(option){
-			this.hbmc=uni.getStorageSync("config").site.hbmc
-			if(option.mid){
-				this.mid=option.mid
-			}
-			this.buydata=uni.getStorageSync("buydata") 
-			if(this.mid>0 && this.buydata.isvip==2){
-				this.pricebuy=this.buydata.vippriced
-			}else if(this.mid>0 && this.buydata.isvip==1){
-				this.pricebuy=this.buydata.priced
-			}else if(this.mid==0 && this.buydata.isvip==2){
-				this.pricebuy=this.buydata.vippriceq
-			}else if(this.mid==0 && this.buydata.isvip==1){
-				this.pricebuy=this.buydata.priceq
-			}
-			// #ifdef MP-TOUTIAO
-			this.buytype='TOUTIAO'
-			this.payType='TOUTIAO'
-			// #endif
-			//#ifdef MP-WEIXIN
-			this.wxlx='wxxcx'
-			this.wxlogin()
-			//#endif
-			//#ifdef H5
-				var ua = window.navigator.userAgent.toLowerCase();
-				if(ua.match(/MicroMessenger/i) == 'micromessenger'){
-					this.wxlx = 'wxgzh';
-				}
-			//#endif
-		},
-		onShow() {
-			if(uni.getStorageSync("userinfo").token){
-				this.ongrzlTap()
-				this.money=uni.getStorageSync("userinfo").money
-			}else{
-				uni.showModal({
-					title: '温馨提示',
-					content: '请先登录',
-					showCancel: true,
-					confirmText: "登录",
-					success: function (res) {
-						if (res.confirm) {
-							uni.navigateTo({
-								url:'/pages/login/login'
-							})						
-						} else if (res.cancel) {
-							uni.navigateBack();						
-						}
-					}
-				});
-			}
-		},
-		computed:{
-			getCouponMoney(){
-				if(this.coupons.length > 0){
-					for(var a  in this.coupons){
-						if(this.coupons[a].coupon_id == this.coupon_id){
-							return this.coupons[a].num;
-						}
-					}
-				}
-				return 0;
-			}
-		},
-		methods:{
-			okTap(){
-				var thia=this
-				this.dataList=this.buydata;
-				
-				this.dataList.sum=1;
-				this.dataList.buytype=this.buytype;
-				//https://rw.gzzsw.cn/api/pay/index?token=a69720a4-6c4c-4baf-b269-d5260b821c7a
-				let data = this.dataList;
-				data.pricebuy=thia.pricebuy
-				data.token = uni.getStorageSync("userinfo").token;
-				data.uid = uni.getStorageSync("userinfo").id; 
-				if(this.mid>0){
-					data.lx=2;//1 全章购买 2单集购买
-					data.smid=this.mid;
-					data.namet=data.name+'【单集购买】【ID:'+this.mid+' 】';
-				}else{
-					data.lx=1;//1 全章购买 2单集购买
-					data.smid=0;
-					data.namet=data.name
-				}
-				data.wxlx=this.wxlx;
-				data.openid=this.openid;
-				data.info=[];
-				console.log(data)
-				uni.request({
-					url: this.configs.webUrl+'/api/pay/videopay',
-					data: data,
-					success: resa =>{
-						//console.log(resa.data);
-						if(thia.dataList.buytype=='微信'){
-							if(this.wxlx=='wxxcx' && resa.data.code==1){
-								//console.log(resa.data.code);
-								this.wxxcx(resa.data.data);
-							}else{
-								// #ifdef APP-PLUS
-								
-								uni.navigateTo({
-									url:'/pages/client/webva?url='+resa.data.data
-								})
-								//plus.runtime.openURL(res.data.data);
-								// #endif  
-								// #ifdef H5
-								window.open(resa.data.data, "_self")
-								// #endif 
-							}
-						}else if(thia.dataList.buytype=='余额'){
-							if(resa.data.code==1){
-								//pages/user/task/task
-								uni.showModal({
-									title: '提示',
-									content: resa.data.msg,
-									showCancel: false,
-									success: res => {
-										uni.setStorage({
-											key: 'isbuy',  
-											data: 2
-										})
-										uni.navigateBack();
-										// uni.navigateBack({
-										// 	delta: 2
-										// });
-									}
-								});
-							}else{
-								if(resa.data.msg=='余额不足'){
-									uni.showModal({
-										title: '提示',
-										content: thia.hbmc+'不足',
-										showCancel: true,
-										confirmText: "充值",
-										success: function (res) {
-											if (res.confirm) {
-												var pricebuy=thia.pricebuy
-												uni.navigateTo({
-													url:"/pages/client/vipcard/recharge?price="+pricebuy*1
-												})
-											} else if (res.cancel) {
-												//uni.navigateBack();
-											}
-										}
-									});
-								}else{
-									uni.showModal({
-										title: '提示',
-										content: resa.data.msg,
-										showCancel: false,
-										success: res => {
-											uni.navigateBack();	
-										}
-									});
-								}
-							}
-						}else if(thia.dataList.buytype=='TOUTIAO'){
-							if(resa.data.code==1){
-								this.ttxcx(resa.data.data);
-							}else{
-								uni.showModal({
-									title: '支付失败',
-									content: JSON.stringify(resa.data.msg),
-									showCancel: false,
-									confirmText: "确定",
-									success: function (ress) {
-										if (res.confirm) {
-											//uni.navigateBack();
-										} else if (res.cancel) {
-											
-										}
-									}
-								});
-							}
-						}
-					},
-					fail: (data, code) => {
-						console.log('fail' + JSON.stringify(data));
-					}
-				});
-			},
-		
-			wxxcx(data){
-				uni.requestPayment({
-				    "provider": 'wxpay',
-					"appId": data.appId,
-					"timeStamp": data.timeStamp+'',
-					"nonceStr": data.nonceStr,
-					"package": data.package,
-					"signType": 'MD5',
-					"paySign": data.sign,
-					success: function (res1) {
-						uni.showModal({
-							title: '温馨提示',
-							content: '支付成功',
-							showCancel: false,
-							confirmText: "确定",
-							success: function (res) {
-								if (res.confirm) {
-									uni.setStorage({
-										key: 'isbuy',  
-										data: 2
-									})
-									uni.navigateBack();	
-								} else if (res.cancel) {
-									
-								}
-							}
-						});
-						//uni.showToast({ title: '支付成功',icon:"none" });
-						console.log('success:' + JSON.stringify(res1));
-					},
-					fail: function (err1) {
-						uni.showModal({
-							title: '温馨提示',
-							content: JSON.stringify(err1),
-							showCancel: false,
-							confirmText: "确定",
-							success: function (res) {
-								if (res.confirm) {
-									//uni.navigateBack();
-								} else if (res.cancel) {
-									
-								}
-							}
-						});
-						//uni.showToast({ title: JSON.stringify(err1),icon:"none" });
-						console.log('fail:' + JSON.stringify(err1));
-					}
-				});
-			},
-			async ongrzlTap(){
-				let data = {};
-				data.token = uni.getStorageSync("userinfo").token;
-				data.uid = uni.getStorageSync("userinfo").id;
-				uni.request({
-					url: this.configs.webUrl+'/api/user/index',
-					data: data,
-					success: res =>{
-						if(res.data.code==1){
-							let ionfo=res.data.data
-							ionfo.isLogin=true
-							this.userinfo=ionfo
-							uni.setStorage({//缓存配置信息
-								key: 'userinfo',  
-								data: res.data.data
-							})
-							if(res.data.data.avatar){
-									var str = res.data.data.avatar;
-									if(str.indexOf("data:image") != -1){
-										this.avatar='';
-									}else{
-										if(str.indexOf("http") != -1){
-											this.avatar=res.data.data.avatar;
-										}else{
-											this.avatar=this.configs.imgUrl+res.data.data.avatar;
-										}
-									}
-								}else{
-									this.avatar='';
-								}
-						}else{
-							uni.showToast({ title: res.data.msg,icon:"none" });
-						}
-					},
-					fail: (data, code) => {
-						//console.log('fail' + JSON.stringify(data));
-					}
-				});		
-			},
-			jianAct(){
-				if(this.num == 1) return;
-				this.num = this.num - 1;
-			},
-			jiaAct(){
-				if(this.num > 99) return; //后面改为库存数量
-				this.num = this.num + 1;
-			},
-			changeType(e){
-				this.payType = e.detail.value;
-				if(e.detail.value=='money'){
-					this.buytype = '余额';
-				}
-				if(e.detail.value=='weixin'){
-					this.buytype = '微信';
-				}
-				if(e.detail.value=='TOUTIAO'){
-					this.payType = 'TOUTIAO';
-					this.buytype = 'TOUTIAO';
-				}
-			},
-			wxlogin(){
-				var this_=this
-					  uni.login({
-					       timeout: 10000,
-					        provider: 'weixin',  //如果是uniapp,在这里需要标明平台的类型,支持的参数请查阅uniapp官网的uni.login()文档
-					        success: (res) => {
-								console.log(res);
-					  			//登陆成功的回调
-								uni.request({  
-								      url: this.configs.webUrl+'/api/user/getOpenid',  
-								      method:'GET',  
-								      data: {   
-								          token: uni.getStorageSync("userinfo").token,       //你的小程序的secret,  
-								          code: res.code                                      //wx.login 登录成功后的code  
-								      },  
-								      success: (cts) => {  
-								          console.log(cts.data.code);
-										  if(cts.data.code==1){
-											  this_.openid=cts.data.data.openid
-										  }else{
-											  uni.showModal({
-											  	title: '温馨提示',
-											  	content: JSON.stringify(cts.data),
-											  	showCancel: true,
-											  	confirmText: "确定",
-											  	success: function (res) {
-											  		if (res.confirm) {
-											  			uni.navigateBack();
-											  		} else if (res.cancel) {
-											  			
-											  		}
-											  	}
-											  });
-										  }
-								      },
-									  fail: (err1) => {
-									  	console.log(err1);
-									     	//失败的回调
-									  }
-								});  
-			
-					  	  },
-					        fail: (err) => {
-								console.log(err);
-					           	//登陆失败的回调
-					        }
-					  })
-			}
-		}
-	}
-</script>
-
-<style>
-	.tuan-buy-l{
-		width: 200rpx;
-		height: 150rpx;
-		background: #F2F2F2;
-	}
-	.tuan-buy-r{
-		width: calc(100% - 200rpx);
-	}
-</style>

+ 0 - 852
pages/client/tuan/detail(原版模板) .nvue

@@ -1,852 +0,0 @@
-<template>
-  <view class="content">
-    <swiper :style="'width: '+ windowWidth +'px; height:100vh; background-color: #000;'" class="swiper" circular 
-	@change="swiperChange" 
-	:current="current"
-	:vertical="true" 
-	duration="300"
-	>
-		<swiper-item v-for="(list, index) in displaySwiperList" :key="index" :style="'width: '+ windowWidth +'px; height:100vh; background-color: #000;'">
-			<view :style="'width: '+ windowWidth +'px; height:'+heightxw+'vh;'">
-				<video
-				v-if="Math.abs(displayIndex-index)==0 && list.src"
-				:id="list._id"
-				:controls="controls"
-				:loop="!isplay"
-				:enable-progress-gesture="false"
-				:show-center-play-btn="false"
-				:show-loading="false"
-				:show-fullscreen-btn="false"
-				@ended="ended"
-				@controlstoggle="controlstoggle"
-				@click="tapVides()"
-				@timeupdate="timeupdate"
-				:style="'width: '+ windowWidth +'px; height:'+heightxw+'vh;'" 
-				:src="list.src"
-				:poster="list.img"
-				class="tsvideo"
-				>
-				</video>  
-				<view v-if="isqp" class="userInfo">
-					<!-- 1.头像 -->
-					<!-- <image @click="tozuozhe" class="userAvatar" :src="list.href" mode="aspectFill"></image> -->
-					<!-- 2.点赞 -->
-					<view @click.stop="cLike(list.like,list.pid,list.mid);" style="opacity: 0.9; margin-top: 17px;">
-						<image v-if="list.like*1==1" src="@/static/aixin.png" style="width: 40px; height: 40px; position: absolute; right: 6px;"></image>
-						<image v-if="list.like*1==2" src="@/static/aixinRed.png" style="width: 40px; height: 40px; position: absolute; right: 6px;"></image>
-						<text style="color: #FFFFFF; margin-top: 5px; font-size: 14px; text-align: center; margin-top: 40px; font-weight: bold;" :class="{'likeNumActive':list.like}">{{list.like_n}}</text>
-					</view>
-					<!-- 3.分享 -->
-					<view style="opacity: 0.9; margin-top: 17px;">
-						<image src="@/static/share-fill.png" style="width: 40px; height: 40px; position: absolute; right: 5px;"></image>
-						<text style="color: #FFFFFF; margin-top: 5px; font-size: 14px; text-align: center; font-weight: bold; margin-top: 40px;">分享</text>
-						<button open-type="share" style="position: absolute; background: none; width: 100%; height: 100%;"  @click.stop="share"></button>
-					</view>
-					<!-- 4.评论 -->
-					<view class="comment" @click.stop="toComment(list.iszj,list.pid,list.mid)" style="opacity: 0.9; margin-top: 17px;">
-						<image v-if="list.iszj*1==1" src="@/static/sc.png" style="width: 40px; height: 40px; position: absolute; right: 6px;"></image>
-						<image v-if="list.iszj*1==2" src="@/static/scRed.png" style="width: 40px; height: 40px; position: absolute; right: 6px;"></image>
-						<text v-if="list.iszj*1==1"  style="color: #FFFFFF; margin-top: 5px; font-size: 14px; font-weight: bold; text-align: center; margin-top: 40px;">追剧</text>
-						<text v-if="list.iszj*1==2" style="color: #ff0000; margin-top: 5px; font-size: 14px; font-weight: bold; text-align: center; margin-top: 40px;">已追</text>
-					</view>
-					
-				</view>
-				<!-- 最底下的文字部分 -->
-				<view v-if="isqp" class="contentcd">
-					<text class="userName" :style="'width: '+ (windowWidth - 90) +'px;'">{{list.title}}</text><!-- i={{i}} -->
-					<text class="wordss" :style="'width: '+ (windowWidth - 90) +'px;'">{{list.msg}}</text><!-- k={{k}} -->
-					<text class="words" @click.stop="sellxj()" :style="'width: '+ (windowWidth - 90) +'px;'">{{list.namets}}</text><!-- k={{k}} -->
-				</view>
-				<!-- play-btn-position="center" -->
-				<view v-if="Math.abs(displayIndex-index)!=0 || !list.src" class="videoHover tsimg" @click.stop="tapVideoHover(index,list.pays)" :style="'width: '+ windowWidth +'px; height:'+heightxw+'vh;'">
-					<image :src="list.img" :style="'width: 100vw; height:'+heightxw+'vh; background-color: #000; position: absolute;'" mode="aspectFit"></image>
-					<image class="playState" src="@/static/play.png"></image>
-				</view>
-			</view>
-			
-		</swiper-item>
-    </swiper>
-	<uni-popup type="bottom" ref="select">
-		<view v-if="fenji==1" :style="'width: '+ windowWidth +'px; height: '+ (windowHeight/1.6) +'px; background-color: #202020; border-top-left-radius: 10px; border-top-right-radius: 10px;'">
-			<view :style="'width: '+ windowWidth +'px; height: 35px;'">
-				<view style="display: flex; flex-direction: row;">
-					<view style="display: flex; flex-direction: column;">
-						<view style="display: flex; flex-direction: row;">
-							<image src="@/static/img/index/layers.png" style="width: 20px; height: 20px; margin-top: 10px; margin-left: 20px;"></image>
-							<view :style="'font-size: 16px; font-weight: bold; color: #FFFFFF; margin-top: 9px; height: 22px; margin-left: 20px; width: '+ (windowWidth*0.6) +'px; overflow: hidden;'">
-								当前播放第{{ Number(originIndex+1) }}个视频
-							</view>
-						</view>
-						<!-- <view :style="'font-size: 12px; color: #FFFFFF; margin-top: 2px; height: 18px; margin-left: 20px; opacity: 0.6; width: '+ (windowWidth*0.6) +'px; overflow: hidden;'">这是第{{ Number(k+1) }}个视频</view> -->
-					</view>
-					<image @click="down" src="@/static/img/index/down.png" style="width: 30px; height: 30px; margin-top: 5px; position: absolute; right: 20px;"></image>
-				</view>
-			</view>
-			<scroll-view :style="'width: '+ (windowWidth) +'px; height: '+ ((windowHeight/1.6)*0.85) +'px;'" :scroll-y="true" :scroll-top="scrollTop">
-				<block v-for="(list,index) in originList">
-					<view @click="selectThisVideo(index,list.pays)" :style="'width: '+ (windowWidth) +'px; display: flex; flex-direction: row;'">
-						<image :src="list.img"
-						mode="aspectFill" style="width: 70px; height: 80px; margin-top: 15px; margin-left: 15px; border-radius: 5px;"></image>
-						<view style="display: flex; flex-direction: column; margin-top: 15px; margin-left: 10px;">
-							<view style="display: flex; flex-direction: row;">
-								<view style="font-size: 18px; color: #FFFFFF; font-weight: bold;">{{list.name}}</view>
-								<image v-if="list.pays*1==1" src="@/static/shilu-login/2.png" style="width: 50rpx; height: 50rpx; margin-left: 20rpx;"></image>
-							</view>
-							<view :style="'font-size: 16px; color: #FFFFFF; margin-top: 5px; width: '+ (windowWidth*0.7) +'px; overflow: hidden;'">{{list.title}}</view>
-							<view :style="'font-size: 16px; color: #FFFFFF; margin-top: 5px; width: '+ (windowWidth*0.7) +'px; overflow: hidden; opacity: 0.6;'">{{list.msg}}</view>
-						</view>
-					</view>
-				</block>
-				<!-- <view @click="getMoreSelectVideo" :style="'width: 100px; height: 40px; border: 1px #FFFFFF solid; border-radius: 40px; margin-top: 30px; margin-left: '+ (windowWidth*0.38) +'px; opacity: 0.6;'">
-					<view v-if="!datareload" style="font-size: 14px; font-weight: bold; color: #FFFFFF; text-align: center; padding-top: 10px;">获取更多</view>
-					<view v-if="datareload" style="font-size: 14px; font-weight: bold; color: #FFFFFF; text-align: center; padding-top: 10px;">没有数据了</view>
-				</view> -->
-				<view style="width: 1px; height: 1px; margin-top: 30px;"></view>
-			</scroll-view>
-		</view>
-		<view v-if="fenji==2" :style="'width: '+ windowWidth +'px; background-color: #202020; border-top-left-radius: 10px; border-top-right-radius: 10px;'">
-			<view :style="'width: '+ windowWidth +'px; height: 35px;'">
-				<view style="display: flex; flex-direction: row;">
-					<view style="display: flex; flex-direction: column;">
-						<view style="display: flex; flex-direction: row;">
-							<image src="@/static/shilu-login/2.png" style="width: 20px; height: 20px; margin-top: 10px; margin-left: 20px;"></image>
-							<view :style="'font-size: 16px; font-weight: bold; color: #FFFFFF; margin-top: 9px; margin-left: 20px; height: 22px;  width: '+ (windowWidth*0.6) +'px; overflow: hidden;'">
-								当前视频 没有权限播放
-							</view>
-						</view>
-						<!-- <view :style="'font-size: 12px; color: #FFFFFF; margin-top: 2px; height: 18px; margin-left: 20px; opacity: 0.6; width: '+ (windowWidth*0.6) +'px; overflow: hidden;'">这是第{{ Number(k+1) }}个视频</view> -->
-					</view>
-					<image @click="downbuy" src="@/static/img/index/down.png" style="width: 30px; height: 30px; margin-top: 5px; position: absolute; right: 20px;"></image>
-				</view>
-			</view>
-			<view class="flex space alcenter wrap" style="padding:30rpx 30rpx 10rpx 30rpx;flex-direction: row; display:flex;">
-				<view class="ft14" style="color: #fff;">我的{{hbmc}}:{{userinfo.money*1}}</view>
-				<view class="ft14" style="color: #fff;" v-if="userinfo.group_id == 1">普通用户</view>
-				<view class="ft14" style="color: #fff;" v-if="userinfo.group_id == 2">VIP用户</view>
-			</view>
-			<view style="padding:10rpx 30rpx; border: #FFFFFF solid; 1upx; margin:10upx 30upx; border-radius: 16upx;">
-				<view v-if="userinfo.group_id == 1" class="flex space alcenter wrap" style="flex-direction: row; display:flex;">
-					<view class="ft14" IF style="color: #fff;">单集视频:{{originList[baymid].priced*1}}{{hbmc}}</view>
-					<view class="ft14" style="color: #fff;">整部视频:{{originList[baymid].priceq*1}}{{hbmc}}</view>
-				</view>
-				<view v-if="userinfo.group_id == 2" class="flex space alcenter wrap" style="flex-direction: row; display:flex;">
-					<view class="ft14" style="color: #fff;">VIP单集视频:{{originList[baymid].vippriced*1}}{{hbmc}}</view>
-					<view class="ft14" style="color: #fff;">VIP整部视频:{{originList[baymid].vippriceq*1}}{{hbmc}}</view>
-				</view>
-				<view class="flex space alcenter wrap mt10" style="flex-direction: row; display:flex;">
-					<view @click="buyAct(1)" class="gdfgjh" style="width: 49%; float: left;">购买单集视频</view>
-					<view @click="buyAct(0)" class="gdfgjh" style="width: 49%; float: left;">购买整部视频</view>
-				</view>
-			</view>
-			
-			<view style="padding:10rpx 30rpx; border: #FFFFFF solid; 1upx; margin:10upx 30upx; border-radius: 16upx;">
-				<view class="ft14 ftw500" style="color: #fff; ">当前充值优惠活动:</view>
-				<view class="flex space alcenter wrap mt5" style="flex-direction: row; display:flex;">
-					<block v-for="(tm,index) in moneyList">
-					<view @click="congzs(tm.money)" class="pd5_15 mt10" style="background: #fff; border-radius: 10upx; width: 49%;">
-						<view class="ft14 ftw500" style="color: #666;">充值¥{{tm.money*1}}</view>
-						<view class="ft12" style="color: #666;">{{hbmc}}{{tm.num*1}} +送{{tm.coupon*1}}</view>
-					</view>
-					</block>
-				</view>
-			</view>	
-			<view style="padding:10rpx 30rpx; border: #FFFFFF solid; 1upx; margin:10upx 30upx; border-radius: 16upx;">
-				<view class="ft14 ftw500" style="color: #fff; ">VIP用户权益:</view>
-				<view class="flex space alcenter wrap mt5" style="flex-direction: row; display:flex;">
-					<view v-if="originList[baymid].vippriced*1>0" class="ft12" style="color: #fff;">VIP单集视频:{{originList[baymid].vippriced*1}} {{hbmc}}</view>
-					<view v-if="originList[baymid].vippriced*1==0 && originList[baymid].vippriceq*1>0" class="ft12" style="color: #fff;">VIP当前单节视频免费</view>
-					<view v-if="originList[baymid].vippriceq*1>0" class="ft12" style="color: #fff;">VIP整部视频:{{originList[baymid].vippriceq*1}} {{hbmc}}</view>
-					<view v-if="originList[baymid].vippriceq*1==0" class="ft12" style="color: #fff;">VIP当前整部免费</view>
-				</view>
-				<view class="ft12 mt5" style="color: #ff0000;">开通VIP享受更多优惠福利</view>
-				<view @click="govip()" class="gdfgjh mt10">开通VIP</view>
-			</view>
-			
-		</view>
-	</uni-popup>
-	
-  </view>
-</template>
-
-<script>
-import configs from "@/common/config.js"
-let audo = uni.createInnerAudioContext()
-export default {
-  data() {
-    return {
-		sharedata: {
-			type: 2,
-			strShareUrl: "",
-			strShareTitle: "分享标题",
-			strShareSummary: "分享总结",
-			strShareImageUrl: ""
-		},
-		fenji: 1,
-		controls:true,
-		originList: [], // 源数据
-		displaySwiperList: [], // swiper需要的数据
-		displayIndex: 0, // 用于显示swiper的真正的下标数值只有:0,1,2。
-		originIndex: 0, // 记录源数据的下标
-		windowWidth:0,
-		windowHeight:0,
-		current:0,
-		oid:0,
-		isplay:true,//是否自动播放下一个视频
-		playCount:2,//剩余多少视频加载视频列表
-		nodate:true, //true 有数据 
-		duration: 500,
-		issp:'',
-		isqp:true,
-		page: 1,
-		urls:configs.webUrl,
-		baymid:0,
-		scrollTop:0,
-		vid: 0,
-		mid: 0,
-		isbuylx: 0, //大于0单节购买  0全集
-		safeArea:0,
-		ttuop:0,
-		uid:0,
-		heightxw:100,
-		hbmc:'',
-		userinfo:[],
-		moneyList:[]
-    };
-  },
-  onLoad(e) {
-	  this.hbmc=uni.getStorageSync("config").site.hbmc
-	  console.log('eeeeeee-----',e)
-	  if(e.fxpid){
-		  if(e.fxpid>0){
-				uni.setStorage({
-					key: 'fxpid',  
-					data: e.fxpid
-				})  
-		  }
-	  }
-	  if(uni.getStorageSync("userinfo")){
-		 this.cztc();
-	  	 this.uid=uni.getStorageSync("userinfo").id
-	  }
-	uni.getSystemInfo({
-	  success: res => {
-	    this.safeArea = res.safeAreaInsets.bottom;
-		if(this.safeArea>0){
-			this.heightxw=97
-		}
-	  }
-	})
-	uni.setStorage({
-		key: 'isbuy',  
-		data: 1
-	})
-	  if(e.vid){
-		this.vid=e.vid
-	  }
-	  if(e.mid){
-		this.mid=e.mid
-	  }
-	  
-	// #ifdef MP-TOUTIAO
-	this.ttuop=64
-	// #endif
-  	this.windowWidth = uni.getSystemInfoSync().windowWidth
-  	this.windowHeight = uni.getSystemInfoSync().windowHeight-this.safeArea-this.ttuop
-	console.log(this.windowHeight)
-	
-  	//this.Recommend();
-  },
-  onShow() {
-	 this.gxdd()
-	 if(uni.getStorageSync("userinfo")){
-		  this.ongrzlTap()
-	 }else{
-		 this.denglu()
-	 }
-  },
-  onShareAppMessage: function(res) {
-  	  // #ifdef MP-WEIXIN
-  	  var href='/pages/video/index?vid='+this.vid+'&fxpid='+this.uid+'&mid=0'
-      console.log(res)
-      let that = this;
-      const obj = {
-        title: "发送给好友",
-        imageUrl: '',
-        path: href,
-        success: function(res) {
-          console.log(res, "转发成功")
-        },
-        fail: function(res) {
-          wx.showToast({
-            title: '发送失败',
-            icon:'none'
-          })
-        }
-      }
-      return obj
-  	  // #endif
-  },
-  methods: {
-	  cztc(){
-	  	let data = {};
-	  	data.token = uni.getStorageSync("userinfo").token;
-	  	data.uid = uni.getStorageSync("userinfo").id;
-	  	uni.request({
-	  		url: this.configs.webUrl+'/api/user/cztc',
-	  		data: data,
-	  		success: res =>{
-	  			console.log(res.data)
-	  			this.moneyList=res.data
-	  		},
-	  		fail: (data, code) => {
-	  			//console.log('fail' + JSON.stringify(data));
-	  		}
-	  	});		
-	  },
-	  share(){
-		  var href='/pages/video/index?vid='+this.vid+'&fxpid='+this.uid+'&mid=0'
-		  // #ifdef H5
-		  uni.setClipboardData({
-		  	data: this.urls+'/h5/#'+href,
-		  	complete() {
-		  		uni.showToast({
-		  			title: "分享连接已复制到剪贴板"
-		  		})
-		  	}
-		  })
-		  // #endif
-		  // #ifndef H5
-		  uni.share({
-		  	provider: "weixin",
-		  	scene: "WXSenceTimeline",
-		  	type: 0,
-		  	href: href,
-		  	title: '分享标题',
-		  	summary: '分享总结',
-		  	imageUrl: '',
-		  	success: function(res) {
-		  		console.log("success:" + JSON.stringify(res));
-		  	},
-		  	fail: function(err) {
-		  		console.log("fail:" + JSON.stringify(err));
-		  	}
-		  })
-		  // #endif
-	  },
-	  gxdd(){
-		var isbuy = uni.getStorageSync("isbuy")
-		console.log('更新列表')
-		this.page=1
-		this.Recommend();
-	  },
-	  buyAct(mid){
-	  	if(mid==1){
-	  		mid = this.originList[this.baymid].mid
-	  	}
-	  	var info=this.originList[this.baymid]
-	  	if(uni.getStorageSync("userinfo")){
-			this.isbuylx=mid
-	  		uni.setStorage({//缓存配置信息
-	  			key: 'buydata',  
-	  			data: info
-	  		})
-			uni.setStorage({
-				key: 'isbuy',  
-				data: 1
-			})
-			this.downbuy()
-	  		uni.navigateTo({
-	  			url:'/pages/client/tuan/buy?id='+this.vid+'&mid='+mid
-	  		})
-	  	}else{
-	  		this.denglu()
-	  		return false
-	  	}
-	  },
-	  congzs(price){
-		  var mid = this.originList[this.baymid].mid
-		  uni.navigateTo({
-		  	url:'/pages/client/vipcard/recharge?id='+this.vid+'&mid='+mid+'&price='+price
-		  })
-	  },
-	  govip(){
-		var mid = this.originList[this.baymid].mid
-	  	if(uni.getStorageSync("userinfo")){
-			this.downbuy()
-	  		uni.navigateTo({
-	  			url:'/pages/client/vipcard/index?vid='+this.vid+'&mid='+mid
-	  		})
-	  	}else{
-	  		this.denglu()
-	  		return false
-	  	}
-	  },
-	  timeupdate(event){
-	  	// console.log(11111)
-	  	// console.log(this.displayIndex)
-	  	if(event.detail.currentTime>0 && this.originList[this.originIndex].pays==1){
-	  		uni.createVideoContext(this.originList[this.originIndex]._id,this).seek(0);
-	  		uni.createVideoContext(this.originList[this.originIndex]._id,this).pause();
-	  		this.fenji=2
-			this.baymid=this.originIndex
-	  		this.$refs.select.open('bottom');
-	  	}
-	  },
-	  selectThisVideo(index,pays){
-		this.down();
-		if(pays==1){
-			this.baymid=index
-			this.fenji=2
-			this.$refs.select.open('bottom');
-		}else{
-			this.duration = 20;
-			this.originIndex=index
-			this.initSwiperData(index);
-			setTimeout(()=>{
-				this.duration = 500;
-			},500)
-		}
-	  },
-	  down(){
-	  	this.$refs.select.close();
-	  },
-	  downbuy(){
-	  	this.$refs.select.close();
-	  },
-	  sellxj() {
-	  	this.fenji=1
-	  	this.$refs.select.open('bottom');
-	  	this.$nextTick(()=>{
-	  		let num1 = (this.windowHeight/1.6)*0.85;
-	  		let num2 = num1/4.78;
-	  		this.scrollTop = num2 * Number(this.k);
-	  	})
-	  },
-	  tapVideoHover(index,pays){
-		  this.baymid=index
-		  this.fenji=2
-		  this.$refs.select.open('bottom');
-	  },
-	  tapVides(){
-	  		this.isqp=!this.isqp
-	  },
-	  ongrzlTap(){
-	  	let data = {};
-	  	data.token = uni.getStorageSync("userinfo").token;
-	  	data.uid = uni.getStorageSync("userinfo").id;
-	  	uni.request({
-	  		url: this.urls+'/api/user/index',
-	  		data: data,
-	  		success: res =>{
-	  			if(res.data.code==1){
-	  				let ionfo=res.data.data
-	  				this.userinfo=ionfo
-	  			}else{
-	  				uni.showToast({ title: res.data.msg,icon:"none" });
-	  			}
-	  		},
-	  		fail: (data, code) => {
-	  			//console.log('fail' + JSON.stringify(data));
-	  		}
-	  	});		
-	  },
-	  Recommend(){
-		this.originList=[]
-	  	var uid=0;
-	  	if(uni.getStorageSync("userinfo")){
-	  		uid=uni.getStorageSync("userinfo").id
-	  	}
-	  	uni.request({
-	  		//url: this.urls+'/api/video/videoinfo?page='+this.page+'&uid='+uid,
-			url: this.urls+'/api/video/videoinfo?page='+this.page+'&uid='+uid+'&vid='+this.vid+'&mid='+this.mid+'&token='+uni.getStorageSync("userinfo").token,
-	  		success: (res) => {
-				if(res.data.isempty==1){
-					// #ifdef MP-WEIXIN
-					if(res.data.videodata){
-						uni.setNavigationBarTitle({
-						    title: res.data.videodata.name
-						});
-					}
-					// #endif
-					var msg = res.data.data
-					var midlog = res.data.midlog
-					//2.这里把视频添加到视频列表
-					if(this.page==1){
-						this.originList=res.data.data
-						for (let i = 0; i < msg.length; i++) {
-							if(this.mid>0){//等于0 上一个页面视频id未0 相当于没有上传
-								if(msg[i].mid==this.mid){//判断判断上一个页面视频id
-									this.originIndex=i
-								}
-							}else{
-								if(msg[i].mid==midlog){//判断当前历史记录最新视频id
-									this.originIndex=i
-								}
-							}
-						}
-						this.initSwiperData(this.originIndex);
-					}else{
-						for (let i = 0; i < msg.length; i++) {
-							this.originList.push(msg[i])
-						}
-					}
-					this.page=this.page+1
-				}else{
-					this.nodate=false
-				}
-	  		}
-	  	})
-	  },
-	  ended(){
-		  //console.log('isplay----',this.isplay)
-	  	// 1.播放当前视频结束时触发,自动切换下一个视频
-		if(this.isplay){
-			if(this.displayIndex<2){
-				this.current=this.displayIndex+1
-			}else{
-				this.current=0	
-			}
-			this.isqp=true
-			console.log('显示swiper Index:',this.displayIndex)
-		}
-	  },
-    /**
-     * 初始一个显示的swiper数据
-     * @originIndex  从源数据的哪个开始显示默认0,如从其他页面跳转进来,要显示第n个,这个参数就是他的下标
-     */
-    initSwiperData(originIndex = this.originIndex) {
-		this.isqp=false
-		//console.log('--------当前数据 Index:',originIndex)
-      const originListLength = this.originList.length; // 源数据长度
-      const displayList = [];
-      displayList[this.displayIndex] = this.originList[originIndex];
-      displayList[this.displayIndex - 1 == -1 ? 2 : this.displayIndex - 1] =
-        this.originList[
-          originIndex - 1 == -1 ? originListLength - 1 : originIndex - 1
-        ];
-      displayList[this.displayIndex + 1 == 3 ? 0 : this.displayIndex + 1] =
-        this.originList[
-          originIndex + 1 == originListLength ? 0 : originIndex + 1
-        ];
-      this.displaySwiperList = displayList;
-	  
-	  audo.pause()
-	  
-	  if(this.oid>=this.originList.length){
-		this.oid=0
-	  }
-	  if(this.oid<0){
-	  		this.oid=this.originList.length-1
-	  }
-	  //console.log('++++++++++++上一条播放数据 Index:',this.oid)
-	  uni.createVideoContext(this.originList[this.oid]._id,this).stop();
-	  if(this.originList[originIndex].pays==1){
-		  this.isqp=true 
-			this.baymid=this.originIndex
-			this.fenji=2
-			this.$refs.select.open('bottom');
-	  }else{
-		 setTimeout(()=>{
-			 this.isqp=true 
-		 	console.log('qqqqqq:',this.originList[originIndex]._id)
-			//audo.play()
-		 	uni.createVideoContext(this.originList[originIndex]._id,this).play();
-			this.bfjl(this.originList[originIndex].mid)
-		 },500) 
-	  }
-	  var pCount=this.originList.length-this.playCount
-	  if(originIndex==pCount && this.nodate){
-		  this.Recommend()
-	  }
-    },
-    /**
-     * swiper滑动时候
-     */
-    swiperChange(event) {
-      const { current } = event.detail;
-      const originListLength = this.originList.length; // 源数据长度
-      // =============向后==========
-      if (this.displayIndex - current == 2 || this.displayIndex - current == -1) {
-        this.originIndex =
-          this.originIndex + 1 == originListLength ? 0 : this.originIndex + 1;
-        this.displayIndex = this.displayIndex + 1 == 3 ? 0 : this.displayIndex + 1;
-		//console.log('+++',this.originIndex)
-		this.oid=this.originIndex-1
-        this.initSwiperData(this.originIndex);
-      }
-      // ======如果两者的差为-2或者1则是向前滑动============
-      else if (this.displayIndex - current == -2 || this.displayIndex - current == 1) {
-        this.originIndex = this.originIndex - 1 == -1 ? originListLength - 1 : this.originIndex - 1;
-        this.displayIndex = this.displayIndex - 1 == -1 ? 2 : this.displayIndex - 1;
-		//console.log('---',this.originIndex)
-		this.oid=this.originIndex+1
-        this.initSwiperData(this.originIndex);
-      }
-	  
-    },
-	detail(vid,mid){
-		var fxpid=1
-		if(uni.getStorageSync("userinfo")){
-			 fxpid=uni.getStorageSync("userinfo").id
-		}
-		uni.navigateTo({
-			url:'/pages/video/index?vid='+vid+'&mid='+mid+'&fxpid='+fxpid
-		})
-	},
-	toComment(sss,vid,mid){
-		if(uni.getStorageSync("userinfo")){
-			
-		}else{
-			this.denglu()
-			return false
-		}
-		const video = this.displaySwiperList[this.displayIndex];
-		//console.log(sss)
-		if(sss==1){
-			this.displaySwiperList[this.displayIndex].iszj=2
-		}else{
-			this.displaySwiperList[this.displayIndex].iszj=1
-		}
-		
-		let this_=this
-		let data = {'vid':vid,'mid':mid};
-		data.token = uni.getStorageSync("userinfo").token
-		data.uid = uni.getStorageSync("userinfo").id
-		uni.request({
-			url: this_.urls+'/api/user/videorecord',
-			data: data,
-			success: data => {
-				// uni.showToast({
-				// 	icon:'none',
-				// 	title:data.data.msg
-				// })
-			},
-			fail: (data, code) => {
-			}
-		});
-	},
-	bfjl(mid){//更新播放记录
-		let this_=this
-		if(uni.getStorageSync("userinfo")){
-			let data = {'vid':this_.vid,'mid':mid};
-			data.uid = uni.getStorageSync("userinfo").id
-			uni.request({
-				url: this_.urls+'/api/video/bfjl',
-				data: data,
-				success: data => {
-					
-				},
-				fail: (data, code) => {
-				}
-			});
-		}
-	},
-	controlstoggle(e){
-		console.log(e.detail.show);
-		this.issp=e.detail.show
-	},
-	cLike(sss,vid,mid){
-		if(uni.getStorageSync("userinfo")){
-			
-		}else{
-			this.denglu()
-			return false
-		}
-		const video = this.displaySwiperList[this.displayIndex];
-		if(sss==1){
-			this.displaySwiperList[this.displayIndex].like=2
-			video.like_n += 1;
-		}else{
-			this.displaySwiperList[this.displayIndex].like=1
-			video.like_n -= 1
-		}
-		
-		console.log(vid)
-		
-		let this_=this
-		let data = {'vid':vid,'mid':mid};
-		data.token = uni.getStorageSync("userinfo").token
-		data.uid = uni.getStorageSync("userinfo").id
-		uni.request({
-			url: this_.urls+'/api/user/tapLove',
-			data: data,
-			success: data => {
-				// uni.showToast({
-				// 	icon:'none',
-				// 	title:data.data.msg
-				// })
-				// if(data.data.msg=='取消成功'){
-				// 	video.like_n -= 1
-				// }else{
-				// 	video.like_n += 1;
-				// }
-			},
-			fail: (data, code) => {
-			}
-		});
-	},
-	denglu(){
-		uni.showModal({
-			title: '温馨提示',
-			content: '请先登录',
-			showCancel: true,
-			confirmText: "登录",
-			success: function (res) {
-				if (res.confirm) {
-					uni.navigateTo({
-						url:"/pages/login/login"
-					})
-				} else if (res.cancel) {
-					//uni.navigateBack();
-				}
-			}
-		});
-		
-	}
-  },
-  created() {
-	
-  },
-};
-</script>
-
-<style>
-page{
-	background: #000000;
-}
-.title {
-  width: 100%;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  height: 60rpx;
-}
-.swiper {
-}
-.wrap_content {
-  border-radius: 20rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  background: gray;
-  color: aqua;
-  height: 100%;
-  font-size: 80px;
-  margin: 0rpx 40rpx;
-}
-.container {background-color: #000000;}
-	.item {
-		/* width : 750rpx; */
-		background-color: #000000;
-		position: relative;
-	}
-	.videoHover{
-		position: absolute;
-		top: 0px;
-		left: 0;
-		flex: 1;
-		background-color: rgba(0,0,0,0.1);
-		justify-content: center;
-		align-items: center;
-		
-		/* border-style: dashed;
-		border-color: #DD524D;
-		border-width: 1px; */
-	}
-	.playState{
-		width:  160rpx;
-		height: 160rpx;
-		opacity: 0.2;
-	}
-	.userInfo{
-		position: absolute;
-		z-index: 99;
-		bottom:30%;
-		right: 10px;
-		width: 100rpx;
-		text-align: center;
-		flex-direction: column;
-		
-	}
-	.userAvatar{
-		border-radius: 500%;
-		margin-bottom: 15px;
-		border-style: solid;
-		border-width: 2px;
-		border-color: #ffffff;
-	}
-	.userAvatar{
-		width : 100rpx;
-		height: 100rpx;
-	}
-	.likeIco,.shareIco,.commentIco{
-		width : 60rpx;
-		height: 60rpx;
-		margin-top: 15px;
-	}
-	.likeNum,.commentNum,.shareTex{
-		color: #ffffff;
-		font-size: 30rpx;
-		text-align: center;
-		margin: 5px;
-	}
-	.likeNumActive{
-		color: red;
-	}
-	.contentcd{
-	  width: 720rpx;
-	  z-index: 99;
-	  position: absolute;
-	  bottom: 70rpx;
-	  /* justify-content: center; */
-	  padding: 15rpx;
-	  flex-direction: column;
-	  justify-content: flex-start;
-	  color: #ffffff;
-	}
-	.userName {
-	  font-size: 30rpx;
-	  color: #ffffff;
-	  margin-top: 80upx;
-	  margin-left: -12rpx;
-	}
-	.words {
-	  margin-top: 16rpx;
-	  font-size: 30rpx;
-	  color: #ffffff;
-	  margin-bottom: 20rpx;
-	}
-	.wordss {
-	  margin-top: 10rpx;
-	  font-size: 26rpx;
-	  color: #ffffff;
-	}
-	.root{
-		background-color: #000000;
-	}
-	.gdfgjh{
-		font-size: 30rpx; 
-		font-weight: 600; 
-		line-height: 90rpx;
-		background: #fff; 
-		border-radius: 18rpx; 
-		padding: 0 20rpx;
-		text-align: center; 
-		margin-bottom: 20rpx;
-	}
-	.tsvideo{
-		/* animation:showDivAni 1s 1; */
-	}
-	@keyframes showDivAni{
-		0%{opacity:0;}
-		100%{opacity: 1;}
-	}
-	.tsimg{
-		/* animation:fadenum12 10s 1; */
-	}
-	@keyframes fadenum12{
-	   0%{opacity: 1;}
-	   10%{opacity: 0.8;}
-	   100%{opacity: 0;}
-	}
-</style>

+ 0 - 657
pages/client/tuan/detail.nvue

@@ -1,657 +0,0 @@
-<template>
-	<view class="content">
-		<u-navbar :title="topTitle" @leftClick="leftClick" titleStyle="color:#fff;" bgColor="#000" leftIconColor="#fff"
-			:autoBack="false">
-		</u-navbar>
-		<swiper :style="'width: '+ windowWidth +'px; height:100vh; background-color: #000;'" class="swiper"
-			:circular='false' @change="swiperChange" :current="swiperCurrent" :vertical="true" duration="300">
-			<block v-for="content in videoInfo.updated_episode_num">
-				<swiper-item :key="content">
-					<view :style="'width: '+ windowWidth +'px; height:'+heightxw+'vh;'">
-						<video autoplay :key="content" id="myVideo" :controls="controls" :loop="!isplay"
-							:enable-progress-gesture="false" :show-center-play-btn="false" :show-loading="false"
-							:show-fullscreen-btn="false" @ended="ended" @controlstoggle="controlstoggle"
-							@click="tapVides()" :style="'width: '+ windowWidth +'px; height:'+heightxw+'vh;'"
-							:src="currentVideoInfo.video_url" class="tsvideo">
-						</video>
-						<view v-if="isqp" class="userInfo">
-							<!-- 2.点赞 -->
-							<view style="opacity: 0.9; margin-top: 17px;">
-								<image v-if="currentVideoInfo.is_zan" src="@/static/aixinRed.png" @click="myLike(2)"
-									style="width: 40px; height: 40px; position: absolute; right: 6px;"></image>
-								<image v-else src="@/static/aixin.png" @click="myLike(1)"
-									style="width: 40px; height: 40px; position: absolute; right: 6px;"></image>
-								<text
-									style="color: #FFFFFF; margin-top: 5px; font-size: 14px; text-align: center; margin-top: 40px; font-weight: bold;">{{currentVideoInfo.total_zan}}</text>
-							</view>
-							<!-- 3.分享 -->
-							<!-- <view style="opacity: 0.9; margin-top: 17px;">
-							<image src="@/static/share-fill.png"
-								style="width: 40px; height: 40px; position: absolute; right: 5px;"></image>
-							<text
-								style="color: #FFFFFF; margin-top: 5px; font-size: 14px; text-align: center; font-weight: bold; margin-top: 40px;">分享</text>
-							<button open-type="share"
-								style="position: absolute; background: none; width: 100%; height: 100%;"
-								@click.stop="share"></button>
-						</view> -->
-							<!-- 4.追剧 -->
-							<view class="comment" style="opacity: 0.9; margin-top: 17px;">
-								<view v-if="videoInfo.is_binge_watch" @click="unBingewatch">
-									<image src="@/static/scRed.png"
-										style="width: 40px; height: 40px; position: absolute; right: 6px;"></image>
-									<text
-										style="color: #ff0000; margin-top: 5px; font-size: 14px; font-weight: bold; text-align: center; margin-top: 40px;">已追</text>
-								</view>
-								<view v-else @click="bingewatch">
-									<image src="@/static/sc.png"
-										style="width: 40px; height: 40px; position: absolute; right: 6px;"></image>
-									<text
-										style="color: #FFFFFF; margin-top: 5px; font-size: 14px; font-weight: bold; text-align: center; margin-top: 40px;">追剧</text>
-								</view>
-							</view>
-
-						</view>
-						<!-- 最底下的文字部分 -->
-						<view v-if="isqp" class="contentcd" @click.stop="sellxj()">
-							<text class="userName">《{{videoInfo.name}}》</text>
-							<text class="userName">更新到第{{videoInfo.updated_episode_num}}集</text>
-							<text class="userName">|</text>
-							<text class="userName">选集</text>
-						</view>
-					</view>
-				</swiper-item>
-			</block>
-		</swiper>
-		<uni-popup type="bottom" ref="select" style="z-index: 100;">
-			<view v-if="fenji==1" class="pop-my">
-				<view class="ju-top">
-					<view style="display: flex; flex-direction: column; ">
-						<view style="display: flex; flex-direction: column;">
-							<view style="display: flex; flex-direction: column;">
-								<u-tabs v-if="fenji==1" :activeStyle="activeStyle" lineColor="none"
-									:inactiveStyle="inactiveStyle" style="align-items: center; width: 100%;"
-									:list="list1" :current="current" @click="click"></u-tabs>
-								<view class="ju-top-title">
-									{{videoInfo.name}}
-								</view>
-								<view class="ju-top-update"> 已更新至{{videoInfo.updated_episode_num}}集 </view>
-							</view>
-							<u-tabs v-if="fenji==1" :activeStyle="activeStyle" lineColor="none"
-								:inactiveStyle="inactiveStyle" style="align-items: flex-start; width: 100%;"
-								:list="labelList" @click="click"></u-tabs>
-							{{labelList}}
-						</view>
-						<view class="down" @click="down">
-							<text class="down-text">收起</text>
-							<image class="down-img" src="@/static/img/index/down.png">
-							</image>
-						</view>
-					</view>
-				</view>
-				<scroll-view class="scroll-my" :scroll-y="true" :scroll-top="scrollTop">
-					<view class="ju-wrapper">
-						<block v-for="content in labelList[tabcurrent].content">
-							<view class="ju-content" :class="activeIndex ==content?'active':'' "
-								@click="playTest(content)">
-								<!-- <view :class="isShowUpdate(content)?'lock-wrapper-no':'lock-wrapper'" -->
-								<view class="lock-wrapper" v-if="isShowUpdate(content)">
-									<text class="update-title">待更新</text>
-								</view>
-								<text class="title">第{{content}}集 </text>
-								<view class="lock-wrapper" v-if="isShowVip(content)">
-									<image class="lock-img" src="@/static/shilu-login/2.png"></image>
-								</view>
-							</view>
-						</block>
-					</view>
-					<view style="width: 1px; height: 1px; margin-top: 30px;"></view>
-				</scroll-view>
-			</view>
-			<view v-if="fenji==2"
-				:style="'width: '+ windowWidth +'px;height:500px; background-color: #fff; border-top-left-radius: 10px; border-top-right-radius: 10px;'">
-			</view>
-		</uni-popup>
-	</view>
-</template>
-
-
-<script>
-	import {
-		getVideoInfo,
-		videoEpisodePlay,
-		videoEpisodeZan,
-	} from '@/common/apis/video.js';
-	import {
-		delShelf,
-		storeshelf
-	} from '@/common/apis/zju.js'
-	import configs from "@/common/config.js"
-	let audo = uni.createInnerAudioContext('myVideo')
-	export default {
-		data() {
-			return {
-				top_height: 0,
-				episode: 1,
-				swiperCurrent: 0,
-				videoContext: '',
-				currentVideoInfo: {},
-				activeStyle: {
-					color: '#f95d27',
-					fontWeight: 'bold',
-					transform: 'scale(1.05)'
-				},
-				inactiveStyle: {
-					color: '#606266',
-					transform: 'scale(1)'
-				},
-				activeIndex: 0,
-				tabcurrent: 0,
-				videoInfo: {
-					"name": "test1-112",
-					"charge_sequence": 24,
-					"charge_coin": 125,
-					"total_episode_num": 98,
-					"updated_episode_num": 24,
-					"update_type": 1
-				},
-				labelList: [],
-				list1: [{
-					name: '当前剧集',
-				}, {
-					name: '相似好剧',
-				}],
-				sharedata: {
-					type: 2,
-					strShareUrl: "",
-					strShareTitle: "分享标题",
-					strShareSummary: "分享总结",
-					strShareImageUrl: ""
-				},
-				fenji: 0,
-				controls: true,
-				windowWidth: 0,
-				windowHeight: 0,
-				current: 0,
-				isplay: true, //是否自动播放下一个视频
-				duration: 500,
-				isqp: true,
-				urls: configs.webUrl,
-				scrollTop: 0,
-				video_id: 0,
-				safeArea: 0,
-				ttuop: 0,
-				heightxw: 100,
-			};
-		},
-		computed: {
-			isShowVip(item) {
-				return (item) => {
-					return item >= this.videoInfo.charge_sequence && item <= this.videoInfo.updated_episode_num
-				}
-			},
-			isShowUpdate(item) {
-				return (item) => {
-					return item > this.videoInfo.updated_episode_num
-				}
-			},
-			topTitle() {
-				return `${this.videoInfo.name} 第${this.episode}集`
-			}
-		},
-		onReady: function(res) {
-			this.videoContext = uni.createVideoContext('myVideo')
-		},
-		mounted() {
-			this.initTabs();
-			this.initSwiperData(this.swiperCurrent + 1)
-			getVideoInfo({
-				video_id: this.video_id
-			}).then(res => {
-				// console.log(res, 'getVideoInfogetVideoInfogetVideoInfo')
-				this.videoInfo = res
-			})
-		},
-		onLoad(e) {
-			let that = this;
-			uni.getSystemInfo({
-				success(res) {
-					that.top_height = res.statusBarHeight; //data中 声明 top_height:0 
-				}
-			});
-			if (e.video_id) {
-				this.video_id = Number(e.video_id)
-			}
-			uni.getSystemInfo({
-				success: res => {
-					this.safeArea = res.safeAreaInsets.bottom;
-					if (this.safeArea > 0) {
-						this.heightxw = 97
-					}
-				}
-			})
-			// #ifdef MP-TOUTIAO
-			this.ttuop = 64
-			// #endif
-			this.windowWidth = uni.getSystemInfoSync().windowWidth
-			this.windowHeight = uni.getSystemInfoSync().windowHeight - this.safeArea - this.ttuop
-			console.log(this.windowHeight)
-		},
-		onShow() {
-
-		},
-		onShareAppMessage: function(res) {
-			// #ifdef MP-WEIXIN
-			var href = '/pages/video/index?video_id=' + this.video_id
-			console.log(res)
-			let that = this;
-			const obj = {
-				title: "发送给好友",
-				imageUrl: '',
-				path: href,
-				success: function(res) {
-					console.log(res, "转发成功")
-				},
-				fail: function(res) {
-					wx.showToast({
-						title: '发送失败',
-						icon: 'none'
-					})
-				}
-			}
-			return obj
-			// #endif
-		},
-		onBackPress() {},
-		methods: {
-			bingewatch() {
-				storeshelf(this.video_id).then(res => {
-					console.log(res, 'storeshelfstoreshelfstoreshelf')
-					this.videoInfo.is_binge_watch = !Boolean(this.videoInfo.is_binge_watch)
-					uni.showToast({
-						title: '追剧成功',
-						duration: 1000,
-						icon: 'none'
-					});
-				})
-			},
-			unBingewatch() {
-				delShelf(this.video_id).then(res => {
-					console.log(res, 'delShelfdelShelfdelShelfdelShelfdelShelf')
-					this.videoInfo.is_binge_watch = !Boolean(this.videoInfo.is_binge_watch)
-				})
-			},
-			leftClick(e) {
-				if (!this.videoInfo?.is_binge_watch) {
-					uni.showModal({
-						title: '加入追剧',
-						content: '喜欢就加入追剧吧',
-						confirmText: '加入追剧',
-						confirmColor: '#FFA500',
-						cancelText: '不用了',
-						success: (res) => {
-							if (res.confirm) {
-								this.bingewatch()
-								uni.navigateBack()
-								// 用户点击了确定按钮
-								// 执行加入追剧的逻辑
-							} else if (res.cancel) {
-								// 用户点击了取消按钮
-								// 执行取消逻辑
-								uni.navigateBack()
-							}
-						}
-					});
-				} else {
-					uni.navigateBack()
-				}
-			},
-			myLike(like) {
-				videoEpisodeZan({
-					episode_id: this.currentVideoInfo.id,
-					zan: like
-				}).then(res => {
-					console.log(res, 'VideoEpisodeZanVideoEpisodeZanVideoEpisodeZan')
-					this.$nextTick(() => {
-						this.currentVideoInfo.is_zan = !Boolean(this.currentVideoInfo.is_zan)
-						if (this.currentVideoInfo.is_zan) {
-							this.currentVideoInfo.total_zan++
-						} else {
-							this.currentVideoInfo.total_zan--
-						}
-					})
-
-				})
-			},
-			initTabs() {
-				function innit(i, num) {
-					let arr = [];
-					for (i; i <= num; i++) {
-						arr.push(i)
-					}
-					return arr
-				}
-				const pageSize = 15;
-				const total = this.videoInfo.total_episode_num;
-				const pageCount = Math.ceil(total / pageSize);
-				for (let i = 0; i < pageCount; i++) {
-					const start = i * pageSize + 1;
-					const end = i === pageCount - 1 ? total : (i + 1) * pageSize;
-					let label;
-					if (i === pageCount - 1) {
-						if (start === total) {
-							label = `${total}`
-						} else {
-							label = `${start}-${total}`
-						}
-					} else {
-						label = `${start}-${end}`
-					}
-					let index;
-					if (label.split('-')[1]) {
-						index = label.split('-')[1]
-					} else {
-						index = total
-					}
-					this.labelList.push({
-						name: label,
-						page: pageCount,
-						content: innit(start, index)
-					})
-				}
-
-			},
-			playTest(item) {
-				console.log(item)
-				if (this.isShowVip(item)) {
-					this.fenji = 2
-					this.activeIndex = ''
-				} else if (this.isShowUpdate(item)) {
-					this.activeIndex = ''
-					uni.showToast({
-						title: '剧集暂未更新',
-						duration: 1000,
-						icon: 'none'
-					});
-				} else {
-					this.activeIndex = item;
-					this.swiperCurrent = item - 1;
-					this.episode = this.swiperCurrent
-					// this.initSwiperData(item)
-					this.down();
-				}
-			},
-			click(item) {
-				this.tabcurrent = item.index
-				console.log('item', item);
-			},
-			share() {
-				var href = '/pages/video/index?video_id=' + this.video_id
-				// #ifdef H5
-				uni.setClipboardData({
-					data: this.urls + '/h5/#' + href,
-					complete() {
-						uni.showToast({
-							title: "分享连接已复制到剪贴板"
-						})
-					}
-				})
-				// #endif
-				// #ifndef H5
-				uni.share({
-					provider: "weixin",
-					scene: "WXSenceTimeline",
-					type: 0,
-					href: href,
-					title: '分享标题',
-					summary: '分享总结',
-					imageUrl: '',
-					success: function(res) {
-						console.log("success:" + JSON.stringify(res));
-					},
-					fail: function(err) {
-						console.log("fail:" + JSON.stringify(err));
-					}
-				})
-				// #endif
-			},
-			down() {
-				this.$refs.select.close();
-			},
-			sellxj() {
-				this.fenji = 1
-				this.$refs.select.open('bottom');
-				this.$nextTick(() => {
-					let num1 = (this.windowHeight / 1.6) * 0.85;
-					let num2 = num1 / 4.78;
-					this.scrollTop = num2 * Number(this.k);
-				})
-			},
-			tapVideoHover(index, pays) {
-				this.videoContext.play()
-				// this.$refs.select.open('bottom');
-			},
-			tapVides() {
-				this.isqp = !this.isqp
-			},
-			ended() {
-				//console.log('isplay----',this.isplay)
-				// 1.播放当前视频结束时触发,自动切换下一个视频
-				if (this.isplay) {
-					if (this.displayIndex < 2) {
-						this.current = this.displayIndex + 1
-					} else {
-						this.current = 0
-					}
-					this.isqp = true
-					console.log('显示swiper Index:', this.displayIndex)
-				}
-			},
-			/**
-			 * 初始一个显示的swiper数据
-			 * @originIndex  从源数据的哪个开始显示默认0,如从其他页面跳转进来,要显示第n个,这个参数就是他的下标
-			 */
-			initSwiperData(originIndex) {
-				this.isqp = false
-				videoEpisodePlay({
-					video_id: this.video_id,
-					sequence: originIndex
-				}).then(res => {
-					this.currentVideoInfo = res
-					console.log(res, 'getVideoEpisodePlaygetVideoEpisodePlay')
-				})
-			},
-			/**
-			 * swiper滑动时候
-			 */
-			swiperChange(event) {
-				const {
-					current
-				} = event.detail;
-				this.episode = current + 1;
-				this.activeIndex = this.episode;
-				this.initSwiperData(current + 1)
-			},
-			controlstoggle(e) {
-				console.log(e.detail.show);
-			},
-		},
-	};
-</script>
-
-<style lang="scss" scoped>
-	page {
-		background: #000000;
-	}
-
-	.userInfo {
-		position: absolute;
-		z-index: 99;
-		bottom: 30%;
-		right: 10px;
-		width: 100rpx;
-		text-align: center;
-		flex-direction: column;
-
-	}
-
-	.contentcd {
-		background-color: rgba(255, 255, 255, .3);
-		width: 720rpx;
-		z-index: 99;
-		position: absolute;
-		bottom: 70rpx;
-		left: 50%;
-		transform: translateX(-50%);
-		padding: 15rpx;
-		border-radius: 8px;
-		display: flex;
-		flex-direction: row;
-		justify-content: flex-start;
-		align-items: center;
-		color: #ffffff;
-		margin: 0 auto;
-	}
-
-	.userName {
-		color: #fff;
-		font-size: 30rpx;
-		color: #ffffff;
-		margin: 0 6rpx;
-	}
-
-	.tsvideo {
-		animation: showDivAni 2s 1;
-	}
-
-	@keyframes showDivAni {
-		0% {
-			opacity: 0;
-		}
-
-		100% {
-			opacity: 1;
-		}
-	}
-</style>
-
-<style lang="scss" scoped>
-	.down {
-		display: flex;
-		flex-direction: row;
-		width: 60px;
-		height: 30px;
-		margin-top: 5px;
-		position: absolute;
-		right: 0px;
-		top: 50%;
-		transform: translateY(-50%);
-
-		.down-text {
-			font-size: 12px;
-			color: #000;
-		}
-
-		.down-img {
-			width: 35rpx;
-			height: 35rpx;
-			object-fit: contain;
-		}
-	}
-
-	.ju-top {
-
-		// background-color: ;
-		.ju-top-title {
-			font-size: 16px;
-			font-weight: bold;
-			color: #000;
-			margin-top: 9px;
-			height: 22px;
-			margin-left: 20px;
-			// width: '+ (windowWidth*0.6) +' px;
-			overflow: hidden;
-		}
-
-		.ju-top-update {
-			font-size: 12px;
-			color: #000;
-			margin-top: 9px;
-			height: 22px;
-			margin-left: 20px;
-		}
-	}
-
-	.pop-my {
-		background-color: #FFFFFF;
-	}
-
-	.scroll-my {
-		height: 50vh;
-	}
-
-	.ju-wrapper {
-		display: flex;
-		flex-direction: row;
-		flex-wrap: wrap;
-		align-items: center;
-		justify-content: start;
-		width: 100%;
-		height: 100%;
-		background-color: #FFFFFF;
-		// margin: 6rpx;
-
-		.ju-content.active {
-			background-color: #ff7f02;
-		}
-
-		.ju-content {
-			flex-grow: 1;
-			position: relative;
-			border-radius: 12rpx;
-			background-color: #f6f6f6;
-			width: 31%;
-			height: 25rpx;
-			align-items: center;
-			justify-content: center;
-			padding: 45rpx 68rpx;
-			margin: 6rpx;
-
-			.lock-wrapper,
-			.lock-wrapper-no {
-				position: absolute;
-				width: 100%;
-				height: 100%;
-				border-radius: 12rpx;
-				background-color: rgba(0, 0, 0, .3);
-
-				.lock-img {
-					position: absolute;
-					left: 3rpx;
-					top: 50%;
-					transform: translateY(-50%);
-					width: 50rpx;
-					height: 50rpx;
-					margin-left: 20rpx;
-				}
-
-				.update-title {
-					width: fit-content;
-					height: fit-content;
-					border-radius: 8rpx;
-					font-size: 10px;
-					padding: 6rpx;
-					background-color: #868686;
-					color: #fff;
-				}
-			}
-
-			.lock-wrapper-no {
-				background-color: #f6f6f6;
-			}
-
-			.title {
-				font-size: 16px;
-			}
-		}
-	}
-</style>

+ 0 - 409
pages/client/tuan/index.vue

@@ -1,409 +0,0 @@
-<template>
-	<view>
-		<sub-tabnav :tabs="tabs" @change="changeIndex" :selectIndex="selectIndex" :scrollTop="scrollTop"></sub-tabnav>
-		<!-- #ifdef MP-WEIXIN -->
-		<view class="" style="background: #ffffff;"> 
-			<uni-search-bar @confirm="search" :focus="false" placeholder="请输入搜索内容" v-model="searchValue" @blur="blur" @focus="focus" @input="input"
-							@cancel="cancel" @clear="clear">
-			</uni-search-bar>
-		</view>
-		<!-- #endif -->
-		<view v-if="selectIndex==0" class="mt15" style="margin:30upx 30upx 0 30upx;box-shadow: 0px 4px 20px 0px rgba(0,0,0,0.04);">
-			<home-banner :banners="banners"></home-banner>
-		</view>
-		
-		<sub-tabvs class="pt5" v-if="selectIndex==1 && typetab[1]" :tabs="typetab" @change="changetype" :selectIndex="selecttype" :scrollTop="scrollTop"></sub-tabvs>
-		<sub-tabvs class="pt5" v-if="selectIndex==1 && addddtab[1]" :tabs="addddtab" @change="changeadddd" :selectIndex="selectadddd" :scrollTop="scrollTop"></sub-tabvs>
-		<sub-tabvs class="pt5" v-if="selectIndex==1 && yeartab[1]" :tabs="yeartab" @change="changeyear" :selectIndex="selectyear" :scrollTop="scrollTop"></sub-tabvs>
-		
-		<sub-tabvs class="pt5" v-if="selectIndex==2 && type2tab[1]" :tabs="type2tab" @change="changetype2" :selectIndex="selecttype2" :scrollTop="scrollTop"></sub-tabvs>
-		<sub-tabvs class="pt5" v-if="selectIndex==3 && type3tab[1]" :tabs="type3tab" @change="changetype3" :selectIndex="selecttype3" :scrollTop="scrollTop"></sub-tabvs>
-		<sub-tabvs class="pt5" v-if="selectIndex==4 && type4tab[1]" :tabs="type4tab" @change="changetype4" :selectIndex="selecttype4" :scrollTop="scrollTop"></sub-tabvs>
-		<view class="pd20_15">
-			<block v-for="(value,key) in listData" :key="key">
-			<view class="box pd16_15 flex alcenter mb16" style="position: relative;" @click="detail(value.id,value.lx)">
-				<image mode="aspectFill" class="tuan-product-l" :src="value.img"></image>
-				<view class="btn-mini" style="position: absolute; top: 40upx; left: 280upx; border-radius: 10upx;font-size: 18upx;width: 60upx; height: 36upx;" :style="getBtnStyle">{{value.lxname}}</view>
-				<view class="tuan-product-r pl15">
-					<view class="ft14 ftw600 cl-main text-over2">{{value.name}}</view>
-					<view class="mt16">
-						<text class="ft12 cl-orange">会员价</text>
-						<text class="ft12 cl-orange">¥</text>
-						<text class="ft16 cl-orange ftw600">{{value.vipprice}}</text>
-						<text class="ml15 ft12 cl-notice text-line">¥{{value.price}}</text>
-					</view>
-					<view class="mt16 flex space alcenter">
-						<view class="ft12 cl-notice">{{value.updatetime}}</view>
-					</view>
-				</view>
-			</view>
-			</block>
-			<uni-load-more :status="status" :content-text="contentText" />
-			<!-- <uni-pagination title="" @change="onPageChange" v-if="total>pageSize" show-icon="true" :pageSize="pageSize" :total="total" current="1"></uni-pagination> -->
-		</view>
-		
-		<!-- <dialog-login v-if="showLogin" @loginYes="loginYes" @closed="showLogin = false"></dialog-login> -->
-		<!-- <com-footer model="tuan"></com-footer> -->
-		
-	</view>
-</template>
-
-<script>
-	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-	  export default {
-		  components: {
-		  	uniLoadMore
-		  },
-		data(){
-			return {
-				banners:[],
-				vipLevel:0,
-				isLogin:true,
-				showLogin:false,
-				datasa:[],
-				dataconfig:[],
-				searchValue:'',
-				
-				tabs:[
-					{name:'全部'},
-					{name:'视频'},
-					// {name:'音频'},
-					// {name:'小说'},
-					// {name:'壁纸'},
-				],
-				selectIndex:0,
-				scrollTop:0,
-				
-				type2tab:[],
-				selecttype2:0,
-				type2id:'',
-				
-				type3tab:[],
-				selecttype3:0,
-				type3id:'',
-				
-				type4tab:[],
-				selecttype4:0,
-				type4id:'',
-				
-				typetab:[],
-				selecttype:0,
-				typeid:'',
-				
-				addddtab:[],
-				selectadddd:0,
-				addddid:'',
-				
-				yeartab:[],
-				selectyear:0,
-				yearid:'',
-				
-				type:'',
-				keytext:'',
-				listData: [],
-				total:0,
-				pageSize:10,
-				last_id: 0,
-				reload: true,
-				status: 'more',
-				contentText: {
-					contentdown: '上拉加载更多',
-					contentrefresh: '加载中',
-					contentnomore: '没有数据了'
-				}
-			}
-		},
-		onLoad(e){
-			//console.log(111)
-			if(e.selectIndex){
-				this.selectIndex=e.selectIndex*1
-			}
-			this.status = 'more';
-			this.getList();
-			this.banners=uni.getStorageSync("config").banner
-		},
-		onPageScroll(e){
-			this.scrollTop = e.scrollTop;
-		},
-		onReachBottom() {
-			this.status = 'more';
-			this.getList();
-		},
-		//监听搜索框文本变化
-		onNavigationBarSearchInputChanged(e) {
-			let text = e.text;
-			if(text){
-				this.keytext=text;	
-			}
-			console.log(text)
-		},
-		//监听点击搜索按钮事件
-		onNavigationBarSearchInputConfirmed(e) {
-			// #ifdef APP-PLUS
-			plus.key.hideSoftKeybord();
-			// #endif
-			var this_=this
-			let text = e.text;
-			if (!text) {
-				uni.showModal({
-					title: '',
-					content:"请输入搜索内容",
-					showCancel: false,
-					confirmText: "确定",
-					confirmColor:"#e19503",
-					success: function (res) {
-						this_.keytext='';
-						this_.getList(0)
-					}
-				});
-				return;
-			} else {
-				this.keytext=text;
-				this.listData=[];
-				this.last_id=0;
-				this.type='';	
-				this.getList(0)
-			}
-			
-		},
-		methods:{
-			detail(id,lx){
-				console.log(lx);
-				if(lx==1){
-					var fxpid=1
-					if(uni.getStorageSync("userinfo")){
-						 fxpid=uni.getStorageSync("userinfo").id
-					}
-					uni.navigateTo({
-						url:'/pages/video/index?id='+id+'&fxpid='+fxpid
-					})
-				}else if(lx==2){
-					uni.navigateTo({
-						url:'/pages/client/tuan/info?id='+id
-					})
-				}else if(lx==3){
-					uni.navigateTo({
-						url:'/pages/client/tuan/info?id='+id
-					})
-				}else if(lx==4){
-					uni.navigateTo({
-						url:'/pages/client/tuan/infotp?id='+id
-					})
-				}else{
-					uni.navigateTo({
-						url:'/pages/client/tuan/list?id='+id
-					})
-				}
-			},
-			onPageChange(e) {
-			    this.last_id=0
-			    this.reload=true
-			    this.getList()
-				uni.pageScrollTo({
-				    scrollTop: 0,
-				    duration: 100
-				});
-			},
-			getList() {
-				let data = {
-					//column: 'id,post_id,title,author_name,cover,published_at' //需要的字段名
-				};
-				var limit=10;
-				if (this.last_id>0) {
-					//说明已有数据,目前处于上拉加载
-					this.status = 'loading';
-					data.offset = this.last_id*limit;
-					data._ = new Date().getTime() + '';
-				}
-				data.limit=limit		
-				
-				if(this.selectIndex){
-					data.lx=this.selectIndex
-				}
-				if(this.typeid && this.selectIndex==1){
-					data.typeid=this.typeid
-				}
-				if(this.addddid && this.selectIndex==1){
-					data.addddid=this.addddid
-				}
-				if(this.yearid && this.selectIndex==1){
-					data.yearid=this.yearid
-				}
-				if(this.type2id && this.selectIndex==2){
-					data.typeid=this.type2id
-				}
-				if(this.type3id && this.selectIndex==3){
-					data.typeid=this.type3id
-				}
-				if(this.type4id && this.selectIndex==4){
-					data.typeid=this.type4id
-				}
-				if(this.keytext){
-					data.keytext=this.keytext
-				}
-				uni.request({
-					url: this.configs.webUrl+'/api/video/lists',
-					data: data,
-					success: data => {
-						//console.log(data.data)
-						
-						this.yeartab=data.data.typedata.year
-						this.addddtab=data.data.typedata.adddd
-						this.typetab=data.data.typedata.type
-						this.type2tab=data.data.typedata.type2
-						this.type3tab=data.data.typedata.type3
-						this.type4tab=data.data.typedata.type4
-						
-						if (data.data.total>0) {
-							let list = data.data.rows;
-							this.listData = this.reload ? list : this.listData.concat(list);
-							this.reload = false;
-							this.last_id = this.last_id+1;
-							if(data.data.total<this.last_id*limit){
-								this.status = '';
-							}
-						}else{
-							this.listData=[];
-							this.contentText.contentdown='没有数据'
-							this.status=''
-							
-						}
-					},
-					fail: (data, code) => {
-						//console.log('fail' + JSON.stringify(data));
-					}
-				});
-			},
-			changeIndex(index){
-				this.selectIndex = index;
-				this.type=this.tabs[index].name
-				this.getdata()				
-			},
-			changetype(index){
-				this.selecttype = index;
-				this.typeid=this.typetab[index].id
-				this.getdata()				
-			},
-			changeadddd(index){
-				this.selectadddd = index;
-				this.addddid=this.addddtab[index].id
-				this.getdata()				
-			},
-			changeyear(index){
-				this.selectyear = index;
-				this.yearid=this.yeartab[index].id
-				this.getdata()				
-			},
-			
-			changetype2(index){
-				this.selecttype2 = index;
-				this.type2id=this.type2tab[index].id
-				this.getdata()				
-			},
-			changetype3(index){
-				this.selecttype3 = index;
-				this.type3id=this.type3tab[index].id
-				this.getdata()				
-			},
-			changetype4(index){
-				this.selecttype4 = index;
-				this.type4id=this.type4tab[index].id
-				this.getdata()				
-			},
-			getdata(){
-				this.last_id=0
-				this.reload=true
-				this.getList()
-			},
-			loginYes(){
-				
-			},
-			mlinkTo(e){
-				if(this.isLogin == true){
-					let link = e.currentTarget.dataset.link;
-				}else{
-					this.showLogin = true;
-				}
-			},
-			search(res) {
-				this.listData=[];
-				this.last_id=0;
-				this.keytext=res.value;
-				this.type='';	
-				this.getList(0)
-			},
-	
-			clear(res) {
-			
-			},
-			input(res) {
-				console.log('----input:', res)
-			},
-			blur(res) { 
-				// this.listData=[];
-				// this.last_id=0;
-				// this.keytext=res.value;
-				// this.type='';	
-				// this.getList(0)
-				//res.value 
-			},
-			focus(e) {
-
-			},
-			cancel(res) {
-				this.keytext='';
-				this.type='';	
-				this.getList(0)
-			}
-		}
-	}
-</script>
-
-<style>
-
-	.user-not-vip{
-		width: 100%;
-		height: 80rpx;
-		background: #FDF6EC;
-		border-radius: 40rpx;
-		border: 2rpx solid #EFC381;
-		text-align: center;
-		line-height: 76rpx;
-		font-size: 24rpx;
-		color:#000000;
-		font-weight: bold;
-	}
-	
-
-	.tuan-product-l{
-		width: 320rpx;
-		height: 240rpx;
-		border-radius: 16rpx;
-		background: #F2F2F2;
-	}
-	.tuan-product-r{
-		width: calc(100% - 320rpx);
-	}
-	.search-result {
-			padding-top: 10px;
-			padding-bottom: 20px;
-			text-align: center;
-		}
-	
-		.search-result-text {
-			text-align: center;
-			font-size: 14px;
-			color:#666;
-		}
-	
-		.example-body {
-			/* #ifndef APP-NVUE */
-			display: block;
-			/* #endif */
-			padding: 0px;
-		}
-	
-		.uni-mt-10 {
-			margin-top: 10px;
-		}
-</style>

+ 0 - 380
pages/client/tuan/info.vue

@@ -1,380 +0,0 @@
-<template>
-	<view>
-		<view class="tuan-detail-header">
-			<swiper :indicator-dots="true" indicator-color="rgba(255,255,255,.3)" indicator-active-color="#ffffff" class="tuan-detail-swiper" :autoplay="true"  :interval="3000" :duration="400">
-				 <swiper-item>
-					 <image :src="info.img" mode="aspectFill"></image>
-				 </swiper-item>
-			</swiper>
-		</view>
-		<view class="tuan-detail-tit pd20_15">
-			<view class="ft18 cl-main ftw600"><text class="ft18 cl-main ftw600" style="color: #F14844;">【{{info.lxname}}】</text>{{info.name}}</view>
-			<view class="flex alcenter space mt12">
-				<view class="flex alcenter">
-					<text class="ft14 cl-orange">会员价:</text>
-					<text class="ft16 cl-orange ftw600">¥{{info.vipprice}}</text>
-					<text class="ml10 ft12 cl-notice">普通价:</text>
-					<text class="ft12 cl-notice text-line">¥{{info.price}}</text>
-				</view>
-				<view class="cl-notice ft12">{{info.updatetime}}</view>
-			</view>
-		</view>
-		<view class="tuan-detail-content mt4">
-			<view class="tuan-detail-content-tab bd-bottom">
-					<sub-tab :tabs="tabs" :selectIndex="selectIndex" @change="changeIndex"></sub-tab>
-			</view>
-			<view v-if="selectIndex == 0" class="pd16_15">
-				<view class="row" >
-					<view style="display: flex;" v-for="(value,key) in info.video" :key="key">
-						<view style="width: 100%;" @click="op(info.id,value.id,value.lx)" class="mini-btn ft14" :type="info.pid==value.id?'primary':'primary'" size="mini">{{value.name}}</view>
-						<button @click="op(info.id,value.id,value.lx)" v-if="value.isplay==1"  style="background: #e4e2e2; margin-top: -10upx; width: 180upx; height: 56upx; padding: 0upx 10upx;" size="mini">{{ value.lx==3 ? '阅读' : '播放' }}</button>
-						<button @click="buys(value)" v-else style="background: #e4e2e2; margin-top: -10upx; width: 180upx; height: 56upx; padding: 0upx 10upx;" size="mini">购买</button>
-					</view>
-				</view>
-			</view>
-			<view v-if="selectIndex == 1" class="pd16_15">
-				<view class="ft14 cl-main  lh20 mb16">
-					<rich-text :nodes="info.info"></rich-text>
-				</view>
-			</view>
-		</view>
-		<view class="mt24" style="margin:30upx 30upx 0 30upx;box-shadow: 0px 4px 20px 0px rgba(0,0,0,0.04);">
-			<home-banner :banners="banners"></home-banner>
-		</view>
-		<home-default :datasa="datasa"></home-default>
-		<view class="form-footer-h">
-			<view class="form-footer-h form-footer">
-				<view class="form-footer-main pd10_15 flex alcenter space">
-						
-						<view class="flex alcenter space" style="width: calc(100% - 400rpx);">
-							<navigator open-type="reLaunch" url="/pages/client/index">
-								<view class="form-footer-item text-center">
-									<view class="iconfont iconicon_bottom_home ft22"></view>
-									<view class="ft12 mt8">首页</view>
-								</view>
-							</navigator>
-							
-							<view @click="contactAct" class="form-footer-item text-center ">
-								<view class="iconfont iconicon_bottom_call ft22"></view>
-								<view class="ft12 mt8">联系</view>
-							</view>
-							<button @click="vipcard" class="form-footer-item text-center ">
-								<view class="iconfont icontabbar01 ft22"></view>
-								<view class="ft12 mt8">开通VIP</view>
-							</button>
-						</view>
-						<button v-if="info.isplay==0" @click="buyAct" class="btn-big" style="width: 288rpx;" :style="getBtnStyle">¥{{price}}购买</button>
-						<button v-if="info.isplay==1" class="btn-big" style="width: 288rpx; color: #ffffff; background: #C0C0C0!important;">{{isplaytext}}</button>
-						
-				</view>
-			</view>
-		</view>
-		
-		<dialog-login v-if="showLogin" @loginYes="loginYes" @closed="showLogin = false"></dialog-login>
-		
-	</view>
-</template>
-
-<script>
-export default {
-		data(){
-			return {
-				isLogin:false,
-				showLogin:false,
-				autoplay:false,
-				playbtn:true,
-				selectIndex:0,
-				tabs:['目录','详情'],
-				nextStep:'',
-				datasa:[],
-				dataconfig:[],
-				id:'',
-				mid:0,
-				info:[],
-				dda:'',
-				price:'',
-				banners:[],
-				isplaytext:'已经购买',
-				audioAction: {
-				    method: 'pause'
-				}
-			}
-		},
-		onLoad(option){
-			this.dda=uni.createVideoContext('myVideo')
-			if(option.id){
-				this.id=option.id
-			}
-			if(option.mid){
-				this.mid=option.mid
-			}
-			this.getList();
-		},
-		onShow() {
-			this.getinfo(this.id);
-			if(uni.getStorageSync("userinfo").token){
-				this.isLogin = true
-				this.showLogin = false
-			}
-			this.banners=uni.getStorageSync("config").banner
-		},
-		onHide() {
-			this.dda.pause()
-		},
-		onShareAppMessage(e){
-			
-		},
-		onShareTimeline(e){
-			
-		},
-		methods:{
-			buys(value){
-				let dataa = {};
-				this.info.priced=value.price
-				this.info.vippriced=value.vipprice
-				this.info.pricedbuy=this.info.price
-				if(uni.getStorageSync("userinfo").token){
-					if(this.info.isvip>1){
-						this.info.pricedbuy=value.vipprice
-					}
-				}
-				console.log(value)
-				
-				uni.setStorage({//缓存配置信息
-					key: 'buydata',  
-					data: this.info
-				})
-				uni.navigateTo({
-					url:'/pages/client/tuan/buy?id='+this.id+'&mid='+value.id
-				})	
-			},
-			timeupdate(event){
-					let _this=this;
-					let currentTime = event.detail.currentTime 
-					if(currentTime>this.info.mrseek && this.info.isplay==0){
-						 //dda.exitFullScreen()
-						 this.dda.seek(this.info.mrseek)
-						 this.dda.pause()
-						 this.dda.stop()
-						 uni.showModal({
-							title: '温馨提示',
-							content: '没权限观看当前视频',
-							showCancel: false,
-							confirmText: "确定",
-							success: function (res) {
-								if (res.confirm) {
-									
-								} else if (res.cancel) {
-									
-								}
-							}
-						 });
-					}
-			},
-			getinfo(id) {
-				uni.showLoading({
-				    title: '加载中'
-				});
-				let data = {};
-				data.id=id
-				data.mid=this.mid
-				if(uni.getStorageSync("userinfo").token){
-					data.token=uni.getStorageSync("userinfo").token
-					this.isLogin = true
-				}
-				uni.request({
-					url: this.configs.webUrl+'/api/video/info',
-					data: data,
-					success: data => {
-							uni.hideLoading();
-							if(uni.getStorageSync("userinfo").token){
-								if(data.data.isvip>1){
-									this.price=data.data.vipprice
-								}else{
-									this.price=data.data.price
-								}
-							}else{
-								this.price=data.data.price
-							}
-							data.data.pricebuy=this.price
-							this.info=[];
-							this.info=data.data
-							
-							if(data.data.isvip>1){
-								if(data.data.vipprice*1==0){
-									this.isplaytext='VIP免费'
-								}
-							}else{
-								if(data.data.price*1==0){
-									this.isplaytext='免费视频'
-								}
-							}
-							uni.setNavigationBarTitle({
-							    title: this.info.name
-							});
-					},
-					fail: (data, code) => {
-						uni.hideLoading();
-					}
-				});
-			},
-			getList() {
-				let data = {
-					//column: 'id,post_id,title,author_name,cover,published_at' //需要的字段名
-				};
-				var limit=10;
-				data.limit=limit
-				data.ishot=2
-				uni.request({
-					url: this.configs.webUrl+'/api/video/lists',
-					data: data,
-					success: data => {
-						
-						uni.setStorage({//缓存配置信息
-							key: 'config',  
-							data: data.data.config
-						})
-						if (data.data.total>0) {
-							this.dataconfig=data.data.config
-							this.datasa=data.data.rows
-						}
-					},
-					fail: (data, code) => {
-					}
-				});
-			},
-			contactAct(){
-				if(this.isLogin == false){
-					this.showLogin = true;
-					this.nextStep = 'contact';
-				}else{
-					uni.navigateTo({
-						url:'/pages/client/vipcard/adviser'
-					})
-				}
-			},
-			vipcard(){
-				uni.navigateTo({
-					url:'/pages/client/vipcard/index'
-				})
-			},
-			op(id,mid,lx){
-				if(lx==1){
-					var fxpid=1
-					if(uni.getStorageSync("userinfo")){
-						 fxpid=uni.getStorageSync("userinfo").id
-					}
-					uni.navigateTo({
-						url:'/pages/video/index?id='+id+'&mid='+mid+'&fxpid='+fxpid
-					})
-				}else if(lx==2){
-					uni.navigateTo({
-						url:'/pages/client/tuan/audio?id='+id+'&mid='+mid
-					})
-				}else if(lx==3){
-					uni.navigateTo({
-						url:'/pages/client/tuan/text?id='+id+'&mid='+mid
-					})
-				}else{
-					uni.navigateTo({
-						url:'/pages/client/tuan/list?id='+id+'&mid='+mid
-					})
-				}
-			},
-			buyAct(){
-				if(this.price*1==0){
-					uni.showToast({ title: '免费视频不需要购买',icon:"none" });
-					return false; 
-				}
-				if(this.isLogin == false){
-					this.showLogin = true;
-					this.nextStep = 'buy';
-				}else{
-					uni.setStorage({//缓存配置信息
-						key: 'buydata',  
-						data: this.info
-					})
-					uni.navigateTo({
-						url:'/pages/client/tuan/buy?id='+this.id
-					})
-				}
-			},
-			loginYes(){
-				if(this.nextStep == 'buy'){
-					uni.navigateTo({
-						url:'/pages/client/tuan/buy'
-					})
-				}else{
-					uni.navigateTo({
-						url:'/pages/client/vipcard/adviser'
-					})
-				}
-			},
-			changeIndex(index){
-				this.selectIndex = index;
-			}
-		}
-	}
-</script>
-
-<style>
-	.user-not-vip{
-		width: 100%;
-		height: 80rpx;
-		background: #FDF6EC;
-		border-radius: 40rpx;
-		border: 2rpx solid #EFC381;
-		text-align: center;
-		line-height: 76rpx;
-		font-size: 24rpx;
-		color:#000000;
-		font-weight: bold;
-	}
-	
-	.tuan-detail-header{
-		position: relative;
-	}
-	.tuan-detail-swiper{
-		height: 500rpx;
-	}
-	.tuan-detail-swiper image{
-		width: 100%;
-		height: 500rpx;
-		background: #F2F2F2;
-	}
-	.tuan-detail-tit{
-		width: 100%;
-		background: #FFFFFF;
-		border-radius: 40rpx 40rpx 0rpx 0rpx;
-		position: relative;
-		margin-top: 20rpx;
-	}
-	.tuan-detail-content-tab{
-		height: 102rpx;
-	}
-	.tuan-detail-content{
-		/* min-height: calc(100vh - 600rpx); */
-		background: #FFFFFF;
-	}
-	.tuan-product-l{
-		width: 320rpx;
-		height: 240rpx;
-		border-radius: 16rpx;
-		background: #F2F2F2;
-	}
-	.tuan-product-r{
-		width: calc(100% - 320rpx);
-	}
-	.cl-orange1{
-		margin-right: 10upx;
-		padding: 15upx;
-		border: 1px solid #CCCCCC;
-	}
-	.mini-btn{
-		margin-left: 10upx;
-		margin-bottom: 20upx;
-		height: 60upx;
-		color: #666666;
-		border-bottom: 1px solid #f0f0f0;
-	}
-</style>

+ 0 - 746
pages/client/tuan/infotp.vue

@@ -1,746 +0,0 @@
-<template>
-	<view class="">
-		<view class="" @touchmove.stop.prevent="a = false" @catchtouchmove="a = false" v-show="!loadFlag">
-			<view class="" style="">
-				<swiper style="height: 100vh;width: 100vw;" :circular="true" @change="swiperChange" :current="activeCurrent">
-					<swiper-item v-for="(item,index) in detail.images" :key="index">
-						<image :src="item" @click="cssClick" style="height: 100vh;width: 100vw;display: flex;" mode="aspectFill"></image>
-					</swiper-item>
-				</swiper>
-			</view>
-			<view class="bottom" :class="cssTran ? 'closeCss' : 'openCss'" v-if="!loadFlag">
-				<view class="num">{{indexCurrent}} / {{detail.imageslength}}</view>
-				<view class="nav-box">
-					<view class="nav-tab" @click="backClick">
-						<image style="width: 50upx; height: 50upx;" :src="staticUrl+'back.png'"></image>
-						<text style="font-size: 24upx;">返回</text>
-					</view>
-					<view class="nav-tab" @click="collectClick()">
-						<image style="width: 50upx; height: 50upx;" :src="isColl?staticUrl+'coll_art.png':staticUrl+'coll.png'"></image>
-						<text style="font-size: 24upx;">{{isColl?'已收藏':'收藏'}}</text>
-					</view>
-					<view class="nav-tab" @click="winClick(detail._id)">
-						<image style="width: 50upx; height: 50upx;" :src="staticUrl+'duihuan.png'"></image>
-						<text style="font-size: 24upx;">下载</text>
-					</view>
-					<view class="nav-tab" @click="zanClick()">
-						<image style="width: 50upx; height: 50upx;" :src="isZan?staticUrl+'zan_art.png':staticUrl+'zan.png'"></image>
-						<text style="font-size: 24upx;">{{isZan?'已点赞':'点赞'}}</text>
-					</view>
-					<view class="nav-tab">
-						<image style="width: 50upx; height: 50upx;" :src="staticUrl+'shares.png'"></image>
-						<text style="font-size: 24upx;">分享</text>
-						
-					</view>
-				</view>
-			</view>
-			<!-- <view v-if="tipsShow" style="position: absolute;top: 0;left: 0;width: 100vw;height: 100vh;z-index: 11;" @click="tipsClick">
-				<image src="../../static/tips.png" style="width: 100%;height: 100%;display: flex;" mode="aspectFill"></image>
-			</view> -->
-		</view>
-		<view class="loading_page" v-show="loadFlag"></view>
-		<pop  
-		    ref="pop" 
-		    direction="center" 
-		    :is_close="true" 
-		    :is_mask="true" 
-		    :width="90"  
-		    height="fit-content" 
-		    :maskFun="true" 
-		    @watchOpen="watchOpen" 
-		    @watchClose="watchClose"
-		>
-		<view>
-			<text class="ffdfgg" v-if="detail.isplay>0" @click="opdownloadFile()">下载</text>
-			<text class="ffdfgg" v-else @click="duihss()">¥{{price}} 兑换下载</text>
-			<!-- #ifdef MP-WEIXIN -->
-			<text class="ffdfgg" @click="adClick()">看广告获取积分</text>
-			<!-- #endif -->
-		</view>
-		</pop>
-	</view>
-</template>
-<script>
-import pop from "@/components/ming-pop/ming-pop.vue";
-let videoAd = null;
-var w = uni.getSystemInfoSync().windowWidth;
-var h = uni.getSystemInfoSync().windowHeight;
-export default {
-	components: {
-		pop
-	},
-	data() {
-		return {
-			loadFlag: true,
-			loginShow: false,
-			detail: {},
-			staticUrl:'',
-			adIntegral: 0,
-			downShow: false,
-			downIntegral: 0,
-			downTitle: '',
-			downBtn: '',
-			adShow: false,
-			
-			isColl: false,
-			isZan: false,
-			zanStatus: true,
-			collStatus: true,
-			
-			cssTran: false,
-			indexCurrent: 1,
-			activeCurrent: 0,
-			
-			id: 0,
-			mid: 0,
-			isplaytext:'',
-			price:0,
-			
-			signShow: false,
-			signTitle: '',
-			w: w,
-			h: h,
-		}
-	},
-	onLoad(e) {
-		this.staticUrl=this.configs.staticUrl
-		var that = this
-		var index =0
-		that.indexCurrent = parseInt(index)+1
-		that.activeCurrent = parseInt(index)
-		that.loadFlag = false
-		if(e.id){
-			this.id=e.id
-			this.getinfo(this.id)
-		}
-	},
-	onShow() {
-		// #ifdef APP-PLUS
-		plus.navigator.setFullscreen(true); 
-		// #endif
-	},
-	onHide() {
-		// #ifdef APP-PLUS
-		plus.navigator.setFullscreen(false); 
-		// #endif 
-	},
-	onUnload(){
-		// #ifdef APP-PLUS
-		plus.navigator.setFullscreen(false); 
-		// #endif 
-	},
-	methods: {
-		
-		getinfo(id) {
-			uni.showLoading({
-			    title: '加载中'
-			});
-			let data = {};
-			data.id=id
-			data.mid=this.mid
-			if(uni.getStorageSync("userinfo").token){
-				data.token=uni.getStorageSync("userinfo").token
-				this.isLogin = true
-			}
-			uni.request({
-				url: this.configs.webUrl+'/api/video/infotp',
-				data: data,
-				success: data => {
-						uni.hideLoading();
-						if(uni.getStorageSync("userinfo").token){
-							if(data.data.isvip>1){
-								this.price=data.data.vipprice
-							}else{
-								this.price=data.data.price
-							}
-						}else{
-							this.price=data.data.price
-						}
-						data.data.pricebuy=this.price
-						//this.info=[];
-						
-						//this.info=data.data
-						this.detail = data.data
-						this.adLoad()
-						if(data.data.isvip>1){
-							if(data.data.vipprice*1==0){
-								this.isplaytext='VIP免费'
-							}
-						}else{
-							if(data.data.price*1==0){
-								this.isplaytext='免费视频'
-							}
-						}
-				},
-				fail: (data, code) => {
-					uni.hideLoading();
-				}
-			});
-		},
-		async getIsZan(){
-			let count = await uniCloud.callFunction({
-				name: 'query_count',
-				data: {
-					dbName: "wx_cover",
-					filter: {
-						"_id": this.detail._id,
-						"zan.user_id": this.vuex_user._id
-					}
-				},
-			})
-			this.zanStatus = false
-			if(count.result > 0) this.isZan = true
-		},
-		async getIsColl(){
-			let count = await uniCloud.callFunction({
-				name: 'query_count',
-				data: {
-					dbName: "wx_cover",
-					filter: {
-						"_id": this.detail._id,
-						"coll.user_id": this.vuex_user._id
-					}
-				},
-			})
-			this.collStatus = false
-			if(count.result > 0) this.isColl = true
-		},
-		opdownloadFile(){
-			var that=this
-			uni.showLoading({
-				title: '正在保存图片'
-			});
-			// 获取图片信息
-			var url = that.detail.images[that.indexCurrent-1]
-			var extension = url.substring(url.lastIndexOf('.') + 1)
-			let fileName = new Date().valueOf();
-			console.log(url)
-			uni.downloadFile({
-				url: url,
-				//filePath: wx.env.USER_DATA_PATH + '/' + fileName + '.' + extension,
-				success: (res) => {
-					var benUrl = res.tempFilePath
-					console.log(res)
-					//图片保存到本地相册
-					uni.saveImageToPhotosAlbum({
-						filePath: benUrl,
-						//授权成功,保存图片
-						success: function(data) {
-							uni.hideLoading()
-							uni.showModal({
-								title: '温馨提示',
-								content: '保存成功',
-								showCancel: false,
-								success(res) {
-									if (res.confirm) {
-										
-									}
-								}
-							});
-						},
-						//授权失败
-						fail: function(err) {
-							if (err.errMsg) {
-								console.log(err.errMsg)
-								//重新授权弹框确认
-								uni.showModal({
-									title: '提示',
-									content: '无权限,请打开下载权限后再试!',
-									showCancel: false,
-									success(res) {
-										if (res.confirm) {
-											//重新授权弹框用户点击了确定
-											uni.openSetting({
-												//进入小程序授权设置页面
-												success(settingdata) {
-													if (settingdata.authSetting['scope.writePhotosAlbum']) {
-														//用户打开了保存图片授权开关
-														uni.saveImageToPhotosAlbum({
-															filePath: benUrl,
-															success: function(data) {
-																uni.hideLoading()
-																that.adShow = true
-															}
-														});
-													} else {
-														//用户未打开保存图片到相册的授权开关
-														uni.showModal({
-															title: '温馨提示',
-															content: '授权失败,请稍后重新获取',
-															showCancel: false
-														});
-													}
-												}
-											});
-										}
-									}
-								});
-							}
-							uni.hideLoading()
-						}
-					});
-				},
-				fail: (error) => {
-					console.log(error)
-				}
-			})
-		},
-		winClick(){
-			if(uni.getStorageSync("userinfo").id){
-				
-			}else{
-				uni.showModal({
-					title: '温馨提示',
-					content: '请先登后下载',
-					showCancel: true,
-					confirmText: "确定",
-					success: function (res) {
-						if (res.confirm) {
-							uni.navigateTo({
-								url:'/pages/login/login'
-							})
-						} else if (res.cancel) {
-							
-						}
-					}
-				});
-				return false;
-			} 
-			var that = this
-			var downIntegral=2
-			if(this.detail.isplay == 0){
-				this.$refs.pop.show();
-			}else{
-				this.opdownloadFile()
-			}
-		},
-		backClick(){
-			uni.navigateBack()
-		},
-		collectClick() {
-			this.isColl=true
-			uni.showToast({
-				icon: 'none',
-				title: '收藏成功',
-				mask: true,
-				duration: 1000
-			})
-		},
-		zanClick(){
-			this.isZan=true
-			uni.showToast({
-				icon: 'none',
-				title: '点赞成功',
-				mask: true,
-				duration: 1000
-			})
-		},
-		cssClick() {
-			this.cssTran = !this.cssTran
-		},
-		swiperChange(e){
-			this.indexCurrent = e.detail.current + 1
-		},
-		adClick(){
-			var mrcs=3
-			var mrcsjr=0
-			if(uni.getStorageSync("config").mrcs && uni.getStorageSync("config").mrcsjr){
-				mrcs=uni.getStorageSync("config").mrcs
-				mrcsjr=uni.getStorageSync("config").mrcsjr
-			}
-			if(mrcsjr>=mrcs){
-				uni.showModal({
-					title: '温馨提示',
-					content: '每日只能看'+mrcs+'次',
-					showCancel: false,
-					confirmText: "确定",
-					success: function (res) {
-						if (res.confirm) {
-							//_this.dyxx()
-							//uni.navigateBack();
-						} else if (res.cancel) {
-							
-						}
-					}
-				});
-				return false;
-			}
-			var that = this
-			if (videoAd) {
-				videoAd.show().catch(err => {
-				// 失败重试
-				// console.log("广告拉去失败")
-					videoAd.load().then(() => videoAd.show())
-				})
-			}
-		},
-		adLoad(){
-			console.log(this.detail.videoids);
-			var that = this
-			if (wx.createRewardedVideoAd) {
-				// 加载激励视频广告
-				// #ifdef MP-QQ
-				videoAd = wx.createRewardedVideoAd({
-					adUnitId: "cbe2baa6cdb9b4f2c75269d000476ee6"
-				});
-				// #endif
-				// #ifdef MP-WEIXIN
-				videoAd = wx.createRewardedVideoAd({
-					adUnitId: that.detail.videoids//微信广告ID
-				});
-				// #endif
-				//捕捉错误
-				videoAd.onError(err => {
-					// 进行适当的提示
-					console.log('videoAd onError', err);
-				});
-				// 监听关闭
-				videoAd.onClose(status => {
-					that.downShow = false
-					if ((status && status.isEnded) || status === undefined) {
-						// 正常播放结束,下发奖励
-						that.admoney()
-						console.log('看完广告')
-					} else {
-						uni.showToast({
-							icon: 'none',
-							title: '播放中途退出,获取失败',
-							mask: true,
-							duration: 1000
-						})
-						// 播放中途退出,进行提示
-						console.log('中途退出')
-					}
-				});
-			}
-		},
-		async userIntegral(){
-			var that = this
-			uni.showLoading({
-				mask: true,
-				title: '加载中...'
-			})
-			let data = await uniCloud.callFunction({
-				name: 'user_integral',
-				data: {
-					userId: that.vuex_user._id
-				},
-			})
-			uni.hideLoading()
-			if(data.result.success){
-				that.getUser()
-				that.signTitle = "<p style='font-weight: 550;font-size: 16px;'>观看成功</p><p style='padding-top: 10px;'>获得<span class='num'>"+data.result.integral+"</span>积分</p>"
-				that.signShow = true
-			}
-		},
-		watchOpen(){},
-		watchClose(){},
-		async admoney(){
-			var this_=this
-			let data = {};
-			if(uni.getStorageSync("userinfo").token){
-				data.token=uni.getStorageSync("userinfo").token
-			}
-			let [err,res] =await this.$httpas.get('/api/user/admoney',data);
-			if (!this.$httpas.errorCheck(err,res)) return;
-			if(res.data.code === 1){
-				uni.setStorage({//缓存配置信息
-					key: 'config',  
-					data: res.data.data
-				})
-				uni.showModal({
-					title: '温馨提示',
-					content: '获取成功 是否马上兑换',
-					showCancel: true,
-					confirmText: "兑换",
-					success: function (ress) {
-						if (ress.confirm) {
-							this_.duihss()
-						} else if (ress.cancel) {
-							
-						}
-					}
-				});
-			}else{
-				uni.showToast({ title: '获取失败',icon:"none" });
-			}
-		},
-		duihss(){
-			var this_=this
-			let data=this.detail;
-			data.sum=1;
-			data.buytype='余额';
-			data.lx=1;//1 全章购买 2单集购买
-			data.smid=0;
-			data.namet=data.name
-			data.pricebuy=data.price
-			data.token = uni.getStorageSync("userinfo").token;
-			data.uid = uni.getStorageSync("userinfo").id; 
-			console.log(data);
-			//return false;
-			uni.request({
-				url: this.configs.webUrl+'/api/pay/videopay',
-				data: data,
-				success: resa =>{
-					//console.log(resa.data);
-					if(data.buytype=='微信'){
-						if(this.wxlx=='wxxcx' && resa.data.code==1){
-							//console.log(resa.data.code);
-							this.wxxcx(resa.data.data);
-						}else{
-							// #ifdef APP-PLUS
-							
-							uni.navigateTo({
-								url:'/pages/client/webva?url='+resa.data.data
-							})
-							//plus.runtime.openURL(res.data.data);
-							// #endif  
-							// #ifdef H5
-							window.open(resa.data.data, "_self")
-							// #endif 
-						}
-					}else if(data.buytype=='余额'){
-						if(resa.data.code==1){
-							//pages/user/task/task
-							uni.showModal({
-								title: '提示',
-								content: '兑换成功',
-								showCancel: false,
-								success: res => {
-									this_.getinfo(this.id)
-									this_.$refs.pop.close(); 
-									this_.opdownloadFile()
-									
-								}
-							});
-						}else{
-							if(resa.data.msg=='余额不足'){
-								uni.showModal({
-									title: '提示',
-									content: '余额不足,看广告可以获取',
-									showCancel: true,
-									confirmText: "看广告",
-									success: res => {
-										this_.adClick()
-									}
-								});
-							}else{
-								uni.showModal({
-									title: '提示',
-									content: resa.data.msg,
-									showCancel: false,
-									success: res => {
-										uni.navigateBack();	
-									}
-								});
-							}
-						}
-					}
-					//thia.okPay(resa)
-				},
-				fail: (data, code) => {
-					console.log('fail' + JSON.stringify(data));
-				}
-			});
-		},
-
-		// 登录
-		getUserInfo(){
-			var that = this
-			wx.getUserProfile({
-			  desc: '更新您的个人信息',
-			  success: (res) => {
-				  that.name = res.userInfo.nickName; //昵称
-				  that.avatar = res.userInfo.avatarUrl; //头像
-				  // 成功后进行登录,获取code
-				  that.wxlogin();
-			  },
-			  fail(err){
-				  uni.showToast({
-				  	icon: 'none',
-				  	title: '授权失败',
-				  	duration: 1500
-				  })
-			  }
-			})
-		},
-		//已经授权,自动登录
-		async wxlogin() {
-			let that = this;
-			uni.showLoading({
-				title: '登录中...'
-			});
-			uni.login({
-				provider: 'weixin',
-				success: function(loginRes) {
-					let code = loginRes.code;
-					that.wxloginres(code);
-				},
-			});
-
-		},
-		//登录后提交服务器获取进一步信息
-		async wxloginres(wxcode) {
-			let that = this;
-
-			var userId = uni.getStorageSync('userId')
-
-			var mptype
-			// #ifdef MP-WEIXIN
-				mptype = 'wx'
-			// #endif
-			// #ifdef MP-QQ
-				mptype = 'qq'
-			// #endif
-			
-			let authorize = await uniCloud.callFunction({
-				name: 'user_authorize',
-				data: {
-					name: that.name,
-					avatar: that.avatar,
-					mptype: mptype,
-					code: wxcode,
-					userId: userId,
-				},
-			})
-			if(authorize.result.success){
-				that.$u.vuex('vuex_user',authorize.result.data)
-				// 登陆成功  获取收藏点赞
-				that.getIsZan()
-				that.getIsColl()
-				uni.showToast({
-					icon: 'none',
-					mask: true,
-					title: '登录成功',
-					duration: 1500
-				})
-				uni.removeStorageSync('userId')
-			}else{
-				uni.showToast({
-					icon: 'none',
-					mask: true,
-					title: authorize.result.msg,
-					duration: 1500
-				})
-			}
-			that.loginShow = false
-		},
-	},
-	onShareAppMessage(res) {
-		var that = this
-		setTimeout(function(){
-			that.adShow = false
-		},2000)
-		return {
-			title: '送你一张超级好看的壁纸~',
-			imageUrl: that.detail.images[that.indexCurrent-1],
-			path: '/pages/index/index?userId='+that.vuex_user._id+'&detailId='+that.detail._id+'&index='+(that.indexCurrent-1)
-		}
-	},
-	onShareTimeline(res) {
-		return {
-			title: '我等风也等你,近听水无声~',
-			imageUrl: '/static/share_bg.jpg',
-			path: '/pages/index/index'
-		}
-	}
-}
-</script>
-<style lang="scss">
-	.bottom {
-		position: fixed;
-		left: 4%;
-		right: 0;
-		width: 92%;
-		height: 52px;
-		box-shadow: 0 0px 8px rgba(0, 0, 0, 0.06);
-		background: rgba(0, 0, 0, 0.94);
-		border-radius: 49px;
-		z-index: 10;
-		opacity: 0.8;
-		.num{
-			position: absolute;
-			top: -20rpx;
-			top: -70rpx;
-			left: 44%;
-			background: rgba(0,0,0,0.6);
-			color: #FFF;
-			padding: 4rpx 20rpx;
-			font-size: 12px;
-			border-radius: 36px;
-		}
-	}
-
-	.nav-tab {
-		position: relative;
-		width: 100%;
-		height: 52px;
-		font-size: 12px;
-		color: #D8D8D8;
-		font-weight: 400;
-
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-	}
-	.nav-box {
-		/* position: absolute; */
-		display: flex;
-		flex-direction: row;
-		justify-content: space-around;
-		width: 100%;
-		box-sizing: border-box;
-	}
-
-	.openCss {
-		animation-name: openLinear;
-		animation-duration: 0.8s;
-		animation-iteration-count: 1;
-		bottom: 40px;
-	}
-
-	@keyframes openLinear {
-		0% {
-			transform: translateY(92px);
-		}
-		100% {
-			transform: translateY(0px);
-		}
-	}
-
-	.closeCss {
-		animation-name: closeLinear;
-		animation-duration: 0.8s;
-		animation-iteration-count: 1;
-		bottom: -52px;
-	}
-	.ffdfgg{
-		font-size: 28upx; 
-		text-align: center; 
-		height: 100upx; 
-		line-height: 100upx; 
-		display: block;
-		background: #00C657;
-		color: #fff;
-		border-radius: 10upx;
-		margin-top: 20upx;
-	}
-	@keyframes closeLinear {
-		0% {
-			transform: translateY(-92px);
-		}
-		100% {
-			transform: translateY(0px);
-		}
-	}
-	
-	.u-indicator-item-number {
-		padding: 6rpx 16rpx;
-		line-height: 1;
-		background-color: rgba(0, 0, 0, 0.3);
-		border-radius: 100rpx;
-		font-size: 26rpx;
-		color: rgba(255, 255, 255, 0.8);
-	}
-</style>

+ 0 - 336
pages/client/tuan/list.vue

@@ -1,336 +0,0 @@
-<template>
-	<view>
-		<view class="tuan-detail-header">
-			<swiper v-if="info.lx==1" :indicator-dots="true" indicator-color="rgba(255,255,255,.3)" indicator-active-color="#ffffff" class="tuan-detail-swiper" :autoplay="true"  :interval="3000" :duration="400">
-				 <swiper-item style="text-align: center;">
-					<video  id="myVideo" :poster="info.img" :show-center-play-btn="playbtn" :autoplay="autoplay"  style="width: 100%;" @timeupdate="timeupdate"  :src="info.videourl"></video>
-				 </swiper-item>
-			</swiper>
-		</view>
-		<view class="row" style="margin-bottom: 40upx;">
-			<block v-for="(value,key) in info.video" :key="key">
-				<button @click="op(info.id,value.id,value.lx)" class="mini-btn ft12" :type="info.pid==value.id?'warn':'primary'" size="mini">{{value.name}}</button>
-			</block>
-		</view>
-		<view class="tuan-detail-tit pd20_15">
-			<view class="ft18 cl-main ftw600">{{info.name}}</view>
-			<view class="flex alcenter space mt12">
-				<view class="flex alcenter">
-					<text class="ft14 cl-orange">会员价:</text>
-					<text class="ft16 cl-orange ftw600">¥{{info.vipprice}}</text>
-					<text class="ml10 ft12 cl-notice">普通价:</text>
-					<text class="ft12 cl-notice text-line">¥{{info.price}}</text>
-				</view>
-				<view class="cl-notice ft12">{{info.updatetime}}</view>
-			</view>
-
-		</view>
-		<view class="mt24" style="margin:30upx 30upx 0 30upx;box-shadow: 0px 4px 20px 0px rgba(0,0,0,0.04);">
-			<home-banner :banners="banners"></home-banner>
-		</view>
-		<home-default :datasa="datasa"></home-default>
-		<view class="form-footer-h">
-			<view class="form-footer-h form-footer">
-				<view class="form-footer-main pd10_15 flex alcenter space">
-						
-						<view class="flex alcenter space" style="width: calc(100% - 400rpx);">
-							<navigator open-type="reLaunch" url="/pages/client/index">
-								<view class="form-footer-item text-center">
-									<view class="iconfont iconicon_bottom_home ft22"></view>
-									<view class="ft12 mt8">首页</view>
-								</view>
-							</navigator>
-							<view @click="contactAct" class="form-footer-item text-center ">
-								<view class="iconfont iconicon_bottom_call ft22"></view>
-								<view class="ft12 mt8">联系</view>
-							</view>
-							<button @click="vipcard" class="form-footer-item text-center ">
-								<view class="iconfont icontabbar01 ft22"></view>
-								<view class="ft12 mt8">开通VIP</view>
-							</button>
-						</view>
-						<button v-if="info.isplay==0" @click="buyAct" class="btn-big" style="width: 288rpx;" :style="getBtnStyle">¥{{price}}购买</button>
-						<button v-if="info.isplay==1" class="btn-big" style="width: 288rpx; color: #ffffff; background: #C0C0C0!important;">{{isplaytext}}</button>
-				</view>
-			</view>
-		</view>
-		<dialog-login v-if="showLogin" @loginYes="loginYes" @closed="showLogin = false"></dialog-login>
-	</view>
-</template>
-
-<script>
-export default {
-		data(){
-			return {
-				isLogin:false,
-				showLogin:false,
-				autoplay:false,
-				playbtn:true,
-				selectIndex:0,
-				tabs:['详情'],
-				nextStep:'',
-				datasa:[],
-				dataconfig:[],
-				id:'',
-				mid:0,
-				info:[],
-				dda:'',
-				price:'',
-				banners:[],
-				isplaytext:'已经购买',
-				audioAction: {
-				    method: 'pause'
-				}
-			}
-		},
-		onLoad(option){
-			this.dda=uni.createVideoContext('myVideo')
-			if(option.id){
-				this.id=option.id
-			}
-			if(option.mid){
-				this.mid=option.mid
-			}
-			this.getList();
-		},
-		onShow() {
-			this.$zaudio.stop();
-			this.getinfo(this.id);
-			if(uni.getStorageSync("userinfo").token){
-				this.isLogin = true
-				this.showLogin = false
-			}
-			this.banners=uni.getStorageSync("config").banner
-		},
-		onHide() {
-			this.dda.pause()
-		},
-		onShareAppMessage(e){
-			
-		},
-		onShareTimeline(e){
-			
-		},
-		methods:{
-			timeupdate(event){
-					let _this=this;
-					let currentTime = event.detail.currentTime 
-					if(currentTime>this.info.mrseek && this.info.isplay==0){
-						 //dda.exitFullScreen()
-						 this.dda.seek(this.info.mrseek)
-						 this.dda.pause()
-						 this.dda.stop()
-						 uni.showModal({
-							title: '温馨提示',
-							content: '没权限观看当前视频',
-							showCancel: false,
-							confirmText: "确定",
-							success: function (res) {
-								if (res.confirm) {
-									
-								} else if (res.cancel) {
-									
-								}
-							}
-						 });
-					}
-			},
-			getinfo(id) {
-				let data = {};
-				data.id=id
-				data.mid=this.mid
-				if(uni.getStorageSync("userinfo").token){
-					data.token=uni.getStorageSync("userinfo").token
-					this.isLogin = true
-				}
-				uni.request({
-					url: this.configs.webUrl+'/api/video/info',
-					data: data,
-					success: data => {
-							if(uni.getStorageSync("userinfo").token){
-								if(data.data.isvip>1){
-									this.price=data.data.vipprice
-								}else{
-									this.price=data.data.price
-								}
-							}else{
-								this.price=data.data.price
-							}
-							data.data.pricebuy=this.price
-							this.info=[];
-							this.info=data.data
-							
-							if(data.data.isvip>1){
-								if(data.data.vipprice*1==0){
-									this.isplaytext='VIP免费'
-								}
-							}else{
-								if(data.data.price*1==0){
-									this.isplaytext='免费视频'
-								}
-							}
-							uni.setNavigationBarTitle({
-							    title: this.info.name
-							});
-					},
-					fail: (data, code) => {
-					}
-				});
-			},
-			getList() {
-				let data = {
-					//column: 'id,post_id,title,author_name,cover,published_at' //需要的字段名
-				};
-				var limit=10;
-				data.limit=limit
-				data.ishot=2
-				uni.request({
-					url: this.configs.webUrl+'/api/video/lists',
-					data: data,
-					success: data => {
-						
-						uni.setStorage({//缓存配置信息
-							key: 'config',  
-							data: data.data.config
-						})
-						if (data.data.total>0) {
-							this.dataconfig=data.data.config
-							this.datasa=data.data.rows
-						}
-					},
-					fail: (data, code) => {
-					}
-				});
-			},
-			contactAct(){
-				if(this.isLogin == false){
-					this.showLogin = true;
-					this.nextStep = 'contact';
-				}else{
-					uni.navigateTo({
-						url:'/pages/client/vipcard/adviser'
-					})
-				}
-			},
-			vipcard(){
-				uni.navigateTo({
-					url:'/pages/client/vipcard/index'
-				})
-			},
-			op(id,mid,lx){
-				if(lx==1){
-					var fxpid=1
-					if(uni.getStorageSync("userinfo")){
-						 fxpid=uni.getStorageSync("userinfo").id
-					}
-					uni.navigateTo({
-						url:'/pages/video/index?id='+id+'&mid='+mid+'&fxpid='+fxpid
-					})
-				}else if(lx==2){
-					uni.navigateTo({
-						url:'/pages/client/tuan/audio?id='+id+'&mid='+mid
-					})
-				}else if(lx==3){
-					uni.navigateTo({
-						url:'/pages/client/tuan/text?id='+id+'&mid='+mid
-					})
-				}else{
-					uni.navigateTo({
-						url:'/pages/client/tuan/list?id='+id+'&mid='+mid
-					})
-				}
-			},
-			buyAct(){
-				if(this.price*1==0){
-					uni.showToast({ title: '免费视频不需要购买',icon:"none" });
-					return false; 
-				}
-				if(this.isLogin == false){
-					this.showLogin = true;
-					this.nextStep = 'buy';
-				}else{
-					uni.setStorage({//缓存配置信息
-						key: 'buydata',  
-						data: this.info
-					})
-					uni.navigateTo({
-						url:'/pages/client/tuan/buy?id='+this.id
-					})
-				}
-			},
-			loginYes(){
-				if(this.nextStep == 'buy'){
-					uni.navigateTo({
-						url:'/pages/client/tuan/buy'
-					})
-				}else{
-					uni.navigateTo({
-						url:'/pages/client/vipcard/adviser'
-					})
-				}
-			},
-			changeIndex(index){
-				this.selectIndex = index;
-			}
-		}
-	}
-</script>
-
-<style>
-	.user-not-vip{
-		width: 100%;
-		height: 80rpx;
-		background: #FDF6EC;
-		border-radius: 40rpx;
-		border: 2rpx solid #EFC381;
-		text-align: center;
-		line-height: 76rpx;
-		font-size: 24rpx;
-		color:#000000;
-		font-weight: bold;
-	}
-	
-	.tuan-detail-header{
-		position: relative;
-	}
-	.tuan-detail-swiper{
-		height: 500rpx;
-	}
-	.tuan-detail-swiper image{
-		width: 100%;
-		height: 500rpx;
-		background: #F2F2F2;
-	}
-	.tuan-detail-tit{
-		width: 100%;
-		background: #FFFFFF;
-		border-radius: 40rpx 40rpx 0rpx 0rpx;
-		position: relative;
-		margin-top: -32rpx;
-	}
-	.tuan-detail-content-tab{
-		height: 102rpx;
-	}
-	.tuan-detail-content{
-		min-height: calc(100vh - 600rpx);
-		background: #FFFFFF;
-	}
-	.tuan-product-l{
-		width: 320rpx;
-		height: 240rpx;
-		border-radius: 16rpx;
-		background: #F2F2F2;
-	}
-	.tuan-product-r{
-		width: calc(100% - 320rpx);
-	}
-	.cl-orange1{
-		margin-right: 10upx;
-		padding: 15upx;
-		border: 1px solid #CCCCCC;
-	}
-	.mini-btn{
-		margin-left: 10upx;
-		margin-bottom: 10upx;
-	}
-</style>

BIN
pages/client/tuan/loading.gif


+ 0 - 92
pages/client/tuan/share.vue

@@ -1,92 +0,0 @@
-<template>
-	<view class="pd16_15">
-		<view class="box noshadow pd16_15">
-			<view class="flex alcenter">
-				<image class="adviser-face-big" :src="statics.defaultFace"></image>
-				<view style="width: calc(100% - 160rpx);" class=" pl15">
-					<view class="ft16 cl-main ftw600">张顾问</view>
-					<view class="flex alcenter mt8">
-						<view class="flex alcenter cl-notice">
-							<text class="iconfont iconicon_weixin ft14"></text>
-							<text class="ft14 ml5">ffy1203605498</text>
-						</view>
-						<view class="copy-tag ml10" :style="{background:tempColor}">复制</view>
-					</view>
-					<view class="flex alcenter space mt8">
-						<view class="flex alcenter cl-notice">
-							<text class="iconfont iconicon_call ft14"></text>
-							<text class="ft14 ml5">13515608638</text>
-						</view>
-						
-						<text class="iconfont iconicon_bottom_call ft20" :style="{color:tempColor}"></text>
-					</view>
-				</view>
-			</view>
-			<view class="mt24">
-				<button class="btn-mid plan" style="width: 100%;" :style="getBtnPlanStyle">
-					绑定顾问
-				</button>
-			</view>
-		</view>
-		
-		<navigator url="/pages/video/index">
-		<view class="box pd16_15 flex alcenter mt24">
-			<image class="tuan-product-l"></image>
-			<view class="tuan-product-r pl15">
-				<view class="ft14 ftw600 cl-main text-over2">洗剪吹加护理一次套餐 会员只需5…</view>
-				<view class="mt16">
-					<text class="ft12 cl-orange">会员价</text>
-					<text class="ft12 cl-orange">¥</text>
-					<text class="ft16 cl-orange ftw600">58</text>
-					<text class="ml15 ft12 cl-notice text-line">¥88</text>
-				</view>
-				<view class="mt16 flex space alcenter">
-					<view class="ft12 cl-notice">已售868</view>
-					<view class="btn-mini" :style="getBtnStyle">购买</view>
-				</view>
-			</view>
-		</view>
-		</navigator>
-		
-		<view class="mt24">
-			<button class="btn-big" :style="{color:tempColor,background:'#fff'}">查看更多特惠 <text class="iconfont iconicon_arrow_small ft14 ml10"></text></button>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default{
-		data(){
-			return {
-				
-			}
-		}
-	}
-</script>
-
-<style>
-	.adviser-face-big{
-		width: 160rpx;
-		height: 160rpx;
-		border-radius: 80rpx;
-		background: #FFFFFF;
-	}
-	.copy-tag{
-		width: 96rpx;
-		height: 40rpx;
-		color:#FFFFFF;
-		font-size: 24rpx;
-		text-align: center;
-		line-height: 40rpx;
-		border-radius: 20rpx;
-	}
-	.tuan-product-l{
-		width: 320rpx;
-		height: 240rpx;
-		border-radius: 16rpx;
-		background: #F2F2F2;
-	}
-	.tuan-product-r{
-		width: calc(100% - 320rpx);
-	}
-</style>

+ 0 - 375
pages/client/tuan/ss.vue

@@ -1,375 +0,0 @@
-<template>
-	<view>
-		<!-- <sub-tabnav :tabs="tabs" @change="changeIndex" :selectIndex="selectIndex" :scrollTop="scrollTop"></sub-tabnav> -->
-		<!-- #ifdef MP-WEIXIN -->
-		<view class="" style="background: #ffffff;"> 
-			<uni-search-bar @confirm="search" :focus="false" placeholder="请输入搜索内容" v-model="searchValue" @blur="blur" @focus="focus" @input="input"
-							@cancel="cancel" @clear="clear">
-			</uni-search-bar>
-		</view>
-		<!-- #endif -->
-		<view style="margin:10upx 30upx 0 30upx;box-shadow: 0px 4px 20px 0px rgba(0,0,0,0.04);">
-			<home-banner :banners="banners"></home-banner>
-		</view>
-		<view class="flex space" style="display:flex; flex-wrap:wrap; padding: 30upx 30upx 0px 30upx;">
-			<block v-for="(value,key) in listData" :key="key">
-			<view class="box pb10 mb15" style="width:31%; border-radius:20rpx;" @click="detail(value.id,0)">
-				<!-- <view class="btn-mini" style="position: absolute; top: 20upx; right: 20upx; border-radius: 10upx;font-size: 18upx;width: 60upx; height: 36upx; z-index: 1;" :style="getBtnStyle">{{value.lxname}}</view> -->
-				<image class="integral-mall-goods" mode="aspectFill" :src="value.img"></image>
-				<view class="mt8 plr10 ft14 ftw400 text-center text-over cl-main">{{value.name}}</view>
-			</view>
-			</block>
-			<!-- <uni-pagination title="" @change="onPageChange" v-if="total>pageSize" show-icon="true" :pageSize="pageSize" :total="total" current="1"></uni-pagination> -->
-		</view>
-		<uni-load-more :status="status" :content-text="contentText" />
-		<view style="width: 100%; height: 30upx;"></view>
-		<!-- <dialog-login v-if="showLogin" @loginYes="loginYes" @closed="showLogin = false"></dialog-login> -->
-		<!-- <com-footer model="tuan"></com-footer> -->
-		
-	</view>
-</template>
-
-<script>
-	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-	  export default {
-		  components: {
-		  	uniLoadMore
-		  },
-		data(){
-			return {
-				banners:[],
-				vipLevel:0,
-				isLogin:true,
-				showLogin:false,
-				datasa:[],
-				dataconfig:[],
-				searchValue:'',
-				total:0,
-				pageSize:10,
-				tabs:[
-					{name:'全部'},
-					{name:'视频'},
-					{name:'音频'},
-					{name:'小说'},
-					{name:'壁纸'},
-				],
-				selectIndex:0,
-				scrollTop:0,
-				
-				type2tab:[],
-				selecttype2:0,
-				type2id:'',
-				
-				type3tab:[],
-				selecttype3:0,
-				type3id:'',
-				
-				type4tab:[],
-				selecttype4:0,
-				type4id:'',
-				
-				typetab:[],
-				selecttype:0,
-				typeid:'',
-				
-				addddtab:[],
-				selectadddd:0,
-				addddid:'',
-				
-				yeartab:[],
-				selectyear:0,
-				yearid:'',
-				
-				type:'',
-				keytext:'',
-				listData: [],
-				last_id: 0,
-				reload: true,
-				status: 'more',
-				contentText: {
-					contentdown: '上拉加载更多',
-					contentrefresh: '加载中',
-					contentnomore: '没有数据了'
-				}
-			}
-		},
-		onLoad(e){
-			//console.log(111)
-			if(e.selectIndex){
-				this.selectIndex=e.selectIndex*1
-			}
-			this.status = 'more';
-			this.getList();
-			this.banners=uni.getStorageSync("config").banner
-		},
-		onPageScroll(e){
-			this.scrollTop = e.scrollTop;
-		},
-		onReachBottom() {
-			this.status = 'more';
-			this.getList();
-		},
-		//监听搜索框文本变化
-		onNavigationBarSearchInputChanged(e) {
-			let text = e.text;
-			if(text){
-				this.keytext=text;	
-			}
-			console.log(text)
-		},
-		//监听点击搜索按钮事件
-		onNavigationBarSearchInputConfirmed(e) {
-			// #ifdef APP-PLUS
-			plus.key.hideSoftKeybord();
-			// #endif
-			var this_=this
-			let text = e.text;
-			if (!text) {
-				uni.showModal({
-					title: '',
-					content:"请输入搜索内容",
-					showCancel: false,
-					confirmText: "确定",
-					confirmColor:"#e19503",
-					success: function (res) {
-						this_.keytext='';
-						this_.getList(0)
-					}
-				});
-				return;
-			} else {
-				this.keytext=text;
-				this.listData=[];
-				this.last_id=0;
-				this.type='';	
-				this.getList(0)
-			}
-			
-		},
-		methods:{
-			detail(vid,mid){
-				var fxpid=1
-				if(uni.getStorageSync("userinfo")){
-					 fxpid=uni.getStorageSync("userinfo").id
-				}
-				uni.navigateTo({
-					url:'/pages/video/index?vid='+vid+'&mid='+mid+'&fxpid='+fxpid
-				})
-			},
-			onPageChange(e) {
-			    this.last_id=0
-			    this.reload=true
-			    this.getList()
-				uni.pageScrollTo({
-				    scrollTop: 0,
-				    duration: 100
-				});
-			},
-			getList() {
-				let data = {
-					//column: 'id,post_id,title,author_name,cover,published_at' //需要的字段名
-				};
-				var limit=10;
-				if (this.last_id>0) {
-					//说明已有数据,目前处于上拉加载
-					this.status = 'loading';
-					data.offset = this.last_id*limit;
-					data._ = new Date().getTime() + '';
-				}
-				data.limit=limit		
-				
-				if(this.selectIndex){
-					data.lx=this.selectIndex
-				}
-				if(this.typeid && this.selectIndex==1){
-					data.typeid=this.typeid
-				}
-				if(this.addddid && this.selectIndex==1){
-					data.addddid=this.addddid
-				}
-				if(this.yearid && this.selectIndex==1){
-					data.yearid=this.yearid
-				}
-				if(this.type2id && this.selectIndex==2){
-					data.typeid=this.type2id
-				}
-				if(this.type3id && this.selectIndex==3){
-					data.typeid=this.type3id
-				}
-				if(this.type4id && this.selectIndex==4){
-					data.typeid=this.type4id
-				}
-				if(this.keytext){
-					data.keytext=this.keytext
-				}
-				uni.request({
-					url: this.configs.webUrl+'/api/video/lists',
-					data: data,
-					success: data => {
-						//console.log(data.data)
-						
-						this.yeartab=data.data.typedata.year
-						this.addddtab=data.data.typedata.adddd
-						this.typetab=data.data.typedata.type
-						this.type2tab=data.data.typedata.type2
-						this.type3tab=data.data.typedata.type3
-						this.type4tab=data.data.typedata.type4
-						
-						if (data.data.total>0) {
-							let list = data.data.rows;
-							this.listData = this.reload ? list : this.listData.concat(list);
-							this.reload = false;
-							this.last_id = this.last_id+1;
-							if(data.data.total<this.last_id*limit){
-								this.status = '';
-							}
-						}else{
-							this.listData=[];
-							this.contentText.contentdown='没有数据'
-							this.status=''
-							
-						}
-					},
-					fail: (data, code) => {
-						//console.log('fail' + JSON.stringify(data));
-					}
-				});
-			},
-			changeIndex(index){
-				this.selectIndex = index;
-				this.type=this.tabs[index].name
-				this.getdata()				
-			},
-			changetype(index){
-				this.selecttype = index;
-				this.typeid=this.typetab[index].id
-				this.getdata()				
-			},
-			changeadddd(index){
-				this.selectadddd = index;
-				this.addddid=this.addddtab[index].id
-				this.getdata()				
-			},
-			changeyear(index){
-				this.selectyear = index;
-				this.yearid=this.yeartab[index].id
-				this.getdata()				
-			},
-			
-			changetype2(index){
-				this.selecttype2 = index;
-				this.type2id=this.type2tab[index].id
-				this.getdata()				
-			},
-			changetype3(index){
-				this.selecttype3 = index;
-				this.type3id=this.type3tab[index].id
-				this.getdata()				
-			},
-			changetype4(index){
-				this.selecttype4 = index;
-				this.type4id=this.type4tab[index].id
-				this.getdata()				
-			},
-			getdata(){
-				this.last_id=0
-				this.reload=true
-				this.getList()
-			},
-			loginYes(){
-				
-			},
-			mlinkTo(e){
-				if(this.isLogin == true){
-					let link = e.currentTarget.dataset.link;
-				}else{
-					this.showLogin = true;
-				}
-			},
-			search(res) {
-				this.listData=[];
-				this.last_id=0;
-				this.keytext=res.value;
-				this.type='';	
-				this.getList(0)
-			},
-	
-			clear(res) {
-			
-			},
-			input(res) {
-				console.log('----input:', res)
-			},
-			blur(res) { 
-				// this.listData=[];
-				// this.last_id=0;
-				// this.keytext=res.value;
-				// this.type='';	
-				// this.getList(0)
-				//res.value 
-			},
-			focus(e) {
-
-			},
-			cancel(res) {
-				this.keytext='';
-				this.type='';	
-				this.getList(0)
-			}
-		}
-	}
-</script>
-
-<style>
-.integral-mall-goods{
-		width: 100%;
-		height: 280rpx;
-		background: #F2F2F2;
-		border-radius: 16upx;
-	}
-	.user-not-vip{
-		width: 100%;
-		height: 80rpx;
-		background: #FDF6EC;
-		border-radius: 40rpx;
-		border: 2rpx solid #EFC381;
-		text-align: center;
-		line-height: 76rpx;
-		font-size: 24rpx;
-		color:#000000;
-		font-weight: bold;
-	}
-	
-
-	.tuan-product-l{
-		width: 320rpx;
-		height: 240rpx;
-		border-radius: 16rpx;
-		background: #F2F2F2;
-	}
-	.tuan-product-r{
-		width: calc(100% - 320rpx);
-	}
-	.search-result {
-			padding-top: 10px;
-			padding-bottom: 20px;
-			text-align: center;
-		}
-	
-		.search-result-text {
-			text-align: center;
-			font-size: 14px;
-			color:#666;
-		}
-	
-		.example-body {
-			/* #ifndef APP-NVUE */
-			display: block;
-			/* #endif */
-			padding: 0px;
-		}
-	
-		.uni-mt-10 {
-			margin-top: 10px;
-		}
-</style>

+ 0 - 67
pages/client/tuan/style/zuijin.css

@@ -1,67 +0,0 @@
-.integral-mall-goods {
-	width: 100%;
-	height: 280rpx;
-	background: #F2F2F2;
-	border-radius: 16upx;
-}
-
-.user-not-vip {
-	width: 100%;
-	height: 80rpx;
-	background: #FDF6EC;
-	border-radius: 40rpx;
-	border: 2rpx solid #EFC381;
-	text-align: center;
-	line-height: 76rpx;
-	font-size: 24rpx;
-	color: #000000;
-	font-weight: bold;
-}
-
-
-.tuan-product-l {
-	width: 150rpx;
-	height: 200rpx;
-	border-radius: 16rpx;
-	background: #F2F2F2;
-}
-
-.tuan-product-r {
-	width: calc(100% - 150rpx);
-}
-
-.btn-vip-adviser {
-	width: 150rpx;
-	height: 60rpx;
-	border-radius: 20px;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	font-size: 28rpx;
-	/* font-weight: 600; */
-	background: #FF6600;
-	color: #FFFFFF;
-}
-
-.search-result {
-	padding-top: 10px;
-	padding-bottom: 20px;
-	text-align: center;
-}
-
-.search-result-text {
-	text-align: center;
-	font-size: 14px;
-	color: #666;
-}
-
-.example-body {
-	/* #ifndef APP-NVUE */
-	display: block;
-	/* #endif */
-	padding: 0px;
-}
-
-.uni-mt-10 {
-	margin-top: 10px;
-}

+ 0 - 339
pages/client/tuan/wdxh.vue

@@ -1,339 +0,0 @@
-<template>
-	<view>
-
-		<view class="flex space" style="display:flex; flex-wrap:wrap; padding: 30upx 30upx 0px 30upx;">
-			<block v-for="(value,key) in listData" :key="key">
-				<view class="box pb10 mb15" style="width:31%; border-radius:20rpx;"
-					@click="detail(value.vid,value.mid)">
-					<!-- <view class="btn-mini" style="position: absolute; top: 20upx; right: 20upx; border-radius: 10upx;font-size: 18upx;width: 60upx; height: 36upx; z-index: 1;" :style="getBtnStyle">{{value.lxname}}</view> -->
-					<image class="integral-mall-goods" mode="aspectFill" :src="value.img"></image>
-					<view class="mt8 plr10 ft14 ftw400 text-center text-over cl-main">{{value.vname}}</view>
-				</view>
-			</block>
-			<!-- <uni-pagination title="" @change="onPageChange" v-if="total>pageSize" show-icon="true" :pageSize="pageSize" :total="total" current="1"></uni-pagination> -->
-		</view>
-		<uni-load-more :status="status" :content-text="contentText" />
-		<view style="width: 100%; height: 30upx;"></view>
-		<!-- <dialog-login v-if="showLogin" @loginYes="loginYes" @closed="showLogin = false"></dialog-login> -->
-		<!-- <com-footer model="tuan"></com-footer> -->
-
-	</view>
-</template>
-
-<script>
-	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-	export default {
-		components: {
-			uniLoadMore
-		},
-		data() {
-			return {
-				banners: [],
-				vipLevel: 0,
-				isLogin: true,
-				showLogin: false,
-				datasa: [],
-				dataconfig: [],
-				searchValue: '',
-				total: 0,
-				pageSize: 10,
-				tabs: [{
-						name: '全部'
-					},
-					{
-						name: '视频'
-					},
-				],
-				selectIndex: 0,
-				scrollTop: 0,
-
-				type2tab: [],
-				selecttype2: 0,
-				type2id: '',
-
-				type3tab: [],
-				selecttype3: 0,
-				type3id: '',
-
-				type4tab: [],
-				selecttype4: 0,
-				type4id: '',
-
-				typetab: [],
-				selecttype: 0,
-				typeid: '',
-
-				addddtab: [],
-				selectadddd: 0,
-				addddid: '',
-
-				yeartab: [],
-				selectyear: 0,
-				yearid: '',
-
-				type: '',
-				keytext: '',
-				listData: [],
-				last_id: 0,
-				reload: true,
-				status: 'more',
-				contentText: {
-					contentdown: '上拉加载更多',
-					contentrefresh: '加载中',
-					contentnomore: '没有数据了'
-				}
-			}
-		},
-		onLoad(e) {
-			//console.log(111)
-			if (e.selectIndex) {
-				this.selectIndex = e.selectIndex * 1
-			}
-			this.status = 'more';
-			this.getList();
-			this.banners = uni.getStorageSync("config").banner
-		},
-		onPageScroll(e) {
-			this.scrollTop = e.scrollTop;
-		},
-		onReachBottom() {
-			this.status = 'more';
-			this.getList();
-		},
-		//监听搜索框文本变化
-		onNavigationBarSearchInputChanged(e) {
-			let text = e.text;
-			if (text) {
-				this.keytext = text;
-			}
-			console.log(text)
-		},
-		//监听点击搜索按钮事件
-		onNavigationBarSearchInputConfirmed(e) {
-			// #ifdef APP-PLUS
-			plus.key.hideSoftKeybord();
-			// #endif
-			var this_ = this
-			let text = e.text;
-			if (!text) {
-				uni.showModal({
-					title: '',
-					content: "请输入搜索内容",
-					showCancel: false,
-					confirmText: "确定",
-					confirmColor: "#e19503",
-					success: function(res) {
-						this_.keytext = '';
-						this_.getList(0)
-					}
-				});
-				return;
-			} else {
-				this.keytext = text;
-				this.listData = [];
-				this.last_id = 0;
-				this.type = '';
-				this.getList(0)
-			}
-
-		},
-		methods: {
-			detail(vid, mid) {
-				var fxpid = 1
-				if (uni.getStorageSync("userinfo")) {
-					fxpid = uni.getStorageSync("userinfo").id
-				}
-				uni.navigateTo({
-					url: '/pages/video/index?vid=' + vid + '&mid=' + mid + '&fxpid=' + fxpid
-				})
-			},
-			onPageChange(e) {
-				this.last_id = 0
-				this.reload = true
-				this.getList()
-				uni.pageScrollTo({
-					scrollTop: 0,
-					duration: 100
-				});
-			},
-			getList() {
-				let data = {
-					//column: 'id,post_id,title,author_name,cover,published_at' //需要的字段名
-				};
-				var limit = 10;
-				if (this.last_id > 0) {
-					//说明已有数据,目前处于上拉加载
-					this.status = 'loading';
-					data.offset = this.last_id * limit;
-					data._ = new Date().getTime() + '';
-				}
-				data.limit = limit
-				if (uni.getStorageSync("userinfo")) {
-					data.uid = uni.getStorageSync("userinfo").id;
-				}
-				uni.request({
-					url: this.configs.webUrl + '/api/video/wdxh',
-					data: data,
-					success: data => {
-
-						if (data.data.total > 0) {
-							let list = data.data.rows;
-							this.listData = this.reload ? list : this.listData.concat(list);
-							this.reload = false;
-							this.last_id = this.last_id + 1;
-							if (data.data.total < this.last_id * limit) {
-								this.status = '';
-							}
-						} else {
-							this.listData = [];
-							this.contentText.contentdown = '没有数据'
-							this.status = ''
-
-						}
-					},
-					fail: (data, code) => {
-						//console.log('fail' + JSON.stringify(data));
-					}
-				});
-			},
-			changeIndex(index) {
-				this.selectIndex = index;
-				this.type = this.tabs[index].name
-				this.getdata()
-			},
-			changetype(index) {
-				this.selecttype = index;
-				this.typeid = this.typetab[index].id
-				this.getdata()
-			},
-			changeadddd(index) {
-				this.selectadddd = index;
-				this.addddid = this.addddtab[index].id
-				this.getdata()
-			},
-			changeyear(index) {
-				this.selectyear = index;
-				this.yearid = this.yeartab[index].id
-				this.getdata()
-			},
-
-			changetype2(index) {
-				this.selecttype2 = index;
-				this.type2id = this.type2tab[index].id
-				this.getdata()
-			},
-			changetype3(index) {
-				this.selecttype3 = index;
-				this.type3id = this.type3tab[index].id
-				this.getdata()
-			},
-			changetype4(index) {
-				this.selecttype4 = index;
-				this.type4id = this.type4tab[index].id
-				this.getdata()
-			},
-			getdata() {
-				this.last_id = 0
-				this.reload = true
-				this.getList()
-			},
-			loginYes() {
-
-			},
-			mlinkTo(e) {
-				if (this.isLogin == true) {
-					let link = e.currentTarget.dataset.link;
-				} else {
-					this.showLogin = true;
-				}
-			},
-			search(res) {
-				this.listData = [];
-				this.last_id = 0;
-				this.keytext = res.value;
-				this.type = '';
-				this.getList(0)
-			},
-
-			clear(res) {
-
-			},
-			input(res) {
-				console.log('----input:', res)
-			},
-			blur(res) {
-				// this.listData=[];
-				// this.last_id=0;
-				// this.keytext=res.value;
-				// this.type='';	
-				// this.getList(0)
-				//res.value 
-			},
-			focus(e) {
-
-			},
-			cancel(res) {
-				this.keytext = '';
-				this.type = '';
-				this.getList(0)
-			}
-		}
-	}
-</script>
-
-<style>
-	.integral-mall-goods {
-		width: 100%;
-		height: 280rpx;
-		background: #F2F2F2;
-		border-radius: 16upx;
-	}
-
-	.user-not-vip {
-		width: 100%;
-		height: 80rpx;
-		background: #FDF6EC;
-		border-radius: 40rpx;
-		border: 2rpx solid #EFC381;
-		text-align: center;
-		line-height: 76rpx;
-		font-size: 24rpx;
-		color: #000000;
-		font-weight: bold;
-	}
-
-
-	.tuan-product-l {
-		width: 320rpx;
-		height: 240rpx;
-		border-radius: 16rpx;
-		background: #F2F2F2;
-	}
-
-	.tuan-product-r {
-		width: calc(100% - 320rpx);
-	}
-
-	.search-result {
-		padding-top: 10px;
-		padding-bottom: 20px;
-		text-align: center;
-	}
-
-	.search-result-text {
-		text-align: center;
-		font-size: 14px;
-		color: #666;
-	}
-
-	.example-body {
-		/* #ifndef APP-NVUE */
-		display: block;
-		/* #endif */
-		padding: 0px;
-	}
-
-	.uni-mt-10 {
-		margin-top: 10px;
-	}
-</style>

+ 0 - 66
pages/client/tuan/zjgk.vue

@@ -1,66 +0,0 @@
-<template>
-	<view>
-		<view class="" style="padding: 30upx 30upx 0px 30upx;">
-			<block v-for="(value,key) in list" :key="key">
-				<view @click="detail(value.video_id,value.video_series_sequence)" style="position: relative;"
-					class="flex alcenter mb16">
-					<image mode="aspectFill" class="tuan-product-l" :src="value.cover_image"></image>
-					<view class="tuan-product-r pl15">
-						<view class="ft16 ftw600 cl-main text-over2">{{value.name}}</view>
-						<view class="mt16">
-							<p class="ft14 "> </p>
-						</view> 
-						<view class="mt16 flex space alcenter">
-							<p class="ft14 ">看到 <label class="ft14 cl-orange">&nbsp;&nbsp;{{value.video_series_sequence}}集</label></p>
-							<view class="btn-vip-adviser ml15">继续观看</view>
-						</view>
-					</view>
-				</view>
-			</block>
-		</view>
-
-
-	</view>
-</template>
-
-<script>
-	import {
-		watchRecord,
-		shelfList,
-		delShelf
-	} from "@/common/apis/zju.js";
-	export default {
-		data() {
-			return {
-				list: []
-			}
-		},
-		onLoad(e) {
-
-		},
-		async onShow() {
-			this.list = await watchRecord();
-		},
-		onPageScroll(e) {
-			this.scrollTop = e.scrollTop;
-		},
-		onReachBottom() {
-
-		},
-		methods: {
-			detail(vid, mid) {
-				var fxpid = 1
-				if (uni.getStorageSync("userinfo")) {
-					fxpid = uni.getStorageSync("userinfo").id
-				}
-				uni.navigateTo({
-					url: '/pages/video/index?vid=' + vid + '&mid=' + mid + '&fxpid=' + fxpid
-				})
-			}
-		}
-	}
-</script>
-
-<style>
-@import url("style/zuijin.css");
-</style>

+ 0 - 368
pages/client/tuan/zjjl.vue

@@ -1,368 +0,0 @@
-<template>
-	<view>
-		<!-- <sub-tabnav :tabs="tabs" @change="changeIndex" :selectIndex="selectIndex" :scrollTop="scrollTop"></sub-tabnav> -->
-		<!-- #ifdef MP-WEIXIN -->
-		<!-- <view class="" style="background: #ffffff;"> 
-			<uni-search-bar @confirm="search" :focus="false" placeholder="请输入搜索内容" v-model="searchValue" @blur="blur" @focus="focus" @input="input"
-							@cancel="cancel" @clear="clear">
-			</uni-search-bar>
-		</view> -->
-		<!-- #endif -->
-		<!-- <view style="margin:10upx 30upx 0 30upx;box-shadow: 0px 4px 20px 0px rgba(0,0,0,0.04);">
-			<home-banner :banners="banners"></home-banner>
-		</view> -->
-		<view class="" style="padding: 30upx 30upx 0px 30upx;">
-			<block v-for="(value,key) in listData" :key="key">
-			<view @click="detail(value.vid,value.mid)" style="position: relative;" class="flex alcenter mb16">
-				<image mode="aspectFill" class="tuan-product-l" :src="value.img"></image>
-				<!-- <view class="btn-mini" style="position: absolute; top: 40upx; left: 280upx; border-radius: 10upx;font-size: 18upx;width: 60upx; height: 36upx;" :style="getBtnStyle">{{value.lxname}}</view> -->
-				<view class="tuan-product-r pl15">
-					<view class="ft16 ftw600 cl-main text-over2">{{value.vname}}</view>
-					<view class="mt16">
-						<text class="ft14 cl-orange">{{value.dqname}}</text>
-					</view>
-					<view class="mt16 flex space alcenter">
-						<view class="ft14 cl-notice">{{value.mname}}</view>
-						<view class="btn-vip-adviser ml15">继续观看</view>
-					</view>
-				</view>
-			</view>
-			</block>
-			<!-- <uni-pagination title="" @change="onPageChange" v-if="total>pageSize" show-icon="true" :pageSize="pageSize" :total="total" current="1"></uni-pagination> -->
-		</view>
-		<uni-load-more :status="status" :content-text="contentText" />
-		<view style="width: 100%; height: 30upx;"></view>
-		<!-- <dialog-login v-if="showLogin" @loginYes="loginYes" @closed="showLogin = false"></dialog-login> -->
-		<!-- <com-footer model="tuan"></com-footer> -->
-		
-	</view>
-</template>
-
-<script>
-	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-	  export default {
-		  components: {
-		  	uniLoadMore
-		  },
-		data(){
-			return {
-				banners:[],
-				vipLevel:0,
-				isLogin:true,
-				showLogin:false,
-				datasa:[],
-				dataconfig:[],
-				searchValue:'',
-				total:0,
-				pageSize:10,
-				tabs:[
-					{name:'全部'},
-					{name:'视频'},
-					{name:'音频'},
-					{name:'小说'},
-					{name:'壁纸'},
-				],
-				selectIndex:0,
-				scrollTop:0,
-				
-				type2tab:[],
-				selecttype2:0,
-				type2id:'',
-				
-				type3tab:[],
-				selecttype3:0,
-				type3id:'',
-				
-				type4tab:[],
-				selecttype4:0,
-				type4id:'',
-				
-				typetab:[],
-				selecttype:0,
-				typeid:'',
-				
-				addddtab:[],
-				selectadddd:0,
-				addddid:'',
-				
-				yeartab:[],
-				selectyear:0,
-				yearid:'',
-				
-				type:'',
-				keytext:'',
-				listData: [],
-				last_id: 0,
-				reload: true,
-				status: 'more',
-				contentText: {
-					contentdown: '上拉加载更多',
-					contentrefresh: '加载中',
-					contentnomore: '没有数据了'
-				}
-			}
-		},
-		onLoad(e){
-			//console.log(111)
-			if(e.selectIndex){
-				this.selectIndex=e.selectIndex*1
-			}
-			this.status = 'more';
-			this.getList();
-			this.banners=uni.getStorageSync("config").banner
-		},
-		onPageScroll(e){
-			this.scrollTop = e.scrollTop;
-		},
-		onReachBottom() {
-			this.status = 'more';
-			this.getList();
-		},
-		//监听搜索框文本变化
-		onNavigationBarSearchInputChanged(e) {
-			let text = e.text;
-			if(text){
-				this.keytext=text;	
-			}
-			console.log(text)
-		},
-		//监听点击搜索按钮事件
-		onNavigationBarSearchInputConfirmed(e) {
-			// #ifdef APP-PLUS
-			plus.key.hideSoftKeybord();
-			// #endif
-			var this_=this
-			let text = e.text;
-			if (!text) {
-				uni.showModal({
-					title: '',
-					content:"请输入搜索内容",
-					showCancel: false,
-					confirmText: "确定",
-					confirmColor:"#e19503",
-					success: function (res) {
-						this_.keytext='';
-						this_.getList(0)
-					}
-				});
-				return;
-			} else {
-				this.keytext=text;
-				this.listData=[];
-				this.last_id=0;
-				this.type='';	
-				this.getList(0)
-			}
-			
-		},
-		methods:{
-			detail(vid,mid){
-				var fxpid=1
-				if(uni.getStorageSync("userinfo")){
-					 fxpid=uni.getStorageSync("userinfo").id
-				}
-				uni.navigateTo({
-					url:'/pages/video/index?vid='+vid+'&mid='+mid+'&fxpid='+fxpid
-				})
-			},
-			onPageChange(e) {
-			    this.last_id=0
-			    this.reload=true
-			    this.getList()
-				uni.pageScrollTo({
-				    scrollTop: 0,
-				    duration: 100
-				});
-			},
-			getList() {
-				let data = {
-					//column: 'id,post_id,title,author_name,cover,published_at' //需要的字段名
-				};
-				var limit=10;
-				if (this.last_id>0) {
-					//说明已有数据,目前处于上拉加载
-					this.status = 'loading';
-					data.offset = this.last_id*limit;
-					data._ = new Date().getTime() + '';
-				}
-				data.limit=limit	
-				if(uni.getStorageSync("userinfo")){
-					data.uid = uni.getStorageSync("userinfo").id;
-				}
-				uni.request({
-					url: this.configs.webUrl+'/api/video/recordlist',
-					data: data,
-					success: data => {
-						//console.log(data.data)
-						
-						
-						if (data.data.total>0) {
-							let list = data.data.rows;
-							this.listData = this.reload ? list : this.listData.concat(list);
-							this.reload = false;
-							this.last_id = this.last_id+1;
-							if(data.data.total<this.last_id*limit){
-								this.status = '';
-							}
-						}else{
-							this.listData=[];
-							this.contentText.contentdown='没有数据'
-							this.status=''
-							
-						}
-					},
-					fail: (data, code) => {
-						//console.log('fail' + JSON.stringify(data));
-					}
-				});
-			},
-			changeIndex(index){
-				this.selectIndex = index;
-				this.type=this.tabs[index].name
-				this.getdata()				
-			},
-			changetype(index){
-				this.selecttype = index;
-				this.typeid=this.typetab[index].id
-				this.getdata()				
-			},
-			changeadddd(index){
-				this.selectadddd = index;
-				this.addddid=this.addddtab[index].id
-				this.getdata()				
-			},
-			changeyear(index){
-				this.selectyear = index;
-				this.yearid=this.yeartab[index].id
-				this.getdata()				
-			},
-			
-			changetype2(index){
-				this.selecttype2 = index;
-				this.type2id=this.type2tab[index].id
-				this.getdata()				
-			},
-			changetype3(index){
-				this.selecttype3 = index;
-				this.type3id=this.type3tab[index].id
-				this.getdata()				
-			},
-			changetype4(index){
-				this.selecttype4 = index;
-				this.type4id=this.type4tab[index].id
-				this.getdata()				
-			},
-			getdata(){
-				this.last_id=0
-				this.reload=true
-				this.getList()
-			},
-			loginYes(){
-				
-			},
-			mlinkTo(e){
-				if(this.isLogin == true){
-					let link = e.currentTarget.dataset.link;
-				}else{
-					this.showLogin = true;
-				}
-			},
-			search(res) {
-				this.listData=[];
-				this.last_id=0;
-				this.keytext=res.value;
-				this.type='';	
-				this.getList(0)
-			},
-	
-			clear(res) {
-			
-			},
-			input(res) {
-				console.log('----input:', res)
-			},
-			blur(res) { 
-				// this.listData=[];
-				// this.last_id=0;
-				// this.keytext=res.value;
-				// this.type='';	
-				// this.getList(0)
-				//res.value 
-			},
-			focus(e) {
-
-			},
-			cancel(res) {
-				this.keytext='';
-				this.type='';	
-				this.getList(0)
-			}
-		}
-	}
-</script>
-
-<style>
-.integral-mall-goods{
-		width: 100%;
-		height: 280rpx;
-		background: #F2F2F2;
-		border-radius: 16upx;
-	}
-	.user-not-vip{
-		width: 100%;
-		height: 80rpx;
-		background: #FDF6EC;
-		border-radius: 40rpx;
-		border: 2rpx solid #EFC381;
-		text-align: center;
-		line-height: 76rpx;
-		font-size: 24rpx;
-		color:#000000;
-		font-weight: bold;
-	}
-	
-
-	.tuan-product-l{
-		width: 150rpx;
-		height: 200rpx;
-		border-radius: 16rpx;
-		background: #F2F2F2;
-	}
-	.tuan-product-r{
-		width: calc(100% - 150rpx);
-	}
-	.btn-vip-adviser{
-		width: 150rpx;
-		height: 60rpx;
-		border-radius: 20rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		font-size: 28rpx;
-		/* font-weight: 600; */
-		background: #FF6600;
-		color:#FFFFFF;
-	}
-	.search-result {
-			padding-top: 10px;
-			padding-bottom: 20px;
-			text-align: center;
-		}
-	
-		.search-result-text {
-			text-align: center;
-			font-size: 14px;
-			color:#666;
-		}
-	
-		.example-body {
-			/* #ifndef APP-NVUE */
-			display: block;
-			/* #endif */
-			padding: 0px;
-		}
-	
-		.uni-mt-10 {
-			margin-top: 10px;
-		}
-</style>

+ 0 - 504
pages/client/video.nvue

@@ -1,504 +0,0 @@
-<template>
-  <view class="content">
-    <swiper :style="'width: '+ windowWidth +'px; height: 100vh; background-color: #000;'" class="swiper" circular 
-	@change="swiperChange" 
-	:current="current"
-	:vertical="true" 
-	duration="300"
-	>
-		<swiper-item v-for="(list, index) in displaySwiperList" :key="index">
-			<view v-if="Math.abs(displayIndex-index)!=0" style="z-index: 999;">
-				<video
-				v-if="Math.abs(displayIndex-index)!=0"
-				:id="list._id"
-				:controls="controls"
-				:autoplay="false"
-				:loop="false"
-				@ended="ended"
-				@controlstoggle="controlstoggle"
-				@click="tapVideoHover()"
-				:style="'width: '+ windowWidth +'px; height:100vh;'" 
-				:src="list.src"
-				>
-				</video>
-			</view>
-			<!-- :poster="list.img" -->
-			<view v-if="Math.abs(displayIndex-index)==0">
-				<video
-				v-if="Math.abs(displayIndex-index)==0"
-				:id="list._id"
-				:controls="controls"
-				:isplay="true"
-				:loop="!isplay"
-				@ended="ended"
-				@controlstoggle="controlstoggle"
-				@click="tapVideoHover()"
-				:enable-progress-gesture="false"
-				:style="'width: '+ windowWidth +'px; height:100vh;'" 
-				:src="list.src"
-				>
-				</video>  
-			</view>
-			<!-- <image v-if="displayIndex != index" :src="list.img" :style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px; background-color: #000; position: absolute;'" mode="aspectFit"
-			></image> -->
-			<view v-if="isqp" class="userInfo">
-				<!-- 1.头像 -->
-				<!-- <image @click="tozuozhe" class="userAvatar" :src="list.href" mode="aspectFill"></image> -->
-				<!-- 2.点赞 -->
-				<view @click.stop="cLike(list.like,list.id,list.mid);" style="opacity: 0.9; margin-top: 17px;">
-					<image v-if="list.like*1==1" src="@/static/aixin.png" style="width: 40px; height: 40px; position: absolute; right: 6px;"></image>
-					<image v-if="list.like*1==2" src="@/static/aixinRed.png" style="width: 40px; height: 40px; position: absolute; right: 6px;"></image>
-					<text style="color: #FFFFFF; margin-top: 5px; font-size: 14px; text-align: center; margin-top: 40px; font-weight: bold;" :class="{'likeNumActive':list.like}">{{list.like_n}}</text>
-				</view>
-				<!-- 3.分享 -->
-				<view style="opacity: 0.9; margin-top: 17px;">
-					<image src="@/static/share-fill.png" style="width: 40px; height: 40px; position: absolute; right: 5px;"></image>
-					<text style="color: #FFFFFF; margin-top: 5px; font-size: 14px; text-align: center; font-weight: bold; margin-top: 40px;">分享</text>
-					<button open-type="share" style="position: absolute; background: none; width: 100%; height: 100%;"  @click.stop="share"></button>
-				</view>
-				<!-- 4.评论 -->
-				<view class="comment" @click.stop="toComment(list.iszj,list.id,list.mid)" style="opacity: 0.9; margin-top: 17px;">
-					<image v-if="list.iszj*1==1" src="@/static/sc.png" style="width: 40px; height: 40px; position: absolute; right: 6px;"></image>
-					<image v-if="list.iszj*1==2" src="@/static/scRed.png" style="width: 40px; height: 40px; position: absolute; right: 6px;"></image>
-					<text v-if="list.iszj*1==1"  style="color: #FFFFFF; margin-top: 5px; font-size: 14px; font-weight: bold; text-align: center; margin-top: 40px;">追剧</text>
-					<text v-if="list.iszj*1==2" style="color: #ff0000; margin-top: 5px; font-size: 14px; font-weight: bold; text-align: center; margin-top: 40px;">已追</text>
-				</view>
-				
-			</view>
-			<!-- 最底下的文字部分 -->
-			<view v-if="isqp" class="contentcd">
-				<text class="userName" :style="'width: '+ (windowWidth - 90) +'px;'">{{list.title}}</text><!-- i={{i}} -->
-				<text class="wordss" :style="'width: '+ (windowWidth - 90) +'px;'">{{list.msg}}</text><!-- k={{k}} -->
-				<text class="words" @click.stop="detail(list.id,0)" :style="'width: '+ (windowWidth - 90) +'px;'">{{list.namets}}</text><!-- k={{k}} -->
-			</view>
-		</swiper-item>
-    </swiper>
-  </view>
-</template>
-
-<script>
-import configs from "@/common/config.js"
-let audo = uni.createInnerAudioContext()
-export default {
-  data() {
-    return {
-		controls:true,
-		originList: [], // 源数据
-		displaySwiperList: [], // swiper需要的数据
-		displayIndex: 0, // 用于显示swiper的真正的下标数值只有:0,1,2。
-		originIndex: 0, // 记录源数据的下标
-		windowWidth:0,
-		windowHeight:0,
-		current:0,
-		oid:0,
-		isplay:true,//是否自动播放下一个视频
-		playCount:2,//剩余多少视频加载视频列表
-		nodate:true, //true 有数据 
-		issp:'',
-		isqp:true,
-		page: 1,
-		urls:configs.webUrl,
-		uid: 0,
-		ttuop:0.
-    };
-  },
-  onShareAppMessage: function(res) {
-	  // #ifdef MP-WEIXIN
-	  var href='/pages/client/video'+'?fxpid='+this.uid
-      console.log(res)
-      let that = this;
-      const obj = {
-        title: "发送给好友",
-        imageUrl: '',
-        path: href,
-        success: function(res) {
-          console.log(res, "转发成功")
-        },
-        fail: function(res) {
-          wx.showToast({
-            title: '发送失败',
-            icon:'none'
-          })
-        }
-      }
-      return obj
-	  // #endif
-  },
-  onLoad(e) {
-	  console.log('eeeeeee-----',e)
-	  if(e.fxpid){
-		  if(e.fxpid>0){
-		  		uni.setStorage({
-		  			key: 'fxpid',  
-		  			data: e.fxpid
-		  		})  
-		  }
-	  }
-	  if(uni.getStorageSync("userinfo")){
-	  	 this.uid=uni.getStorageSync("userinfo").id
-	  }
-	// #ifdef MP-TOUTIAO
-	//this.ttuop=164
-	// #endif
-  	this.windowWidth = uni.getSystemInfoSync().windowWidth
-  	this.windowHeight = uni.getSystemInfoSync().windowHeight-this.ttuop
-  	this.Recommend();
-  },
-  methods: {
-	  share(){
-		  var href='/pages/client/video'+'?fxpid='+this.uid
-		  // #ifdef H5
-		  uni.setClipboardData({
-		  	data: this.urls+'/h5/#'+href,
-		  	complete() {
-		  		uni.showToast({
-		  			title: "分享连接已复制到剪贴板"
-		  		})
-		  	}
-		  })
-		  // #endif
-		 // #ifdef MP-WEIXIN
-		 
-		 // #endif
-		  // #ifdef APP-PLUS
-		  uni.share({
-		  	provider: "weixin",
-		  	scene: "WXSenceTimeline",
-		  	type: 0,
-		  	href:href,
-		  	title: '分享标题',
-		  	summary: '分享总结',
-		  	imageUrl: '',
-		  	success: function(res) {
-		  		console.log("success:" + JSON.stringify(res));
-		  	},
-		  	fail: function(err) {
-		  		console.log("fail:" + JSON.stringify(err));
-		  	},
-		  })
-		  // #endif 
-	  },
-	  tapVideoHover(){
-		  this.isqp=!this.isqp
-	  },
-	  Recommend(){
-	  	var uid=0;
-	  	if(uni.getStorageSync("userinfo")){
-	  		uid=uni.getStorageSync("userinfo").id
-	  	}
-	  	uni.request({
-	  		url: this.urls+'/api/video/videoRecommend?page='+this.page+'&uid='+uid,
-	  		success: (res) => {
-				if(res.data.isempty==1){
-					var msg = res.data.data
-					//2.这里把视频添加到视频列表
-					for (let i = 0; i < msg.length; i++) {
-						this.originList.push(msg[i])
-					}
-					if(this.page==1){
-						this.initSwiperData();
-					}
-					this.page=this.page+1
-				}else{
-					this.nodate=false
-				}
-	  		}
-	  	})
-	  },
-	  ended(){
-		  //console.log('isplay----',this.isplay)
-	  	// 1.播放当前视频结束时触发,自动切换下一个视频
-		if(this.isplay){
-			if(this.displayIndex<2){
-				this.current=this.displayIndex+1
-			}else{
-				this.current=0	
-			}
-			console.log('显示swiper Index:',this.displayIndex)
-		}
-	  },
-    /**
-     * 初始一个显示的swiper数据
-     * @originIndex  从源数据的哪个开始显示默认0,如从其他页面跳转进来,要显示第n个,这个参数就是他的下标
-     */
-    initSwiperData(originIndex = this.originIndex) {
-		console.log('--------当前数据 Index:',originIndex)
-      const originListLength = this.originList.length; // 源数据长度
-      const displayList = [];
-      displayList[this.displayIndex] = this.originList[originIndex];
-      displayList[this.displayIndex - 1 == -1 ? 2 : this.displayIndex - 1] =
-        this.originList[
-          originIndex - 1 == -1 ? originListLength - 1 : originIndex - 1
-        ];
-      displayList[this.displayIndex + 1 == 3 ? 0 : this.displayIndex + 1] =
-        this.originList[
-          originIndex + 1 == originListLength ? 0 : originIndex + 1
-        ];
-      this.displaySwiperList = displayList;
-	  
-	  //audo.pause()
-	  
-	  if(this.oid>=this.originList.length){
-		this.oid=0
-	  }
-	  if(this.oid<0){
-	  		this.oid=this.originList.length-1
-	  }
-	  console.log('++++++++++++上一条播放数据 Index:',this.oid)
-	  uni.createVideoContext(this.originList[this.oid]._id,this).stop();
-	  setTimeout(()=>{
-		console.log('qqqqqq:',this.originList[originIndex]._id)
-	  	uni.createVideoContext(this.originList[originIndex]._id,this).play();
-	  },500)
-	  var pCount=this.originList.length-this.playCount
-	  if(originIndex==pCount && this.nodate){
-		  this.Recommend()
-	  }
-    },
-    /**
-     * swiper滑动时候
-     */
-    swiperChange(event) {
-      const { current } = event.detail;
-      const originListLength = this.originList.length; // 源数据长度
-      // =============向后==========
-      if (this.displayIndex - current == 2 || this.displayIndex - current == -1) {
-        this.originIndex =
-          this.originIndex + 1 == originListLength ? 0 : this.originIndex + 1;
-        this.displayIndex = this.displayIndex + 1 == 3 ? 0 : this.displayIndex + 1;
-		//console.log('+++',this.originIndex)
-		this.oid=this.originIndex-1
-        this.initSwiperData(this.originIndex);
-      }
-      // ======如果两者的差为-2或者1则是向前滑动============
-      else if (this.displayIndex - current == -2 || this.displayIndex - current == 1) {
-        this.originIndex = this.originIndex - 1 == -1 ? originListLength - 1 : this.originIndex - 1;
-        this.displayIndex = this.displayIndex - 1 == -1 ? 2 : this.displayIndex - 1;
-		//console.log('---',this.originIndex)
-		this.oid=this.originIndex+1
-        this.initSwiperData(this.originIndex);
-      }
-	  this.isqp=true 
-    },
-	detail(vid,mid){
-		var fxpid=1
-		if(uni.getStorageSync("userinfo")){
-			 fxpid=uni.getStorageSync("userinfo").id
-		}
-		uni.navigateTo({
-			url:'/pages/video/index?vid='+vid+'&mid='+mid+'&fxpid='+fxpid
-		})
-	},
-	toComment(sss,vid,mid){
-		if(uni.getStorageSync("userinfo")){
-			
-		}else{
-			this.denglu()
-			return false
-		}
-		const video = this.displaySwiperList[this.displayIndex];
-		//console.log(sss)
-		if(sss==1){
-			this.displaySwiperList[this.displayIndex].iszj=2
-		}else{
-			this.displaySwiperList[this.displayIndex].iszj=1
-		}
-		
-		let this_=this
-		let data = {'vid':vid,'mid':mid};
-		data.token = uni.getStorageSync("userinfo").token
-		data.uid = uni.getStorageSync("userinfo").id
-		uni.request({
-			url: this_.urls+'/api/user/videorecord',
-			data: data,
-			success: data => {
-				// uni.showToast({
-				// 	icon:'none',
-				// 	title:data.data.msg
-				// })
-			},
-			fail: (data, code) => {
-			}
-		});
-	},
-	controlstoggle(e){
-		console.log(e.detail.show);
-		this.issp=e.detail.show
-	},
-	cLike(sss,vid,mid){
-		if(uni.getStorageSync("userinfo")){
-			
-		}else{
-			this.denglu()
-			return false
-		}
-		const video = this.displaySwiperList[this.displayIndex];
-		if(sss==1){
-			this.displaySwiperList[this.displayIndex].like=2
-			video.like_n += 1;
-		}else{
-			this.displaySwiperList[this.displayIndex].like=1
-			video.like_n -= 1
-		}
-		
-		console.log(vid)
-		
-		let this_=this
-		let data = {'vid':vid,'mid':mid};
-		data.token = uni.getStorageSync("userinfo").token
-		data.uid = uni.getStorageSync("userinfo").id
-		uni.request({
-			url: this_.urls+'/api/user/tapLove',
-			data: data,
-			success: data => {
-				// uni.showToast({
-				// 	icon:'none',
-				// 	title:data.data.msg
-				// })
-				// if(data.data.msg=='取消成功'){
-				// 	video.like_n -= 1
-				// }else{
-				// 	video.like_n += 1;
-				// }
-			},
-			fail: (data, code) => {
-			}
-		});
-	},
-	denglu(){
-		uni.showModal({
-			title: '温馨提示',
-			content: '请先登录',
-			showCancel: true,
-			confirmText: "登录",
-			success: function (res) {
-				if (res.confirm) {
-					uni.navigateTo({
-						url:"/pages/login/login"
-					})
-				} else if (res.cancel) {
-					//uni.navigateBack();
-				}
-			}
-		});
-		
-	}
-  },
-  created() {
-	
-  },
-};
-</script>
-
-<style>
-.title {
-  width: 100%;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  height: 60rpx;
-}
-.swiper {
-}
-.wrap_content {
-  border-radius: 20rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  background: gray;
-  color: aqua;
-  height: 100%;
-  font-size: 80px;
-  margin: 0rpx 40rpx;
-}
-.container {background-color: #000000;}
-	.item {
-		/* width : 750rpx; */
-		background-color: #000000;
-		position: relative;
-	}
-	.videoHover{
-		position: absolute;
-		top: 40px;
-		left: 0;
-		flex: 1;
-		background-color: rgba(0,0,0,0.1);
-		justify-content: center;
-		align-items: center;
-		
-		/* border-style: dashed;
-		border-color: #DD524D;
-		border-width: 1px; */
-	}
-	.playState{
-		width:  160rpx;
-		height: 160rpx;
-		opacity: 0.2;
-	}
-	.userInfo{
-		position: absolute;
-		z-index: 99;
-		bottom:30%;
-		right: 10px;
-		width: 100rpx;
-		text-align: center;
-		flex-direction: column;
-		
-	}
-	.userAvatar{
-		border-radius: 500%;
-		margin-bottom: 15px;
-		border-style: solid;
-		border-width: 2px;
-		border-color: #ffffff;
-	}
-	.userAvatar{
-		width : 100rpx;
-		height: 100rpx;
-	}
-	.likeIco,.shareIco,.commentIco{
-		width : 60rpx;
-		height: 60rpx;
-		margin-top: 15px;
-	}
-	.likeNum,.commentNum,.shareTex{
-		color: #ffffff;
-		font-size: 30rpx;
-		text-align: center;
-		margin: 5px;
-	}
-	.likeNumActive{
-		color: red;
-	}
-	.contentcd{
-	  width: 720rpx;
-	  z-index: 99;
-	  position: absolute;
-	  bottom: 30px;
-	  /* justify-content: center; */
-	  padding: 15rpx;
-	  flex-direction: column;
-	  justify-content: flex-start;
-	  color: #ffffff;
-	}
-	.userName {
-	  font-size: 30rpx;
-	  color: #ffffff;
-	  margin-top: 80upx;
-	  margin-left: -12rpx;
-	}
-	.words {
-	  margin-top: 16rpx;
-	  font-size: 30rpx;
-	  color: #ffffff;
-	  margin-bottom: 20rpx;
-	}
-	.wordss {
-	  margin-top: 10rpx;
-	  font-size: 26rpx;
-	  color: #ffffff;
-	}
-	.root{
-		background-color: #000000;
-	}
-</style>

+ 0 - 59
pages/client/video/video.nvue

@@ -1,59 +0,0 @@
-<template>
-  <view class="content">
-	<!-- #ifdef APP-PLUS -->
-    <ad-content-page class="ad-content-page" ref="adContentPage" :adpid="adpid" @load="onadload" @error="onaderror"></ad-content-page>
-	<!-- #endif -->
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      title: 'ad-content-page',
-	  adpid:''
-    }
-  },
-  onShow() {
-	// #ifdef APP-PLUS
-	if(uni.getStorageSync("config")){
-		this.adpid=uni.getStorageSync("config").site.appapi.dspadpid
-		console.log(this.adpid)
-	}
-    this.$nextTick(() => {
-      // 需要在页面显示时调用广告组件的 show 方法
-      this.$refs.adContentPage.show();
-    })
-	// #endif
-  },
-  onUnload() {
-  	// #ifdef APP-PLUS
-  	// 需要在页面隐藏时调用广告组件的 hide 方法停止广告内容的声音
-  	this.$refs.adContentPage.hide();
-  	// #endif
-  },
-  onHide() {
-	// #ifdef APP-PLUS
-    // 需要在页面隐藏时调用广告组件的 hide 方法停止广告内容的声音
-    this.$refs.adContentPage.hide();
-	// #endif
-  },
-  methods: {
-    onadload(e) {
-      console.log("onadload",e);
-    },
-    onaderror(e) {
-      console.log("onaderror",e);
-    }
-  }
-}
-</script>
-<style>
-.content {
-  flex: 1
-}
-
-.ad-content-page {
-  flex: 1
-}
-</style>

+ 0 - 99
pages/client/vipcard/adviser.vue

@@ -1,99 +0,0 @@
-<template>
-	<view class="pd16_15">
-		<view class="box noshadow pd16_15">
-			<view class="flex alcenter">
-				<image class="adviser-face-big" :src="statics.defaultFace"></image>
-				<view style="width: calc(100% - 160rpx);" class=" pl15">
-					<view class="ft16 cl-main ftw600">张顾问</view>
- 					<view class="flex alcenter mt8">
-						<view class="flex alcenter cl-notice">
-							<text class="iconfont iconicon_weixin ft14"></text>
-							<text class="ft14 ml5">{{weixin}}</text>
-						</view>
-						<view @click="onddtel(weixin)" class="copy-tag ml10" :style="{background:tempColor}">复制</view>
-					</view>
-					<view class="flex alcenter space mt8">
-						<view class="flex alcenter cl-notice">
-							<text class="iconfont iconicon_call ft14"></text>
-							<text class="ft14 ml5">{{tel}}</text>
-						</view>
-						<text  @click="ontel(tel)" class="iconfont iconicon_bottom_call ft20" :style="{color:tempColor}"></text>
-					</view>
-				</view>
-			</view>
-			<view class="mt24">
-				<navigator url="/pages/client/vipcard/adviserchange">
-				<button class="btn-mid plan" style="width: 100%;" :style="getBtnPlanStyle">
-					<text class="iconfont iconicon_huan mr10"></text>更换顾问
-				</button>
-				</navigator>
-			</view>
-		</view>
-		
-		<view class="box noshadow pd16_15 mt16">
-			<textarea v-model="content" placeholder="我有问题要跟顾问反馈:" placeholder-class="cl-notice" class="ft14" style="height: 300rpx; width: 100%;" :maxlength="300"></textarea>
-			<view class="mt12 text-right ft12 cl-notice">
-				{{content.length}}/300
-			</view>
-		</view>
-		<view class="mt16">
-			<button class="btn-big" :style="getBtnStyle">立即提交</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default{
-		data(){
-			return {
-				content:'',
-				tel:'',
-				weixin:''
-			}
-		},
-		onShow() {
-			this.tel= uni.getStorageSync("config").tels
-			this.weixin= uni.getStorageSync("config").weixin
-		},
-		methods:{
-			ontel(tel){
-				uni.makePhoneCall({
-				    phoneNumber: tel //仅为示例
-				});
-			},
-			onddtel(tel){
-				uni.setClipboardData({
-				 data: tel,  
-				 success() {  
-				  publicFun.showtip('已经复制')  
-				 },  
-				 fail(res) {  
-				  console.log(res)  
-				  publicFun.showtip('复制失败')  
-				 }  
-				
-				})
-
-			},
-			
-		}
-	}
-</script>
-
-<style>
-	.adviser-face-big{
-		width: 160rpx;
-		height: 160rpx;
-		border-radius: 80rpx;
-		background: #FFFFFF;
-	}
-	.copy-tag{
-		width: 96rpx;
-		height: 40rpx;
-		color:#FFFFFF;
-		font-size: 24rpx;
-		text-align: center;
-		line-height: 40rpx;
-		border-radius: 20rpx;
-	}
-</style>

+ 0 - 76
pages/client/vipcard/adviserchange.vue

@@ -1,76 +0,0 @@
-<template>
-	<view class="pd16_15">
-		<view v-if="resultType == 0">
-			<view class="box noshadow pd10_15 flex alcenter space">
-				<input placeholder="输入顾问ID" placeholder-class="cl-notice" style="width: 300rpx;" class="ft16 cl-main" />
-				<button class="btn-mid" :style="getBtnStyle" style="width: 160rpx;">确定</button>
-			</view>
-			<view class="text-center pt60 ft14 cl-info2">或</view>
-			
-			<view class="box noshadow mt60 pd32">
-				<view class="text-center">
-					<text class="iconfont iconicon_saoma ft40" :style="{color:tempColor}"></text>
-				</view>
-				<view class="text-center mt16 ft14 cl-main">扫描顾问码</view>
-			</view>
-		</view>
-		<view v-if="resultType == 1">
-			
-			<view class="box noshadow pd16_15">
-				<view class="flex alcenter">
-					<image class="adviser-face-big" :src="statics.defaultFace"></image>
-					<view style="width: calc(100% - 160rpx);" class=" pl15">
-						<view class="ft16 cl-main ftw600">张顾问</view>
-						<view class="flex alcenter mt8">
-							<view class="flex alcenter cl-notice">
-								<text class="iconfont iconicon_weixin ft14"></text>
-								<text class="ft14 ml5">ffy1203605498</text>
-							</view>
-							
-						</view>
-						<view class="flex alcenter space mt8">
-							<view class="flex alcenter cl-notice">
-								<text class="iconfont iconicon_call ft14"></text>
-								<text class="ft14 ml5">13515608638</text>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			
-			<view class="mt16">
-				<button class="btn-big" :style="getBtnStyle">确定更换</button>
-			</view>
-			
-		</view>
-		
-		<view v-if="resultType == -1">
-			
-			<com-empty title="未找到顾问,请返回重新操作"></com-empty>
-			
-			<view class="flex center">
-				<button class="btn-mid" :style="getBtnStyle">返回</button>
-			</view>
-		</view>
-		
-	</view>
-</template>
-
-<script>
-	export default{
-		data(){
-			return {
-				resultType: -1, //1 -1
-			}
-		}
-	}
-</script>
-
-<style>
-	.adviser-face-big{
-		width: 160rpx;
-		height: 160rpx;
-		border-radius: 80rpx;
-		background: #FFFFFF;
-	}
-</style>

+ 0 - 91
pages/client/vipcard/fxlog.vue

@@ -1,91 +0,0 @@
-<template>
-	<view class="pd16_15">
-		<block v-for="(item,index) in listData" :key="index">
-		<view class="box pd16_15 flex alcenter space" style="margin-bottom: 30upx;">
-			<view>
-				<view class="ft14 cl-main">{{item.memo}} 【订单ID:{{item.oid}}】</view>
-				<view class="mt8 ft12 cl-notice">{{item.createtime}}</view>
-				<!-- <view class="mt8">
-					<text class="ft12 cl-notice">备注:</text>
-					<text class="ft12 cl-main">暂无</text>
-				</view> -->
-			</view>
-			<view class="cl-main ft18 ftw600">
-				{{item.jzt}}{{item.money}}
-			</view>
-		
-		</view>
-		</block>	
-		<uni-load-more :status="status" :content-text="contentText" />
-	</view>
-</template>
-
-<script>
-	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-	  export default {
-		  components: {
-		  	uniLoadMore
-		  },
-		data(){
-			return {
-			    listData: [],
-				last_id: 0,
-				reload: true,
-				status: 'more',
-				contentText: {
-					contentdown: '上拉加载更多',
-					contentrefresh: '加载中',
-					contentnomore: '没有数据了'
-				}
-			}
-		},
-		onReachBottom() {
-			this.status = 'more';
-			this.getList();
-		},
-		onLoad() {
-			this.getList();
-		},
-		methods:{
-			getList() {
-				let data = {
-					//column: 'id,post_id,title,author_name,cover,published_at' //需要的字段名
-				};
-				var limit=10;
-				if (this.last_id>0) {
-					//说明已有数据,目前处于上拉加载
-					this.status = 'loading';
-					data.offset = this.last_id*limit;
-					data._ = new Date().getTime() + '';
-				}
-				data.limit=limit		
-				data.token = uni.getStorageSync("userinfo").token;
-				uni.request({
-					url: this.configs.webUrl+'/api/user/userfxinfo',
-					data: data,
-					success: data => {
-						console.log(data.data)
-						if (data.data.total>0) {
-							let list = data.data.rows;
-							this.listData = this.reload ? list : this.listData.concat(list);
-							this.reload = false;
-							this.last_id = this.last_id+1;
-							if(data.data.total<this.last_id*limit){
-								this.status = '';
-							}
-						}else{
-							this.contentText.contentdown='没有数据'
-						}
-					},
-					fail: (data, code) => {
-						//console.log('fail' + JSON.stringify(data));
-					}
-				});
-			},
-		}
-	}
-</script>
-
-<style>
-	
-</style>

+ 0 - 302
pages/client/vipcard/index.vue

@@ -1,302 +0,0 @@
-<template>
-	<view v-if="vipSetting.length > 0">
-		<view class="vipcard-detail-header">
-			<image class="bg" :src="statics.vipcardDetailHeaderBg"></image>
-			<view class="main pt20">
-				<view class="flex alcenter space">
-					<view class="col3 text-center">
-						<view class="ft12 cl-w8">{{vipLevel>1?'到期日期':''}}</view>
-						<view class="mt8 vipcard-num">{{vipLevel>1?userinfo.dtime:''}}</view>
-					</view>
-					<view class="col3 flex center">
-						<image class="vipcard-face" :src="avatar"></image>
-					</view>
-					<view class="col3 text-center">
-						<view class="ft12 cl-w8">{{vipLevel>1?'剩余天数':''}}</view>
-						<view v-if="userinfo.dqts>=0" class="mt8 vipcard-num">{{vipLevel>1?userinfo.dqts+'天':''}}</view>
-						<view v-if="userinfo.dqts<0" class="mt8 vipcard-num">{{vipLevel>1?'已经到期'+-userinfo.dqts+'天':''}}</view>
-					</view>
-				</view>
-				
-				<view class="flex center mt8">
-					<view class="vipcard-level-tag ft12 cl-w8">当前等级:<text class="ftw600 ft12 ml4">{{vipname}}</text></view>
-				</view>
-			</view>
-		</view>
-	
-		<view class="vipcard-detail-main">
-			<view class="flex center">
-				<swiper @change="changeVip" class="vipcard-swiper" previous-margin="15px" next-margin="30px" :indicator-dots="false" :autoplay="false">
-					<swiper-item>
-						<view class="swiper-item">
-							<view class="card">
-								<image class="bg" :src="statics.vipcardBg[vipLevel-1]"></image>
-								<view class="main">
-									<view class="text-center ft20 ftw600 cl-main">{{vipname}}</view>
-									<view v-if="userinfo.dqts>=0" class="mt20 flex center">
-										<view @click="vipcm" v-if="vipLevel == 1" class="vipcard-info"><text class="ft14 ftw600 ml4 cl-main">立即升级</text></view>
-										<view @click="vipcm" v-if="vipLevel == 2" class="vipcard-info">{{userinfo.dqts}}天后到期 续费VIP</view>
-									</view>
-									<view v-if="userinfo.dqts<0" class="mt20 flex center">
-										<view @click="vipcm" v-if="vipLevel == 1" class="vipcard-info"><text class="ft14 ftw600 ml4 cl-main">立即升级</text></view>
-										<view @click="vipcm" v-if="vipLevel == 2" class="vipcard-info">已经到期{{-userinfo.dqts}}天 立即续费VIP</view>
-									</view>
-								</view>
-							</view>
-						</view>
-					</swiper-item>
-		
-				</swiper>
-			</view>
-			<view class="pd16_15">
-				<view class="box noshadow pd16_15">
-					<view class="ft16 ftw600 cl-main">VIP会员持有权益</view>
-					<view class="flex space alcenter mt16">
-						<view class="vipcard-con-box pd20_15 flex alcenter">
-							<image style="width: 80rpx;height: 80rpx;" :src="statics.vipTq[0]"></image>
-							<view class="ml10">
-								<view class="ft14 ftw600 cl-main">福利</view>
-								<view class="mt6 ft12 cl-notice">超级礼包</view>
-							</view>
-						</view>
-						<view class="vipcard-con-box pd20_15 flex alcenter">
-							<image style="width: 80rpx;height: 80rpx;" :src="statics.vipTq[1]"></image>
-							<view class="ml10">
-								<view class="ft14 ftw600 cl-main">特惠折扣</view>
-								<view class="mt6 ft12 cl-notice">会员专属价</view>
-							</view>
-						</view>
-						
-					</view>
-					
-					<view class="flex space alcenter mt16">
-						<view class="vipcard-con-box pd20_15 flex alcenter">
-							<image style="width: 80rpx;height: 80rpx;" :src="statics.vipTq[2]"></image>
-							<view class="ml10">
-								<view class="ft14 ftw600 cl-main">专属特惠</view>
-								<view class="mt6 ft12 cl-notice">免费视频</view>
-							</view>
-						</view>
-						<view class="vipcard-con-box pd20_15 flex alcenter">
-							<image style="width: 80rpx;height: 80rpx;" :src="statics.vipTq[3]"></image>
-							<view class="ml10">
-								<view class="ft14 ftw600 cl-main">专属顾问</view>
-								<view class="mt6 ft12 cl-notice">独家找片</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<dialog-birthday :showOnly="true" :title="'V'+vipSetting[selectId].level +vipSetting[selectId].name + '生日礼包'" v-if="showBirthday" @closed="showBirthday = false"></dialog-birthday>
-	</view>
-</template>
-
-<script>
-	export default{
-		data(){
-			return {
-				vipLevel:'',
-				rankNum:290, //成长值
-				selectId:0,
-				vipname:'',
-				showBirthday:false,
-				avatar:'',
-				userinfo:[],
-				vid:0,
-				mid:0,
-				vipSetting:[
-					{level:1,name:'普通会员',rank_need:100},
-					{level:2,name:'VIP会员',rank_need:200},
-					// {level:3,name:'铂金会员',rank_need:300},
-					// {level:4,name:'钻石会员',rank_need:400},
-					// {level:5,name:'至尊会员',rank_need:500},
-				],
-			}
-		},
-		onLoad(e) {
-			if(e.vid){
-				this.vid=e.vid
-			}
-			if(e.mid){
-				this.mid=e.mid
-			}
-		},
-		onShow() {
-			this.ongrzlTap();
-		},
-		computed:{
-			getVipType(){
-				let arr =  new Array;
-				for(var a  in this.vipSetting){
-					let type = 0; // 0未达到  1已达到  2当前
-					if(this.vipLevel > this.vipSetting[a].level){
-						type = 1;
-					}else if(this.vipLevel == this.vipSetting[a].level){
-						type = 2;
-					}
-					arr.push(type);
-				}
-				return arr;
-			}
-		},
-		methods:{
-			async ongrzlTap(){
-				let data = {};
-				data.token = uni.getStorageSync("userinfo").token;
-				data.uid = uni.getStorageSync("userinfo").id;
-				uni.request({
-					url: this.configs.webUrl+'/api/user/index',
-					data: data,
-					success: res =>{
-						if(res.data.code==1){
-							let ionfo=res.data.data
-							this.userinfo=ionfo
-							this.vipLevel=ionfo.group_id
-							if(this.vipLevel==1){
-								this.vipname='普通会员'
-							}else{
-								this.vipname='VIP会员'
-							}
-							if(res.data.data.avatar){
-									var str = res.data.data.avatar;
-									if(str.indexOf("data:image") != -1){
-										this.avatar='';
-									}else{
-										if(str.indexOf("http") != -1){
-											this.avatar=res.data.data.avatar;
-										}else{
-											this.avatar=this.configs.imgUrl+res.data.data.avatar;
-										}
-									}
-								}else{
-									this.avatar='';
-								}
-						}else{
-							uni.showToast({ title: res.data.msg,icon:"none" });
-						}
-					},
-					fail: (data, code) => {
-						//console.log('fail' + JSON.stringify(data));
-					}
-				});		
-			},
-			changeVip(e){
-				this.selectId = parseInt(e.detail.current);
-			},
-			vipcm(){
-				//uni.showToast({ title: '0000',icon:"none" });
-				uni.navigateTo({
-					url:'/pages/client/vipcard/vipcm?vid='+this.vid+'&mid='+this.mid
-				})
-			}
-			
-		}
-	}
-</script>
-
-<style>
-	.vipcard-detail-header{
-		position: relative;
-		height: 480rpx;
-	}
-	.vipcard-detail-header .bg{
-		width: 100%;
-		height: 480rpx;
-	}
-	.vipcard-detail-header .main{
-		height: 480rpx;
-		width: 100%;
-		position: absolute;
-		left: 0;
-		top: 0;
-	}
-	.vipcard-detail-header .vipcard-num{
-		font-size: 24rpx;
-		font-weight: bold;
-		line-height: 48rpx;
-		background: linear-gradient(180deg, #F2DCA9 0%, #C79556 100%);
-		-webkit-background-clip: text;
-		-webkit-text-fill-color: transparent;
-	}
-	.vipcard-detail-header .vipcard-face{
-		width: 112rpx;
-		height: 112rpx;
-		border:8rpx solid rgba(255,255,255,0.9);
-		border-radius: 100rpx;
-		background: rgba(255,255,255,0.9);
-	}
-	.vipcard-detail-header .vipcard-level-tag{
-		height: 40rpx;
-		border-radius: 20rpx;
-		padding: 0 16rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		border:2rpx solid rgba(255,255,255,.3)
-	}
-	.vipcard-detail-main{
-		position: relative;
-		margin-top: -212rpx;
-	}
-
-	.vipcard-swiper{
-		height: 280rpx;
-		width: 100%;
-	}
-	.vipcard-swiper .swiper-item{
-		width: 100%;
-		padding-left: 15px; /**就用PX了**/
-	}
-	.vipcard-swiper .swiper-item .card{
-		height: 280rpx;
-		width: 100%;
-		position: relative;
-		border-radius: 32rpx;
-		overflow: hidden;
-	}
-	.vipcard-swiper .swiper-item .card .bg{
-		width: 100%;
-		height: 280rpx;
-	}
-	.vipcard-swiper .swiper-item .card .main{
-		width: 100%;
-		height: 280rpx;
-		position: absolute;
-		left: 0;
-		top: 0;
-		z-index: 2;
-		padding: 72rpx;
-	}
-	.vipcard-swiper .swiper-item .card .main .vipcard-info{
-		height: 80rpx;
-		background: #FFFFFF;
-		border-radius: 24rpx;
-		padding: 0 20rpx;
-		text-align: center;
-		line-height: 80rpx;
-		color:#ff0000;
-		font-size: 30rpx;
-	}
-	.vipcard-swiper .swiper-item .card .vip-type-tag{
-		width: 104rpx;
-		height: 40rpx;
-		background: linear-gradient(136deg, #4E4E4E 0%, #262728 100%);
-		border-radius: 0rpx 20rpx 20rpx 0rpx;
-		text-align: center;
-		line-height: 40rpx;
-		font-size: 24rpx;
-		color:#F7E3C3;
-		font-weight: 500;
-		position: absolute;
-		z-index: 3;
-		left: 0;
-		top:40rpx;
-	}
-	.vipcard-con-box{
-		width: 300rpx;
-		background: #FFFFFF;
-		box-shadow: 0rpx 4rpx 32rpx 0rpx rgba(0, 0, 0, 0.04);
-		border-radius: 8rpx;
-	}
-</style>

+ 0 - 141
pages/client/vipcard/integraldh.vue

@@ -1,141 +0,0 @@
-<template>
-	<view>
-		<view class="integral-log-header">
-			<image class="bg" :src="statics.integralLogHeader"></image>
-			<view class="main pd24_20">
-				<view class="flex alcenter space">
-					<view>
-						<view class="flex alcenter">
-							<text class="ft14 cl-w">当前积分</text>
-							<navigator open-type="redirect" url="/pages/client/integral/role">
-								<text class="ml5 iconfont iconbtn_question cl-w ft20"></text>
-							</navigator>
-						</view>
-						<view class="mt16 flex alcenter">
-							<image :src="statics.integralImg01" style="width: 40rpx; height: 40rpx;"></image>
-							<text class="ml10 ft20 cl-w ftw600">{{userinfo.score}}</text>
-						</view>
-					</view>
-					<view class="btn-integral">
-					<view class="ft14 mb10">兑换说明:</view>
-					{{userinfo.config.jfdhsm}}
-					</view>
-	
-				</view>
-			</view>
-		</view>
-		<view class="integral-log-main pd16_15">
-			<view class="ft18">兑换数量:</view>
-			<input class="ft14 mt16" type="digit" placeholder="请输入兑换数量" style="border: 1px solid #ddd; height: 80upx; line-height: 80upx; border-radius: 16upx; padding: 10upx;" v-model="sum" />
-		<button @click="duihuan()" class="btn-vip-money ft18 mt20" style="width: 80%; background: rgb(0, 198, 87); color: #ffffff; text-align: center; height: 100upx; line-height: 100upx;">提交兑换</button>
-		</view>
-		
-	</view>
-</template>
-
-<script>
-	export default{
-		data(){
-			return {
-				sum: '',
-				userinfo:[],
-				listData: [],
-				last_id: 0,
-				reload: true,
-				status: 'more',
-				userinfo:[],
-				contentText: {
-					contentdown: '上拉加载更多',
-					contentrefresh: '加载中',
-					contentnomore: '没有数据了'
-				}
-			}
-		},
-		onReachBottom() {
-
-		},
-		onLoad(){
-			this.ongrzlTap()
-		},
-		methods:{
-			duihuan(){
-				let data = {};
-				data.token = uni.getStorageSync("userinfo").token;
-				data.uid = uni.getStorageSync("userinfo").id;
-				if(!this.sum){
-					uni.showToast({
-					  icon: 'none',
-					  title: '请输入兑换数量'
-					});
-					return;
-				}
-				data.sum=this.sum
-				uni.request({
-					url: this.configs.webUrl+'/api/user/duihuan',
-					data: data,
-					success: res =>{
-						if(res.data.code==1){
-							this.ongrzlTap()
-							uni.showToast({ title: res.data.msg,icon:"none" });
-						}else{
-							uni.showToast({ title: res.data.msg,icon:"none" });
-						}
-					},
-					fail: (data, code) => {
-						
-					}
-				});
-			},
-			async ongrzlTap(){
-				let data = {};
-				data.token = uni.getStorageSync("userinfo").token;
-				data.uid = uni.getStorageSync("userinfo").id;
-				uni.request({
-					url: this.configs.webUrl+'/api/user/index',
-					data: data,
-					success: res =>{
-						if(res.data.code==1){
-							let ionfo=res.data.data
-							this.userinfo=ionfo
-						}else{
-							uni.showToast({ title: res.data.msg,icon:"none" });
-						}
-					},
-					fail: (data, code) => {
-						//console.log('fail' + JSON.stringify(data));
-					}
-				});		
-			},
-			
-		}
-	}
-</script>
-
-<style>
-	.integral-log-header{
-		position: relative;
-		height: 252rpx;
-	}
-	.integral-log-header .bg{
-		width: 100%;
-		height: 252rpx;
-	}
-	.integral-log-header .main{
-		height: 252rpx;
-		width: 100%;
-		position: absolute;
-		left: 0;
-		top: 0;
-	}
-	.btn-integral{
-		color:#ffffff;
-		font-size: 24rpx;
-	}
-	.integral-log-main{
-		background: #FFFFFF;
-		min-height: 1400rpx;
-		position: relative;
-		margin-top: -32rpx;
-		border-radius: 32rpx 32rpx 0rpx 0rpx;
-	}
-</style>

+ 0 - 168
pages/client/vipcard/integrallog.vue

@@ -1,168 +0,0 @@
-<template>
-	<view>
-		<view class="integral-log-header">
-			<image class="bg" :src="statics.integralLogHeader"></image>
-			<view class="main pd24_20">
-				<view class="flex alcenter space">
-					<view>
-						<view class="flex alcenter">
-							<text class="ft14 cl-w">当前积分</text>
-							<navigator open-type="redirect" url="/pages/client/integral/role">
-								<text class="ml5 iconfont iconbtn_question cl-w ft20"></text>
-							</navigator>
-						</view>
-						<view class="mt16 flex alcenter">
-							<image :src="statics.integralImg01" style="width: 40rpx; height: 40rpx;"></image>
-							<text class="ml10 ft20 cl-w ftw600">{{userinfo.score}}</text>
-						</view>
-					</view>
-					<navigator open-type="redirect" url="/pages/client/vipcard/integraldh">
-					<view class="btn-integral">积分兑换</view>
-					</navigator>
-				</view>
-			</view>
-		</view>
-		<view class="integral-log-main">
-			<view class="pd16_15 bd-bottom flex alcenter">
-				<text class="iconfont iconicon_integral_des ft20 cl-main"></text>
-				<text class="ml10 ft16 ftw600 cl-main">积分明细</text>
-			</view>
-			<view class="pd16_15" v-if="listData.length>0">
-				<block v-for="(item,index) in listData" :key="index">
-				<view class="pb16 mb16 bd-bottom flex alcenter space">
-					<view>
-						<view class="ft14 cl-main">{{item.memo}}</view>
-						<view class="mt8 ft12 cl-notice">{{item.createtime}}</view>
-					</view>
-					<view class="ft18 ftw600 cl-main">{{item.jzt}}{{item.score}}</view>
-				</view>
-				</block>
-				<uni-load-more :status="status" :content-text="contentText" />
-			</view>
-			
-			<com-empty v-else title="暂无积分记录"></com-empty>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default{
-		data(){
-			return {
-				userinfo:[],
-				listData: [],
-				last_id: 0,
-				reload: true,
-				status: 'more',
-				userinfo:[],
-				contentText: {
-					contentdown: '上拉加载更多',
-					contentrefresh: '加载中',
-					contentnomore: '没有数据了'
-				}
-			}
-		},
-		onReachBottom() {
-			this.status = 'more';
-			this.getList();
-		},
-		onLoad(){
-			this.ongrzlTap()
-			this.getList();
-		},
-		methods:{
-			async ongrzlTap(){
-				let data = {};
-				data.token = uni.getStorageSync("userinfo").token;
-				data.uid = uni.getStorageSync("userinfo").id;
-				uni.request({
-					url: this.configs.webUrl+'/api/user/index',
-					data: data,
-					success: res =>{
-						if(res.data.code==1){
-							let ionfo=res.data.data
-							this.userinfo=ionfo
-						}else{
-							uni.showToast({ title: res.data.msg,icon:"none" });
-						}
-					},
-					fail: (data, code) => {
-						//console.log('fail' + JSON.stringify(data));
-					}
-				});		
-			},
-			getList() {
-				let data = {
-					//column: 'id,post_id,title,author_name,cover,published_at' //需要的字段名
-				};
-				var limit=10;
-				if (this.last_id>0) {
-					//说明已有数据,目前处于上拉加载
-					this.status = 'loading';
-					data.offset = this.last_id*limit;
-					data._ = new Date().getTime() + '';
-				}
-				data.limit=limit		
-				data.token = uni.getStorageSync("userinfo").token;
-				uni.request({
-					url: this.configs.webUrl+'/api/user/userscoreinfo',
-					data: data,
-					success: data => {
-						console.log(data.data)
-						if (data.data.total>0) {
-							let list = data.data.rows;
-							this.listData = this.reload ? list : this.listData.concat(list);
-							this.reload = false;
-							this.last_id = this.last_id+1;
-							if(data.data.total<this.last_id*limit){
-								this.status = '';
-							}
-						}else{
-							this.contentText.contentdown='没有数据'
-						}
-					},
-					fail: (data, code) => {
-						//console.log('fail' + JSON.stringify(data));
-					}
-				});
-			},
-		}
-	}
-</script>
-
-<style>
-	.integral-log-header{
-		position: relative;
-		height: 252rpx;
-	}
-	.integral-log-header .bg{
-		width: 100%;
-		height: 252rpx;
-	}
-	.integral-log-header .main{
-		height: 252rpx;
-		width: 100%;
-		position: absolute;
-		left: 0;
-		top: 0;
-	}
-	.btn-integral{
-		width: 192rpx;
-		height: 80rpx;
-		background: #FFFFFF;
-		box-shadow: 0rpx 8rpx 32rpx 0rpx rgba(0, 0, 0, 0.04);
-		border-radius: 40rpx;
-		text-align: center;
-		line-height: 80rpx;
-		color:#6687EF;
-		font-size: 28rpx;
-		font-weight: 500;
-	}
-	.integral-log-main{
-		background: #FFFFFF;
-		min-height: 1400rpx;
-		position: relative;
-		margin-top: -32rpx;
-		border-radius: 32rpx 32rpx 0rpx 0rpx;
-	}
-</style>

+ 0 - 94
pages/client/vipcard/moneylog.vue

@@ -1,94 +0,0 @@
-<template>
-	<view class="pd16_15">
-		<block v-for="(item,index) in listData" :key="index">
-		<view class="box pd16_15 flex alcenter space" style="margin-bottom: 30upx;">
-			<view>
-				<view class="ft14 cl-main">{{item.memo}}</view>
-				<view class="mt8 ft12 cl-notice">{{item.createtime}}</view>
-				<!-- <view class="mt8">
-					<text class="ft12 cl-notice">备注:</text>
-					<text class="ft12 cl-main">暂无</text>
-				</view> -->
-			</view>
-			
-			<view class="cl-main ft18 ftw600">
-				{{item.jzt}}{{item.money}}
-			</view>
-		
-		</view>
-		</block>	
-		<uni-load-more :status="status" :content-text="contentText" />
-	</view>
-</template>
-
-<script>
-	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-	  export default {
-		  components: {
-		  	uniLoadMore
-		  },
-		data(){
-			return {
-			    listData: [],
-				last_id: 0,
-				reload: true,
-				status: 'more',
-				userinfo:[],
-				contentText: {
-					contentdown: '上拉加载更多',
-					contentrefresh: '加载中',
-					contentnomore: '没有数据了'
-				}
-			}
-		},
-		onReachBottom() {
-			this.status = 'more';
-			this.getList();
-		},
-		onLoad() {
-			this.getList();
-		},
-		methods:{
-			
-			getList() {
-				let data = {
-					//column: 'id,post_id,title,author_name,cover,published_at' //需要的字段名
-				};
-				var limit=10;
-				if (this.last_id>0) {
-					//说明已有数据,目前处于上拉加载
-					this.status = 'loading';
-					data.offset = this.last_id*limit;
-					data._ = new Date().getTime() + '';
-				}
-				data.limit=limit		
-				data.token = uni.getStorageSync("userinfo").token;
-				uni.request({
-					url: this.configs.webUrl+'/api/user/usermoneyinfo',
-					data: data,
-					success: data => {
-						console.log(data.data)
-						if (data.data.total>0) {
-							let list = data.data.rows;
-							this.listData = this.reload ? list : this.listData.concat(list);
-							this.reload = false;
-							this.last_id = this.last_id+1;
-							if(data.data.total<this.last_id*limit){
-								this.status = '';
-							}
-						}else{
-							this.contentText.contentdown='没有数据'
-						}
-					},
-					fail: (data, code) => {
-						//console.log('fail' + JSON.stringify(data));
-					}
-				});
-			},
-		}
-	}
-</script>
-
-<style>
-	
-</style>

+ 0 - 479
pages/client/vipcard/recharge.vue

@@ -1,479 +0,0 @@
-<template>
-	<view class="pd16_15">
-		
-		<view class="box over-hide">
-			<view class="recharge-header">
-				<image :src="statics.moneyRecharge"></image>
-				<view class="main pd24_20">
-					<view class="ft16 cl-w9">当前{{hbmc}}</view>
-					<view class="mt16 ftw600 ft32 cl-w">{{userinfo.money}}</view>
-				</view>
-			</view>
-			<navigator url="/pages/client/vipcard/moneylog">
-				<view class="pd16_15 flex alcenter space">
-					<text class="ft14 ftw600 cl-main">{{hbmc}}明细 </text>
-					<text class="iconfont iconicon_arrow_circle ft20" :style="{color:tempColor}"></text>
-				</view>
-			</navigator>
-		</view>
-		
-		<radio-group  @change="changeNum">
-			<view class="flex wrap space mt16">
-				<view v-for="(item,index) in moneyList" :key="index"  :class="index > 1 ? 'mt16' : ''" class="box pd20_15" style="width: 48%;">
-					<view class="flex alcenter space">
-						<view class="ft16 cl-main ftw600">¥{{item.money*1}}</view>
-						<radio :value="item.money" :checked="money == item.money"  :color="tempColor" />
-					</view>
-					<view v-if="item.num!=item.money" class="ft14 mt10 cl-main ftw400">
-					{{hbmc}}{{item.num*1}}
-					<text v-if="item.coupon*1>0" class="ft14">+送{{item.coupon*1}}</text>
-					</view>
-					
-				</view>
-			</view>
-		</radio-group>
-		<radio-group  @change="changetd" style="display: none;">
-			<view class="mt16">
-				<view v-for="(item,index) in tdList" :key="index"  :class="index >= 1 ? 'mt16' : ''" class="box pd20_15 flex alcenter space">
-					<text class="ft16 cl-main ftw600">{{item.name}}</text>
-					<radio :value="item.num" :checked="tdnum == item.num"  :color="tempColor" />
-				</view>
-			</view>
-		</radio-group>
-		<view v-if="getCoupon > 0 " class="mt16 tag-coupon" :style="getTagStyle">
-			¥{{money}} 充值{{hbmc}} {{getnum*1}} 再送{{getCoupon*1}}
-		</view>
-		<view class="list-call" style="margin-top: 40upx; display: none;">
-		  <input class="sl-input tdadf" v-model="money" type="digit" placeholder="自定义金额" />
-		</view>
-		<view class="form-footer-h">
-			<view class="form-footer form-footer-h">
-				<view class="form-footer-main pd10_15">
-					<!-- <button style="width: 49%; float: left;" @click="paykami" class="btn-big">卡密充值</button> -->
-					<button style="width: 100%; float: right;" @click="paySuccess" class="btn-big" :style="getBtnStyle">支付 {{money>0?'¥'+money:''}}</button>
-				</view>
-			</view>
-		</view>
-		<hFormAlert v-if="cancelShow" title="卡密充值"  name="cancel_desc" placeholder="请输入卡密卡号" @confirm="confirm" @cancel="cancel"></hFormAlert>
-		<dialog-couponshare v-if="showCouponInvite" @closed="closedInvite"></dialog-couponshare>
-	</view>
-</template>
-
-<script>
-	import hFormAlert from '@/components/h-form-alert/h-form-alert.vue';
-	export default{
-		components: {hFormAlert},
-		data(){
-			return {
-				money:'',
-				moneyList:[],
-				tdnum:'901',
-				openid:'',
-				tdList:[
-					{num:'901',name:'微信H5(50-100-200)'},
-					{num:'904',name:'支付宝H5(30-50-100-200)'},
-				],
-				numa:'',
-				num:0,
-				userinfo:'',
-				showCouponInvite:false,
-				cancelShow:false,
-				hbmc:'',
-				czid:0
-			}
-		},
-		computed:{
-			getnum(){
-				for(var  a in this.moneyList){
-					if(this.moneyList[a].money == this.money){
-						return this.moneyList[a].num;
-					}
-				}
-			},
-			getCoupon(){
-				for(var  a in this.moneyList){
-					if(this.moneyList[a].money == this.money){
-						return this.moneyList[a].coupon;
-					}
-				}
-				return 0;
-			}
-		},
-		onLoad(e){
-			this.hbmc=uni.getStorageSync("config").site.hbmc
-			if(e.price){
-				this.money=e.price
-			}
-			//#ifdef MP-WEIXIN
-			this.wxlogin()
-			//#endif
-		},
-		onShow() {
-			this.ongrzlTap();
-			this.cztc();
-		},
-		onShareAppMessage(e){
-			
-		},
-		onShareTimeline(e){
-			
-		},
-		methods:{
-			cztc(){
-				let data = {};
-				data.token = uni.getStorageSync("userinfo").token;
-				data.uid = uni.getStorageSync("userinfo").id;
-				uni.request({
-					url: this.configs.webUrl+'/api/user/cztc',
-					data: data,
-					success: res =>{
-						console.log(res.data)
-						this.moneyList=res.data
-					},
-					fail: (data, code) => {
-						//console.log('fail' + JSON.stringify(data));
-					}
-				});		
-			},
-			changeNum(e){
-				this.money = parseInt(e.detail.value);
-				
-				//this.num = this.moneyList[a].coupon;
-			},
-			changetd(e){
-				this.tdnum = e.detail.value;
-			},
-			
-			paykami(){
-				this.cancelShow=true
-			},
-			cancel(){
-				this.cancelShow=false
-			},
-			confirm(e){
-				console.log(e.cancel_desc);
-				if(!e.cancel_desc){
-					this.cancelShow=false
-					uni.showToast({ title: '请输入卡密',icon:"none" });
-					return false
-				}
-				let data = {};
-				data.token = uni.getStorageSync("userinfo").token;
-				data.uid = uni.getStorageSync("userinfo").id;
-				data.crd = e.cancel_desc;
-				uni.request({
-					url: this.configs.webUrl+'/api/user/kami',
-					data: data,
-					success: res =>{
-						if(res.data.code==1){
-							this.userinfo.money=res.data.data.userinfo.money
-							uni.showToast({ title: res.data.msg,icon:"none" });
-						}else{
-							uni.showToast({ title: res.data.msg,icon:"none" });
-						}
-					},
-					fail: (data, code) => {
-						//console.log('fail' + JSON.stringify(data));
-					}
-				});	
-				this.cancelShow=false
-			},
-			paySuccess(){
-				for(var  a in this.moneyList){
-					if(this.moneyList[a].money == this.money){
-						this.czid=this.moneyList[a].id;
-					}
-				}
-				console.log(this.czid);
-				//#ifdef MP-WEIXIN
-				this.paywxxcx()
-				//#endif
-				//#ifdef MP-TOUTIAO
-				// this.payttxcx()
-				//#endif
-				//#ifndef MP-WEIXIN || MP-TOUTIAO
-				this.paySuccessa()
-				//#endif
-			},
-			
-			paywxxcx(){
-				if(!this.money){
-					uni.showToast({ title:'金额不对',icon:"none" });
-					return false
-				}
-				if(!this.openid){
-					uni.showToast({ title:'Openid味加载',icon:"none" });
-					return false
-				}
-				uni.showLoading({
-				    title: 'Loading'
-				});
-				let data = {};
-				data.token = uni.getStorageSync("userinfo").token;
-				data.total = this.money;
-				data.czid = this.czid;
-				data.tdnum = this.tdnum;
-				data.openid = this.openid;
-				uni.request({
-					url: this.configs.webUrl+'/api/paywx/paywxxcx',
-					data: data,
-					success: res =>{
-						console.log(res.data);
-						if(res.data.code==1){
-							uni.hideLoading();
-							uni.requestPayment({
-							    "provider": 'wxpay',
-								"appId": res.data.data.appId,
-								"timeStamp": res.data.data.timeStamp+'',
-								"nonceStr": res.data.data.nonceStr,
-								"package": res.data.data.package,
-								"signType": 'MD5',
-								"paySign": res.data.data.sign,
-								success: function (res1) {
-									uni.showModal({
-										title: '温馨提示',
-										content: '支付成功',
-										showCancel: false,
-										confirmText: "确定",
-										success: function (res) {
-											if (res.confirm) {
-												this.ongrzlTap();
-											} else if (res.cancel) {
-												
-											}
-										}
-									});
-									//uni.showToast({ title: '支付成功',icon:"none" });
-									console.log('success:' + JSON.stringify(res1));
-								},
-								fail: function (err1) {
-									uni.showModal({
-										title: '支付失败',
-										content: JSON.stringify(err1),
-										showCancel: false,
-										confirmText: "确定",
-										success: function (res) {
-											if (res.confirm) {
-												//uni.navigateBack();
-											} else if (res.cancel) {
-												
-											}
-										}
-									});
-									//uni.showToast({ title: JSON.stringify(err1),icon:"none" });
-									console.log('fail:' + JSON.stringify(err1));
-								}
-							});
-						}else{
-							uni.hideLoading();
-							uni.showModal({
-								title: '温馨提示',
-								content: JSON.stringify(res.data),
-								showCancel: false,
-								confirmText: "确定",
-								success: function (res) {
-									if (res.confirm) {
-										uni.navigateBack();
-									} else if (res.cancel) {
-										
-									}
-								}
-							});
-						}
-					},
-					fail: (data, code) => {
-						//console.log('fail' + JSON.stringify(data));
-					}
-				});
-			},
-			paySuccessa(){
-				if(!this.num){
-					uni.showToast({ title:'金额不对',icon:"none" });
-					return false
-				}
-				uni.showLoading({
-				    title: 'Loading'
-				});
-				let data = {};
-				data.iswx = '';
-				//#ifdef H5
-				var ua = window.navigator.userAgent.toLowerCase();
-				if(ua.match(/MicroMessenger/i) == 'micromessenger'){
-					data.iswx = 'wxgzh';
-				}
-				//#endif
-				data.token = uni.getStorageSync("userinfo").token;
-				data.total = this.num;
-				data.tdnum = this.tdnum;
-				// uni.showToast({ title:data.iswx,icon:"none" });
-				// return false
-				uni.request({
-					url: this.configs.webUrl+'/api/paywx/paywxh5',
-					data: data,
-					success: res =>{
-						console.log(res);
-						if(res.data.code==1){
-							uni.hideLoading();
-							console.log(res.data.data);
-							// #ifdef APP-PLUS  
-							
-							uni.navigateTo({
-								url:'/pages/client/webva?url='+res.data.data
-							})
-							//plus.runtime.openURL(res.data.data);
-							// #endif  
-							// #ifdef H5
-							window.open(res.data.data, "_self")
-							// #endif 
-							///index/paydsf?out_trade_no=2206131027251
-							//uni.showToast({ title: res.data.msg,icon:"none" });
-						}else{
-							uni.hideLoading();
-							uni.showToast({ title: res.data.msg,icon:"none" });
-						}
-					},
-					fail: (data, code) => {
-						//console.log('fail' + JSON.stringify(data));
-					}
-				});
-			},
-			async ongrzlTap(){
-				let data = {};
-				data.token = uni.getStorageSync("userinfo").token;
-				data.uid = uni.getStorageSync("userinfo").id;
-				uni.request({
-					url: this.configs.webUrl+'/api/user/index',
-					data: data,
-					success: res =>{
-						if(res.data.code==1){
-							let ionfo=res.data.data
-							ionfo.isLogin=true
-							this.userinfo=ionfo
-							this.jfdt=ionfo.config.jfdt?ionfo.config.jfdt:''
-							uni.setStorage({//缓存配置信息
-								key: 'userinfo',  
-								data: res.data.data
-							})
-							if(res.data.data.avatar){
-									var str = res.data.data.avatar;
-									if(str.indexOf("data:image") != -1){
-										this.avatar='';
-									}else{
-										if(str.indexOf("http") != -1){
-											this.avatar=res.data.data.avatar;
-										}else{
-											this.avatar=this.configs.imgUrl+res.data.data.avatar;
-										}
-									}
-								}else{
-									this.avatar='';
-								}
-								uni.setStorage({//缓存配置信息
-									key: 'avatar',  
-									data: this.avatar
-								})
-						}else{
-							uni.showToast({ title: res.data.msg,icon:"none" });
-						}
-					},
-					fail: (data, code) => {
-						//console.log('fail' + JSON.stringify(data));
-					}
-				});		
-			},
-			closedInvite(){
-				this.showCouponInvite = false;
-				let pages = getCurrentPages();
-				uni.navigateBack({
-					delta:pages.length
-				});
-			},
-			wxlogin(){
-				var this_=this
-					  uni.login({
-					       timeout: 10000,
-					        provider: 'weixin',  //如果是uniapp,在这里需要标明平台的类型,支持的参数请查阅uniapp官网的uni.login()文档
-					        success: (res) => {
-								//console.log(res);
-					  			//登陆成功的回调
-								uni.request({  
-								      url: this.configs.webUrl+'/api/user/getOpenid',  
-								      method:'GET',  
-								      data: {   
-								          token: uni.getStorageSync("userinfo").token,       //你的小程序的secret,  
-								          code: res.code                                      //wx.login 登录成功后的code  
-								      },  
-								      success: (cts) => {  
-								          console.log(cts.data.data);
-										  if(cts.data.code==1){
-											  this_.openid=cts.data.data.openid
-										  }else{
-											  uni.showModal({
-											  	title: '温馨提示',
-											  	content: JSON.stringify(cts.data),
-											  	showCancel: false,
-											  	confirmText: "确定",
-											  	success: function (res) {
-											  		if (res.confirm) {
-											  			uni.navigateBack();
-											  		} else if (res.cancel) {
-											  			
-											  		}
-											  	}
-											  });
-										  }
-								      },
-									  fail: (err1) => {
-									  	console.log(err1);
-									     	//失败的回调
-									  }
-								});  
-			
-					  	  },
-					        fail: (err) => {
-								console.log(err);
-					           	//登陆失败的回调
-					        }
-					  })
-			}
-		}
-	}
-</script>
-
-<style>
-	.tag-coupon{
-		width: 100%;
-		height: 80rpx;
-		border-radius: 16rpx;
-		text-align: center;
-		line-height: 80rpx;
-		font-size: 28rpx;
-	}
-	.recharge-header{
-		height: 240rpx;
-		width: 100%;
-		position: relative;
-	}
-	.recharge-header image{
-		width: 100%;
-		height: 240rpx;
-	}
-	.recharge-header .main{
-		position: absolute;
-		width: 100%;
-		height: 240rpx;
-		left: 0;
-		top: 0;
-	}
-	.tdadf{
-		border: 1px solid #f8f8f8; 
-		padding: 10px 10px; 
-		text-align: center;
-		height: 80upx;
-		background: #ffffff; 
-		border-radius: 8px; 
-		box-shadow: 0px 4px 20px 0px rgba(0,0,0,0.04);
-		font-size: 30upx;
-		color: #666;
-	}
-</style>

+ 0 - 210
pages/client/vipcard/vipcm.vue

@@ -1,210 +0,0 @@
-<template>
-	<view class="pd16_15">		
-		<radio-group>
-			<view class="flex wrap space mt16">
-				<view v-for="(item,index) in moneyList" :key="index"  :class="index > 1 ? 'mt16' : ''" @click="clickNum(item.num,index)" class="box pd20_15 flex alcenter space" style="width: 330rpx;">
-					<text class="ft14 cl-main ftw600">{{item.num}}</text>
-					<radio :value="item.coupon+''" :checked="num == item.num"  :color="tempColor" />
-				</view>
-			</view>
-		</radio-group>
-
-		<view class="form-footer-h">
-			<view class="form-footer form-footer-h">
-				<view class="form-footer-main pd10_15">
-					<button @click="paySuccess" class="btn-big" :style="getBtnStyle">确定</button>
-				</view>
-			</view>
-		</view>
-		<hFormAlert v-if="cancelShow" title=""  name="cancel_desc" placeholder="请输入卡密卡号" @confirm="confirm" @cancel="cancel"></hFormAlert>
-		<dialog-couponshare v-if="showCouponInvite" @closed="closedInvite"></dialog-couponshare>
-	</view>
-</template>
-
-<script>
-	import hFormAlert from '@/components/h-form-alert/h-form-alert.vue';
-	export default{
-		components: {hFormAlert},
-		data(){
-			return {
-				num:'',
-				moneyList:[],
-				numa:'',
-				userinfo:'',
-				paysj:'',
-				showCouponInvite:false,
-				cancelShow:false,
-				vid:0,
-				mid:0,
-				hbmc:''
-			}
-		},
-		computed:{
-			getCoupon(){
-				for(var  a in this.moneyList){
-					if(this.moneyList[a].num == this.num){
-						return this.moneyList[a].coupon;
-					}
-				}
-				return 0;
-			}
-		},
-		onLoad(e){
-			this.hbmc=uni.getStorageSync("config").site.hbmc
-			if(e.vid){
-				this.vid=e.vid
-			}
-			if(e.mid){
-				this.mid=e.mid
-			}
-			this.paysja()
-		},
-		onShareAppMessage(e){
-			
-		},
-		onShareTimeline(e){
-			
-		},
-		methods:{
-			changeNum(e){
-				console.log(e);
-				this.num = e.detail.value;
-			},
-			clickNum(value,index){
-				this.num = value;
-				this.numa=this.moneyList[index].coupon
-			},
-			async paysja(){
-				//this.showCouponInvite = true;
-				let data = {};
-				data.token = uni.getStorageSync("userinfo").token;
-				data.uid = uni.getStorageSync("userinfo").id;
-				
-				uni.request({
-					url: this.configs.webUrl+'/api/user/paysj',
-					data: data,
-					success: res =>{
-						if(res.data.code==1){
-							this.moneyList =res.data.data
-						}else{
-						}
-					},
-					fail: (data, code) => {
-						//console.log('fail' + JSON.stringify(data));
-					}
-				});
-			},
-			paySuccess(){
-				var _this=this
-				uni.showModal({
-					title: '温馨提示',
-					content: '是否确定支付升级',
-					showCancel: true,
-					confirmText: "确定",
-					success: function (res) {
-						if (res.confirm) {
-							_this.paySuccesspost()
-						} else if (res.cancel) {
-							
-						}
-					}
-				});
-			},
-			paySuccesspost(){		
-				//this.showCouponInvite = true;
-				let data = {};
-				data.token = uni.getStorageSync("userinfo").token;
-				data.uid = uni.getStorageSync("userinfo").id;
-				data.num = this.numa;
-				if(this.vid>0){
-					data.vid = this.vid;
-				}
-				if(this.mid>0){
-					data.mid = this.mid;
-				}
-				uni.request({
-					url: this.configs.webUrl+'/api/user/vipsj',
-					data: data,
-					success: res =>{
-						if(res.data.code==1){
-							uni.showModal({
-								title: '温馨提示',
-								content: res.data.msg,
-								showCancel: false,
-								confirmText: "确定",
-								success: function (res) {
-									if (res.confirm) {
-										uni.navigateBack();
-									} else if (res.cancel) {
-										
-									}
-								}
-							});
-						}else{
-							if(res.data.msg=='余额不足'){
-								uni.showModal({
-									title: '提示',
-									content: this.hbmc+'不足',
-									showCancel: true,
-									confirmText: "充值",
-									success: function (res) {
-										if (res.confirm) {
-											uni.navigateTo({
-												url:"/pages/client/vipcard/recharge"
-											})
-										} else if (res.cancel) {
-											//uni.navigateBack();
-										}
-									}
-								});
-							}else{
-								uni.showToast({ title: res.data.msg,icon:"none" });
-							}
-							
-						}
-					},
-					fail: (data, code) => {
-						//console.log('fail' + JSON.stringify(data));
-					}
-				});
-			},
-			closedInvite(){
-				this.showCouponInvite = false;
-				let pages = getCurrentPages();
-				uni.navigateBack({
-					delta:pages.length
-				});
-			}
-		}
-	}
-</script>
-
-<style>
-	.tag-coupon{
-		width: 100%;
-		height: 80rpx;
-		border-radius: 16rpx;
-		text-align: center;
-		line-height: 80rpx;
-		font-size: 28rpx;
-	}
-	.recharge-header{
-		height: 240rpx;
-		width: 100%;
-		position: relative;
-	}
-	.recharge-header image{
-		width: 100%;
-		height: 240rpx;
-	}
-	.recharge-header .main{
-		position: absolute;
-		width: 100%;
-		height: 240rpx;
-		left: 0;
-		top: 0;
-	}
-	.tdadf{
-		border: 1px solid #f8f8f8; padding: 10px 5px; background: #ffffff; border-radius: 8px; box-shadow: 0px 4px 20px 0px rgba(0,0,0,0.04);
-	}
-</style>

+ 0 - 24
pages/client/webva.vue

@@ -1,24 +0,0 @@
-<template>
-    <view>
-        <web-view :src="url"></web-view>
-    </view>
-</template>
-<script>
-	export default{
-		data(){
-			return {
-				url:'',
-
-			}
-		},
-		onLoad(option){
-			if(option.url){
-				this.url=option.url
-			}
-		},
-
-		methods:{
-	
-		}
-	}
-</script>

+ 0 - 29
pages/client/webvazf.vue

@@ -1,29 +0,0 @@
-<template>
-    <view>
-        <web-view :src="url"></web-view>
-    </view>
-</template>
-<script>
-	export default{
-		data(){
-			return {
-				url:'',
-
-			}
-		},
-		onLoad(option){
-			this.url=uni.getStorageSync("userinfo").config.zflj
-		},
-
-		methods:{
-			// 监听原生标题导航按钮点击事件
-			onNavigationBarButtonTap(e) {
-				const index = e.index;
-					uni.switchTab({
-						url:"/pages/client/index"
-					})
-					
-			}
-		}
-	}
-</script>

+ 0 - 314
pages/client/zui copy.vue

@@ -1,314 +0,0 @@
-<template>
-	<view>
-		<!-- 标题栏和状态栏占位符 -->
-		<!-- <view class="titleNview-placing"> </view> -->
-		<siginIn :sign_list="sign_list" :qdjl="qdjl" :tdsy="tdsy"  @cksigin="cksigin" @click="getsigin"></siginIn>
-		<view class="pd16_15 mt16">
-			<view class="pd16_15" style="box-shadow: 0px 0px 20upx 0px rgba(0,0,0,0.2);  border-radius: 20upx;">
-				<view>
-					<view class="flex alcenter space">
-						<view class="flex alcenter">
-							<!-- <image style="width: 40rpx;height: 40rpx;" :src="statics.zhuico[0]"></image> -->
-							<text class="ft16 ftw600 cl-main">最近观看</text>
-						</view>
-						<navigator url="/pages/client/tuan/zjgk">
-						<view class="ft14 cl-notice">更多</view>
-						</navigator>
-					</view>
-					<view class="mt16 flex space">
-						<block v-for="(value,key) in newsa" :key="key" v-if="key<3">
-						<view class="box pb10" style="width:31%; position: relative; border-radius:20rpx;" @click="detail(value.vid,value.mid)">
-							<!-- <view class="btn-mini" style="position: absolute; top: 20upx; right: 20upx; border-radius: 10upx;font-size: 18upx;width: 60upx; height: 36upx; z-index: 1;" :style="getBtnStyle">{{value.lxname}}</view> -->
-							<image class="integral-mall-goods" mode="aspectFill" :src="value.img"></image>
-							<view class="mt8 plr10 ft14 ftw400 text-center text-over cl-main">{{value.vname}}</view>
-						</view>
-						</block>	
-				
-					</view>
-				</view>	
-				<view class="mt24">
-					<view class="flex alcenter space">
-						<view class="flex alcenter">
-							<!-- <image style="width: 40rpx;height: 40rpx;" :src="statics.zhuico[0]"></image> -->
-							<text class="ft16 ftw600 cl-main">我的追剧</text>
-						</view>
-						<navigator url="/pages/client/tuan/zjjl">
-						<view class="ft14 cl-notice">更多</view>
-						</navigator>
-					</view>
-					<view class="mt16">
-						<block v-for="(value,key) in record" :key="key">
-						<view @click="detail(value.vid,value.mid)" style="position: relative;" class="flex alcenter mb16">
-							<image mode="aspectFill" class="tuan-product-l" :src="value.img"></image>
-							<!-- <view class="btn-mini" style="position: absolute; top: 40upx; left: 280upx; border-radius: 10upx;font-size: 18upx;width: 60upx; height: 36upx;" :style="getBtnStyle">{{value.lxname}}</view> -->
-							<view class="tuan-product-r pl15">
-								<view class="ft16 ftw600 cl-main text-over2">{{value.vname}}</view>
-								<view class="mt16">
-									<text class="ft14 cl-orange">{{value.dqname}}</text>
-								</view>
-								<view class="mt16 flex space alcenter">
-									<view class="ft14 cl-notice">{{value.mname}}</view>
-									<view class="btn-vip-adviser ml15">继续观看</view>
-								</view>
-							</view>
-						</view>
-						</block>
-					</view>
-				</view>	
-			</view>
-			
-		</view>
-	</view>
-</template>
-<script>
-	import siginIn from '@/components/fanxiao-sign/sigin-in.vue';
-	export default{
-		components: {
-		    siginIn
-		},
-		data(){
-			return {
-				qdjl:0,
-				tdsy:0,
-				navLock:false,
-				datasa:[],
-				showdyxx:true,
-				dataconfig:[],
-				banners:[],
-				datainfo:[],
-				dataindex:[],
-				newsa:[],
-				record:[],
-				mbgColor:this.$mbgColor,
-				sign_list: []
-			}
-		},
-		computed:{
-			
-		},
-		onPageScroll(e){
-			
-		},
-		onShareAppMessage(e){
-			
-		},
-		onShareTimeline(e){
-			
-		},
-		onLoad(e){
-		},
-		onShow() {
-			this.getList();
-			let this_=this
-			console.log(this.dataindex)
-		},
-		methods:{
-			cksigin(){
-				this.getList();
-			},
-			getsigin(e) {
-			    console.log('已点击签到------');
-			},
-			getList() {
-				let this_=this
-				let data = {};
-				if(uni.getStorageSync("userinfo")){
-					data.uid = uni.getStorageSync("userinfo").id;
-				}
-				uni.request({
-					url: this.configs.webUrl+'/api/video/zuiju',
-					data: data,
-					success: data => {
-						this.newsa=data.data.new
-						this.record=data.data.record
-						this.sign_list=data.data.getweek
-						this.qdjl=data.data.qdjl
-						this.tdsy=data.data.tdsy
-					},
-					fail: (data, code) => {
-					}
-				});
-			},
-			saoma(){
-				//#ifdef APP-PLUS  
-				uni.scanCode({
-				    success: function (res) {
-						if(res.result.indexOf("uid") != -1){
-							var obj = JSON.parse(res.result); 
-							if(obj.uid){
-								uni.navigateTo({
-									url:'/pages/login/reg?uid='+obj.uid
-								})
-							}	
-						}else{
-							uni.showToast({ title: res.result,icon:"none" });	
-						}	
-				    }
-				});
-				//#endif
-				
-			},
-			detail(vid,mid){
-				var fxpid=1
-				if(uni.getStorageSync("userinfo")){
-					 fxpid=uni.getStorageSync("userinfo").id
-				}
-				uni.navigateTo({
-					url:'/pages/video/index?vid='+vid+'&mid='+mid+'&fxpid='+fxpid
-				})
-			},
-			linkTo(e){
-				if(this.isLogin == false){
-					this.showLogin = true;
-				}else{
-					let link = e.currentTarget.dataset.link;
-					uni.navigateTo({
-						url:link
-					})
-				}
-			},
-			
-			exchange(e){
-				if(this.isLogin == false){
-					this.showLogin = true;
-				}else{
-					let id = e.currentTarget.dataset.id;
-					uni.navigateTo({
-						url:'/pages/client/integral/exchange?id='+id
-					})
-				}
-			},
-		},
-	}
-</script>
-
-<style>
-	.home-header{
-		height: 300rpx;
-		width: 100%;
-		position: relative;
-		border-radius: 0rpx 0rpx 48rpx 48rpx;
-	}
-	.home-main{
-		width: 100%;
-		position: relative;
-		margin-top: -156rpx;
-		padding: 0 30rpx;
-	}
-	.home-mendian{
-		width: 100%;
-		height: 84rpx;
-		background:rgba(255,255,255,0.1);
-		border-radius: 42rpx;
-	}
-	.integral-mall-header{
-		position: relative;
-		height: 320rpx;
-	}
-	.integral-mall-header .bg{
-		width: 100%;
-		height: 320rpx;
-	}
-	.integral-mall-header .main{
-		position: absolute;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 320rpx;
-	}
-	.swiper-integral{
-		height: 32rpx;
-		width: 100%;
-	}
-	.integral-mall-main{
-		position: relative;
-		/* margin-top: -104rpx; */
-	}
-	.integal-mall-menu{
-		width: 100%;
-		height: 190rpx;
-		background: #FFFFFF;
-		border-radius: 20rpx;
-	}
-	.integral-tuan-l{
-		width: 100%;
-		height: 280rpx;
-		background: #f2f2f2;
-		border-radius: 16rpx;
-	}
-	
-	
-	.integral-mall-coupon{
-		background: #FFFFFF;
-		position: relative;
-		border-radius: 16rpx;
-		overflow: hidden;
-	}
-	.integral-mall-coupon  .top{
-		padding: 0rpx 0rpx 24rpx 0rpx;
-		border-bottom: 2rpx dashed #FEC675;
-	}
-	.integral-mall-coupon  .y-l,.integral-mall-coupon  .y-r{
-		width: 20rpx;
-		height: 20rpx;
-		border-radius: 10rpx;
-		background: #F5F6FA;
-		position: absolute;
-		z-index: 2;
-		top: 284rpx;
-	}
-	.integral-mall-coupon  .y-l{
-		left: -10rpx;
-	}
-	.integral-mall-coupon  .y-r{
-		right: -10rpx;
-	}
-	.integral-mall-coupon   .coupon-value{
-		width: 100%;
-	}
-	.integral-mall-coupon  .coupon-value image{
-		width: 100%;
-	}
-	.integral-mall-coupon  .coupon-value .num{
-		width: 100%;
-		height: 64rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		position: absolute;
-		left: 0;
-		top: 0;
-	}
-	.integral-mall-goods{
-		width: 100%;
-		height: 280rpx;
-		background: #F2F2F2;
-		border-radius: 16upx;
-	}
-	.titleNview-placing {
-		height: var(--status-bar-height);
-		padding-top: 44px;
-		box-sizing: content-box;
-	}
-	.tuan-product-l{
-		width: 150rpx;
-		height: 200rpx;
-		border-radius: 16rpx;
-		background: #F2F2F2;
-	}
-	.tuan-product-r{
-		width: calc(100% - 150rpx);
-	}
-	.btn-vip-adviser{
-		width: 150rpx;
-		height: 60rpx;
-		border-radius: 20rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		font-size: 28rpx;
-		/* font-weight: 600; */
-		background: #FF6600;
-		color:#FFFFFF;
-	}
-</style>

+ 0 - 195
pages/client/zui.vue

@@ -1,195 +0,0 @@
-<template>
-	<view>
-		<view class="body">
-			<view class="pd16_15" style="box-shadow: 0px 0px 20upx 0px rgba(0,0,0,0.2);  border-radius: 20upx;">
-				<view>
-					<view class="flex alcenter space top-show">
-						<view class="flex alcenter">
-							<text class="ft16 ftw600 cl-main">最近观看</text>
-						</view>
-
-						<navigator url="/pages/client/tuan/zjgk">
-							<view class="ft14 cl-notice" v-show="historyList.length >  3">更多</view>
-							<!-- <view class="ft14 cl-notice" >更多</view> -->
-						</navigator>
-					</view>
-				</view>
-				<view class="mt16 history-box ">
-					<block v-for="(value,key) in historyList" :key="key" v-if="key<3">
-						<view class="history-item-box" @click="detail(value)">
-							<image class="history-item-image" :src="value.cover_image"></image>
-							<label class="history-item-title">{{value.name}}</label>
-						</view>
-					</block>
-					<view class="box pb10 history-item-box  history-add-box" @click="goToJuYuan">
-						<image class="add-icon" src="/static/img/zhuiju/add.png"></image>
-					</view>
-
-				</view>
-			</view>
-			<view class="mt24 pd16_15">
-				<view class="flex alcenter space">
-					<view class="flex alcenter">
-						<text class="ft16 ftw600 cl-main">我的追剧</text>
-					</view>
-				</view>
-				<view class="mt16 zuiju-box">
-					<block v-if="zhuijuList.length >  0" v-for="(value,key) in zhuijuList" :key="key">
-						<view class="box pd16_15  mb16 zuiju-box-item">
-							<image @click="detail(value)" class="zuiju-box-item-cover" :src="value.cover_image"></image>
-							<view class="zuiju-box-item-info" @click="detail(value)">
-								<label class="zuiju-box-item-info-title">{{value.name}}</label>
-								<label class="zuiju-box-item-info-juji">看到<span
-										class="guankan">{{value.watch_episode_num}}集</span></label>
-								<label class="zuiju-box-item-info-gx">更新至<span
-										class="update-ji">{{value.updated_episode_num}}集</span></label>
-							</view>
-							<view class="zuiju-box-item-del-box" @click="delzj(value.video_id)">
-								<image class="del-icon" src="../../static/img/zhuiju/delete.png"></image>
-							</view>
-						</view>
-
-					</block>
-				</view>
-				<view v-if="is_show" class="mt16 zuiju-box-kong">
-					<image src="../../static/img/zhuiju/kong.png"></image>
-					<text class="ft14">暂无追剧</text>
-					<label class="ft16" @click="goToJuYuan()">去追剧</label>
-				</view>
-			</view>
-		</view>
-
-	</view>
-	</view>
-</template>
-<script>
-	import {
-		watchRecord,
-		shelfList,
-		delShelf
-	} from "@/common/apis/zju.js";
-	export default {
-		data() {
-			return {
-				more_text: "查看全部",
-				qdjl: 0,
-				tdsy: 0,
-				navLock: false,
-				datasa: [],
-				showdyxx: true,
-				dataconfig: [],
-				banners: [],
-				datainfo: [],
-				dataindex: [],
-				newsa: [],
-				record: [],
-				historyList: [],
-				zhuijuList: [],
-				mbgColor: this.$mbgColor,
-				is_show_more: false,
-				is_show: false
-			}
-		},
-		computed: {
-
-		},
-		onPageScroll(e) {
-
-		},
-		onShareAppMessage(e) {
-
-		},
-		onShareTimeline(e) {
-
-		},
-		onLoad(e) {},
-		onShow() {
-			this.getList();
-		},
-		methods: {
-			changeList() {
-				if (this.is_show_more) {
-					this.more_text = "查看全部";
-				} else {
-					this.more_text = "收起"
-				}
-				this.is_show_more = !this.is_show_more;
-			},
-			async getList() {
-				this.historyList = await watchRecord();
-				this.zhuijuList = await shelfList();
-				if (this.zhuijuList.length < 1) {
-					this.is_show = 1;
-				}else{
-					this.is_show =0;
-				}
-			},
-			saoma() {
-				//#ifdef APP-PLUS  
-				uni.scanCode({
-					success: function(res) {
-						if (res.result.indexOf("uid") != -1) {
-							var obj = JSON.parse(res.result);
-							if (obj.uid) {
-								uni.navigateTo({
-									url: '/pages/login/reg?uid=' + obj.uid
-								})
-							}
-						} else {
-							uni.showToast({
-								title: res.result,
-								icon: "none"
-							});
-						}
-					}
-				});
-				//#endif
-
-			},
-			detail(value) {
-				uni.navigateTo({
-					url: '/pages/video/index?video_id=' + value.video_id
-				})
-			},
-			linkTo(e) {
-				if (this.isLogin == false) {
-					this.showLogin = true;
-				} else {
-					let link = e.currentTarget.dataset.link;
-					uni.navigateTo({
-						url: link
-					})
-				}
-			},
-			async delzj(id) {
-				let res = await delShelf(id);
-				uni.showToast({
-					title: "删除成功",
-					icon: "none"
-				});
-				// 更新最近列表数据
-				this.zhuijuList = await shelfList();
-				console.log(res);
-			},
-			exchange(e) {
-				if (this.isLogin == false) {
-					this.showLogin = true;
-				} else {
-					let id = e.currentTarget.dataset.id;
-					uni.navigateTo({
-						url: '/pages/client/integral/exchange?id=' + id
-					})
-				}
-			},
-			goToJuYuan() {
-				uni.switchTab({
-					url: '/pages/index/index'
-				})
-			}
-		},
-	}
-</script>
-
-<style>
-	@import url("style/zui.css");
-</style>

pages/client/components/home/banner.vue → pages/components/home/banner.vue


pages/client/components/home/default.vue → pages/components/home/default.vue


pages/client/components/home/grid.vue → pages/components/home/grid.vue


pages/client/components/home/vipcard.vue → pages/components/home/vipcard.vue


+ 1 - 1
pages/index/billboard/index.vue

@@ -76,7 +76,7 @@
 			getList() {
 				getMiniprogramRank().then(res => {
 					console.log(res, 'getMiniprogramRecentvideogetMiniprogramRecentvideogetMiniprogramRecentvideo')
-					this.listData = res
+					this.listData = res.data
 				})
 			},
 			getdata() {

+ 251 - 254
pages/index/index.vue

@@ -1,273 +1,270 @@
 <template>
-	<view>
-		<!-- 标题栏和状态栏占位符 -->
-		<!-- <view class="titleNview-placing"> </view> -->
-		<sub-tabvs class="" :tabs="typetab" @change="changeIndex" :selectIndex="selecttype"
-			:scrollTop="scrollTop"></sub-tabvs>
-		<view class="home-header pd0_15 mt10" :style="'background: '+mbgColor+';'">
-			<view class="home-mendian flex alcenter space plr15 cl-w9" style="display: none;">
-				<navigator style="width: calc(100% - 80rpx);" url="/pages/client/tuan/ss">
-					<view class="flex alcenter" style="width: calc(100% - 80rpx);">
-						<text class="iconfont  iconsousuo ft14 mr10"></text>
-						<text class="text-over ft14" style="width: calc(100% - 60rpx);">请输入搜索内容</text>
-					</view>
-				</navigator>
-				<text @click="saoma()" class="iconfont iconicon_saoma ft24"></text>
-			</view>
+  <view>
+    <!-- 标题栏和状态栏占位符 -->
+    <!-- <view class="titleNview-placing"> </view> -->
+    <sub-tabvs class="" :tabs="typetab" @change="changeIndex" :selectIndex="selecttype"
+      :scrollTop="scrollTop"></sub-tabvs>
+    <view class="home-header pd0_15 mt10" :style="'background: ' + mbgColor + ';'">
+      <view class="home-mendian flex alcenter space plr15 cl-w9" style="display: none;">
+        <navigator style="width: calc(100% - 80rpx);" url="/pages/client/tuan/ss">
+          <view class="flex alcenter" style="width: calc(100% - 80rpx);">
+            <text class="iconfont  iconsousuo ft14 mr10"></text>
+            <text class="text-over ft14" style="width: calc(100% - 60rpx);">请输入搜索内容</text>
+          </view>
+        </navigator>
+        <text @click="saoma()" class="iconfont iconicon_saoma ft24"></text>
+      </view>
 
-			<view class="">
-				<home-banner :banners="banners"></home-banner>
-			</view>
-		</view>
-		<view class="integral-mall-main plr15" style="margin-top: 30upx;">
-			<view class="integal-mall-menu flex pt10 pb10">
-				<view class="col2 text-center" @click="linkTo" data-link="/pages/zhuiju/index" data-type='tabbar'>
-					<view>
-						<!-- <image style="width: 100rpx; height: 100rpx;" :src="statics.zhuico[0]"></image> -->
-						<image style="width: 100rpx; height: 100rpx;" src="/static/icon/index/zuiju.png"></image>
-					</view>
-					<view class="ft14 ftw600">追剧</view>
-				</view>
-				<view class="col2 text-center bd-left" @click="linkTo" data-link="/pages/index/billboard/index">
-					<view>
-						<!-- <image style="width: 100rpx; height: 100rpx;" :src="statics.zhuico[2]"></image> -->
-						<image style="width: 100rpx; height: 100rpx;" src="/static/icon/index/phb.png"></image>
-					</view>
-					<view class="ft14 ftw600">排行</view>
-				</view>
-				<view class="col2 text-center bd-left" @click="linkTo" data-link="/pages/index/new/index">
-					<view>
-						<!-- <image style="width: 100rpx; height: 100rpx;" :src="statics.zhuico[6]"></image> -->
-						<image style="width: 100rpx; height: 100rpx;" src="/static/icon/index/new.png"></image>
-					</view>
-					<view class="ft14 ftw600">最新</view>
-				</view>
-			</view>
-			<view class="mt24">
-				<view class="flex alcenter start">
-					<view class="flex alcenter">
-						<image style="width: 40rpx;height: 40rpx;" :src="statics.zhuico[0]"></image>
-						<text class="ft16 ftw600 cl-main ml15">{{hotdata.subject_name}}</text>
-					</view>
-					<!-- <navigator url="/pages/client/tuan/ss?selectIndex=1"> -->
-					<!-- <view @click="huanyihuan()" class="ft14 cl-notice">换一换</view> -->
-					<!-- </navigator> -->
-				</view>
+      <view class="">
+        <home-banner :banners="banners"></home-banner>
+      </view>
+    </view>
+    <view class="integral-mall-main plr15" style="margin-top: 30upx;">
+      <view class="integal-mall-menu flex pt10 pb10">
+        <view class="col2 text-center" @click="linkTo" data-link="/pages/zhuiju/index" data-type='tabbar'>
+          <view>
+            <!-- <image style="width: 100rpx; height: 100rpx;" :src="statics.zhuico[0]"></image> -->
+            <image style="width: 100rpx; height: 100rpx;" src="/static/icon/index/zuiju.png"></image>
+          </view>
+          <view class="ft14 ftw600">追剧</view>
+        </view>
+        <view class="col2 text-center bd-left" @click="linkTo" data-link="/pages/index/billboard/index">
+          <view>
+            <!-- <image style="width: 100rpx; height: 100rpx;" :src="statics.zhuico[2]"></image> -->
+            <image style="width: 100rpx; height: 100rpx;" src="/static/icon/index/phb.png"></image>
+          </view>
+          <view class="ft14 ftw600">排行</view>
+        </view>
+        <view class="col2 text-center bd-left" @click="linkTo" data-link="/pages/index/new/index">
+          <view>
+            <!-- <image style="width: 100rpx; height: 100rpx;" :src="statics.zhuico[6]"></image> -->
+            <image style="width: 100rpx; height: 100rpx;" src="/static/icon/index/new.png"></image>
+          </view>
+          <view class="ft14 ftw600">最新</view>
+        </view>
+      </view>
+      <view class="mt24">
+        <view class="flex alcenter start">
+          <view class="flex alcenter">
+            <image style="width: 40rpx;height: 40rpx;" :src="statics.zhuico[0]"></image>
+            <text class="ft16 ftw600 cl-main ml15">{{ hotdata.subject_name }}</text>
+          </view>
+          <!-- <navigator url="/pages/client/tuan/ss?selectIndex=1"> -->
+          <!-- <view @click="huanyihuan()" class="ft14 cl-notice">换一换</view> -->
+          <!-- </navigator> -->
+        </view>
 
-				<view class="mt16 card-wrapper" style="min-height: 100px;">
-					<block v-for="(value,key) in hotdata.data" :key="key">
-						<view class="box card" style="width:31%; position: relative; border-radius:20rpx;"
-							@click="detail(value)">
-							<!-- <view class="btn-mini" style="position: absolute; top: 20upx; right: 20upx; border-radius: 10upx;font-size: 18upx;width: 60upx; height: 36upx; z-index: 1;" :style="getBtnStyle">{{value.lxname}}</view> -->
-							<image class="integral-mall-goods" mode="aspectFill" :src="value.cover_image"></image>
-							<view class="mt8 plr10 ft14 ftw400 text-center text-over cl-main">{{value.name}}</view>
-						</view>
-					</block>
-				</view>
-			</view>
-			<view class="mt24">
-				<view class="flex alcenter start">
-					<view class="flex alcenter">
-						<image style="width: 40rpx;height: 40rpx;" :src="statics.zhuico[0]"></image>
-						<text class="ft16 ftw600 cl-main ml15">{{givedata.subject_name}}</text>
-					</view>
-					<!-- <navigator url="/pages/client/tuan/ss?selectIndex=1"> -->
-					<!-- <view @click="huanyihuan()" class="ft14 cl-notice">换一换</view> -->
-					<!-- </navigator> -->
-				</view>
-				<view class="mt16 card-wrapper" style="min-height: 100px;">
-					<block v-for="(value,key) in givedata.data" :key="key">
-						<view class="box card" style="width:31%; position: relative; border-radius:20rpx;"
-							@click="detail(value)">
-							<image class="integral-mall-goods" mode="aspectFill" :src="value.cover_image"></image>
-							<view class="mt8 plr10 ft14 ftw400 text-center text-over cl-main">{{value.name}}</view>
-						</view>
-					</block>
-				</view>
-			</view>
-		</view>
-	</view>
-	<!-- <home-default :datasa="datasa"></home-default> -->
-	</view>
-	</view>
-</template>
+        <view class="mt16 card-wrapper" style="min-height: 100px;">
+          <block v-for="(value, key) in hotdata.data" :key="key">
+            <view class="box card" style="width:31%; position: relative; border-radius:20rpx;" @click="detail(value)">
+              <!-- <view class="btn-mini" style="position: absolute; top: 20upx; right: 20upx; border-radius: 10upx;font-size: 18upx;width: 60upx; height: 36upx; z-index: 1;" :style="getBtnStyle">{{value.lxname}}</view> -->
+              <image class="integral-mall-goods" mode="aspectFill" :src="value.cover_image"></image>
+              <view class="mt8 plr10 ft14 ftw400 text-center text-over cl-main">{{ value.name }}</view>
+            </view>
+          </block>
+        </view>
+      </view>
+      <view class="mt24">
+        <view class="flex alcenter start">
+          <view class="flex alcenter">
+            <image style="width: 40rpx;height: 40rpx;" :src="statics.zhuico[0]"></image>
+            <text class="ft16 ftw600 cl-main ml15">{{ givedata.subject_name }}</text>
+          </view>
+          <!-- <navigator url="/pages/client/tuan/ss?selectIndex=1"> -->
+          <!-- <view @click="huanyihuan()" class="ft14 cl-notice">换一换</view> -->
+          <!-- </navigator> -->
+        </view>
+        <view class="mt16 card-wrapper" style="min-height: 100px;">
+          <block v-for="(value, key) in givedata.data" :key="key">
+            <view class="box card" style="width:31%; position: relative; border-radius:20rpx;" @click="detail(value)">
+              <image class="integral-mall-goods" mode="aspectFill" :src="value.cover_image"></image>
+              <view class="mt8 plr10 ft14 ftw400 text-center text-over cl-main">{{ value.name }}</view>
+            </view>
+          </block>
+        </view>
+      </view>
+    </view>
+  </view>
+  <!-- <home-default :datasa="datasa"></home-default> -->
+</view></view></template>
 <script>
-	import {
-		getMiniprogramHall
-	} from '@/common/apis/index.js'
-	import {getConfigInfo} from "@/common/apis/common.js";
-	import cellGroup from '../../uni_modules/uview-ui/libs/config/props/cellGroup';
-	export default {
-		data() {
-			return {
-				navLock: false,
-				banners: [],
-				hotdata: [],
-				givedata: [],
-				typetab: [{
-					name: '推荐短剧',
-					id: 1
-				}, ],
-				selecttype: 0,
-				scrollTop: 0,
-				type: 1,
-				mbgColor: this.$mbgColor,
-			}
-		},
-		computed: {
+import {
+  getMiniprogramHall
+} from '@/common/apis/index.js'
+import { getConfigInfo } from "@/common/apis/common.js";
+import cellGroup from '../../uni_modules/uview-ui/libs/config/props/cellGroup';
+export default {
+  data() {
+    return {
+      navLock: false,
+      banners: [],
+      hotdata: [],
+      givedata: [],
+      typetab: [{
+        name: '推荐短剧',
+        id: 1
+      },],
+      selecttype: 0,
+      scrollTop: 0,
+      type: 1,
+      mbgColor: this.$mbgColor,
+    }
+  },
+  computed: {
 
-		},
-		onPageScroll(e) {
-			if (e.scrollTop > 44) {
-				if (this.navLock == false) {
-					this.navLock = true;
-					uni.setNavigationBarColor({
-						frontColor: "#000000",
-						backgroundColor: "#FFFFFF",
-						complete: () => {
-							this.navLock = false;
-						}
-					});
-				}
-			} else {
-				if (this.navLock == false) {
-					this.navLock = true;
-					let this_ = this
-					uni.setNavigationBarColor({
-						frontColor: "#000000",
-						backgroundColor: this_.mbgColor,
-						complete: () => {
-							this.navLock = false;
-						}
-					});
-				}
-			}
-		},
-		onLoad(e) {
-			this.settitle();
-			
-		},
-		onShow() {
-			this.getList();
-		},
-		methods: {
-			async settitle(){
-				let config = await getConfigInfo();
-				uni.setNavigationBarTitle({
-					title: config.play_name
-				});
-			},
-			changeIndex(index) {
-				if (this.typetab[index].id) {
-					this.type = this.typetab[index].id
-					//this.getList(0)
-				}
-				console.log(this.type)
-				this.selecttype = index;
-			},
-			huanyihuan() {
+  },
+  onPageScroll(e) {
+    if (e.scrollTop > 44) {
+      if (this.navLock == false) {
+        this.navLock = true;
+        uni.setNavigationBarColor({
+          frontColor: "#000000",
+          backgroundColor: "#FFFFFF",
+          complete: () => {
+            this.navLock = false;
+          }
+        });
+      }
+    } else {
+      if (this.navLock == false) {
+        this.navLock = true;
+        let this_ = this
+        uni.setNavigationBarColor({
+          frontColor: "#000000",
+          backgroundColor: this_.mbgColor,
+          complete: () => {
+            this.navLock = false;
+          }
+        });
+      }
+    }
+  },
+  onLoad(e) {
+    this.settitle();
 
-			},
-			getList() {
-				getMiniprogramHall().then(res => {
-					console.log(res, 'getMiniprogramHallgetMiniprogramHall')
-					this.banners = res.banner
-					this.hotdata = res.recommend[0]
-					this.givedata = res.recommend[1]
-				})
-			},
-			saoma() {
-				//#ifdef APP-PLUS  
-				uni.scanCode({
-					success: function(res) {
-						if (res.result.indexOf("uid") != -1) {
-							var obj = JSON.parse(res.result);
-							if (obj.uid) {
-								uni.navigateTo({
-									url: '/pages/login/reg?uid=' + obj.uid
-								})
-							}
-						} else {
-							uni.showToast({
-								title: res.result,
-								icon: "none"
-							});
-						}
-					}
-				});
-				//#endif
+  },
+  onShow() {
+    this.getList();
+  },
+  methods: {
+    async settitle() {
+      let res = await getConfigInfo();
+      let config = res.data;
+      uni.setNavigationBarTitle({
+        title: config.play_name
+      });
+    },
+    changeIndex(index) {
+      if (this.typetab[index].id) {
+        this.type = this.typetab[index].id
+        //this.getList(0)
+      }
+      console.log(this.type)
+      this.selecttype = index;
+    },
+    huanyihuan() {
 
-			},
-			detail(value) {
-				uni.navigateTo({
-					url: '/pages/video/index?video_id=' + value.video_id
-				})
-			},
-			linkTo(e) {
-				console.log(e, 'linkTolinkTolinkTo')
-				let link = e.currentTarget.dataset.link;
-				let type = e.currentTarget.dataset.type;
-				if (type == 'tabbar') {
-					uni.switchTab({
-						url: link
-					})
-				} else {
-					uni.navigateTo({
-						url: link
-					})
-				}
+    },
+    getList() {
+      getMiniprogramHall().then(res => {
+        console.log(res, 'getMiniprogramHallgetMiniprogramHall')
+        this.banners = res.data.banner
+        this.hotdata = res.data.recommend[0]
+        this.givedata = res.data.recommend[1]
+      })
+    },
+    saoma() {
+      //#ifdef APP-PLUS  
+      uni.scanCode({
+        success: function (res) {
+          if (res.result.indexOf("uid") != -1) {
+            var obj = JSON.parse(res.result);
+            if (obj.uid) {
+              uni.navigateTo({
+                url: '/pages/login/reg?uid=' + obj.uid
+              })
+            }
+          } else {
+            uni.showToast({
+              title: res.result,
+              icon: "none"
+            });
+          }
+        }
+      });
+      //#endif
 
-			},
-		},
-	}
+    },
+    detail(value) {
+      uni.navigateTo({
+        url: '/pages/video/index?video_id=' + value.video_id
+      })
+    },
+    linkTo(e) {
+      console.log(e, 'linkTolinkTolinkTo')
+      let link = e.currentTarget.dataset.link;
+      let type = e.currentTarget.dataset.type;
+      if (type == 'tabbar') {
+        uni.switchTab({
+          url: link
+        })
+      } else {
+        uni.navigateTo({
+          url: link
+        })
+      }
+
+    },
+  },
+}
 </script>
 
 <style lang="scss" scoped>
-	.card-wrapper {
-		display: flex;
-		justify-content: start;
+.card-wrapper {
+  display: flex;
+  justify-content: start;
 
-		.card {
-			margin: 6px;
-		}
-	}
+  .card {
+    margin: 6px;
+  }
+}
 
-	.home-header {
-		/* height: 300rpx; */
-		width: 100%;
-		position: relative;
-		border-radius: 0rpx 0rpx 48rpx 48rpx;
-	}
+.home-header {
+  /* height: 300rpx; */
+  width: 100%;
+  position: relative;
+  border-radius: 0rpx 0rpx 48rpx 48rpx;
+}
 
-	.home-mendian {
-		width: 100%;
-		height: 84rpx;
-		background: rgba(255, 255, 255, 0.1);
-		border-radius: 42rpx;
-	}
+.home-mendian {
+  width: 100%;
+  height: 84rpx;
+  background: rgba(255, 255, 255, 0.1);
+  border-radius: 42rpx;
+}
 
-	.integral-mall-main {
-		position: relative;
-		/* margin-top: -104rpx; */
-	}
+.integral-mall-main {
+  position: relative;
+  /* margin-top: -104rpx; */
+}
 
-	.integal-mall-menu {
-		width: 100%;
-		height: 190rpx;
-		background: #FFFFFF;
-		border-radius: 20rpx;
-	}
+.integal-mall-menu {
+  width: 100%;
+  height: 190rpx;
+  background: #FFFFFF;
+  border-radius: 20rpx;
+}
 
-	.integral-mall-goods {
-		width: 100%;
-		height: 280rpx;
-		background: #F2F2F2;
-		border-radius: 16upx;
-	}
+.integral-mall-goods {
+  width: 100%;
+  height: 280rpx;
+  background: #F2F2F2;
+  border-radius: 16upx;
+}
 
-	.titleNview-placing {
-		height: var(--status-bar-height);
-		padding-top: 44px;
-		box-sizing: content-box;
-	}
+.titleNview-placing {
+  height: var(--status-bar-height);
+  padding-top: 44px;
+  box-sizing: content-box;
+}
 </style>

+ 1 - 1
pages/index/new/index.vue

@@ -68,7 +68,7 @@
 			getList() {
 				getMiniprogramRecentvideo().then(res => {
 					console.log(res, 'getMiniprogramRecentvideogetMiniprogramRecentvideogetMiniprogramRecentvideo')
-					this.listData = res
+					this.listData = res.data;
 				})
 			},
 			getdata() {

+ 77 - 76
pages/member/consume.vue

@@ -1,86 +1,87 @@
 <template>
-	<view class="body pd16_15">
-		<view class="jilu-box" v-show="list.length > 0">
-			<view class="pb10 jilu-item" v-for="(item,key) in list" :key="key">
-				<view class="jilu-item-box">
-					<view class="jilu-items">
-						<view class="lines">
-							<text class="ft14" style="font-weight: bold;">{{item.video_name}}</text>
-							<text class="ft12 jilu-txt">{{item.series_name}}</text>
-							<text class="ft12 jilu-txt">{{item.created_at}}</text>
-						</view>
-					</view>
-					<view class="lines">
-						<text class="ft14 jilu-txt"
-							style="text-align: right;font-weight: bold;color:  #FF9800;">-{{item.coin_cost}}K币</text>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="empty-box" v-if="list.length <  1 && show">
-			<image src="/static/img/orders/emty.png" mode=""></image>
-			<p class="ft14 line-1-txt">暂无消费记录</p>
-		</view>
-	</view>
+  <view class="body pd16_15">
+    <view class="jilu-box" v-show="list.length > 0">
+      <view class="pb10 jilu-item" v-for="(item, key) in list" :key="key">
+        <view class="jilu-item-box">
+          <view class="jilu-items">
+            <view class="lines">
+              <text class="ft14" style="font-weight: bold;">{{ item.video_name }}</text>
+              <text class="ft12 jilu-txt">{{ item.series_name }}</text>
+              <text class="ft12 jilu-txt">{{ item.created_at }}</text>
+            </view>
+          </view>
+          <view class="lines">
+            <text class="ft14 jilu-txt"
+              style="text-align: right;font-weight: bold;color:  #FF9800;">-{{ item.coin_cost }}K币</text>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="empty-box" v-if="list.length < 1 && show">
+      <image src="/static/img/orders/emty.png" mode=""></image>
+      <p class="ft14 line-1-txt">暂无消费记录</p>
+    </view>
+  </view>
 </template>
 
 <script>
-	import {
-		getUserConsumeRecord
-	} from "@/common/apis/my.js"
-	export default {
-		data() {
-			return {
-				page: 1,
-				hasMore: true,
-				list: [],
-				show: false
-			}
-		},
-		onLoad() {
+import {
+  getUserConsumeRecord
+} from "@/common/apis/my.js"
+export default {
+  data() {
+    return {
+      page: 1,
+      hasMore: true,
+      list: [],
+      show: false
+    }
+  },
+  onLoad() {
 
-		},
-		onShow() {
-			this.page = 1;
-			this.hasMore = true;
-			this.getList();
-			uni.hideLoading();
-		},
-		onPullDownRefresh() {
-			this.page = 1;
-			this.list = [];
-			this.getList();
-			uni.stopPullDownRefresh();
-		},
-		onReachBottom() {
-			if (!this.hasMore) {
-				return false;
-			}
-			this.getList();
-		},
-		methods: {
-			async getList() {
+  },
+  onShow() {
+    this.page = 1;
+    this.hasMore = true;
+    this.getList();
+    uni.hideLoading();
+  },
+  onPullDownRefresh() {
+    this.page = 1;
+    this.list = [];
+    this.getList();
+    uni.stopPullDownRefresh();
+  },
+  onReachBottom() {
+    if (!this.hasMore) {
+      return false;
+    }
+    this.getList();
+  },
+  methods: {
+    async getList() {
 
-				if (this.page <= 1) {
-					this.show = false;
-				}
-				let res = await getUserConsumeRecord(this.page);
-				if (res) {
-					if (this.page >= res.last_page) {
-						this.hasMore = false;
-					} else {
-						this.page++;
-					}
-					res.data.forEach((item, index) => {
-						this.list.push(item);
-					})
-				}
-				this.show = true;
-			},
-		}
-	}
+      if (this.page <= 1) {
+        this.show = false;
+      }
+      let response = await getUserConsumeRecord(this.page);
+      let res = response.data
+      if (res) {
+        if (this.page >= res.last_page) {
+          this.hasMore = false;
+        } else {
+          this.page++;
+        }
+        res.data.forEach((item, index) => {
+          this.list.push(item);
+        })
+      }
+      this.show = true;
+    },
+  }
+}
 </script>
 
 <style scoped lang="scss">
-	@import url("style/consume.css");
+@import url("style/consume.css");
 </style>

+ 33 - 37
pages/member/index.vue

@@ -8,7 +8,7 @@
 					<!-- <image class="vip-level" :src="userinfo.group_id>1?statics.vipLevelImg[0]:''"></image> -->
 				</view>
 				<view class="ml15">
-					<view class="ft16 cl-main">{{userinfo.type}}</view>
+					<view class="ft16 cl-main">{{ userinfo.type }}</view>
 					<view class="mt12 ft12 cl-notice">ID:{{ userinfo.uid || '' }}
 						<image @click="copyId(userinfo.uid || '')" style="margin-left: 10px; width: 30rpx;height: 15px;"
 							src="/static/img/wode/cpoy.png">
@@ -21,47 +21,41 @@
 			<div class="box pd16_15  creadit-box">
 				<div class="mt16 coin-box">
 					<div class="flex alcenter coin-item">
-						<label class="coin-text">{{userinfo.charge_coin|| 0}}</label>
+						<label class="coin-text">{{ userinfo.charge_coin || 0 }}</label>
 						<label class="coin-text">永久看币</label>
 					</div>
 					<label class="box-line">|</label>
 					<div class="flex alcenter coin-item">
-						<label class="coin-text">{{userinfo.reward_coin|| 0}}</label>
+						<label class="coin-text">{{ userinfo.reward_coin || 0 }}</label>
 						<label class="coin-text">赠送看币</label>
 					</div>
-				</div>
-				<navigator  url="/pages/pay/pay">
-				<div class="mt16 box-cj"><label class="btn-cz">去充值</label></div>
+				</div>
+				<navigator url="/pages/pay/pay">
+					<div class="mt16 box-cj"><label class="btn-cz">去充值</label></div>
 				</navigator>
 
 			</div>
 			<!-- <home-vipcard :userinfo="userinfo" @loginAct="showLoginAct" @qrcode="showQrcode = true"></home-vipcard> -->
 
 			<view class="flex wrap space mt16">
-				<view v-for="(item,index) in getMenus" :key="index" :class="index > 1 ? 'mt16': ''">
+				<view v-for="(item, index) in getMenus" :key="index" :class="index > 1 ? 'mt16' : ''">
 					<view v-if="item.type == 'link'" :data-index="index" @click="memberLinkTo"
 						class="box pd16_15 flex alcenter" style="width: 320rpx;">
 						<image :src="item.icon" style="width: 64rpx;height: 64rpx;"></image>
-						<text class="ml15 ft14 ftw500 cl-main">{{item.name}}</text>
+						<text class="ml15 ft14 ftw500 cl-main">{{ item.name }}</text>
 					</view>
 					<view v-else style="width: 320rpx;" @click="showPopu(item.type)">
 						<button class="box pd16_15 flex alcenter" style="padding: 32rpx 30rpx; margin: 0;">
 							<image :src="item.icon" style="width: 64rpx;height: 64rpx;"></image>
-							<text class="ml15 ft14 ftw500 cl-main">{{item.name}}</text>
+							<text class="ml15 ft14 ftw500 cl-main">{{ item.name }}</text>
 						</button>
 					</view>
 				</view>
 			</view>
 			<com-copyright></com-copyright>
-			<!-- <image src=""></image> -->
-			<!-- <com-footer model="member"></com-footer> -->
 			<uni-popup ref="popup" type="center">
-				<image  :show-menu-by-longpress="true" class="qrcode-img"   :src="kefu.url"></image>
-			
+				<image :show-menu-by-longpress="true" class="qrcode-img" :src="kefu.url"></image>
 			</uni-popup>
-			<dialog-birthday v-if="showBirthday" @closed="showBirthday = false"></dialog-birthday>
-
-
 		</view>
 	</view>
 </template>
@@ -148,11 +142,12 @@
 			}
 		},
 		async onLoad() {
-			this.kefu = await getKefu();
+			let res = await getKefu();
+			this.kefu = res.data;
 		},
 		async onShow() {
-			let info = await getUserInfo();
-			this.userinfo = info;
+			let res = await getUserInfo();
+			this.userinfo = res.data;
 		},
 		onShareAppMessage: function(res) {
 			// #ifdef MP-WEIXIN 
@@ -228,7 +223,7 @@
 			copyId(uid) {
 				console.log('uid', uid);
 				uni.setClipboardData({
-					data: uid+"",
+					data: uid + "",
 					success: () => {
 						uni.showToast({
 							title: '复制成功',
@@ -243,23 +238,24 @@
 						});
 					}
 				})
-			},previewImage(e) {
-				console.log('e', e);
-				uni.previewImage({
-						urls: this.kefu.url,
-						longPressActions: {
-							// itemList: ['发送给朋友', '保存图片', '收藏'],
-							success: function(data) {
-								console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
-							},
-							fail: function(err) {
-								console.log(err.errMsg);
-							}
-						}
-					});
-				
-		}
-	},
+			},
+			previewImage(e) {
+				console.log('e', e);
+				uni.previewImage({
+					urls: this.kefu.url,
+					longPressActions: {
+						// itemList: ['发送给朋友', '保存图片', '收藏'],
+						success: function(data) {
+							console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+						},
+						fail: function(err) {
+							console.log(err.errMsg);
+						}
+					}
+				});
+
+			}
+		},
 	}
 </script>
 

+ 89 - 87
pages/member/orders.vue

@@ -1,88 +1,90 @@
-<template>
-	<view class="body pd16_15">
-		<view class="jilu-box" v-show="list.length > 0" >
-			<view class="pb10 jilu-item"  v-for="(item,key) in list" :key="key">
-				<view class="jilu-item-box">
-					<text class="ft12 jilu-txt">订单号:{{item.trade_no}}</text>
-					<text class="ft12 jilu-txt">{{item.status}}</text>
-				</view>
-				<view class="jilu-item-box" >
-					<view class="jilu-items">
-						<image class="pay-icon" src="/static/img/orders/cj-icon.png" mode=""></image>
-						<view class="lines">
-							<text class="ft14" style="font-weight: bold;">{{item.pay_name}}</text>
-							<text class="ft12 jilu-txt">时间:{{item.pay_end_at}}</text>
-						</view>
-					</view>
-					<view class="lines">
-						<text class="ft14 jilu-txt" style="text-align: right;font-weight: bold;color:  #FF9800;">{{item.pay_result}}K币</text>
-						<text class="ft12 jilu-txt">实付金额:&yen;{{item.price}}</text>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="empty-box" v-if="list.length <  1 && show">
-			<image src="/static/img/orders/emty.png" mode=""></image>
-			<p class="ft14 line-1-txt">暂无充值记录</p>
-			<p class="ft14 line-2-txt">小充一笔,看更多好剧吧</p>
-			<navigator url="/pages/pay/pay">
-				<view class="ft16 btn-box"><text class="ft12 btn-cz">去充值</text> </view>
-			</navigator>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {getOrderList} from "@/common/apis/recharge.js"
-	export default {
-		data() {
-			return {
-				page: 1,
-				hasMore:true,
-				list: [],
-				show:false
-			}
-		},onLoad() {
-			
-		},onShow() {
-			this.page = 1;
-			this.hasMore = true;
-			this.getList();
-			uni.hideLoading();
-		},onPullDownRefresh() {
-			this.page = 1;
-			this.list = [];
-			this.getList();
-			uni.stopPullDownRefresh();
-		},onReachBottom() {
-			if(!this.hasMore){
-				return false;
-			}
-			this.getList();
-		},
-		methods: {
-			async getList() {
-				
-				if(this.page<=1 ){
-					this.show = false;
-				}
-				let res = await getOrderList(this.page);
-				if(res){
-					if(this.page >= res.last_page){
-						this.hasMore =  false;
-					}else{
-						this.page++;
-					}
-					res.data.forEach((item, index) => {
-						this.list.push(item);
-					})
-				}
-				this.show =true;
-			},
-		}
-	}
-</script>
-
-<style>
-	@import url("style/orders.css");
+<template>
+  <view class="body pd16_15">
+    <view class="jilu-box" v-show="list.length > 0">
+      <view class="pb10 jilu-item" v-for="(item, key) in list" :key="key">
+        <view class="jilu-item-box">
+          <text class="ft12 jilu-txt">订单号:{{ item.trade_no }}</text>
+          <text class="ft12 jilu-txt">{{ item.status }}</text>
+        </view>
+        <view class="jilu-item-box">
+          <view class="jilu-items">
+            <image class="pay-icon" src="/static/img/orders/cj-icon.png" mode=""></image>
+            <view class="lines">
+              <text class="ft14" style="font-weight: bold;">{{ item.pay_name }}</text>
+              <text class="ft12 jilu-txt">时间:{{ item.pay_end_at }}</text>
+            </view>
+          </view>
+          <view class="lines">
+            <text class="ft14 jilu-txt"
+              style="text-align: right;font-weight: bold;color:  #FF9800;">{{ item.pay_result }}K币</text>
+            <text class="ft12 jilu-txt">实付金额:&yen;{{ item.price }}</text>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="empty-box" v-if="list.length < 1 && show">
+      <image src="/static/img/orders/emty.png" mode=""></image>
+      <p class="ft14 line-1-txt">暂无充值记录</p>
+      <p class="ft14 line-2-txt">小充一笔,看更多好剧吧</p>
+      <navigator url="/pages/pay/pay">
+        <view class="ft16 btn-box"><text class="ft12 btn-cz">去充值</text> </view>
+      </navigator>
+    </view>
+  </view>
+</template>
+
+<script>
+import { getOrderList } from "@/common/apis/recharge.js"
+export default {
+  data() {
+    return {
+      page: 1,
+      hasMore: true,
+      list: [],
+      show: false
+    }
+  }, onLoad() {
+
+  }, onShow() {
+    this.page = 1;
+    this.hasMore = true;
+    this.getList();
+    uni.hideLoading();
+  }, onPullDownRefresh() {
+    this.page = 1;
+    this.list = [];
+    this.getList();
+    uni.stopPullDownRefresh();
+  }, onReachBottom() {
+    if (!this.hasMore) {
+      return false;
+    }
+    this.getList();
+  },
+  methods: {
+    async getList() {
+
+      if (this.page <= 1) {
+        this.show = false;
+      }
+      let response = await getOrderList(this.page);
+      let res = response.data;
+      if (res) {
+        if (this.page >= res.last_page) {
+          this.hasMore = false;
+        } else {
+          this.page++;
+        }
+        res.data.forEach((item, index) => {
+          this.list.push(item);
+        })
+      }
+      this.show = true;
+    },
+  }
+}
+</script>
+
+<style>
+@import url("style/orders.css");
 </style>

+ 4 - 0
pages/member/style/index.css

@@ -1,5 +1,9 @@
 	.body {
 		background-color: #FFFFFF;
+	}
+	.cl-notice{
+		display: flex;
+		align-items: center;
 	}
 	.coin-text{
 		font-size: 1rem;

+ 0 - 0
pages/pay/pay.vue


이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.