Merge branch 'master' of http://git.cc-lotus.info/pointToNetwork/point-app

manifest.json

@@ -138,14 +138,13 @@
                 "desc" : "定位当前位置，选在收获地址"
             }
         },
-        "requiredPrivateInfos" : [ "chooseAddress", "chooseLocation", "getLocation" ],
-        "plugins" : {
-            "chooseLocation" : {
-                "version" : "1.0.9",
-                "provider" : "wx76a9a06e5b4e693e"
-            }
-        }
+        "requiredPrivateInfos" : [ "chooseAddress", "chooseLocation" ], //getLocation
+        "plugins" : {}
     },
+    // "chooseLocation" : {
+    //     "version" : "1.0.9",
+    //     "provider" : "wx76a9a06e5b4e693e"
+    // }
     "mp-alipay" : {
         "usingComponents" : true
     },

pages.json

@@ -149,13 +149,7 @@
 						"navigationBarTitleText": "新增收货地址"
 					}
 				},
-				{
-					"path": "address/location",
-					"style": {
-						"navigationBarTitleText": "定位"
-					}
-
-				}, {
+         {
 					"path": "account/index",
 					"style": {
 						"navigationBarTitleText": "账号管理"

pages/market/index.vue

@@ -8,14 +8,14 @@
 				<view class="text_2" v-if="num==0" @click="edit(1)">编辑</view>
 				<view class="text_2" v-if="num==1" @click="edit(0)">完成</view>
 			</view>
-			<view class="one" v-if="!user.id">
-				<view class="logo"><text class="iconfont icon-gouwuche"></text></view>
+			<view class="one" v-if="!user._id">
+				<view class="logo"><text class="iconfont icon-geren2"></text></view>
 				<view class="one_1">您还没有登录</view>
 				<view class="btn">
 					<button type="primary" size="mini" @click="toCommon('/pages/login/index')">去登录</button>
 				</view>
 			</view>
-			<view class="one" v-if="list.length==0&&user.id">
+			<view class="one" v-if="list.length==0&&user._id">
 				<view class="logo"><text class="iconfont icon-gouwuche"></text></view>
 				<view class="one_1">购物车空空如也~</view>
 				<view class="btn">
@@ -131,9 +131,7 @@
 					success: (res) => {
 						let user = that.$jwt(res.data);
 						if (user) {
-							that.$set(that, `user`, {
-								id: user.id,
-							})
+							that.$set(that, `user`,user)
 							that.searchMarket();
 						}
 					},

pagesMy/address/index.vue

@@ -158,6 +158,7 @@
 								},
 								fail: function(err) {
 									console.log(err);
+									that.clearPage()
 								}
 							})
 						}

pagesMy/address/location.vue

@@ -1,49 +0,0 @@
-<template>
-	<mobile-frame :frameStyle="frameStyle">
-		<view class="main">
-			<view class="one">
-			</view>
-		</view>
-	</mobile-frame>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				frameStyle: {
-					useBar: false
-				},
-			};
-		},
-		onLoad: function(e) {
-			console.log('1');
-			uni.getLocation({
-				type: 'wgs84',
-				geocode: true,
-				success: function(res) {
-					console.log(res);
-					console.log('当前位置的经度：' + res.longitude);
-					console.log('当前位置的纬度：' + res.latitude);
-				}
-			});
-		},
-		onShow: function() {},
-		methods: {
-
-		}
-	}
-</script>
-
-<style lang="scss">
-	.main {
-		display: flex;
-		flex-direction: column;
-		width: 100vw;
-		height: 100vh;
-
-		.one {
-			padding: 2vw;
-		}
-	}
-</style>