更新

smart-ui-app/common/common.scss

@@ -55,9 +55,7 @@
 	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%;
@@ -66,7 +64,7 @@
 		background-color: #dcdcdc;
 	}
 	.con {
-		padding-left: 30px;
+		padding-left: 20px;
 		width: 60%;
 		float: left;
 		.title {
@@ -98,8 +96,8 @@
 			}
 			.ll {
 				color: #d72424;
-				font-size: 16px;
-				padding-right: 5px;
+				font-size: 13px;
+				padding-right: 3px;
 			}
 			.wz {
 				font-size: 12px;
@@ -114,7 +112,7 @@
 			font-size: 13px;
 			color: white;
 			font-weight: bold;
-			margin-top: -17px;
+			margin-top: -2px;
 			margin-right: -20px;
 			line-height: 23px;
 			margin-right: -31px;
@@ -127,8 +125,8 @@
 }
 .menu {
 	background-color: white;
-	border-radius: 7px;
-	padding: 15px;
+	border-radius: 5px;
+	padding: 15px 0px 15px 0px;
 	width: 100%;
 	margin-top: 10px;
 	box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
@@ -142,8 +140,12 @@
 		color: white;
 		padding: 3px;
 	}
+	.icon1{
+		width: 55px;
+		height: 55px;
+	}
 	.title {
-		padding-top: 4px;
+		margin-top: -4px;
 		font-size: 13px;
 	}
 }
@@ -158,7 +160,7 @@
 	float: right;
 	font-size: 13px;
 	font-weight: normal;
-	margin-top: 9px;
+	margin-top: 12px;
 	color: #b2b1b1;
 }
 .mt10 {
@@ -264,7 +266,7 @@
 	overflow: hidden;
 	position: relative;
 	.lable {
-		flex: 0.3;
+		flex: 0.22;
 		font-size: 14px;
 		font-weight: bold;
 	}
@@ -411,15 +413,16 @@
 		.dz {
 			width: 87%;
 			float: left;
-			.icon{
-				padding-right: 3px;
-			}
 		}
 		.dh {
 			width: 13%;
 			float: left;
-			color: #03a9f4;
+			color: red;
 			text-align: right;
+			.icon{
+				font-size: 20px;
+				margin-right: -10px;
+			}
 		}
 	}
 }
@@ -464,7 +467,7 @@
 		text-align: left;
 		line-height: 20px;
 		overflow: hidden;
-		-webkit-line-clamp: 5;
+		-webkit-line-clamp: 6;
 		text-overflow: ellipsis;
 		display: -webkit-box;
 		-webkit-box-orient: vertical;

smart-ui-app/pages.json

@@ -14,6 +14,15 @@
 		
 		},
 		{
+			"path": "pages/travel/index",
+			"style": {
+				"navigationBarTitleText": "景区",
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "dark"
+			}
+		
+		},
+		{
 			"path": "pages/user/my",
 			"style": {
 				"navigationBarTitleText": "我的",
@@ -94,15 +103,6 @@
 
 		},
 		{
-			"path": "pages/travel/index",
-			"style": {
-				"navigationBarTitleText": "景区",
-				"enablePullDownRefresh": true,
-				"backgroundTextStyle": "dark"
-			}
-
-		},
-		{
 			"path": "pages/user/login",
 			"style": {
 				"navigationBarTitleText": "授权登陆"
@@ -195,26 +195,26 @@
 		"backgroundColor": "#F8F8F8",
 		"list": [{
 				"pagePath": "pages/index/index2",
-				"iconPath": "static/tab/home.png",
-				"selectedIconPath": "static/tab/home_select.png",
+				"iconPath": "static/tab/a1.png",
+				"selectedIconPath": "static/tab/a1s.png",
 				"text": "首页"
 			},
 			{
 				"pagePath": "pages/travel/index",
-				"iconPath": "static/tab/jq.png",
-				"selectedIconPath": "static/tab/jq_select.png",
+				"iconPath": "static/tab/a2.png",
+				"selectedIconPath": "static/tab/a2s.png",
 				"text": "景区"
 			},
 			{
 				"pagePath": "pages/shop/hotel/index",
-				"iconPath": "static/tab/jd.png",
-				"selectedIconPath": "static/tab/jd_select.png",
+				"iconPath": "static/tab/a3.png",
+				"selectedIconPath": "static/tab/a3s.png",
 				"text": "酒店预订"
 			},
 			{
 				"pagePath": "pages/user/my",
-				"iconPath": "static/tab/my.png",
-				"selectedIconPath": "static/tab/my_select.png",
+				"iconPath": "static/tab/a4.png",
+				"selectedIconPath": "static/tab/a4s.png",
 				"text": "我的"
 			}
 		]

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

@@ -14,27 +14,51 @@
 		<view class="ms">
 			<text class="icon">&#xe64a;</text>
 			<text>谢通门县欢迎您</text>
-			<navigator url="/pages/index/index" class="jb">旧版首页</navigator>
+			<!-- <navigator url="/pages/index/index" class="jb">旧版首页</navigator> -->
 		</view>
-		<view class="top"><image :src="aboutUs.bgImg1 ? ip + aboutUs.bgImg1 : '../../static/bj.jpg'"></image></view>
+		<view class="top"><image :src="aboutUs.bgImg1 ? ip + aboutUs.bgImg1 : '../../static/bj.jpg'" mode="aspectFill"></image></view>
 		<view class="flex menu">
 			<view class="f" @click="tab('/pages/travel/index')">
-				<view class="icon" style="background-color: #0f0b51;">&#xe605;</view>
+				<image src="../../static/icon3.png" mode="widthFix" class="icon1"></image>
 				<view class="title">景区介绍</view>
 			</view>
 			<view class="f" @click="navigate('/pages/travel/introduction')">
-				<view class="icon" style="background-color: #2cc937;">&#xe647;</view>
+				<image src="../../static/icon1.png" mode="widthFix" class="icon1"></image>
 				<view class="title">旅游攻略</view>
 			</view>
 			<view class="f" @click="navigate('/pages/government/activity')">
-				<view class="icon" style="background-color: #e23e33;">&#xe645;</view>
+				<image src="../../static/icon2.png" mode="widthFix" class="icon1"></image>
 				<view class="title">热门活动</view>
 			</view>
 			<view class="f" @click="navigate('/pages/government/index')">
-				<view class="icon" style="background-color: #e23e33;">&#xe695;</view>
+				<image src="../../static/icon4.png" mode="widthFix" class="icon1"></image>
 				<view class="title">党政服务</view>
 			</view>
 		</view>
+		<view class="flex" style="margin-top: 10px;">
+			<view class="f" style="padding-right:8px;">
+				<image
+					@click="tab('/pages/travel/index')"
+					:src="aboutUs.bgImg1 ? ip + aboutUs.bgImg2 : '../../static/bj.jpg'"
+					style="height: 164px;width: 100%;border-radius: 5px;"
+					mode="aspectFill"
+				/></image>
+			</view>
+			<view class="f">
+				<image
+					@click="tab('/pages/shop/hotel/index')"
+					:src="aboutUs.bgImg1 ? ip + aboutUs.bgImg3 : '../../static/bj.jpg'"
+					style="height: 77px;width: 100%;border-radius: 5px;"
+					mode="aspectFill"
+				></image>
+				<image
+					@click="navigate('/pages/other/feedback')"
+					:src="aboutUs.bgImg1 ? ip + aboutUs.bgImg4 : '../../static/bj.jpg'"
+					style="height: 77px;width: 100%;margin-top: 5px;border-radius: 5px;"
+					mode="aspectFill"
+				></image>
+			</view>
+		</view>
 		<view class="it">
 			<view class="v_title">
 				<image src="../../static/lo.png" class="lo" mode="widthFix"></image>
@@ -46,7 +70,7 @@
 				<view class="clear"></view>
 			</view>
 			<view class="jq_item" v-for="(item, index) in hot_list" :key="index" @click="detail(item)">
-				<image :src="ip + item.showPictures" class="bmg"></image>
+				<image :src="ip + item.showPictures" class="bmg" mode="aspectFill"></image>
 				<view class="tit omit">{{ item.title }}</view>
 				<view class="desc omit">{{ item.briefContent }}</view>
 			</view>
@@ -62,11 +86,11 @@
 				<view class="clear"></view>
 			</view>
 			<view class="jq_item flex" v-for="(item, index) in zn_list" :key="index" @click="detail(item)">
-				<view class="f" style="height: 200px;border-radius: 5px;"><image :src="ip + item.showPictures" class="img"></image></view>
+				<view class="f" style="height: 200px;border-radius: 5px;"><image :src="ip + item.showPictures" mode="aspectFill" class="img"></image></view>
 				<view class="f" style="padding: 10px;">
-					<view class="tit omit">{{ item.title }}</view>
+					<view class="tit omit" style="margin-top: -12px;">{{ item.title }}</view>
 					<view class="str-summery">{{ item.briefContent }}</view>
-					<view class="lx">浏览</view>
+					<view class="lx" style="margin-top: 14px; width: 82px;float: right;">浏览</view>
 				</view>
 			</view>
 		</view>
@@ -91,18 +115,21 @@ export default {
 	},
 	onLoad(e) {
 		this.getData();
-		//天气接口
-		uni.request({
-			url: this.$http.urls.weather,
-			success: res => {
-				if (!res.data.errcode) {
-					this.weather = res.data;
-				}
-			}
-		});
+		this.getWeather();
 		//uni.setStorageSync("user",{"searchValue":null,"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"remark":null,"params":{},"memberId":27,"name":"wx_1011223213","mobile":"","email":null,"registerTime":"2021-11-23 21:39:27","lastLoginTime":"2021-11-23 21:53:20","lastLoginIp":"127.0.0.1","loginNum":2,"unionid":null,"openid":"ok3qt5FMehpGy6aOtqPd9pnPLC_Q","nickName":"西域男孩","avatarUrl":"https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTLeSLQBtiavUU0ByFbXtND7iaricbNU81HSdaV9bQLTfciaMV604u5TNIdjLiaarL7MIZQXIrWFZfNiaZIQ/132","gender":"0","province":"","city":"","country":"","language":"zh_CN","lastLat":null,"lastLng":null,"isShop":0,"apiToken":"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIyNyIsImlhdCI6MTYzNzY3NTYwMCwiZXhwIjoxNjM4MjgwNDAwfQ.vRPuNnLrUH1T8_qOL6Ti4TT2Akw29Set18kiavbjJynol52cxHXqeRoStyF4afdcsiipELdVW9G8-zh52voOFg"})
 	},
 	methods: {
+		getWeather() {
+			//天气接口
+			uni.request({
+				url: this.$http.urls.weather,
+				success: res => {
+					if (!res.data.errcode) {
+						this.weather = res.data;
+					}
+				}
+			});
+		},
 		getData() {
 			this.$http.request({
 				url: this.$http.urls.home,
@@ -162,7 +189,7 @@ export default {
 	}
 }
 .ms {
-	font-size: 22px;
+	font-size: 20px;
 	font-weight: bold;
 	margin-bottom: 15px;
 	margin-top: 10px;
@@ -181,6 +208,9 @@ export default {
 		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
 	}
 }
+.a1 {
+	border-radius: 3px;
+}
 .it {
 	margin-top: 15px;
 }

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

@@ -3,10 +3,8 @@
 		<view class="top"><image src="../../static/bj.jpg" mode="aspectFill"></image></view>
 		<view class="content">
 			<view class="title">
-				<text class="mt">谢通门</text>
-				县隶属于日喀则市，位于西藏自治区日喀则市西北部、雅鲁藏布江北岸。东邻南木林县和日喀则市桑珠孜区，北接那曲市申扎县，西邻昂仁县，南与萨迦县和拉孜县接壤。位于东经87°4′至89°1′，北纬29°18′至30°26′，县人民政府驻卡嘎镇。县城距日喀则市人民政府83千米。截至2014年，谢通门县辖1个镇、18个乡。总面积13960平方千米。
-				谢通门县被命名为“四好农村路”全国
-				<text class="mt">示范县。</text>
+				谢通门县隶属于日喀则市，位于西藏自治区日喀则市西北部、雅鲁藏布江北岸。东邻南木林县和日喀则市桑珠孜区，北接那曲市申扎县，西邻昂仁县，南与萨迦县和拉孜县接壤。位于东经87°4′至89°1′，北纬29°18′至30°26′，县人民政府驻卡嘎镇。县城距日喀则市人民政府83千米。截至2014年，谢通门县辖1个镇、18个乡。总面积13960平方千米。
+				谢通门县被命名为“四好农村路”全国示范县。
 			</view>
 			<view class="info">
 				<view class="item">

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

@@ -20,7 +20,7 @@
 						:size-type="upload.size"
 						:max-count="upload.count"
 						:name="upload.name"
-						:file-list="item.showPictures"
+						:file-list="item.pic"
 						:deletable="item.auditFlag != 1"
 						:show-progress="item.auditFlag != 1"
 						:custom-btn="item.auditFlag == 1"
@@ -31,7 +31,7 @@
 				</view>
 				<view class="form_group">
 					<view class="lable">手机号码</view>
-					<input type="text" placeholder="(选填),以便将处理结果反馈给你" v-model="item.phone" />
+					<input type="text" placeholder="(选填),以便将处理结果反馈给你" v-model="item.phone" style="flex: 0.8;" />
 				</view>
 			</view>
 			<button class="btn" @click="up()">提交投诉</button>

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

@@ -85,7 +85,7 @@ export default {
 		return {
 			ip: this.$http.urls.ip,
 			numList: [{ name: '资料填写' }, { name: '资料审核' }, { name: '审核通过' }],
-			item: { showPictures: [], auditFlag: -1, pic: [] },
+			item: { showPictures: [], auditFlag: -1, pic: [],shopType:2 },
 			upload: {
 				header: { apiToken: this.$getUser().apiToken },
 				name: 'img',

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

@@ -5,18 +5,16 @@
 			<view class="name">{{ item.name }}</view>
 			<view class="address">
 				<view class="dz omit">
-					<text class="icon">&#xe64a;</text>
 					<text>{{ item.addres }}</text>
 				</view>
-				<view class="dh" @click="dh()">导航</view>
+				<view class="dh" @click="dh()"><text class="icon">&#xe64a;</text></view>
 				<view class="clear"></view>
 			</view>
 			<view class="address">
 				<view class="dz">
-					<text class="icon">&#xe634;</text>
 					<text>{{ item.bossPhone }}</text>
 				</view>
-				<view class="dh" @click="phone()">拨打</view>
+				<view class="dh" @click="phone()"><text class="icon">&#xe634;</text></view>
 				<view class="clear"></view>
 			</view>
 		</view>

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

@@ -13,6 +13,7 @@
 				</view>
 				<view class="clear"></view>
 			</view>
+			<view class="loading" v-if="list.length >0"><u-loadmore :status="loadMore ? 'loading' : 'nomore'" /></view>
 			<view class="noLogin" v-if="list.length == 0">
 				<image class="u-error-icon" src="../../../static/sj.png" mode="widthFix"></image>
 				<view class="dll" @click="go()">暂无酒店</view>
@@ -27,7 +28,8 @@ export default {
 		return {
 			ip: this.$http.urls.ip,
 			value: 5,
-			list: []
+			list: [],
+			loadMore:false
 		};
 	},
 	onLoad() {
@@ -63,6 +65,6 @@ export default {
 
 <style lang="scss">
 .list {
-	padding: 10px 10px 70px 10px;
+	padding: 0px 10px 70px 10px;
 }
 </style>

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

@@ -54,7 +54,6 @@ export default {
 		}
 	}
 	.title {
-		padding-top: 20px;
 		font-size: 23px;
 		font-weight: 400;
 		margin-bottom: 20px;

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

@@ -83,6 +83,9 @@ export default {
 </script>
 
 <style lang="scss">
+page{
+	background-color: f6f6f8;
+}	
 .list {
 	padding: 0px 10px 70px 10px;
 }

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

@@ -3,7 +3,7 @@
 		<view class="list">
 			<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="con" style="width: 70%;">
 					<view class="title omit">{{ item.title }}</view>
 					<view class="ms">
 						<text class="ll">{{ item.browseNum }}</text>

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

@@ -1,10 +1,15 @@
 <template>
 	<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>
+		<map
+			class="map"
+			:latitude="item.lat"
+			:longitude="item.lng"
+			scale="11.5"
+			:polyline="polyline"
+			:polygons="polygon"
+			:markers="markers"
+			show-compass="true"
+		></map>
 	</view>
 </template>
 
@@ -42,7 +47,7 @@ export default {
 		};
 	},
 	onLoad(e) {
-		this.getData(9);
+		this.getData(e.id);//9
 	},
 	methods: {
 		change(index) {
@@ -54,8 +59,8 @@ export default {
 			this.$http.request({
 				url: this.$http.urls.getMarkerList + id,
 				success: res => {
-					console.log('asd:' + JSON.stringify(res));
 					this.tab = res.data.data.list;
+					console.log('asd:' + JSON.stringify(this.tab));
 					this.tab.forEach(item => {
 						item.locationSet = JSON.parse(item.locationSet);
 					});
@@ -65,48 +70,47 @@ export default {
 		},
 		//刷新数据
 		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 = [];
-				let iconPictures = '';
-				if (this.item.iconPictures != null && this.item.iconPictures != '') {
-					iconPictures = this.$http.urls.ip + this.item.iconPictures;
+			//this.item = this.tab[this.current];
+			this.item.lat=this.tab[0].lat;
+			this.item.lng=this.tab[0].lng;
+			this.tab.forEach(item => {
+				if (item.shapeType == 'polyline') {
+					item.locationSet.forEach(l => {
+						this.polyline[0].points.push({ latitude: l.lat, longitude: l.lng });
+					});
+				}
+				if (item.shapeType == 'polygon') {
+					item.locationSet.forEach(l => {
+						this.polygon[0].points.push({ latitude: l.lat, longitude: l.lng });
+					});
 				}
-				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'
-						}
+				if (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 (item.shapeType == 'marker') {
+					let iconPictures = '';
+					if (item.iconPictures != null && item.iconPictures != '') {
+						iconPictures = this.$http.urls.ip + item.iconPictures;
+					}
+					item.locationSet.forEach(l => {
+						this.markers.push({
+							latitude: l.lat,
+							longitude: l.lng,
+							iconPath: iconPictures,
+							callout: {
+								display: 'ALWAYS',
+								content: item.markerName,
+								padding: 7,
+								bgColor: '#4CAF50',
+								borderRadius: 5,
+								color: '#ffffff'
+							}
+						});
 					});
-				});
-			}
+				}
+			});
 		}
 	}
 };
@@ -117,6 +121,5 @@ export default {
 	position: fixed;
 	width: 100%;
 	height: 100%;
-	top: 40px;
 }
 </style>

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

@@ -45,13 +45,18 @@ export default {
 };
 </script>
 
-<style>
+<style lang="scss">
 .item {
 	background-color: white;
 	padding: 10px;
 	border-radius: 5px;
 	box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
 }
+.form_group {
+	.lable {
+		flex: 0.3;
+	}
+}
 .l {
 	line-height: 56px;
 }

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

@@ -17,12 +17,12 @@
 		<view class="main">
 			<view class="list">
 				<view class="item hr" @click="navigate('/pages/order/my')">
-					<text class="icon ic" style="background-color: #2979FF;">&#xe705;</text>
+					<text class="icon ic" style="background-color: #2196F3;">&#xe705;</text>
 					<text>我的预约</text>
 					<text class="icon arrow">&#xe62d;</text>
 				</view>
 				<view class="item hr" @click="navigate('/pages/shop/list')">
-					<text class="icon ic" style="background-color:red">&#xe616;</text>
+					<text class="icon ic" style="background-color:#607D8B">&#xe616;</text>
 					<text>商家中心</text>
 					<text class="icon arrow">&#xe62d;</text>
 				</view>
@@ -39,7 +39,7 @@
 					<text class="icon arrow">&#xe62d;</text>
 				</view>
 				<view class="item hr">
-					<button open-type="share">
+					<button open-type="share" hover-class='none'>
 						<text class="icon ic" style="background-color:#18B566">&#xe607;</text>
 						<text>分享朋友</text>
 						<text class="icon arrow">&#xe62d;</text>
@@ -177,5 +177,9 @@ button {
 	padding-right: 2px;
 	line-height: 20px;
 	overflow: initial;
+	&:hover {
+		background-color: white;
+		outline:none;
+	}
 }
 </style>

smart-ui/src/views/management/aboutUs/index-back.vue

@@ -1,302 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['management:aboutUs:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['management:aboutUs:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['management:aboutUs:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['management:aboutUs:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="aboutUsList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="关于我们id" align="center" prop="aboutUsId" />
-      <el-table-column label="标题" align="center" prop="title" />
-      <el-table-column label="求助电话" align="center" prop="helpPhone" />
-      <el-table-column label="简介1" align="center" prop="briefText1" />
-      <el-table-column label="简介2" align="center" prop="briefText2" />
-      <el-table-column label="简介3" align="center" prop="briefText3" />
-      <el-table-column label="简介4" align="center" prop="briefText4" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['management:aboutUs:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['management:aboutUs:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改关于我们对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="标题" prop="title">
-          <el-input v-model="form.title" placeholder="请输入标题" />
-        </el-form-item>
-        <el-form-item label="求助电话" prop="helpPhone">
-          <el-input v-model="form.helpPhone" placeholder="请输入求助电话" />
-        </el-form-item>
-        <el-form-item label="展示图片">
-          <imageUpload v-model="form.showPictures"/>
-        </el-form-item>
-        <el-form-item label="简介1" prop="briefText1">
-          <el-input v-model="form.briefText1" placeholder="请输入简介1" />
-        </el-form-item>
-        <el-form-item label="简介2" prop="briefText2">
-          <el-input v-model="form.briefText2" placeholder="请输入简介2" />
-        </el-form-item>
-        <el-form-item label="简介3" prop="briefText3">
-          <el-input v-model="form.briefText3" placeholder="请输入简介3" />
-        </el-form-item>
-        <el-form-item label="简介4" prop="briefText4">
-          <el-input v-model="form.briefText4" placeholder="请输入简介4" />
-        </el-form-item>
-        <el-form-item label="详情">
-          <editor v-model="form.content" :min-height="192"/>
-        </el-form-item>
-        <el-form-item label="背景图片1">
-          <imageUpload v-model="form.bgImg1"/>
-        </el-form-item>
-        <el-form-item label="背景图片2">
-          <imageUpload v-model="form.bgImg2"/>
-        </el-form-item>
-        <el-form-item label="背景图片3">
-          <imageUpload v-model="form.bgImg3"/>
-        </el-form-item>
-        <el-form-item label="背景图片4">
-          <imageUpload v-model="form.bgImg4"/>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listAboutUs, getAboutUs, delAboutUs, addAboutUs, updateAboutUs, exportAboutUs } from "@/api/management/aboutUs";
-
-export default {
-  name: "AboutUs",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 关于我们表格数据
-      aboutUsList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询关于我们列表 */
-    getList() {
-      this.loading = true;
-      listAboutUs(this.queryParams).then(response => {
-        this.aboutUsList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        aboutUsId: null,
-        title: null,
-        helpPhone: null,
-        showPictures: null,
-        briefText1: null,
-        briefText2: null,
-        briefText3: null,
-        briefText4: null,
-        content: null,
-        bgImg1: null,
-        bgImg2: null,
-        bgImg3: null,
-        bgImg4: null,
-        createTime: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.aboutUsId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加关于我们";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const aboutUsId = row.aboutUsId || this.ids
-      getAboutUs(aboutUsId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改关于我们";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.aboutUsId != null) {
-            updateAboutUs(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addAboutUs(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const aboutUsIds = row.aboutUsId || this.ids;
-      this.$confirm('是否确认删除关于我们编号为"' + aboutUsIds + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delAboutUs(aboutUsIds);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有关于我们数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          this.exportLoading = true;
-          return exportAboutUs(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-          this.exportLoading = false;
-        }).catch(() => {});
-    }
-  }
-};
-</script>

smart-ui/src/views/management/aboutUs/index.vue

@@ -2,13 +2,11 @@
   <div class="app-container">
     <el-form ref="form" :model="form" :rules="rules" label-width="100px">
       <el-form-item label="标题" prop="title"><el-input v-model="form.title" placeholder="请输入标题" /></el-form-item>
-      <el-form-item label="求助电话" prop="helpPhone"><el-input v-model="form.helpPhone" placeholder="请输入求助电话"/></el-form-item>
+      <el-form-item label="求助电话" prop="helpPhone"><el-input v-model="form.helpPhone" placeholder="请输入求助电话" /></el-form-item>
       <el-form-item label="首页banner"><imageUpload v-model="form.bgImg1" :limit="1" /></el-form-item>
-      <!-- <el-form-item label="首页banner"><imageUpload v-model="form.showPictures" :limit="2"/></el-form-item> -->
-<!--      <el-form-item label="背景图片1"><imageUpload v-model="form.bgImg1" :limit="1" /></el-form-item>
-      <el-form-item label="背景图片2"><imageUpload v-model="form.bgImg2" :limit="1"/></el-form-item>
-      <el-form-item label="背景图片3"><imageUpload v-model="form.bgImg3" :limit="1"/></el-form-item>
-      <el-form-item label="背景图片4"><imageUpload v-model="form.bgImg4" :limit="1"/></el-form-item> -->
+      <el-form-item label="旅游景区"><imageUpload v-model="form.bgImg2" :limit="1" /></el-form-item>
+      <el-form-item label="酒店预订"><imageUpload v-model="form.bgImg3" :limit="1" /></el-form-item>
+      <el-form-item label="投诉建议"><imageUpload v-model="form.bgImg4" :limit="1" /></el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer"><el-button type="primary" @click="submitForm">确 定</el-button></div>
   </div>

smart-ui/src/views/management/member/index.vue

@@ -11,7 +11,6 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5"><el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-hasPermi="['management:member:add']">新增</el-button></el-col>
-      <el-col :span="1.5"><el-button type="success" icon="el-icon-edit" :disabled="single" @click="handleUpdate" v-hasPermi="['management:member:edit']">修改</el-button></el-col>
       <el-col :span="1.5">
         <el-button type="danger" icon="el-icon-delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['management:member:remove']">删除</el-button>
       </el-col>
@@ -32,7 +31,6 @@
       <el-table-column label="上次登录IP" align="center" prop="lastLoginIp" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['management:member:edit']">修改</el-button>
           <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['management:member:remove']">删除</el-button>
         </template>
       </el-table-column>