'message'

pages/feedback/feedback.js

@@ -1,4 +1,6 @@
 // pages/feedback/feedback.js
+import '../../utils/config'
+import config from '../../utils/config'
 Page({
 
     /**
@@ -63,6 +65,7 @@ Page({
               })
         } else{
             if(!phoneNum){
+                this.submitBtn()
                 wx.showToast({
                     title: '提交成功！',
                 })
@@ -75,12 +78,30 @@ Page({
                       })
                     return;
                 }
+                this.submitBtn()
                 wx.showToast({
                     title: '提交成功',
                 })
             }
         }
+    },
 
+    submitBtn(){
+        wx.request({
+          url: config.host+'/front/addAccuse',
+          method:'POST',
+          header:{
+              'content-type':'application/json'
+          },
+          data:{
+            title:this.data.feedbackTitle,
+            detail:this.data.feedbackContent,
+            phone:this.data.phoneNum
+          },
+          success(res){
+              console.log(res.data)
+          }          
+        })
     },
 
     /**

pages/foodDetail/foodDetail.js

@@ -11,6 +11,8 @@ Page({
         shopTitle: '', //店铺名
         foodList:[],    //美食照片路径
         shopDescribe: '', //商铺简介
+        perCost:'', //人均消费
+        businessHours:'',   //营业时间
         heat: '', //商铺热度
         dish:'',    //招牌菜
         shopPhone: '', //商铺电话
@@ -67,7 +69,9 @@ Page({
                     shopPhone: result[i].phone,
                     shopAddress: result[i].location,
                     shopLatitude: result[i].latitude,
-                    shopLongtitude: result[i].longitude
+                    shopLongtitude: result[i].longitude,
+                    perCost:result[i].perCost,
+                    businessHours:result[i].businessHours
                 })
             }
         }

pages/foodDetail/foodDetail.wxml

@@ -9,28 +9,40 @@
     <view>
         <view class="shopDetail">
             <text class="shopDetailTile">简介：</text>
-            <text>{{shopDescribe == null ? '无' : shopDescribe}}</text>
+            <text wx:if="{{shopDescribe == null}}">无</text>
+            <text wx:elif="{{shopDescribe == ''}}">无</text>
+            <text wx:else>{{shopDescribe}}</text>
         </view>
         <view class="shopDetail">
-            <text>人均消费：</text>
+            <text wx:if="{{perCost == null}}">人均消费：-</text>
+            <text wx:elif="{{perCost == ''}}">人均消费：-</text>
+            <text wx:else>人均消费：{{perCost}}</text>
         </view>
         <view class="shopDetail">
-            <text>营业时间：</text>
+            <text wx:if="{{businessHours == null}}">营业时间：-</text>
+            <text wx:elif="{{businessHours == ''}}">营业时间：-</text>
+            <text wx:else>营业时间：{{businessHours}}</text>
         </view>
         <view class="shopDetail">
             <text>热度：{{heat}}</text>
         </view>
         <view class="shopDetail">
             <text class="shopDetailTile">招牌菜：</text>
-            <text>{{dish == null ? '无' : dish}}</text>
+            <text wx:if="{{dish == null}}">-</text>
+            <text wx:elif="{{dish == ''}}">-</text>
+            <text wx:else>{{dish}}</text>
         </view>
         <view class="shopDetail">
             <text class="shopDetailTile">电话：</text>
-            <text>{{shopPhone == null ? '商家未留电话' : shopPhone}}</text>
+            <text wx:if="{{shopPhone == null}}">商家未留电话</text>
+            <text wx:elif="{{shopPhone == ''}}">商家未留电话</text>
+            <text wx:else>{{shopPhone}}</text>
         </view>
         <view class="shopDetail">
             <text class="shopDetailTile">地址：</text>
-            <text class="address">{{shopAddress}}</text>
+            <text wx:if="{{shopAddress == null}}" class="address">商家未留地址</text>
+            <text wx:elif="{{shopAddress == ''}}" class="address">商家未留地址</text>
+            <text wx:else class="address">{{shopAddress}}</text>
             <text class="adderessNav" bindtap="toFoodAddress">去这里</text>
         </view>
     </view>

pages/main/main.js

@@ -9,7 +9,6 @@ Page({
      */
     data: {
         bannerList:[],  //轮播图列表
-        newNoticeTitle:'',   //滚动显示的公告标题
         naxiImgUrl:'',  //纳溪介绍的图片
         macunImgUrl:'',  //马村介绍的图片
         hotScenicList:[],   //热门景点列表
@@ -30,51 +29,6 @@ Page({
         this.setData({
             bannerList:banners
         })
-
-        //获取公告列表
-        let result = await request('/front/notificationFront') 
-        // console.log(result);
-        // 对公告列表按id降序排序(即按发布时间由近到远排序)
-        if(result.length == 0){ //如果公告列表长度为0,则显示无公告
-            this.setData({
-                newNoticeTitle:'暂无公告内容'
-            })
-        }else if(result.length == 1 && result[0].status == 1){  //如果有一条公告,且状态为1,则展示标题
-            this.setData({
-                newNoticeTitle:result[0].title
-            })
-        }else if(result.length == 1 && result[0].status == 0){  //如果有一条公告,且状态为0,则展示无公告
-            this.setData({
-                newNoticeTitle:'暂无公告内容'
-            })
-        }
-        else{   //超过2条公告时,根据公告id进行降序排序(即根据时间由近到远排序)
-            for(let i = 0;i < result.length-1;i++){
-                for(let j = 0;j < result.length-1-i;j++){
-                    if(result[j].id < result[j+1].id){
-                        let temp = result[j]
-                        result[j] = result[j+1]
-                        result[j+1] = temp
-                    }
-                }                
-            }
-            // console.log(result);
-            // 遍历重新排序后的列表，取出第一个状态为1的标题,即为最新发布的公告
-            for(let i = 0;i < result.length;i++){
-                if(result[i].status == 1){
-                    this.setData({
-                        newNoticeTitle:result[0].title
-                    })
-                    break;
-                }else{//如果状态都为0，则展示无公告
-                    console.log();
-                    this.setData({
-                        newNoticeTitle:'暂无公告内容'
-                    })
-                }
-                
-            }            
-        }
         
         //获取纳溪照片（默认取第一张)
         let naxiImg = await request('/front/introduce/files/1')
@@ -90,23 +44,10 @@ Page({
             macunImgUrl:macunImg[0].iconPath
         })
 
-        //获取景点列表和照片
+        //获取景点列表
         let sceneryImgList = await request('/front/scenicSpotAndCallout')
         // console.log(sceneryImgList);
-        let imagePath = []  //景点照片列表
-        let imageList = []  //景点照片列表
-        // console.log(sceneryImgList);
-        for(let i = 0;i < sceneryImgList.length;i++){
-            let id = sceneryImgList[i].id
-            // console.log(id);
-            imagePath = await request('/front/findAllScenicSpotFilesPath/'+id) 
-            // console.log(imagePath);
-            imageList[i] = imagePath
-            // console.log(imageList);
-            // 将景点照片添加到景点列表
-            Object.assign(sceneryImgList[i],imagePath)
-            // console.log(sceneryImgList);
-        }
+   
         // 按景点热度降序重新排列
         for(let i = 0;i < sceneryImgList.length - 1;i++){
             for(let j = 0;j < sceneryImgList.length - 1 - i;j++){
@@ -140,18 +81,7 @@ Page({
 
         //获取商户信息
         let foodList = await request('/front/merchantAndCallout')
-        // console.log(foodList);
-        let foodImagePath = []
-        for(let i = 0;i < foodList.length;i++){
-            let id = foodList[i].id
-            foodImagePath = await request('/front/findAllMerchantFilesPath/'+id)
-            // console.log(foodImagePath);
-            // 将图片地址添加到商户列表对应的店铺内
-            // Object.assign(foodList[i],imagePath)
-            foodList[i].iconPath = foodImagePath
-            // console.log(result);
-        }
-        // console.log(foodList);
+        console.log(foodList);
 
         // 按商户热度进行降序重新排列
         for(let i = 0;i < foodList.length - 1;i++){
@@ -174,7 +104,7 @@ Page({
         this.setData({
             hotFoodList
         })
-        // console.log(this.data.hotFoodList);
+        console.log(this.data.hotFoodList);
         
     },
 

pages/main/main.wxml

@@ -100,7 +100,7 @@
         <view class="scenicImgWrapper">
             <view class="leftWrapper">
                 <view class="imgLeft" wx:for="{{leftImg}}" wx:key="key" data-item="{{item}}">
-                    <image class="imgLeftDetail" src="{{item[0].iconPath}}" mode="widthFix"/>
+                    <image class="imgLeftDetail" src="{{item.coverImage}}" mode="widthFix"/>
                     <view class="scenicText">
                         <text class="hotTitle">{{item.title}}</text>
                         <text class="hotText">热度：{{item.viewCount >= 10000 ? item.viewCount/10000+'万' : item.viewCount}}</text>
@@ -109,7 +109,7 @@
             </view>
             <view class="rightWrapper">
                 <view class="imgRight" wx:for="{{rightImg}}" wx:key="key" data-item="{{item}}">
-                    <image class="imgRightDetail" src="{{item[0].iconPath}}"/>
+                    <image class="imgRightDetail" src="{{item.coverImage}}"/>
                     <view class="scenicText">
                         <text class="hotTitle">{{item.title}}</text>
                         <text class="hotText">热度：：{{item.viewCount >= 10000 ? item.viewCount/10000+'万' : item.viewCount}}</text>
@@ -134,7 +134,7 @@
         </view>
         <view class="foodWrapper" wx:for="{{hotFoodList}}" wx:key="key" data-item="{{item}}">
             <view class="foodImg">
-                <image class="foodImgDetail" src="{{item.iconPath[0].iconPath}}" />
+                <image class="foodImgDetail" src="{{item.coverImage}}" />
             </view>
             <view>
                 <view class="foodText">

pages/main/main.wxss

@@ -148,7 +148,7 @@
 }
 
 .imgRightDetail {
-    height: 450rpx;
+    height: 420rpx;
 }
 
 .scenicText {

pages/recommendFood/recommendFood.js

@@ -20,6 +20,7 @@ Page({
             title: '数据加载中',
             mask:true
         })
+        //获取商户信息
         let result = await request('/front/merchantAndCallout').catch(err=>{
             wx.hideLoading()
             wx.showModal({
@@ -35,18 +36,8 @@ Page({
                   }
                 }
               })
-        })  //获取商户信息
+        })  
         // console.log(result);
-        let imagePath = []
-        for(let i = 0;i < result.length;i++){
-            let id = result[i].id
-            imagePath = await request('/front/findAllMerchantFilesPath/'+id)
-            //console.log(imagePath);
-            // 将图片地址添加到商户列表对应的店铺内
-            // Object.assign(result[i],imagePath)
-            result[i].iconPath = imagePath
-            // console.log(result);
-        }
 
         this.setData({
             foodList:result
@@ -65,7 +56,7 @@ Page({
 
     //跳转到美食详情页
     tofoodDetail(e){
-        // console.log(e);
+        console.log(e);
         let foodId = e.currentTarget.dataset.item.id
         wx.navigateTo({
           url: '/pages/foodDetail/foodDetail?id=' + foodId,

pages/recommendFood/recommendFood.wxml

@@ -11,7 +11,7 @@
                 商家未上传照片
             </view>
             <view wx:else>
-                <image class="foodImg" src="{{item.iconPath[0].iconPath}}"></image>
+                <image class="foodImg" src="{{item.coverImage}}"></image>
             </view>
         </view>
         <view class="foodIntro">

pages/scenicDetail/scenicDetail.wxml

@@ -8,15 +8,21 @@
         <text class="sceneryTitle">{{scenicTitle}}</text>
     </view>
     <view class="sceneryTitleWrap">
-        <text class="sceneryIntroContent" user-select>{{scenicDescribe == null ? '暂无介绍' : scenicDescribe}}</text>
+        <text wx:if="{{scenicDescribe == null}}" class="sceneryIntroContent" user-select>暂无介绍</text>
+        <text wx:elif="{{scenicDescribe == ''}}" class="sceneryIntroContent" user-select>暂无介绍</text>
+        <text wx:else class="sceneryIntroContent" user-select>{{scenicDescribe}}</text>
     </view>
     <view class="tourNotice">
         <text class="tourNoticeTitle">旅游注意事项：</text>
-        <text class="tourNoticeContent">{{attention == null ? '无' : attention}}</text>
+        <text class="tourNoticeContent" wx:if="{{attention == null}}">无</text>
+        <text class="tourNoticeContent" wx:elif="{{attention == ''}}">无</text>
+        <text class="tourNoticeContent" wx:else>{{attention}}</text>
     </view>
     <view class="tourNotice">
         <text class="tourNoticeTitle">建议游玩时间：</text>
-        <text class="tourNoticeContent">{{playTime == null ? '无' : playTime}}</text>
+        <text wx:if="{{playTime == null}}" class="tourNoticeContent">无</text>
+        <text wx:elif="{{playTime == ''}}" class="tourNoticeContent">无</text>
+        <text wx:else class="tourNoticeContent">{{playTime}}</text>
     </view>
     <!-- 去往景点按钮 -->
     <view class="goDestination">

pages/scenicList/scenicList.js

@@ -9,7 +9,6 @@ Page({
      */
     data: {
         scenicList:[],  //景点列表
-        imageList:[],   //景点照片列表
     },
 
     /**
@@ -21,8 +20,7 @@ Page({
             title: '数据加载中',
             mask:true
         })
-        let imageList = this.data.imageList
-        let imagePath = []
+        //获取景点列表
         let result = await request('/front/scenicSpotAndCallout').catch(err=>{
             wx.hideLoading()
             wx.showModal({
@@ -38,29 +36,17 @@ Page({
                   }
                 }
               })
-        })  //获取景点列表
+        })  
         // console.log(result);
         for(let i = 0;i < result.length;i++){
             if(result[i].viewCount >= 10000){
                 result[i].viewCount = result[i].viewCount/10000+'万'
             }
         }
-        //获取景点照片列表
-        for(let i = 0;i < result.length;i++){
-            let id = result[i].id
-            // console.log(id);
-            imagePath = await request('/front/findAllScenicSpotFilesPath/'+id) 
-            // console.log(imagePath);
-            imageList[i] = imagePath
-            // 将景点照片添加到景点列表
-            Object.assign(result[i],imagePath)
-            // console.log(result);
-        }
+
         this.setData({
-            scenicList:result,
-            imageList
+            scenicList:result
         })
-        //console.log(this.data.imageList);
         // console.log(this.data.scenicList);
 
         // 关闭“数据加载中”的提示

pages/scenicList/scenicList.wxml

@@ -8,7 +8,7 @@
     <view wx:for="{{scenicList}}" wx:key="key">
         <view class="scenery" bindtap="toScenicDetail" data-item="{{item}}">
             <view class="imgWrapper">
-                <image class="sceneryImg" mode="widthFix" lazy-load="true" src="{{item[0].iconPath}}"></image>
+                <image class="sceneryImg" mode="widthFix" lazy-load="true" src="{{item.coverImage}}"></image>
             </view>
             <view class="sceneryContent">
                 <view class="titleAndRate">

project.config.json

@@ -42,7 +42,7 @@
     },
     "compileType": "miniprogram",
     "libVersion": "2.19.4",
-    "appid": "wx8c0c330b7cfef98c",
+    "appid": "wxa87397c3ebf89d7f",
     "projectname": "miniprogram-92",
     "condition": {},
     "editorSetting": {

project.private.config.json

@@ -1,6 +1,6 @@
 {
     "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-    "projectname": "navigation_two",
+    "projectname": "navigation_v1.03",
     "setting": {
         "compileHotReLoad": true
     }