123456

.hbuilderx/launch.json

@@ -2,6 +2,10 @@
   // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
     "version": "0.0",
     "configurations": [{
+     	"app-plus" : 
+     	{
+     		"launchtype" : "local"
+     	},
      	"default" : 
      	{
      		"launchtype" : "local"

components/goods-detail.vue

@@ -1,28 +1,30 @@
 <template>
 	<uni-popup ref="more-detail" type="bottom" :mask-click="false" height="30px">
-		<view class="more-detail">
-			<view class="more-detail-close" @click="$refs['more-detail'].close()"><image src="https://www.chaomangdao.com/image/home/guanbi@2x.png" mode=""></image></view>
-			<view class="more-detail-head">商品详情</view>
-			<view class="content">
-				<view>{{ goods.goods_name }}</view>
-				<view class="props">
-					<view>
-						<view class="label">参考价：</view>
-						<view class="value">￥{{ goods.price }}</view>
-					</view>
-					<view>
-						<view class="label">参考概率：</view>
-						<view class="value">{{ rate.value }}</view>
+		<scroll-view class="scrolllist" scroll-y="true">
+			<view class="more-detail">
+				<view class="more-detail-close" @click="$refs['more-detail'].close()"><image src="https://www.chaomangdao.com/image/home/guanbi@2x.png" mode=""></image></view>
+				<view class="more-detail-head">商品详情</view>
+				<view class="content">
+					<view>{{ goods.goods_name }}</view>
+					<view class="props">
+						<view>
+							<view class="label">参考价：</view>
+							<view class="value">￥{{ goods.price }}</view>
+						</view>
+						<view>
+							<view class="label">参考概率：</view>
+							<view class="value">{{ rate.value }}</view>
+						</view>
 					</view>
 				</view>
+				<view class="goods.xiangqing">
+					<!-- 产品多图 -->
+					<image v-for="xq in goods.xiangqing" :src="xq.indexOf('http') == -1 ? 'https://www.chaomangdao.com' + xq : xq" mode="widthFix"></image>
+					<!-- 产品单图 -->
+					<!-- <image :src="goods.image" @click="lookImg()" mode="widthFix"></image> -->
+				</view>
 			</view>
-			<view class="goods.xiangqing">
-				<!-- 产品多图 -->
-				<image v-for="xq in goods.xiangqing" :src="xq.indexOf('http') == -1 ? 'https://www.chaomangdao.com' + xq : xq" mode="widthFix"></image>
-				<!-- 产品单图 -->
-				<!-- <image :src="goods.image" @click="lookImg()" mode="widthFix"></image> -->
-			</view>
-		</view>
+		</scroll-view>
 	</uni-popup>
 </template>
 
@@ -79,9 +81,11 @@ export default {
 </script>
 
 <style lang="scss">
+.scrolllist {
+	max-height: 70vh;
+}
 .more-detail {
 	max-height: 70vh;
-	overflow: auto;
 	background: #ffffff;
 	border-radius: 20rpx 20rpx 0rpx 0rpx;
 	position: relative;

components/recycle.vue

@@ -1,71 +1,90 @@
 <template>
 	<uni-popup ref="recycle" :mask-click="false">
 		<view class="recycle">
-			<view class="recycle_close" @click="$refs.recycle.close()">
-				<image src="/static/image/publice/guanbi@2x.png" mode=""></image>
-			</view>
+			<view class="recycle_close" @click="$refs.recycle.close()"><image src="/static/image/publice/guanbi@2x.png" mode=""></image></view>
 			<view class="recycle_head">提示</view>
 			<view class="recycle_price center">
 				<text>￥{{ recycleMessage.amount }}</text>
 				<text>回收金币</text>
 			</view>
-			<view class="recycle_ul">
-				<view class="recycle_ul_li flex" v-for="(item,index) in recycleMessage.goods_info" :key="index">
-					<view class="recycle_ul_li_txt">{{ item.name }}</view>
-					<view class="recycle_ul_li_r flexs">
-						<text>￥{{ item.price }}</text>
-						<text>x{{ item.num }}</text>
+			<scroll-view class="scrolllist" scroll-y="true">
+				<view class="recycle_ul">
+					<view class="recycle_ul_li flex" v-for="(item, index) in recycleMessage.goods_info" :key="index">
+						<view class="recycle_ul_li_txt">{{ item.name }}</view>
+						<view class="recycle_ul_li_r flexs">
+							<text>￥{{ item.price }}</text>
+							<text>x{{ item.num }}</text>
+						</view>
 					</view>
 				</view>
-			</view>
+			</scroll-view>
+
 			<view class="recycle_txt">回收规则：平台统一回收折扣10，回收金币直接放【我的】 - 【余额】</view>
-			<view class="sure" @click="$refs.recycle.close()">
-			  确定
-			</view>
+			<view class="sure" @click="$refs.recycle.close()">确定</view>
 		</view>
 	</uni-popup>
 </template>
 
 <script>
-	export default {
-		name:"recycle",
-		data() {
-			return {
-				recycleMessage: {}
-			};
+export default {
+	name: 'recycle',
+	data() {
+		return {
+			recycleMessage: {}
+		};
+	},
+	methods: {
+		//抽奖结束点击回收触发
+		recycle(prizeInfo) {
+			let ids = [];
+			prizeInfo.forEach(item => {
+				ids.push(item.prize_id);
+			});
+			this.$api.exchange({ record_ids: ids.join(',') }).then(res => {
+				if (res.code === 1) {
+					this.recycleMessage = res.data;
+					this.$refs.recycle.open();
+				}
+			});
 		},
-		methods: {
-			//抽奖结束点击回收触发
-			recycle(prizeInfo){
-				let ids = []
-				prizeInfo.forEach(item=>{
-					ids.push(item.prize_id)
-				})
-				this.$api.exchange({record_ids:ids.join(',')}).then(res=>{
-					if (res.code === 1) {
-						this.recycleMessage = res.data
-						this.$refs.recycle.open()
-					}
-				})
-			},
-			//打开回收结果窗口
-			open(recycleMessage){
-				this.recycleMessage = recycleMessage
-				this.$refs.recycle.open()
-			}
+		//打开回收结果窗口
+		open(recycleMessage) {
+			this.recycleMessage = recycleMessage;
+			this.$refs.recycle.open();
 		}
 	}
+};
 </script>
 
 <style lang="scss">
-	.sure{padding: 10rpx 20rpx;border-radius: 30rpx;font-size: 26rpx;background:-webkit-linear-gradient(0deg, #89f7fe 0%, #66a6ff 100%);color: #fff;width: 200rpx;text-align: center;margin: 0 auto;margin-top: 40rpx;}
-	
+.sure {
+	padding: 10rpx 20rpx;
+	border-radius: 30rpx;
+	font-size: 26rpx;
+	background: -webkit-linear-gradient(0deg, #89f7fe 0%, #66a6ff 100%);
+	color: #fff;
+	width: 200rpx;
+	text-align: center;
+	margin: 0 auto;
+	margin-top: 40rpx;
+}
+
 .recycle {
-	.sure{padding: 10rpx 20rpx;border-radius: 30rpx;font-size: 26rpx;background: -webkit-linear-gradient(0deg, #89f7fe 0%, #66a6ff 100%);color: #fff;width: 200rpx;text-align: center;margin: 0 auto;margin-top: 40rpx;}
+	.sure {
+		padding: 10rpx 20rpx;
+		border-radius: 30rpx;
+		font-size: 26rpx;
+		background: -webkit-linear-gradient(0deg, #89f7fe 0%, #66a6ff 100%);
+		color: #fff;
+		width: 200rpx;
+		text-align: center;
+		margin: 0 auto;
+		margin-top: 40rpx;
+	}
 	width: 640rpx;
 	padding-bottom: 95rpx;
 	position: relative;
-	background: #FFFFFF;
+	background: #ffffff;
 	box-shadow: 0rpx -5rpx 20rpx 0rpx rgba(0, 0, 0, 0.1);
 	border-radius: 30rpx;
 	.recycle_close {
@@ -81,13 +100,13 @@
 		line-height: 100rpx;
 		font-size: 32rpx;
 		font-weight: bold;
-		border-bottom: 2rpx solid #E9E9E9;
+		border-bottom: 2rpx solid #e9e9e9;
 	}
 	.recycle_price {
 		margin: 40rpx 0 0rpx 0;
 		flex-direction: column;
 		text {
-			color: #FA7E48;
+			color: #fa7e48;
 			font-size: 36rpx;
 			font-weight: bold;
 			&:last-child {
@@ -97,6 +116,9 @@
 			}
 		}
 	}
+	.scrolllist {
+		max-height: 500rpx;
+	}
 	.recycle_ul {
 		padding: 0 30rpx;
 		margin: 50rpx 0;
@@ -117,7 +139,7 @@
 				&:last-child {
 					width: 80rpx;
 					text-align: right;
-					color: #FA7E48;
+					color: #fa7e48;
 					font-size: 30rpx;
 				}
 			}
@@ -128,7 +150,5 @@
 		color: #999999;
 		font-size: 26rpx;
 	}
-	
 }
-
 </style>

components/show-result.vue

@@ -17,6 +17,7 @@
 						</view>
 						<image class="one" v-if="prizedata && prizedata.prizeInfo" :src="prizedata.prizeInfo[0].image" mode="widthFix"></image>
 						<text class="colorblack" v-if="prizedata && prizedata.prizeInfo">{{ prizedata.prizeInfo[0].goods_name }}</text>
+						<text class="colorblack" v-if="prizedata && prizedata.prizeInfo">￥{{ prizedata.prizeInfo[0].coin_price }}</text>
 					</view>
 					<!-- 5开or10开 -->
 					<view class="prize_ul" :class="'prize_ul-' + mode" v-else>
@@ -27,7 +28,8 @@
 								<text class="tag-text">{{ tagTextFun(item) }}</text>
 							</view>
 							<image class="two" :src="item.image" mode="widthFix"></image>
-							<text class="a">{{ item.goods_name }}</text>
+							<view class="a">{{ item.goods_name }}</view>
+							<view class="price">￥{{ item.coin_price }}</view>
 						</view>
 						<!-- </scroll-view> -->
 					</view>
@@ -116,14 +118,52 @@ export default {
 		}
 	},
 	methods: {
+		//盒子抖动
+		shake: function(animation) {
+			let time = 0;
+			const duration = 90;
+			for (var i = 0; i < 20; i++) {
+				let rotate = -10;
+				let scaleY = 1.1;
+				if (i % 2 != 0) {
+					rotate = 0;
+					scaleY = 1;
+				}
+				animation
+					.rotate(rotate)
+					.scaleY(scaleY)
+					.step({ duration });
+				time += duration;
+			}
+			return time;
+		},
+		//盒子压缩
+		compress: function(animation) {
+			const duration = 100;
+			animation
+				.translateY('5vh')
+				.scaleY(0.9)
+				.scaleX(1.2)
+				.step({ duration });
+			return duration;
+		},
+		//盒子跳跃
+		jump: function(animation) {
+			const duration = 150;
+			animation
+				.translateY('-50vh')
+				.scaleY(1.1)
+				.scaleX(0.9)
+				.step({ duration });
+			return duration;
+		},
 		open(prizedata) {
 			prizedata.boxImg && (this.boxImg = prizedata.boxImg);
 			//播放音乐
-			this.startAudio();
+			// this.startAudio();
 			//打开结果
 			this.$refs.prize.open();
 			//加载动画
-			// this.openLoading = true
 			this.prizedata = prizedata;
 			this.showAnimation();
 		},
@@ -135,14 +175,20 @@ export default {
 			});
 		},
 		showAnimation() {
+			let animation = uni.createAnimation();
+			this.animationTime += this.shake(animation);
+			this.animationTime += this.compress(animation);
+			this.animationTime += this.jump(animation);
+			this.animation = animation;
 			this.boxAnimation = this.animation.export();
+			console.log(this.animationTime, '动画时长');
 			setTimeout(() => {
-				this.explode = true;
-				this.hideAnimation();
+				// this.explode = true;
+				// this.hideAnimation();
 				if (this.tag != 'normal') {
 					//开启震动
 					try {
-						uni.vibrate({
+						uni.vibrateShort({
 							success: function() {
 								console.log('震动');
 							}
@@ -165,6 +211,9 @@ export default {
 		},
 		//关闭
 		close() {
+			this.animationTime = 0;
+			this.explode = false;
+			this.hide = false;
 			this.$emit('close');
 			this.$refs.prize.close();
 		},
@@ -193,16 +242,16 @@ export default {
 		tagImgFun(prizeInfo) {
 			if (!prizeInfo) return null;
 			if (prizeInfo.tag == 'normal') {
-				return '/pagesA/static/tag-1.png';
+				return 'https://www.chaomangdao.com/image/tag-1.png';
 			}
 			if (prizeInfo.tag == 'rare') {
-				return '/pagesA/static/tag-2.png';
+				return 'https://www.chaomangdao.com/image/tag-2.png';
 			}
 			if (prizeInfo.tag == 'supreme') {
-				return '/pagesA/static/tag-3.png';
+				return 'https://www.chaomangdao.com/image/tag-3.png';
 			}
 			if (prizeInfo.tag == 'legend') {
-				return '/pagesA/static/tag-4.png';
+				return 'https://www.chaomangdao.com/image/tag-4.png';
 			}
 		},
 		recycle() {
@@ -221,53 +270,17 @@ export default {
 		}
 	},
 	created() {
-		let animation = uni.createAnimation();
-		this.animationTime += shake(animation);
-		this.animationTime += compress(animation);
-		this.animationTime += jump(animation);
-		this.animation = animation;
+		// let animation = uni.createAnimation();
+		// this.animationTime = 0;
+		// this.animationTime += shake(animation);
+		// this.animationTime += compress(animation);
+		// this.animationTime += jump(animation);
+		// this.animation = animation;
 	},
-	onLoad() {}
-};
-//盒子抖动
-function shake(animation) {
-	let time = 0;
-	const duration = 90;
-	for (var i = 0; i < 20; i++) {
-		let rotate = -10;
-		let scaleY = 1.1;
-		if (i % 2 != 0) {
-			rotate = 0;
-			scaleY = 1;
-		}
-		animation
-			.rotate(rotate)
-			.scaleY(scaleY)
-			.step({ duration });
-		time += duration;
+	destroyed() {
+		console.log(111);
 	}
-	return time;
-}
-//盒子压缩
-function compress(animation) {
-	const duration = 100;
-	animation
-		.translateY('5vh')
-		.scaleY(0.9)
-		.scaleX(1.2)
-		.step({ duration });
-	return duration;
-}
-//盒子跳跃
-function jump(animation) {
-	const duration = 150;
-	animation
-		.translateY('-30vh')
-		.scaleY(1.1)
-		.scaleX(0.9)
-		.step({ duration });
-	return duration;
-}
+};
 </script>
 
 <style lang="scss">
@@ -278,7 +291,6 @@ function jump(animation) {
 	background-color: #fff;
 }
 .twobox {
-	height: 186rpx;
 	width: 176rpx;
 	border-radius: 13rpx;
 	background-color: #fff;
@@ -335,7 +347,7 @@ function jump(animation) {
 		.prize_footer {
 			width: 100%;
 			&-2 {
-				bottom: -114rpx;
+				bottom: -200rpx;
 			}
 			.btn {
 				height: 84rpx;
@@ -396,20 +408,20 @@ function jump(animation) {
 		margin-bottom: 16rpx;
 		position: relative;
 		width: 176rpx;
-		height: 186rpx;
 		display: flex;
 		flex-direction: column;
 		align-items: center;
 		justify-content: center;
 		display: flex;
-		padding: 8rpx 0;
+		padding: 8rpx;
 		// margin-right: 20rpx;
 		box-sizing: border-box;
 
-		image {
-			margin: 0 auto;
+		.two {
+			width: 176rpx;
+			height: 176rpx;
 		}
-		text {
+		.a {
 			font-size: 24rpx;
 			// font-family: PingFangSC-Medium, PingFang SC;
 			font-weight: 500;
@@ -419,11 +431,32 @@ function jump(animation) {
 			white-space: nowrap;
 			text-overflow: ellipsis;
 		}
+		.price {
+			margin-top: 6rpx;
+			font-size: 24rpx;
+			font-weight: 500;
+			color: #171a20;
+		}
 		.left-top-tag {
+			position: absolute;
+			top: 0;
+			left: 0;
+			z-index: 9999999;
 			width: 3rem;
 			height: 3rem;
+			.tag-img {
+				width: 100%;
+				height: 100%;
+			}
 			.tag-text {
 				font-size: 0.6rem !important;
+				position: absolute;
+				position: absolute;
+				top: 30%;
+				left: 30%;
+				color: #fff !important;
+				width: auto !important;
+				transform: translateX(-50%) translateY(-50%) rotate(-45deg);
 			}
 		}
 	}
@@ -467,10 +500,24 @@ function jump(animation) {
 			color: #171a20;
 		}
 		.left-top-tag {
+			position: absolute;
+			top: -2rpx;
+			left: -2rpx;
+			z-index: 9999999;
 			width: 5rem;
 			height: 5rem;
+			.tag-img {
+				width: 100%;
+				height: 100%;
+			}
 			.tag-text {
 				font-size: 1rem;
+				position: absolute;
+				top: 30%;
+				left: 30%;
+				color: #fff !important;
+				width: auto !important;
+				transform: translateX(-50%) translateY(-50%) rotate(-45deg);
 			}
 		}
 	}
@@ -496,24 +543,24 @@ function jump(animation) {
 		border-radius: 27rpx 27rpx 27rpx 27rpx;
 	}
 }
-.left-top-tag {
-	z-index: 999999;
-	position: absolute;
-	left: -2px;
-	top: -3px;
-	.tag-img {
-		height: 100% !important;
-		width: 100% !important;
-	}
-	.tag-text {
-		position: absolute;
-		top: 30%;
-		left: 30%;
-		color: #fff !important;
-		width: auto !important;
-		transform: translateX(-50%) translateY(-50%) rotate(-45deg);
-	}
-}
+// .left-top-tag {
+// 	z-index: 999999;
+// 	position: absolute;
+// 	left: -2px;
+// 	top: -3px;
+// 	.tag-img {
+// 		height: 100% !important;
+// 		width: 100% !important;
+// 	}
+// 	.tag-text {
+// 		position: absolute;
+// 		top: 30%;
+// 		left: 30%;
+// 		color: #fff !important;
+// 		width: auto !important;
+// 		transform: translateX(-50%) translateY(-50%) rotate(-45deg);
+// 	}
+// }
 .prize_shop_scale {
 	transform: scale(1.3);
 }

http/api.js

@@ -4,7 +4,8 @@ const mobilelogin = (data) => url.post('/api/user/mobilelogin', data);
 const passwordLogin = (data) => url.post('/api/user/login', data);
 const resetpwd = (data) => url.post('/api/user/resetpwd', data);
 const agreement = (data) => url.post('/api/common/agreement', data);
-
+// 提幣開關
+const checkSwitch = (data) => url.get('/api/index/checkSwitch', data);
 // 首页接口
 const getPayKey = (data) => url.post('/api/wechat/getPayKey', data);
 const sumuv = (data) => url.post('/api/index/sumUv', {});
@@ -112,6 +113,7 @@ const boximages = (data) => url.post('/api/index/boximages', data)
 //提交晒图
 const setShai = (data) => url.post('/api/index/setShai', data)
 export default {
+	checkSwitch, //提幣開關
 	sumuv, //统计uv
 	getVgoods, //假数据
 	lunbobox, //最新开盒轮播

main.js

@@ -10,6 +10,6 @@ Vue.prototype.$http = http
 Vue.prototype.$imgDomain = 'http://manghe4.tuana.cn/'
 
 const app = new Vue({
-    ...App
+	...App
 })
 app.$mount()

manifest.json

@@ -50,8 +50,7 @@
 				"androidStyle": "common"
 			}
 		},
-		"nvueCompiler": "uni-app",
-		"renderer": "native"
+		"nvueCompiler": "uni-app"
 	},
 	/* 快应用特有相关 */
 	"quickapp": {},

pages.json

@@ -1,480 +1,477 @@
-{
-	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		{
-			"path": "pages/tabbar/index",
+{
+	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		{
+			"path": "pages/tabbar/index",
 			"style": {
 				// #ifdef H5
 				"navigationStyle": "custom",
-				// #endif
-				"enablePullDownRefresh": false
-			}
-
-		},
-		{
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "uni-app"
-			}
-		},
-		{
-			"path": "pages/index/hot",
-			"style": {
-				"navigationBarTitleText": "盲盒商城"
-			}
-		}, {
-			"path": "pages/index/help",
-			"style": {
-				"navigationBarTitleText": "新手帮助",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/tabbar/cashPay/cashPay",
-			"style": {
-				"navigationBarTitleText": "现金支付",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/index/flow",
-			"style": {
-				"navigationBarTitleText": "发货流程",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/index/redirect",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/index/wechatLogin",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/index/more",
-			"style": {
-				"navigationBarTitleText": "盲盒商城",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/index/details",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
-
-		}, {
-			"path": "pages/tabbar/classify",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
-
-		}, {
-			"path": "pages/login/register",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
-
-		},
-		{
-			"path": "pages/login/login",
-			"style": {
-				"navigationBarTitleText": "登录",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
-
-		},
-		{
-			"path": "pages/login/wxLogin",
-			"style": {
-				"navigationBarTitleText": "登录",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
-
-		},
-		{
-			"path": "pages/login/redirect",
-			"style": {
-				"navigationBarTitleText": "登录",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
-
-		},
-		{
-			"path": "pages/login/phoneLogin",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
-
-		}, {
-			"path": "pages/tabbar/box",
-			"style": {
-				"navigationBarTitleText": "我的盒柜",
-				"enablePullDownRefresh": false
-			}
-
-		}
-
-		, {
-			"path": "pages/tabbar/shai",
-			"style": {
-				"navigationBarTitleText": "晒图",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/tabbar/me",
-			"style": {
+				// #endif
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "uni-app"
+			}
+		},
+		{
+			"path": "pages/index/hot",
+			"style": {
+				"navigationBarTitleText": "盲盒商城"
+			}
+		}, {
+			"path": "pages/index/help",
+			"style": {
+				"navigationBarTitleText": "新手帮助",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/tabbar/cashPay/cashPay",
+			"style": {
+				"navigationBarTitleText": "现金支付",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/flow",
+			"style": {
+				"navigationBarTitleText": "发货流程",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/redirect",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/wechatLogin",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/more",
+			"style": {
+				"navigationBarTitleText": "盲盒商城",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/details",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/tabbar/classify",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/login/register",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		},
+		{
+			"path": "pages/login/login",
+			"style": {
+				"navigationBarTitleText": "登录",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		},
+		{
+			"path": "pages/login/wxLogin",
+			"style": {
+				"navigationBarTitleText": "登录",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		},
+		{
+			"path": "pages/login/redirect",
+			"style": {
+				"navigationBarTitleText": "登录",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		},
+		{
+			"path": "pages/login/phoneLogin",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/tabbar/box",
+			"style": {
+				"navigationBarTitleText": "我的盒柜",
+				"enablePullDownRefresh": false
+			}
+
+		}
+
+		, {
+			"path": "pages/tabbar/shai",
+			"style": {
+				"navigationBarTitleText": "晒图",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/tabbar/me",
+			"style": {
 				"navigationBarTitleText": "我的",
 				// #ifdef H5
 				"navigationStyle": "custom",
-				// #endif
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/me/set",
-			"style": {
-				"navigationBarTitleText": "设置",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/me/address",
-			"style": {
-				"navigationBarTitleText": "收货地址",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/me/addSite",
-			"style": {
+				// #endif
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/me/set",
+			"style": {
+				"navigationBarTitleText": "设置",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/me/address",
+			"style": {
+				"navigationBarTitleText": "收货地址",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/me/addSite",
+			"style": {
 				"navigationBarTitleText": "",
 				// #ifdef H5
 				"navigationStyle": "custom",
 				// #endif
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/me/shaitu",
-			"style": {
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/me/shaitu",
+			"style": {
 				"navigationBarTitleText": "",
 				// #ifdef H5
 				"navigationStyle": "custom",
-				// #endif
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/me/coll",
-			"style": {
-				"navigationBarTitleText": "我的收藏",
-				"enablePullDownRefresh": true
-			}
-
-		}, {
-			"path": "pages/me/applyFaHuo",
-			"style": {
-				"navigationBarTitleText": "申请发货",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/me/record",
-			"style": {
-				"navigationBarTitleText": "开箱记录",
-				"enablePullDownRefresh": true
-			}
-
-		}, {
-			"path": "pages/me/order",
-			"style": {
-				"navigationBarTitleText": "我的订单",
-				"enablePullDownRefresh": true
-			}
-
-		}, {
-			"path": "pages/me/order-details",
-			"style": {
-				"navigationBarTitleText": "详情",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/me/logistics",
-			"style": {
-				"navigationBarTitleText": "物流信息",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/me/deposit",
-			"style": {
-				"navigationBarTitleText": "提现",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/me/goldDeposit",
-			"style": {
-				"navigationBarTitleText": "金币提现",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/me/balance",
-			"style": {
-				"navigationBarTitleText": "我的余额",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/me/out",
-			"style": {
-				"navigationBarTitleText": "转出到钱包",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/me/alipay",
-			"style": {
-				"navigationBarTitleText": "支付宝绑定",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/me/WeChat",
-			"style": {
-				"navigationBarTitleText": "微信绑定",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/me/wallet",
-			"style": {
-				"navigationBarTitleText": "我的钱包",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/me/recharge",
-			"style": {
-				"navigationBarTitleText": "充值",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/index/wfsm",
-			"style": {
-				"navigationBarTitleText": "玩法说明",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/index/search",
-			"style": {
-				"navigationBarTitleText": "搜索",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
-
-		}, {
-			"path": "pages/login/forgetPassword",
-			"style": {
-				"navigationBarTitleText": "忘记密码",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
-
-		},
-		{
-			"path": "pages/index/shopList",
-			"style": {
-				"navigationBarTitleText": "商品列表",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/index/service",
-			"style": {
-				"navigationBarTitleText": "客服咨询",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/index/newBox",
-			"style": {
-				"navigationBarTitleText": "最新开箱",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/index/recommend",
-			"style": {
-				"navigationBarTitleText": "推荐盲盒",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/login/bindPhone",
-			"style": {
-				"navigationBarTitleText": "绑定手机号",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/me/myBox",
-			"style": {
-				"navigationBarTitleText": "我的盒柜",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/index/records",
-			"style": {
-				"navigationBarTitleText": "开盒记录",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/me/passwordRecharge/passwordRecharge",
-			"style": {
-				"navigationBarTitleText": "充值卡密",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/me/carpassList/carpassList",
-			"style": {
-				"navigationBarTitleText": "卡密充值记录",
-				"enablePullDownRefresh": false
-			}
-
-		}
-	],
-	"subPackages": [{
-		"root": "pagesA",
-		"pages": [{
-			"path": "pages/invite",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false,
+				// #endif
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/me/coll",
+			"style": {
+				"navigationBarTitleText": "我的收藏",
+				"enablePullDownRefresh": true
+			}
+
+		}, {
+			"path": "pages/me/applyFaHuo",
+			"style": {
+				"navigationBarTitleText": "申请发货",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/me/record",
+			"style": {
+				"navigationBarTitleText": "开箱记录",
+				"enablePullDownRefresh": true
+			}
+
+		}, {
+			"path": "pages/me/order",
+			"style": {
+				"navigationBarTitleText": "我的订单",
+				"enablePullDownRefresh": true
+			}
+
+		}, {
+			"path": "pages/me/order-details",
+			"style": {
+				"navigationBarTitleText": "详情",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/me/logistics",
+			"style": {
+				"navigationBarTitleText": "物流信息",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/me/deposit",
+			"style": {
+				"navigationBarTitleText": "提现",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/me/goldDeposit",
+			"style": {
+				"navigationBarTitleText": "金币提现",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/me/balance",
+			"style": {
+				"navigationBarTitleText": "我的余额",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/me/out",
+			"style": {
+				"navigationBarTitleText": "转出到钱包",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/me/alipay",
+			"style": {
+				"navigationBarTitleText": "支付宝绑定",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/me/WeChat",
+			"style": {
+				"navigationBarTitleText": "微信绑定",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/me/wallet",
+			"style": {
+				"navigationBarTitleText": "我的钱包",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/me/recharge",
+			"style": {
+				"navigationBarTitleText": "充值",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/wfsm",
+			"style": {
+				"navigationBarTitleText": "玩法说明",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/search",
+			"style": {
+				"navigationBarTitleText": "搜索",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/login/forgetPassword",
+			"style": {
+				"navigationBarTitleText": "忘记密码",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		},
+		{
+			"path": "pages/index/shopList",
+			"style": {
+				"navigationBarTitleText": "商品列表",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/service",
+			"style": {
+				"navigationBarTitleText": "客服咨询",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/newBox",
+			"style": {
+				"navigationBarTitleText": "最新开箱",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/recommend",
+			"style": {
+				"navigationBarTitleText": "推荐盲盒",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/login/bindPhone",
+			"style": {
+				"navigationBarTitleText": "绑定手机号",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/me/myBox",
+			"style": {
+				"navigationBarTitleText": "我的盒柜",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/records",
+			"style": {
+				"navigationBarTitleText": "开盒记录",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/me/passwordRecharge/passwordRecharge",
+			"style": {
+				"navigationBarTitleText": "充值卡密",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/me/carpassList/carpassList",
+			"style": {
+				"navigationBarTitleText": "卡密充值记录",
+				"enablePullDownRefresh": false
+			}
+
+		}
+	],
+	"subPackages": [{
+		"root": "pagesA",
+		"pages": [{
+			"path": "pages/invite",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
 				"backgroundColor": "#F5F6FA",
-				"navigationStyle": "custom"
-			}
-
-		}, {
-			"path": "pages/camera",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
-
-		}, {
-			"path": "pages/user",
-			"style": {
-				"navigationBarTitleText": "用户协议",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/privacy",
-			"style": {
-				"navigationBarTitleText": "隐私协议",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/buyer",
-			"style": {
-				"navigationBarTitleText": "买家须知",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/bannerMessage",
-			"style": {
-				"navigationBarTitleText": "详情",
-				"enablePullDownRefresh": false
-			}
-
-		}]
-	}, {
-		"pages": [{
-			"path": "pages/server",
-			"style": {
-				"navigationBarTitleText": "联系客服",
-				"navigationStyle": "custom",
-				"enablePullDownRefresh": false
-			}
-
-		}],
-		"root": "pagesB"
-	}],
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "盲盒商城",
-		"navigationBarBackgroundColor": "#FFFFFF",
-		"backgroundColor": "#F8F8F8"
-	},
-	"tabBar": {
-		"backgroundColor": "#FFFFFF",
-		"color": "#333333",
-		"selectedColor": "#1030ff",
-		"list": [{
-				"iconPath": "static/image/tabbar/shouyeweixuanzhong@2x.png",
-				"selectedIconPath": "static/image/tabbar/shouyexuanzhong@2x.png",
-				"pagePath": "pages/tabbar/index",
-				"text": "首页"
-			},
-			{
-				"iconPath": "static/image/tabbar/tj_1.png",
-				"selectedIconPath": "static/image/tabbar/tj.png",
-				"pagePath": "pages/index/more",
-				"text": "推荐"
-			},
-			{
-				"iconPath": "static/image/tabbar/huishouweixuanzhong@2x.png",
-				"selectedIconPath": "static/image/tabbar/fenleixuanzhong@2x1.png",
-				"pagePath": "pages/tabbar/box",
-				"text": "盒柜"
-			},
-
-
-			{
-				"iconPath": "static/image/tabbar/fenleiweixuanzhong@2x.png",
-				"selectedIconPath": "static/image/tabbar/fenleixuanzhong@2x.png",
-				"pagePath": "pages/tabbar/shai",
-				"text": "晒图"
-			},
-
-
-
-			{
-				"iconPath": "static/image/tabbar/wodeweixuanzhong@2x.png",
-				"selectedIconPath": "static/image/tabbar/wodeyixuanzhong@2x1.png",
-				"pagePath": "pages/tabbar/me",
-				"text": "我的"
-			}
-		]
-	}
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/camera",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/user",
+			"style": {
+				"navigationBarTitleText": "用户协议",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/privacy",
+			"style": {
+				"navigationBarTitleText": "隐私协议",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/buyer",
+			"style": {
+				"navigationBarTitleText": "买家须知",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/bannerMessage",
+			"style": {
+				"navigationBarTitleText": "详情",
+				"enablePullDownRefresh": false
+			}
+
+		}]
+	}, {
+		"root": "pagesB",
+		"pages": [{
+			"path": "pages/server",
+			"style": {
+				"navigationBarTitleText": "联系客服",
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": false
+			}
+
+		}]
+	}],
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "盲盒商城",
+		"navigationBarBackgroundColor": "#FFFFFF",
+		"backgroundColor": "#F8F8F8"
+	},
+	"tabBar": {
+		"backgroundColor": "#FFFFFF",
+		"color": "#333333",
+		"selectedColor": "#1030ff",
+		"list": [{
+				"iconPath": "static/image/tabbar/shouyeweixuanzhong@2x.png",
+				"selectedIconPath": "static/image/tabbar/shouyexuanzhong@2x.png",
+				"pagePath": "pages/tabbar/index",
+				"text": "首页"
+			},
+			{
+				"iconPath": "static/image/tabbar/tj_1.png",
+				"selectedIconPath": "static/image/tabbar/tj.png",
+				"pagePath": "pages/index/more",
+				"text": "推荐"
+			},
+			{
+				"iconPath": "static/image/tabbar/huishouweixuanzhong@2x.png",
+				"selectedIconPath": "static/image/tabbar/fenleixuanzhong@2x1.png",
+				"pagePath": "pages/tabbar/box",
+				"text": "盒柜"
+			},
+
+
+			{
+				"iconPath": "static/image/tabbar/fenleiweixuanzhong@2x.png",
+				"selectedIconPath": "static/image/tabbar/fenleixuanzhong@2x.png",
+				"pagePath": "pages/tabbar/shai",
+				"text": "晒图"
+			},
+			{
+				"iconPath": "static/image/tabbar/wodeweixuanzhong@2x.png",
+				"selectedIconPath": "static/image/tabbar/wodeyixuanzhong@2x1.png",
+				"pagePath": "pages/tabbar/me",
+				"text": "我的"
+			}
+		]
+	}
 }

pages/login/login.vue

@@ -4,11 +4,9 @@
 			<!-- <text>{{ isPassword ? '密码登录' : '手机快捷登录' }}</text> -->
 			<!-- <text>{{ isPassword ? '如忘记密码可用已注册手机登录' : '未注册过的手机号将自动创建账号' }}</text> -->
 		</view>
-		 <view class="register_ul">
+		<view class="register_ul">
 			<view class="register_li flex">
-				<view class="register_ipt">
-					<input type="number" maxlength="11" v-model="from.mobile" placeholder="请输入手机号" placeholder-style="color:#999999" />
-				</view>
+				<view class="register_ipt"><input type="number" maxlength="11" v-model="from.mobile" placeholder="请输入手机号" placeholder-style="color:#999999" /></view>
 			</view>
 			<view class="register_li flex">
 				<view class="register_ipt">
@@ -17,14 +15,14 @@
 				</view>
 				<view class="code center" v-if="!isPassword" @click="getCode">{{ codeTxt }}</view>
 			</view>
-		</view> 
-		 <view class="register_code" @click="isPassword = !isPassword" v-if="isPassword">验证码登录</view>
-		<button class="register_btn" hover-class="hover-view" @click="submit">登录</button> 
-		 <view class="register_footer center">
+		</view>
+		<view class="register_code" @click="isPassword = !isPassword" v-if="isPassword">验证码登录</view>
+		<button class="register_btn" hover-class="hover-view" @click="submit">登录</button>
+		<view class="register_footer center">
 			<text @click="goPassword">{{ isPassword ? '忘记密码' : '密码登录' }}</text>
 			<text></text>
 			<text @click="goRegister">注册账号</text>
-		</view> 
+		</view>
 		<view class="register_fast center" @click="wxLogin">
 			<text>选择登录方式</text>
 			<image src="/static/image/publice/weixin@3x.png" mode=""></image>
@@ -40,143 +38,146 @@
 </template>
 
 <script>
-	import $DB from '../../http/debounce.js'
-	export default {
-		data() {
-			return {
-				isPassword:false,//是否密码登录
-				isConsent:true,//是否同意
-				flag:true,
-				codeTxt:'获取验证码',
-				sending:true,
-				second:60,
-				disabled:false,
-				from:{
-					mobile:'',//
-					captcha:'',//
-					sharecode:'',
-					password:'',
-					is_channel:""
-				}
-			};
-		},
-		methods:{
-			//微信登录
-			wxLogin () {
-				this.$api.getWechatLoginUrl({redirect:'/h5/#/pages/login/bindPhone?sharecode=' + uni.getStorageSync('sharecode') + '&is_channel=' + uni.getStorageSync('is_channel')}).then(res=>{
+import $DB from '../../http/debounce.js';
+export default {
+	data() {
+		return {
+			isPassword: false, //是否密码登录
+			isConsent: true, //是否同意
+			flag: true,
+			codeTxt: '获取验证码',
+			sending: true,
+			second: 60,
+			disabled: false,
+			from: {
+				mobile: '', //
+				captcha: '', //
+				sharecode: '',
+				password: '',
+				is_channel: ''
+			}
+		};
+	},
+	methods: {
+		//微信登录
+		wxLogin() {
+			this.$api
+				.getWechatLoginUrl({ redirect: '/h5/#/pages/login/bindPhone?sharecode=' + uni.getStorageSync('sharecode') + '&is_channel=' + uni.getStorageSync('is_channel') })
+				.then(res => {
 					if (res.code === 1) {
-						location.href = res.data.url
+						location.href = res.data.url;
 						// uni.setStorageSync('token',res.data.token)
 						// uni.setStorageSync('is_notice',res.data.is_notice)
 						// uni.removeStorageSync('is_channel')
 						// uni.switchTab({url:'/pages/tabbar/index'})
 					}
-				})
-			},
-			//去隐私协议
-			goPrivacy () {
-				uni.navigateTo({url:'/pagesA/pages/privacy'})
-			},
-			//去用户协议
-			goUser () {
-				uni.navigateTo({url:'/pagesA/pages/user'})
-			},
-			//登录
-			submit:$DB(function(){
-				if (!this.from.mobile.match(/^(0|86|17951)?1[3456789]\d{9}$/)) {
-					uni.showToast({
-						title: '请输入正确的手机号',
-						icon:'none'
-					});
-					return
-				}
-				if (!this.from.captcha && !this.isPassword) return uni.showToast({title:'请输入验证码',icon:'none'})
-				if (!this.isConsent) return uni.showToast({title:'请阅读并同意用户和隐私协议',icon:'none'})
-				if (!this.flag) return
-				this.flag = false
-				this.from.is_channel = uni.getStorageSync('is_channel');
-				this.$api[this.isPassword ? 'passwordLogin' : 'mobilelogin']({...this.from,msg:'登录中'}).then(res=>{
-					if(res.data.registerurl){
+				});
+		},
+		//去隐私协议
+		goPrivacy() {
+			uni.navigateTo({ url: '/pagesA/pages/privacy' });
+		},
+		//去用户协议
+		goUser() {
+			uni.navigateTo({ url: '/pagesA/pages/user' });
+		},
+		//登录
+		submit: $DB(function() {
+			if (!this.from.mobile.match(/^(0|86|17951)?1[3456789]\d{9}$/)) {
+				uni.showToast({
+					title: '请输入正确的手机号',
+					icon: 'none'
+				});
+				return;
+			}
+			if (!this.from.captcha && !this.isPassword) return uni.showToast({ title: '请输入验证码', icon: 'none' });
+			if (!this.isConsent) return uni.showToast({ title: '请阅读并同意用户和隐私协议', icon: 'none' });
+			if (!this.flag) return;
+			this.flag = false;
+			this.from.is_channel = uni.getStorageSync('is_channel');
+			this.$api[this.isPassword ? 'passwordLogin' : 'mobilelogin']({ ...this.from, msg: '登录中' })
+				.then(res => {
+					if (res.data.registerurl) {
 						//存在跳转链接
-						location.href = res.data.registerurl
-						return
+						location.href = res.data.registerurl;
+						return;
 					}
 					if (res.code === 1) {
-						uni.setStorageSync('token',res.data.token)
-						uni.setStorageSync('is_notice',res.data.is_notice)
-						uni.removeStorageSync('is_channel')
-						uni.switchTab({url:'/pages/tabbar/index'})
+						uni.setStorageSync('token', res.data.token);
+						uni.setStorageSync('is_notice', res.data.is_notice);
+						uni.removeStorageSync('is_channel');
+						uni.switchTab({ url: '/pages/tabbar/index' });
 					} else {
-						this.flag = true
+						this.flag = true;
 					}
-				}).then(res=>{
-					console.log(res);
 				})
-			}),
-			//验证码登录
-			codeLogin () {
-				uni.navigateTo({url:'/pages/login/phoneLogin'})
-			},
-			//注册账号
-			goRegister () {
-				uni.navigateTo({url:'/pages/login/register'})
-			},
-			//忘记密码
-			goPassword () {
-				if (this.isPassword) {
-					uni.navigateTo({url:'/pages/login/forgetPassword'})
-				} else {
-					this.isPassword = true
-				}
-				
-			},
-			//获取验证码
-			getCode:$DB(function(){
-				if (!this.sending) return
-				if (!this.from.mobile.match(/^(0|86|17951)?1[3456789]\d{9}$/)) {
-					uni.showToast({
-						title: '请输入正确的手机号',
-						icon:'none'
-					});
-					return
-				}
-				this.$api.send({mobile:this.from.mobile,msg:'发送中',event:'login'}).then( res => {
-					this.sending = false;
-					this.disabled = true;
-					if (res.code === 1) {
-						this.timeDown();
-					}
-					uni.showToast({
-						title: res.msg,
-						icon:'none'
-					});
+				.catch(res => {
+					this.flag = true;
 				});
-			}),
-			timeDown(){
-				let result = setInterval( ()=>{
-					--this.second;
-					this.codeTxt = this.second + 'S'
-					if(this.second < 0) {
-						clearInterval(result);
-						this.sending = true;
-						this.disabled = false;
-						this.second = 60;
-						this.codeTxt = '获取验证码'
-					} 
-				}, 1000);
-			},
+		}),
+		//验证码登录
+		codeLogin() {
+			uni.navigateTo({ url: '/pages/login/phoneLogin' });
+		},
+		//注册账号
+		goRegister() {
+			uni.navigateTo({ url: '/pages/login/register' });
+		},
+		//忘记密码
+		goPassword() {
+			if (this.isPassword) {
+				uni.navigateTo({ url: '/pages/login/forgetPassword' });
+			} else {
+				this.isPassword = true;
+			}
 		},
-		onLoad() {
-			if (uni.getStorageSync('sharecode')) {
-				this.from.sharecode = uni.getStorageSync('sharecode')
+		//获取验证码
+		getCode: $DB(function() {
+			if (!this.sending) return;
+			if (!this.from.mobile.match(/^(0|86|17951)?1[3456789]\d{9}$/)) {
+				uni.showToast({
+					title: '请输入正确的手机号',
+					icon: 'none'
+				});
+				return;
 			}
+			this.$api.send({ mobile: this.from.mobile, msg: '发送中', event: 'login' }).then(res => {
+				this.sending = false;
+				this.disabled = true;
+				if (res.code === 1) {
+					this.timeDown();
+				}
+				uni.showToast({
+					title: res.msg,
+					icon: 'none'
+				});
+			});
+		}),
+		timeDown() {
+			let result = setInterval(() => {
+				--this.second;
+				this.codeTxt = this.second + 'S';
+				if (this.second < 0) {
+					clearInterval(result);
+					this.sending = true;
+					this.disabled = false;
+					this.second = 60;
+					this.codeTxt = '获取验证码';
+				}
+			}, 1000);
+		}
+	},
+	onLoad() {
+		if (uni.getStorageSync('sharecode')) {
+			this.from.sharecode = uni.getStorageSync('sharecode');
 		}
 	}
+};
 </script>
 <style>
-	page {
-		background: #FFFFFF;
-	}
+page {
+	background: #ffffff;
+}
 </style>
 <style lang="scss">
 .register {
@@ -201,7 +202,7 @@
 	}
 	.register_li {
 		padding: 40rpx 0;
-		border-bottom: 2rpx solid #DDDDDD;
+		border-bottom: 2rpx solid #dddddd;
 		.register_ipt {
 			flex: 1;
 			input {
@@ -211,7 +212,7 @@
 		}
 		.code {
 			width: 150rpx;
-			color: #4EABFC;
+			color: #4eabfc;
 			font-size: 28rpx;
 		}
 	}
@@ -223,7 +224,7 @@
 	border-radius: 40rpx;
 }
 .register_code {
-	color: #4EABFC;
+	color: #4eabfc;
 	font-size: 28rpx;
 	text-align: right;
 	margin: 30rpx 0 0rpx 0;
@@ -231,15 +232,14 @@
 .register_footer {
 	margin: 50rpx 0 125rpx 0;
 	text {
-		color: #4EABFC;
+		color: #4eabfc;
 		font-size: 26rpx;
 		&:nth-child(2) {
 			width: 1px;
 			height: 25rpx;
 			margin: 0 35rpx;
-			background: #4EABFC;
+			background: #4eabfc;
 		}
-		
 	}
 }
 .register_fast {
@@ -255,8 +255,6 @@
 	}
 }
 .register_consent {
-	
-	
 	margin-top: 50px;
 	/*
 	width: 100%;
@@ -272,7 +270,7 @@
 		margin-right: 10rpx;
 	}
 	.blue {
-		color: #4EABFC;
+		color: #4eabfc;
 	}
 }
 </style>

pages/me/applyFaHuo.vue

@@ -101,33 +101,32 @@ export default {
 			this.$api.applyDelivery({ record_ids: ids.join(','), address_id: this.applyAddress.address_id }).then(res => {
 				if (res.code === 1) {
 					if (res.data.delivery_fee > 0) {
-						if (this.payIndex == 2) {
+						if (this.payIndex == 0) {
+							// #ifdef MP
 							this.$http.post(res.data.wechat).then(res => {
-								if (res.code === 1) {
-									WeixinJSBridge.invoke(
-										'getBrandWCPayRequest',
-										{
-											appId: res.data.appId, //公众号ID，由商户传入
-											timeStamp: res.data.timeStamp, //时间戳，自1970年以来的秒数
-											nonceStr: res.data.nonceStr, //随机串
-											package: res.data.package,
-											signType: res.data.signType, //微信签名方式：
-											paySign: res.data.paySign //微信签名
-										},
-										function(res) {
-											if (res.err_msg == 'get_brand_wcpay_request:ok') {
-												uni.showToast({ title: '支付成功' });
-												setTimeout(() => {
-													uni.redirectTo({ url: '/pages/me/order?type=0' });
-												}, 800);
-											}
-										}
-									);
-								} else if (res.code === 403) {
-								}
+								let da = res.jsConfig;
+								let data = {
+									// #ifdef MP
+									timeStamp: da.timeStamp,
+									// #endif
+									nonceStr: da.nonceStr,
+									package: da.package,
+									signType: da.signType,
+									paySign: da.paySign,
+									success: function(res) {
+										uni.showToast({ title: '支付成功' });
+										setTimeout(() => {
+											uni.redirectTo({ url: '/pages/me/wallet' });
+										}, 800);
+									},
+									fail: () => {
+										uni.showToast({ title: '支付失败' });
+									}
+								};
+								console.log(data);
+								wx.requestPayment(data);
 							});
-						} else {
-							location.href = res.data[this.payIndex == 0 ? 'wechat' : 'alipay'] + '?token=' + uni.getStorageSync('token');
+							// #endif
 						}
 					} else {
 						// 跳转到支付页面

pages/me/deposit.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="deposit">
+	<view class="deposit" v-if="canTi == 1">
 		<view class="deposit_head">
 			<view class="deposit_head_name">提现金额</view>
 			<view class="deposit_head_main">
@@ -13,91 +13,96 @@
 		<view class="deposit_main">
 			<view class="deposit_main_name">选择提现方式</view>
 			<view class="deposit_main_ul">
-				<view class="deposit_main_li flex" v-for="(item,index) in payList" :key="index" @click="changePay(item.type)">
+				<view class="deposit_main_li flex" v-for="(item, index) in payList" :key="index" @click="changePay(item.type)">
 					<view class="deposit_main_img flexs" @click.stop="bindAccount(item.type)">
 						<image :src="item.image" mode=""></image>
-						<text>{{ item.name }}{{ item.account ? '('+ item.account +')' : ' (请绑定)' }}</text>
+						<text>{{ item.name }}{{ item.account ? '(' + item.account + ')' : ' (请绑定)' }}</text>
 					</view>
 					<view class="deposit_main_li_select">
 						<image :src="item.type == payType ? '/static/image/publice/xuanzhong1@2x.png' : '/static/image/publice/weixuanzhong@2x.png'" mode=""></image>
 					</view>
 				</view>
 			</view>
-			<view class="deposit_main_txt"><u-parse :content="message" ></u-parse></view>
+			<view class="deposit_main_txt"><u-parse :content="message"></u-parse></view>
 		</view>
 		<button class="deposit_btn" hover-class="hover-view" @click="submit">提交</button>
 	</view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				message:'',
-				amount:'',//提现金额
-				payType:1,//支付方式
-				payList:[
-					// {
-					// 	name:'微信提现',
-					// 	type:'0',
-					// 	account:'',
-					// 	image:'/static/image/me/weixin@2x.png'
-					// },
-					{
-						name:'支付宝提现',
-						type:'1',
-						account:'',
-						image:'/static/image/me/zhifubao@2x.png'
-					}
-				],//支付列表
-			};
+export default {
+	data() {
+		return {
+			canTi: '',
+			message: '',
+			amount: '', //提现金额
+			payType: 1, //支付方式
+			payList: [
+				// {
+				// 	name:'微信提现',
+				// 	type:'0',
+				// 	account:'',
+				// 	image:'/static/image/me/weixin@2x.png'
+				// },
+				{
+					name: '支付宝提现',
+					type: '1',
+					account: '',
+					image: '/static/image/me/zhifubao@2x.png'
+				}
+			] //支付列表
+		};
+	},
+	methods: {
+		submit() {
+			// return uni.showToast({title:'不支持体现',icon:'none'})
+			if (!this.amount) return uni.showToast({ title: '请输入金额', icon: 'none' });
+			if (!this.payList.find(item => item.type == this.payType).account)
+				return uni.showToast({ title: '请绑定' + (this.payType == 0 ? '微信' : '支付宝') + '账号', icon: 'none' });
+			if (this.amount == 0) return;
+			this.$api.withdrawal({ amount: this.amount, type: this.payType == 0 ? 'wechat' : 'alipay' }).then(res => {
+				if (res.code === 1) {
+					uni.showToast({ title: res.msg });
+					this.amount = '';
+				}
+			});
 		},
-		methods:{
-			submit () {
-        // return uni.showToast({title:'不支持体现',icon:'none'})
-				if (!this.amount) return uni.showToast({title:'请输入金额',icon:'none'})
-				if (!this.payList.find(item => item.type == this.payType).account) return uni.showToast({title:'请绑定' + (this.payType == 0 ?'微信' : '支付宝') +'账号',icon:'none'})
-				if (this.amount == 0) return
-				this.$api.withdrawal({amount:this.amount,type:this.payType == 0 ? 'wechat' : 'alipay'}).then(res=>{
-					if (res.code === 1) {
-						uni.showToast({title:res.msg})
-						this.amount = ''
-					}
-				})
-			},
-			//绑定账号
-			bindAccount (type) {
-				uni.navigateTo({url: '/pages/me/WeChat?type=' + type})
-			},
-			changePay (type) {
-				this.payType = type
-			},
-			//huoqu
-			getAccount () {
-				this.$api.getWithdrawalSetting().then(res=>{
-					if (res.code === 1) {
-						let alipay = this.payList.find(item => item.type == 1)
-						alipay.account = res.data.alipay.account
-						let wechat = this.payList.find(item => item.type == 0)
-						wechat && (wechat.account = res.data.wechat.account)
-					}
-				})
-			},
-			getMessage () {
-				this.$api.agreement({name:'withdrawal_instruction'}).then(res=>{
-					if (res.code === 1) {
-						this.message = res.data.content
-					}
-				})
-			}
+		//绑定账号
+		bindAccount(type) {
+			uni.navigateTo({ url: '/pages/me/WeChat?type=' + type });
 		},
-		onShow() {
-			this.getAccount()
+		changePay(type) {
+			this.payType = type;
 		},
-		onLoad() {
-			this.getMessage()
+		//huoqu
+		getAccount() {
+			this.$api.getWithdrawalSetting().then(res => {
+				if (res.code === 1) {
+					let alipay = this.payList.find(item => item.type == 1);
+					alipay.account = res.data.alipay.account;
+					let wechat = this.payList.find(item => item.type == 0);
+					wechat && (wechat.account = res.data.wechat.account);
+				}
+			});
+		},
+		getMessage() {
+			this.$api.agreement({ name: 'withdrawal_instruction' }).then(res => {
+				if (res.code === 1) {
+					this.message = res.data.content;
+				}
+			});
 		}
+	},
+	onShow() {
+		this.getAccount();
+	},
+	onLoad() {
+		this.getMessage();
+		this.$api.checkSwitch().then(({ data }) => {
+			this.canTi = data;
+		});
 	}
+};
 </script>
 
 <style lang="scss">
@@ -109,7 +114,7 @@
 			padding: 30rpx 0 20rpx 20rpx;
 		}
 		.deposit_head_main {
-			background: #FFFFFF;
+			background: #ffffff;
 			padding: 30rpx 30rpx 58rpx 20rpx;
 			.deposit_head_txt {
 				font-size: 28rpx;
@@ -117,13 +122,13 @@
 			}
 			.deposit_head_ipt {
 				padding: 20rpx 0;
-				border-bottom: 2rpx solid #EBEBEB;
+				border-bottom: 2rpx solid #ebebeb;
 				text {
 					font-size: 36rpx;
 					margin-right: 20rpx;
 				}
 				input {
-					color: #F6AF32;
+					color: #f6af32;
 					font-size: 36rpx;
 				}
 			}
@@ -136,7 +141,7 @@
 		padding: 50rpx 0 30rpx 20rpx;
 	}
 	.deposit_main_ul {
-		background: #FFFFFF;
+		background: #ffffff;
 		.deposit_main_li {
 			padding: 30rpx 20rpx;
 			.deposit_main_img {
@@ -164,7 +169,7 @@
 	color: #333333;
 	font-size: 30rpx;
 	margin-top: 150rpx;
-	background: #FFFFFF;
+	background: #ffffff;
 	box-shadow: 0rpx 0rpx 12rpx 0rpx rgba(220, 220, 220, 0.2);
 	border-radius: 20rpx;
 }

pages/me/shaitu.vue

@@ -1,110 +1,121 @@
 <template>
 	<view class="shaitu">
-		<!-- <view class="shaitu_head flex">
+		<view v-if="canTi == 1">
+			<!-- <view class="shaitu_head flex">
 			<image src="/static/image/publice/fanhui@2x.png" mode="" @click="retutnTop"></image>
 			<text>提交晒图</text>
 			<view></view>
 		</view> -->
-		<view class="shaitu_ul">
-			<view class="shaitu_li">
-				<view class="shaitu_name">描述</view>
-				<view class="shaitu_ipt shaitu_ipts flex">
-					<textarea placeholder="请输入描述" v-model="formData.box_zw" placeholder-style="color:#999999" maxlength="-1"></textarea>
+			<view class="shaitu_ul">
+				<view class="shaitu_li">
+					<view class="shaitu_name">描述</view>
+					<view class="shaitu_ipt shaitu_ipts flex">
+						<textarea placeholder="请输入描述" v-model="formData.box_zw" placeholder-style="color:#999999" maxlength="-1"></textarea>
+					</view>
+				</view>
+				<view class="shaitu_li">
+					<view class="shaitu_name">图片</view>
+					<uni-file-picker
+						v-model="imageValue"
+						file-mediatype="image"
+						mode="grid"
+						file-extname="png,jpg,jpeg"
+						:limit="3"
+						@success="success"
+						@fail="fail"
+						@select="selectImg"
+					/>
 				</view>
 			</view>
-			<view class="shaitu_li">
-				<view class="shaitu_name">图片</view>
-				<uni-file-picker
-					v-model="imageValue"  
-					file-mediatype="image"
-					mode="grid"
-					file-extname="png,jpg,jpeg"
-					:limit="3"
-					@success="success" 
-					@fail="fail" 
-					@select="selectImg"
-				/>
-			</view>
+			<button class="shaitu_btn" hover-class="hover-view" @click="submit">提交晒图</button>
 		</view>
-		<button class="shaitu_btn" hover-class="hover-view" @click="submit">提交晒图</button>
+		<view class="jjqd" v-else>敬请期待</view>
 	</view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				formData: {
-					token: uni.getStorageSync('token'),
-					box_zw: '',
-					box_img:'',
-				},
-				imageValue: [],
-				flag:true,//
-				shaitu:'',
-			};
-		},
-		methods:{
-			retutnTop () {
-				uni.navigateBack()
+export default {
+	data() {
+		return {
+			canTi: '',
+			formData: {
+				token: uni.getStorageSync('token'),
+				box_zw: '',
+				box_img: ''
 			},
-			//选择图片
-			selectImg(imgList){
-				this.imageValue.push(...imgList.tempFiles)
-			},
-			async submit () {
-				if (!this.flag) return
-				if (!this.formData.box_zw) return uni.showToast({title:'请输入描述',icon:'none'})
-				if (!this.imageValue || this.imageValue.length < 1) return uni.showToast({title:'请上传图片',icon:'none'})
-				//上传图片
-				let imgUrlList = []
-				for(let i = 0 ; i < this.imageValue.length ; i++){
-					const img = this.imageValue[i]
-					const res = await this.$api.upload_image({path: img.path})
-					imgUrlList.push(res.url)
-				}
-				this.formData.box_img = imgUrlList.join(",")
-				this.flag = false
-				uni.showLoading({title:'数据提交中'})
-				this.$api.setShai(this.formData).then(res=>{
-					uni.hideLoading()
-					if (res.code === 1) {
-						uni.showToast({title: '提交成功！'})
-						setTimeout(()=>{
-							this.retutnTop()
-						}, 800)
-					} else {
-						this.flag = true
-					}
-				})
-			}
+			imageValue: [],
+			flag: true, //
+			shaitu: ''
+		};
+	},
+	methods: {
+		retutnTop() {
+			uni.navigateBack();
+		},
+		//选择图片
+		selectImg(imgList) {
+			this.imageValue.push(...imgList.tempFiles);
 		},
-		onLoad () {
+		isti() {
+			this.$api.checkSwitch().then(({ data }) => {
+				this.canTi = data;
+				if (data == 0) {
+					this.tabs = ['提现', '团队', '推广'];
+				}
+			});
 		},
-		onShow() {
+		async submit() {
+			if (!this.flag) return;
+			if (!this.formData.box_zw) return uni.showToast({ title: '请输入描述', icon: 'none' });
+			if (!this.imageValue || this.imageValue.length < 1) return uni.showToast({ title: '请上传图片', icon: 'none' });
+			//上传图片
+			let imgUrlList = [];
+			for (let i = 0; i < this.imageValue.length; i++) {
+				const img = this.imageValue[i];
+				const res = await this.$api.upload_image({ path: img.path });
+				imgUrlList.push(res.url);
+			}
+			this.formData.box_img = imgUrlList.join(',');
+			this.flag = false;
+			uni.showLoading({ title: '数据提交中' });
+			this.$api.setShai(this.formData).then(res => {
+				uni.hideLoading();
+				if (res.code === 1) {
+					uni.showToast({ title: '提交成功！' });
+					setTimeout(() => {
+						this.retutnTop();
+					}, 800);
+				} else {
+					this.flag = true;
+				}
+			});
 		}
-	}
+	},
+	onLoad() {
+		this.isti();
+	},
+	onShow() {}
+};
 </script>
 
 <style lang="scss">
-	.shaitu_head {
-		width: 100%;
-		height: 88rpx;
-		padding: 0 30rpx;
-		background: #FFFFFF;
-		image {
-			width: 44rpx;
-			height: 44rpx;
-		}
-		text {
-			font-size: 36rpx;
-			font-weight: bold;
-		}
+.shaitu_head {
+	width: 100%;
+	height: 88rpx;
+	padding: 0 30rpx;
+	background: #ffffff;
+	image {
+		width: 44rpx;
+		height: 44rpx;
 	}
+	text {
+		font-size: 36rpx;
+		font-weight: bold;
+	}
+}
 .shaitu_ul {
 	padding: 20rpx 30rpx 0 30rpx;
 	.shaitu_li {
-		
 		.shaitu_name {
 			font-size: 30rpx;
 			font-weight: bold;
@@ -113,7 +124,7 @@
 		.shaitu_ipt {
 			height: 80rpx;
 			padding: 0 30rpx;
-			background: #FFFFFF;
+			background: #ffffff;
 			border-radius: 10rpx;
 			input {
 				font-size: 28rpx;
@@ -137,11 +148,17 @@
 	height: 98rpx;
 	color: #333333;
 	margin: 20rpx auto;
-	
+
 	font-size: 30rpx;
 	font-weight: bold;
-	background: #FFFFFF;
+	background: #ffffff;
 	box-shadow: 0rpx 0rpx 121rpx 0rpx rgba(63, 52, 2, 0.12);
 	border-radius: 10rpx;
 }
+.jjqd {
+	margin-top: 50rpx;
+	text-align: center;
+	color: #000000;
+	font-size: 52rpx;
+}
 </style>

pages/tabbar/index.vue

@@ -153,7 +153,7 @@
 		</view>
 		<uni-popup ref="num-popup" type="bottom" :mask-click="false">
 			<view class="num-popup">
-				<view class="popup-close" @click="closeNumPopup"><image src="/static/image/home/guanbi@2x.png" mode=""></image></view>
+				<view class="popup-close" @click="closeNumPopup"><image src="https://www.chaomangdao.com/image/home/guanbi@2x.png" mode=""></image></view>
 				<view class="num-button-group">
 					<view class="num-button" @click="createOder(1)">
 						<image src="../../static/image/new_home/btn-1.png" mode="widthFix"></image>
@@ -179,7 +179,7 @@
 		</uni-popup>
 		<uni-popup ref="regulation" :mask-click="false">
 			<view class="regulation">
-				<view class="regulation_close" @click="$refs.regulation.close()"><image src="/static/image/home/guanbi@2x.png" mode=""></image></view>
+				<view class="regulation_close" @click="$refs.regulation.close()"><image src="https://www.chaomangdao.com/image/home/guanbi@2x.png" mode=""></image></view>
 				<view class="regulation_name">玩法规则</view>
 				<view class="regulation_main">
 					<scroll-view scroll-y="true" class="scroll-view"><u-parse :content="message"></u-parse></scroll-view>
@@ -188,7 +188,7 @@
 		</uni-popup>
 		<uni-popup ref="regulation_1" :mask-click="false">
 			<view class="regulation_1">
-				<view class="regulation_close" @click="$refs.regulation_1.close()"><image src="/static/image/home/guanbi@2x.png" mode=""></image></view>
+				<view class="regulation_close" @click="$refs.regulation_1.close()"><image src="https://www.chaomangdao.com/image/home/guanbi@2x.png" mode=""></image></view>
 				<view class="regulation_name">买家须知</view>
 				<view class="regulation_main">
 					<scroll-view scroll-y="true" class="scroll-view"><u-parse :content="mjxz"></u-parse></scroll-view>
@@ -222,6 +222,33 @@ innerAudioContext.autoplay = true;
 innerAudioContext.loop = true;
 // innerAudioContext.src = '/static/image/home/bj.mp3';
 export default {
+	// #ifdef MP
+	onShareAppMessage: function(res) {
+		console.log(res);
+		console.log('是否从按钮进入');
+		if (res.from === 'button' || res.from === 'menu') {
+			// 来自页面内分享按钮
+			let pages = getCurrentPages();
+			// 获取当前页面
+			let page = pages[pages.length - 1];
+			let path = '/' + page.route + '?';
+			// 保存传值
+			for (let i in page.options) {
+				path += i + '=' + page.options[i] + '&';
+			}
+			// 保存邀请人
+			path += 'spread=' + this.userInfo.uid;
+			let data = {
+				path: path,
+				imageUrl: 'https://www.chaomangdao.com/image/logo.png',
+				title: this.userInfo.nickname + '邀请您进入潮盲岛'
+			};
+			return data;
+		} else {
+			console.log('else');
+		}
+	},
+	// #endif
 	components: {
 		payment,
 		showResult,

pages/tabbar/me.vue

@@ -28,7 +28,7 @@
 				<view class="grxxtb-bottom-item" @click="toMyBox()">
 					<view class="grxxtb-bottom-item-bg"><image src="../../static/image/tabbar/baobei.png" mode=""></image></view>
 					<view class="grxxtb-bottom-item-font">宝贝数</view>
-					<view class="grxxtb-bottom-item-font">0</view>
+					<view class="grxxtb-bottom-item-font">{{ bbs }}</view>
 				</view>
 			</view>
 		</view>
@@ -159,7 +159,8 @@ export default {
 					url: '/pages/me/set'
 				}
 			],
-			info: {} //个人信息
+			info: {}, //个人信息
+			bbs: 0
 		};
 	},
 	methods: {
@@ -218,10 +219,17 @@ export default {
 				.catch(res => {
 					console.log(res);
 				});
+		},
+		getbbs() {
+			this.$api.myBox({ status: 1, page: 1, msg: '数据加载中' }).then(res => {
+				console.log(res, '123456');
+				this.bbs = res.data.total;
+			});
 		}
 	},
 	onShow() {
 		this.getInfo();
+		this.getbbs();
 	}
 };
 </script>

pages/tabbar/shai.vue

@@ -1,194 +1,196 @@
 <template>
 	<view class="box">
-		<view class="box_ul">
-			<view class="box_ul_li " v-for="(item,index) in boxList" :key="index"  @click="item.flag = !item.flag">
-			<view class="s-bt flex">
-			<view class="s-tx">	<image :src="item.box_tx" mode="aspectFill"></image>
-			</view>
-				<view class="s-mc">{{ item.box_mc}}</view>
-					<!-- <view class="s-sj">{{ item.box_sj}}</view> -->
-					<view class="s-sj">{{ item.box_sj }}</view>
-			<view class="s-qc"></view>
-			</view>
-			<view class="s-zw">{{ item.box_zw}}</view>
-			<view class="s-img-list ">
-			<view class="s-img-box" v-for="(item2,index) in item.box_img" :key="index"  @click="item.flag = !item.flag">
-				<image :src="item2" mode="aspectFill" @click="lookImg(item2)"></image>
+		<view v-if="canTi == 1">
+			<view class="box_ul">
+				<view class="box_ul_li " v-for="(item, index) in boxList" :key="index" @click="item.flag = !item.flag">
+					<view class="s-bt flex">
+						<view class="s-tx"><image :src="item.box_tx" mode="aspectFill"></image></view>
+						<view class="s-mc">{{ item.box_mc }}</view>
+						<!-- <view class="s-sj">{{ item.box_sj}}</view> -->
+						<view class="s-sj">{{ item.box_sj }}</view>
+						<view class="s-qc"></view>
+					</view>
+					<view class="s-zw">{{ item.box_zw }}</view>
+					<view class="s-img-list ">
+						<view class="s-img-box" v-for="(item2, index) in item.box_img" :key="index" @click="item.flag = !item.flag">
+							<image :src="item2" mode="aspectFill" @click="lookImg(item2)"></image>
+						</view>
+						<view class="s-qc"></view>
+					</view>
 				</view>
-			 	<view class="s-qc"></view>
-			</view>
 			</view>
+			<div class="shai-btn" @click="shaitu()"><image src="/static/image/new_home/shaitu.png" mode="widthFix"></image></div>
 		</view>
-		<div class="shai-btn" @click="shaitu()">
-			<image src="/static/image/new_home/shaitu.png" mode="widthFix"></image>
-		</div>
+		<view class="jjqd" v-else>敬请期待</view>
 	</view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				i:0,//
-				page:1,
-				isAll:false,//
-				pages:null,//
-				totalNumber:0,//总数量
-				boxList:[],//盒子列表
-			};
-		},
-		watch:{
-			boxList:{
-				handler(val){
-					let totalNumber = 0
-					
-					this.isAll = val.every(item=>item.flag)
-					if (val.length == 0) this.isAll = false
-					val.forEach(item=>{
-						if (item.flag) {
-							totalNumber++
-						}
-					})
-					this.totalNumber = totalNumber
-				},
-				deep:true //true 深度监听
-			}
-		},
-		methods:{
-			lookImg (url) {
-				uni.previewImage({
-						urls: [url],
-						longPressActions: {
-								itemList: ['发送给朋友', '保存图片', '收藏'],
-								success: function(data) {
-										console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
-								},
-								fail: function(err) {
-										console.log(err.errMsg);
-								}
-						}
+export default {
+	data() {
+		return {
+			canTi: '',
+			i: 0, //
+			page: 1,
+			isAll: false, //
+			pages: null, //
+			totalNumber: 0, //总数量
+			boxList: [] //盒子列表
+		};
+	},
+	watch: {
+		boxList: {
+			handler(val) {
+				let totalNumber = 0;
+
+				this.isAll = val.every(item => item.flag);
+				if (val.length == 0) this.isAll = false;
+				val.forEach(item => {
+					if (item.flag) {
+						totalNumber++;
+					}
 				});
+				this.totalNumber = totalNumber;
 			},
-			//获取晒图集合
-			getShaiList () {
-				this.$api.sList({status:this.i + 1,page: this.page, msg:'数据加载中'}).then(res=>{
-					if (res.code === 1) {
-						res.data.data.forEach(item=>{
-							item.flag = false
-						})
-						this.pages = res.data.last_page
-						this.boxList = this.page == 1 ? res.data.data : [...this.boxList,...res.data.data]
+			deep: true //true 深度监听
+		}
+	},
+	methods: {
+		lookImg(url) {
+			uni.previewImage({
+				urls: [url],
+				longPressActions: {
+					itemList: ['发送给朋友', '保存图片', '收藏'],
+					success: function(data) {
+						console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+					},
+					fail: function(err) {
+						console.log(err.errMsg);
 					}
-				})
-			},
-			shaitu(){
-				uni.navigateTo({url:'/pages/me/shaitu'})
-			}
+				}
+			});
 		},
-		onShow () {
-			this.getShaiList()
+		//获取晒图集合
+		getShaiList() {
+			this.$api.sList({ status: this.i + 1, page: this.page, msg: '数据加载中' }).then(res => {
+				if (res.code === 1) {
+					res.data.data.forEach(item => {
+						item.flag = false;
+					});
+					this.pages = res.data.last_page;
+					this.boxList = this.page == 1 ? res.data.data : [...this.boxList, ...res.data.data];
+				}
+			});
+			this.$api.checkSwitch().then(({ data }) => {
+				this.canTi = data;
+			});
 		},
-		onReachBottom() {
-			console.log(121)
-			if (this.page < this.pages) {
-				this.page++
-				this.getShaiList()
-			}
+		shaitu() {
+			uni.navigateTo({ url: '/pages/me/shaitu' });
+		},
+		isti() {
+			this.$api.checkSwitch().then(({ data }) => {
+				this.canTi = data;
+				if (data == 0) {
+					this.tabs = ['提现', '团队', '推广'];
+				}
+			});
+		}
+	},
+	onShow() {
+		this.isti();
+		this.getShaiList();
+	},
+	onReachBottom() {
+		console.log(121);
+		if (this.page < this.pages) {
+			this.page++;
+			this.getShaiList();
 		}
 	}
+};
 </script>
 
 <style lang="scss">
-	
-	.shai-btn{
-		position: fixed;
-		bottom: 70px;
-		right: 10px;
-		$size: 70rpx;
-		width: $size;
-		height: $size;
-		border-radius: 50%;
-	}
-	
-	.s-bt { display: block;}
-	.s-tx{ height:80rpx; 
+.shai-btn {
+	position: fixed;
+	bottom: 70px;
+	right: 10px;
+	$size: 70rpx;
+	width: $size;
+	height: $size;
+	border-radius: 50%;
+}
+
+.s-bt {
+	display: block;
+}
+.s-tx {
+	height: 80rpx;
 	width: 80rpx;
 	float: left;
 	image {
-		border-radius: 40rpx; 
-		
-		
+		border-radius: 40rpx;
 	}
-	 
-	 }
-	 
-	 .s-mc {
-		 float: left;
-		 line-height: 80rpx; padding-left: 30rpx;
-		 font-size: 26rpx;
-		 
-	 }
-	 .s-sj {
-		 float: right;
-		  line-height: 80rpx;
-		  padding-right:10rpx; color:#999;
-	 }
-	 .s-qc {
-		 clear: both;
-	 }
-	 
-	 
-	 .s-zw {
-		 padding: 20rpx 0;
-		     -webkit-box-pack: justify;
-		     -webkit-justify-content: space-between;
-		     justify-content: space-between;
-		     color: var(--mainColor);
-		     font-size: 16px;
-		     text-align: justify;
-			 line-height: 1.6;
-		 
-	 }
-	 
-	 
-	 
-	 
-	 
-	 .s-img-box {
-	 	float: left;
-		
-	
-		
-		
-		image {
-			width: 190rpx;
-			height: 120rpx;
-			margin-bottom: 16rpx;
-			margin-left:16rpx;
-		}
-		text {
-			color: #000000;
-			font-size: 26rpx;
-		}
-		
-		
-		}
-	
+}
+
+.s-mc {
+	float: left;
+	line-height: 80rpx;
+	padding-left: 30rpx;
+	font-size: 26rpx;
+}
+.s-sj {
+	float: right;
+	line-height: 80rpx;
+	padding-right: 10rpx;
+	color: #999;
+}
+.s-qc {
+	clear: both;
+}
+
+.s-zw {
+	padding: 20rpx 0;
+	-webkit-box-pack: justify;
+	-webkit-justify-content: space-between;
+	justify-content: space-between;
+	color: var(--mainColor);
+	font-size: 16px;
+	text-align: justify;
+	line-height: 1.6;
+}
+
+.s-img-box {
+	float: left;
+
+	image {
+		width: 190rpx;
+		height: 120rpx;
+		margin-bottom: 16rpx;
+		margin-left: 16rpx;
+	}
+	text {
+		color: #000000;
+		font-size: 26rpx;
+	}
+}
+
 .box_head {
 	position: sticky;
 	top: 88rpx;
 	left: 0;
-	background: #FAFAFA;
+	background: #fafafa;
 	z-index: 2021;
 	width: 100%;
 	.box_head_li {
-		flex:1 ;
+		flex: 1;
 		font-size: 30rpx;
 		height: 90rpx;
 		font-weight: bold;
 	}
 	.active {
-		color: #F6AF32;
+		color: #f6af32;
 	}
 }
 .box_ul {
@@ -196,7 +198,7 @@
 	.box_ul_li {
 		padding: 30rpx;
 		margin-bottom: 20rpx;
-		background: #FFFFFF;
+		background: #ffffff;
 		border-radius: 20rpx;
 		.box_ul_li_img {
 			image {
@@ -218,7 +220,7 @@
 		}
 		.box_ul_li_price {
 			text {
-				color: #CF271B;
+				color: #cf271b;
 				font-size: 28rpx;
 			}
 			image {
@@ -240,7 +242,7 @@
 	bottom: 50px;
 	width: 100%;
 	padding: 0 30rpx;
-	background: #FFFFFF;
+	background: #ffffff;
 	.box_footer_all {
 		image {
 			width: 44rpx;
@@ -253,18 +255,24 @@
 		}
 	}
 	.box_footer_li {
-		color: #FFFFFF;
+		color: #ffffff;
 		width: 220rpx;
 		height: 78rpx;
 		border-radius: 39rpx;
 		font-size: 30rpx;
 		margin-left: 30rpx;
 		&:first-child {
-			background: #FA7E48;
+			background: #fa7e48;
 		}
 		&:last-child {
-			background: #F6AF32;
+			background: #f6af32;
 		}
 	}
 }
+.jjqd {
+	margin-top: 50rpx;
+	text-align: center;
+	color: #000000;
+	font-size: 52rpx;
+}
 </style>

pagesA/pages/invite.vue

@@ -21,7 +21,7 @@
 			:lineScale="0.15"
 		></v-tabs>
 		<swiper class="swiper" circular :current="current" @change="swiperChange">
-			<swiper-item>
+			<swiper-item v-if="canTi == 1">
 				<view class="coin-swiper">
 					<view class="total-coin-view flex" style="justify-content: flex-start;align-items: flex-end;">
 						<view class="">
@@ -156,6 +156,7 @@ export default {
 		return {
 			info: {},
 			current: 0,
+			canTi: '',
 			tabs: ['佣金', '提现', '团队', '推广'],
 			totalIn: 0,
 			withd: 0, //已提现
@@ -179,12 +180,21 @@ export default {
 			this.totalIn = data.data.total;
 			this.withd = data.data.dw;
 		});
+		this.isti();
 		this.loadRetailList();
 		this.loadTeamList();
 		this.loadTixianList();
 		this.getInfo();
 	},
 	methods: {
+		isti() {
+			this.$api.checkSwitch().then(({ data }) => {
+				this.canTi = data;
+				if (data == 0) {
+					this.tabs = ['提现', '团队', '推广'];
+				}
+			});
+		},
 		toDeposit() {
 			uni.navigateTo({ url: '/pages/me/deposit' });
 		},
@@ -386,7 +396,6 @@ export default {
 }
 page {
 	background-color: #f5f6fa;
-
 }
 $swiperH: calc(100vh - 70rpx - 44px);
 .invite {

unpackage/dist/build/mp-weixin/components/goods-detail.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/goods-detail"],{"49e1":function(n,e,t){"use strict";t.r(e);var o=t("9beb"),i=t.n(o);for(var u in o)"default"!==u&&function(n){t.d(e,n,(function(){return o[n]}))}(u);e["default"]=i.a},"800d":function(n,e,t){"use strict";var o=t("9920"),i=t.n(o);i.a},9920:function(n,e,t){},"9beb":function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={name:"payment",props:{boxId:Number},data:function(){return{goods:{},rate:{},boxDetail:{}}},methods:{open:function(n,e){this.goods=n,this.rate=e||{},this.$refs["more-detail"].open()},lookImg:function(){n.previewImage({urls:[this.goods.image],longPressActions:{itemList:["发送给朋友","保存图片","收藏"],success:function(n){console.log("选中了第"+(n.tapIndex+1)+"个按钮,第"+(n.index+1)+"张图片")},fail:function(n){console.log(n.errMsg)}}})},getDetails:function(){var n=this;this.$api.boxDetail({box_id:this.boxId}).then((function(e){1===e.code&&(n.boxDetail=e.data,n.record3=e.data.record.slice(0,3),console.log(n.boxDetail))}))}}};e.default=t}).call(this,t("543d")["default"])},d6ea:function(n,e,t){"use strict";t.r(e);var o=t("ea2f"),i=t("49e1");for(var u in i)"default"!==u&&function(n){t.d(e,n,(function(){return i[n]}))}(u);t("800d");var a,r=t("f0c5"),c=Object(r["a"])(i["default"],o["b"],o["c"],!1,null,null,null,!1,o["a"],a);e["default"]=c.exports},ea2f:function(n,e,t){"use strict";t.d(e,"b",(function(){return i})),t.d(e,"c",(function(){return u})),t.d(e,"a",(function(){return o}));var o={uniPopup:function(){return t.e("uni_modules/uni-popup/components/uni-popup/uni-popup").then(t.bind(null,"450c"))}},i=function(){var n=this,e=n.$createElement;n._self._c;n._isMounted||(n.e0=function(e){return n.$refs["more-detail"].close()})},u=[]}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/goods-detail"],{"49e1":function(n,t,e){"use strict";e.r(t);var o=e("9beb"),i=e.n(o);for(var u in o)"default"!==u&&function(n){e.d(t,n,(function(){return o[n]}))}(u);t["default"]=i.a},"800d":function(n,t,e){"use strict";var o=e("9920"),i=e.n(o);i.a},9920:function(n,t,e){},"9beb":function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e={name:"payment",props:{boxId:Number},data:function(){return{goods:{},rate:{},boxDetail:{}}},methods:{open:function(n,t){this.goods=n,this.rate=t||{},this.$refs["more-detail"].open()},lookImg:function(){n.previewImage({urls:[this.goods.image],longPressActions:{itemList:["发送给朋友","保存图片","收藏"],success:function(n){console.log("选中了第"+(n.tapIndex+1)+"个按钮,第"+(n.index+1)+"张图片")},fail:function(n){console.log(n.errMsg)}}})},getDetails:function(){var n=this;this.$api.boxDetail({box_id:this.boxId}).then((function(t){1===t.code&&(n.boxDetail=t.data,n.record3=t.data.record.slice(0,3),console.log(n.boxDetail))}))}}};t.default=e}).call(this,e("543d")["default"])},d6ea:function(n,t,e){"use strict";e.r(t);var o=e("f383"),i=e("49e1");for(var u in i)"default"!==u&&function(n){e.d(t,n,(function(){return i[n]}))}(u);e("800d");var r,a=e("f0c5"),c=Object(a["a"])(i["default"],o["b"],o["c"],!1,null,null,null,!1,o["a"],r);t["default"]=c.exports},f383:function(n,t,e){"use strict";e.d(t,"b",(function(){return i})),e.d(t,"c",(function(){return u})),e.d(t,"a",(function(){return o}));var o={uniPopup:function(){return e.e("uni_modules/uni-popup/components/uni-popup/uni-popup").then(e.bind(null,"450c"))}},i=function(){var n=this,t=n.$createElement,e=(n._self._c,n.__map(n.goods.xiangqing,(function(t,e){var o=n.__get_orig(t),i=t.indexOf("http");return{$orig:o,g0:i}})));n._isMounted||(n.e0=function(t){return n.$refs["more-detail"].close()}),n.$mp.data=Object.assign({},{$root:{l0:e}})},u=[]}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'components/goods-detail-create-component',
     {

unpackage/dist/build/mp-weixin/components/goods-detail.wxml

@@ -1 +1 @@
-<uni-popup class="vue-ref" vue-id="c8558ffa-1" type="bottom" mask-click="{{false}}" height="30px" data-ref="more-detail" bind:__l="__l" vue-slots="{{['default']}}"><view class="more-detail"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="more-detail-close" bindtap="__e"><image src="https://chaomd.liuniu946.com/image/home/guanbi@2x.png" mode></image></view><view class="more-detail-head">商品详情</view><view class="content"><view>{{goods.goods_name}}</view><view class="props"><view><view class="label">参考价：</view><view class="value">{{"￥"+goods.price}}</view></view><view><view class="label">参考概率：</view><view class="value">{{rate.value}}</view></view></view></view><view class="goods.xiangqing"><block wx:for="{{goods.xiangqing}}" wx:for-item="xq" wx:for-index="__i0__"><image src="{{xq}}" mode="widthFix"></image></block></view></view></uni-popup>
+<uni-popup class="vue-ref" vue-id="c8558ffa-1" type="bottom" mask-click="{{false}}" height="30px" data-ref="more-detail" bind:__l="__l" vue-slots="{{['default']}}"><scroll-view class="scrolllist" scroll-y="true"><view class="more-detail"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="more-detail-close" bindtap="__e"><image src="https://www.chaomangdao.com/image/home/guanbi@2x.png" mode></image></view><view class="more-detail-head">商品详情</view><view class="content"><view>{{goods.goods_name}}</view><view class="props"><view><view class="label">参考价：</view><view class="value">{{"￥"+goods.price}}</view></view><view><view class="label">参考概率：</view><view class="value">{{rate.value}}</view></view></view></view><view class="goods.xiangqing"><block wx:for="{{$root.l0}}" wx:for-item="xq" wx:for-index="__i0__"><image src="{{xq.g0==-1?'https://www.chaomangdao.com'+xq.$orig:xq.$orig}}" mode="widthFix"></image></block></view></view></scroll-view></uni-popup>

unpackage/dist/build/mp-weixin/components/goods-detail.wxss

@@ -1 +1 @@
-.more-detail{max-height:70vh;overflow:auto;background:#fff;border-radius:20rpx 20rpx 0rpx 0rpx;position:relative}.more-detail .more-detail-close{top:30rpx;right:30rpx;width:44rpx;height:44rpx;position:absolute}.more-detail .content{padding:0 50rpx 30rpx 50rpx}.more-detail .more-detail-head{padding:0 50rpx 150rpx 50rpx;text-align:center;font-size:30rpx;font-weight:700;padding:40rpx 0 50rpx 0}.more-detail .props{display:flex;margin:16rpx 0}.more-detail .props > view{display:flex;flex:1;align-items:center}.more-detail .props .label{font-size:28rpx;color:#959595}.more-detail .props .value{margin-left:10rpx;font-size:32rpx;font-weight:700}
+.scrolllist{max-height:70vh}.more-detail{max-height:70vh;background:#fff;border-radius:20rpx 20rpx 0rpx 0rpx;position:relative}.more-detail .more-detail-close{top:30rpx;right:30rpx;width:44rpx;height:44rpx;position:absolute}.more-detail .content{padding:0 50rpx 30rpx 50rpx}.more-detail .more-detail-head{padding:0 50rpx 150rpx 50rpx;text-align:center;font-size:30rpx;font-weight:700;padding:40rpx 0 50rpx 0}.more-detail .props{display:flex;margin:16rpx 0}.more-detail .props > view{display:flex;flex:1;align-items:center}.more-detail .props .label{font-size:28rpx;color:#959595}.more-detail .props .value{margin-left:10rpx;font-size:32rpx;font-weight:700}

unpackage/dist/build/mp-weixin/components/prize-flying.wxml

@@ -1 +1 @@
-<view class="prize-flying"><block wx:for="{{flyLeftList}}" wx:for-item="flyLeft" wx:for-index="index"><view class="{{['fly-prize','fly-left']}}" style="{{'-webkit-animation-duration:'+(flySpeed+'s')+';'+('animation-duration:'+(flySpeed+'s')+';')}}"><image src="{{flyLeft.image}}" mode></image></view></block><block wx:for="{{flyCenterList}}" wx:for-item="flyCenter" wx:for-index="index"><view class="{{['fly-prize','fly-center']}}" style="{{'-webkit-animation-duration:'+(flySpeed+'s')+';'+('animation-duration:'+(flySpeed+'s')+';')}}"><image src="{{flyCenter.image}}" mode></image></view></block><block wx:for="{{flyRightList}}" wx:for-item="flyRight" wx:for-index="index"><view class="{{['fly-prize','fly-right']}}" style="{{'-webkit-animation-duration:'+(flySpeed+'s')+';'+('animation-duration:'+(flySpeed+'s')+';')}}"><image src="{{flyRight.image}}" mode></image></view></block></view>
+<view class="prize-flying"><block wx:for="{{flyLeftList}}" wx:for-item="flyLeft" wx:for-index="index"><view class="{{['fly-prize','fly-left']}}" style="{{'-webkit-animation-duration:'+(flySpeed+'s')+';'+('animation-duration:'+(flySpeed+'s')+';')}}"><image src="{{flyLeft.image}}" mode></image></view></block><block wx:for="{{$root.l0}}" wx:for-item="flyCenter" wx:for-index="index"><view class="{{['fly-prize','fly-center']}}" style="{{'-webkit-animation-duration:'+(flySpeed+'s')+';'+('animation-duration:'+(flySpeed+'s')+';')}}"><image src="{{flyCenter.g0==-1?'https://www.chaomangdao.com'+flyCenter.$orig.image:flyCenter.$orig.image}}" mode></image></view></block><block wx:for="{{$root.l1}}" wx:for-item="flyRight" wx:for-index="index"><view class="{{['fly-prize','fly-right']}}" style="{{'-webkit-animation-duration:'+(flySpeed+'s')+';'+('animation-duration:'+(flySpeed+'s')+';')}}"><image src="{{flyRight.g1==-1?'https://www.chaomangdao.com'+flyRight.$orig.image:flyRight.$orig.image}}" mode></image></view></block></view>

unpackage/dist/build/mp-weixin/components/recycle.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/recycle"],{"1cb6":function(e,n,c){},7657:function(e,n,c){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var t={name:"recycle",data:function(){return{recycleMessage:{}}},methods:{recycle:function(e){var n=this,c=[];e.forEach((function(e){c.push(e.prize_id)})),this.$api.exchange({record_ids:c.join(",")}).then((function(e){1===e.code&&(n.recycleMessage=e.data,n.$refs.recycle.open())}))},open:function(e){this.recycleMessage=e,this.$refs.recycle.open()}}};n.default=t},"7c9a":function(e,n,c){"use strict";var t=c("1cb6"),u=c.n(t);u.a},"977d":function(e,n,c){"use strict";c.d(n,"b",(function(){return u})),c.d(n,"c",(function(){return r})),c.d(n,"a",(function(){return t}));var t={uniPopup:function(){return c.e("uni_modules/uni-popup/components/uni-popup/uni-popup").then(c.bind(null,"450c"))}},u=function(){var e=this,n=e.$createElement;e._self._c;e._isMounted||(e.e0=function(n){return e.$refs.recycle.close()},e.e1=function(n){return e.$refs.recycle.close()})},r=[]},bc06:function(e,n,c){"use strict";c.r(n);var t=c("7657"),u=c.n(t);for(var r in t)"default"!==r&&function(e){c.d(n,e,(function(){return t[e]}))}(r);n["default"]=u.a},e95a:function(e,n,c){"use strict";c.r(n);var t=c("977d"),u=c("bc06");for(var r in u)"default"!==r&&function(e){c.d(n,e,(function(){return u[e]}))}(r);c("7c9a");var o,i=c("f0c5"),a=Object(i["a"])(u["default"],t["b"],t["c"],!1,null,null,null,!1,t["a"],o);n["default"]=a.exports}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/recycle"],{"16bb":function(e,n,c){"use strict";c.d(n,"b",(function(){return u})),c.d(n,"c",(function(){return r})),c.d(n,"a",(function(){return t}));var t={uniPopup:function(){return c.e("uni_modules/uni-popup/components/uni-popup/uni-popup").then(c.bind(null,"450c"))}},u=function(){var e=this,n=e.$createElement;e._self._c;e._isMounted||(e.e0=function(n){return e.$refs.recycle.close()},e.e1=function(n){return e.$refs.recycle.close()})},r=[]},"1cb6":function(e,n,c){},7657:function(e,n,c){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var t={name:"recycle",data:function(){return{recycleMessage:{}}},methods:{recycle:function(e){var n=this,c=[];e.forEach((function(e){c.push(e.prize_id)})),this.$api.exchange({record_ids:c.join(",")}).then((function(e){1===e.code&&(n.recycleMessage=e.data,n.$refs.recycle.open())}))},open:function(e){this.recycleMessage=e,this.$refs.recycle.open()}}};n.default=t},"7c9a":function(e,n,c){"use strict";var t=c("1cb6"),u=c.n(t);u.a},bc06:function(e,n,c){"use strict";c.r(n);var t=c("7657"),u=c.n(t);for(var r in t)"default"!==r&&function(e){c.d(n,e,(function(){return t[e]}))}(r);n["default"]=u.a},e95a:function(e,n,c){"use strict";c.r(n);var t=c("16bb"),u=c("bc06");for(var r in u)"default"!==r&&function(e){c.d(n,e,(function(){return u[e]}))}(r);c("7c9a");var o,i=c("f0c5"),a=Object(i["a"])(u["default"],t["b"],t["c"],!1,null,null,null,!1,t["a"],o);n["default"]=a.exports}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'components/recycle-create-component',
     {

unpackage/dist/build/mp-weixin/components/recycle.wxml

@@ -1 +1 @@
-<uni-popup class="vue-ref" vue-id="f6f2d744-1" mask-click="{{false}}" data-ref="recycle" bind:__l="__l" vue-slots="{{['default']}}"><view class="recycle"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="recycle_close" bindtap="__e"><image src="/static/image/publice/guanbi@2x.png" mode></image></view><view class="recycle_head">提示</view><view class="recycle_price center"><text>{{"￥"+recycleMessage.amount}}</text><text>回收金币</text></view><view class="recycle_ul"><block wx:for="{{recycleMessage.goods_info}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="recycle_ul_li flex"><view class="recycle_ul_li_txt">{{item.name}}</view><view class="recycle_ul_li_r flexs"><text>{{"￥"+item.price}}</text><text>{{"x"+item.num}}</text></view></view></block></view><view class="recycle_txt">回收规则：平台统一回收折扣10，回收金币直接放【我的】 - 【余额】</view><view data-event-opts="{{[['tap',[['e1',['$event']]]]]}}" class="sure" bindtap="__e">确定</view></view></uni-popup>
+<uni-popup class="vue-ref" vue-id="f6f2d744-1" mask-click="{{false}}" data-ref="recycle" bind:__l="__l" vue-slots="{{['default']}}"><view class="recycle"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="recycle_close" bindtap="__e"><image src="/static/image/publice/guanbi@2x.png" mode></image></view><view class="recycle_head">提示</view><view class="recycle_price center"><text>{{"￥"+recycleMessage.amount}}</text><text>回收金币</text></view><scroll-view class="scrolllist" scroll-y="true"><view class="recycle_ul"><block wx:for="{{recycleMessage.goods_info}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="recycle_ul_li flex"><view class="recycle_ul_li_txt">{{item.name}}</view><view class="recycle_ul_li_r flexs"><text>{{"￥"+item.price}}</text><text>{{"x"+item.num}}</text></view></view></block></view></scroll-view><view class="recycle_txt">回收规则：平台统一回收折扣10，回收金币直接放【我的】 - 【余额】</view><view data-event-opts="{{[['tap',[['e1',['$event']]]]]}}" class="sure" bindtap="__e">确定</view></view></uni-popup>

unpackage/dist/build/mp-weixin/components/recycle.wxss

@@ -1 +1 @@
-.sure{padding:10rpx 20rpx;border-radius:30rpx;font-size:26rpx;background:-webkit-linear-gradient(0deg,#89f7fe,#66a6ff);color:#fff;width:200rpx;text-align:center;margin:0 auto;margin-top:40rpx}.recycle{width:640rpx;padding-bottom:95rpx;position:relative;background:#fff;box-shadow:0rpx -5rpx 20rpx 0rpx rgba(0,0,0,.1);border-radius:30rpx}.recycle .sure{padding:10rpx 20rpx;border-radius:30rpx;font-size:26rpx;background:-webkit-linear-gradient(0deg,#89f7fe,#66a6ff);color:#fff;width:200rpx;text-align:center;margin:0 auto;margin-top:40rpx}.recycle .recycle_close{top:20rpx;right:30rpx;width:44rpx;height:44rpx;position:absolute}.recycle .recycle_head{height:100rpx;text-align:center;line-height:100rpx;font-size:32rpx;font-weight:700;border-bottom:2rpx solid #e9e9e9}.recycle .recycle_price{margin:40rpx 0 0rpx 0;flex-direction:column}.recycle .recycle_price text{color:#fa7e48;font-size:36rpx;font-weight:700}.recycle .recycle_price text:last-child{color:#333;margin-top:10rpx;font-size:26rpx}.recycle .recycle_ul{padding:0 30rpx;margin:50rpx 0}.recycle .recycle_ul_li{margin-bottom:30rpx}.recycle .recycle_ul_li:last-child{margin-bottom:0}.recycle .recycle_ul_li .recycle_ul_li_txt{color:#999;font-size:26rpx}.recycle .recycle_ul_li .recycle_ul_li_r text{color:#999;font-size:26rpx}.recycle .recycle_ul_li .recycle_ul_li_r text:last-child{width:80rpx;text-align:right;color:#fa7e48;font-size:30rpx}.recycle .recycle_txt{padding:0 30rpx;color:#999;font-size:26rpx}
+.sure{padding:10rpx 20rpx;border-radius:30rpx;font-size:26rpx;background:-webkit-linear-gradient(0deg,#89f7fe,#66a6ff);color:#fff;width:200rpx;text-align:center;margin:0 auto;margin-top:40rpx}.recycle{width:640rpx;padding-bottom:95rpx;position:relative;background:#fff;box-shadow:0rpx -5rpx 20rpx 0rpx rgba(0,0,0,.1);border-radius:30rpx}.recycle .sure{padding:10rpx 20rpx;border-radius:30rpx;font-size:26rpx;background:-webkit-linear-gradient(0deg,#89f7fe,#66a6ff);color:#fff;width:200rpx;text-align:center;margin:0 auto;margin-top:40rpx}.recycle .recycle_close{top:20rpx;right:30rpx;width:44rpx;height:44rpx;position:absolute}.recycle .recycle_head{height:100rpx;text-align:center;line-height:100rpx;font-size:32rpx;font-weight:700;border-bottom:2rpx solid #e9e9e9}.recycle .recycle_price{margin:40rpx 0 0rpx 0;flex-direction:column}.recycle .recycle_price text{color:#fa7e48;font-size:36rpx;font-weight:700}.recycle .recycle_price text:last-child{color:#333;margin-top:10rpx;font-size:26rpx}.recycle .scrolllist{max-height:500rpx}.recycle .recycle_ul{padding:0 30rpx;margin:50rpx 0}.recycle .recycle_ul_li{margin-bottom:30rpx}.recycle .recycle_ul_li:last-child{margin-bottom:0}.recycle .recycle_ul_li .recycle_ul_li_txt{color:#999;font-size:26rpx}.recycle .recycle_ul_li .recycle_ul_li_r text{color:#999;font-size:26rpx}.recycle .recycle_ul_li .recycle_ul_li_r text:last-child{width:80rpx;text-align:right;color:#fa7e48;font-size:30rpx}.recycle .recycle_txt{padding:0 30rpx;color:#999;font-size:26rpx}

unpackage/dist/build/mp-weixin/pages/login/wxLogin.wxml

@@ -1 +1 @@
-<view class="content"><view class="logo-img-box"><image class="logo-img" src="https://chaomd.liuniu946.com/image/logo.png" mode=" aspectFit"></image><button class="{{['userInfo',(isclick)?'nocaction':'']}}" type="warn" data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" bindtap="__e"><text class="iconfont iconweixin"></text><text>微信授权登录</text></button></view></view>
+<view class="content"><view class="logo-img-box"><image class="logo-img" src="https://www.chaomangdao.com/image/logo.png" mode=" aspectFit"></image><button class="{{['userInfo',(isclick)?'nocaction':'']}}" type="warn" data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" bindtap="__e"><text class="iconfont iconweixin"></text><text>微信授权登录</text></button></view></view>

unpackage/dist/build/mp-weixin/pages/me/balance.wxss

@@ -1 +1 @@
-.balance{padding:0 30rpx}.balance .balance_head .balance_head_bj{height:220rpx;margin-bottom:30rpx;background:url(https://chaomd.liuniu946.com/image/yuebeijing@2x.png) no-repeat;background-size:cover;flex-direction:column}.balance .balance_head .balance_head_bj text{color:#fff}.balance .balance_head .balance_head_bj text:first-child{font-size:60rpx;font-weight:700}.balance .balance_head .balance_head_bj text:last-child{font-size:28rpx;margin-top:30rpx}.balance .balance_head .balance_head_li{width:330rpx;height:78rpx;margin-bottom:20rpx;color:#fff;font-size:30rpx;border-radius:39rpx}.balance .balance_head .balance_head_li:first-child{background:-webkit-linear-gradient(60deg,#ffb0d0,#ff67a4);margin-right:10rpx}.balance .balance_head .balance_head_li:last-child{background:-webkit-linear-gradient(0deg,#89f7fe,#66a6ff);margin-left:10rpx}.balance_main_head{background:#fff;border-radius:10rpx 10rpx 0rpx 0rpx;border-bottom:2rpx solid #fafafa}.balance_main_head .balance_main_li{width:50%;height:80rpx;font-size:30rpx}.balance_main_head .active{color:#fff;position:relative;font-weight:700;background:-webkit-linear-gradient(0deg,#89f7fe,#66a6ff)}.balance_main_head .active::after{position:absolute;content:"";bottom:0;left:50%;-webkit-transform:translateX(-50%);transform:translateX(-50%);width:40rpx;height:4rpx;background:#89f7fe;border-radius:2rpx}.balance_main_list{background:#fff;border-radius:0rpx 0rpx 10rpx 10rpx}.balance_main_list .balance_main_list_li{padding:20rpx 30rpx;border-bottom:2rpx solid #fafafa}.balance_main_list .balance_main_list_li .balance_main_list_li_name{color:#666;font-size:26rpx;margin-bottom:20rpx}.balance_main_list .balance_main_list_li .balance_main_list_li_time{color:#999}.balance_main_list .balance_main_list_li .balance_main_list_li_price{color:#ff4891;font-size:30rpx}.balance_main_list .balance_main_list_li .blue{color:#327cf6}
+.balance{padding:0 30rpx}.balance .balance_head .balance_head_bj{height:220rpx;margin-bottom:30rpx;background:url(https://www.chaomangdao.com/image/yuebeijing@2x.png) no-repeat;background-size:cover;flex-direction:column}.balance .balance_head .balance_head_bj text{color:#fff}.balance .balance_head .balance_head_bj text:first-child{font-size:60rpx;font-weight:700}.balance .balance_head .balance_head_bj text:last-child{font-size:28rpx;margin-top:30rpx}.balance .balance_head .balance_head_li{width:330rpx;height:78rpx;margin-bottom:20rpx;color:#fff;font-size:30rpx;border-radius:39rpx}.balance .balance_head .balance_head_li:first-child{background:-webkit-linear-gradient(60deg,#ffb0d0,#ff67a4);margin-right:10rpx}.balance .balance_head .balance_head_li:last-child{background:-webkit-linear-gradient(0deg,#89f7fe,#66a6ff);margin-left:10rpx}.balance_main_head{background:#fff;border-radius:10rpx 10rpx 0rpx 0rpx;border-bottom:2rpx solid #fafafa}.balance_main_head .balance_main_li{width:50%;height:80rpx;font-size:30rpx}.balance_main_head .active{color:#fff;position:relative;font-weight:700;background:-webkit-linear-gradient(0deg,#89f7fe,#66a6ff)}.balance_main_head .active::after{position:absolute;content:"";bottom:0;left:50%;-webkit-transform:translateX(-50%);transform:translateX(-50%);width:40rpx;height:4rpx;background:#89f7fe;border-radius:2rpx}.balance_main_list{background:#fff;border-radius:0rpx 0rpx 10rpx 10rpx}.balance_main_list .balance_main_list_li{padding:20rpx 30rpx;border-bottom:2rpx solid #fafafa}.balance_main_list .balance_main_list_li .balance_main_list_li_name{color:#666;font-size:26rpx;margin-bottom:20rpx}.balance_main_list .balance_main_list_li .balance_main_list_li_time{color:#999}.balance_main_list .balance_main_list_li .balance_main_list_li_price{color:#ff4891;font-size:30rpx}.balance_main_list .balance_main_list_li .blue{color:#327cf6}

unpackage/dist/build/mp-weixin/pages/me/deposit.wxml

@@ -1 +1 @@
-<view class="deposit"><view class="deposit_head"><view class="deposit_head_name">提现金额</view><view class="deposit_head_main"><view class="deposit_head_txt">提现比例1：1</view><view class="deposit_head_ipt flexs"><text>￥</text><input type="digit" placeholder="请输入" maxlength="9" placeholder-style="color:#999999" data-event-opts="{{[['input',[['__set_model',['','amount','$event',[]]]]]]}}" value="{{amount}}" bindinput="__e"/></view></view></view><view class="deposit_main"><view class="deposit_main_name">选择提现方式</view><view class="deposit_main_ul"><block wx:for="{{payList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['changePay',['$0'],[[['payList','',index,'type']]]]]]]}}" class="deposit_main_li flex" bindtap="__e"><view data-event-opts="{{[['tap',[['bindAccount',['$0'],[[['payList','',index,'type']]]]]]]}}" class="deposit_main_img flexs" catchtap="__e"><image src="{{item.image}}" mode></image><text>{{item.name+(item.account?'('+item.account+')':' (请绑定)')}}</text></view><view class="deposit_main_li_select"><image src="{{item.type==payType?'/static/image/publice/xuanzhong1@2x.png':'/static/image/publice/weixuanzhong@2x.png'}}" mode></image></view></view></block></view><view class="deposit_main_txt"><u-parse vue-id="7b0ec626-1" content="{{message}}" bind:__l="__l"></u-parse></view></view><button class="deposit_btn" hover-class="hover-view" data-event-opts="{{[['tap',[['submit',['$event']]]]]}}" bindtap="__e">提交</button></view>
+<block wx:if="{{canTi==1}}"><view class="deposit"><view class="deposit_head"><view class="deposit_head_name">提现金额</view><view class="deposit_head_main"><view class="deposit_head_txt">提现比例1：1</view><view class="deposit_head_ipt flexs"><text>￥</text><input type="digit" placeholder="请输入" maxlength="9" placeholder-style="color:#999999" data-event-opts="{{[['input',[['__set_model',['','amount','$event',[]]]]]]}}" value="{{amount}}" bindinput="__e"/></view></view></view><view class="deposit_main"><view class="deposit_main_name">选择提现方式</view><view class="deposit_main_ul"><block wx:for="{{payList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['changePay',['$0'],[[['payList','',index,'type']]]]]]]}}" class="deposit_main_li flex" bindtap="__e"><view data-event-opts="{{[['tap',[['bindAccount',['$0'],[[['payList','',index,'type']]]]]]]}}" class="deposit_main_img flexs" catchtap="__e"><image src="{{item.image}}" mode></image><text>{{item.name+(item.account?'('+item.account+')':' (请绑定)')}}</text></view><view class="deposit_main_li_select"><image src="{{item.type==payType?'/static/image/publice/xuanzhong1@2x.png':'/static/image/publice/weixuanzhong@2x.png'}}" mode></image></view></view></block></view><view class="deposit_main_txt"><u-parse vue-id="7b0ec626-1" content="{{message}}" bind:__l="__l"></u-parse></view></view><button class="deposit_btn" hover-class="hover-view" data-event-opts="{{[['tap',[['submit',['$event']]]]]}}" bindtap="__e">提交</button></view></block>

unpackage/dist/build/mp-weixin/pages/me/recharge.wxml

@@ -1 +1 @@
-<view class="recharge"><view class="recharge_head"><view class="czbj"><view class="czbj-img"><image src="https://chaomd.liuniu946.com/image/me/czbj.jpg"></image></view><view class="czbj-text"><text>当前金币</text><label class="_span">{{capital.coin}}</label></view></view><view class="recharge_head_txt flex"><text>选择充值金额</text><text>实际到账金币：<text class="real-coin">{{realCoin}}</text></text></view><view class="recharge_head_ul flexs"><block wx:for="{{rechargeList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['changeI',[index]]]]]}}" class="{{['recharge_head_li','center',(index==i)?'active':'']}}" bindtap="__e"><text>￥</text><text>{{item.coin}}</text></view></block></view></view><view class="deposit_main"><view class="deposit_main_name">选择支付方式</view><view class="deposit_main_ul"><block wx:for="{{payList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['changePay',['$0'],[[['payList','',index,'type']]]]]]]}}" class="deposit_main_li flex" bindtap="__e"><view class="deposit_main_img flexs"><image src="{{item.image}}" mode></image><text>{{item.name}}</text></view><view class="deposit_main_li_select"><image src="{{item.type==payIndex?'/static/image/publice/xuanzhong1@2x.png':'/static/image/publice/weixuanzhong@2x.png'}}" mode></image></view></view></block></view><view class="deposit_main_txt"><u-parse vue-id="ced7055e-1" content="{{message}}" bind:__l="__l"></u-parse></view></view><button class="recharge_btn" hover-class="hover-view" data-event-opts="{{[['tap',[['submitPay',['$event']]]]]}}" bindtap="__e">支付</button></view>
+<view class="recharge"><view class="recharge_head"><view class="czbj"><view class="czbj-img"><image src="https://www.chaomangdao.com/image/me/czbj.jpg"></image></view><view class="czbj-text"><text>当前金币</text><label class="_span">{{capital.coin}}</label></view></view><view class="recharge_head_txt flex"><text>选择充值金额</text><text>实际到账金币：<text class="real-coin">{{realCoin}}</text></text></view><view class="recharge_head_ul flexs"><block wx:for="{{rechargeList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['changeI',[index]]]]]}}" class="{{['recharge_head_li','center',(index==i)?'active':'']}}" bindtap="__e"><text>￥</text><text>{{item.coin}}</text></view></block></view></view><view class="deposit_main"><view class="deposit_main_name">选择支付方式</view><view class="deposit_main_ul"><block wx:for="{{payList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['changePay',['$0'],[[['payList','',index,'type']]]]]]]}}" class="deposit_main_li flex" bindtap="__e"><view class="deposit_main_img flexs"><image src="{{item.image}}" mode></image><text>{{item.name}}</text></view><view class="deposit_main_li_select"><image src="{{item.type==payIndex?'/static/image/publice/xuanzhong1@2x.png':'/static/image/publice/weixuanzhong@2x.png'}}" mode></image></view></view></block></view><view class="deposit_main_txt"><u-parse vue-id="ced7055e-1" content="{{message}}" bind:__l="__l"></u-parse></view></view><button class="recharge_btn" hover-class="hover-view" data-event-opts="{{[['tap',[['submitPay',['$event']]]]]}}" bindtap="__e">支付</button></view>

unpackage/dist/build/mp-weixin/pages/me/shaitu.wxml

@@ -1 +1 @@
-<view class="shaitu"><view class="shaitu_ul"><view class="shaitu_li"><view class="shaitu_name">描述</view><view class="shaitu_ipt shaitu_ipts flex"><textarea placeholder="请输入描述" placeholder-style="color:#999999" maxlength="-1" data-event-opts="{{[['input',[['__set_model',['$0','box_zw','$event',[]],['formData']]]]]}}" value="{{formData.box_zw}}" bindinput="__e"></textarea></view></view><view class="shaitu_li"><view class="shaitu_name">图片</view><uni-file-picker vue-id="1bb5ff4c-1" file-mediatype="image" mode="grid" file-extname="png,jpg,jpeg" limit="{{3}}" value="{{imageValue}}" data-event-opts="{{[['^success',[['success']]],['^fail',[['fail']]],['^select',[['selectImg']]],['^input',[['__set_model',['','imageValue','$event',[]]]]]]}}" bind:success="__e" bind:fail="__e" bind:select="__e" bind:input="__e" bind:__l="__l"></uni-file-picker></view></view><button class="shaitu_btn" hover-class="hover-view" data-event-opts="{{[['tap',[['submit',['$event']]]]]}}" bindtap="__e">提交晒图</button></view>
+<view class="shaitu"><block wx:if="{{canTi==1}}"><view><view class="shaitu_ul"><view class="shaitu_li"><view class="shaitu_name">描述</view><view class="shaitu_ipt shaitu_ipts flex"><textarea placeholder="请输入描述" placeholder-style="color:#999999" maxlength="-1" data-event-opts="{{[['input',[['__set_model',['$0','box_zw','$event',[]],['formData']]]]]}}" value="{{formData.box_zw}}" bindinput="__e"></textarea></view></view><view class="shaitu_li"><view class="shaitu_name">图片</view><uni-file-picker vue-id="1bb5ff4c-1" file-mediatype="image" mode="grid" file-extname="png,jpg,jpeg" limit="{{3}}" value="{{imageValue}}" data-event-opts="{{[['^success',[['success']]],['^fail',[['fail']]],['^select',[['selectImg']]],['^input',[['__set_model',['','imageValue','$event',[]]]]]]}}" bind:success="__e" bind:fail="__e" bind:select="__e" bind:input="__e" bind:__l="__l"></uni-file-picker></view></view><button class="shaitu_btn" hover-class="hover-view" data-event-opts="{{[['tap',[['submit',['$event']]]]]}}" bindtap="__e">提交晒图</button></view></block><block wx:else><view class="jjqd">敬请期待</view></block></view>

unpackage/dist/build/mp-weixin/pages/me/shaitu.wxss

@@ -1 +1 @@
-.shaitu_head{width:100%;height:88rpx;padding:0 30rpx;background:#fff}.shaitu_head image{width:44rpx;height:44rpx}.shaitu_head text{font-size:36rpx;font-weight:700}.shaitu_ul{padding:20rpx 30rpx 0 30rpx}.shaitu_ul .shaitu_li .shaitu_name{font-size:30rpx;font-weight:700;padding:30rpx 0}.shaitu_ul .shaitu_li .shaitu_ipt{height:80rpx;padding:0 30rpx;background:#fff;border-radius:10rpx}.shaitu_ul .shaitu_li .shaitu_ipt input{font-size:28rpx}.shaitu_ul .shaitu_li .shaitu_ipt image{width:22rpx;height:22rpx}.shaitu_ul .shaitu_li .shaitu_ipts{padding:30rpx;height:160rpx}.shaitu_ul .shaitu_li .shaitu_ipts textarea{font-size:28rpx}.shaitu_btn{width:690rpx;height:98rpx;color:#333;margin:20rpx auto;font-size:30rpx;font-weight:700;background:#fff;box-shadow:0rpx 0rpx 121rpx 0rpx rgba(63,52,2,.12);border-radius:10rpx}
+.shaitu_head{width:100%;height:88rpx;padding:0 30rpx;background:#fff}.shaitu_head image{width:44rpx;height:44rpx}.shaitu_head text{font-size:36rpx;font-weight:700}.shaitu_ul{padding:20rpx 30rpx 0 30rpx}.shaitu_ul .shaitu_li .shaitu_name{font-size:30rpx;font-weight:700;padding:30rpx 0}.shaitu_ul .shaitu_li .shaitu_ipt{height:80rpx;padding:0 30rpx;background:#fff;border-radius:10rpx}.shaitu_ul .shaitu_li .shaitu_ipt input{font-size:28rpx}.shaitu_ul .shaitu_li .shaitu_ipt image{width:22rpx;height:22rpx}.shaitu_ul .shaitu_li .shaitu_ipts{padding:30rpx;height:160rpx}.shaitu_ul .shaitu_li .shaitu_ipts textarea{font-size:28rpx}.shaitu_btn{width:690rpx;height:98rpx;color:#333;margin:20rpx auto;font-size:30rpx;font-weight:700;background:#fff;box-shadow:0rpx 0rpx 121rpx 0rpx rgba(63,52,2,.12);border-radius:10rpx}.jjqd{margin-top:50rpx;text-align:center;color:#000;font-size:52rpx}

unpackage/dist/build/mp-weixin/pages/me/wallet.wxss

@@ -1 +1 @@
-.wallet{padding:30rpx 30rpx 0 30rpx}.wallet_head{height:220rpx;margin-bottom:60rpx;background:url(https://chaomd.liuniu946.com/image/yuebeijing@2x.png) no-repeat;background-size:cover;padding:30rpx 30rpx 30rpx 40rpx}.wallet_head .wallet_head_txt{color:#fff;font-size:28rpx}.wallet_head .wallet_head_price{color:#fff;font-size:60rpx;font-weight:700;line-height:1}.wallet_head .wallet_head_btn{display:flex;justify-content:flex-end}.wallet_head .wallet_head_btn button{width:150rpx;height:60rpx;background:#f6af32;border-radius:30rpx}.balance_main_head{background:#fff;height:80rpx;font-size:30rpx;font-weight:700;border-radius:10rpx 10rpx 0rpx 0rpx;border-bottom:2rpx solid #fafafa}.balance_main_list{background:#fff;border-radius:0rpx 0rpx 10rpx 10rpx}.balance_main_list .balance_main_list_li{padding:20rpx 30rpx;border-bottom:2rpx solid #fafafa}.balance_main_list .balance_main_list_li .balance_main_list_li_name{color:#666;font-size:26rpx;margin-bottom:20rpx}.balance_main_list .balance_main_list_li .balance_main_list_li_time{color:#999}.balance_main_list .balance_main_list_li .balance_main_list_li_price{color:#f6af32;font-size:30rpx}.balance_main_list .balance_main_list_li .blue{color:#327cf6}
+.wallet{padding:30rpx 30rpx 0 30rpx}.wallet_head{height:220rpx;margin-bottom:60rpx;background:url(https://www.chaomangdao.com/image/yuebeijing@2x.png) no-repeat;background-size:cover;padding:30rpx 30rpx 30rpx 40rpx}.wallet_head .wallet_head_txt{color:#fff;font-size:28rpx}.wallet_head .wallet_head_price{color:#fff;font-size:60rpx;font-weight:700;line-height:1}.wallet_head .wallet_head_btn{display:flex;justify-content:flex-end}.wallet_head .wallet_head_btn button{width:150rpx;height:60rpx;background:#f6af32;border-radius:30rpx}.balance_main_head{background:#fff;height:80rpx;font-size:30rpx;font-weight:700;border-radius:10rpx 10rpx 0rpx 0rpx;border-bottom:2rpx solid #fafafa}.balance_main_list{background:#fff;border-radius:0rpx 0rpx 10rpx 10rpx}.balance_main_list .balance_main_list_li{padding:20rpx 30rpx;border-bottom:2rpx solid #fafafa}.balance_main_list .balance_main_list_li .balance_main_list_li_name{color:#666;font-size:26rpx;margin-bottom:20rpx}.balance_main_list .balance_main_list_li .balance_main_list_li_time{color:#999}.balance_main_list .balance_main_list_li .balance_main_list_li_price{color:#f6af32;font-size:30rpx}.balance_main_list .balance_main_list_li .blue{color:#327cf6}

unpackage/dist/build/mp-weixin/pages/tabbar/classify.wxml

@@ -1 +1 @@
-<view class="classify"><view class="classify_search center"><view data-event-opts="{{[['tap',[['goSearch',['$event']]]]]}}" class="classify_search_ipt flexs" bindtap="__e"><image src="https://chaomd.liuniu946.com/image/home/sousuo@2x.png" mode></image><input type="text" disabled="{{true}}" placeholder="输入您要搜索的内容" placeholder-style="color:#808080"/></view></view><view class="classify_main flexs"><scroll-view class="classify_main_left scroll-view" scroll-y="true"><block wx:for="{{classList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['changeIndex',[index]]]]]}}" class="{{['classify_main_left_li','center',(index==i)?'active':'']}}" bindtap="__e">{{item.name}}</view></block></scroll-view><scroll-view class="scroll-view classify_main_right" scroll-y="true"><view class="scroll-view_ul"><block wx:for="{{boxList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['goMessage',['$0'],[[['boxList','',index]]]]]]]}}" class="classify_main_right_li flexs" bindtap="__e"><view class="classify_main_right_li_img"><image src="{{item.image}}" mode="aspectFill"></image></view><view class="classify_main_right_li_main"><view class="classify_main_right_li_name">{{item.box_name}}</view><view class="classify_main_right_li_price">{{item.coin_price+"金币"}}</view></view></view></block></view></scroll-view></view></view>
+<view class="classify"><view class="classify_search center"><view data-event-opts="{{[['tap',[['goSearch',['$event']]]]]}}" class="classify_search_ipt flexs" bindtap="__e"><image src="https://www.chaomangdao.com/image/home/sousuo@2x.png" mode></image><input type="text" disabled="{{true}}" placeholder="输入您要搜索的内容" placeholder-style="color:#808080"/></view></view><view class="classify_main flexs"><scroll-view class="classify_main_left scroll-view" scroll-y="true"><block wx:for="{{classList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['changeIndex',[index]]]]]}}" class="{{['classify_main_left_li','center',(index==i)?'active':'']}}" bindtap="__e">{{item.name}}</view></block></scroll-view><scroll-view class="scroll-view classify_main_right" scroll-y="true"><view class="scroll-view_ul"><block wx:for="{{boxList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['goMessage',['$0'],[[['boxList','',index]]]]]]]}}" class="classify_main_right_li flexs" bindtap="__e"><view class="classify_main_right_li_img"><image src="{{item.image}}" mode="aspectFill"></image></view><view class="classify_main_right_li_main"><view class="classify_main_right_li_name">{{item.box_name}}</view><view class="classify_main_right_li_price">{{item.coin_price+"金币"}}</view></view></view></block></view></scroll-view></view></view>

unpackage/dist/build/mp-weixin/pages/tabbar/shai.wxml

@@ -1 +1 @@
-<view class="box"><view class="box_ul"><block wx:for="{{boxList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" data-event-params="{{({item})}}" class="box_ul_li " bindtap="__e"><view class="s-bt flex"><view class="s-tx"><image src="{{item.box_tx}}" mode="aspectFill"></image></view><view class="s-mc">{{item.box_mc}}</view><view class="s-sj">{{item.box_sj}}</view><view class="s-qc"></view></view><view class="s-zw">{{item.box_zw}}</view><view class="s-img-list "><block wx:for="{{item.box_img}}" wx:for-item="item2" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['e1',['$event']]]]]}}" data-event-params="{{({item})}}" class="s-img-box" bindtap="__e"><image src="{{item2}}" mode="aspectFill" data-event-opts="{{[['tap',[['lookImg',['$0'],[[['boxList','',index],['box_img','',index]]]]]]]}}" bindtap="__e"></image></view></block><view class="s-qc"></view></view></view></block></view><view data-event-opts="{{[['tap',[['shaitu']]]]}}" class="shai-btn _div" bindtap="__e"><image src="/static/image/new_home/shaitu.png" mode="widthFix"></image></view></view>
+<view class="box"><block wx:if="{{canTi==1}}"><view><view class="box_ul"><block wx:for="{{boxList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" data-event-params="{{({item})}}" class="box_ul_li " bindtap="__e"><view class="s-bt flex"><view class="s-tx"><image src="{{item.box_tx}}" mode="aspectFill"></image></view><view class="s-mc">{{item.box_mc}}</view><view class="s-sj">{{item.box_sj}}</view><view class="s-qc"></view></view><view class="s-zw">{{item.box_zw}}</view><view class="s-img-list "><block wx:for="{{item.box_img}}" wx:for-item="item2" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['e1',['$event']]]]]}}" data-event-params="{{({item})}}" class="s-img-box" bindtap="__e"><image src="{{item2}}" mode="aspectFill" data-event-opts="{{[['tap',[['lookImg',['$0'],[[['boxList','',index],['box_img','',index]]]]]]]}}" bindtap="__e"></image></view></block><view class="s-qc"></view></view></view></block></view><view data-event-opts="{{[['tap',[['shaitu']]]]}}" class="shai-btn _div" bindtap="__e"><image src="/static/image/new_home/shaitu.png" mode="widthFix"></image></view></view></block><block wx:else><view class="jjqd">敬请期待</view></block></view>

unpackage/dist/build/mp-weixin/pagesB/pages/server.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesB/pages/server"],{"38dd":function(t,n,e){"use strict";e.r(n);var a=e("bd02"),u=e("675f");for(var r in u)"default"!==r&&function(t){e.d(n,t,(function(){return u[t]}))}(r);e("7155");var c,o=e("f0c5"),f=Object(o["a"])(u["default"],a["b"],a["c"],!1,null,null,null,!1,a["a"],c);n["default"]=f.exports},"675f":function(t,n,e){"use strict";e.r(n);var a=e("dbfa"),u=e.n(a);for(var r in a)"default"!==r&&function(t){e.d(n,t,(function(){return a[t]}))}(r);n["default"]=u.a},7155:function(t,n,e){"use strict";var a=e("7a9a"),u=e.n(a);u.a},"7a9a":function(t,n,e){},9041:function(t,n,e){"use strict";(function(t){e("a940");a(e("66fd"));var n=a(e("38dd"));function a(t){return t&&t.__esModule?t:{default:t}}wx.__webpack_require_UNI_MP_PLUGIN__=e,t(n.default)}).call(this,e("543d")["createPage"])},bd02:function(t,n,e){"use strict";var a;e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return r})),e.d(n,"a",(function(){return a}));var u=function(){var t=this,n=t.$createElement;t._self._c},r=[]},dbfa:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={data:function(){return{serve:{}}},methods:{retutnTop:function(){t.navigateBack()},getServe:function(){var t=this;this.$api.getServiceInfo().then((function(n){1===n.code&&(t.serve=n.data)}))}},onLoad:function(){this.getServe()}};n.default=e}).call(this,e("543d")["default"])}},[["9041","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesB/pages/server"],{"335d":function(t,n,e){"use strict";var a;e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return r})),e.d(n,"a",(function(){return a}));var u=function(){var t=this,n=t.$createElement;t._self._c},r=[]},"38dd":function(t,n,e){"use strict";e.r(n);var a=e("335d"),u=e("675f");for(var r in u)"default"!==r&&function(t){e.d(n,t,(function(){return u[t]}))}(r);e("7155");var c,o=e("f0c5"),f=Object(o["a"])(u["default"],a["b"],a["c"],!1,null,null,null,!1,a["a"],c);n["default"]=f.exports},"675f":function(t,n,e){"use strict";e.r(n);var a=e("dbfa"),u=e.n(a);for(var r in a)"default"!==r&&function(t){e.d(n,t,(function(){return a[t]}))}(r);n["default"]=u.a},7155:function(t,n,e){"use strict";var a=e("7a9a"),u=e.n(a);u.a},"7a9a":function(t,n,e){},9041:function(t,n,e){"use strict";(function(t){e("a940");a(e("66fd"));var n=a(e("38dd"));function a(t){return t&&t.__esModule?t:{default:t}}wx.__webpack_require_UNI_MP_PLUGIN__=e,t(n.default)}).call(this,e("543d")["createPage"])},dbfa:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={data:function(){return{serve:{}}},methods:{retutnTop:function(){t.navigateBack()},getServe:function(){var t=this;this.$api.getServiceInfo().then((function(n){1===n.code&&(t.serve=n.data)}))}},onLoad:function(){this.getServe()}};n.default=e}).call(this,e("543d")["default"])}},[["9041","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pagesB/pages/server.wxml

@@ -1 +1 @@
-<view class="server"><view class="server_head flex"><image src="/static/image/publice/fanhui1@2x.png" mode data-event-opts="{{[['tap',[['retutnTop',['$event']]]]]}}" bindtap="__e"></image><text>联系客服</text><text></text></view><view class="server_main center"><view class="server_main_box"><view class="server_main_head"><image src="https://chaomd.liuniu946.com/image/logo.png" mode></image></view><view class="server_main_name center"><text>潮盲岛</text><text>{{serve.number}}</text></view><view class="server_main_img"><image src="{{serve.qrcode}}" mode="aspectFill"></image></view><view class="server_main_txt">扫码联系客服</view></view><view class="server-download center"><image src="../static/xiazai@2x.png" mode></image><text>长按保存二维码</text></view></view></view>
+<view class="server"><view class="server_head flex"><image src="/static/image/publice/fanhui1@2x.png" mode data-event-opts="{{[['tap',[['retutnTop',['$event']]]]]}}" bindtap="__e"></image><text>联系客服</text><text></text></view><view class="server_main center"><view class="server_main_box"><view class="server_main_head"><image src="https://www.chaomangdao.com/image/logo.png" mode></image></view><view class="server_main_name center"><text>潮盲岛</text><text>{{serve.number}}</text></view><view class="server_main_img"><image src="{{serve.qrcode}}" mode="aspectFill"></image></view><view class="server_main_txt">扫码联系客服</view></view><view class="server-download center"><image src="../static/xiazai@2x.png" mode></image><text>长按保存二维码</text></view></view></view>