小程序更新

smart-ui-app/common/common.scss

@@ -41,6 +41,61 @@
 		text-align: right;
 	}
 }
+.r_item {
+	background-color: white;
+	padding: 15px 8px 15px 8px;
+	border-bottom: 1px solid #e5e5e5;
+	border-radius: 5px;
+	margin-top: 10px;
+	box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.2);
+	.pic {
+		float: left;
+		width: 30%;
+		border-radius: 3px;
+		height: 80px;
+		background-color: #dcdcdc;
+	}
+	.con {
+		padding-left: 30px;
+		width: 60%;
+		float: left;
+		.title {
+			font-size: 15px;
+			text-align: left;
+			color: #252525;
+			font-weight: bold;
+		}
+		.ms {
+			margin-top: 10px;
+			.ll {
+				color: #d72424;
+				font-size: 16px;
+				padding-right: 5px;
+			}
+			.wz {
+				font-size: 12px;
+			}
+		}
+		.lx {
+			float: right;
+			color: #fff;
+			background: #d72424;
+			border-radius: 20px;
+			padding: 5px 12px;
+			font-size: 13px;
+			color: white;
+			font-weight: bold;
+			margin-top: -20px;
+			margin-right: -20px;
+			line-height: 23px;
+			margin-right: -31px;
+			.icon {
+				padding-right: 5px;
+				font-size: 20px;
+			}
+		}
+	}
+}
 .mt10 {
 	margin-top: 10px;
 }

smart-ui-app/pages.json

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

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

@@ -1,8 +1,8 @@
 <template>
 	<view>
 		<view class="list">
-			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
-				<view class="r65">
+			<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>
@@ -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/government/index.vue

@@ -5,7 +5,7 @@
 				<view class="r63">
 					<view class="title">{{ item.title }}</view>
 				</view>
-				<view class="r37 day">{{ item.createTime.substring(0, 11) }}</view>
+				<view class="r35 day">{{ item.createTime.substring(0, 11) }}</view>
 				<view class="clear"></view>
 			</view>
 			<view class="loading"><u-loadmore :status="loadMore ? 'loading' : 'nomore'" /></view>

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

@@ -45,7 +45,7 @@
 					<view class="more">点击显示更多</view>
 				</view>
 				<view class="item" @click="tab('/pages/government/index')">
-					<view class="tag">党政服务信息</view>
+					<view class="tag">党政服务</view>
 					<image src="../../static/img3.jpg" mode="aspectFill" class="gray"></image>
 					<view class="more">点击显示更多</view>
 				</view>

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

@@ -2,32 +2,26 @@
 	<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 class="title">
+				<text class="mt">谢通门</text>
+				县隶属于日喀则市，位于西藏自治区日喀则市西北部、雅鲁藏布江北岸。东邻南木林县和日喀则市桑珠孜区，北接那曲市申扎县，西邻昂仁县，南与萨迦县和拉孜县接壤。位于东经87°4′至89°1′，北纬29°18′至30°26′，县人民政府驻卡嘎镇。县城距日喀则市人民政府83千米。截至2014年，谢通门县辖1个镇、18个乡。总面积13960平方千米。
+				谢通门县被命名为“四好农村路”全国
+				<text class="mt">示范县。</text>
 			</view>
-			<view class="item">
-				<view class="name">
-					邮箱
-					<text class="tag">xxxxxxx</text>
+			<view class="info">
+				<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">xxxxx</text>
+				<view class="item">
+					<view class="name">
+						所在地址
+						<text class="tag">日喀则市</text>
+					</view>
 				</view>
 			</view>
-			<view class="copyright">Copyright © 2021 {{ item.title }} 版权所有</view>
 		</view>
 	</view>
 </template>
@@ -62,31 +56,6 @@ export default {
 	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;
@@ -94,30 +63,32 @@ export default {
 	}
 }
 .content {
-	padding: 15px 5px 15px 5px;
-	.logo {
-		text-align: center;
-		image {
-			width: 100px;
-			height: 100px;
-			margin: 0 auto;
-			border-radius: 50%;
-		}
-		.version {
-			margin-bottom: 20px;
-			color: $dar;
-			margin-top: 5px;
+	padding: 15px;
+	.title {
+		padding: 10px;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		border-radius: 5px;
+		.mt {
+			font-size: 25px;
+			font-weight: bold;
+			padding-left: 5px;
+			padding-right: 5px;
 		}
 	}
-	.item {
-		padding: 15px;
-		border-bottom: 1px solid #f1f1f1;
-		color: black;
-		font-size: 15px;
-		overflow: hidden;
-		.tag {
-			float: right;
-			color: $dar2;
+	.info {
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		margin-top: 10px;
+		border-radius: 5px;
+		.item {
+			padding: 15px;
+			border-bottom: 1px solid #f1f1f1;
+			color: black;
+			font-size: 15px;
+			overflow: hidden;
+			.tag {
+				float: right;
+				color: $dar2;
+			}
 		}
 	}
 }

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

@@ -51,15 +51,15 @@
 				<view class="tttt" style="font-weight: bolder;">添加游客</view>
 				<view class="form_group hr">
 					<view class="lable">游客姓名</view>
-					<input placeholder="请输入散客预约人数" v-model="guest.guestName" />
+					<input placeholder="请输入游客姓名" v-model="guest.guestName" />
 				</view>
 				<view class="form_group hr">
 					<view class="lable">身份证号</view>
-					<input placeholder="请输入散客预约人数" v-model="guest.idCard" />
+					<input placeholder="请输入游客身份证号" v-model="guest.idCard" />
 				</view>
 				<view class="form_group hr">
 					<view class="lable">手机号码</view>
-					<input type="number" placeholder="请输入散客预约人数" v-model="guest.phone" />
+					<input type="number" placeholder="请输入游客手机号码" v-model="guest.phone" />
 				</view>
 				<view class="form_group hr">
 					<view class="lable">入住日期</view>

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

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="list">
-			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
+			<view class="r_item" v-for="(item, index) in list" :key="index" @click="detail(item)">
 				<image :src="ip + item.showPictures" mode="aspectFill" class="pic"></image>
 				<view class="con">
 					<view class="title omit">{{ item.title }}</view>
@@ -85,57 +85,5 @@ export default {
 <style lang="scss">
 .list {
 	padding: 0px 10px 70px 10px;
-	.item {
-		background-color: white;
-		padding: 15px 8px 15px 8px;
-		border-bottom: 1px solid #e5e5e5;
-		border-radius: 5px;
-		margin-top: 10px;
-		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.2);
-		.pic {
-			float: left;
-			width: 30%;
-			border-radius: 3px;
-			height: 80px;
-			background-color: #dcdcdc;
-		}
-		.con {
-			padding-left: 30px;
-			width: 60%;
-			float: left;
-			.title {
-				font-size: 15px;
-				text-align: left;
-				color: #252525;
-				font-weight: bold;
-			}
-			.ms {
-				margin-top: 10px;
-				.ll {
-					color: #d72424;
-					font-size: 16px;
-					padding-right: 5px;
-				}
-				.wz {
-					font-size: 12px;
-				}
-			}
-			.lx {
-				float: right;
-				color: #fff;
-				background: #d72424;
-				border-radius: 10px;
-				padding: 8px 10px;
-				font-size: 16px;
-				color: white;
-				font-weight: 700;
-				margin-right: -20px;
-				.icon {
-					padding-right: 5px;
-					font-size: 20px;
-				}
-			}
-		}
-	}
 }
 </style>

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

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="list">
-			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
+			<view class="r_item" v-for="(item, index) in list" :key="index" @click="detail(item)">
 				<image :src="ip + item.showPictures" mode="aspectFill" class="pic"></image>
 				<view class="con">
 					<view class="title omit">{{ item.title }}</view>
@@ -9,10 +9,6 @@
 						<text class="ll">{{ item.browseNum }}</text>
 						<text class="wz">浏览</text>
 					</view>
-<!-- 					<view class="lx">
-						<text class="icon">&#xe696;</text>
-						景区路线
-					</view> -->
 				</view>
 				<view class="clear"></view>
 			</view>
@@ -81,57 +77,5 @@ export default {
 <style lang="scss">
 .list {
 	padding: 0px 10px 70px 10px;
-	.item {
-		background-color: white;
-		padding: 15px 8px 15px 8px;
-		border-bottom: 1px solid #e5e5e5;
-		border-radius: 5px;
-		margin-top: 10px;
-		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.2);
-		.pic {
-			float: left;
-			width: 30%;
-			border-radius: 3px;
-			height: 80px;
-			background-color: #dcdcdc;
-		}
-		.con {
-			padding-left: 30px;
-			width: 60%;
-			float: left;
-			.title {
-				font-size: 15px;
-				text-align: left;
-				color: #252525;
-				font-weight: bold;
-			}
-			.ms {
-				margin-top: 10px;
-				.ll {
-					color: #d72424;
-					font-size: 16px;
-					padding-right: 5px;
-				}
-				.wz {
-					font-size: 12px;
-				}
-			}
-			.lx {
-				float: right;
-				color: #fff;
-				background: #d72424;
-				border-radius: 10px;
-				padding: 8px 10px;
-				font-size: 16px;
-				color: white;
-				font-weight: 700;
-				margin-right: -20px;
-				.icon {
-					padding-right: 5px;
-					font-size: 20px;
-				}
-			}
-		}
-	}
 }
 </style>

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

@@ -43,7 +43,6 @@ export default {
 	},
 	onLoad(e) {
 		this.getData(e.id);
-		this.windowHeight = uni.getSystemInfoSync().windowHeight;
 	},
 	methods: {
 		change(index) {
@@ -85,12 +84,27 @@ export default {
 				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
+				this.markers = [];
+				let iconPictures = '';
+				if (this.item.iconPictures != null && this.item.iconPictures != '') {
+					iconPictures = this.$http.urls.ip + this.item.iconPictures;
+				}
+				this.item.locationSet.forEach(l => {
+					this.markers.push({
+						latitude: l.lat,
+						longitude: l.lng,
+						width: 45,
+						height: 65,
+						iconPath: iconPictures,
+						callout: {
+							display: 'ALWAYS',
+							content: this.tab[this.current].markerName,
+							padding: 7,
+							bgColor: '#4CAF50',
+							borderRadius: 5,
+							color: '#ffffff'
+						}
+					});
 				});
 			}
 		}

smart-ui/src/layout/components/Navbar.vue

@@ -9,14 +9,6 @@
       <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item" />
         
-        <el-tooltip content="源码地址" effect="dark" placement="bottom">
-          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
-        </el-tooltip>
-
-        <el-tooltip content="文档地址" effect="dark" placement="bottom">
-          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip>
-
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
         <el-tooltip content="布局大小" effect="dark" placement="bottom">