From c1ea54bcb6d8afaa5c71c30a5f27d62ddcbb8298 Mon Sep 17 00:00:00 2001
From: han <151435705@qq.com>
Date: Thu, 12 Dec 2024 16:37:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=9F=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/config.js | 347 ++++++------
common/httpRequest.js | 1 +
pages/fuwu/fuwu.vue | 3 +-
pages/index/index.vue | 4 +-
subPageA/food/fooddetial/fooddetial.vue | 1 +
subPageB/jiqiren/jiqiren/zhinengjiqiren.vue | 564 ++++++++++++--------
subPageC/Ai/index.vue | 1 -
subPageC/flower/index.vue | 26 +-
subPageC/translate/index.vue | 54 +-
subPageC/weather/index.vue | 16 +-
10 files changed, 584 insertions(+), 433 deletions(-)
diff --git a/common/config.js b/common/config.js
index 11b91d5..30952c5 100644
--- a/common/config.js
+++ b/common/config.js
@@ -22,189 +22,194 @@ const PWPATH = "https://eluyou.ailuquan.cn";
//手绘图项目名称
const HANDDRAWNNAME = "";
module.exports = {
- REAUEST_ROOTPATH : REAUEST_ROOTPATH,
+ REAUEST_ROOTPATH: REAUEST_ROOTPATH,
ROOTPATH: ROOTPATH,
- HANDDRAWNNAME:HANDDRAWNNAME,
- PWPATH:PWPATH,
- ARER_CODE:"131401",
- ARER_CODE_FOUR:"131401",
+ HANDDRAWNNAME: HANDDRAWNNAME,
+ PWPATH: PWPATH,
+ ARER_CODE: "131401",
+ ARER_CODE_FOUR: "131401",
lunbo_url: REAUEST_ROOTPATH + "/mobile/index/getLoopPic.do",
- messagelist: REAUEST_ROOTPATH + "/mobile/messageInfo/messagelist", //目的地
- sceniclist: REAUEST_ROOTPATH + "/mobile/scenic/sceniclist", //景区
- scenicDetial:REAUEST_ROOTPATH + "/mobile/scenic/getDetailes.do", //景区详情
- techanlist: REAUEST_ROOTPATH + "/mobile/shopping/getSpecialList", //特产
- getProposalFood: REAUEST_ROOTPATH + "/mobile/food/delicacyFood/getProposalFood", //推荐美食
- getFoodList: REAUEST_ROOTPATH + "/mobile/food/delicacyFood/getFood", //美食列表
- getFoodDetail: REAUEST_ROOTPATH + "/mobile/food/delicacyFood/getFood", //美食详情(方法一样,参数多一个id)
- getRestaurantList: REAUEST_ROOTPATH + "/mobile/food/restaurant/getRestaurant" ,//商家列表
- getSpecialGoodDetail: REAUEST_ROOTPATH + "/mobile/shopping/getShoppingById", //特产详情
- getMessageDetail: REAUEST_ROOTPATH + "/mobile/messageInfo/messages", //目的地详情
- getscenicList: REAUEST_ROOTPATH + "/mobile/scenic/getScenicList.do", //景区列表
- getAmuseList: REAUEST_ROOTPATH + "/mobile/amuse/getAmuseList.do", //娱乐列表
- getLineList: REAUEST_ROOTPATH + "/mobile/line/getLineList.do", //线路列表
-
- getHotelList: REAUEST_ROOTPATH + "/mobile/gyhotel/getgyHotel.do",//酒店列表
-
- getHomestayList: REAUEST_ROOTPATH + "/admin-api/homestay/HotelApp/pageListHotel",//民宿列表
- getHomestayDetail: REAUEST_ROOTPATH + "/admin-api/homestay/HotelApp/getHotelInfoVo",//民宿详情
- createHotelOrder: REAUEST_ROOTPATH + "/admin-api/homestay/HotelOrder/createHotelOrder",//民宿订单提交
- userCancelUpdateOrder: REAUEST_ROOTPATH + "/admin-api/homestay/HotelOrder/userCancelUpdateOrder",//民宿订单取消
- getDictDataList: REAUEST_ROOTPATH + "/admin-api/homestay/HotelOrder/getDictDataList",//民宿订单原因
-
-
- aiSendMsg: REAUEST_ROOTPATH + "/app-api/wechatshop/ai/sendMsg",//Ai发送
- getWeatherForecast: REAUEST_ROOTPATH + "/app-api/wechatshop/weather/getWeatherForecast",//天气预报
- getRealTimeWeather: REAUEST_ROOTPATH + "/app-api/wechatshop/weather/getRealTimeWeather",//Ai发送
-
-
-
+ messagelist: REAUEST_ROOTPATH + "/mobile/messageInfo/messagelist", //目的地
+ sceniclist: REAUEST_ROOTPATH + "/mobile/scenic/sceniclist", //景区
+ scenicDetial: REAUEST_ROOTPATH + "/mobile/scenic/getDetailes.do", //景区详情
+ techanlist: REAUEST_ROOTPATH + "/mobile/shopping/getSpecialList", //特产
+ getProposalFood: REAUEST_ROOTPATH + "/mobile/food/delicacyFood/getProposalFood", //推荐美食
+ getFoodList: REAUEST_ROOTPATH + "/mobile/food/delicacyFood/getFood", //美食列表
+ getFoodDetail: REAUEST_ROOTPATH + "/mobile/food/delicacyFood/getFood", //美食详情(方法一样,参数多一个id)
+ getRestaurantList: REAUEST_ROOTPATH + "/mobile/food/restaurant/getRestaurant", //商家列表
+ getSpecialGoodDetail: REAUEST_ROOTPATH + "/mobile/shopping/getShoppingById", //特产详情
+ getMessageDetail: REAUEST_ROOTPATH + "/mobile/messageInfo/messages", //目的地详情
+ getscenicList: REAUEST_ROOTPATH + "/mobile/scenic/getScenicList.do", //景区列表
+ getAmuseList: REAUEST_ROOTPATH + "/mobile/amuse/getAmuseList.do", //娱乐列表
+ getLineList: REAUEST_ROOTPATH + "/mobile/line/getLineList.do", //线路列表
+
+ getHotelList: REAUEST_ROOTPATH + "/mobile/gyhotel/getgyHotel.do", //酒店列表
+
+ getHomestayList: REAUEST_ROOTPATH + "/admin-api/homestay/HotelApp/pageListHotel", //民宿列表
+ getHomestayDetail: REAUEST_ROOTPATH + "/admin-api/homestay/HotelApp/getHotelInfoVo", //民宿详情
+ createHotelOrder: REAUEST_ROOTPATH + "/admin-api/homestay/HotelOrder/createHotelOrder", //民宿订单提交
+ userCancelUpdateOrder: REAUEST_ROOTPATH + "/admin-api/homestay/HotelOrder/userCancelUpdateOrder", //民宿订单取消
+ getDictDataList: REAUEST_ROOTPATH + "/admin-api/homestay/HotelOrder/getDictDataList", //民宿订单原因
+
+
+ aiSendMsg: REAUEST_ROOTPATH + "/app-api/wechatshop/ai/sendMsg", //Ai发送
+ getWeatherForecast: REAUEST_ROOTPATH + "/app-api/wechatshop/weather/getWeatherForecast", //天气预报
+ getRealTimeWeather: REAUEST_ROOTPATH + "/app-api/wechatshop/weather/getRealTimeWeather", //Ai发送
+ getTtranslate: REAUEST_ROOTPATH + "/app-api/wechatshop/toolTranslate/translate", //翻译
+
+
// getMethodList: REAUEST_ROOTPATH + "/mobile/method/getMethodList", //原攻略列表
- getMethodList: REAUEST_ROOTPATH + "/mobile/WalkthroughType/selectWalkthroughType",//攻略列表
- getMethodRecommendList: REAUEST_ROOTPATH + "/mobile/WalkthroughType/selectMessageRecommend",//攻略推荐列表
- selectMessageWalkthroughType: REAUEST_ROOTPATH + "/mobile/WalkthroughType/selectMessageWalkthroughType",//攻略分类查询攻略列表
-
-
-
- getVideoList: REAUEST_ROOTPATH + "/mobile/WalkthroughType/selectVideoSoundList",//影音列表
-
- getHotevenList: REAUEST_ROOTPATH + "/mobile/hotevent/getHoteventList.do" ,//活动列表
- getHotevenDetail: REAUEST_ROOTPATH + "/mobile/hotevent/getDetailes.do" ,//活动详情
- getScenicLiveTvList: REAUEST_ROOTPATH + "/mobile/index/getScenicLiveTv.do" ,//首页直播列表
+ getMethodList: REAUEST_ROOTPATH + "/mobile/WalkthroughType/selectWalkthroughType", //攻略列表
+ getMethodRecommendList: REAUEST_ROOTPATH + "/mobile/WalkthroughType/selectMessageRecommend", //攻略推荐列表
+ selectMessageWalkthroughType: REAUEST_ROOTPATH +
+ "/mobile/WalkthroughType/selectMessageWalkthroughType", //攻略分类查询攻略列表
+
+
+
+ getVideoList: REAUEST_ROOTPATH + "/mobile/WalkthroughType/selectVideoSoundList", //影音列表
+
+ getHotevenList: REAUEST_ROOTPATH + "/mobile/hotevent/getHoteventList.do", //活动列表
+ getHotevenDetail: REAUEST_ROOTPATH + "/mobile/hotevent/getDetailes.do", //活动详情
+ getScenicLiveTvList: REAUEST_ROOTPATH + "/mobile/index/getScenicLiveTv.do", //首页直播列表
getnear: REAUEST_ROOTPATH + "/mobile/appnear/getnear.do", //附近资源接口 (周边)
- scenicgoodlist:REAUEST_ROOTPATH+"/mobile/scenic/scenicgoodlist" ,//景区评论-产监
- getCommentFromMobile:REAUEST_ROOTPATH+"/mobile/scenic/getCommentFromMobile" ,//景区评论-本库
- totalnumAndPj:REAUEST_ROOTPATH+"/mobile/scenic/totalnumAndPj" ,//评价人数和平均评分
- hotelgoodlist:REAUEST_ROOTPATH+"/mobile/gyhotel/hotelgoodlist" ,//景区评论
- hoteltotalnumAndPj:REAUEST_ROOTPATH+"/mobile/gyhotel/hoteltotalnumAndPj" ,//评价人数和平均评分
+ scenicgoodlist: REAUEST_ROOTPATH + "/mobile/scenic/scenicgoodlist", //景区评论-产监
+ getCommentFromMobile: REAUEST_ROOTPATH + "/mobile/scenic/getCommentFromMobile", //景区评论-本库
+ totalnumAndPj: REAUEST_ROOTPATH + "/mobile/scenic/totalnumAndPj", //评价人数和平均评分
+ hotelgoodlist: REAUEST_ROOTPATH + "/mobile/gyhotel/hotelgoodlist", //景区评论
+ hoteltotalnumAndPj: REAUEST_ROOTPATH + "/mobile/gyhotel/hoteltotalnumAndPj", //评价人数和平均评分
//wisdomGuide:REAUEST_ROOTPATH+"/sjz_qyly/map/index.html",
- wisdomGuide:ROOTPATH+"/sjz_qyly/map/index.html",
- searchList:REAUEST_ROOTPATH + "/mobile/conlumnInfo/getAllDataByBcode",
- getAllConlumn: REAUEST_ROOTPATH + "/mobile/conlumnInfo/getAllConlumn" ,//智能机器人栏目列表
- getCircumData:REAUEST_ROOTPATH + "/mobile/messageInfo/getCircumData.do", //生态走廊中周边推荐
- jilu: REAUEST_ROOTPATH + "/mobile/messageInfo/messageInfoBrowsenum", //信息阅读接口
- dianzan: REAUEST_ROOTPATH + "/mobile/messageInfo/messageInfoEventLike", //信息点赞接口
- hotevenJilu: REAUEST_ROOTPATH + "/mobile/hotevent/hoteventRead.do", //活动阅读接口
- hotevenDianzan: REAUEST_ROOTPATH + "/mobile/hotevent/hoteventLike.do" ,//活动点赞接口
- realTimeCar: REAUEST_ROOTPATH + "/mobile/cyjcstat/realTimeCar" ,//实时车流量接口
- getYbsjSysParam: REAUEST_ROOTPATH + "/mobile/system/getYbsjSysParam.do" ,//查询是否显示车流量与天气
- campsitedetail: REAUEST_ROOTPATH + "/mobile/messageInfo/messages" ,//驿站营地详情
- quyuList: REAUEST_ROOTPATH + "/mobile/sort/getCondition.do" ,//驿站营地列表区域
- getgyHoteldetails : REAUEST_ROOTPATH + "/mobile/gyhotel/getgyHoteldetails.do" ,//住宿详情
- getAllDataByBcode: REAUEST_ROOTPATH+"/mobile/conlumnInfo/getAllDataByBcode" ,//智能机器人
- methodDetail : REAUEST_ROOTPATH + "/mobile/method/getDetailes" ,//活动详情
- tousuList: REAUEST_ROOTPATH+"/mobile/messageInfo/getAreaFromType.do" ,//投诉列表
- travelroutedetail: REAUEST_ROOTPATH + "/mobile/line/getDetail.do" ,//线路详情
- huanjing: REAUEST_ROOTPATH + "/mobile/cyjcstat/envMonitoring", //环境监测
- getAittoData: REAUEST_ROOTPATH + "/mobile/h5/getAittoData.do" ,//获取爱淘数据
- getOauthWxUser: ROOTPATH + "/weixin/get", //微信调用授权
- getUserOrderCount: "/phone/api/getUserOrderCount" ,//获取订单记录数量
- getLogin: "/phone/api/getLogin" ,//账号密码登陆
- getUserOrder: "/phone/api/getUserOrder" ,//获取订单列表
- getUserOrderInfo: "/phone/api/getUserOrderInfo" ,//获取订单详情
- uploadPicture: "/phone/api/uploadPicture" ,//上传图片
- commentSave: "/phone/api/commentSave" ,//提交评论
- getSpotInfo: "/phone/api/getSpotInfo" ,//获取景区详情
- getSpotSuitVilTime: "/phone/api/getSpotSuitVilTime" ,//获取景区门票套餐时间
- getSpotSuitInfo: "/phone/api/getSpotSuitInfo" ,//门票预订 获取 套餐信息
- spotCreate: "/phone/api/spotCreate" ,//创建订单
+ wisdomGuide: ROOTPATH + "/sjz_qyly/map/index.html",
+ searchList: REAUEST_ROOTPATH + "/mobile/conlumnInfo/getAllDataByBcode",
+ getAllConlumn: REAUEST_ROOTPATH + "/mobile/conlumnInfo/getAllConlumn", //智能机器人栏目列表
+ getCircumData: REAUEST_ROOTPATH + "/mobile/messageInfo/getCircumData.do", //生态走廊中周边推荐
+ jilu: REAUEST_ROOTPATH + "/mobile/messageInfo/messageInfoBrowsenum", //信息阅读接口
+ dianzan: REAUEST_ROOTPATH + "/mobile/messageInfo/messageInfoEventLike", //信息点赞接口
+ hotevenJilu: REAUEST_ROOTPATH + "/mobile/hotevent/hoteventRead.do", //活动阅读接口
+ hotevenDianzan: REAUEST_ROOTPATH + "/mobile/hotevent/hoteventLike.do", //活动点赞接口
+ realTimeCar: REAUEST_ROOTPATH + "/mobile/cyjcstat/realTimeCar", //实时车流量接口
+ getYbsjSysParam: REAUEST_ROOTPATH + "/mobile/system/getYbsjSysParam.do", //查询是否显示车流量与天气
+ campsitedetail: REAUEST_ROOTPATH + "/mobile/messageInfo/messages", //驿站营地详情
+ quyuList: REAUEST_ROOTPATH + "/mobile/sort/getCondition.do", //驿站营地列表区域
+ getgyHoteldetails: REAUEST_ROOTPATH + "/mobile/gyhotel/getgyHoteldetails.do", //住宿详情
+ getAllDataByBcode: REAUEST_ROOTPATH + "/mobile/conlumnInfo/getAllDataByBcode", //智能机器人
+ methodDetail: REAUEST_ROOTPATH + "/mobile/method/getDetailes", //活动详情
+ tousuList: REAUEST_ROOTPATH + "/mobile/messageInfo/getAreaFromType.do", //投诉列表
+ travelroutedetail: REAUEST_ROOTPATH + "/mobile/line/getDetail.do", //线路详情
+ huanjing: REAUEST_ROOTPATH + "/mobile/cyjcstat/envMonitoring", //环境监测
+ getAittoData: REAUEST_ROOTPATH + "/mobile/h5/getAittoData.do", //获取爱淘数据
+ getOauthWxUser: ROOTPATH + "/weixin/get", //微信调用授权
+ getUserOrderCount: "/phone/api/getUserOrderCount", //获取订单记录数量
+ getLogin: "/phone/api/getLogin", //账号密码登陆
+ getUserOrder: "/phone/api/getUserOrder", //获取订单列表
+ getUserOrderInfo: "/phone/api/getUserOrderInfo", //获取订单详情
+ uploadPicture: "/phone/api/uploadPicture", //上传图片
+ commentSave: "/phone/api/commentSave", //提交评论
+ getSpotInfo: "/phone/api/getSpotInfo", //获取景区详情
+ getSpotSuitVilTime: "/phone/api/getSpotSuitVilTime", //获取景区门票套餐时间
+ getSpotSuitInfo: "/phone/api/getSpotSuitInfo", //门票预订 获取 套餐信息
+ spotCreate: "/phone/api/spotCreate", //创建订单
paymentJSAPI: "/phone/api/paymentJSAPI", //支付接口
- userCancelOrder: "/phone/api/userCancelOrder" ,//退款接口
- LoginUN: "/phone/api/LoginUN" ,//登陆
+ userCancelOrder: "/phone/api/userCancelOrder", //退款接口
+ LoginUN: "/phone/api/LoginUN", //登陆
paymentH5: "/phone/api/paymentH5", //支付接口(h5)
- insertScinceGoodComment : REAUEST_ROOTPATH + "/mobile/scenic/insertScinceGoodComment" ,//保存评论(产监平台)
- imgPushFun: REAUEST_ROOTPATH + "/mobile/jpush/imgPush.do" ,//推送消息(带图片)
-
-
-
- getMessageInfoFormFilter: REAUEST_ROOTPATH + "/mobile/messageInfo/getMessageInfoFormFilter" ,//信息管理列表数据查询
- getMessageInfoFormFilter_two: REAUEST_ROOTPATH + "/mobile/messageInfo/getMessageInfoFormFilter_two" ,//信息管理列表数据查询-导游页面测试
- getMessageInfoFormFilter_food: REAUEST_ROOTPATH + "/mobile/messageInfo/getMessageInfoFormFilter_food" ,//信息管理列表数据查询-美食页面
- getMessgeInfoDetailFormId: REAUEST_ROOTPATH + "/mobile/messageInfo/getMessgeInfoDetailFormId" ,//信息详情接口查询
- getSysParamFormRegion: REAUEST_ROOTPATH + "/mobile/sysParam/getSysParamFormRegion" ,//系统参数查询
- getCondition: REAUEST_ROOTPATH + "/mobile/sort/getCondition.do" ,//排序、分类筛选条件查询
- getLineInfoFormFilterByPage: REAUEST_ROOTPATH + "/mobile/lineInfo/getLineInfoFormFilterByPage" ,//查询线路列表接口
- getLineDetailFormId: REAUEST_ROOTPATH + "/mobile/lineInfo/getLineDetailFormId" ,//线路详情接口
- updateMessageInfoUBFeildFormId: REAUEST_ROOTPATH + "/mobile/messageInfo/updateMessageInfoUBFeildFormId" ,//更改信息的浏览量和点赞量
- getMapData : REAUEST_ROOTPATH + "/mobile/h5/getTenXData",//获取地图上的数据
- getRedisData: REAUEST_ROOTPATH + "/mobile/messageInfo/getRedisData.do" ,//从redis中获取数据
- getScenicListToMap: REAUEST_ROOTPATH + "/mobile/scenic/getScenicListToMap" ,//查询景区信息显示到地图
- getHotelListToMap: REAUEST_ROOTPATH + "/mobile/gyhotel/getHotelListToMap" ,//查询酒店信息显示到地图
- getScenicListFormFilter: REAUEST_ROOTPATH + "/mobile/scenic/getScenicListFormFilter" ,//查询景区列表(暂用在热门景区,所返回字段只有目的地详情中热门景区字段)
- getWeather: REAUEST_ROOTPATH + "/mobile/weather/getweather",//天气
- saveUser: REAUEST_ROOTPATH + "/mobile/weixin/saveUserInfo" ,//APP保存微信用户信息
- getUserInterest: REAUEST_ROOTPATH + "/mobile/interest/getUserInterest.do" ,//根据用户uniid查询用户关注选择的推送数据
- addUserInterest: REAUEST_ROOTPATH + "/mobile/interest/addUserInterest.do" ,//保存用户关注选择的推送数据
- selectControlListFormFilter : REAUEST_ROOTPATH + "/mobile/complaint/selectControlListFormFilter" ,//投诉列表
- getAddressByLatLng: REAUEST_ROOTPATH + "/mobile/h5/getAddressByLatLng" ,//逆地址解析
- fileUpload: REAUEST_ROOTPATH + "/mobile/file/upload" ,//上传文件
- base64Upload: REAUEST_ROOTPATH + "/mobile/file/base64Upload" ,//上传文件-base64
- addFeedback : REAUEST_ROOTPATH + "/mobile/complaint/addFeedback" ,//新增投诉
- getMapScenicList:REAUEST_ROOTPATH+"/mobile/mapScenic/getMapScenicList",//全域景区列表
- getAllDataListPage:REAUEST_ROOTPATH+"/mobile/allDataList/getAllDataList",//ybsjAllData列表
- wxLiveAdd: REAUEST_ROOTPATH + "/mobile/wxLive/liveAdd.do",//添加域名
- wxQueryLive: REAUEST_ROOTPATH + "/mobile/wxLive/queryLive.do",//查询直播中的流
- wxGetLiveUrl: REAUEST_ROOTPATH + "/mobile/wxLive/getLiveUrl.do",//生成推流及播放地址
+ insertScinceGoodComment: REAUEST_ROOTPATH + "/mobile/scenic/insertScinceGoodComment", //保存评论(产监平台)
+ imgPushFun: REAUEST_ROOTPATH + "/mobile/jpush/imgPush.do", //推送消息(带图片)
+
+
+
+ getMessageInfoFormFilter: REAUEST_ROOTPATH + "/mobile/messageInfo/getMessageInfoFormFilter", //信息管理列表数据查询
+ getMessageInfoFormFilter_two: REAUEST_ROOTPATH +
+ "/mobile/messageInfo/getMessageInfoFormFilter_two", //信息管理列表数据查询-导游页面测试
+ getMessageInfoFormFilter_food: REAUEST_ROOTPATH +
+ "/mobile/messageInfo/getMessageInfoFormFilter_food", //信息管理列表数据查询-美食页面
+ getMessgeInfoDetailFormId: REAUEST_ROOTPATH + "/mobile/messageInfo/getMessgeInfoDetailFormId", //信息详情接口查询
+ getSysParamFormRegion: REAUEST_ROOTPATH + "/mobile/sysParam/getSysParamFormRegion", //系统参数查询
+ getCondition: REAUEST_ROOTPATH + "/mobile/sort/getCondition.do", //排序、分类筛选条件查询
+ getLineInfoFormFilterByPage: REAUEST_ROOTPATH + "/mobile/lineInfo/getLineInfoFormFilterByPage", //查询线路列表接口
+ getLineDetailFormId: REAUEST_ROOTPATH + "/mobile/lineInfo/getLineDetailFormId", //线路详情接口
+ updateMessageInfoUBFeildFormId: REAUEST_ROOTPATH +
+ "/mobile/messageInfo/updateMessageInfoUBFeildFormId", //更改信息的浏览量和点赞量
+ getMapData: REAUEST_ROOTPATH + "/mobile/h5/getTenXData", //获取地图上的数据
+ getRedisData: REAUEST_ROOTPATH + "/mobile/messageInfo/getRedisData.do", //从redis中获取数据
+ getScenicListToMap: REAUEST_ROOTPATH + "/mobile/scenic/getScenicListToMap", //查询景区信息显示到地图
+ getHotelListToMap: REAUEST_ROOTPATH + "/mobile/gyhotel/getHotelListToMap", //查询酒店信息显示到地图
+ getScenicListFormFilter: REAUEST_ROOTPATH +
+ "/mobile/scenic/getScenicListFormFilter", //查询景区列表(暂用在热门景区,所返回字段只有目的地详情中热门景区字段)
+ getWeather: REAUEST_ROOTPATH + "/mobile/weather/getweather", //天气
+ saveUser: REAUEST_ROOTPATH + "/mobile/weixin/saveUserInfo", //APP保存微信用户信息
+ getUserInterest: REAUEST_ROOTPATH + "/mobile/interest/getUserInterest.do", //根据用户uniid查询用户关注选择的推送数据
+ addUserInterest: REAUEST_ROOTPATH + "/mobile/interest/addUserInterest.do", //保存用户关注选择的推送数据
+ selectControlListFormFilter: REAUEST_ROOTPATH + "/mobile/complaint/selectControlListFormFilter", //投诉列表
+ getAddressByLatLng: REAUEST_ROOTPATH + "/mobile/h5/getAddressByLatLng", //逆地址解析
+ fileUpload: REAUEST_ROOTPATH + "/mobile/file/upload", //上传文件
+ base64Upload: REAUEST_ROOTPATH + "/mobile/file/base64Upload", //上传文件-base64
+ addFeedback: REAUEST_ROOTPATH + "/mobile/complaint/addFeedback", //新增投诉
+ getMapScenicList: REAUEST_ROOTPATH + "/mobile/mapScenic/getMapScenicList", //全域景区列表
+ getAllDataListPage: REAUEST_ROOTPATH + "/mobile/allDataList/getAllDataList", //ybsjAllData列表
+ wxLiveAdd: REAUEST_ROOTPATH + "/mobile/wxLive/liveAdd.do", //添加域名
+ wxQueryLive: REAUEST_ROOTPATH + "/mobile/wxLive/queryLive.do", //查询直播中的流
+ wxGetLiveUrl: REAUEST_ROOTPATH + "/mobile/wxLive/getLiveUrl.do", //生成推流及播放地址
generalTranslation: REAUEST_ROOTPATH + "/mobile/translate/generalTranslation", //照片翻译
- photoTranslation: REAUEST_ROOTPATH + "/mobile/translate/photoTranslation" ,//文字翻译
+ photoTranslation: REAUEST_ROOTPATH + "/mobile/translate/photoTranslation", //文字翻译
objectDistinguish: REAUEST_ROOTPATH + "/mobile/translate/objectDistinguish", //通用物识别
- insertLoginLog: REAUEST_ROOTPATH + "/mobile/ybsjLoginLogInfo/insertLoginLog" ,//登陆日志
- saveOperatorLog: REAUEST_ROOTPATH + "/mobile/ybsjLoginLogInfo/saveOperatorLog" ,//操作日志
- getDicByDicnum: REAUEST_ROOTPATH + "/mobile/dictionary/getDicByDicnum" ,//根据dicnum获取字典表子级
- getScenic: REAUEST_ROOTPATH + "/mobile/reserve/subscribeScenic" ,//查询需要预约的景区
- scenicState: REAUEST_ROOTPATH + "/mobile/reserve/scenicState" ,//查询需要预约的景区的状况
- reserveScenic:REAUEST_ROOTPATH + "/mobile/reserve/scenic" ,//预约景区
- myReserve:REAUEST_ROOTPATH + "/mobile/reserve/myReserve" ,// 我的预约信息
- cancelReserve:REAUEST_ROOTPATH + "/mobile/reserve/cancelReserve" ,// 取消预约
- scanQrCode:REAUEST_ROOTPATH + "/mobile/reserve/scanQrCode" ,// 扫码
- confirmReserve:REAUEST_ROOTPATH + "/mobile/reserve/confirmReserve" ,// 确认通过
- scanRecored:REAUEST_ROOTPATH + "/mobile/reserve/scanRecored" ,// 扫码记录
- scenicAdminLogin:REAUEST_ROOTPATH + "/mobile/weixin/scenicAdminLogin" ,// 管理员登陆
- getCommentList: REAUEST_ROOTPATH + "/mobile/comment/getCommentList" ,//获取用户下的所有评论
- getCommentDetail: REAUEST_ROOTPATH + "/mobile/comment/getCommentDetail" ,//获取评论详情
- saveCommentInteract: REAUEST_ROOTPATH + "/mobile/comment/saveCommentInteract" ,//保存用户回复
- saveCommentDetail: REAUEST_ROOTPATH + "/mobile/comment/saveCommentDetail" ,//保存用户评论
- getDimensionList: REAUEST_ROOTPATH + "/mobile/comment/getDimensionList" ,//获取评论页面网评维度
- getScenicVolume: REAUEST_ROOTPATH + "/mobile/scenic/getScenicVolume" ,//从产监获取客流量
- subscribeScenic: REAUEST_ROOTPATH + "/mobile/reserve/subscribeScenic" ,//获取可预约的景区
- scenicDetail: REAUEST_ROOTPATH + "/mobile/reserve/scenicDetail" ,//预约的景区详情
- scenicTimeList: REAUEST_ROOTPATH + "/mobile/reserve/scenicTimeList" ,//景区时间段
- saveReserveInfo: REAUEST_ROOTPATH + "/mobile/reserve/saveReserveInfo" ,//保存景区预约信息
- reserveDetail: REAUEST_ROOTPATH + "/mobile/reserve/reserveDetail" ,//预约详情
- loginApp:REAUEST_ROOTPATH + "/mobile/weixin/loginApp" ,// app登录
- registerUserApp:REAUEST_ROOTPATH + "/mobile/weixin/registerUserApp" ,//app注册
- getScenicListByGuids:REAUEST_ROOTPATH + "/mobile/scenic/getScenicListByGuids" ,//获取热门景点列表
- deleteUserApp:REAUEST_ROOTPATH + "/mobile/weixin/deleteUserApp" ,//注销账号
+ insertLoginLog: REAUEST_ROOTPATH + "/mobile/ybsjLoginLogInfo/insertLoginLog", //登陆日志
+ saveOperatorLog: REAUEST_ROOTPATH + "/mobile/ybsjLoginLogInfo/saveOperatorLog", //操作日志
+ getDicByDicnum: REAUEST_ROOTPATH + "/mobile/dictionary/getDicByDicnum", //根据dicnum获取字典表子级
+ getScenic: REAUEST_ROOTPATH + "/mobile/reserve/subscribeScenic", //查询需要预约的景区
+ scenicState: REAUEST_ROOTPATH + "/mobile/reserve/scenicState", //查询需要预约的景区的状况
+ reserveScenic: REAUEST_ROOTPATH + "/mobile/reserve/scenic", //预约景区
+ myReserve: REAUEST_ROOTPATH + "/mobile/reserve/myReserve", // 我的预约信息
+ cancelReserve: REAUEST_ROOTPATH + "/mobile/reserve/cancelReserve", // 取消预约
+ scanQrCode: REAUEST_ROOTPATH + "/mobile/reserve/scanQrCode", // 扫码
+ confirmReserve: REAUEST_ROOTPATH + "/mobile/reserve/confirmReserve", // 确认通过
+ scanRecored: REAUEST_ROOTPATH + "/mobile/reserve/scanRecored", // 扫码记录
+ scenicAdminLogin: REAUEST_ROOTPATH + "/mobile/weixin/scenicAdminLogin", // 管理员登陆
+ getCommentList: REAUEST_ROOTPATH + "/mobile/comment/getCommentList", //获取用户下的所有评论
+ getCommentDetail: REAUEST_ROOTPATH + "/mobile/comment/getCommentDetail", //获取评论详情
+ saveCommentInteract: REAUEST_ROOTPATH + "/mobile/comment/saveCommentInteract", //保存用户回复
+ saveCommentDetail: REAUEST_ROOTPATH + "/mobile/comment/saveCommentDetail", //保存用户评论
+ getDimensionList: REAUEST_ROOTPATH + "/mobile/comment/getDimensionList", //获取评论页面网评维度
+ getScenicVolume: REAUEST_ROOTPATH + "/mobile/scenic/getScenicVolume", //从产监获取客流量
+ subscribeScenic: REAUEST_ROOTPATH + "/mobile/reserve/subscribeScenic", //获取可预约的景区
+ scenicDetail: REAUEST_ROOTPATH + "/mobile/reserve/scenicDetail", //预约的景区详情
+ scenicTimeList: REAUEST_ROOTPATH + "/mobile/reserve/scenicTimeList", //景区时间段
+ saveReserveInfo: REAUEST_ROOTPATH + "/mobile/reserve/saveReserveInfo", //保存景区预约信息
+ reserveDetail: REAUEST_ROOTPATH + "/mobile/reserve/reserveDetail", //预约详情
+ loginApp: REAUEST_ROOTPATH + "/mobile/weixin/loginApp", // app登录
+ registerUserApp: REAUEST_ROOTPATH + "/mobile/weixin/registerUserApp", //app注册
+ getScenicListByGuids: REAUEST_ROOTPATH + "/mobile/scenic/getScenicListByGuids", //获取热门景点列表
+ deleteUserApp: REAUEST_ROOTPATH + "/mobile/weixin/deleteUserApp", //注销账号
//票务这边的
- pageComplaintinfo:PWPATH+"/app-api/wechatshop/complaintinfo/pageComplaintinfo",//获得投诉建议分页
- createComplaintinfo: PWPATH +"/app-api/wechatshop/complaintinfo/createComplaintinfo",//创建投诉建议
- getComplaintinfo: PWPATH +"/app-api/wechatshop/complaintinfo/getComplaintinfo",//投诉建议详情
- getTicketSortList: PWPATH + "/app-api/wechatshop/ticket/getTicketSortList",//获取门票分类
- getTicketList: PWPATH + "/app-api/wechatshop/ticket/getTicketList",//获取门票列表分页
- isQuota: PWPATH + "/app-api/wechatshop/ticket/isQuota",//查询是否限购
- getTicketInfo: PWPATH + "/app-api/wechatshop/ticket/getTicketInfo",//获取门票信息
- getScencAndTicketInfo: PWPATH + "/app-api/wechatshop/ticket/getScencAndTicketInfo",//获取景区门票相关信息
- getTicketDateInventory: PWPATH + "/app-api/wechatshop/ticket/getTicketDateInventory",//获得门票日期库存
- verifyAndCreateOrder: PWPATH + "/app-api/wechatshop/ticket/verifyAndCreateOrder",//验证门票库存,生成订单
- isHaveOrder: PWPATH + "/app-api/wechatshop/ticket/isHaveOrder",//获取当前用户是否存在待支付订单
- getOrderList: PWPATH + "/app-api/wechatshop/order/getOrderList",//获取订单分页
- cancelOrder: PWPATH + "/app-api/wechatshop/order/cancelOrder",//取消订单
- delectOrder: PWPATH + "/app-api/wechatshop/order/delectOrder",//删除订单(目前逻辑是只能删除已取消的订单)
- getOrderDetails: PWPATH + "/app-api/wechatshop/order/getOrderDetails",//获取订单详情
- payOrder: PWPATH + "/app-api/pay/order/submit",//微信支付
- refund: PWPATH + "/app-api/pay/refund/refund",//发起退款
- refundWeChat: PWPATH + "/app-api/pay/refund/refundWeChat",//发起退款-启明芯
- getQmxTicketDoc: PWPATH + "/app-api/wechatshop/ticket/getQmxTicketDoc",//获取启明芯门票证件信息
- getOrderExpireTime: PWPATH + "/app-api/wechatshop/order/getOrderExpireTime",//获取订单自动取消时长配置
-
-
- getPhone: PWPATH+"/app-api/wechatshop/auth/getWeChatUserMobile",//获取手机号
- weChatLogin: PWPATH+"/app-api/wechatshop/auth/weChatLogin",//登陆获取token
- refreshToken: PWPATH +"/admin-api/system/auth/refresh-token",//登陆获取token
-
+ pageComplaintinfo: PWPATH + "/app-api/wechatshop/complaintinfo/pageComplaintinfo", //获得投诉建议分页
+ createComplaintinfo: PWPATH + "/app-api/wechatshop/complaintinfo/createComplaintinfo", //创建投诉建议
+ getComplaintinfo: PWPATH + "/app-api/wechatshop/complaintinfo/getComplaintinfo", //投诉建议详情
+ getTicketSortList: PWPATH + "/app-api/wechatshop/ticket/getTicketSortList", //获取门票分类
+ getTicketList: PWPATH + "/app-api/wechatshop/ticket/getTicketList", //获取门票列表分页
+ isQuota: PWPATH + "/app-api/wechatshop/ticket/isQuota", //查询是否限购
+ getTicketInfo: PWPATH + "/app-api/wechatshop/ticket/getTicketInfo", //获取门票信息
+ getScencAndTicketInfo: PWPATH + "/app-api/wechatshop/ticket/getScencAndTicketInfo", //获取景区门票相关信息
+ getTicketDateInventory: PWPATH + "/app-api/wechatshop/ticket/getTicketDateInventory", //获得门票日期库存
+ verifyAndCreateOrder: PWPATH + "/app-api/wechatshop/ticket/verifyAndCreateOrder", //验证门票库存,生成订单
+ isHaveOrder: PWPATH + "/app-api/wechatshop/ticket/isHaveOrder", //获取当前用户是否存在待支付订单
+ getOrderList: PWPATH + "/app-api/wechatshop/order/getOrderList", //获取订单分页
+ cancelOrder: PWPATH + "/app-api/wechatshop/order/cancelOrder", //取消订单
+ delectOrder: PWPATH + "/app-api/wechatshop/order/delectOrder", //删除订单(目前逻辑是只能删除已取消的订单)
+ getOrderDetails: PWPATH + "/app-api/wechatshop/order/getOrderDetails", //获取订单详情
+ payOrder: PWPATH + "/app-api/pay/order/submit", //微信支付
+ refund: PWPATH + "/app-api/pay/refund/refund", //发起退款
+ refundWeChat: PWPATH + "/app-api/pay/refund/refundWeChat", //发起退款-启明芯
+ getQmxTicketDoc: PWPATH + "/app-api/wechatshop/ticket/getQmxTicketDoc", //获取启明芯门票证件信息
+ getOrderExpireTime: PWPATH + "/app-api/wechatshop/order/getOrderExpireTime", //获取订单自动取消时长配置
+
+
+ getPhone: PWPATH + "/app-api/wechatshop/auth/getWeChatUserMobile", //获取手机号
+ weChatLogin: PWPATH + "/app-api/wechatshop/auth/weChatLogin", //登陆获取token
+ refreshToken: PWPATH + "/admin-api/system/auth/refresh-token", //登陆获取token
+
// 民宿客栈
- getHomestayOrderDetail: PWPATH +"/admin-api/homestay/HotelOrder/selectUserOrderOne", // 获取民宿订单详情信息
+ getHomestayOrderDetail: PWPATH + "/admin-api/homestay/HotelOrder/selectUserOrderOne", // 获取民宿订单详情信息
getHomestayOrderList: PWPATH + "/admin-api/homestay/HotelOrder/selectPageUser", // 获取用户全部民宿订单列表
getHomestayOrderRefund: PWPATH + "/admin-api/homestay/HotelOrder/getHotelRefundLog", // 获取用户民宿退款信息
-}
+}
\ No newline at end of file
diff --git a/common/httpRequest.js b/common/httpRequest.js
index f2de6a2..644065f 100644
--- a/common/httpRequest.js
+++ b/common/httpRequest.js
@@ -283,6 +283,7 @@ module.exports = {
method: "GET",
header: headers
};
+ console.log('config'.config)
config = requestInterceptor(config);
uni.request(config).then(result => {
const response = responseInterceptor(result, config);
diff --git a/pages/fuwu/fuwu.vue b/pages/fuwu/fuwu.vue
index b34efc1..d669a8f 100644
--- a/pages/fuwu/fuwu.vue
+++ b/pages/fuwu/fuwu.vue
@@ -96,8 +96,7 @@
class="at_size_2" mode="aspectFill">
附近
-
-
+
AI管家
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 15f90ea..d52bd3e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -49,7 +49,7 @@
-
+
行程规划
@@ -79,7 +79,7 @@
-
+
AI管家
diff --git a/subPageA/food/fooddetial/fooddetial.vue b/subPageA/food/fooddetial/fooddetial.vue
index 8a9469b..497d186 100644
--- a/subPageA/food/fooddetial/fooddetial.vue
+++ b/subPageA/food/fooddetial/fooddetial.vue
@@ -137,6 +137,7 @@
if (!that.$util.isSuccess(res)) {
return;
}
+ console.log("========")
var data = res.data;
data.logo = this.$config.ROOTPATH + data.logo;
var shangjia = data[that.$param.shangjiakey];
diff --git a/subPageB/jiqiren/jiqiren/zhinengjiqiren.vue b/subPageB/jiqiren/jiqiren/zhinengjiqiren.vue
index bfa9751..3de0b07 100644
--- a/subPageB/jiqiren/jiqiren/zhinengjiqiren.vue
+++ b/subPageB/jiqiren/jiqiren/zhinengjiqiren.vue
@@ -1,11 +1,11 @@
+ title="智能客服" @clickLeft="back" />
-
+
@@ -13,13 +13,13 @@
泉宝
{{ item.time }}
-
-
-
+
+
{{items.text}}
-
+
查看更多
@@ -45,8 +45,6 @@
-
-
@@ -61,9 +59,7 @@
-
-
@@ -74,88 +70,94 @@
-
+
+
+
+
+ 松开 发送
+
+
@@ -374,17 +446,17 @@ innerAudioContext.autoplay = true;
@import url("/static/css/common.css");
@import url("/pages/index/index.css");
- .half{
+ .half {
width: 50%;
}
- .jqr_dig_warp{
+ .jqr_dig_warp {
background-image: url('https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/jiqirenbg.png');
background-repeat: no-repeat;
background-size: 100% auto;
}
- .user-box{
+ .user-box {
display: flex;
flex-direction: column;
@@ -393,7 +465,7 @@ innerAudioContext.autoplay = true;
align-items: center;
justify-content: start;
- .j_dig_time{
+ .j_dig_time {
display: flex;
flex-direction: column;
padding: 0;
@@ -401,64 +473,116 @@ innerAudioContext.autoplay = true;
}
}
- .dig_column{
+ .dig_column {
margin-left: 50rpx;
margin-top: 20rpx;
}
}
- .me{
+ .me {
align-items: flex-end;
}
- .b_tol_ipt{
+ .b_tol_ipt {
margin-left: 50rpx;
background: #F8F9FD;
- border-radius: 44rpx;
+ border-radius: 44rpx;
- .ipt_jqr{
- border: none;
- padding-left: 20rpx
- }
+ .ipt_jqr {
+ border: none;
+ padding-left: 20rpx
+ }
}
- .lazy_sech{
+
+ .lazy_sech {
background-color: #fff;
}
- .jqr_tol{
+
+ .jqr_tol {
height: fit-content;
- padding:20rpx 0 50rpx 0 ;
+ padding: 20rpx 0 50rpx 0;
}
- .jpan_mode{
+
+ .jpan_mode {
display: flex;
align-items: center;
justify-content: space-around;
- .b_tol_box{
+ .b_tol_box {
font-family: Source Han Sans SC;
- font-weight: 500;
- font-size: 30rpx;
- color: #0983FF;
- width: fit-content;
- height: fit-content;
+ font-weight: 500;
+ font-size: 30rpx;
+ color: #0983FF;
+ width: fit-content;
+ height: fit-content;
}
}
- .jqr_dig_scroll{
+ .jqr_dig_scroll {
padding-bottom: 300rpx;
}
- .jqr_tol_box{
+ .jqr_tol_box {
height: fit-content;
}
- .jqr_box{
+ .jqr_box {
max-height: unset;
}
- .dig_more{
+ .dig_more {
bottom: 0;
}
- .noPadding{
- padding-bottom: 20rpx!important;
+
+ .noPadding {
+ padding-bottom: 20rpx !important;
}
-
+ .audio-animation {
+ position: fixed;
+ // width: 100vw;
+ // height: 100vh;
+ left: 50%;
+ top: 50%;
+ transform: translate(-50%, -50%);
+ z-index: 202410;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ .text {
+ text-align: center;
+ font-size: 28rpx;
+ color: #333;
+ margin-top: 60rpx;
+ }
+
+ .audio-wave {
+ padding: 50rpx;
+
+ .audio-wave-text {
+ background-color: #0983ff;
+ width: 7rpx;
+ height: 12rpx;
+ margin: 0 6rpx;
+ border-radius: 5rpx;
+ display: inline-block;
+ border: none;
+ animation: wave 0.25s ease-in-out;
+ animation-iteration-count: infinite;
+ animation-direction: alternate;
+ }
+
+ /* 声波动画 */
+ @keyframes wave {
+ from {
+ transform: scaleY(1);
+ }
+
+ to {
+ transform: scaleY(4);
+ }
+ }
+ }
+ }
+
+
\ No newline at end of file
diff --git a/subPageC/Ai/index.vue b/subPageC/Ai/index.vue
index 82bb05c..60258c0 100644
--- a/subPageC/Ai/index.vue
+++ b/subPageC/Ai/index.vue
@@ -202,7 +202,6 @@
.then(res => {
console.log("---", res)
});
-
this.content = ''
this.scrollToBottom()
// // 模拟对方回复
diff --git a/subPageC/flower/index.vue b/subPageC/flower/index.vue
index fdc3c7a..cdbbe1c 100644
--- a/subPageC/flower/index.vue
+++ b/subPageC/flower/index.vue
@@ -1,5 +1,9 @@
+
+
+
+
@@ -42,6 +46,8 @@
export default {
data() {
return {
+ //公共路径
+ rootPath: this.$config.ROOTPATH,
imageSrc: "",
imageTitle: "",
search_result: []
@@ -57,13 +63,13 @@
mediaType: ['image'],
sourceType: [sourceType],
success: (res) => {
- console.log(res)
$this.imageSrc = res.tempFiles[0].tempFilePath
uni.showLoading({
title: '图片识别中...'
})
this.task = uni.uploadFile({
- url: 'http://192.168.130.157:48080/app-api/wechatshop/toolIdentify/identifyPlant', //仅为示例,非真实的接口地址
+ url: this.rootPath +
+ '/app-api/wechatshop/toolIdentify/identifyPlant', //仅为示例,非真实的接口地址
filePath: $this.imageSrc,
name: 'file',
formData: {
@@ -115,19 +121,21 @@
overflow: hidden;
- &:after {
+ .bg {
content: '';
- width: 100%;
+ width: 100vw;
height: 60vh;
position: absolute;
left: 0;
top: 0;
z-index: 0;
- background: url('@/static/test/flower-bg.png');
- background-repeat: no-repeat;
- background-size: cover;
-
+
+ image {
+ width: 100vw;
+ height: 100%;
+ }
}
+
&:before {
content: '';
width: 160%;
@@ -136,7 +144,7 @@
left: -30%;
top: 0;
z-index: 0;
- background: linear-gradient(to bottom, #0983ff, rgba(#0983ff,.8));
+ background: linear-gradient(to bottom, #0983ff, rgba(#0983ff, .8));
border-radius: 0 0 50% 50%;
}
diff --git a/subPageC/translate/index.vue b/subPageC/translate/index.vue
index 59dc5f5..830f8ae 100644
--- a/subPageC/translate/index.vue
+++ b/subPageC/translate/index.vue
@@ -49,6 +49,8 @@
},
data() {
return {
+ //公共路径
+ rootPath: this.$config.ROOTPATH,
imageSrc: "",
imageTitle: "",
search_result: [],
@@ -160,28 +162,24 @@
mediaType: ['image'],
sourceType: ['camera', 'album'],
success: (res) => {
- console.log(res)
$this.imageSrc = res.tempFiles[0].tempFilePath
uni.showLoading({
title: '识别中...'
})
- console.log("bbb")
this.task = uni.uploadFile({
- url: 'http://192.168.130.157:48080/app-api/wechatshop/toolIdentify/identifyText',
+ url: this.rootPath + '/app-api/wechatshop/toolIdentify/identifyText',
filePath: $this.imageSrc,
name: 'file',
formData: {
'file': $this.imageSrc
},
- success: (res) => {
- console.log('uploadImage success, res is:', res)
+ success: (res) => {
let data = JSON.parse(res.data)
uni.showToast({
title: '识别成功',
icon: 'success',
duration: 1000
-
- })
+ })
if (data.data.words !== null) {
this.ActiveText = data.data.words
} else {
@@ -190,7 +188,6 @@
this.gotoTranslate()
},
fail: (err) => {
- console.log('uploadImage fail', err);
uni.showModal({
content: err.errMsg,
showCancel: false
@@ -207,30 +204,45 @@
}
})
},
+ //选择翻译语种 from
changeFrom(val) {
this.fromShow = false
this.ActiveFrom = val.value[0]
},
-
+ //选择翻译语种 to
changeTo(val) {
this.toShow = false
this.ActiveTo = val.value[0]
},
+ //翻译
gotoTranslate() {
- let queryParams
- if (!this.exchange) {
- queryParams = `query=${this.ActiveText}&from=${this.ActiveFrom.value}&to=${this.ActiveTo.value}`
+ if (this.ActiveFrom.value == this.ActiveTo.value) {
+ this.resultText = this.ActiveText
} else {
- queryParams = `query=${this.ActiveText}&from=${this.ActiveTo.value}&to=${this.ActiveFrom.value}`
- }
+ let queryParams
+ if (!this.exchange) {
+ queryParams = {
+ query: this.ActiveText,
+ from: this.ActiveFrom.value,
+ to: this.ActiveTo.value
+ }
- uni.request({
- url: 'http://192.168.130.157:48080/app-api/wechatshop/toolTranslate/translate?' + queryParams,
- success: (res) => {
- this.resultText = res.data.data
- console.log(this.resultText)
- }
- });
+ } else {
+ queryParams = {
+ query: this.ActiveText,
+ from: this.ActiveTo.value,
+ to: this.ActiveFrom.value,
+ }
+ }
+ this.$Request.get(this.$config.getTtranslate, queryParams, "", "", false, true)
+ .then(res => {
+ if (res.data !== null) {
+ this.resultText = res.data
+ } else {
+ this.resultText = this.ActiveText
+ }
+ })
+ }
},
}
}
diff --git a/subPageC/weather/index.vue b/subPageC/weather/index.vue
index 6f0c643..b8c91a0 100644
--- a/subPageC/weather/index.vue
+++ b/subPageC/weather/index.vue
@@ -1,10 +1,8 @@
-
-
- 鹿泉天气
-
+
{{today_data.temp}}°
@@ -50,7 +48,11 @@
data
} from '../../uni_modules/uview-ui/libs/mixin/mixin';
+ import uniNavBar from '@/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue'
export default {
+ components: {
+ uniNavBar
+ },
data() {
return {
today_data: undefined,
@@ -93,7 +95,7 @@
methods: {
initPages() {
this.$Request.get(this.$config.getWeatherForecast, null, null, null, false, true)
- .then(res => {
+ .then(res => {
let data = res.data
this.tempMax = Math.max.apply(Math, data.map(item => {
return item.tempMax
@@ -130,8 +132,8 @@
},
gotoBack() {
uni.navigateBack({
- delta: 1 // 默认值是1,表示返回的页面层数
- });
+ delta: 1,
+ })
},
getWeekday(day) {
const date = new Date(day); //字符串转日期