更新

smart-admin/src/main/java/com/huijy/web/controller/api/ApiIndexController.java

@@ -120,7 +120,7 @@ public class ApiIndexController extends ApiAbstractController {
         }
         member.setMobile(phoneNumberInfo.getPhoneNumber());
         memberService.updateMember(member);
-        return AjaxResult.success();
+        return AjaxResult.success(member);
     }
 
 
@@ -186,35 +186,20 @@ public class ApiIndexController extends ApiAbstractController {
         return AjaxResult.success();
     }
 
-    //分页获取主要内容信息
     @GetMapping("/getPageContent")
     @ApiOperation("分页获取主要内容信息")
     @UnLogin
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "type", value = "类型:1、党政服务;2、景区介绍;3、旅游攻略;4、热门活动", required = true, defaultValue = "1", dataType = "Integer",
-                    allowableValues = "1,2,3,4", paramType = "query"),
-            @ApiImplicitParam(name = "pageNum", required = true, defaultValue = "1", value = "页码", paramType = "query"),
-            @ApiImplicitParam(name = "pageSize", required = true, defaultValue = "20", value = "显示记录数", paramType = "query")
-    })
-    public TableDataInfo getPageContent(@ApiIgnore @LoginMember Member member, Integer type) {
-        Content content = new Content();
-        content.setServiceInfo(type + "");
+    public TableDataInfo getPageContent(Content content) {
         content.setReleaseFlag("1");
         startPage();
         List<Content> list = contentService.selectContentList(content);
         return getDataTable(list);
-
     }
 
-
-    //分页获取主要内容信息
     @GetMapping("/getContentInfo/{contentId}")
     @ApiOperation("获取主要内容详细信息")
     @UnLogin
-
-    public AjaxResult getContentInfo(@ApiIgnore @LoginMember Member member, @PathVariable Integer contentId) {
-        // AboutUs aboutUs = aboutUsService.selectAboutUsByAboutUsId(1L);
-
+    public AjaxResult getContentInfo(@PathVariable Integer contentId) {
         Content info = contentService.selectContentByContentId(contentId.longValue());
         Map<String, Object> resultObj = new HashMap<String, Object>();
         resultObj.put("info", info);
@@ -339,8 +324,8 @@ public class ApiIndexController extends ApiAbstractController {
     @UnLogin
     @GetMapping("/hotelList")
     @ApiOperation("酒店列表")
-    public AjaxResult hotelList() {
-        List<Shop> list = shopService.selectShopByHotel();
+    public AjaxResult hotelList(Shop shop) {
+        List<Shop> list = shopService.selectShopByHotel(shop);
         return AjaxResult.success(list);
     }
 

smart-system/src/main/java/com/huijy/management/mapper/ShopMapper.java

@@ -62,5 +62,5 @@ public interface ShopMapper {
 
     List<Shop> selectListByMemberId(@Param("memberId") Long memberId);
 
-    public List<Shop> selectShopByHotel();
+    public List<Shop> selectShopByHotel(Shop shop);
 }

smart-system/src/main/java/com/huijy/management/service/IShopService.java

@@ -67,5 +67,5 @@ public interface IShopService {
      */
     List<Shop> getListByMemberId(Long memberId);
 
-    public List<Shop> selectShopByHotel();
+    public List<Shop> selectShopByHotel(Shop shop);
 }

smart-system/src/main/java/com/huijy/management/service/impl/ShopServiceImpl.java

@@ -96,7 +96,7 @@ public class ShopServiceImpl implements IShopService {
     }
 
     @Override
-    public List<Shop> selectShopByHotel() {
-        return shopMapper.selectShopByHotel();
+    public List<Shop> selectShopByHotel(Shop shop) {
+        return shopMapper.selectShopByHotel(shop);
     }
 }

smart-system/src/main/resources/mapper/management/ShopMapper.xml

@@ -51,7 +51,11 @@
     </select>
 
     <select id="selectShopByHotel" resultMap="ShopResult">
-       SELECT * FROM t_shop WHERE shop_type=2 AND audit_flag=1 ORDER BY create_time DESC
+        SELECT * FROM t_shop
+         WHERE shop_type=2
+         AND audit_flag=1
+        <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
+        ORDER BY create_time DESC
     </select>
 
     <insert id="insertShop" parameterType="Shop" useGeneratedKeys="true" keyProperty="shopId">

smart-ui-app/App.vue

@@ -25,7 +25,7 @@ button::after { border: none }
 /**挂载iconfont图表*/
 @font-face {
 	font-family: 'iconfont';
-	src: url('https://at.alicdn.com/t/font_2816842_y7wrurhw29b.ttf?t=1638869589801') format('truetype'); //在线
+	src: url('https://at.alicdn.com/t/font_2816842_zl1wpxv95og.ttf?t=1639040029988') format('truetype'); //在线
 	// src: url('~@/static/font/iconfont.ttf') format('truetype'); //本地
 }
 .icon {

smart-ui-app/common/common.scss

@@ -138,7 +138,6 @@
 		}
 		.lx {
 			float: right;
-			width: 55%;
 			text-align: center;
 			margin-right: -18px;
 			color: #fff;
@@ -512,12 +511,11 @@
 		}
 		.lx {
 			float: right;
-			width: 55%;
 			margin-right: -20px;
 			color: #fff;
 			background: #e22929;
 			border-radius: 15pt 0pt 0pt 15pt;
-			padding: 5px 12px;
+			padding: 5px 20px;
 			font-size: 13px;
 			letter-spacing: 1.1px;
 			color: white;
@@ -527,6 +525,23 @@
 	}
 }
 .sos {
+	float: right;
+	background: red;
+	padding: 4px 17px 4px 17px;
+	color: white;
+	font-size: 15px;
+	text-align: center;
+	font-weight: normal;
+	margin-top: -6px;
+	border-radius: 20px;
+	box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+	opacity: 0.7;
+	.icon {
+		font-size: 20px;
+		padding-bottom: 3px;
+	}
+}
+/* .sos {
 	position: fixed;
 	top: 53%;
 	right: 0px;
@@ -544,7 +559,7 @@
 		font-size: 25px;
 		padding-bottom: 3px;
 	}
-}
+} */
 .hot_item {
 	.u-node {
 		width: 55rpx;

smart-ui-app/common/http.js

@@ -111,15 +111,16 @@ const request = (opt) => {
 		}
 	})
 }
+const getParam = (url, parameter) => {
+	let index = url.lastIndexOf(parameter);
+	url = url.substring(index + 4, url.length);
+	return url;
+}
 const getUser = () => {
 	return uni.getStorageSync('user');
 }
 //拨打救援电话
 const call = (aboutUs) => {
-	if (!getUser().memberId) {
-		uni.showModal({ content: '登陆才能使用该功能', showCancel: false });
-		return;
-	}
 	//获取拨打人位置
 	uni.authorize({
 		scope: 'scope.userLocation',
@@ -127,31 +128,22 @@ const call = (aboutUs) => {
 			uni.getLocation({
 				type: 'wgs84',
 				success: res => {
-					console.log("asd:"+JSON.stringify(res));
-					uni.showModal({
-						title: '提示',
-						content: '是否拨打' + aboutUs.helpPhone + '求援电话?',
-						success: c => {
-							if (c.confirm) {
-								//上传拨打救援记录
-								request({
-									method: 'POST',
-									url: urls.pushHelp,
-									data: {
-										memberId: getUser().memberId,
-										lat: res.latitude,
-										lng: res.longitude,
-										phone: aboutUs.helpPhone,
-										memberPhone: getUser().mobile
-									},
-									success: r => {
-										uni.makePhoneCall({
-											phoneNumber: aboutUs
-												.helpPhone
-										});
-									}
-								});
-							}
+					//上传拨打救援记录
+					request({
+						method: 'POST',
+						url: urls.pushHelp,
+						data: {
+							memberId: getUser().memberId,
+							lat: res.latitude,
+							lng: res.longitude,
+							phone: aboutUs.helpPhone,
+							memberPhone: getUser().mobile
+						},
+						success: r => {
+							uni.makePhoneCall({
+								phoneNumber: aboutUs
+									.helpPhone
+							});
 						}
 					});
 				}
@@ -168,4 +160,5 @@ module.exports = {
 	request,
 	getUser,
 	call,
+	getParam,
 };

smart-ui-app/components/help.vue

@@ -0,0 +1,116 @@
+<template>
+	<u-popup v-model="show" :mask-close-able="false" mode="center" border-radius="14" width="90%" height="auto" :closeable="true">
+		<view class="u-popup">
+			<view class="tttt" style="font-weight: bolder;">拨打求助电话</view>
+			<view style="text-align: center;"><image src="../static/help.jpg" mode="widthFix" class="pic"></image></view>
+			<view class="help">
+				<text class="icon">&#xe94d;</text>
+				<text>求助电话：{{ aboutUs.helpPhone }}</text>
+			</view>
+			<view class="tk">
+				<view class="vvv">1，当你或者你的亲人景区不慎走失</view>
+				<view class="vvv">2，你在谢通门遇到困难</view>
+			</view>
+			<button class="btn" @click="call()" v-if="user.mobile&&user.mobile.length > 0">拨打电话</button>
+			<button class="btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" v-else>获取手机号并拨打</button>
+		</view>
+	</u-popup>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			show: false,
+			aboutUs: {},
+			user: {}
+		};
+	},
+	onLoad() {},
+	methods: {
+		init(show = true) {
+			if (!this.$hasLogin()) {
+				uni.showModal({
+					title: '提示',
+					content: '您还未登陆,请先登陆!',
+					success: res => {
+						if (res.confirm) {
+							uni.navigateTo({
+								url: '/pages/user/login'
+							});
+						}
+					}
+				});
+				return;
+			}
+			this.show = show;
+			this.aboutUs = uni.getStorageSync('aboutUs');
+			this.user = this.$getUser();
+		},
+		call() {
+			this.$http.call(this.aboutUs);
+		},
+		// 绑定用户手机号
+		getPhoneNumber(e) {
+			let item = {};
+			uni.login({
+				provider: 'weixin',
+				success: res => {
+					this.disabled = false;
+					item.code = res.code;
+					item.encryptedData = e.target.encryptedData;
+					item.iv = e.target.iv;
+					this.$http.request({
+						url: this.$http.urls.bindWxMobile,
+						data: item,
+						method: 'POST',
+						success: r => {
+							this.user.mobile = r.data.data.mobile;
+							uni.setStorageSync('user', this.user);
+							this.$forceUpdate();
+							this.$http.call(this.aboutUs);
+						}
+					});
+				}
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.u-popup {
+	overflow: hidden;
+}
+.pic {
+	border-radius: 7px;
+	width: 50%;
+	margin: 0 auto;
+}
+.help {
+	border-radius: 5px;
+	padding: 10px;
+	box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+	margin: 10px 0px 5px 0px;
+	color: #626262;
+	font-size:15px;
+	.icon {
+		padding-right: 3px;
+		font-weight: bold;
+	}
+}
+.tk {
+	box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+	background-color: white;
+	color: #626262;
+	margin-top: 10px;
+	.vvv {
+		padding: 5px 5px 5px 5px;
+		font-size: 13px;
+	}
+}
+
+.btn {
+	margin-top: 20px !important;
+}
+</style>

smart-ui-app/pages.json

@@ -11,12 +11,19 @@
 				"backgroundTextStyle": "dark",
 				"navigationStyle": "custom"
 			}
-
+		
+		},
+		{
+			"path": "pages/user/my",
+			"style": {
+				"navigationBarTitleText": "我的",
+				"navigationStyle": "custom"
+			}
 		},
 		{
 			"path": "pages/travel/index",
 			"style": {
-				"navigationBarTitleText": "景区",
+				"navigationBarTitleText": "旅游景区",
 				"enablePullDownRefresh": true,
 				"backgroundTextStyle": "dark"
 			}
@@ -31,13 +38,6 @@
 
 		},
 		{
-			"path": "pages/user/my",
-			"style": {
-				"navigationBarTitleText": "我的",
-				"navigationStyle": "custom"
-			}
-		},
-		{
 			"path": "pages/shop/list",
 			"style": {
 				"navigationBarTitleText": "我的店铺",
@@ -139,9 +139,9 @@
 			}
 
 		}, {
-			"path": "pages/travel/introduction",
+			"path": "pages/travel/list",
 			"style": {
-				"navigationBarTitleText": "旅游攻略",
+				"navigationBarTitleText": "",
 				"enablePullDownRefresh": true,
 				"backgroundTextStyle": "dark"
 			}
@@ -215,7 +215,7 @@
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
 		"navigationBarTitleText": "",
-		"navigationBarBackgroundColor": "#E22929",
+		"navigationBarBackgroundColor": "#d84748",
 		"backgroundColor": "#F8F8F8",
 		"pageOrientation": "portrait"
 

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

@@ -26,7 +26,7 @@ export default {
 	data() {
 		return {
 			list: [],
-			param: { pageNum: 1, pageSize: 10, type: 4 },
+			param: { pageNum: 1, pageSize: 10, serviceInfo: 4, title: '', orderByColumn: 'createTime', isAsc: 'desc' },
 			loadMore: true
 		};
 	},
@@ -52,6 +52,14 @@ export default {
 		detail(item) {
 			uni.navigateTo({ url: '/pages/travel/detail?id=' + item.contentId });
 		},
+		//点击键盘搜索按钮触发
+		search() {
+			this.refresh();
+		},
+		//清空搜索内容
+		clear() {
+			this.refresh();
+		},
 		//刷新数据
 		refresh() {
 			this.loadMore = true;

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

@@ -26,7 +26,7 @@ export default {
 	data() {
 		return {
 			list: [],
-			param: { pageNum: 1, pageSize: 10, type: 1 },
+			param: { pageNum: 1, pageSize: 10, serviceInfo: 1,title:'',orderByColumn: 'createTime', isAsc: 'desc'  },
 			loadMore: true
 		};
 	},
@@ -52,6 +52,14 @@ export default {
 		detail(item) {
 			uni.navigateTo({ url: '/pages/travel/detail?id=' + item.contentId });
 		},
+		//点击键盘搜索按钮触发
+		search() {
+			this.refresh();
+		},
+		//清空搜索内容
+		clear() {
+			this.refresh();
+		},
 		//刷新数据
 		refresh() {
 			this.loadMore = true;

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

@@ -1,9 +1,5 @@
 <template>
 	<view class="page">
-		<view class="sos" @click="call()">
-			<view class="icon">&#xe6d1;</view>
-			SOS
-		</view>
 		<view class="wd">
 			<view class="qw">{{ weather.tem }}°</view>
 			<view class="xs">
@@ -14,14 +10,18 @@
 		<view class="ms">
 			<text class="icon">&#xe64a;</text>
 			<text>谢通门县欢迎您</text>
+			<view class="sos" @click="call()">
+				<text class="icon">&#xe94d;</text>
+				求助
+			</view>
 		</view>
-		<view class="top"><image :src="aboutUs.bgImg1 ? ip + aboutUs.bgImg1 : '../../static/loading.gif'" mode="aspectFill"></image></view>
+		<view class="top"><image :src="ip + aboutUs.bgImg1" mode="aspectFill"></image></view>
 		<view class="flex menu">
-			<view class="f" @click="tab('/pages/travel/index')">
+			<view class="f" @click="navigate('/pages/travel/detail?id=43')">
 				<image src="../../static/icon3.png" mode="widthFix" class="icon1"></image>
-				<view class="title">景区介绍</view>
+				<view class="title">谢通门介绍</view>
 			</view>
-			<view class="f" @click="navigate('/pages/travel/introduction')">
+			<view class="f" @click="navigate('/pages/travel/list?type=3')">
 				<image src="../../static/icon1.png" mode="widthFix" class="icon1"></image>
 				<view class="title">旅游攻略</view>
 			</view>
@@ -36,26 +36,11 @@
 		</view>
 		<view class="flex" style="margin-top: 10px;">
 			<view class="f" style="padding-right:8px;">
-				<image
-					@click="navigate('/pages/travel/detail?id=41')"
-					:src="aboutUs.bgImg1 ? ip + aboutUs.bgImg2 : '../../static/loading.gif'"
-					style="height: 164px;width: 100%;border-radius: 5px;"
-					mode="aspectFill"
-				/></image>
+				<image @click="navigate(2)" :src="ip + aboutUs.bgImg2" style="height: 164px;width: 100%;border-radius: 5px;" mode="aspectFill"></image>
 			</view>
 			<view class="f">
-				<image
-					@click="navigate('/pages/travel/detail?id=42')"
-					:src="aboutUs.bgImg1 ? ip + aboutUs.bgImg3 : '../../static/loading.gif'"
-					style="height: 77px;width: 100%;border-radius: 5px;"
-					mode="aspectFill"
-				></image>
-				<image
-					@click="navigate('/pages/other/feedback')"
-					:src="aboutUs.bgImg1 ? ip + aboutUs.bgImg4 : '../../static/loading.gif'"
-					style="height: 77px;width: 100%;margin-top: 5px;border-radius: 5px;"
-					mode="aspectFill"
-				></image>
+				<image @click="navigate(3)" :src="ip + aboutUs.bgImg3" style="height: 77px;width: 100%;border-radius: 5px;" mode="aspectFill"></image>
+				<image @click="navigate(4)" :src="ip + aboutUs.bgImg4" style="height: 77px;width: 100%;margin-top: 5px;border-radius: 5px;" mode="aspectFill"></image>
 			</view>
 		</view>
 		<view class="it">
@@ -98,11 +83,16 @@
 			</view>
 		</view>
 		<u-back-top :scroll-top="scrollTop"></u-back-top>
+		<help ref="help"></help>
 	</view>
 </template>
 
 <script>
+import help from '../../components/help.vue';
 export default {
+	components: {
+		help
+	},
 	data() {
 		return {
 			ip: this.$http.urls.ip,
@@ -118,7 +108,7 @@ export default {
 	},
 	onLoad(e) {
 		this.getData();
-		this.getWeather();
+		//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: {
@@ -153,12 +143,26 @@ export default {
 		detail(item) {
 			uni.navigateTo({ url: '/pages/travel/detail?id=' + item.contentId });
 		},
-		navigate(url) {
-			uni.navigateTo({ url: url });
+		//根据后台的选择跳转id跳转到指定文章
+		navigate(index) {
+			let id;
+			if (index == 2) {
+				id = this.$http.getParam(this.aboutUs.briefText1, '?');
+			}
+			if (index == 2) {
+				id = this.$http.getParam(this.aboutUs.briefText2, '?');
+			}
+			if (index == 3) {
+				id = this.$http.getParam(this.aboutUs.briefText3, '?');
+			}
+			if (index == 4) {
+				id = this.$http.getParam(this.aboutUs.briefText4, '?');
+			}
+			uni.navigateTo({ url: '/pages/travel/detail?id=' + id });
 		},
 		//拨打求助电话
 		call() {
-			this.$http.call(this.aboutUs);
+			this.$refs.help.init();
 		}
 	},
 	//下拉刷新

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

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

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

@@ -1,7 +1,7 @@
 <template>
 	<view class="list">
 		<view class="msearch">
-			<u-search v-model="param.title" :animation="true" action-text="取消" placeholder="输入搜索内容" shape="round" @search="search" @clear="clear"></u-search>
+			<u-search v-model="param.name" :animation="true" action-text="取消" placeholder="输入搜索内容" shape="round" @search="search" @clear="clear"></u-search>
 		</view>
 		<view class="r_item" v-for="(item, index) in list" :key="index" @click="detail(item)">
 			<image :src="ip + item.showPictures[0]" mode="aspectFill" class="pic"></image>
@@ -33,7 +33,7 @@ export default {
 			ip: this.$http.urls.ip,
 			value: 5,
 			list: [],
-			param: {},
+			param: {name:''},
 			loadMore: false
 		};
 	},
@@ -45,6 +45,7 @@ export default {
 		getData() {
 			this.$http.request({
 				url: this.$http.urls.hotelList,
+				data:this.param,
 				success: res => {
 					this.list = res.data.data;
 					this.list.forEach(item => {
@@ -56,6 +57,14 @@ export default {
 		//详情
 		detail(item) {
 			uni.navigateTo({ url: '/pages/shop/detail?shopId=' + item.shopId });
+		},
+		//点击键盘搜索按钮触发
+		search() {
+			this.getData();
+		},
+		//清空搜索内容
+		clear() {
+			this.getData();
 		}
 	},
 	//下拉刷新

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

@@ -11,7 +11,7 @@
 					<text class="icon">&#xec86;</text>
 					<text class="ll">{{ item.browseNum }}</text>
 				</view>
-				<view class="lx">
+				<view class="lx" @click="lx(item)">
 					<text class="icon">&#xe603;</text>
 					<text>景区路线</text>
 				</view>
@@ -28,7 +28,7 @@ export default {
 		return {
 			ip: this.$http.urls.ip,
 			list: [],
-			param: { pageNum: 1, pageSize: 10, type: 2 },
+			param: { pageNum: 1, pageSize: 10, serviceInfo: 2, title: '',orderByColumn: 'createTime', isAsc: 'desc' },
 			loadMore: true
 		};
 	},
@@ -58,6 +58,14 @@ export default {
 		detail(item) {
 			uni.navigateTo({ url: '/pages/travel/detail?id=' + item.contentId });
 		},
+		//点击键盘搜索按钮触发
+		search() {
+			this.refresh();
+		},
+		//清空搜索内容
+		clear() {
+			this.refresh();
+		},
 		//刷新数据
 		refresh() {
 			this.loadMore = true;

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

@@ -12,7 +12,7 @@
 						<text class="icon">&#xec86;</text>
 						<text class="ll">{{ item.browseNum }}</text>
 					</view>
-					<view class="lx">
+					<view class="lx" v-if="param.type == 3">
 						<text class="icon">&#xe603;</text>
 						<text>获取攻略</text>
 					</view>
@@ -30,12 +30,30 @@ export default {
 		return {
 			ip: this.$http.urls.ip,
 			list: [],
-			param: { pageNum: 1, pageSize: 10, type: 3, title: '' },
+			param: { pageNum: 1, pageSize: 10, serviceInfo: 3, title: '',orderByColumn: 'createTime', isAsc: 'desc' },
 			loadMore: true
 		};
 	},
-	onLoad() {
+	onLoad(e) {
+		this.param.serviceInfo = e.type;
 		this.getData();
+		this.$nextTick(() => {
+			if (e.type == 3) {
+				uni.setNavigationBarTitle({
+					title: '旅游攻略'
+				});
+			}
+			if (e.type == 5) {
+				uni.setNavigationBarTitle({
+					title: '谢通门介绍'
+				});
+			}
+			if (e.type == 6) {
+				uni.setNavigationBarTitle({
+					title: '特产介绍'
+				});
+			}
+		}, 300);
 	},
 	methods: {
 		//获取数据
@@ -56,6 +74,14 @@ export default {
 		detail(item) {
 			uni.navigateTo({ url: '/pages/travel/detail?id=' + item.contentId });
 		},
+		//点击键盘搜索按钮触发
+		search() {
+			this.refresh();
+		},
+		//清空搜索内容
+		clear() {
+			this.refresh();
+		},
 		//刷新数据
 		refresh() {
 			this.loadMore = true;

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

@@ -1,13 +1,12 @@
 <template>
 	<view class="bg">
 		<view class="p"><image src="../../static/profile.jpg" class="pic" mode="widthFix"></image></view>
-		<view class="title">谢通门智慧旅游登录使用:</view>
+		<view class="title">谢通门智慧旅游将使用:</view>
 		<view class="info">
 			<text v-if="first">您的公开信息（昵称，头像等）</text>
 			<text v-else>您的手机号</text>
 		</view>
-		<button class="btn" @click="getUserProfile()" v-if="first" :disabled="disabled">获取信息</button>
-		<button class="btn" open-type="getPhoneNumber" :disabled="disabled" @getphonenumber="getPhoneNumber" style="background-color: #2196F3" v-else>获取手机号</button>
+		<button class="btn" @click="getUserProfile()" :disabled="disabled">获取信息</button>
 		<button class="btn" style="background-color: #9E9E9E;" @click="cancel()">取消</button>
 	</view>
 </template>
@@ -43,12 +42,7 @@ export default {
 							this.disabled = false;
 							res.data.data.memberInfo.apiToken = res.data.data.apiToken;
 							uni.setStorageSync('user', res.data.data.memberInfo);
-							//未绑定手机号
-							if (res.data.data.memberInfo.mobile == null || res.data.data.memberInfo.mobile == '') {
-								this.first = false;
-							} else {
-								uni.navigateBack({ delta: 1 });
-							}
+							uni.navigateBack({ delta: 1 });
 						}
 					});
 				},
@@ -114,7 +108,6 @@ page {
 	}
 	.btn {
 		margin-top: 20px;
-		width: 75%;
 		border-radius: 20px;
 	}
 }

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

@@ -2,22 +2,23 @@
 	<view class="page">
 		<view class="top">
 			<view class="wd">
-				<view class="qw"><image :src="user == '' ? '../../static/ls.jpg' : user.avatarUrl" class="head"></image></view>
+				<image :src="user == '' ? '../../static/ls.jpg' : user.avatarUrl" class="head"></image>
 				<view class="xs" @click="navigate('/pages/user/info')">
-					<view v-if="user == ''">登录 / 注册</view>
+					<view class="nickName" v-if="user == ''">登录 / 注册</view>
 					<view class="nickName" v-else>
 						<text>{{ user.nickName }}</text>
-						<view class="icon">&#xe8b7;</view>
 					</view>
-					<view class="nh">{{ user == '' ? '你还未登陆' : ' 你好，欢迎来到智慧旅游' }}</view>
+					<view class="nh">{{ user == '' ? '你还未登陆' : ' 您好，欢迎来到谢通门智慧旅游' }}</view>
+					<view class="clear"></view>
 				</view>
 			</view>
+			<view class="icon" @click="navigate('/pages/user/info')" v-if="user != ''">&#xe8b7;</view>
 			<image src="../../static/my.png" mode="aspectFill"></image>
 		</view>
 		<view class="main">
 			<view class="list flex">
 				<view class="item f" @click="navigate('/pages/order/my')" style="padding-right: 0px;">
-					<view style="border-right: 1px solid #d0d0d0;">
+					<view style="border-right: 1px solid #f1f1f1;">
 						<text class="icon ic" style="background-color: #2196F3;">&#xe705;</text>
 						<view class="fon">我的预约</view>
 					</view>
@@ -39,7 +40,7 @@
 					<text class="icon arrow">&#xe62d;</text>
 				</view>
 				<view class="item hr">
-					<button open-type="share" hover-class="none">
+					<button open-type="share" hover-class="none" class="button">
 						<text class="icon ic" style="background-color:#34cf43">&#xe607;</text>
 						<text>分享朋友</text>
 						<text class="icon arrow">&#xe62d;</text>
@@ -52,11 +53,16 @@
 				</view>
 			</view>
 		</view>
+		<help ref="help"></help>
 	</view>
 </template>
 
 <script>
+import help from '../../components/help.vue';
 export default {
+	components: {
+		help
+	},
 	data() {
 		return {
 			ip: this.$http.urls.ip,
@@ -80,7 +86,7 @@ export default {
 		},
 		//拨打求助电话
 		call() {
-			this.$http.call(this.aboutUs);
+			this.$refs.help.init();
 		}
 	},
 	onShareAppMessage: function(res) {
@@ -101,6 +107,7 @@ export default {
 	position: relative;
 	height: 270px;
 	color: white;
+	overflow: hidden;
 	.wd {
 		position: absolute;
 		top: 80px;
@@ -113,24 +120,28 @@ export default {
 		}
 		.xs {
 			margin-left: 90px;
-			width: 100%;
 			font-weight: bold;
 			margin-top: 10px;
 			.nickName {
+				width: 100%;
+				font-size: 14px;
 				margin-top: 20px;
+				position: relative;
 			}
 			.nh {
 				font-size: 12px;
 				font-weight: normal;
 				margin-top: 5px;
 			}
-			.icon {
-				float: right;
-				font-size: 25px;
-				margin-right: -17px;
-			}
 		}
 	}
+	.icon {
+		position: absolute;
+		right: 14px;
+		top: 93px;
+		font-size: 25px;
+		z-index: 1;
+	}
 	image {
 		width: 100%;
 		height: 270px;
@@ -172,7 +183,7 @@ export default {
 		}
 	}
 }
-button {
+.button {
 	text-align: left;
 	background-color: white;
 	color: #2e2e2e !important;

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

@@ -10,14 +10,8 @@
       </el-form>
       <el-table v-loading="loading" border :data="contentList" ref="table" @select="select">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="标题" align="left" prop="title" />
-        <el-table-column label="文章" align="center" prop="author" width="190" />
-        <el-table-column label="发布标志" align="center" prop="releaseFlag" width="100">
-          <template slot-scope="scope">
-            <el-tag type="danger" effect="dark" v-if="scope.row.releaseFlag == 0">未发布</el-tag>
-            <el-tag effect="dark" v-if="scope.row.releaseFlag == 1">已发布</el-tag>
-          </template>
-        </el-table-column>
+        <el-table-column label="文章标题" align="left" prop="title" />
+        <el-table-column label="文章类型" align="center" prop="author" width="190" />
       </el-table>
       <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
       <div slot="footer" class="dialog-footer">

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

@@ -129,10 +129,10 @@
         </el-form-item>
         <el-form-item label="标题" prop="title"><el-input v-model="form.title" placeholder="请输入标题" /></el-form-item>
         <el-form-item label="作者" prop="author"><el-input v-model="form.author" placeholder="请输入作者" /></el-form-item>
-        <el-form-item label="点击量" prop="browseNum" v-if="serviceInfo == 2 || serviceInfo == 3">
+        <el-form-item label="点击量" prop="browseNum">
           <el-input-number v-model="form.browseNum" :min="1" :step="10" placeholder="请输入点击量" />
         </el-form-item>
-        <el-form-item label="封面图片" v-if="serviceInfo == 2 || serviceInfo == 3"><imageUpload :limit="1" v-model="form.showPictures" /></el-form-item>
+        <el-form-item label="封面图片"><imageUpload :limit="1" v-model="form.showPictures" /></el-form-item>
         <el-form-item label="详情" prop="content"><editor v-model="form.content" :min-height="200" /></el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer" v-if="form.auditFlag == null || form.auditFlag == 0||form.auditFlag == 3">