Merge branch 'master' of http://git.feashow.cn/odjbin/city-store-transfer

2023-11-15 23:20:09 +08:00
parent 88e2d6542b 3b422a959d
commit 0ebd9ea050
9 changed files with 201 additions and 167 deletions
--- a/components/DropDown/DropDown.vue
+++ b/components/DropDown/DropDown.vue
@@ -47,7 +47,6 @@
 			return {
 				title: ['行业', '区域', '面积', '筛选'],
 				activeIndex: -1,
-				// postlist: [['全部', '餐饮美食', '百货超市', '美容美发'],['区域1', '区域2', '区域3', '区域4'],['100m2','200m2','300m2'],['附近的', '最新发布的', '其他']]
 			};
 		},
 		computed: {
--- a/pages/index/HomeMainContent/Statistics.vue
+++ b/pages/index/HomeMainContent/Statistics.vue
@@ -8,9 +8,9 @@
 				/>
 			</view>
 			<text class="text1">累计用户</text>
-			<text class="num1">{{ totalUser }}</text>
+			<text class="num1">{{ statNum.all_user_num }}</text>
 			<view class="border border1"></view>
-			<text class="num11">昨日新增{{ yesterdayUser }}位</text>
+			<text class="num11">昨日新增{{ statNum.yesterday_user_num }}位</text>

 		</view>
 		<view class="right">
@@ -22,9 +22,9 @@
 					/>
 				</view>
 				<text class="text2">累计转店</text>
-				<text class="num2">{{ totalTrans }}</text>
+				<text class="num2">{{ statNum.all_trans_num }}</text>
 				<view class="border border2"></view>
-				<text class="num21">昨日新增{{ yesterdayTrans }}位</text>
+				<text class="num21">昨日新增{{ statNum.yesterday_trans_num }}位</text>

 			</view>
 			<view class="right2">
@@ -35,9 +35,9 @@
 					/>
 				</view>
 				<text class="text3">累计找店</text>
-				<text class="num3">{{ totalSearch }}</text>
+				<text class="num3">{{ statNum.all_find_num }}</text>
 				<view class="border border3"></view>
-				<text class="num22">昨日新增{{ yesterdaySearch }}位</text>
+				<text class="num22">昨日新增{{ statNum.yesterday_find_num }}位</text>
 			</view>
 			
 		</view>
@@ -47,27 +47,18 @@
 </template>

 <script>
+
 	export default {
 		props:{
-			totalUser:{
-				type:Number
-			},
-			yesterdayUser:{
-				type:Number
-			},
-			totalTrans:{
-				type:Number
-			},
-			yesterdayTrans:{
-				type:Number
-			},
-			totalSearch:{
-				type:Number
-			},
-			yesterdaySearch:{
-				type:Number
+			statNum :{
+				type:Object,
+				default(){
+					return {
+						
+					}
+				}
+			}
 		}
-		},
 	}
 </script>

--- a/pages/index/NavBarPages/czxx/czxx.vue
+++ b/pages/index/NavBarPages/czxx/czxx.vue
@@ -15,7 +15,7 @@
 			<DropDown></DropDown>
 		</view>
 		<view class="marginLR10">
-			<SearchShopList :showStyle="1"/>
+			<ShowShopList :showStyle="1"/>
 		</view>
 	</view>
 </template>
--- a/pages/index/NavBarPages/xmzs/xmzs.vue
+++ b/pages/index/NavBarPages/xmzs/xmzs.vue
@@ -15,7 +15,7 @@
 			<DropDown></DropDown>
 		</view>
 		<view class="marginLR10">
-			<SearchShopList :showStyle="1"/>
+			<ShowShopList :showStyle="1"/>
 		</view>
 	</view>
 </template>
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -4,10 +4,17 @@
 		<view class="home-content">
 			<view class="service">
 				<u-image src="/static/statistics/sy_icon_lxkf.png" width="108rpx" height="108rpx"/>
+				<button 
+					open-type="contact" 
+					bindcontact="handleContact" 
+					session-from="sessionFrom"
+					class="service-btn"
+					>
+				</button>			
 			</view>
 			<HomeNavCard></HomeNavCard>
 			<HomeNoticeBar :text="notice" />
-			<Statistics :data="statisticsNum" />
+			<Statistics :statNum="statNum"/>
 			<view class="show-and-search">
 				<view class="show-tab list-tab" :class="{ 'tab-activate': chooseIndex === 0 }" @click="this.chooseIndex=0">
 					<text>店铺列表</text>
@@ -38,7 +45,7 @@
 			return {
 				notice: [],
 				chooseIndex: 0,
-				statisticsNum: [231753, 1345],
+				statNum: {},
 				swiperList:[]
 			}
 		},
@@ -47,13 +54,11 @@
 			this.getNotice()
 			this.getStat()
 			this.open()
-			this.getRegionList()
 		},
 		methods: {
 			getBanner(){
 				this.$api.getBanner().then(res=>{  
-					console.log('lunbo',res.data.data);
-					this.swiperList = res.data.data.map(item=>item.img)
+					this.swiperList = res.data.data.map(item=>this.$api.imgUrl+item.img)
 				})
 			},
 			getNotice(){
@@ -63,7 +68,8 @@
 			},
 			getStat(){
 				this.$api.getStat().then(res=>{
-					this.statisticsNum = res.data.data
+					this.statNum = res.data.data
+					console.log(res.data.data);
 				})
 			},
 			getRegionList() {
@@ -89,8 +95,6 @@
 					success(res) {
 						console.log('res.latitude', res.latitude);
 						console.log('res.longitude', res.longitude);
-						uni.setStorageSync('latitude', res.latitude);
-						uni.setStorageSync('longitude', res.longitude);
 						qqmapsdk.reverseGeocoder({
 							location: {
 								latitude: res.latitude,
@@ -106,6 +110,7 @@
 								uni.setStorageSync('city_code', re.result.ad_info.city_code.substring(3));
 								uni.setStorageSync('city', city.slice(0, 2));
 								uni.setStorageSync('district', district);
+								that.getRegionList()
 								// that.position = city.slice(0, 2) + district.slice(0, 2)
 							},
 							fail: (re) => {
@@ -176,6 +181,18 @@
 				right: 17rpx;
 				top: 1109rpx;
 				z-index: 1;
+				.service-btn {
+					position: absolute;
+					top: 0;
+					background-color: inherit;
+					border-radius: 50%;
+					width: 108rpx;
+					height: 108rpx;
+				}
+				.service-btn::after {
+					border: none;
+
+				}
 			}
 		}

--- a/pages/my/login/login.vue
+++ b/pages/my/login/login.vue
@@ -58,10 +58,6 @@
 								console.log('res.da',res);
 								// console.log('登录code换取的信息', data);
 								uni.setStorageSync('loginToken', data.token);
-								uni.setStorageSync('avatar', data.avatar);
-								uni.setStorageSync('nickname', data.nickname);
-								uni.setStorageSync('account', data.sn);
-								uni.setStorageSync('mobile', data.mobile);
 								that.$toast.success('登录成功')
 								that.$emit('success')
 								//登录完成后使用手机code换取手机号,调用/user/getMobileByMnp接口
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -54,9 +54,6 @@
 				return
 			}
 			this.isLoad = true
-			this.src = uni.getStorageSync('avatar')
-			this.username = uni.getStorageSync('nickname')
-			this.account = uni.getStorageSync('account')
 		},
 		methods: {
 			reOnLoad() {
--- a/pages/publish/publishTransfer/publishTransfer.vue
+++ b/pages/publish/publishTransfer/publishTransfer.vue
@@ -7,31 +7,36 @@
 			</view>

 			<u-form-item label="标题" label-position="top" border-bottom="true" prop="title">
-					<u-input v-model="form.title" placeholder="请输入标题以便吸引人的注意哦" placeholder-class="input-class" border="none"></u-input>
+				<u-input v-model="form.title" placeholder="请输入标题以便吸引人的注意哦" placeholder-class="input-class"
+					border="none"></u-input>
 			</u-form-item>
 			<u-form-item label="区域" label-position="top" border-bottom="true" right-icon="arrow-right" prop="region">
 				<text @click="show1 = true" class="checktext">请选择所属区域</text>
 				<view class="arrow-icon">
 					<u-icon name="arrow-right" size="30px"></u-icon>
 				</view>
-					<u-picker :columns="regionColumns" :show="show1" :closeOnClickOverlay="true" @close="show1 = false" v-model="form.region"></u-picker>
+				<u-picker :columns="regionColumns" :show="show1" :closeOnClickOverlay="true" @close="show1 = false"
+					v-model="form.region"></u-picker>
 			</u-form-item>
 			<u-form-item label="地址" label-position="top" border-bottom="true" prop="place">
-					<u-input v-model="form.place" placeholder="请输入店铺地址" placeholder-class="input-class" border="none" ></u-input>
+				<u-input v-model="form.place" placeholder="请输入店铺地址" placeholder-class="input-class" border="none"
+					@change="changeAddress"></u-input>
 			</u-form-item>
 			<u-form-item label="行业" label-position="top" border-bottom="true" class="picker">
 				<text @click="show2 = true" class="checktext">请选择行业类型</text>
 				<view class="arrow-icon">
 					<u-icon name="arrow-right" size="30px"></u-icon>
 				</view>
-					<u-picker mode="region" :show="show2" :closeOnClickOverlay="true" @close="show2 = false" v-model="form.trade"></u-picker>
+				<u-picker mode="region" :show="show2" :closeOnClickOverlay="true" @close="show2 = false"
+					v-model="form.trade"></u-picker>
 			</u-form-item>
 			<u-form-item label="业态" label-position="top" border-bottom="true">
 				<text @click="show3 = true" class="checktext">请选择行业业态</text>
 				<view class="arrow-icon">
 					<u-icon name="arrow-right" size="30px"></u-icon>
 				</view>
-					<u-picker mode="region" :show="show3" :closeOnClickOverlay="true" @close="show3 = false" v-model="form.karma"></u-picker>
+				<u-picker mode="region" :show="show3" :closeOnClickOverlay="true" @close="show3 = false"
+					v-model="form.karma"></u-picker>
 			</u-form-item>
 			<u-form-item label="面积" label-position="top" border-bottom="true" prop="size">
 				<u-input v-model="form.size" placeholder="请输入店铺面积" placeholder-class="input-class" border="none"></u-input>
@@ -53,7 +58,8 @@
 			</u-form-item>
 		</u-form>
 		<view class="bug-figure"></view>
-			<u-button @click="submit" color="linear-gradient(to right, #E86262, #CC3333)" :size="normal" shape="circle" class="submit-btn">发布</u-button>
+		<u-button @click="submit" color="linear-gradient(to right, #E86262, #CC3333)" :size="normal" shape="circle"
+			class="submit-btn">发布</u-button>
 		<view class="bug-figure"></view>
 	</view>
 </template>
@@ -105,9 +111,13 @@

 				},
 			}
-			
 		},
 		methods: {
+			handleSearchAddress() {
+				uni.navigateTo({
+					url: '/pages/publish/chooseAddress/chooseAddress'
+				})
+			},
 			confirmArea(e) {
 				this.ShopInfomation.city = e.value[0]
 				this.ShopInfomation.area = e.value[1]
@@ -122,30 +132,48 @@
 					console.log("失败信息:" + JSON.stringify(errors))
 					// uni.$u.toast('校验失败')
 				})
-						}
 			},
-		
+			changeAddress(e) {
+				console.log('changeAddress', e);
+				// this.getAddressList(e)
+			},
+			getAddressList(value) {
+				var that = this
+				uni.request({
+					url: 'https://apis.map.qq.com/ws/geocoder/v1/?address=' + value + '&key=' +
+						that.$api.key,
+					success(res) {
+						console.log('diz', res.data.result.location);
+						console.log('lat', res.data.result.location.lat);
+						console.log('lng', res.data.result.location.lng);
+					},
+					fail(err) {
+						console.log('请求区域失败：', err);
+					}
+				})
+			},
+		},
 		onReady() {
 			this.$refs.uForm.setRules(this.rules)
-		},
-
+		}
 	}
 </script>

 <style lang="scss">
-	.count{
+	.count {}

-	}
 	.form {
 		margin-left: 20px;
 		margin-right: 20px;
 	}
+
 	.input-class {
 		font-size: 30rpx;
 		font-weight: 1px;
 		border-style: none;

 	}
+
 	.upload {
 		display: flex;
 		flex-direction: column;
@@ -155,16 +183,20 @@
 		height: 300rpx;
 		// margin-right: 20px;
 	}
+
 	.submit-btn {
 		width: 80%;
 	}
+
 	.bug-figure {
 		height: 100rpx;
 	}
+
 	.checkbox1 {
 		display: flex;
 		justify-content: space-between;
 	}
+
 	.checktext {
 		margin-top: 5rpx;
 		font-size: 30rpx;
@@ -176,6 +208,7 @@
 		display: flex;
 		justify-content: space-between;
 	}
+
 	.arrow-icon {
 		position: absolute;
 		right: 10rpx;
--- a/service/request.js
+++ b/service/request.js
@@ -128,6 +128,7 @@ const toast = {
 }
 const apiService = {
 	serverHost,
+	imgUrl:'https://spsp.feashow.com/',
 	key:'ZRKBZ-Q7FWL-GVZPK-MCRBU-4XFB5-ATBDB',
 	uploadImgUrl: serverHost + `/upload/image/`,
 	//登录接口