Merge pull request '调试完成' (#311) from xbx into master

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/311

pages/shop/index.vue

@@ -17,7 +17,7 @@
 				<u-swiper :list="list" mode="dot" @click="clickImage"></u-swiper>
 			</view>
 			<view class="chengnuo">
-				<view>
+				<!-- <view>
 					<image src="/static/image/shop/4.png"></image>
 					<text>免费洗衣</text>
 				</view>
@@ -32,6 +32,10 @@
 				<view>
 					<image src="/static/image/shop/7.png"></image>
 					<text>上门取件</text>
+				</view> -->
+				<view v-for="(item,index) in tips" :key="index" @click="totips(item.document_code)">
+					<image :src="item.file_name"></image>
+					<text>{{item.document_title}}</text>
 				</view>
 			</view>
 			<view class="fenlei">
@@ -95,12 +99,14 @@
 				pinTuanPush: {}, // 拼团推荐
 				activityInfo: {},
 				areaList: [], // 位置信息
+				tips:[]
 			}
 		},
 		onLoad() {
 			this.getShopTopList();
 			this.getLocation(); // 获取定位
 			this.getStoreActivity();
+			this.gettips()
 			// this.area = uni.getStorageSync("address") || "请选择";
 		},
 		onShow() {
@@ -110,6 +116,21 @@
 			this.getAllLoaction(); // 获取位置
 		},
 		methods: {
+			totips(id){
+				this.$u.route({
+					type:"to",
+					url:"/pageB/tipsinfo/index",
+					params:{
+						id
+					}
+				})
+			},
+			gettips(){
+				this.$u.api.tips().then((res)=>{
+					console.log(res)
+					this.tips = res.data
+				})
+			},
 			sousuo() {
 				// console.log(123)
 				this.$u.route({