qukaidi 4 роки тому
батько
коміт
ee21cf2670

+ 102 - 100
components/mi-map/mi-map.vue

@@ -1,15 +1,7 @@
 <template>
 	<view class="server-place">
-		<map
-			id='map'
-			ref='map'
-			v-bind:style="{height: mapH + 'px'}"
-			style="width: 100%;" 
-			:latitude="latitude" 
-			:longitude="longitude"
-			:controls='controls'
-			scale="18"
-			@regionchange='mapChange'>
+		<map id='map' ref='map' v-bind:style="{height: mapH + 'px'}" style="width: 100%;" :latitude="latitude" :longitude="longitude"
+		 :controls='controls' scale="18" @regionchange='mapChange'>
 		</map>
 		<view class="map-tools">
 			<view class="my-location" @tap="toMyLocation">
@@ -19,24 +11,24 @@
 					<text class="text">{{myAddress}}</text>
 				</view>
 			</view>
-			
+
 			<view class="start-place">
 				<view class="place">
 					<text class="text">{{addressObj.address}}</text>
 				</view>
 				<view class="tip">{{descText}}</view>
-				<button @tap="submitAdress" class="sure" type="primary">确认选择</button>
 			</view>
+			<button @tap="submitAdress" class="sure" type="primary">确认选择</button>
 		</view>
 	</view>
-	
+
 </template>
 
 <script>
 	const app = getApp()
 	var QQMapWX = require('./qqmap-wx-jssdk.min.js')
 	var qqmapsdk = new QQMapWX({
-	  key: 'LXCBZ-NNIKD-UZ64F-H6AFI-UNJLH-OCFGE'
+		key: 'LXCBZ-NNIKD-UZ64F-H6AFI-UNJLH-OCFGE'
 	})
 	export default {
 		props: {
@@ -59,17 +51,17 @@
 		},
 		data() {
 			return {
-				mapH: 0,             // 地图高度,可在initMapH()中设置高度
-				longitude: 0,        // 初始经度
-				latitude: 0,         // 初始纬度
-				myAddress: '',   	 // 初始地址信息
-				addressObj: {        // 地图选点信息
+				mapH: 0, // 地图高度,可在initMapH()中设置高度
+				longitude: 0, // 初始经度
+				latitude: 0, // 初始纬度
+				myAddress: '', // 初始地址信息
+				addressObj: { // 地图选点信息
 					longitude: '',
 					latitude: '',
 					address: '请选择集合地点'
 				},
-				controls: [],  // 地图中心点图标, 可更换iconPath, 详情见官方文档关于map组件的介绍
-				
+				controls: [], // 地图中心点图标, 可更换iconPath, 详情见官方文档关于map组件的介绍
+
 			};
 		},
 		mounted() {
@@ -77,22 +69,20 @@
 			this.initMapH()
 			this.initPositionIcon()
 		},
-		methods:{
+		methods: {
 			// 初始化地图中心位置的定位图片
 			initPositionIcon() {
 				setTimeout(() => {
-					this.controls = [
-						{
-							iconPath: this.positionIcon,
-							position: { 
-								left: 185,
-								top: 265,
-								width: 30, 
-								height: 30,
-							},
-							clickable: false
-						}
-					]
+					this.controls = [{
+						iconPath: this.positionIcon,
+						position: {
+							left: uni.getSystemInfoSync().screenWidth/2-15,
+							top: uni.getSystemInfoSync().screenHeight/2-225,
+							width: 30,
+							height: 30,
+						},
+						clickable: false
+					}]
 				}, 100)
 			},
 			// 查询现在的位置
@@ -113,30 +103,30 @@
 					}
 				})
 			},
-			
+
 			// 初始化我的位置
 			async initMap(res) {
 				this.longitude = res.longitude;
 				this.latitude = res.latitude;
 				this.myAddress = await this.getAddressName(res);
-				
-				this.addressObj = Object.assign({}, this.addressObj,{
+
+				this.addressObj = Object.assign({}, this.addressObj, {
 					longitude: res.longitude,
 					latitude: res.latitude,
 					address: this.myAddress
 				})
 			},
-			
+
 			// 地图选择位置后 查询地点名称
 			async checkMap(res) {
-				this.addressObj = Object.assign({}, this.addressObj,{
+				this.addressObj = Object.assign({}, this.addressObj, {
 					longitude: res.longitude,
 					latitude: res.latitude,
 					address: await this.getAddressName(res)
 				})
 				console.log('当前位置:' + res.latitude + '|' + res.longitude);
 			},
-			
+
 			// 监听地图位置变化
 			mapChange(e) {
 				let that = this
@@ -158,34 +148,35 @@
 			},
 			// 查询地图中心点的名称
 			getAddressName(addressObj) {
-				
+
 				return new Promise((res) => {
 					// #ifdef APP-PLUS
-						qqmapsdk.reverseGeocoder({
-							location: {
-								latitude: addressObj.latitude,
-								longitude: addressObj.longitude
-							},
-							get_poi: 1,
-							poi_options: "page_size=1;page_index=1",
-							output: 'jsonp',
-							success: (e) => {
-								res(e.result.formatted_addresses.recommend);
-							},
-							fail: err => {
-								res(err);
-							}
-						})
+					qqmapsdk.reverseGeocoder({
+						location: {
+							latitude: addressObj.latitude,
+							longitude: addressObj.longitude
+						},
+						get_poi: 1,
+						poi_options: "page_size=1;page_index=1",
+						output: 'jsonp',
+						success: (e) => {
+							res(e.result.formatted_addresses.recommend);
+						},
+						fail: err => {
+							res(err);
+						}
+					})
 					// #endif
-					
+
 					// #ifndef APP-PLUS
-						// ======================== jsonp跨域 ======================== 
-						const KEY = 'LXCBZ-NNIKD-UZ64F-H6AFI-UNJLH-OCFGE'
-						let locationObj = addressObj.latitude+','+addressObj.longitude
-						let url = 'https://apis.map.qq.com/ws/geocoder/v1?coord_type=5&get_poi=1&output=jsonp&poi_options=page_size=1;page_index=1';
-						this.$jsonp(url,{
-						  key: KEY,
-						  location: locationObj
+					// ======================== jsonp跨域 ======================== 
+					const KEY = 'LXCBZ-NNIKD-UZ64F-H6AFI-UNJLH-OCFGE'
+					let locationObj = addressObj.latitude + ',' + addressObj.longitude
+					let url =
+						'https://apis.map.qq.com/ws/geocoder/v1?coord_type=5&get_poi=1&output=jsonp&poi_options=page_size=1;page_index=1';
+					this.$jsonp(url, {
+							key: KEY,
+							location: locationObj
 						}).then(e => {
 							res(e.result.formatted_addresses.recommend);
 						})
@@ -193,19 +184,19 @@
 							res(err);
 						})
 					// #endif
-					
-					
+
+
 				})
-				
+
 			},
 			// 计算地图的高度
 			initMapH() {
 				// #ifdef APP-PLUS
-					this.mapH = uni.getSystemInfoSync().windowHeight - 210;
-				// #endif
-				// #ifndef APP-PLUS
-					this.mapH = uni.getSystemInfoSync().windowHeight - 170;
+				this.mapH = uni.getSystemInfoSync().windowHeight - 210;
 				// #endif
+				// // #ifndef APP-PLUS
+				// this.mapH = uni.getSystemInfoSync().windowHeight - 170;
+				// // #endif
 			},
 			// 移动到我的位置
 			toMyLocation() {
@@ -223,20 +214,22 @@
 </script>
 
 <style lang="scss" scoped>
-	.server-place{
+	.server-place {
 		position: fixed;
 		left: 0;
 		top: 0;
 		height: 100vh;
 		width: 100%;
 		z-index: 999;
-		.map-tools{
+
+		.map-tools {
 			width: 750rpx;
 			display: flex;
 			justify-content: center;
 			align-items: center;
 			flex-direction: column;
-			.my-location{
+
+			.my-location {
 				width: 700rpx;
 				height: 100rpx;
 				box-shadow: 0rpx 3rpx 20rpx rgba(0, 0, 0, 0.2);
@@ -246,67 +239,76 @@
 				justify-content: flex-start;
 				align-items: center;
 				overflow: hidden;
-				.left{
+				margin-top: 10rpx;
+				.left {
 					background: #3384ff;
 					// flex: 20%;
 					width: 100rpx;
 					height: 100%;
 				}
-				.right{
-					font-size: 0.57rem;
-					margin-left: .5rem;
+
+				.right {
+					font-size: 26rpx;
+					margin-left: 10rpx;
 					color: #111;
 					// flex: 80%;
 					display: flex;
 					justify-content: center;
 					align-items: flex-start;
 					flex-direction: column;
-					.text{
-						width: 12rem;
+
+					.text {
+						width: 500rpx;
 						overflow: hidden;
-						white-space:nowrap;
+						white-space: nowrap;
 						text-overflow: ellipsis;
 						color: #3384FF;
-						margin-top: .3rem;
+						margin-top: 10rpx;
 					}
 				}
 			}
-			
-			.start-place{
-				width: 85%;
+
+			.start-place {
+				width: 700rpx;
+				height: 100rpx;
 				margin: 0 auto;
-				height: 5.5rem;
 				margin: 0 auto;
-				margin-top: .6rem;
-				box-shadow: 0px 3px 20px rgba(0, 0, 0, 0.2);
+				box-shadow: 0rpx 3rpx 20rpx rgba(0, 0, 0, 0.2);
 				background: #fff;
-				border-radius: 0.5rem;
-				.place{
-					.title{
-						font-size: 20rpx;
+				border-radius: 10rpx;
+				margin-top: 20rpx;
+				.place {
+					margin-left: 10rpx;
+					.title {
+						font-size: 24rpx;
 						font-weight: bold;
 						color: #111;
 					}
-					.text{
-						font-size:16rpx;
+
+					.text {
+						margin-top: 20rpx;
+						font-size: 20rpx;
 						color: #3384FF;
 						font-weight: bold;
 						width: 700rpx;
 						vertical-align: middle;
 						display: inline-block;
 						overflow: hidden;
-						white-space:nowrap;
+						white-space: nowrap;
 						text-overflow: ellipsis;
 					}
 				}
-				.tip{
+
+				.tip {
 					font-size: 0.57rem;
 					color: #666;
 				}
-				.sure{
-					font-weight: 600;
-				}
-				
+			}
+
+			.sure {
+				font-weight: 600;
+				width: 700rpx;
+				margin-top: 20rpx;
 			}
 		}
 	}

+ 10 - 0
pages/home/index.vue

@@ -45,6 +45,7 @@
 </template>
 
 <script>
+	import {mapState,mapMutations} from 'vuex'
 	import {
 		request
 	} from '../../common/request/request'
@@ -62,6 +63,12 @@
 			uni.$on('login', (data) => {
 				this.loginStatus = data.msg
 			})
+			if(!this.hasLogin){
+				this.$u.route({
+					url: "pages/login/index",
+					type:"reLaunch"
+				})	
+			}
 		},
 		onReady() {
 			if (this.loginStatus == "登录成功") {
@@ -87,6 +94,9 @@
 					uni.hideLoading();
 				})
 		},
+		computed:{
+			...mapState(['hasLogin'])
+		},
 		methods: {
 			//轮播图
 			getBanners() {

+ 107 - 20
pages/login/index.vue

@@ -16,7 +16,7 @@
 					<view style="margin-top: 30rpx;">
 						<u-field v-model="code" placeholder="请填写验证码" label-width="50">
 							<u-icon slot="icon" name="lock" size="36" color="#666666"></u-icon>
-							<u-button size="mini" slot="right" type="primary" @click="getCode" shape="circle">{{codeText}}</u-button>
+							<u-button size="mini" slot="right" type="primary" @click="getCode" shape="circle" :loading="codeLoading">{{codeText}}</u-button>
 						</u-field>
 					</view>
 					<u-verification-code ref="uCode" @change="codeChange"></u-verification-code>
@@ -46,6 +46,11 @@
 </template>
 
 <script>
+	import {mapState,mapMutations} from 'vuex'
+	import {
+		request
+	} from '../../common/request/request'
+	require("promise.prototype.finally").shim()
 	export default {
 		data() {
 			return {
@@ -54,21 +59,85 @@
 				codeText: '',
 				pact: false,
 				loading: false,
+				codeLoading:false,
+				SystemInfo:'',
+				networkType:''
 			}
 		},
-		computed: {},
+		computed: {
+			...mapState(['hasLogin'])
+		},
+		onLoad() {
+			uni.getSystemInfo({
+			    success:(res)=>{
+					this.SystemInfo=res
+			    }
+			});
+			uni.getNetworkType({
+			    success:(res)=>{
+			        this.networkType=res.networkType
+			    }
+			});
+			if(this.hasLogin){
+				this.$u.route({
+					url: 'pages/home/index',
+					type: 'switchTab',
+				})
+			}
+		},
+		created() {
+		},
 		methods: {
+			...mapMutations(['login']),
+			toUser(provider){
+				this.login(provider);
+				if(this.hasLogin){
+					this.$u.route({
+						url: 'pages/home/index',
+						type: 'switchTab',
+					})
+				}else{
+					uni.navigateBack();
+				}
+			},
 			submit() {
 				if (this.$u.test.mobile(this.tel)) {
 					this.loading = true
-					setTimeout(() => {
-						this.$u.route({
-							url: 'pages/home/index',
-							type: 'switchTab',
-						})
-						uni.$emit('login',{msg:'登录成功'})
+					request({
+						url: '/sailun/appLogin/storeLogin',
+						method: 'post',
+						data: {
+							"account": "",
+							"loginType": "1",
+							"mobileCode": this.code,
+							"password": "",
+							"phoneNumber": this.tel,
+							"osType":this.SystemInfo.platform,
+							"osVersion":this.SystemInfo.system,
+							"phoneBrand":this.SystemInfo.brand,
+							"phoneModel":this.SystemInfo.model,
+							"appVersion":"1.00",
+							"networkType":this.networkType,
+						}
+					}).then(res => {
+						if (res.data.code == 0) {
+							console.log(res.data.data)
+							this.toUser(res.data.data)
+							uni.$emit('login', {
+								msg: '登录成功'
+							})
+
+						}else {
+							this.$refs.uToast.show({
+								title: res.data.msg,
+							})
+						}
+					}).catch(err => {
+						console.log(err)
+						this.$u.toast('登录失败');
+					}).finally(() => {
 						this.loading = false
-					}, 2000)
+					})
 				}
 			},
 			inregister() {
@@ -80,20 +149,38 @@
 				this.codeText = text;
 			},
 			getCode() {
-				if (this.$refs.uCode.canGetCode) {
-					// 模拟向后端请求验证码
-					uni.showLoading({
-						title: '正在获取验证码',
+				if (this.tel) {
+					this.codeLoading=true
+					request({
+						url: '/sailun/appStoreBasicInfo/sendCode',
+						method: 'post',
+						data: {
+							"phoneNumber": this.tel,
+							"opreaType":"1"
+						},
+					}).then(res => {
+						console.log(res)
+						if (res.data.code == 0) {
+							
+							if (this.$refs.uCode.canGetCode) {
+								this.$refs.uCode.start();
+							} else {
+								this.$u.toast('倒计时结束后再发送');
+							}
+						}
+						if (res.data.code == 500) {
+							this.$u.toast(res.data.msg);
+						}
+					}).catch(err => {
+						console.log(err)
+					}).finally(() => {
+						this.codeLoading=false
 					})
-					setTimeout(() => {
-						uni.hideLoading();
-						// 通知验证码组件内部开始倒计时
-						this.$refs.uCode.start();
-					}, 1000);
 				} else {
-					this.$u.toast('倒计时结束后再发送');
+					this.$u.toast('请输入手机号');
 				}
-			}
+			
+			},
 		}
 	};
 </script>

+ 55 - 53
pages/login/register_2.vue

@@ -39,7 +39,7 @@
 						</view>
 						<u-input v-model="form.code" placeholder="请输入验证码" type="number" />
 						<view class="" slot="right">
-							<u-button size="mini" type="primary" @click="getCode" shape="circle">{{codeText}}</u-button>
+							<u-button size="mini" type="primary" @click="getCode" shape="circle" :loading="codeLoading" >{{codeText}}</u-button>
 						</view>
 					</u-form-item>
 					<u-form-item prop="region">
@@ -96,45 +96,46 @@
 					city: "",
 					district: "",
 					addressInfo: "",
-
 				},
 				rules: {
-					// store: [{
-					// 	required: true,
-					// 	message: '请输入门店名称',
-					// 	trigger: 'blur,change'
-					// }],
-					// company: [{
-					// 	required: true,
-					// 	message: '请输入公司名称',
-					// 	trigger: 'blur,change'
-					// }],
-					// name: [{
-					// 	required: true,
-					// 	message: '请输入联系人',
-					// 	trigger: 'blur,change'
-					// }],
-					// phone: [{
-					// 	required: true,
-					// 	message: '请输入联系电话',
-					// 	trigger: 'blur,change'
-					// }],
-					// code: [{
-					// 	required: true,
-					// 	message: '请输入验证码',
-					// 	trigger: 'blur,change'
-					// }],
-					// region: [{
-					// 	required: true,
-					// 	message: '请选择地区',
-					// 	trigger: 'change',
-					// }],
-					// addressInfo: [{
-					// 	required: true,
-					// 	message: '请选择地区',
-					// 	trigger: 'change',
-					// }],
-				}
+					store: [{
+						required: true,
+						message: '请输入门店名称',
+						trigger: 'blur,change'
+					}],
+					company: [{
+						required: true,
+						message: '请输入公司名称',
+						trigger: 'blur,change'
+					}],
+					name: [{
+						required: true,
+						message: '请输入联系人',
+						trigger: 'blur,change'
+					}],
+					phone: [{
+						required: true,
+						message: '请输入联系电话',
+						trigger: 'blur,change'
+					}],
+					code: [{
+						required: true,
+						message: '请输入验证码',
+						trigger: 'blur,change'
+					}],
+					region: [{
+						required: true,
+						message: '请选择地区',
+						trigger: 'change',
+					}],
+					addressInfo: [{
+						required: true,
+						message: '请选择地区',
+						trigger: 'change',
+					}],
+				},
+				dataUrl: "",
+				codeLoading:false
 			};
 		},
 		created() {
@@ -149,6 +150,9 @@
 				this.form.longitude = data.longitude
 				this.form.addressInfo = data.address
 			})
+			uni.$on('dataUrl', (data) => {
+				this.dataUrl = data
+			})
 			let that = this
 			uni.getLocation({
 				type: 'wgs84',
@@ -195,11 +199,14 @@
 			nextStep() {
 				this.$refs.uForm.validate(valid => {
 					if (valid) {
-						uni.$emit("formData",this.form)
+
 						this.$u.route({
 							url: 'pages/login/register_3',
 						})
-
+						uni.$emit("formData", {
+							formData: this.form,
+							dataUrl: this.dataUrl
+						})
 					} else {
 						console.log('验证失败');
 					}
@@ -211,25 +218,19 @@
 			},
 			getCode() {
 				if (this.form.phone) {
+					this.codeLoading=true
 					request({
 						url: '/sailun/appStoreBasicInfo/sendCode',
 						method: 'post',
 						data: {
 							"phoneNumber": parseInt(this.form.phone),
+							"opreaType":"0"
 						},
 					}).then(res => {
 						console.log(res)
 						if (res.data.code == 0) {
 							if (this.$refs.uCode.canGetCode) {
-								// 模拟向后端请求验证码
-								uni.showLoading({
-									title: '正在获取验证码',
-								})
-								setTimeout(() => {
-									uni.hideLoading();
-									// 通知验证码组件内部开始倒计时
-									this.$refs.uCode.start();
-								}, 1000);
+								this.$refs.uCode.start();
 							} else {
 								this.$u.toast('倒计时结束后再发送');
 							}
@@ -240,7 +241,8 @@
 					}).catch(err => {
 						console.log(err)
 					}).finally(() => {
-
+						this.codeLoading=false
+						// 通知验证码组件内部开始倒计时
 					})
 				} else {
 					this.$u.toast('请输入手机号');
@@ -249,9 +251,9 @@
 			},
 			regionConfirm(e) {
 				this.form.region = e.province.label + '-' + e.city.label + '-' + e.area.label;
-				this.form.province=e.province.label;
-				this.form.city=e.city.label;
-				this.form.district=e.area.label;
+				this.form.province = e.province.label;
+				this.form.city = e.city.label;
+				this.form.district = e.area.label;
 			},
 			inMap() {
 				this.$u.route({

+ 82 - 95
pages/login/register_3.vue

@@ -130,69 +130,57 @@
 			}
 		},
 		created() {
-			
-			
+			uni.$on('formData', (data) => {
+				this.formData =data.formData
+				this.dataUrl=data.dataUrl
+			})
 		},
 		mounted() {
 			this.getAgentArea()
 			this.getTasknum()
-			// uni.$on('dataUrl', (data) => {
-			// 	this.dataUrl = data
-			// })
 		},
 		methods: {
 			getAgentArea() {
-				uni.$on('formData', (data) => {
-					this.formData = data
-					console.log(this.formData)
-					let that=this
-					
+				request({
+					url: '/sailun/appStoreBasicInfo/getAgentArea',
+					method: 'post',
+					data: {
+						"area": this.formData.district,
+						"city": this.formData.city,
+						"province": this.formData.province,
+						"spart": "10",
+						"vkorg": "8100",
+						"vtweg": "10"
+					}
+				}).then(res => {
+					if (res.data.code == 0) {
+						this.agentList = res.data.Data.data
+						this.agentList = this.agentList.reduce((res, item, index, array) => {
+							for (let i = 0; i < array[index].brandList.length; i++) {
+								res.push({
+									brand: array[index].brandList[i],
+									brandCode: array[index].brandList[i],
+									name: item.name,
+									kunnr: item.kunnr,
+									agent_id: item.kunnr,
+									taskNum: "",
+									checked: false,
+									disabled: false,
+								})
+							}
+							return res;
+						}, []);
+
+					}
+					if (res.data.code == 500) {
+						this.$u.toast(res.data.msg);
+					}
+					return this.agentList
+				}).catch(err => {
+					console.log(err)
+				}).finally(() => {
+
 				})
-			request({
-				url: '/sailun/appStoreBasicInfo/getAgentArea',
-				method: 'post',
-				data: {
-					"province": "山东省",
-					"city": "青岛市",
-					"area": "市北区",
-					// "area":this.formData.district,
-					// "city":this.formData.city,
-					// "province":this.formData.province,
-					"spart": "10",
-					"vkorg": "8100",
-					"vtweg": "10"
-				}
-			}).then(res => {
-				console.log(res.data.code)
-				if (res.data.code == 0) {
-					this.agentList = res.data.Data.data
-					this.agentList = this.agentList.reduce((res, item, index, array) => {
-						console.log("11111")
-						for (let i = 0; i < array[index].brandList.length; i++) {
-							res.push({
-								brand: array[index].brandList[i],
-								brandCode: array[index].brandList[i],
-								name: item.name,
-								kunnr: item.kunnr,
-								agent_id: item.kunnr,
-								taskNum: "",
-								checked: false,
-								disabled: false,
-							})
-						}
-						return res;
-					}, []);
-					
-				}
-				if (res.data.code == 500) {
-					this.$u.toast(res.data.msg);
-				}
-				return this.agentList
-			}).catch(err => {
-				console.log(err)
-			}).finally(() => {
-			
-			})
 			},
 			getTasknum() {
 				request({
@@ -250,46 +238,45 @@
 					})
 					return res;
 				}, []);
-				// let data = {
-				// 	"brandAgentLvQueryList":this.brandAgentLvQueryList,
-				// 	"city": "string",
-				// 	"contactName": "string",
-				// 	"district": "string",
-				// 	"jd": "string",
-				// 	"licenseUrl": "string",
-				// 	"mobileCode": "string",
-				// 	"province": "string",
-				// 	"storeImageUrl": "string",
-				// 	"storeName": "string",
-				// 	"storePhone": "string",
-				// 	"version": 0,
-				// 	"wd": "string"
-				// }
-				// console.log(data)
-				// request({
-				// 	url: '/sailun/appStoreBasicInfo/storeReg',
-				// 	method: 'post',
-				// 	data: data
-				// }).then(res => {
-				// 	console.log(res)
-				// 	if (res.data.code == 0) {
-				// 		this.loading = true
-				// 		setTimeout(() => {
-				// 			this.$u.route({
-				// 				url: 'pages/login/index',
-				// 				type: "reLaunch"
-				// 			})
-				// 			this.loading = false
-				// 		}, 2000)
-				// 	}
-				// 	if (res.data.code == 500) {
-				// 		this.$u.toast(res.data.msg);
-				// 	}
-				// }).catch(err => {
-				// 	console.log(err)
-				// }).finally(() => {
-
-				// })
+				let data = {
+					"brandAgentLvQueryList":this.brandAgentLvQueryList,
+					"city":this.formData.city,
+					"contactName":this.formData.name,
+					"district":this.formData.district,
+					"jd":this.formData.longitude,
+					"licenseUrl":this.dataUrl.licenseUrl,
+					"mobileCode":this.formData.code,
+					"province":this.formData.province,
+					"storeImageUrl":this.dataUrl.storeUrl,
+					"storeName":this.formData.store,
+					"storePhone":this.formData.phone,
+					"version":1.00,
+					"wd":this.formData.latitude,
+				}
+				console.log(data)
+				request({
+					url: '/sailun/appStoreBasicInfo/storeReg',
+					method: 'post',
+					data: data
+				}).then(res => {
+					console.log(res)
+					if (res.data.code == 0) {
+						this.loading = true
+						this.$u.toast("注册成功");
+						setTimeout(() => {
+							this.$u.route({
+								url: 'pages/login/index',
+							})
+						}, 2000)
+					}
+					if (res.data.code == 500) {
+						this.$u.toast(res.data.msg);
+					}
+				}).catch(err => {
+					console.log(err)
+				}).finally(() => {
+					this.loading = false
+				})
 			},
 		}
 	}

BIN
static/全钢证书/7dd70be738af7473d3d156353cf791c.png


BIN
static/全钢证书/9dde9e8380464c25a9a6e36d566eb2ba.keystore


BIN
static/全钢证书/development证书.p12.zip


BIN
static/全钢证书/development证书.p12/__MACOSX/._development证书.p12


BIN
static/全钢证书/development证书.p12/development证书.p12


BIN
static/全钢证书/ios_distribution证书.p12


BIN
static/全钢证书/storetbr.mobileprovision


BIN
static/全钢证书/storetbrtest.mobileprovision


+ 4 - 0
static/全钢证书/新建文本文档.txt

@@ -0,0 +1,4 @@
+地图ak
+安卓:4wYVsEvjrdDXtsbRYsNTy1f01PAYbZin
+ios:KYoTmSbggKUatksUwZKXrFmZX9oiVBrR
+com.sailun.storetbr

+ 12 - 1
store/index.js

@@ -58,13 +58,16 @@ const store = new Vuex.Store({
 				selectedIconPath: "account-fill",
 				text: '我的',
 				customIcon: false,
-				pagePath: '/pages/me/index'
+				pagePath: '/pages/me/index',
 			},
 		],
 	
 		//显示提示消息相关配置
 		showToastDuration : 4000,
 		showServerErrorMsg: '连接服务器异常!',
+		hasLogin:false ,//用户是否登录
+		storeInfo:{}//存放用户账号数据
+		
 	},
 	mutations: {
 		$uStore(state, payload) {
@@ -86,6 +89,14 @@ const store = new Vuex.Store({
 			}
 			// 保存变量到本地,见顶部函数定义
 			saveLifeData(saveKey, state[saveKey])
+		},
+		login(state,provider){
+			state.hasLogin=true;
+			state.storeInfo=provider
+		},
+		logout(state){
+			state.hasLogin=false;
+			state.storeInfo={}
 		}
 	}
 })

+ 1 - 1
unpackage/debug/.ios.ins

@@ -1 +1 @@
-forceInstall
+installed