小程序更新

smart-ui-app/common/common.scss

@@ -16,10 +16,35 @@
 	background-color: white;
 	padding: 7px;
 }
-.mt10{
+.t_item {
+	background-color: white;
+	padding: 18px;
+	border-bottom: 1px solid #e5e5e5;
+	border-radius: 5px;
+	margin-top: 10px;
+	box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.2);
+	.title {
+		font-size: 15px;
+		text-align: left;
+		color: #252525;
+		font-weight: bold;
+	}
+	.desc {
+		color: #969799;
+		font-size: 13px;
+		padding-top: 10px;
+	}
+	.day {
+		color: #969799;
+		font-size: 13px;
+		padding-top: 15px;
+		text-align: right;
+	}
+}
+.mt10 {
 	margin-top: 10px;
 }
-.mt20{
+.mt20 {
 	margin-top: 20px;
 }
 .omit {
@@ -127,7 +152,7 @@
 		font-size: 14px;
 		padding-left: 15px;
 	}
-	.u-upload{
+	.u-upload {
 		margin-left: 20px;
 	}
 	.u-numberbox {
@@ -153,6 +178,10 @@
 	width: 35%;
 	float: left;
 }
+.r37 {
+	width: 37%;
+	float: left;
+}
 .r40 {
 	width: 40%;
 	float: left;
@@ -165,6 +194,10 @@
 	width: 60%;
 	float: left;
 }
+.r63 {
+	width: 63%;
+	float: left;
+}
 .r65 {
 	width: 65%;
 	float: left;
@@ -202,4 +235,3 @@
 	color: $dar2;
 	font-size: 11px;
 }
-

smart-ui-app/pages.json

@@ -4,21 +4,25 @@
 	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
-			"path": "pages/shop/list",
+			"path": "pages/other/about",
 			"style": {
-				"navigationBarTitleText": "我的店铺",
-				"enablePullDownRefresh": true,
-				"backgroundTextStyle": "dark"
+				"navigationBarTitleText": "关于我们",
+				"navigationStyle": "custom"
 			}
 		
 		},
 		{
-			"path": "pages/shop/up",
+			"path": "pages/user/my",
 			"style": {
-				"navigationBarTitleText": "数据上报",
-				"enablePullDownRefresh": false
+				"navigationBarTitleText": "我的",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/user/login",
+			"style": {
+				"navigationBarTitleText": "授权登陆"
 			}
-		
 		},
 		{
 			"path": "pages/index/index",
@@ -28,64 +32,71 @@
 			}
 		},
 		{
-			"path": "pages/user/my",
+			"path": "pages/travel/route",
 			"style": {
-				"navigationBarTitleText": "我的",
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "路线",
+				"enablePullDownRefresh": false
 			}
+		
 		},
 		{
-			"path": "pages/shop/apply",
+			"path": "pages/government/index",
 			"style": {
-				"navigationBarTitleText": "店铺开通申请",
-				"enablePullDownRefresh": false
+				"navigationBarTitleText": "党政服务",
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "dark"
 			}
 		
 		},
 		{
-			"path": "pages/travel/detail",
+			"path": "pages/travel/index",
 			"style": {
-				"navigationBarTitleText": "内容详情",
-				"enablePullDownRefresh": false
+				"navigationBarTitleText": "景区",
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "dark"
 			}
-
+		
 		},
 		{
-			"path": "pages/other/about",
+			"path": "pages/shop/list",
 			"style": {
-				"navigationBarTitleText": "关于我们"
+				"navigationBarTitleText": "我的店铺",
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "dark"
 			}
-
+		
 		},
 		{
-			"path": "pages/user/login",
+			"path": "pages/shop/up",
 			"style": {
-				"navigationBarTitleText": "授权登陆"
+				"navigationBarTitleText": "数据上报",
+				"enablePullDownRefresh": false
 			}
+		
 		},
 		{
-			"path": "pages/user/info",
+			"path": "pages/shop/apply",
 			"style": {
-				"navigationBarTitleText": "个人资料"
+				"navigationBarTitleText": "店铺开通申请",
+				"enablePullDownRefresh": false
 			}
+		
 		},
 		{
-			"path": "pages/travel/index",
+			"path": "pages/travel/detail",
 			"style": {
-				"navigationBarTitleText": "景区",
-				"enablePullDownRefresh": true,
-				"backgroundTextStyle": "dark"
+				"navigationBarTitleText": "内容详情",
+				"enablePullDownRefresh": false
 			}
 
-		}, {
-			"path": "pages/government/index",
+		},
+		{
+			"path": "pages/user/info",
 			"style": {
-				"navigationBarTitleText": "党政服务",
-				"enablePullDownRefresh": true,
-				"backgroundTextStyle": "dark"
+				"navigationBarTitleText": "个人资料"
 			}
-
-		}, {
+		},
+	 {
 			"path": "pages/government/detail",
 			"style": {
 				"navigationBarTitleText": "内容详情",
@@ -107,13 +118,6 @@
 				"backgroundTextStyle": "dark"
 			}
 
-		}, {
-			"path": "pages/travel/route",
-			"style": {
-				"navigationBarTitleText": "路线",
-				"enablePullDownRefresh": false
-			}
-
 		}
 	],
 	"tabBar": {

smart-ui-app/pages/government/index.vue

@@ -1,11 +1,11 @@
 <template>
 	<view>
 		<view class="list">
-			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
-				<view class="r65">
-					<view class="title">{{item.title}}</view>
+			<view class="t_item" v-for="(item, index) in list" :key="index" @click="detail(item)">
+				<view class="r63">
+					<view class="title">{{ item.title }}</view>
 				</view>
-				<view class="r35 day">{{item.createTime.substring(0,11)}}</view>
+				<view class="r37 day">{{ item.createTime.substring(0, 11) }}</view>
 				<view class="clear"></view>
 			</view>
 			<view class="loading"><u-loadmore :status="loadMore ? 'loading' : 'nomore'" /></view>
@@ -43,7 +43,7 @@ export default {
 		},
 		//详情
 		detail(item) {
-			uni.navigateTo({ url: '/pages/government/detail?id='+item.contentId});
+			uni.navigateTo({ url: '/pages/government/detail?id=' + item.contentId });
 		},
 		//刷新数据
 		refresh() {
@@ -73,30 +73,5 @@ export default {
 <style lang="scss">
 .list {
 	padding: 0px 10px 70px 10px;
-	.item {
-		background-color: white;
-		padding: 18px;
-		border-bottom: 1px solid #e5e5e5;
-		border-radius: 5px;
-		margin-top: 10px;
-		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.2);
-		.title {
-			font-size: 15px;
-			text-align: left;
-			color: #252525;
-			font-weight: bold;
-		}
-		.desc {
-			color: #969799;
-			font-size: 13px;
-			padding-top: 10px;
-		}
-		.day {
-			color: #969799;
-			font-size: 13px;
-			padding-top: 15px;
-			padding-left: 20px;
-		}
-	}
 }
 </style>

smart-ui-app/pages/index/index.vue

@@ -97,7 +97,7 @@ export default {
 				uni.showModal({ content: '登陆才能使用该功能', showCancel: false });
 				return;
 			}
-			//拨打电话获取位置
+			//获取拨打人位置
 			uni.authorize({
 				scope: 'scope.userLocation',
 				success: s => {
@@ -109,10 +109,11 @@ export default {
 								content: '是否拨打' + this.item.helpPhone + '求援电话?',
 								success: c => {
 									if (c.confirm) {
+										//上传拨打救援记录
 										this.$http.request({
 											method: 'POST',
 											url: this.$http.urls.pushHelp,
-											data: { memberId: this.$getUser().memberId, lat: res.latitude, lng: res.longitude, phone: this.item.helpPhone },
+											data: { memberId: this.$getUser().memberId, lat: res.latitude, lng: res.longitude, phone: this.$getUser().mobile },
 											success: r => {
 												uni.makePhoneCall({
 													phoneNumber: this.item.helpPhone

smart-ui-app/pages/other/about.vue

@@ -1,31 +1,36 @@
 <template>
-	<view class="content">
-		<view class="logo">
-			<image class="logo" src="../../static/img3.jpg" mode=""></image>
-			<view class="version">{{ item.title }}</view>
-		</view>
-		<view class="item">
-			<view class="name" @click="phone()">
-				联系电话
-				<text class="tag">{{ item.helpPhone }}</text>
+	<view>
+		<view class="top"><image src="../../static/bj.jpg" mode="aspectFill"></image></view>
+		<view class="content">
+			<section
+				class="wwei-editor"
+				style="color: rgb(51, 51, 51); font-family: 微软雅黑; font-size: 12px; white-space: normal; text-align: center; margin: 0px 1em; line-height: 1.6em;"
+			>
+				<img src="http://pro.wwei.cn/Public/wxeditor/css/gs640.png" style="border: 0px; width: 266px; vertical-align: middle; height: 36px !important;" />
+				<section style="color: white; font-size: 1em; margin-top: -2.1em; white-space: nowrap;">请输入标题</section>
+			</section>
+			<view class="item">
+				<view class="name" @click="phone()">
+					联系电话
+					<text class="tag">{{ item.helpPhone }}</text>
+				</view>
 			</view>
-		</view>
-		<view class="item">
-			<view class="name">
-				邮箱
-				<text class="tag">xxxxxxx</text>
+			<view class="item">
+				<view class="name">
+					邮箱
+					<text class="tag">xxxxxxx</text>
+				</view>
 			</view>
-		</view>
-		<view class="item">
-			<view class="name">
-				地址
-				<text class="tag">xxxxx</text>
+			<view class="item">
+				<view class="name">
+					地址
+					<text class="tag">xxxxx</text>
+				</view>
 			</view>
+			<view class="copyright">Copyright © 2021 {{ item.title }} 版权所有</view>
 		</view>
-		<view class="copyright">Copyright © 2021 {{ item.title }} 版权所有</view>
 	</view>
 </template>
-
 <script>
 export default {
 	data() {
@@ -53,6 +58,41 @@ export default {
 </script>
 
 <style lang="scss">
+.top {
+	position: relative;
+	height: 300px;
+	color: white;
+	.wd {
+		position: absolute;
+		top: 70px;
+		left: 20px;
+		z-index: 11;
+		.head {
+			width: 75px;
+			height: 75px;
+			border-radius: 50%;
+		}
+		.xs {
+			margin-left: 90px;
+			width: 100%;
+			font-weight: bold;
+			margin-top: 10px;
+			.nickName {
+				margin-top: 20px;
+			}
+			.nh {
+				font-size: 12px;
+				font-weight: normal;
+				margin-top: 5px;
+			}
+		}
+	}
+	image {
+		width: 100%;
+		height: 300px;
+		position: absolute;
+	}
+}
 .content {
 	padding: 15px 5px 15px 5px;
 	.logo {

smart-ui-app/pages/shop/list.vue

@@ -4,7 +4,7 @@
 			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
 				<view class="lef">
 					<image :src="ip + item.showPictures[0].url" mode="aspectFill" class="pic"></image>
-					<view class="tag">{{ item.shopType == 1 ? '门店' : '酒店' }}</view>
+					 <view class="tag">{{ item.shopType == 1 ? '门店' : '酒店' }}</view>
 				</view>
 				<view class="con">
 					<view class="title omit">{{ item.name }}</view>
@@ -101,21 +101,21 @@ export default {
 			width: 30%;
 			position: relative;
 			overflow: hidden;
+			height: 85px;
+			border-radius: 4px;
 			.pic {
 				width: 100%;
-				border-radius: 3px;
-				height: 80px;
+				height: 85px;
 				background-color: #dcdcdc;
-				overflow: hidden;
 			}
 			.tag {
 				position: absolute;
-				bottom: 0px;
+				bottom: 0;
 				width: 100%;
 				text-align: center;
-				background-color: red;
+				background-color: $theme-color;
 				height: 20px;
-				opacity: 0.6;
+				opacity: 0.7;
 				color: white;
 			}
 		}

smart-ui-app/pages/travel/index.vue

@@ -51,7 +51,7 @@ export default {
 		},
 		//路线
 		lx(item) {
-			uni.navigateTo({ url: '/pages/travel/route' });
+			uni.navigateTo({ url: '/pages/travel/route?id=' + item.contentId });
 		},
 		//详情
 		detail(item) {

smart-ui-app/pages/travel/route.vue

@@ -1,49 +1,98 @@
 <template>
-	<view><map class="map" :latitude="item.lat" :longitude="item.lng" :polygons="polygons" show-compass="true"></map></view>
+	<view>
+		<u-tabs :list="tab" name="markerName" active-color="#c74547" :is-scroll="false" :current="current" @change="change"></u-tabs>
+		<map class="map" v-if="item.shapeType == 'polyline'" :latitude="item.lat" :longitude="item.lng" scale="13" :polyline="polyline" show-compass="true"></map>
+		<map class="map" v-if="item.shapeType == 'polygon'" :latitude="item.lat" :longitude="item.lng" scale="12" :polygons="polygon" show-compass="true"></map>
+		<map class="map" v-if="item.shapeType == 'circle'" :latitude="item.lat" :longitude="item.lng" scale="13" :circles="circles" show-compass="true"></map>
+		<map class="map" v-if="item.shapeType == 'marker'" :latitude="item.lat" :longitude="item.lng" scale="13" :markers="markers" show-compass="true"></map>
+	</view>
 </template>
 
 <script>
 export default {
 	data() {
 		return {
-			param: { pageNum: 1, pageSize: 10, markerType: 0 },
-			item: { lat: 29.431988858402345, lng: 88.2551640092571 },
-			list: [],
-			covers: [],
-			polygons: [
+			item: {},
+			tab: [],
+			current: 0,
+			markers: [],
+			polyline: [
 				{
-					strokeWidth: 3,
-					strokeColor: '#2196F3',
+					arrowLine: true,
+					width: 12,
+					color: '#4CAF50',
+					points: []
+				}
+			],
+			polygon: [
+				{
+					strokeWidth: 5,
+					strokeColor: '#4CAF50',
 					fillColor: '#03a9f482',
 					points: []
 				}
+			],
+			circles: [
+				{
+					strokeWidth: 3,
+					color: '#4CAF50',
+					fillColor: '#03a9f482'
+				}
 			]
 		};
 	},
-	onLoad() {
-		this.getData();
+	onLoad(e) {
+		this.getData(e.id);
 		this.windowHeight = uni.getSystemInfoSync().windowHeight;
 	},
 	methods: {
+		change(index) {
+			this.current = index;
+			this.refresh();
+		},
 		//获取数据
-		getData() {
+		getData(id) {
 			this.$http.request({
-				url: this.$http.urls.getPageMarker,
-				data: this.param,
-				loading: 'false',
+				url: this.$http.urls.getMarkerList + id,
 				success: res => {
-					console.log('asd:' + JSON.stringify(this.item));
-					res.data.rows.forEach(item => {
+					console.log('asd:' + JSON.stringify(res));
+					this.tab = res.data.data.list;
+					this.tab.forEach(item => {
 						item.locationSet = JSON.parse(item.locationSet);
-						this.list.push(item);
-					});
-					this.item = this.list[0];
-					this.item.locationSet.forEach(item => {
-						this.polygons[0].points.push({ latitude: item.lat, longitude: item.lng });
 					});
-					//this.covers.push({ latitude: this.item.locationSet.lat, longitude: this.item.locationSet.lng, iconPath: this.$http.urls.ip + this.item.iconPictures });
+					this.refresh();
 				}
 			});
+		},
+		//刷新数据
+		refresh() {
+			this.item = this.tab[this.current];
+			if (this.item.shapeType == 'polyline') {
+				this.polyline[0].points = [];
+				this.item.locationSet.forEach(l => {
+					this.polyline[0].points.push({ latitude: l.lat, longitude: l.lng });
+				});
+			}
+			if (this.item.shapeType == 'polygon') {
+				this.polygon[0].points = [];
+				this.item.locationSet.forEach(l => {
+					this.polygon[0].points.push({ latitude: l.lat, longitude: l.lng });
+				});
+			}
+			if (this.item.shapeType == 'circle') {
+				this.circles[0].latitude = this.item.locationSet.lat;
+				this.circles[0].longitude = this.item.locationSet.lng;
+				this.circles[0].radius = this.item.radius;
+			}
+			if (this.item.shapeType == 'marker') {
+				this.markers.push({
+					title: '卫生间',
+					label:'卫生间',
+					latitude: this.item.locationSet.lat,
+					longitude: this.item.locationSet.lng,
+					iconPath: this.$http.urls.ip + this.item.iconPictures
+				});
+			}
 		}
 	}
 };
@@ -54,6 +103,6 @@ export default {
 	position: fixed;
 	width: 100%;
 	height: 100%;
-	top: 0px;
+	top: 40px;
 }
 </style>

smart-ui-app/pages/user/login.vue

@@ -1,8 +1,9 @@
 <template>
 	<view class="bg">
+		<view class="p"><image src="../../static/profile.jpg" class="pic" mode="widthFix"></image></view>
 		<view class="title">智慧旅游小程序正在使用智慧旅游平台登陆提供的服务，平台登陆将使用:</view>
 		<view class="info">
-			<text class="icon"></text>
+			<text class="icon">&#xe75b;</text>
 			<text v-if="first">您的公开信息（昵称，头像，性别等）</text>
 			<text v-else>您的手机号</text>
 		</view>
@@ -15,7 +16,6 @@
 export default {
 	data() {
 		return {
-			item: {},
 			first: true
 		};
 	},
@@ -44,7 +44,12 @@ export default {
 						success: res => {
 							res.data.data.memberInfo.apiToken = res.data.data.apiToken;
 							uni.setStorageSync('user', res.data.data.memberInfo);
-							uni.navigateBack({ delta: 1 });
+							//未绑定手机号
+							if (res.data.data.memberInfo.mobile == null || res.data.data.memberInfo.mobile == '') {
+								this.first = false;
+							} else {
+								uni.navigateBack({ delta: 1 });
+							}
 						}
 					});
 				}
@@ -52,18 +57,19 @@ export default {
 		},
 		// 绑定用户手机号
 		getPhoneNumber(e) {
+			let item = {};
 			uni.login({
 				provider: 'weixin',
 				success: res => {
-					this.item.code = res.code;
-					this.item.encryptedData = e.target.encryptedData;
-					this.item.iv = e.target.iv;
+					item.code = res.code;
+					item.encryptedData = e.target.encryptedData;
+					item.iv = e.target.iv;
 					this.$http.request({
-						url: this.$http.urls.bindPhone,
-						data: this.item,
-						success: res => {
-							uni.setStorageSync('user', res.data.data);
-							uni.$emit('update');
+						url: this.$http.urls.bindWxMobile,
+						data: item,
+						method: 'POST',
+						success: r => {
+							console.log('zxxx:' + JSON.stringify(r));
 							uni.navigateBack({ delta: 1 });
 						}
 					});
@@ -83,12 +89,25 @@ page {
 }
 .bg {
 	padding: 30px;
+	.p {
+		text-align: center;
+		padding: 15px;
+		.pic {
+			width: 100px;
+			height: 100px;
+			border-radius: 50%;
+		}
+	}
 	.title {
 		font-weight: bold;
+		font-size: 16px;
 	}
 	.info {
 		color: #8b918d;
 		margin-top: 10px;
+		.icon {
+			padding-right: 3px;
+		}
 	}
 	.btn {
 		margin-top: 20px;

smart-ui/src/views/login.vue

@@ -50,9 +50,6 @@
       </el-form-item>
     </el-form>
     <!--  底部  -->
-    <div class="el-login-footer">
-      <span>Copyright © 2018-2021 ruoyi.vip All Rights Reserved.</span>
-    </div>
   </div>
 </template>