静态页

.hbuilderx/launch.json

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

androidPrivacy.json

@@ -0,0 +1,3 @@
+{
+    "prompt" : "none"
+}

components/seckill/seckill.vue

@@ -12,7 +12,7 @@
 			<view class="textNav iconfont iconenter" >更多</view>
 		</view>
 		<view class="floor-list">
-			<image src="../../static/img/cg.jpg" mode=""></image>
+			<image src="../../static/img/cgg.png" mode=""></image>
 		</view>
 		<!-- <scroll-view class="floor-list" scroll-x>
 			<view class="scoll-wrapper position-relative" @click="navTo('/pages/product/classify?type=2')">

manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "易趣G",
+    "name" : "易趣GO",
     "appid" : "__UNI__0D9C79D",
     "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
+    "versionName" : "1.1.0",
+    "versionCode" : 110,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */
@@ -15,7 +15,8 @@
             "delay" : 0
         },
         "modules" : {
-            "OAuth" : {}
+            "OAuth" : {},
+            "Bluetooth" : {}
         },
         /* 模块配置 */
         "distribute" : {
@@ -51,6 +52,54 @@
                         "appsecret" : "02b2a9605a080f0705eb3db43093679a",
                         "UniversalLinks" : ""
                     }
+                },
+                "ad" : {}
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            },
+            "splashscreen" : {
+                "androidStyle" : "default",
+                "useOriginalMsgbox" : false,
+                "iosStyle" : "common",
+                "android" : {
+                    "hdpi" : "C:/Users/Administrator/Desktop/新建文件夹 (7)/480.png",
+                    "xhdpi" : "C:/Users/Administrator/Desktop/新建文件夹 (7)/720.png",
+                    "xxhdpi" : "C:/Users/Administrator/Desktop/新建文件夹 (7)/1080.png"
+                },
+                "ios" : {
+                    "iphone" : {
+                        "portrait-896h@3x" : "C:/Users/Administrator/Desktop/新建文件夹 (7)/480.png"
+                    }
                 }
             }
         }

pages.json

@@ -262,12 +262,8 @@
 		{
 			"path": "pages/product/classify",
 			"style": {
-				"navigationBarTitleText": "",
-				"app-plus": {
-					"titleNView": {
-						"type": "none"
-					}
-				}
+				"navigationBarTitleText": ""
+				
 			}
 		},
 		{

pages/hall/hall.vue

@@ -9,7 +9,7 @@
 			<swiper-item class="carousel-item" v-for="(item,index) in carouselList "  @click="bannerNavToUrl(item)"><image :src="item.pic" mode=""></image> </swiper-item>
 		</swiper>
 		<view class="hall-center">
-			<view class="shingle-main" v-for="(item, index) in list" :key="index" @click="nav(item)" v-if="item.name!='体验馆'">
+			<view class="shingle-main" v-for="(item, index) in list" :key="index" @click="nav(item)" v-if="item.name!='体验馆（100-1000）'">
 				<view class="shingle-bg"><image :src="item.image" mode=""></image></view>
 				<view class="shinglem-title flex">
 					<image class="tbg" src="../../static/img/tbg-left.png" mode=""></image>
@@ -64,6 +64,10 @@ export default {
 			loadingType: 'more'
 		};
 	},
+	onLoad() {
+		this.get()
+		this.loadData();
+	},
 	onShow() {
 		this.loadData();
 		this.get()

pages/hall/halllist.vue

@@ -1,28 +1,30 @@
 <template>
 	<view class="center">
+		<!-- #ifdef APP -->
+		<view class="height">
+		</view>
+		<!-- #endif -->
 		<view class="content-money">
-			<view class="status_bar"><!-- 这里是状态栏 --></view>
+			<view class="status_bar">
+				<!-- 这里是状态栏 -->
+			</view>
 			<view class="money-box">
-				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/img/fanhui.png" mode=""></image></view>
-				<view class="header">商品认购体验馆</view>
-				<image class="money_bg" src="../../static/img/hinfo-bg.png"></image>
+				<view class="goback-box" @click="toBack">
+					<image class="goback" src="../../static/img/fanhui.png" mode=""></image>
+				</view>
+				<view class="header">{{name}}</view>
+				<!-- <image class="money_bg" src="../../static/img/hinfo-bg.png"></image> -->
 			</view>
 		</view>
 		<swiper class="hallist-bg" autoplay="true" duration="400" interval="5000">
-			<swiper-item v-for="(item, index) in images" :key="index" class="carousel-item"><image :src="item" /></swiper-item>
+			<swiper-item v-for="(item, index) in images" :key="index" class="carousel-item">
+				<image :src="item" />
+			</swiper-item>
 		</swiper>
 		<view class="message flex">
 			<image class="message-left" src="../../static/img/hinco.png" mode=""></image>
-			<u-notice-bar
-				style="width: 100%;"
-				mode="vertical"
-				type="none"
-				:volume-icon="false"
-				:more-icon="true"
-				:list="text"
-				@click="goDetails"
-				@getMore="navTo('/pages/index/message?type = 1')"
-			></u-notice-bar>
+			<u-notice-bar style="width: 100%;" mode="vertical" type="none" :volume-icon="false" :more-icon="true"
+				:list="text" @click="goDetails" @getMore="navTo('/pages/index/message?type = 1')"></u-notice-bar>
 		</view>
 		<view class="navbar">
 			<view class="navbar-item" @click="navTo('/pages/money/qudou')">
@@ -46,7 +48,7 @@
 					<image class="navbar-image" src="../../static/money/m04.png" mode=""></image>
 					<view class="font">广告值</view>
 				</view>
-				<view class="navbar-num">{{ userInfo.anticipate }}</view>
+				<view class="navbar-num">{{ userInfo.anticipate ||'0.00'}}</view>
 			</view>
 		</view>
 		<view class="main" v-for="(item, index) in list" :key="index">
@@ -56,42 +58,40 @@
 					<view class="mmain-title">
 						<image class="mmaint-left" :src="item.time_image" mode=""></image>
 						<view class="mmaint-font">{{ item.nickname }}</view>
-						<view class="mmaint-time">{{ item.radd_time }}开售</view>
+						<view class="mmaint-time">{{ item.add_time }}认购</view>
+					</view>
+					<view class="mmain-time" style="margin-top: 28rpx;">认购时间:{{ item.add_time }}-{{ item.end_time }}
 					</view>
-					<view class="mmain-time" style="margin-top: 28rpx;">预约时间:{{ item.add_time }}-{{ item.end_time }}</view>
-					<view class="mmain-time">付款时间:{{ item.radd_time | ahead }}-{{ item.rend_time }}</view>
+					<view class="mmain-time">付款时间:{{ item.radd_time  }}-{{ item.rend_time }}</view>
 					<view class="mmain-time flex">
-						<view class="mmain-font">距预约结束:</view>
+						<view class="mmain-font">距认购结束:</view>
 
-						<view class="lyy-b-jz flex" v-if="item.daotime == 1" style="font-size: 30rpx; color: #d13737;">已结束</view>
+						<view class="lyy-b-jz flex" v-if="item.daotime == 1" style="font-size: 30rpx; color: #d13737;">
+							已结束</view>
 						<view class="lyy-b-jz flex" v-else>
-							<uni-countdowns
-								color="#FFFFFF"
-								splitor-color="#FECD57"
-								background-color="#FECD57"
-								border-color="#FECD57"
-								:show-day="false"
-								:hour="item.hours"
-								:minute="item.minutes"
-								:second="item.seconds"
-								:index="index"
-								@timeover="isTime"
-							></uni-countdowns>
+							<uni-countdowns color="#FFFFFF" splitor-color="#FECD57" background-color="#FECD57"
+								border-color="#FECD57" :show-day="false" :hour="item.hours" :minute="item.minutes"
+								:second="item.seconds" :index="index" @timeover="isTime"></uni-countdowns>
 						</view>
 					</view>
 				</view>
-				<view class="mmain-image"><image :src="item.image" mode=""></image></view>
+				<view class="mmain-image">
+					<image :src="item.image" mode=""></image>
+				</view>
 			</view>
-			<view class="bottom" :style="{'background-color': (item.str=='预约'?'#d13737':'#808080') ,'color': (item.str=='预约'?'#d13737':'#808080')}"  @click="open(item)">
-				<view class="bottom-font" v-if="item.str == '预约'">立即{{ item.str }}</view>
-				<view class="bottom-font"  v-else>{{ item.daotime == 1 ? '立即进入' : '您已预约' }}</view>
+			<view class="bottom"
+				:style="{'background-color': (item.str=='预约'&&item.isShow?'#d13737':'#808080') ,'color': (item.str=='预约'?'#d13737':'#808080')}"
+				@click="item.isShow?open(item):cloo()">
+				<view class="bottom-font" v-if="item.str == '预约'">立即认购</view>
+
+				<view class="bottom-font" v-else>{{ item.daotime == 1 ? '立即进入' : '您已认购' }}</view>
 				<image class="bottom-image" src="../../static/img/jt.png" mode=""></image>
 			</view>
-			
+
 		</view>
 		<uni-popup ref="popup" type="center">
 			<view class="popup">
-				<view class="popup-title">预约需要{{ price }}广告值是否立即预约？</view>
+				<view class="popup-title">认购需要{{ price }}广告值是否立即认购？</view>
 				<view class="btn-box">
 					<view class="btn-left" @click="close()">取消</view>
 					<view class="btn-right" @click="appointment()">确定</view>
@@ -100,7 +100,7 @@
 		</uni-popup>
 		<uni-popup ref="navPopup" type="center">
 			<view class="popup">
-				<view class="popup-title">预约成功,是否跳转至订单页？</view>
+				<view class="popup-title">认购成功,是否跳转至订单页？</view>
 				<view class="btn-box">
 					<view class="btn-left" @click="close()">取消</view>
 					<view class="btn-right" @click="navTodd()">确定</view>
@@ -111,574 +111,709 @@
 </template>
 
 <script>
-import uniCountdowns from '@/components/uni-countdown/uni-countdowns.vue';
-import { pay_list } from '../../api/wallet.js';
-import { article } from '@/api/user.js';
-import { getUserInfo, rate } from '@/api/user.js';
-import { mapState, mapMutations } from 'vuex';
-import { auction_list, subscribe, advance } from '@/api/hall.js';
-import { timeComputed } from '@/utils/rocessor.js';
-export default {
-	components: {
-		uniCountdowns
-	},
-	data() {
-		return {
-			images: [], //轮播图
-			name: '', //馆名字
-			peoplename: '', //馆长名字
-			price: '', //预约的价格
-			id: '', //预约会场id
-			oid: '', //馆id
-			page: 1,
-			limit: 10,
-			loadingType: 'more',
-			text: [],
-			article: [],
-			list: [],
-			aliData: {},
-			bankData: {},
-			wx: {},
-			sm: 0,
-			sbly: ''
-		};
-	},
-	filters: {
-		ahead(provider) {
-			let time = provider.split(':');
-			console.log(time);
-			if (time[1] * 1 - 6 < 0) {
-				time[1] = time[1] * 1 + 54;
-				if (time[0] * 1 == 0) {
-					time[0] = '23';
-				} else {
-					time[0] = time[0] * 1 - 1;
-				}
-			} else {
-				time[1] = time[1] * 1 - 6;
-				if (time[1] < 10) {
-					time[1] = '0' + time[1];
-				}
-			}
-			return time[0] + ':' + time[1] + ':' + time[2];
-		}
-	},
-	onLoad(option) {
-		this.oid = option.id;
-		this.name = option.name;
-		this.peoplename = option.peoplename;
-	},
-	onShow() {
-		this.list = [];
-		this.page = 1;
-		this.limit = 10;
-		this.loadingType = 'more';
-		pay_list({}).then(({ data }) => {
-			this.wx = data.wx;
-			this.aliData = data.zfb;
-			this.bankData = data.bank;
-		});
-		this.loadData();
-		this.isSm();
-	},
-	computed: {
-		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
-	},
-	methods: {
-		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
-		isSm() {
-			rate({}).then(e => {
-				this.sm = e.data.is_auth;
-				if (e.data.is_auth == 3) {
-					this.sbly = e.data.off;
-				}
-			});
+	import uniCountdowns from '@/components/uni-countdown/uni-countdowns.vue';
+	import {
+		pay_list
+	} from '../../api/wallet.js';
+	import {
+		article
+	} from '@/api/user.js';
+	import {
+		getUserInfo,
+		rate
+	} from '@/api/user.js';
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import {
+		auction_list,
+		subscribe,
+		advance
+	} from '@/api/hall.js';
+	import {
+		timeComputed
+	} from '@/utils/rocessor.js';
+	export default {
+		components: {
+			uniCountdowns
 		},
-		loadData() {
-			const obj = this;
-			if (obj.loadingType == 'nomore' || obj.loadingType == 'loading') {
-				return;
-			}
-			obj.loadingType = 'loading';
-			auction_list({
-				page: obj.page,
-				limit: obj.limit,
-				auction_gu_id: obj.oid
-			}).then(({ data }) => {
-				obj.images = data.slider_image;
-				console.log(data,'场馆');
-				data.data.forEach(e => {
-					let now_time = timeComputed(e.time);
-					console.log(e.time, now_time);
-					e.hours = now_time.hours;
-					e.minutes = now_time.minutes;
-					e.seconds = now_time.seconds;
-					if (now_time.hours < 0 || now_time.minutes < 0 || now_time.seconds < 0) {
-						e.daotime = 1;
-					} else {
-						e.daotime = 0;
-					}
-					let jcsj = e.radd_time.split(':');
-					if (jcsj[0] * 1 >= 8 && jcsj[0] * 1 < 12) {
-						e.time_image = '../../static/img/morningicon.png';
-						e.show = 'MORNING SHOWS';
-					} else if (jcsj[0] * 1 >= 12 && jcsj[0] * 1 < 18) {
-						e.show = 'AFTERNOON SHOWS';
-						e.time_image = '../../static/img/afternoonicon.png';
+		data() {
+			return {
+				images: [], //轮播图
+				name: '', //馆名字
+				peoplename: '', //馆长名字
+				price: '', //预约的价格
+				id: '', //预约会场id
+				oid: '', //馆id
+				page: 1,
+				limit: 10,
+				loadingType: 'more',
+				text: [],
+				article: [],
+				list: [],
+				aliData: {},
+				bankData: {},
+				wx: {},
+				sm: 0,
+				sbly: '',
+				
+
+			};
+		},
+		filters: {
+			ahead(provider) {
+				let time = provider.split(':');
+				console.log(time);
+				if (time[1] * 1 - 6 < 0) {
+					time[1] = time[1] * 1 + 54;
+					if (time[0] * 1 == 0) {
+						time[0] = '23';
 					} else {
-						e.time_image = '../../static/img/eveningicon.png';
-						e.show = 'EVENING SHOWS';
+						time[0] = time[0] * 1 - 1;
 					}
-				});
-				obj.list = obj.list.concat(data.data);
-				if (data.data.length == obj.limit) {
-					obj.loadingType = 'more';
-					obj.page++;
 				} else {
-					obj.loadingType = 'nomore';
+					time[1] = time[1] * 1 - 6;
+					if (time[1] < 10) {
+						time[1] = '0' + time[1];
+					}
 				}
+				return time[0] + ':' + time[1] + ':' + time[2];
+			}
+		},
+		onLoad(option) {
+			this.oid = option.id;
+			console.log(option, "欧赔tion");
+			this.name = option.name;
+			this.peoplename = option.peoplename;
+		},
+		onShow() {
+			this.list = [];
+			this.page = 1;
+			this.limit = 10;
+			this.loadingType = 'more';
+			pay_list({}).then(({
+				data
+			}) => {
+				this.wx = data.wx;
+				this.aliData = data.zfb;
+				this.bankData = data.bank;
 			});
+			this.loadData();
+			this.isSm();
 		},
-		open(item) {
-			if (this.sm == 0) {
-				uni.showModal({
-					title: '提示',
-					content: '您未实名认证无法参与，是否前去实名认证？',
-					success: function(res) {
-						if (res.confirm) {
-							uni.navigateTo({
-								url: '/pages/user/approve'
-							});
-						} else if (res.cancel) {
-							console.log('用户点击取消');
-						}
+		computed: {
+			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+		},
+		methods: {
+			...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
+			isSm() {
+				rate({}).then(e => {
+					this.sm = e.data.is_auth;
+					if (e.data.is_auth == 3) {
+						this.sbly = e.data.off;
 					}
 				});
-				return;
-			}
-			if (this.sm == 1) {
-				return this.$api.msg('实名认证正在审核中请耐心等待');
-			}
-			if (this.sm == 3) {
-				uni.showModal({
-					title: '提示',
-					content: '申请失败,原因' + this.sbly + '是否重新申请',
-					success: function(res) {
-						if (res.confirm) {
-							uni.navigateTo({
-								url: '/pages/user/approve'
-							});
-						} else if (res.cancel) {
-							console.log('用户点击取消');
+			},
+			cloo(){
+				this.$api.msg('开场时间未到!')
+			},
+			loadData() {
+				const obj = this;
+				if (obj.loadingType == 'nomore' || obj.loadingType == 'loading') {
+					return;
+				}
+				obj.loadingType = 'loading';
+				auction_list({
+					page: obj.page,
+					limit: obj.limit,
+					auction_gu_id: obj.oid
+				}).then(({
+					data
+				}) => {
+					obj.images = data.slider_image;
+					console.log(data, '场馆');
+					data.data.forEach(e => {
+						let ee = e
+							// console.log(e,'e');
+							let arr = Array.from(e.site.split(',').join(""))
+							let day = new Date().getDay()
+							arr.forEach(e=>{
+								console.log(e,day,'eee');
+									if (e == day) {
+										obj.isShow = true
+										this.$set(ee,'isShow',true)
+										console.log(ee.isShow, day, e == day ? '等于' : '不等于');
+										}
+									// }else{
+									// 	// obj.isShow = false
+									// 	this.$set(ee,'isShow',false)
+									// 	console.log(ee, day, e == day ? '等于' : '不等于');
+									// }
+									
+								})
+							
+							// console.log(day, arr, 'datyyyyyyyyyyyy');
+							// console.log(new Date().getDay(),'arr');
+							// arr.forEach(e=>{
+							// 	if(day==e){
+							// 		obj.isShow = true
+							// 		console.log(day,e,obj.isShow,'今日是申购日');
+							// 		return
+							// 	}
+							// 	obj.isShow = false
+							// 	console.log(day,e,obj.isShow,'今日不是申购日');
+
+							// })
+							// arr.forEach(e=>{
+							// 	console.log(e,'eeeeee');
+							// 	let day = new Date().getDay()
+							// 	if (e == day) {
+									
+							// 		obj.isShow = true
+							// 		this.$set(e,'isShow',true)
+							// 		console.log(e, day, e == day ? '等于' : '不等于');
+							// 		return
+							// 	}
+							// 	obj.isShow = false
+							// 	this.$set(e,'isShow',false)
+							// 	console.log(e, day, e == day ? '等于' : '不等于');
+							// })
+
 						}
-					}
-				});
-				return;
-			}
-			if (this.wx == '' && this.aliData == '' && this.bankData == '') {
-				uni.showModal({
-					title: '提示',
-					content: '您未填写收款信息无法参与，是否前去填写收款信息？',
-					success: function(res) {
-						if (res.confirm) {
-							uni.navigateTo({
-								url: '/pages/collection/collection'
-							});
-						} else if (res.cancel) {
-							console.log('用户点击取消');
+
+					)
+
+					data.data.forEach(e => {
+						let now_time = timeComputed(e.time);
+						console.log(e.time, now_time);
+						e.hours = now_time.hours;
+						e.minutes = now_time.minutes;
+						e.seconds = now_time.seconds;
+						if (now_time.hours < 0 || now_time.minutes < 0 || now_time.seconds < 0) {
+							e.daotime = 1;
+						} else {
+							e.daotime = 0;
+						}
+						let jcsj = e.radd_time.split(':');
+						if (jcsj[0] * 1 >= 8 && jcsj[0] * 1 < 12) {
+							e.time_image = '../../static/img/morningicon.png';
+							e.show = 'MORNING SHOWS';
+						} else if (jcsj[0] * 1 >= 12 && jcsj[0] * 1 < 18) {
+							e.show = 'AFTERNOON SHOWS';
+							e.time_image = '../../static/img/afternoonicon.png';
+						} else {
+							e.time_image = '../../static/img/eveningicon.png';
+							e.show = 'EVENING SHOWS';
 						}
+					});
+					obj.list = obj.list.concat(data.data);
+					// console.log(obj.list,'list');
+					if (data.data.length == obj.limit) {
+						obj.loadingType = 'more';
+						obj.page++;
+					} else {
+						obj.loadingType = 'nomore';
 					}
 				});
-				return;
-			}
-			if (item.sta != 1) {
-				this.id = item.id;
-				advance({ id: item.id })
-					.then(e => {
-						console.log(e, 'success');
-						uni.navigateTo({
-							url:'../order/order'
+			},
+			open(item) {
+				if (this.sm == 0) {
+					uni.showModal({
+						title: '提示',
+						content: '您未实名认证无法参与，是否前去实名认证？',
+						success: function(res) {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: '/pages/user/approve'
+								});
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+					return;
+				}
+				if (this.sm == 1) {
+					return this.$api.msg('实名认证正在审核中请耐心等待');
+				}
+				if (this.sm == 3) {
+					uni.showModal({
+						title: '提示',
+						content: '申请失败,原因' + this.sbly + '是否重新申请',
+						success: function(res) {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: '/pages/user/approve'
+								});
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+					return;
+				}
+				if (this.wx == '' && this.aliData == '' && this.bankData == '') {
+					uni.showModal({
+						title: '提示',
+						content: '您未填写收款信息无法参与，是否前去填写收款信息？',
+						success: function(res) {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: '/pages/collection/collection'
+								});
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+					return;
+				}
+				if (item.sta != 1) {
+					this.id = item.id;
+					advance({
+							id: item.id
+						})
+						.then(e => {
+							console.log(e, 'success');
+							uni.navigateTo({
+								url: '../order/order'
+							})
 						})
+						.catch(e => {
+							console.log(e, 'fail');
+						});
+				} else {
+					this.price = item.anticipate;
+					this.id = item.id;
+					this.$refs.popup.open();
+				}
+			},
+			goDetails(e) {
+				console.log(e, '123456');
+				uni.navigateTo({
+					url: '/pages/index/messageInfo?id=' + this.article[e].id
+				});
+			},
+			close() {
+				this.price = '';
+				this.id = '';
+				this.$refs.popup.close();
+				this.$refs.navPopup.close();
+			},
+			navTodd() {
+				this.$refs.navPopup.close()
+				uni.navigateTo({
+					url: '../order/order'
+				})
+			},
+			nav() {
+				uni.navigateTo({
+					url: '/pages/hall/hallinfo?id=' + this.id + '&name=' + this.name + '&peoplename=' + this
+						.peoplename
+				});
+			},
+			navTo(url) {
+				uni.navigateTo({
+					url
+				});
+			},
+			toBack() {
+				uni.navigateBack({});
+			},
+			appointment() {
+				subscribe({
+						id: this.id
+					})
+					.then(({
+						data
+					}) => {
+						this.$api.msg('认购成功');
+						console.log(data);
+						this.price = '';
+						this.$refs.popup.close();
+						this.page = 1;
+						this.limit = 10;
+						this.loadingType = 'more';
+						this.list = [];
+						this.loadData();
+						this.updata();
+						this.$refs.navPopup.open()
+					})
+					.catch(e => {
+						this.price = '';
+						this.$refs.popup.close();
+						console.log(e);
+					});
+			},
+			updata() {
+				getUserInfo({})
+					.then(({
+						data
+					}) => {
+						this.setUserInfo(data);
 					})
 					.catch(e => {
-						console.log(e, 'fail');
+						console.log(e);
 					});
-			} else {
-				this.price = item.anticipate;
-				this.id = item.id;
-				this.$refs.popup.open();
+			},
+			isTime(index) {
+				console.log(index, '123');
+				this.list[index].daotime = 1;
 			}
-		},
-		goDetails(e) {
-			console.log(e, '123456');
-			uni.navigateTo({
-				url: '/pages/index/messageInfo?id=' + this.article[e].id
-			});
-		},
-		close() {
-			this.price = '';
-			this.id = '';
-			this.$refs.popup.close();
-			this.$refs.navPopup.close();
-		},
-		navTodd(){
-			this.$refs.navPopup.close()
-			uni.navigateTo({
-				url:'../order/order'
-			})
-		},
-		nav() {
-			uni.navigateTo({
-				url: '/pages/hall/hallinfo?id=' + this.id + '&name=' + this.name + '&peoplename=' + this.peoplename
-			});
-		},
-		navTo(url) {
-			uni.navigateTo({
-				url
-			});
-		},
-		toBack() {
-			uni.navigateBack({});
-		},
-		appointment() {
-			subscribe({ id: this.id })
-				.then(({ data }) => {
-					this.$api.msg('预约成功');
-					console.log(data);
-					this.price = '';
-					this.$refs.popup.close();
-					this.page = 1;
-					this.limit = 10;
-					this.loadingType = 'more';
-					this.list = [];
-					this.loadData();
-					this.updata();
-					this.$refs.navPopup.open()
-				})
-				.catch(e => {
-					this.price = '';
-					this.$refs.popup.close();
-					console.log(e);
-				});
-		},
-		updata() {
-			getUserInfo({})
-				.then(({ data }) => {
-					this.setUserInfo(data);
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-		isTime(index) {
-			console.log(index, '123');
-			this.list[index].daotime = 1;
 		}
-	}
-};
+	};
 </script>
 
 <style lang="less">
-page,
-.center {
-	height: auto;
-	min-height: 100%;
-	background: #f2f5f4;
-}
-.money-box {
-	color: #ffffff;
-	text-align: center;
-	position: relative;
-	.header {
-		position: absolute;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 80rpx;
-		font-size: 32rpx;
-		font-weight: 700;
-		z-index: 99;
-		display: flex;
-		justify-content: center;
-		align-items: center;
+	page,
+	.center {
+		height: auto;
+		min-height: 100%;
+		background: #f2f5f4;
 	}
-	.goback-box {
-		position: absolute;
-		left: 18rpx;
-		top: 0;
+
+	.height {
+		width: 100%;
 		height: 80rpx;
-		display: flex;
-		align-items: center;
+		background: #fff;
 	}
-	.goback {
-		z-index: 100;
-		width: 34rpx;
-		height: 34rpx;
-	}
-	.money_bg {
-		width: 100%;
+
+	.money-box {
 		height: 382rpx;
-		display: block;
-	}
-}
-.shingle-mmain {
-	position: relative;
-	z-index: 2;
-	margin: -90rpx auto 0;
-	width: 690rpx;
-	height: 176rpx;
-	background: #ffffff;
-	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-	border-radius: 20rpx;
-	background-color: #ffffff;
-	.smmain-item {
-		width: 33%;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		.red {
-			color: #fd3b39 !important;
-		}
-		.smitem-top {
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: bolder;
+		color: #ffffff;
+		text-align: center;
+		position: relative;
+
+		.header {
 			color: #0c1732;
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			height: 80rpx;
+			font-size: 32rpx;
+			font-weight: 700;
+			z-index: 99;
+			display: flex;
+			justify-content: center;
+			align-items: center;
 		}
-		.smitem-bottom {
-			margin-top: 10rpx;
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #0c1732;
+
+		.goback-box {
+			position: absolute;
+			left: 18rpx;
+			top: 0;
+			height: 80rpx;
+			display: flex;
+			align-items: center;
 		}
-		.people {
-			justify-content: center;
-			.peopleitem {
-				width: 24rpx;
-				height: 34rpx;
-				image {
-					width: 100%;
-					height: 100%;
+
+		.goback {
+			z-index: 100;
+			width: 34rpx;
+			height: 34rpx;
+		}
+
+		.money_bg {
+			width: 100%;
+			height: 382rpx;
+			display: block;
+		}
+	}
+
+	.shingle-mmain {
+		position: relative;
+		z-index: 2;
+		margin: -90rpx auto 0;
+		width: 690rpx;
+		height: 176rpx;
+		background: #ffffff;
+		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+		border-radius: 20rpx;
+		background-color: #ffffff;
+
+		.smmain-item {
+			width: 33%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+
+			.red {
+				color: #fd3b39 !important;
+			}
+
+			.smitem-top {
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: bolder;
+				color: #0c1732;
+			}
+
+			.smitem-bottom {
+				margin-top: 10rpx;
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #0c1732;
+			}
+
+			.people {
+				justify-content: center;
+
+				.peopleitem {
+					width: 24rpx;
+					height: 34rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
 				}
 			}
 		}
+
+		.shu {
+			width: 2rpx;
+			height: 70rpx;
+			background: #dcdcdc;
+		}
 	}
-	.shu {
-		width: 2rpx;
-		height: 70rpx;
-		background: #dcdcdc;
-	}
-}
-.main {
-	margin: 30rpx auto 0;
-	padding: 50rpx 50rpx 36rpx 50rpx;
-	width: 690rpx;
-	background: #ffffff;
-	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-	border-radius: 20rpx;
-	.mtitle-english {
-		font-size: 30rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #9ea6ba;
-	}
-	.mmain {
-		margin-top: 24rpx;
-		.mmain-info {
-			.mmain-title {
-				display: flex;
-				justify-content: flex-start;
-				align-items: center;
-				.mmaint-left {
-					width: 52rpx;
-					height: 40rpx;
-				}
-				.mmaint-font {
-					margin-left: 10rpx;
-					font-size: 32rpx;
-					font-family: PingFang SC;
-					font-weight: bold;
-					color: #0c1732;
+
+	.main {
+		margin: 30rpx auto 0;
+		padding: 50rpx 50rpx 36rpx 50rpx;
+		width: 690rpx;
+		background: #ffffff;
+		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+		border-radius: 20rpx;
+
+		.mtitle-english {
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #9ea6ba;
+		}
+
+		.mmain {
+			margin-top: 24rpx;
+
+			.mmain-info {
+				.mmain-title {
+					display: flex;
+					justify-content: flex-start;
+					align-items: center;
+
+					.mmaint-left {
+						width: 52rpx;
+						height: 40rpx;
+					}
+
+					.mmaint-font {
+						margin-left: 10rpx;
+						font-size: 32rpx;
+						font-family: PingFang SC;
+						font-weight: bold;
+						color: #0c1732;
+					}
+
+					.mmaint-time {
+						margin-left: 20rpx;
+						font-size: 28rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #0c1732;
+					}
 				}
-				.mmaint-time {
-					margin-left: 20rpx;
-					font-size: 28rpx;
+
+				.mmain-time {
+					justify-content: flex-start;
+					margin-top: 10rpx;
+					font-size: 26rpx;
 					font-family: PingFang SC;
 					font-weight: 500;
 					color: #0c1732;
+
+					.lyy-b-jz {
+						margin-left: 10rpx;
+					}
 				}
 			}
-			.mmain-time {
-				justify-content: flex-start;
-				margin-top: 10rpx;
-				font-size: 26rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #0c1732;
-				.lyy-b-jz {
-					margin-left: 10rpx;
+
+			.mmain-image {
+				padding-top: 14rpx;
+				width: 182rpx;
+				height: 182rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
 				}
 			}
 		}
-		.mmain-image {
-			padding-top: 14rpx;
-			width: 182rpx;
-			height: 182rpx;
-			image {
-				width: 100%;
-				height: 100%;
+
+		.bottom {
+			margin-top: 32rpx;
+			width: 380rpx;
+			height: 64rpx;
+			background: #d13737;
+			border-radius: 20rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+
+			.bottom-font {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #ffffff;
+			}
+
+			.bottom-image {
+				margin-left: 12rpx;
+				width: 24rpx;
+				height: 22rpx;
 			}
 		}
 	}
-	.bottom {
-		margin-top: 32rpx;
-		width: 380rpx;
-		height: 64rpx;
-		background: #d13737;
+
+	.popup {
+		width: 582rpx;
+		background: #ffffff;
 		border-radius: 20rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		.bottom-font {
-			font-size: 28rpx;
+		padding: 118rpx 20rpx 30rpx;
+
+		.popup-title {
+			text-align: center;
+			font-size: 42rpx;
 			font-family: PingFang SC;
-			font-weight: bold;
-			color: #ffffff;
+			font-weight: 500;
+			color: #0c1732;
 		}
-		.bottom-image {
-			margin-left: 12rpx;
-			width: 24rpx;
-			height: 22rpx;
+
+		.btn-box {
+			padding-top: 90rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+
+			.btn-left {
+				width: 248rpx;
+				height: 78rpx;
+				border: 2rpx solid #dc262b;
+				border-radius: 10rpx;
+				font-size: 34rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #dc262b;
+				text-align: center;
+				line-height: 78rpx;
+			}
+
+			.btn-right {
+				width: 248rpx;
+				height: 78rpx;
+				background: #dc262b;
+				border-radius: 10rpx;
+				font-size: 34rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #ffffff;
+				text-align: center;
+				line-height: 78rpx;
+			}
 		}
 	}
-}
-.popup {
-	width: 582rpx;
-	background: #ffffff;
-	border-radius: 20rpx;
-	padding: 118rpx 20rpx 30rpx;
-	.popup-title {
-		text-align: center;
-		font-size: 42rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #0c1732;
-	}
-	.btn-box {
-		padding-top: 90rpx;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		.btn-left {
-			width: 248rpx;
-			height: 78rpx;
-			border: 2rpx solid #dc262b;
-			border-radius: 10rpx;
-			font-size: 34rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #dc262b;
-			text-align: center;
-			line-height: 78rpx;
+
+	.message {
+		justify-content: space-around;
+		margin: 20rpx auto 0;
+		padding: 16rpx 40rpx 16rpx 50rpx;
+		width: 690rpx;
+		background: #ffffff;
+		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+		border-radius: 20rpx;
+
+		.message-left {
+			width: 52rpx;
+			height: 52rpx;
+			flex-shrink: 0;
 		}
-		.btn-right {
-			width: 248rpx;
-			height: 78rpx;
-			background: #dc262b;
-			border-radius: 10rpx;
-			font-size: 34rpx;
+
+		.message-font {
+			margin: 0 40rpx;
+			font-size: 28rpx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #ffffff;
-			text-align: center;
-			line-height: 78rpx;
+			color: #0c1732;
+		}
+
+		.message-right {
+			width: 18rpx;
+			height: 30rpx;
 		}
 	}
-}
-.message {
-	justify-content: space-around;
-	margin: 20rpx auto 0;
-	padding: 16rpx 40rpx 16rpx 50rpx;
-	width: 690rpx;
-	background: #ffffff;
-	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-	border-radius: 20rpx;
-	.message-left {
-		width: 52rpx;
-		height: 52rpx;
-		flex-shrink: 0;
-	}
-	.message-font {
-		margin: 0 40rpx;
-		font-size: 28rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #0c1732;
-	}
-	.message-right {
-		width: 18rpx;
-		height: 30rpx;
-	}
-}
-.hallist-bg {
-	position: relative;
-	z-index: 10;
-	margin: -280rpx auto 0;
-	width: 702rpx;
-	height: 300rpx;
-	border-radius: 14rpx;
-	image {
-		width: 100%;
-		height: 100%;
-	}
-}
-.navbar {
-	display: flex;
-	align-items: center;
-	justify-content: space-around;
-	width: 700rpx;
-	background: #ffffff;
-	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-	border-radius: 20rpx;
-	margin: 40rpx auto 0;
-	padding: 40rpx 0 50rpx;
-
-	.vvv {
-		width: 2rpx;
-		height: 74rpx;
-		background: #dcdcdc;
+
+	.hallist-bg {
+		position: relative;
+		z-index: 10;
+		margin: -280rpx auto 0;
+		width: 702rpx;
+		height: 300rpx;
+		border-radius: 14rpx;
+
+		image {
+			width: 100%;
+			height: 100%;
+		}
 	}
 
-	.navbar-item {
+	.navbar {
 		display: flex;
-		flex-direction: column;
 		align-items: center;
+		justify-content: space-around;
+		width: 700rpx;
+		background: #ffffff;
+		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+		border-radius: 20rpx;
+		margin: 40rpx auto 0;
+		padding: 40rpx 0 50rpx;
+
+		.vvv {
+			width: 2rpx;
+			height: 74rpx;
+			background: #dcdcdc;
+		}
 
-		.navbar-font {
-			margin-bottom: 10rpx;
+		.navbar-item {
 			display: flex;
-			justify-content: center;
+			flex-direction: column;
 			align-items: center;
 
-			image {
-				margin-right: 10rpx;
-				width: 40rpx;
-				height: 40rpx;
+			.navbar-font {
+				margin-bottom: 10rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+
+				image {
+					margin-right: 10rpx;
+					width: 40rpx;
+					height: 40rpx;
+				}
+
+				.font {
+					font-size: 30rpx;
+					font-weight: bold;
+					color: #0c1732;
+				}
 			}
 
-			.font {
-				font-size: 30rpx;
+			.navbar-num {
+				font-size: 34rpx;
 				font-weight: bold;
 				color: #0c1732;
 			}
 		}
-
-		.navbar-num {
-			font-size: 34rpx;
-			font-weight: bold;
-			color: #0c1732;
-		}
 	}
-}
 </style>

pages/index/index.vue

@@ -1,11 +1,11 @@
-<strong></strong><template>
+<template>
 	<view class="center">
 		<view class="top">
 			<!-- <image class="top-bg" src="../../static/img/top-bg.png" mode=""></image> -->
 			<view class="top-main flex">
 				<view class="search-box flex" @click="clickSearch()">
 					<image class="search" src="../../static/img/search.png" mode=""></image>
-					<view class="search-font">输入关键词搜索</view>
+					<view class="search-font">请输入关键词搜索</view>
 				</view>
 			</view>
 		</view>
@@ -67,7 +67,7 @@
 		<view class="shingle" v-if="list">
 			<view class="shingle-top flex">
 				<view class="shingle-title">商品认购体验馆</view>
-				<view class="shingle-btn" @click="nav('/pages/hall/hall')">
+				<view class="shingle-btn" @click="navTo(list)">
 					超值体验
 					<text>></text>
 				</view>
@@ -156,9 +156,12 @@
 		store_list
 	} from '@/api/index.js';
 	import uniCountdowns from '@/components/uni-countdown/uni-countdowns.vue';
+	// #ifdef H5
 	import {
 		openMap
 	} from '@/utils/rocessor.js';
+	// #endif
+	
 	import {
 		auction_gu
 	} from '@/api/hall.js';

pages/money/jinDou.vue

@@ -126,6 +126,7 @@ export default {
 	onLoad(options) {},
 	onShow() {
 		this.loadData();
+		console.log(this.userInfo,'kkkkkkkk');
 	},
 	methods: {
 		// 页面跳转

pages/money/money.vue

@@ -1,5 +1,10 @@
 <template>
 	<view class="center">
+		<!-- #ifdef APP -->
+		<view class="app">
+			
+		</view>
+		<!-- #endif -->
 		<view class="top">
 			<image class="top-bg" src="../../static/img/order99.png" mode=""></image>
 			<view class="top-font">余额（元）</view>
@@ -159,6 +164,10 @@ export default {
 </script>
 
 <style lang="less">
+	.app{
+		width: 100%;height: 80rpx;
+		background: #fff;
+	}
 .center {
 	height: 100%;
 	width: 100%;

pages/product/classify.vue

@@ -1,5 +1,10 @@
 <template>
 	<view class="container">
+		<!-- #ifdef APP -->
+		<view class="app">
+			<!-- <image src="../../static/img/left.png" mode=""></image> -->
+		</view>
+		<!-- #endif -->
 		<empty v-if="loaded === true && list.length === 0"></empty>
 		<view class="hotgoods">
 			<view class="hotgoods-item" v-for="item in list" :key="item.id" @click="navToDetailPage(item)">
@@ -42,12 +47,14 @@ export default {
 	},
 	onLoad(option) {
 		// 获取查询对象
-		if (option.type) {
-			this.type = option.type;
-			uni.setNavigationBarTitle({
-				title: option.type == 1 ? '医斯佳专区':option.type == 2 ? '趣豆购区' : option.type == 4 ? '随意嗨购' : option.type == 3 ? 'CBB专区' : '购物券区'
-			});
-		}
+	
+	if (option.type) {
+		this.type = option.type;
+		uni.setNavigationBarTitle({
+			title: option.type == 1 ? '医斯佳专区':option.type == 2 ? '趣豆购区' : option.type == 4 ? '随意嗨购' : option.type == 3 ? 'CBB专区' : '购物券区'
+		});
+	}
+	
 		// 加载基础数据
 		this.loadData();
 	},
@@ -115,6 +122,11 @@ export default {
 page {
 	background: $page-color-base;
 }
+.app{
+	width: 100%;
+	height: 40rpx;
+	background: #ffffff;
+}
 
 .carousel-section {
 	padding: 0;

pages/public/forget.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
-		<view class="logo-img"><image src="../../static/img/log.png" mode=""></image></view>
-		<view class="logo">易趣go</view>
+		<view class="logo-img"><image src="../../static/img/log01.jpg" mode=""></image></view>
+		<view class="logo">易趣GO</view>
 		<view class="login_text">
 			<view class="login_input flex_item">
 				<view class="login_img"><image class="phone" src="/static/img/phone.png"></image></view>

pages/public/login.vue

@@ -26,7 +26,7 @@
 					<view class="weixin_text" @click="wecahtLogin">微信登录</view>
 					<!-- #endif -->
 					<!-- #ifdef APP-PLUS -->
-					<block v-if="!is_ios">
+					<!-- <block v-if="!is_ios">
 						<view class="weixin" @click="wecahtLogin"><image src="/static/img/img05.png" mode="scaleToFill"></image></view>
 						<view class="weixin_text" @click="wecahtLogin">微信登录</view>
 					</block>
@@ -39,7 +39,7 @@
 							<image class="loginIcon" src="/static/icon/appleIcon.png" mode=" scaleToFill"></image>
 							<text class="weixin_text">通过Apple登录</text>
 						</view>
-					</block>
+					</block> -->
 					<!-- #endif -->
 				</view>
 			</view>

pages/redirect/redirect.vue

@@ -38,21 +38,23 @@ export default {
 			})
 				.then(({ data }) => {
 					obj.wchatAuth(data);
+					console.log(data,'进入+++++++++++++++++++++++++++++++++++++');
 				})
 				.catch(e => {
 					obj.wchatAuth(data);
-					// uni.showModal({
-					// 	title: '提示',
-					// 	content: '您未绑定手机号，请您先去绑定手机号',
-					// 	showCancel: false,
-					// 	success: function(res) {
-					// 		if (res.confirm) {
-					// 			uni.navigateTo({
-					// 				url: '/pages/set/phone'
-					// 			});
-					// 		}
-					// 	}
-					// });
+					console.log('进入了但是没有提示手机号');
+					uni.showModal({
+						title: '提示',
+						content: '您未绑定手机号，请您先去绑定手机号',
+						showCancel: false,
+						success: function(res) {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: '/pages/set/phone'
+								});
+							}
+						}
+					});
 				});
 		},
 		// #endif
@@ -85,7 +87,7 @@ export default {
 				})
 				.catch(e => {
 					uni.showModal({
-						title: '错误',
+						title: '错误11111',
 						content: JSON.stringify(e),
 						showCancel: false
 					});
@@ -97,11 +99,11 @@ export default {
 			// 保存token
 			uni.setStorageSync('token', data.token);
 			// 获取用户基础信息
-			console.log('获取用户信息');
 			getUserInfo({})
 				.then(e => {
 					obj.login();
 					// 保存返回用户数据
+					
 					obj.setUserInfo(e.data);
 					let ur = uni.getStorageSync('present') || '/pages/index/index';
 					// 用于处理缓存bug
@@ -109,45 +111,43 @@ export default {
 						ur = '/pages/index/index';
 					}
 					console.log('跳转');
-					uni.switchTab({
-						url: '/pages/index/index'
-					});
-					// console.log(e.data, '用户信息');
-					// if (e.data.phone || e.data.email) {
-					// 	console.log('有手机号');
-					// 	uni.switchTab({
-					// 		url: ur,
-					// 		fail(e) {
-					// 			uni.navigateTo({
-					// 				url: ur,
-					// 				fail(e) {
-					// 					uni.navigateTo({
-					// 						url: '/pages/index/index'
-					// 					});
-					// 				}
-					// 			});
-					// 		}
-					// 	});
-					// } else {
-					// 	console.log('没有手机号');
-					// 	uni.showModal({
-					// 		title: '提示',
-					// 		content: '请先绑定手机号',
-					// 		showCancel: false,
-					// 		success: res => {
-					// 			uni.navigateTo({
-					// 				url: '/pages/set/phone'
-					// 			});
-					// 		},
-					// 		fail(e) {
-					// 			console.log(e);
-					// 		}
-					// 	});
-					// }
+					// uni.switchTab({
+					// 	url: '/pages/index/index'
+					// });
+					if (e.data.phone) {
+						console.log('有手机号');
+						uni.switchTab({
+							url: ur,
+							fail(e) {
+								uni.navigateTo({
+									url: ur,
+									fail(e) {
+										uni.navigateTo({
+											url: '/pages/index/index'
+										});
+									}
+								});
+							}
+						});
+					} else {
+						uni.showModal({
+							title: '提示',
+							content: '请先绑定手机号',
+							showCancel: false,
+							success: res => {
+								uni.navigateTo({
+									url: '/pages/set/phone'
+								});
+							},
+							fail(e) {
+								console.log(e);
+							}
+						});
+					}
 				})
 				.catch(e => {
 					uni.showModal({
-						title: '错误',
+						title: '错误1111112',
 						content: JSON.stringify(e),
 						showCancel: false
 					});

pages/set/phone.vue

@@ -89,6 +89,7 @@ export default {
 			})
 				.then(({ data }) => {
 					obj.$api.msg('绑定成功！');
+					console.log("绑定成功");
 					setTimeout(function() {
 						obj.loding = false;
 						uni.switchTab({
@@ -98,7 +99,7 @@ export default {
 				})
 				.catch(err => {
 					obj.loding = false;
-					console.log(err);
+					console.log(err,"err");
 				});
 		}
 	}

pages/user/shareQrCode.vue

@@ -42,7 +42,7 @@ export default {
 				type:1,
 				//#endif
 				//#ifdef APP-PLUS
-				type:2,
+				type:3,
 				//#endif
 			}).then(({ data }) => {
 				console.log(data);

pages/user/user.vue

@@ -58,7 +58,7 @@
 				<view class="jg"></view>
 				<view class="sy-item" @click="navTo('/pages/money/jinDou')">
 					<view class="sy-item-val">
-						{{userInfo.anticipate || '0.00'}}
+						{{userInfo.golden_bean || '0.00'}}
 					</view>
 					<view class="sy-item-name">
 						金豆
@@ -516,13 +516,13 @@
 	.container,page {
 		min-height: 100%;
 		height: auto;
-		background-color: $page-color-base;
+		background-color: #fff;
 	}
 
 
 	.vheigh {
 		height: var(--status-bar-height);
-		background-color: $base-color;
+		background-color:  #fff;
 	}
 
 	.user-section {

store/index.js

@@ -1,6 +1,7 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
 import user from './model/user'
+import {tabbar,tabbar1} from '@/utils/tabbar.js'
 Vue.use(Vuex)
 
 const store = new Vuex.Store({
@@ -16,6 +17,13 @@ const store = new Vuex.Store({
 		weichatObj: '', //微信对象
 		// #endif
 	},
+	getters:{
+		jump(item){
+			if(item==true){
+				return tabbar
+			}else return tabbar1
+		}
+	},
 	mutations: {
 		//保存微信信息
 		setWeiChatInfo(state, provider) {

unpackage/cache/apk/apkurl

@@ -0,0 +1 @@
+https://ide.dcloud.net.cn/build/download/f8c7f020-025d-11ed-bec6-0b05774bc9c6

unpackage/cache/certdata

@@ -0,0 +1,3 @@
+andrCertfile=D:/yqg.keystore
+andrCertAlias=com.yqg.cn
+andrCertPass=7IwuiYJfyRjKKTfhI7sjzw==

unpackage/cache/wgt/__UNI__0D9C79D/__uniappview.html

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+  <head>
+    <meta charset="UTF-8" />
+    <script>
+      var __UniViewStartTime__ = Date.now();
+      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
+        CSS.supports('top: constant(a)'))
+      document.write(
+        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+    </script>
+    <title>View</title>
+    <link rel="stylesheet" href="view.css" />
+  </head>
+
+  <body>
+    <div id="app"></div>
+    <script src="__uniappes6.js"></script>
+    <script src="view.umd.min.js"></script>
+    <script src="app-view.js"></script>
+  </body>
+
+</html>

unpackage/cache/wgt/__UNI__0D9C79D/androidPrivacy.json

@@ -0,0 +1,3 @@
+{
+    "prompt" : "none"
+}

unpackage/cache/wgt/__UNI__0D9C79D/app-config.js

@@ -0,0 +1 @@
+(function(e){function r(r){for(var n,l,i=r[0],p=r[1],a=r[2],c=0,s=[];c<i.length;c++)l=i[c],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in p)Object.prototype.hasOwnProperty.call(p,n)&&(e[n]=p[n]);f&&f(r);while(s.length)s.shift()();return u.push.apply(u,a||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,i=1;i<t.length;i++){var p=t[i];0!==o[p]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={"app-config":0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e["default"]}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="/";var i=this["webpackJsonp"]=this["webpackJsonp"]||[],p=i.push.bind(i);i.push=r,i=i.slice();for(var a=0;a<i.length;a++)r(i[a]);var f=p;t()})([]);

unpackage/cache/wgt/__UNI__0D9C79D/static/css/cmy.css

@@ -0,0 +1,551 @@
+/*初始化类*/
+@font-face {
+	font-family: 'iconfont';
+	/* project id 1482221 */
+	src: url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.eot');
+	src: url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.eot?#iefix') format('embedded-opentype'),
+		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff2') format('woff2'),
+		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff') format('woff'),
+		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.ttf') format('truetype'),
+		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.svg#iconfont') format('svg');
+}
+
+.acea-row {
+	display: -webkit-box;
+	display: -moz-box;
+	display: -webkit-flex;
+	display: -ms-flexbox;
+	display: flex;
+	-webkit-box-lines: multiple;
+	-moz-box-lines: multiple;
+	-o-box-lines: multiple;
+	-webkit-flex-wrap: wrap;
+	-ms-flex-wrap: wrap;
+	flex-wrap: wrap
+}
+
+.acea-row.row-middle {
+	-webkit-box-align: center;
+	-moz-box-align: center;
+	-o-box-align: center;
+	-ms-flex-align: center;
+	-webkit-align-items: center;
+	align-items: center
+}
+
+.bg-color-red {
+	background-color: #e93323 !important;
+}
+
+.acea-row.row-right {
+	-webkit-box-pack: end;
+	-moz-box-pack: end;
+	-o-box-pack: end;
+	-ms-flex-pack: end;
+	-webkit-justify-content: flex-end;
+	justify-content: flex-end
+}
+
+.acea-row.row-between-wrapper {
+	-webkit-box-align: center;
+	-moz-box-align: center;
+	-o-box-align: center;
+	-ms-flex-align: center;
+	-webkit-align-items: center;
+	align-items: center;
+	-webkit-box-pack: justify;
+	-moz-box-pack: justify;
+	-o-box-pack: justify;
+	-ms-flex-pack: justify;
+	-webkit-justify-content: space-between;
+	justify-content: space-between
+}
+
+.acea-row.row-column-around {
+	-webkit-flex-direction: column;
+	-ms-flex-direction: column;
+	flex-direction: column;
+	justify-content: space-around;
+	-webkit-justify-content: space-around
+}
+
+.acea-row.row-center-wrapper {
+	-webkit-box-align: center;
+	-moz-box-align: center;
+	-o-box-align: center;
+	-ms-flex-align: center;
+	-webkit-align-items: center;
+	align-items: center;
+	-webkit-box-pack: center;
+	-moz-box-pack: center;
+	-o-box-pack: center;
+	-ms-flex-pack: center;
+	-webkit-justify-content: center;
+	justify-content: center
+}
+
+.iconfont {
+	font-family: "iconfont" !important;
+	font-size: 34rpx;
+	font-style: normal;
+	-webkit-font-smoothing: antialiased;
+	-webkit-text-stroke-width: 0rpx;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+.iconedit:before {
+	content: "\e649";
+}
+
+.iconfavorfill:before {
+	content: "\e64b";
+}
+
+.iconfavor:before {
+	content: "\e64c";
+}
+
+.iconlocation:before {
+	content: "\e651";
+}
+
+.iconroundcheckfill:before {
+	content: "\e656";
+}
+
+.iconroundcheck:before {
+	content: "\e657";
+}
+
+.iconunfold:before {
+	content: "\e661";
+}
+
+.iconlikefill:before {
+	content: "\e668";
+}
+
+.iconlike:before {
+	content: "\e669";
+}
+
+.iconshop:before {
+	content: "\e676";
+}
+
+.iconcart:before {
+	content: "\e6af";
+}
+
+.icondelete:before {
+	content: "\e6b4";
+}
+
+.iconhome:before {
+	content: "\e6b8";
+}
+
+.iconcartfill:before {
+	content: "\e6b9";
+}
+
+.iconhomefill:before {
+	content: "\e6bb";
+}
+
+.iconlock:before {
+	content: "\e6c0";
+}
+
+.iconfriendadd:before {
+	content: "\e6ca";
+}
+
+.iconfold:before {
+	content: "\e6de";
+}
+
+.iconapps:before {
+	content: "\e729";
+}
+
+.iconadd:before {
+	content: "\e767";
+}
+
+.iconmove:before {
+	content: "\e768";
+}
+
+.icontriangledownfill:before {
+	content: "\e79b";
+}
+
+.icontriangleupfill:before {
+	content: "\e79c";
+}
+
+.iconshaixuan:before {
+	content: "\e74a";
+}
+
+.iconyanzhengma:before {
+	content: "\e684";
+}
+
+.iconjifen:before {
+	content: "\e60f";
+}
+
+.iconwuliuxinxi:before {
+	content: "\e62b";
+}
+
+.iconmessage:before {
+	content: "\e78a";
+}
+
+.iconsetting:before {
+	content: "\e78e";
+}
+
+.iconaddition:before {
+	content: "\e6e0";
+}
+
+.iconclose:before {
+	content: "\e6e9";
+}
+
+.iconenter:after {
+	content: "\e6f8";
+}
+
+.iconprompt:before {
+	content: "\e71b";
+}
+
+.iconreturn:before {
+	content: "\e720";
+}
+
+.iconsearch:before {
+	content: "\e741";
+}
+
+.iconpengyouquan:before {
+	content: "\e62c";
+}
+
+.iconweixin:before {
+	content: "\e60e";
+}
+
+.iconzhifubao:before {
+	content: "\e673";
+}
+
+.iconyue:before {
+	content: "\e618";
+}
+
+.iconweixin1:before {
+	content: "\e622";
+}
+
+.iconlock1:before {
+	content: "\e64d";
+}
+
+.iconuser:before {
+	content: "\e64e";
+}
+
+.iconchenggongtixianshouyi:before {
+	content: "\e64f";
+}
+
+.iconviptuiguangdingdan:before {
+	content: "\e650";
+}
+
+.icondaifukuan:before {
+	content: "\e652";
+}
+
+.icondaijiesuanshouyi:before {
+	content: "\e653";
+}
+
+.icondaidakuanshouyi:before {
+	content: "\e654";
+}
+
+.icondaifahuo:before {
+	content: "\e655";
+}
+
+.icondaishouhuoshouyi:before {
+	content: "\e658";
+}
+
+.icondaishouhuo:before {
+	content: "\e659";
+}
+
+.iconwuxiaoshouyi:before {
+	content: "\e65a";
+}
+
+.icontixianmingxi:before {
+	content: "\e65b";
+}
+
+.iconshouyi:before {
+	content: "\e65c";
+}
+
+.iconkouchutixianshouxufei:before {
+	content: "\e65d";
+}
+
+.iconyishenqingshouyi:before {
+	content: "\e65e";
+}
+
+.icontuihuanhuo:before {
+	content: "\e65f";
+}
+
+
+/*水平线*/
+.hr {
+	width: 100%;
+	position: relative;
+	border-bottom: 1px solid #dddddd;
+	/* height: 0.5rpx; */
+}
+
+/* 一行显示 */
+.clamp {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	display: block;
+}
+
+/* 二行显示 */
+.clamp2 {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
+}
+
+/* 二行显示 */
+.ellipsis {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 2;
+}
+
+.common-hover {
+	background: #f5f5f5;
+}
+
+/* 角标 */
+.corner {
+	background-color: #e51c23;
+	position: absolute;
+	right: -18rpx;
+	top: -18rpx;
+	color: #FFFFFF;
+	text-align: center;
+	border-radius: 999px;
+	font-size: 24rpx !important;
+	min-width: 35rpx;
+	min-height: 35rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	line-height: 1;
+}
+
+.flex_item {
+	display: flex;
+	align-items: center;
+	/* justify-content: space-between; */
+}
+
+/* 左右顶格加上下居中 */
+.flex-between-center {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+
+/* flex布局-整体居中 */
+.flex-center {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.flex-start {
+	display: flex;
+	align-items: center;
+	justify-content: flex-start;
+}
+
+/*文字对齐*/
+.text-left {
+	text-align: left !important;
+}
+
+.text-center {
+	text-align: center !important;
+}
+
+.text-justify {
+	text-align: justify !important;
+}
+
+.text-right {
+	text-align: right !important;
+}
+
+.text-default {
+	color: #212121 !important;
+}
+
+.text-white {
+	color: #ffffff !important;
+}
+
+.text-primary {
+	color: #00bcd4 !important;
+}
+
+.text-success {
+	color: #009688 !important;
+}
+
+.text-info {
+	color: #03a9f4 !important;
+}
+
+.text-warning {
+	color: #ffc107 !important;
+}
+
+.text-danger {
+	color: #e51c23 !important;
+}
+
+.text-pink {
+	color: #e91e63 !important;
+}
+
+.text-purple {
+	color: #673ab7 !important;
+}
+
+.text-indigo {
+	color: #3f51b5 !important;
+}
+
+.text-gray {
+	color: #999999 !important;
+}
+
+.bg-default {
+	background-color: #f5f5f5 !important;
+}
+
+.bg-primary {
+	background-color: #00bcd4 !important;
+}
+
+.bg-success {
+	background-color: #009688 !important;
+}
+
+.bg-info {
+	background-color: #03a9f4 !important;
+}
+
+.bg-warning {
+	background-color: #FFB238 !important;
+}
+
+.bg-danger {
+	background-color: #DC4D46 !important;
+}
+
+.bg-pink {
+	background-color: #e91e63 !important;
+}
+
+.bg-purple {
+	background-color: #673ab7 !important;
+}
+
+.bg-indigo {
+	background-color: #3f51b5 !important;
+}
+
+.bg-white {
+	background-color: white !important;
+}
+
+.bg-gray {
+	background-color: #e3e3e3 !important;
+}
+
+/* 边框 */
+.border-radius-15 {
+	border-radius: 15rpx;
+}
+
+.border-radius-10 {
+	border-radius: 10rpx;
+}
+
+.border-radius-all {
+	border-radius: 1000rpx;
+}
+
+/* 底部边线 */
+.borde-b {
+	border-bottom: 1px solid #dddddd;
+}
+
+/* 弹性盒子 */
+.flex {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.items-left {
+	justify-content: flex-start;
+}
+
+.items-right {
+	justify-content: flex-end;
+}
+
+.flex-shrink-false {
+	flex-shrink: 0;
+}
+
+.flex-grow-true {
+	flex-grow: 1;
+}
+
+.position-relative {
+	position: relative;
+}