Merge branch 'master' of ssh://8.134.10.79:222/Leadfyy.co/uniapp-qxk

# Conflicts:
#	pages/write/baseInfo.vue

pages/index/index.vue

@@ -305,10 +305,10 @@
 		justify-content: center;
 		.searchIcon{
 			position: absolute;
-			left: 0;
-			top: 6rpx;
-			width: 38rpx;
-			height: 36rpx;
+			left: 10rpx;
+			top: 5rpx;
+			width: 40rpx;
+			height: 40rpx;
 			z-index: 999999;
 		}
 	}

pages/settings/settings.vue

@@ -12,6 +12,7 @@
 				</u-cell>
 				
 				<u-cell title="我的分销优惠码" :isLink="true" :border="false" url="/packages/agent/agent" v-if="isAgent()"></u-cell>
+				<u-cell title="退出登录" :isLink="true" :border="false" @click="logout"></u-cell>
 		</u-cell-group>
 		<view class="fixed-tips">{{ version ? 'v'+ version : '' }}</view>
 	</view>
@@ -34,6 +35,10 @@
 			}
 		},
 		methods: {
+			logout(){
+				uni.removeStorage({key:'userInfo'});
+				uni.removeStorage({key:'qxk_sysinfo'});
+			},
 			previewImage(){
 				uni.previewImage({
 					urls: [this.userInfo.avatar]

pages/write/baseInfo.vue

@@ -85,7 +85,7 @@
         </view>
         <view class="justify-between group_17" @click="pickerShow(true)">
           <view class="flex-row group_18">
-            <text class="text_17">是否快评：</text>
+            <text class="text_17">选择档位：</text>
             <text class="text_18"></text>
           </view>
 		  
@@ -145,6 +145,7 @@
 <script>
 	import { dispose } from '@/common/directoss.js';
 	import { checkAgentCode } from '@/service/index.js';
+	import { address } from '@/service/address.js';
 	
   export default {
     data() {
@@ -195,10 +196,16 @@
 			})
 			//t = [...t,...texts];
 			this.columns.push(texts)
-			
+			this.defaultAddress();
 		}
 	},
 	methods: {
+		async defaultAddress(){
+			let res = await address();
+			if(res.data.datas.length > 0){
+				this.address = res.data.datas[0];
+			}
+		},
 		checkCoupon(event){
 			if(this.couponTimer){
 				clearTimeout(this.couponTimer);