修改bug

App.vue

@@ -15,34 +15,6 @@
 			if (skey != null && skey != "" && skey != undefined) {
 				this.globalData.skey = skey;
 			}
-			// #ifdef APP-PLUS
-			systemInfo.env = 'app';
-			// #endif
-			systemInfo.isXS = systemInfo.screenWidth < 768;
-			this.globalData.systemInfo = systemInfo;
-			console.log(systemInfo);
-			// this.globalData.launchPage = this.$Route.path;
-			console.log('App Launch');
-			let postHeader = {
-				from: "gushi",
-				uuid: systemInfo.deviceId,
-				os: "uni",
-				dev_os_version: systemInfo.appVersion,
-				device_name: systemInfo.osName,
-				screen_size: "[" + systemInfo.screenWidth + "," + systemInfo.screenHeight + "]",
-				own_version: "" + systemInfo.appVersionCode,
-				channel: "normal",
-				ios_version: systemInfo.osVersion,
-				country_code: "",
-				is_jailbreak: "0",
-				is_notification_enable: "0",
-				sign: "",
-				timestamp: "",
-				appid: systemInfo.appId,
-				ua: systemInfo.ua
-			};
-			this.globalData.postHeader = postHeader;
-
 		},
 		onShow: function(options) {
 			console.log('App Show');

components/ToastW3/ToastW3.scss

@@ -0,0 +1,184 @@
+.page-total{
+	position: fixed;
+	left: 0;
+	top: 0;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 100%;
+	height: 100%;
+	background-color: rgba(0,0,0,0.5);
+	z-index: 99999;
+	
+	// position: fixed; /* 固定定位，覆盖整个视口 */
+	// top: 0;
+	// left: 0;
+	// width: 100%;
+	// height: 100%;
+	// background: rgba(0, 0, 0, 0.5); /* 半透明黑色背景 */
+	// display: flex; /* 使用 Flexbox 居中 */
+	// justify-content: center; /* 水平居中 */
+	// align-items: center; /* 垂直居中 */
+	// z-index: 1000; /* 确保它处于最前面 */
+}
+
+.box{
+	display: flex;
+	justify-content: center;
+	width: 100%;
+}
+/* 文件重命名 */
+.dialog-box{
+	background-color: #ffffff;
+	width:auto;height:auto;
+	padding:10rpx 50rpx;
+	border-radius: 8rpx;
+	overflow: hidden;
+	position: relative;
+	display: flex;flex-direction: row;justify-content: center;align-items: center;
+	.title{
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 100%;
+		font-size: 28rpx;
+		color: #000000;
+	}
+}
+
+
+.a-fadein,
+.a-fadeinT,
+.a-fadeinR,
+.a-fadeinB,
+.a-fadeinL,
+.a-bouncein,
+.a-bounceinT,
+.a-bounceinR,
+.a-bounceinB,
+.a-bounceinL,
+.a-rotatein,
+.a-rotateinLT,
+.a-rotateinLB,
+.a-rotateinRT,
+.a-rotateinRB,
+.a-flipin,
+.a-flipinX,
+.a-flipinY {
+	-webkit-animation: .3s ease-out backwards;
+	-moz-animation: .3s ease-out backwards;
+	-ms-animation: .3s ease-out backwards;
+	-moz-transform: translate3d(0,0,0);
+	-ms-transform: translate3d(0,0,0);
+	-o-transform: translate3d(0,0,0);
+	transform: translate3d(0,0,0);
+}
+
+.a-fadeout,
+.a-fadeoutT,
+.a-fadeoutR,
+.a-fadeoutB,
+.a-fadeoutL,
+.a-bounceout,
+.a-bounceoutT,
+.a-bounceoutR,
+.a-bounceoutB,
+.a-bounceoutL,
+.a-rotateout,
+.a-rotateoutLT,
+.a-rotateoutLB,
+.a-rotateoutRT,
+.a-rotateoutRB,
+.a-flipoutX,
+.a-flipoutY {
+	-webkit-animation: .3s ease-in forwards;
+	-moz-animation: .3s ease-in forwards;
+	-ms-animation: .3s ease-in forwards;
+	animation: .3s ease-in forwards;
+	-moz-transform: translate3d(0,0,0);
+	-ms-transform: translate3d(0,0,0);
+	-o-transform: translate3d(0,0,0);
+	transform: translate3d(0,0,0);
+}
+
+
+/* 淡入 */
+.a-fadein {
+	-webkit-animation-name: fadein;
+	-moz-animation-name: fadein;
+	-ms-animation-name: fadein;
+	animation-name: fadein;
+}
+
+/* 淡出 */
+.a-fadeout {
+	-webkit-animation-name: fadeout;
+	-moz-animation-name: fadeout;
+	-ms-animation-name: fadeout;
+	animation-name: fadeout;
+}
+
+/* 弹入 */
+.a-bouncein {
+	-webkit-animation-name: bouncein;
+	-moz-animation-name: bouncein;
+	-ms-animation-name: bouncein;
+	animation-name: bouncein;
+}
+
+/* 弹出 */
+.a-bounceout {
+	-webkit-animation-name: bounceout;
+	-moz-animation-name: bounceout;
+	-ms-animation-name: bounceout;
+	animation-name: bounceout;
+}
+
+
+/* 淡入 */
+@keyframes fadein {
+	0% {
+		opacity: 0;
+	}
+
+	100% {
+		opacity: 1;
+	}
+}
+
+/* 淡出 */
+@keyframes fadeout {
+	0% {
+		opacity: 1;
+	}
+
+	100% {
+		opacity: 0;
+	}
+}
+
+/* 弹入 */
+@keyframes bouncein {
+	0% {
+		opacity: 0;
+		transform: scale(0.3);
+	}
+
+	100% {
+		opacity: 1;
+		transform: scale(1);
+	}
+}
+
+/* 弹出 */
+@keyframes bounceout {
+	0% {
+		opacity: 1;
+		transform: scale(1);
+	}
+
+	100% {
+		opacity: 0;
+		transform: scale(0.3);
+	}
+}

components/ToastW3/ToastW3.vue

@@ -0,0 +1,108 @@
+<template>
+	<view class="page-total" v-if="isShow">
+		<view class="box" :class="AClass[AnIndex][AnIdx]">
+			<view class="dialog-box">
+				<view class="title">{{options.title}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				AClass: [
+					['a-fadein', 'a-fadeout'],
+					['a-bouncein', 'a-bounceout'],
+				],
+				AnIndex: 0,
+				AnIdx: 0,
+				isShow: false,
+				SetTime: null,
+				value: '',
+				promise: '',
+				// 配置
+				options: {
+					// 提示标题
+					title: '',
+					// 动画类型
+					animation: 0,
+				},
+			};
+		},
+		props: {
+			// 提示标题
+			title: {
+				type: String,
+				default: '提示',
+			},
+			// 动画类型
+			animation: {
+				type: Number,
+				default: 0
+			}
+		},
+		methods: {
+			// 询问框
+			showToast(options) {
+				this.AnIndex = options.animation || 0;
+				this.AnIdx = options.animation || 0;
+				this.options = {
+					// 提示标题
+					title: options.title || '',
+					// 动画类型
+					animation: options.animation || 0,
+				};
+				this.show();
+				let that = this;
+				setTimeout(function() {
+						that.hide();
+					},
+					2000);
+				this.promise = new Promise((resolve, reject) => {
+					this.resolve = resolve;
+					this.reject = reject;
+				});
+				return this.promise; //返回promise对象,给父级组件调用
+			},
+			/**
+			 * 显示
+			 */
+			show(callback) {
+				this.isShow = true;
+			},
+			/**
+			 * 隐藏
+			 */
+			hide() {
+				this.AnIdx = 1;
+				this.SetTime = setTimeout(() => {
+					this.isShow = false;
+				}, 300);
+			},
+			/**
+			 * 清除输入值
+			 */
+			onClear() {
+				this.options.value = '';
+			},
+			/**
+			 * 取消点击
+			 */
+			onCancel() {
+				this.hide();
+			},
+			/**
+			 * 确定点击
+			 */
+			onConfirm() {
+				this.hide();
+			},
+		},
+	}
+</script>
+
+<style scoped lang="scss">
+	@import 'ToastW3.scss'
+</style>

pages.json

@@ -49,6 +49,13 @@
 				"navigationStyle": "custom",
 				"navigationBarBackgroundColor": "#ffffff"
 			}
+		}, {
+			"path": "pages/login/down",
+			"style": {
+				"navigationBarTitleText": "加入成功",
+				"navigationStyle": "custom",
+				"navigationBarBackgroundColor": "#ffffff"
+			}
 		}, {
 			"path": "pages/my/editMobile",
 			"style": {

pages/article/article.vue

@@ -21,18 +21,6 @@
 		data() {
 			return {
 				title: '',
-				sel: 1,
-				myinfo: {
-					nickname: '王思思',
-					join_name: '注册日期：2024年5月',
-					num_1: 0,
-					num_2: 0,
-					num_3: 0,
-					num_4: 0,
-					is_login: 'no',
-					num_history: 0,
-					num_collection: 0
-				},
 			}
 		},
 		onLoad() {
@@ -47,82 +35,9 @@
 				})
 			}, 200);
 		},
-		onShow() {
-			this.loadData();
-		},
+		onShow() {},
 		methods: {
 			onBack() {},
-			chkSel() {
-				if (this.sel == 1) {
-					this.sel = 0;
-				} else {
-					this.sel = 1;
-				}
-			},
-			loadData() {
-				console.log("this.globalData", getApp().globalData);
-				let obj2 = {
-					is_first: 0
-				}
-				const postData = Object.assign({}, getApp().globalData.postHeader, obj2);
-
-				console.log(postData);
-
-				uni.request({
-					url: this.$apiHost + '/Gushi/getmyinfo', //仅为示例，并非真实接口地址。
-					data: postData,
-					method: 'POST',
-					header: {
-						'content-type': 'application/json', //自定义请求头信息
-						'Access-Control-Allow-Origin': '*'
-					},
-					success: (res) => {
-						console.log('data:', res.data);
-						this.myinfo = res.data;
-					}
-				});
-
-
-
-			},
-			EditNickname() {
-				let that = this;
-				this.$refs['DialogBox'].confirm({
-					title: '更改昵称',
-					placeholder: '请输入修改的昵称',
-					value: that.myinfo.nickname,
-					DialogType: 'input',
-					animation: 0
-				}).then((res) => {
-					if (res.value.length < 1) {
-						uni.showToast({
-							title: "请输入有效的昵称",
-							icon: 'none'
-						});
-						return;
-					}
-					that.myinfo.nickname = res.value;
-					let obj2 = {
-						nickname: res.value
-					}
-					const postData = Object.assign({}, getApp().globalData.postHeader, obj2);
-					uni.request({
-						url: that.$apiHost + '/Gushi/editinfo', //检测是否已绑定
-						data: postData,
-						method: 'POST',
-						header: {
-							'content-type': 'application/json', //自定义请求头信息
-							'Access-Control-Allow-Origin': '*'
-						},
-						success: (res) => {
-							uni.showToast({
-								title: res.data.str,
-								icon: 'none'
-							});
-						}
-					});
-				})
-			},
 		}
 	}
 </script>

pages/index/index.vue

@@ -94,265 +94,16 @@
 		components: {},
 		data() {
 			return {
-				title: '故事花园为您服务',
-				app_index: [],
-				story_info: {},
-				platDiff: '',
+				title: '',
 
-				num_people: 0,
-				num_diamond: 0,
-				showPop: false,
-				popFrom: 'bottom',
-				maskClick: true,
-				isPlayingState: false,
-
-				bg_show: false,
-				show_sound: false,
-				swiperIndex: 0,
-				data_list: [{
-					"title": "春晓",
-					"author": "唐.白居易",
-					"content": "春眠不觉晓，\n处处闻啼鸟。\n夜来风雨声，\n花落知多少。\n春眠不觉晓，\n处处闻啼鸟。\n夜来风雨声，\n花落知多少\n",
-					"is_show": 1
-				}],
-				record_list: [],
-				tid: 0,
-				audio: null,
-				record_id: 0,
 			}
 		},
 		onLoad() {
 			let self = this;
-			// let dataString = uni.getStorageSync('home_dataMsg');
-			// if(dataString && false) {
-			// 	let dataList = JSON.parse(dataString);
-			// 	this.app_index = dataList.app_index;
-			// 	setTimeout(function() {
-			// 		self.loadData(0);
-			// 	},3000);
-			// }else {
-
-			// }
-
-			// 全局挂载 音乐播放
-			// #ifdef H5
-			this.audio = uni.createInnerAudioContext();
-			// #endif
-			// #ifdef APP
-			this.audio = uni.getBackgroundAudioManager();
-			// #endif
-
-			this.audio.onPlay(() => {
-				console.log("----onPlay");
 
-			});
-			this.audio.onError(() => {
-				console.log(res.errMsg);
-				console.log(res.errCode);
-			});
-			this.audio.onPause(() => {
-				console.log("----onPause");
-
-			});
-			this.audio.onStop(() => {
-				console.log("----onStop");
-			});
-			this.audio.onEnded(() => {
-				console.log("----onEnded");
-				this.record_id = 0;
-			});
-		},
-		onShow() {
-			// uni.hideTabBar({
-			// 	animation:false
-			// })
-			this.loadData(1);
-			// this.showBottomPlayer();
 		},
-		methods: {
-			onSwiperChange(e) {
-				this.swiperIndex = e.detail.current
-				console.log("swiperIndex = " + this.swiperIndex);
-				this.tid = this.data_list[this.swiperIndex].id;
-				this.loadRecord();
-
-				// this.$emit("change", e);
-
-			},
-			swiperChangeClick(e) {
-
-			},
-			start() {
-				this.title = '录音已开始';
-				console.log('start', new Date().getTime());
-			},
-			end(e) {
-				this.title = '录音结束，停止录音，处理你得到的录音文件';
-				console.log('end', e.tempFilePath);
-				this.show_sound = false;
-
-				uni.showLoading({
-					title: '处理中'
-				});
-				let that = this;
-				let uuid = getApp().globalData.postHeader.uuid;
-				const uploadTask = uni.uploadFile({
-					url: that.$apiHost + '/Gushi/upload', // post请求地址
-					formData: {
-						tid: that.tid,
-						uuid: uuid
-					},
-					filePath: e.tempFilePath,
-					name: 'file', // 待确认
-					//下面header 如果在app上无法上传，则去掉注释
-					//            header: {
-					//                // 'Content-Type': 'multipart/form-data',
-					// 'content-type': 'application/json'
-					//            },
-					success: function(uploadFileRes) {
-						let resdata = JSON.parse(uploadFileRes.data)
-						console.log('Success1:', uploadFileRes);
-						if (resdata.success == 'yes') {
-							console.log('Success2:', resdata.url);
-							// that.avator = resdata.url;
-							that.loadData(2); //不翻页
-							that.loadRecord();
-						}
-						// _self.imgsID.push(JSON.parse(uploadFileRes.data).data.fileId);
-						// console.log('_self.imgsID:', _self.imgsID)
-					},
-					fail: function(uploadFileFail) {
-						console.log('Error:', uploadFileFail.data);
-					},
-					complete: () => {
-						console.log('Complete:');
-					}
-				});
-			},
-			cancel() {
-				this.title = '录音取消，停止录音';
-				console.log('cancel', new Date().getTime());
-			},
-			playRecord(item) {
-				console.log('item', item.fileurl)
-				this.record_id = item.id;
-				this.audio.autoplay = false;
-				this.audio.src = item.fileurl;
-				this.audio.play();
-			},
-			onBack() {},
-			onShowPopup(e) {
-				this.showPop = e.detail.value
-			},
-			onMaskClick(e) {
-				this.maskClick = e.detail.value
-			},
-			loadData(is_first) {
-				console.log("this.globalData", getApp().globalData);
-				let obj2 = {
-					is_first: is_first
-				}
-				const postData = Object.assign({}, getApp().globalData.postHeader, obj2);
-
-				console.log(this.$apiHost + '/Gushi/all');
-
-				let that = this;
-				uni.request({
-					url: this.$apiHost + '/Gushi/all',
-					data: postData,
-					method: 'POST',
-					header: {
-						'content-type': 'application/json',
-						'Cache-Control': 'no-cache',
-						'Access-Control-Allow-Origin': '*'
-					},
-					success: (res) => {
-						console.log('data:', res.data);
-						that.data_list = res.data.msg.list;
-						that.num_people = res.data.msg.num_people;
-						that.num_diamond = res.data.msg.num_diamond;
-						if (is_first == 1) {
-							that.data_list.map((item, index) => {
-								if (item.is_show > 0) {
-									that.swiperIndex = index
-									that.tid = item.id;
-								}
-							});
-							that.loadRecord();
-						} else {
-							that.data_list.map((item, index) => {
-								if (that.tid == item.id) {
-									that.swiperIndex = index
-								}
-							})
-						}
-					},
-					complete() {
-						uni.hideLoading()
-					},
-					fail: (e) => {
-						console.log("e", e.errMsg)
-					}
-				});
-			},
-			loadRecord() {
-				let obj2 = {
-					tid: this.tid
-				}
-				console.log("this.obj2", obj2);
-				const postData = Object.assign({}, getApp().globalData.postHeader, obj2);
-				console.log(this.$apiHost + '/Gushi/all');
-				let that = this;
-				uni.request({
-					url: this.$apiHost + '/Gushi/record',
-					data: postData,
-					method: 'POST',
-					header: {
-						'content-type': 'application/json',
-						'Cache-Control': 'no-cache',
-						'Access-Control-Allow-Origin': '*'
-					},
-					success: (res) => {
-						console.log('loadRecord:', res.data);
-						that.record_list = res.data.msg.list;
-					},
-					fail: (e) => {
-						console.log("e", e.errMsg)
-					}
-				});
-			},
-			likeThis(item) {
-				let obj2 = {
-					tid: item.id
-				}
-				console.log("tid", obj2);
-				const postData = Object.assign({}, getApp().globalData.postHeader, obj2);
-				let that = this;
-				uni.request({
-					url: this.$apiHost + '/Gushi/record_like',
-					data: postData,
-					method: 'POST',
-					header: {
-						'content-type': 'application/json',
-						'Cache-Control': 'no-cache',
-						'Access-Control-Allow-Origin': '*'
-					},
-					success: (res) => {
-						console.log('likeThis:', res.data);
-						uni.showToast({
-							title: res.data.str,
-							icon: 'none'
-						})
-						if (res.data.status) {
-							this.loadRecord();
-						}
-					},
-					fail: (e) => {
-						console.log("e", e.errMsg)
-					}
-				});
-			}
-		}
+		onShow() {},
+		methods: {}
 	}
 </script>
 

pages/login/down.scss

@@ -0,0 +1,82 @@
+page {
+	background-color: #161616;
+	width: 100%;
+	height: 100%;
+}
+.page {
+	width: 100%;
+	height: 100%;
+}
+.header {
+	display: flex;
+	flex-direction: row;
+	justify-content: flex-start;
+	align-items: center;
+	width: 750rpx;height: 120rpx;
+	padding-top: calc(var(--status-bar-height) + 0rpx);
+	.left {
+		display: flex;flex-direction: row;width:100rpx;height:60rpx;
+		justify-content: center;
+		padding-left:50rpx;
+		image {
+			width:36rpx;height:36rpx;
+		}
+	}
+}
+.thread {
+	height: 20rpx;
+}
+.thread2 {
+	height: 60rpx;
+}
+
+.tbody {
+	display: flex;flex-direction: column;justify-content: center;align-items: center;
+	image {
+		width:152rpx;height:152rpx;
+	}
+	.tips {
+		font-weight: 400;margin-top:76rpx;
+		font-size: 24rpx;
+		color: #D0D0D0;
+	}
+	.btn_submit {
+		width: 660rpx;height: 96rpx;margin-top:288rpx;
+		background: linear-gradient( 142deg, #FF5967 0%, #FF2A95 100%);
+		border-radius: 28rpx 28rpx 28rpx 28rpx;
+		display: flex;flex-direction: column;justify-content: center;align-items: center;
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #FFFFFF;
+	}
+	
+}
+.blankHeight {
+	width:750rpx;height:180rpx;
+}
+
+.pop_mask {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100vw;
+    height: 100vh;
+    background-color: rgba(0, 0, 0, 0.5);
+}
+
+.body {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start;
+    align-items: flex-end;
+}
+
+.clickT {
+    width: 300rpx;
+    height: 100rpx;
+    z-index: 9999;
+    margin-top: 0rpx;
+    margin-right: 20rpx;
+}

pages/login/down.vue

@@ -0,0 +1,72 @@
+<template>
+	<view class="page">
+		<view class="header">
+			<view class="left">
+				<!-- <image class="img" mode="widthFix" src="../../static/login/close.png"></image> -->
+			</view>
+		</view>
+
+		<view class="tbody">
+			<image style="margin-top: 50rpx;height: 120rpx;" src="../../static/me/img_checkMark.png" mode="heightFix" />
+			<text style="margin-top: 68rpx;color:#FFFFFF;font-size: 28rpx;">下载APP，遇见更好的TA！</text>
+
+
+			<text class="btn_submit" @click="toDown">下载APP</text>
+
+
+
+		</view>
+		<view class="pop_mask" v-if="show_mask">
+			<view class="body">
+				<image class="clickT" src="../../static/w3/wx_mask.png" mode="widthFix" />
+			</view>
+		</view>
+		<view class="blankHeight"></view>
+		<!-- 提示框 -->
+		<DialogBox ref="DialogBox"></DialogBox>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {},
+		data() {
+			return {
+				title: '',
+				show_mask: false,
+			}
+		},
+		onLoad(params) {
+			this.ycode = params.ycode || '999999';
+		},
+		onShow() {},
+		methods: {
+			onBack() {},
+			toDown() {
+				if (this.is_show_mask()) {
+					this.show_mask = true;
+				} else {
+					if (browser.versions.mobile && browser.versions.ios) {
+						location.href = "http://e.yujianmate.com/web/";
+					} else {
+						location.href = "http://e.yujianmate.com/app/v100.2.apk";
+					}
+				}
+			},
+			is_show_mask() {
+				var ua = navigator.userAgent.toLowerCase();
+				if (ua.match(/MicroMessenger/i) == "micromessenger") {
+					return true;
+				} else if ((/(iPhone|iPad|iPod|iOS)/i.test(ua) && /\sQQ/i.test(ua)) || (/(Android)/i.test(ua) &&
+						/MQQBrowser/i.test(ua) && /\sQQ/i.test((ua).split('MQQBrowser')))) {
+					return true;
+				}
+				return false;
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import 'down.scss';
+</style>

pages/login/login.vue

@@ -114,8 +114,9 @@
 		},
 		onShow() {
 			if (getApp().globalData.skey != "") {
+				// console.log("====", getApp().globalData.skey);
 				uni.switchTab({
-					url: "/pages/index/home"
+					url: "/pages/index/index"
 				});
 			}
 			// this.loadData();

pages/sms/sms.vue

@@ -50,31 +50,7 @@
 		components: {},
 		data() {
 			return {
-				title: '故事花园为您服务',
-				app_index: [],
-				story_info: {},
-				platDiff: '',
-
-				num_people: 0,
-				num_diamond: 0,
-				showPop: false,
-				popFrom: 'bottom',
-				maskClick: true,
-				isPlayingState: false,
-
-				bg_show: false,
-				show_sound: false,
-				swiperIndex: 0,
-				data_list: [{
-					"title": "春晓",
-					"author": "唐.白居易",
-					"content": "春眠不觉晓，\n处处闻啼鸟。\n夜来风雨声，\n花落知多少。\n春眠不觉晓，\n处处闻啼鸟。\n夜来风雨声，\n花落知多少\n",
-					"is_show": 1
-				}],
-				record_list: [],
-				tid: 0,
-				audio: null,
-				record_id: 0,
+				title: '',
 			}
 		},
 		onLoad() {
@@ -87,228 +63,14 @@
 			// 		self.loadData(0);
 			// 	},3000);
 			// }else {
-
 			// }
-
-			// 全局挂载 音乐播放
-			// #ifdef H5
-			this.audio = uni.createInnerAudioContext();
-			// #endif
-			// #ifdef APP
-			this.audio = uni.getBackgroundAudioManager();
-			// #endif
-
-			this.audio.onPlay(() => {
-				console.log("----onPlay");
-
-			});
-			this.audio.onError(() => {
-				console.log(res.errMsg);
-				console.log(res.errCode);
-			});
-			this.audio.onPause(() => {
-				console.log("----onPause");
-
-			});
-			this.audio.onStop(() => {
-				console.log("----onStop");
-			});
-			this.audio.onEnded(() => {
-				console.log("----onEnded");
-				this.record_id = 0;
-			});
 		},
 		onShow() {
 			// uni.hideTabBar({
 			// 	animation:false
 			// })
-			this.loadData(1);
-			// this.showBottomPlayer();
 		},
-		methods: {
-			onSwiperChange(e) {
-				this.swiperIndex = e.detail.current
-				console.log("swiperIndex = " + this.swiperIndex);
-				this.tid = this.data_list[this.swiperIndex].id;
-				this.loadRecord();
-
-				// this.$emit("change", e);
-
-			},
-			swiperChangeClick(e) {
-
-			},
-			start() {
-				this.title = '录音已开始';
-				console.log('start', new Date().getTime());
-			},
-			end(e) {
-				this.title = '录音结束，停止录音，处理你得到的录音文件';
-				console.log('end', e.tempFilePath);
-				this.show_sound = false;
-
-				uni.showLoading({
-					title: '处理中'
-				});
-				let that = this;
-				let uuid = getApp().globalData.postHeader.uuid;
-				const uploadTask = uni.uploadFile({
-					url: that.$apiHost + '/Gushi/upload', // post请求地址
-					formData: {
-						tid: that.tid,
-						uuid: uuid
-					},
-					filePath: e.tempFilePath,
-					name: 'file', // 待确认
-					//下面header 如果在app上无法上传，则去掉注释
-					//            header: {
-					//                // 'Content-Type': 'multipart/form-data',
-					// 'content-type': 'application/json'
-					//            },
-					success: function(uploadFileRes) {
-						let resdata = JSON.parse(uploadFileRes.data)
-						console.log('Success1:', uploadFileRes);
-						if (resdata.success == 'yes') {
-							console.log('Success2:', resdata.url);
-							// that.avator = resdata.url;
-							that.loadData(2); //不翻页
-							that.loadRecord();
-						}
-						// _self.imgsID.push(JSON.parse(uploadFileRes.data).data.fileId);
-						// console.log('_self.imgsID:', _self.imgsID)
-					},
-					fail: function(uploadFileFail) {
-						console.log('Error:', uploadFileFail.data);
-					},
-					complete: () => {
-						console.log('Complete:');
-					}
-				});
-			},
-			cancel() {
-				this.title = '录音取消，停止录音';
-				console.log('cancel', new Date().getTime());
-			},
-			playRecord(item) {
-				console.log('item', item.fileurl)
-				this.record_id = item.id;
-				this.audio.autoplay = false;
-				this.audio.src = item.fileurl;
-				this.audio.play();
-			},
-			onBack() {},
-			onShowPopup(e) {
-				this.showPop = e.detail.value
-			},
-			onMaskClick(e) {
-				this.maskClick = e.detail.value
-			},
-			loadData(is_first) {
-				console.log("this.globalData", getApp().globalData);
-				let obj2 = {
-					is_first: is_first
-				}
-				const postData = Object.assign({}, getApp().globalData.postHeader, obj2);
-
-				console.log(this.$apiHost + '/Gushi/all');
-
-				let that = this;
-				uni.request({
-					url: this.$apiHost + '/Gushi/all',
-					data: postData,
-					method: 'POST',
-					header: {
-						'content-type': 'application/json',
-						'Cache-Control': 'no-cache',
-						'Access-Control-Allow-Origin': '*'
-					},
-					success: (res) => {
-						console.log('data:', res.data);
-						that.data_list = res.data.msg.list;
-						that.num_people = res.data.msg.num_people;
-						that.num_diamond = res.data.msg.num_diamond;
-						if (is_first == 1) {
-							that.data_list.map((item, index) => {
-								if (item.is_show > 0) {
-									that.swiperIndex = index
-									that.tid = item.id;
-								}
-							});
-							that.loadRecord();
-						} else {
-							that.data_list.map((item, index) => {
-								if (that.tid == item.id) {
-									that.swiperIndex = index
-								}
-							})
-						}
-					},
-					complete() {
-						uni.hideLoading()
-					},
-					fail: (e) => {
-						console.log("e", e.errMsg)
-					}
-				});
-			},
-			loadRecord() {
-				let obj2 = {
-					tid: this.tid
-				}
-				console.log("this.obj2", obj2);
-				const postData = Object.assign({}, getApp().globalData.postHeader, obj2);
-				console.log(this.$apiHost + '/Gushi/all');
-				let that = this;
-				uni.request({
-					url: this.$apiHost + '/Gushi/record',
-					data: postData,
-					method: 'POST',
-					header: {
-						'content-type': 'application/json',
-						'Cache-Control': 'no-cache',
-						'Access-Control-Allow-Origin': '*'
-					},
-					success: (res) => {
-						console.log('loadRecord:', res.data);
-						that.record_list = res.data.msg.list;
-					},
-					fail: (e) => {
-						console.log("e", e.errMsg)
-					}
-				});
-			},
-			likeThis(item) {
-				let obj2 = {
-					tid: item.id
-				}
-				console.log("tid", obj2);
-				const postData = Object.assign({}, getApp().globalData.postHeader, obj2);
-				let that = this;
-				uni.request({
-					url: this.$apiHost + '/Gushi/record_like',
-					data: postData,
-					method: 'POST',
-					header: {
-						'content-type': 'application/json',
-						'Cache-Control': 'no-cache',
-						'Access-Control-Allow-Origin': '*'
-					},
-					success: (res) => {
-						console.log('likeThis:', res.data);
-						uni.showToast({
-							title: res.data.str,
-							icon: 'none'
-						})
-						if (res.data.status) {
-							this.loadRecord();
-						}
-					},
-					fail: (e) => {
-						console.log("e", e.errMsg)
-					}
-				});
-			}
-		}
+		methods: {}
 	}
 </script>
 

pages/w3/box.vue

@@ -10,7 +10,7 @@
 			</view>
 		</view>
 
-		<view class="tabMain2">
+		<view class="tabMain2" v-if="tab == 1">
 			<view class="menu" :class="tab2==1?'active':''" @click="selTab2(1)">
 				开拓者燃料
 			</view>
@@ -49,12 +49,12 @@
 		<view class="list_item" v-for="(item,index) in list" :class="tab2 > 1?'state12':''">
 			<view class="item1">
 				<text class="left">{{item.name}}</text>
-				<block v-if="item.num_have > 0">
+				<block v-if="item.num_have > 0 && tab == 1">
 					<text class="right state2">
 						已拓中{{item.num_have}}/{{item.num}}
 					</text>
 				</block>
-				<block v-else>
+				<block v-else-if="tab == 1 && tab2 < 3">
 					<text class="right">
 						开拓中0/{{item.num}}
 					</text>
@@ -63,25 +63,35 @@
 			<view class="item2">
 				<view class="left">
 					<image class="icon" mode="widthFix" :src="'../../static/w3/box/box_'+item.id+'.png'"></image>
-					<text class="name" v-if="tab2>1">待解锁：{{item.num_sign}}/{{item.num_task}}天</text>
-					<text class="time" v-if="item.num_have > 0 && tab2>1">开拓日期：{{item.tdate}}</text>
+					<block v-if="tab == 1 && tab2 < 3">
+						<text class="name" v-if="tab2>1">待解锁：{{item.num_sign}}/{{item.num_task}}天</text>
+						<text class="time" v-if="item.num_have > 0 && tab2>1">开拓日期：{{item.tdate}}</text>
+					</block>
 				</view>
 				<view class="right">
-					<view class="content">
+					<view class="content" v-if="tab2 < 3">
 						探索需要{{item.num_dui}}个暗物质，可探索获得{{item.num_jkb}}个暗物质，周期{{item.num_limit_day}}
 						天，最多可完成{{item.num}}次探索。
 					</view>
+					<view class="content" v-else>
+						<view style="font-size:32rpx;">开拓完成</view>
+						<view style="font-size:28rpx;color:#999;padding-top:10rpx;">完成日期：{{item.tdate}}</view>
+					</view>
 					<view class="act">
-						<block v-if="tab2 == 1 && item.num_have < item.num">
+						<block v-if="tab2 == 1 && item.num_have < item.num && tab == 1">
 							<image class="icon" mode="widthFix" src="../../static/w3/tansuo.png"
 								@click="onDuihuan(item)"></image>
 						</block>
 						<block v-if="tab2 == 2">
 							<text class="sign_name"></text>
 						</block>
+						<block v-if="tab2 == 2 && tab == 1">
+							<text class="state_name">待领取：{{item.can_get_gmb}}</text>
+							<!-- <image class="icon" mode="heightFix" src="../../static/w3/x_get.png"></image> -->
+						</block>
 						<block v-if="tab == 2">
-							<text class="state_name">待领取：1</text>
-							<image class="icon" mode="heightFix" src="../../static/w3/x_get.png"></image>
+							<image class="icon" mode="heightFix" src="../../static/w3/tansuo.png"
+								@click="onJihuo(item)"></image>
 						</block>
 					</view>
 				</view>
@@ -94,6 +104,7 @@
 
 
 		<DialogBoxW3 ref="DialogBoxW3"></DialogBoxW3>
+		<ToastW3 ref="ToastW3"></ToastW3>
 	</view>
 </template>
 
@@ -132,7 +143,7 @@
 				// e的返回格式为json对象：{fontSize: "15px", text: "记录", color: "#fff", fontWeight: "normal", index: 0}
 
 				uni.navigateTo({
-					url: "/pages/w3/tranRecord?stype=sign",
+					url: "/pages/w3/tranRecord?stype=ad",
 				})
 			},
 			selTab(tb) {
@@ -164,10 +175,14 @@
 						},
 						success: (res) => {
 							console.log("----", res.data.list);
-							uni.showToast({
+							// uni.showToast({
+							// 	title: res.data.str,
+							// 	icon: 'none'
+							// })
+							that.$refs['ToastW3'].showToast({
 								title: res.data.str,
-								icon: 'none'
-							})
+								animation: 0
+							});
 							if (res.data.success == "yes") {
 								that.loadBoxList(1, this.tab);
 							}
@@ -189,6 +204,32 @@
 					// });
 				})
 			},
+			onJihuo(item) {
+				let that = this;
+				uni.request({
+					url: this.$apiHost + "/Box/jihuo",
+					data: {
+						uuid: getApp().globalData.uuid,
+						id: item.item_id
+					},
+					header: {
+						"content-type": "application/json"
+					},
+					success: (res) => {
+						console.log("----", res.data.list);
+						that.$refs['ToastW3'].showToast({
+							title: res.data.str,
+							animation: 0
+						});
+						if (res.data.success == "yes") {
+							that.loadBoxList(2, this.tab);
+						}
+					},
+					complete: (com) => {
+						uni.hideLoading();
+					},
+				});
+			},
 			loadBoxList(tab, type) {
 				let that = this;
 				uni.request({

pages/w3/invite.vue

@@ -51,7 +51,7 @@
 					</view>
 
 					<view class="numlist2">
-						<view v-if="zt_list.length<=0" class="empty">
+						<view v-if="nodata" class="empty">
 							<view class="bg"></view>
 							<text style="margin-top: 0rpx;font-size: 24rpx;color: #999999;">暂无数据</text>
 						</view>
@@ -115,6 +115,7 @@
 			return {
 				myinfo: {},
 				sel: 1,
+				nodata: true,
 				zt_list: [],
 				X_Info: {
 
@@ -205,6 +206,9 @@
 					success: (res) => {
 						console.log("----:", res.data);
 						this.zt_list = res.data.list;
+						if (res.data.list != null && res.data.list != undefined) {
+							this.nodata = false;
+						}
 					},
 					complete: (com) => {
 						// uni.hideLoading();

pages/w3/tran.vue

@@ -9,7 +9,7 @@
 					<view class="num">
 						<input type="number" v-model="num" placeholder="请输入传送数量" />
 					</view>
-					<view class="all">
+					<view class="all" @click="num = myinfo.num_gmb">
 						全部
 					</view>
 				</view>
@@ -56,6 +56,7 @@
 			</view>
 		</view>
 
+		<ToastW3 ref="ToastW3"></ToastW3>
 	</view>
 </template>
 
@@ -120,16 +121,16 @@
 			tranSubmit() {
 				var that = this;
 				if (this.num < 1) {
-					uni.showToast({
+					that.$refs['ToastW3'].showToast({
 						title: "请填写数量",
-						icon: 'none'
+						animation: 0
 					});
 					return;
 				}
 				if (this.mobile.length < 11) {
-					uni.showToast({
+					that.$refs['ToastW3'].showToast({
 						title: "请填写对方手机号",
-						icon: 'none'
+						animation: 0
 					});
 					return;
 				}
@@ -146,9 +147,9 @@
 					},
 					success: (res) => {
 						console.log("----:", res.data);
-						uni.showToast({
+						that.$refs['ToastW3'].showToast({
 							title: res.data.str,
-							icon: 'none'
+							animation: 0
 						});
 						if (res.data.success == "yes") {
 							this.num = 0;

pages/w3/ucenter.vue

@@ -6,7 +6,8 @@
 					<view class="user">
 						<image class="avator" mode="widthFix" src="../../static/home/meinv.png"></image>
 						<text class="nickname">{{myinfo.nickname}}</text>
-						<image class="iconV" mode="widthFix" src="../../static/w3/w3_icon_2.png"></image>
+						<image class="iconV" mode="widthFix" :src="'../../static/w3/w3_icon_'+(myinfo.level+1)+'.png'">
+						</image>
 					</view>
 					<view class="num">{{myinfo.num_gmb}}</view>
 					<view class="desc">
@@ -15,7 +16,7 @@
 					</view>
 				</view>
 				<view class="right">
-					<image class="icon" mode="widthFix" src="../../static/w3/w3_2.png"></image>
+					<image class="icon" mode="widthFix" :src="'../../static/w3/w3_'+(myinfo.level+1)+'.png'"></image>
 					<view class="desc" @click="goPage('/pages/w3/levRule')">
 						查看晋升规则
 						<image class="arrow" mode="widthFix" src="../../static/me/arrow_right.png"></image>