cmy 2 vuotta sitten
vanhempi
commit
cd4c982d1a

+ 8 - 3
manifest.json

@@ -2,8 +2,8 @@
     "name" : "宏根蒂",
     "appid" : "__UNI__D811809",
     "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
+    "versionName" : "1.0.1",
+    "versionCode" : 101,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */
@@ -42,7 +42,12 @@
             },
             /* ios打包配置 */
             "sdkConfigs" : {
-                "maps" : {},
+                "maps" : {
+                    "amap" : {
+                        "appkey_ios" : "",
+                        "appkey_android" : ""
+                    }
+                },
                 "oauth" : {
                     "weixin" : {
                         "appid" : "",

+ 63 - 15
pages/index/actionDetail.vue

@@ -2,23 +2,33 @@
 	<view class="content">
 		<image v-if="detail.pics" :src="detail.pics.split(',')[1]" mode="widthFix" class="top-img"></image>
 		<view class="add-if">
-			<view class="jj">
+			<view class="jj" v-if="!detail.partake">
 				<view class="if-tit">
 					购买7万元宏根蒂品牌红酒成为
 				</view>
 				<view class="if-level">
 					品牌经纪人
 				</view>
-				<view v-if="!detail.partake" class="if-status">
+				<view class="if-status">
 					{{userInfo.level > 0 ?'您已满足参与条件': '您未满足参与条件'}}
 				</view>
-				<view class="add-btn" v-if="!detail.partake" :class="{'cant': userInfo.level == 0}" @click="add()">
+				<view class="add-btn" :class="{'cant': userInfo.level == 0}" @click="add()">
 					立即参与
 				</view>
-				<view class="add-btn bg-gray"  v-else  >
-					已参与
+			</view>
+			<view v-else>
+				<view class="flex">
+					<image class="action_icon" src="../../static/img/action_left_icon.png" mode="widthFix"></image>
+					<view class="text-white action_title">
+						参与进度
+					</view>
+					<image class="action_icon" src="../../static/img/action_right_icon.png" mode="widthFix"></image>
+				</view>
+				<view class="jj margin-t-20">
+
 				</view>
 			</view>
+
 		</view>
 		<view class="add-recoed flex">
 			<view class="add-left">
@@ -35,7 +45,7 @@
 			<view class="jj" v-html="detail.content"></view>
 		</view>
 		<view class="" style="height: 60rpx;">
-			
+
 		</view>
 	</view>
 </template>
@@ -47,7 +57,9 @@
 		getActionDetail,
 		addAction
 	} from '@/api/index.js'
-	import { getUser } from '@/api/user.js'
+	import {
+		getUser
+	} from '@/api/user.js'
 	export default {
 		components: {
 			uniLoadMore,
@@ -56,7 +68,7 @@
 		data() {
 			return {
 				userInfo: {
-					
+
 				},
 				detail: {}
 			}
@@ -66,13 +78,19 @@
 			this.getUser()
 		},
 		onShow() {
-			
+
 		},
 		onReachBottom() {
 
 		},
 		onReady() {
 
+		},
+		onBackPress() {
+			uni.navigateTo({
+				url: '/pages/index/index'
+			})
+			return true;
 		},
 		methods: {
 			goDetail() {
@@ -89,8 +107,10 @@
 			getActionDetail() {
 				let that = this
 				getActionDetail({
-					
-				},that.id).then(res => {
+
+				}, that.id).then(res => {
+
+					console.log(res);
 					that.detail = res.data
 				})
 			},
@@ -103,7 +123,7 @@
 					out_id: this.id
 				}).then(res => {
 					uni.hideLoading()
-				}).catch(()=>{
+				}).catch(() => {
 					uni.hideLoading()
 				})
 			}
@@ -117,6 +137,7 @@
 		min-height: 100%;
 		background-color: #fdd717;
 	}
+
 	.add-if {
 		width: 693rpx;
 		margin: 20rpx auto;
@@ -124,12 +145,23 @@
 		background: linear-gradient(0deg, #FF9805, #FFB606);
 		border-radius: 20rpx;
 		padding: 20rpx;
+
+		.action_title {
+			font-size: 44rpx;
+		}
+
+		.action_icon {
+			height: 22rpx;
+			width: 46rpx;
+		}
+
 		.if-tit {
 			font-size: 43rpx;
 			font-weight: bold;
 			text-align: center;
 			color: #6B4216;
 		}
+
 		.if-level {
 			width: 274rpx;
 			height: 76rpx;
@@ -140,14 +172,16 @@
 			font-size: 37rpx;
 			font-weight: bold;
 			color: #6B4216;
-			margin:40rpx auto 30rpx;
+			margin: 40rpx auto 30rpx;
 		}
+
 		.if-status {
 			font-size: 26rpx;
 			font-weight: 500;
 			color: #666666;
 			text-align: center;
 		}
+
 		.add-btn {
 			width: 366rpx;
 			height: 80rpx;
@@ -159,11 +193,13 @@
 			color: #6B4216;
 			text-align: center;
 			margin: 30rpx auto 20rpx;
-			&.bg-gray{
+
+			&.bg-gray {
 				color: #FFFFFF;
 			}
 		}
 	}
+
 	.add-recoed {
 		width: 693rpx;
 		height: 104rpx;
@@ -172,27 +208,33 @@
 		border-radius: 35rpx;
 		margin: 20rpx auto;
 		padding: 0 32rpx;
+
 		.add-left {
 			display: flex;
 			align-items: center;
+
 			image {
 				width: 38rpx;
 				margin: 0 15rpx 0 0;
 			}
+
 			font-size: 36rpx;
 			font-weight: bold;
 			color: #FFFFFF;
 		}
+
 		.add-right {
 			font-size: 30rpx;
 			font-weight: 500;
 			color: #FFFFFF;
+
 			image {
 				width: 15rpx;
 				margin: 0 0 0 15rpx;
 			}
 		}
 	}
+
 	.action-wrap {
 		width: 704rpx;
 		height: 330rpx;
@@ -205,6 +247,7 @@
 			border-radius: 20rpx;
 		}
 	}
+
 	.jj-wrap {
 		width: 693rpx;
 		// height: 100rpx;
@@ -213,6 +256,7 @@
 		background: linear-gradient(0deg, #FF9805, #FFB606);
 		border-radius: 35rpx;
 		margin: auto;
+
 		.jj-tit {
 			margin-bottom: 20rpx;
 			font-size: 44rpx;
@@ -220,6 +264,7 @@
 			color: #FFFFFF;
 			text-align: center;
 			position: relative;
+
 			&::before {
 				content: '';
 				position: absolute;
@@ -233,8 +278,9 @@
 				border-radius: 6rpx;
 			}
 		}
-		
+
 	}
+
 	.jj {
 		background-color: #fff;
 		width: 653rpx;
@@ -243,9 +289,11 @@
 		border: 3px solid #FCE791;
 		padding: 20rpx;
 	}
+
 	.top-img {
 		width: 750rpx;
 	}
+
 	.cant {
 		background: #D3D3D3 !important;
 		color: #fff !important;

+ 1 - 1
pages/index/index.vue

@@ -58,7 +58,7 @@
 				<view class="img-wrapper flex">
 					<image src="../../static/index/in7.png" mode=""></image>
 				</view>
-				<view class="item-title">升级条件</view>
+				<view class="item-title">加入我们</view>
 			</view>
 		</view>
 		<!-- 分类 ed -->

+ 12 - 2
pages/index/storeList.vue

@@ -38,8 +38,8 @@
 							<view class="hd-btn">
 								<image src="../../static/icon/call.png" mode="" style="margin-right: 15rpx;"
 									@click.stop="makeCall(item.phone)"></image>
-								<!-- <image src="../../static/icon/dh.png" mode=""
-									@click.stop="toGaodeMap(item)"></image> -->
+								<image src="../../static/icon/dh.png" mode=""
+									@click.stop="toGaodeMap(item)"></image>
 							</view>
 						</view>
 					</view>
@@ -217,7 +217,17 @@
 				// #ifdef H5
 				// console.log('选择高德', latitude, longitude, address);
 				window.location.href = `https://uri.amap.com/marker?position=${item.longitude},${item.latitude}&name=${item.address}`;
+				return
 				// #endif
+				uni.openLocation({
+					latitude:+item.latitude,
+					longitude:+item.longitude,
+					name:item.name,
+					address:item.detailed_address,
+					fail(e){
+						console.log(e,'连接失败');
+					}
+				})
 			},
 		}
 	}

+ 334 - 288
pages/public/login.vue

@@ -6,239 +6,264 @@
 		<view class="loginTitle"><text>登录</text></view>
 		<view class="login_text">
 			<view class="login_input flex">
-				<view class="login_img"><image src="/static/icon/img03.png"></image></view>
-				<view class="login_name"><input class="uni-input" v-model="username" focus placeholder="请输入手机号" /></view>
+				<view class="login_img">
+					<image src="/static/icon/img03.png"></image>
+				</view>
+				<view class="login_name"><input class="uni-input" v-model="username" focus placeholder="请输入手机号" />
+				</view>
 			</view>
 			<view class="login_input flex">
-				<view class="login_img"><image src="/static/icon/img04.png"></image></view>
-				<view class="login_name"><input class="uni-input" type="password" v-model="passward" focus placeholder="请输入密码" /></view>
+				<view class="login_img">
+					<image src="/static/icon/img04.png"></image>
+				</view>
+				<view class="login_name"><input class="uni-input" type="password" v-model="passward" focus
+						placeholder="请输入密码" /></view>
 			</view>
 			<view><button type="green" class="uni-button uni-button-green" @click="toLogin">登录</button></view>
-			<view><button type="green" class="uni-button uni-button-green uni-button-green-plain" plain="true" hover-class="none" @click="register">注册</button></view>
-			<navigator url="./forget"><view class="forget">忘记密码</view></navigator>
+			<view><button type="green" class="uni-button uni-button-green uni-button-green-plain" plain="true"
+					hover-class="none" @click="register">注册</button></view>
+			<navigator url="./forget">
+				<view class="forget">忘记密码</view>
+			</navigator>
 			<view class="flex other">
 				<view class="fenge"></view>
 				<view class="qita">其他方式登录</view>
 				<view class="fenge"></view>
 			</view>
 			<!-- #ifndef APP-PLUS -->
-					<view class="weixin" @click="wecahtLogin"><image src="/static/img/img05.png"></image></view>
-					<view class="weixin_text" @click="wecahtLogin">微信登录</view>
-					<!-- #endif -->
-					<!-- #ifdef APP-PLUS -->
-					<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>
-					<block v-else>
-						<view class="ios_login flex" @click="wecahtLogin('weixin')">
-							<text class="iconfont iconweixin"></text>
-							<text class="weixin_text">微信登录</text>
-						</view>
-						<view v-if='is_apple_login' class="ios_login flex" @click="wecahtLogin('apple')">
-							<image class="loginIcon" src="/static/icon/appleIcon.png" mode=" scaleToFill"></image>
-							<text class="weixin_text">通过Apple登录</text>
-						</view>
-					</block>
-					<!-- #endif -->
-				</view>
+			<view class="weixin" @click="wecahtLogin">
+				<image src="/static/img/img05.png"></image>
 			</view>
+			<view class="weixin_text" @click="wecahtLogin">微信登录</view>
+			<!-- #endif -->
+			<!-- #ifdef APP-PLUS -->
+			<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>
+			<block v-else>
+				<view class="ios_login flex" @click="wecahtLogin('weixin')">
+					<text class="iconfont iconweixin"></text>
+					<text class="weixin_text">微信登录</text>
+				</view>
+				<view v-if='is_apple_login' class="ios_login flex" @click="wecahtLogin('apple')">
+					<image class="loginIcon" src="/static/icon/appleIcon.png" mode=" scaleToFill"></image>
+					<text class="weixin_text">通过Apple登录</text>
+				</view>
+			</block>
+			<!-- #endif -->
+		</view>
+	</view>
 </template>
 
 <script>
-import { mapMutations } from 'vuex';
-import { login} from '@/api/login.js';
-import { getUserInfo} from '@/api/user.js';
-// #ifdef APP-PLUS
-// applelogin接口需要开发编写,基础项目中可能没有
-import { applelogin } from '@/api/set.js';
-// loginWx接口需要开发编写,基础项目中可能没有
-import { loginWx } from '@/api/login.js';
-// #endif
-// #ifdef H5
-import { loginWinxin } from '@/utils/wxAuthorized';
-// #endif
-export default {
-	data() {
-		return {
-			username: '',
-			passward: '',
-			// #ifdef APP-PLUS
-			is_ios: false ,//判断是否为ios手机
-			is_apple_login:false,//是否有ios授权登录功能
-			// #endif
-		};
-	},
-	onLoad() {
-		let obj = this;
-		// #ifdef APP-PLUS
-		let system = uni.getStorageSync('platform');
-		// 判断是否为ios
-		if (system == 'ios') {
-			obj.is_ios = true;
-		}
-		uni.getSystemInfo({
-			success(e) {
-				if(+e.system.split('.')[0]>=13){
-					obj.is_apple_login=true;
-				}
-			}
-		})
-		// #endif
-	},
-	methods: {
-		...mapMutations('user', ['setUserInfo', 'login']),
-		// 微信登录
-		wecahtLogin(type) {
+	import {
+		mapMutations
+	} from 'vuex';
+	import {
+		login
+	} from '@/api/login.js';
+	import {
+		getUserInfo
+	} from '@/api/user.js';
+	// #ifdef APP-PLUS
+	// applelogin接口需要开发编写,基础项目中可能没有
+	import {
+		applelogin
+	} from '@/api/set.js';
+	// loginWx接口需要开发编写,基础项目中可能没有
+	import {
+		loginWx
+	} from '@/api/login.js';
+	// #endif
+	// #ifdef H5
+	import {
+		loginWinxin
+	} from '@/utils/wxAuthorized';
+	// #endif
+	export default {
+		data() {
+			return {
+				username: '',
+				passward: '',
+				// #ifdef APP-PLUS
+				is_ios: false, //判断是否为ios手机
+				is_apple_login: false, //是否有ios授权登录功能
+				// #endif
+			};
+		},
+		onLoad() {
 			let obj = this;
-			// #ifdef H5
-			let weichatBrowser = uni.getStorageSync('weichatBrowser');
-			if (weichatBrowser) {
-				loginWinxin();
-			}
-			// #endif
 			// #ifdef APP-PLUS
-			uni.login({
-				provider: type,
+			let system = uni.getStorageSync('platform');
+			// 判断是否为ios
+			if (system == 'ios') {
+				obj.is_ios = true;
+			}
+			uni.getSystemInfo({
 				success(e) {
-					uni.getUserInfo({
-						provider: type,
-						success(es) {
-							if(type==='weixin'){
-								loginWx(es.userInfo)
-									.then(e => {
-										uni.setStorageSync('token', e.data.token);
-										getUserInfo({}).then(e => {
-											obj.login();
-											// 保存返回用户数据
-											obj.setUserInfo(e.data);
-											//成功跳转首页
-											uni.switchTab({
-												url: '/pages/index/index'
+					if (+e.system.split('.')[0] >= 13) {
+						obj.is_apple_login = true;
+					}
+				}
+			})
+			// #endif
+		},
+		methods: {
+			...mapMutations('user', ['setUserInfo', 'login']),
+			// 微信登录
+			wecahtLogin(type) {
+				let obj = this;
+				// #ifdef H5
+				let weichatBrowser = uni.getStorageSync('weichatBrowser');
+				if (weichatBrowser) {
+					loginWinxin();
+				}
+				// #endif
+				// #ifdef APP-PLUS
+				uni.login({
+					provider: type,
+					success(e) {
+						uni.getUserInfo({
+							provider: type,
+							success(es) {
+								if (type === 'weixin') {
+									loginWx(es.userInfo)
+										.then((e) => {
+											uni.setStorageSync('token', e.data.token);
+											getUserInfo({}).then(e => {
+												obj.login();
+												// 保存返回用户数据
+												obj.setUserInfo(e.data);
+												//成功跳转首页
+												uni.switchTab({
+													url: '/pages/index/index'
+												});
 											});
-										});
-									})
-									.catch(e => {
-										console.log(e);
-										uni.showModal({
-											content: JSON.stringify(e),
-											success() {},
-											fail() {}
-										});
-									});
-							}
-							if(type==='apple'){
-								console.log(es.userInfo);
-								applelogin({
-									account: es.userInfo.openId,
-								})
-									.then(function(e) {
-										console.log(e,'token')
-										uni.setStorageSync('token', e.data.token);
-										getUserInfo({}).then(e => {
-											obj.login();
-											// 保存返回用户数据
-											obj.setUserInfo(e.data);
-											//成功跳转首页
-											uni.switchTab({
-												url: '/pages/index/index'
+										})
+										.catch(e => {
+											console.log(e);
+											uni.showModal({
+												content: JSON.stringify(e),
+												success() {},
+												fail() {}
 											});
 										});
-										
-									})
-									.catch(function(e) {
-										console.log(e);
-									});
-							}
-							
-						},
-						fail(es) {
-							uni.showModal({
-								content: JSON.stringify(es),
-								success() {
-									// obj.login();
-									// // 保存返回用户数据
-									// obj.setUserInfo(e.data);
-									// //成功跳转首页
-									// uni.switchTab({
-									// 	url: '/pages/index/index'
-									// });
 								}
-							});
-						}
-					});
-				},
-				fail(e) {
-					uni.showModal({
-						title: '提示',
-						content: JSON.stringify(e),
-						showCancel: false
-					});
-				}
-			});
-			// #endif
-		},
-		//登录
-		async toLogin() {
-			let obj = this;
-			obj.logining = true;
-			if (obj.username == '') {
-				obj.$api.msg('请输入手机号');
-				return;
-			}
-			if (obj.passward == '') {
-				obj.$api.msg('请输入密码');
-				return;
-			}
-			login({
-				account: obj.username,
-				password: obj.passward
-			})
-				.then(function(e) {
-					uni.setStorageSync('token', e.data.token);
-					obj.$store.commit('hasLogin', true);
-					getUserInfo({}).then(e => {
-						obj.login();
-						// 保存返回用户数据
-						obj.setUserInfo(e.data);
-						let ur = uni.getStorageSync('present')|| '/pages/index/index';
-						//成功跳转首页
-						uni.switchTab({
-							url: ur,
-							fail(e) {
-								uni.navigateTo({
-									url: ur,
-									fail(e) {
-										uni.navigateTo({
-											url: '/pages/index/index',
+								if (type === 'apple') {
+									console.log(es.userInfo);
+									applelogin({
+											account: es.userInfo.openId,
+										})
+										.then(function(e) {
+											console.log(e, 'token')
+											uni.setStorageSync('token', e.data.token);
+											getUserInfo({}).then(e => {
+												obj.login();
+												// 保存返回用户数据
+												obj.setUserInfo(e.data);
+												//成功跳转首页
+												uni.switchTab({
+													url: '/pages/index/index'
+												});
+											});
+
+										})
+										.catch(function(e) {
+											console.log(e);
 										});
+								}
+
+							},
+							fail(es) {
+								uni.showModal({
+									content: JSON.stringify(es),
+									success() {
+										// obj.login();
+										// // 保存返回用户数据
+										// obj.setUserInfo(e.data);
+										// //成功跳转首页
+										// uni.switchTab({
+										// 	url: '/pages/index/index'
+										// });
 									}
 								});
 							}
 						});
+					},
+					fail(e) {
+						uni.showModal({
+							title: '提示',
+							content: JSON.stringify(e),
+							showCancel: false
+						});
+					}
+				});
+				// #endif
+			},
+			//登录
+			async toLogin() {
+				let obj = this;
+				obj.logining = true;
+				if (obj.username == '') {
+					obj.$api.msg('请输入手机号');
+					return;
+				}
+				if (obj.passward == '') {
+					obj.$api.msg('请输入密码');
+					return;
+				}
+				login({
+						account: obj.username,
+						password: obj.passward
+					})
+					.then(function(e) {
+						uni.setStorageSync('token', e.data.token);
+						obj.$store.commit('hasLogin', true);
+						getUserInfo({}).then(e => {
+							obj.login();
+							// 保存返回用户数据
+							obj.setUserInfo(e.data);
+							let ur = uni.getStorageSync('present') || '/pages/index/index';
+							//成功跳转首页
+							uni.switchTab({
+								url: ur,
+								fail(e) {
+									uni.navigateTo({
+										url: ur,
+										fail(e) {
+											uni.navigateTo({
+												url: '/pages/index/index',
+											});
+										}
+									});
+								}
+							});
+						});
+					})
+					.catch(function(e) {
+						console.log(e);
 					});
-				})
-				.catch(function(e) {
-					console.log(e);
+			},
+			//跳转注册页
+			register() {
+				uni.navigateTo({
+					url: `/pages/public/register`
 				});
-		},
-		//跳转注册页
-		register() {
-			uni.navigateTo({
-				url: `/pages/public/register`
-			});
-		},
-		// 后退
-		navBack() {
-			uni.navigateBack();
+			},
+			// 后退
+			navBack() {
+				uni.navigateBack();
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
 	/* #ifdef APP-PLUS */
-	
+
 	.ios_login {
 		width: 260rpx;
 		border-radius: 12rpx;
@@ -248,17 +273,19 @@ export default {
 		padding: 10rpx;
 		background-color: #212121;
 		color: #ffffff;
+
 		.loginIcon {
 			width: 50rpx;
 			height: 50rpx;
 		}
+
 		.weixin_text {
 			line-height: 1;
 			margin-left: 20rpx;
 			color: #ffffff !important;
 		}
 	}
-	
+
 	/* #endif */
 	.ios_login {
 		width: 350rpx;
@@ -270,117 +297,136 @@ export default {
 		background-color: #212121;
 		color: #ffffff;
 		font-size: 32rpx;
+
 		.loginIcon {
 			font-size: 35rpx;
 			width: 35rpx;
 			height: 35rpx;
 		}
+
 		.weixin_text {
 			line-height: 1;
 			margin-left: 20rpx;
 			color: #ffffff !important;
 		}
 	}
-	
-page {
-	height: 100%;
-}
-.container {
-	width: 100%;
-	height: 100%;
-	background-size: 100%;
-}
-.container_text {
-	width: 100%;
-	height: 500rpx;
-	top: 0rpx;
-	.banner-img {
+
+	page {
+		height: 100%;
+	}
+
+	.container {
 		width: 100%;
 		height: 100%;
+		background-size: 100%;
 	}
-}
-.login_text {
-	margin: auto 30rpx;
-	position: relative;
-	padding: 100rpx 102rpx;
-	background-color: #ffffff;
-	margin-top: -180rpx;
-	border-radius: 20rpx;
-	.login_input {
-		border-bottom: 1px solid #f0f0f0;
-		margin-bottom: 65rpx;
-		.login_img image {
-			height: 35rpx;
-			width: 29rpx;
-			margin-right: 20rpx;
+
+	.container_text {
+		width: 100%;
+		height: 500rpx;
+		top: 0rpx;
+
+		.banner-img {
+			width: 100%;
+			height: 100%;
 		}
-		.uni-input {
-			text-align: left;
-			width: 470rpx;
-			font-size: 28rpx !important;
+	}
+
+	.login_text {
+		margin: auto 30rpx;
+		position: relative;
+		padding: 100rpx 102rpx;
+		background-color: #ffffff;
+		margin-top: -180rpx;
+		border-radius: 20rpx;
+
+		.login_input {
+			border-bottom: 1px solid #f0f0f0;
+			margin-bottom: 65rpx;
+
+			.login_img image {
+				height: 35rpx;
+				width: 29rpx;
+				margin-right: 20rpx;
+			}
+
+			.uni-input {
+				text-align: left;
+				width: 470rpx;
+				font-size: 28rpx !important;
+			}
+
+			.login_name {
+				color: #333333;
+			}
 		}
-		.login_name {
-			color: #333333;
+
+		.other {
+			margin-top: 60rpx;
+
+			.fenge {
+				width: 30%;
+				height: 2rpx;
+				background-color: #eeeeee;
+			}
+
+			.qita {
+				font-size: 28rpx;
+				color: #999999;
+			}
+		}
+
+		.weixin {
+			width: 75rpx;
+			height: 75rpx;
+			margin: 25rpx auto;
 		}
-	}
 
-	.other {
-		margin-top: 60rpx;
-		.fenge {
-			width: 30%;
-			height: 2rpx;
-			background-color: #eeeeee;
+		.weixin image {
+			width: 100%;
+			height: 100%;
 		}
-		.qita {
+
+		.weixin_text {
+			text-align: center;
 			font-size: 28rpx;
 			color: #999999;
 		}
+
+		.forget {
+			font-size: 28rpx;
+			width: 100%;
+			text-align: right;
+			color: #999999;
+		}
+
+		.uni-button-green {
+			color: #ffffff;
+			background-color: $base-color;
+			margin: 40rpx 10rpx;
+			border-radius: 50rpx;
+		}
+
+		.uni-button-green-plain {
+			border: 1px solid $base-color;
+			margin: 40rpx 10rpx;
+			border-radius: 50rpx;
+			color: $base-color;
+			background-color: #ffffff;
+		}
+
+		.uni-button {
+			height: 85rpx;
+			line-height: 85rpx;
+		}
 	}
-	.weixin {
-		width: 75rpx;
-		height: 75rpx;
-		margin: 25rpx auto;
-	}
-	.weixin image {
+
+	.loginTitle {
+		position: absolute;
+		top: 250rpx;
 		width: 100%;
-		height: 100%;
-	}
-	.weixin_text {
 		text-align: center;
-		font-size: 28rpx;
-		color: #999999;
-	}
-	.forget {
-		font-size: 28rpx;
-		width: 100%;
-		text-align: right;
-		color: #999999;
-	}
-
-	.uni-button-green {
-		color: #ffffff;
-		background-color: $base-color;
-		margin: 40rpx 10rpx;
-		border-radius: 50rpx;
-	}
-	.uni-button-green-plain {
-		border: 1px solid $base-color;
-		margin: 40rpx 10rpx;
-		border-radius: 50rpx;
-		color: $base-color;
-		background-color: #ffffff;
-	}
-	.uni-button {
-		height: 85rpx;
-		line-height: 85rpx;
+		color: white;
+		font-size: 40rpx;
 	}
-}
-.loginTitle {
-	position: absolute;
-	top: 250rpx;
-	width: 100%;
-	text-align: center;
-	color: white;
-	font-size: 40rpx;
-}
 </style>

+ 17 - 3
pages/user/shareQrCode.vue

@@ -26,6 +26,9 @@
 		mapState,
 		mapMutations
 	} from 'vuex';
+	import {
+		getUserInfo
+	} from '@/api/user.js';
 	export default {
 		data() {
 			return {
@@ -45,10 +48,21 @@
 			};
 		},
 		onLoad() {
-			
+			const obj = this;
+			if(!this.userInfo.uid){
+				getUserInfo({}).then(e => {
+					// 保存返回用户数据
+					obj.setUserInfo(e.data);
+					//成功跳转首页
+					uni.switchTab({
+						url: '/pages/index/index'
+					});
+				});
+			}else{
+				this.val = 'http://hgd.liuniu946.com/appdom/index.html?spread=' + this.userInfo.uid
+			}
 		},
 		onShow() {
-			this.val = 'http://hgd.liuniu946.com/appdom/index.html?spread=' + this.userInfo.uid
 		},
 		//下拉刷新
 		onPullDownRefresh() {
@@ -74,7 +88,7 @@
 .erweima {
 	width: 300rpx;
 	position: absolute;
-	top: 923rpx;
+	top: 948rpx;
 	left: 0;
 	right: 0;
 	margin: auto;

BIN
static/img/action_bg.png


BIN
static/img/action_left_icon.png


BIN
static/img/action_right_icon.png


+ 1 - 0
unpackage/debug/.roid.ins

@@ -0,0 +1 @@
+forceInstall

BIN
unpackage/debug/android_debug.apk


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 3 - 3
unpackage/dist/dev/app-plus/app-service.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 80 - 81
unpackage/dist/dev/app-plus/app-view.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
unpackage/dist/dev/app-plus/manifest.json


Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä