diff --git a/common/config.js b/common/config.js
index 13ff41e..a436f8a 100644
--- a/common/config.js
+++ b/common/config.js
@@ -142,6 +142,7 @@ module.exports = {
//票务这边的
pageComplaintinfo:PWPATH+"/wechatshop/complaintinfo/pageComplaintinfo",//获得投诉建议分页
+ createComplaintinfo: PWPATH +"/wechatshop/complaintinfo/createComplaintinfo",//创建投诉建议
getPhone: PWPATH+"/wechatshop/auth/getWeChatUserMobile",//获取手机号
diff --git a/common/httpRequest.js b/common/httpRequest.js
index 933b838..9e0a50d 100644
--- a/common/httpRequest.js
+++ b/common/httpRequest.js
@@ -24,12 +24,10 @@ module.exports = {
}
return info;
},
- post: function (url, data, headerContentType, tentId, needAes) {
- console.log(url, data, headerContentType, tentId, needAes, 'post请求参数')
+ post: function (url, data, headerContentType, tentId, needAes, auth) {
+ console.log(url, data, headerContentType, tentId, needAes, 'post请求参数');
-
- debugger
- if (needAes != false) {
+ if (needAes !== false) {
for (var key in data) {
data[key] = aes.aesMinEncrypt(data[key]);
}
@@ -37,93 +35,71 @@ module.exports = {
headerContentType = headerContentType == "json" ? "application/json" : "application/x-www-form-urlencoded";
- // header = header || { "content-type":"application/x-www-form-urlencoded"};
- // url = this.config("ROOTPATH")+url;
- if (tentId && tentId != "" && tentId != null && tentId != undefined) {
- return new Promise((succ, error) => {
- uni.request({
- url: url,
- data: headerContentType == "application/json" ? JSON.stringify(data) : data,
- method: "POST",
- header: {
- "content-type": headerContentType,
- "tenant-id": tentId,
- },
- xhrFields: {
- withCredentials: true // 这里设置了withCredentials
- },
- success: function (result) {
- succ.call(self, result.data)
- },
- fail: function (e) {
- error.call(self, e)
- }
- })
- })
- } else {
- return new Promise((succ, error) => {
- uni.request({
- url: url,
- data: headerContentType =="application/json"?JSON.stringify(data):data,
- method: "POST",
- header: {
- "content-type": headerContentType
- },
- xhrFields: {
- withCredentials: true // 这里设置了withCredentials
- },
- success: function (result) {
- succ.call(self, result.data)
- },
- fail: function (e) {
- error.call(self, e)
- }
- })
- })
+ let headers = {
+ "content-type": headerContentType
+ };
+
+ if (auth==true) {
+ const tok = store.state.userInfo.accessToken || uni.getStorageSync('userInfo').accessToken;
+ headers['Authorization'] = 'Bearer ' + tok;
}
+
+ if (tentId && tentId !== "" && tentId !== null && tentId !== undefined) {
+ headers['tenant-id'] = tentId;
+ }
+
+ return new Promise((succ, error) => {
+ uni.request({
+ url: url,
+ data: headerContentType == "application/json" ? JSON.stringify(data) : data,
+ method: "POST",
+ header: headers,
+ xhrFields: {
+ withCredentials: true // 这里设置了withCredentials
+ },
+ success: function (result) {
+ succ.call(self, result.data);
+ },
+ fail: function (e) {
+ error.call(self, e);
+ }
+ });
+ });
},
- get: function (url, data, headerContentType, tentId, needAes) {
- console.log(url, data, headerContentType, tentId, needAes, 'get请求参数')
+
+ get: function (url, data, headerContentType, tentId, needAes, auth) {
+ console.log(url, data, headerContentType, tentId, needAes, 'get请求参数');
headerContentType = headerContentType ? headerContentType : "application/x-www-form-urlencoded";
- // header = header || { "content-type":"application/x-www-form-urlencoded"};
- // url = this.config("ROOTPATH")+url;
- if (tentId && tentId != "" && tentId != null && tentId != undefined) {
- return new Promise((succ, error) => {
- uni.request({
- url: url,
- data: data,
- method: "GET",
- header: {
- "content-type": headerContentType,
- "tenant-id": tentId,
- },
- success: function (result) {
- succ.call(self, result.data)
- },
- fail: function (e) {
- error.call(self, e)
- }
- })
- })
- } else {
- return new Promise((succ, error) => {
- uni.request({
- url: url,
- data: data,
- method: "GET",
- header: {
- "content-type": headerContentType
- },
- success: function (result) {
- succ.call(self, result.data)
- },
- fail: function (e) {
- error.call(self, e)
- }
- })
- })
+
+ let headers = {
+ "content-type": headerContentType
+ };
+
+ if (auth == true) {
+ const tok = store.state.userInfo.accessToken || uni.getStorageSync('userInfo').accessToken;
+ headers['Authorization'] = 'Bearer ' + tok;
}
+
+ if (tentId && tentId !== "" && tentId !== null && tentId !== undefined) {
+ headers['tenant-id'] = tentId;
+ }
+
+ return new Promise((succ, error) => {
+ uni.request({
+ url: url,
+ data: data,
+ method: "GET",
+ header: headers,
+ success: function (result) {
+ succ.call(self, result.data);
+ },
+ fail: function (e) {
+ error.call(self, e);
+ }
+ });
+ });
}
+
}
// 写法示例
diff --git a/components/f-login/f-login.vue b/components/f-login/f-login.vue
index 112aa5b..fdc592e 100644
--- a/components/f-login/f-login.vue
+++ b/components/f-login/f-login.vue
@@ -5,8 +5,8 @@
- 欢迎登录~
- 用户登录后消费可享受更好的服务体验
+ 请先登录~
+ 用户登录后可享受更好的服务体验
@@ -130,7 +130,6 @@ export default {
//生成token
this.setUserInfo(userInfo)
- this.$param.userkey = userInfo.openid
setTimeout(() => {
// uni.showToast({
diff --git a/pages.json b/pages.json
index 964ee12..126e42b 100644
--- a/pages.json
+++ b/pages.json
@@ -18,7 +18,7 @@
{
"path": "pages/fuwu/fuwu",
"style": {
- "navigationBarTitleText": "文旅服务"
+ "navigationStyle": "custom"
}
},
{
@@ -523,17 +523,7 @@
}
}
},
- {
- "path": "cate/xiongan/xiongan",
- "style": {
- "navigationBarTitleText": "了解雄安",
- "app-plus": {
- "titleNView": {
- "type": "transparent"
- }
- }
- }
- },
+
{
"path": "cate/index",
"style": {
@@ -739,7 +729,7 @@
"pagePath": "pages/fuwu/fuwu",
"iconPath": "static/animg/bar/fuwu.png",
"selectedIconPath": "static/animg/bar/fuwu_active.png",
- "text": "文旅服务"
+ "text": "服务"
},
{
"pagePath": "pages/personcenter/personcenter",
diff --git a/pages/fuwu/fuwu.vue b/pages/fuwu/fuwu.vue
index f939648..cbf4c25 100644
--- a/pages/fuwu/fuwu.vue
+++ b/pages/fuwu/fuwu.vue
@@ -1,51 +1,50 @@
-
+
+
+
+
+ “E码游”鹿泉
+ 精心筹备，让您的旅程无忧自在
+
+
+
+ 投诉
+ 去投诉
+
+
+ 建议
+ 去建议
+
+
+
- 游前必备
+
+ 游前必备
+
-
+
景区
-
+
美食
-
+
文创
-
+
线路
-
+
酒店
-
+
活动
-
-
+
攻略
-
-
-
- 非遗
-
-
+
+ 非遗
+
+
-
+
- 游玩助手
-
+
+ 游玩助手
+
+
-
-
-
-
-
- 附近
-
-
-
- 机器人
+
+
+
+
+ 附近
+
+
+
+ 机器人
+
+
-
+
diff --git a/pages/index/index.vue b/pages/index/index.vue
index afa58c1..6d14e7b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -169,6 +169,7 @@
+
@@ -313,9 +314,10 @@ export default {
});
break;
case 'tousu':
- uni.navigateTo({
- url: "/subPageB/suggest/sug_list?type=1",
- });
+ this.onTokenJump('/subPageB/suggest/sug_list?type=1', 'navigateTo')
+ // uni.navigateTo({
+ // url: "/subPageB/suggest/sug_list?type=1",
+ // });
break;
}
},
diff --git a/pages/personcenter/personcenter.vue b/pages/personcenter/personcenter.vue
index e00d19b..4d82087 100644
--- a/pages/personcenter/personcenter.vue
+++ b/pages/personcenter/personcenter.vue
@@ -132,14 +132,16 @@ export default {
goPage(val) {
switch (val) {
case 'yijian':
- uni.navigateTo({
- url: "/subPageB/suggest/sug_list?type=2",
- });
+ this.onTokenJump('/subPageB/suggest/sug_list?type=2', 'navigateTo')
+ // uni.navigateTo({
+ // url: "/subPageB/suggest/sug_list?type=2",
+ // });
break;
case 'tousu':
- uni.navigateTo({
- url: "/subPageB/suggest/sug_list?type=1",
- });
+ this.onTokenJump('/subPageB/suggest/sug_list?type=1', 'navigateTo')
+ // uni.navigateTo({
+ // url: "/subPageB/suggest/sug_list?type=1",
+ // });
break;
case 'about':
uni.navigateTo({
diff --git a/static/animg/fuwu/at_1.png b/static/animg/fuwu/at_1.png
deleted file mode 100755
index 570ff8c..0000000
Binary files a/static/animg/fuwu/at_1.png and /dev/null differ
diff --git a/static/animg/fuwu/at_2.png b/static/animg/fuwu/at_2.png
deleted file mode 100755
index 279e12e..0000000
Binary files a/static/animg/fuwu/at_2.png and /dev/null differ
diff --git a/static/animg/fuwu/at_3.png b/static/animg/fuwu/at_3.png
deleted file mode 100755
index 50f24e8..0000000
Binary files a/static/animg/fuwu/at_3.png and /dev/null differ
diff --git a/static/animg/fuwu/at_5.png b/static/animg/fuwu/at_5.png
deleted file mode 100755
index c884dff..0000000
Binary files a/static/animg/fuwu/at_5.png and /dev/null differ
diff --git a/static/animg/fuwu/f_dl.png b/static/animg/fuwu/f_dl.png
deleted file mode 100755
index 15d4b6f..0000000
Binary files a/static/animg/fuwu/f_dl.png and /dev/null differ
diff --git a/static/animg/fuwu/f_dy.png b/static/animg/fuwu/f_dy.png
deleted file mode 100755
index f457689..0000000
Binary files a/static/animg/fuwu/f_dy.png and /dev/null differ
diff --git a/static/animg/fuwu/f_fj.png b/static/animg/fuwu/f_fj.png
deleted file mode 100755
index 7a74ca8..0000000
Binary files a/static/animg/fuwu/f_fj.png and /dev/null differ
diff --git a/static/animg/fuwu/f_fy.png b/static/animg/fuwu/f_fy.png
deleted file mode 100755
index b35091f..0000000
Binary files a/static/animg/fuwu/f_fy.png and /dev/null differ
diff --git a/static/animg/fuwu/f_gh.png b/static/animg/fuwu/f_gh.png
deleted file mode 100755
index 3f2e200..0000000
Binary files a/static/animg/fuwu/f_gh.png and /dev/null differ
diff --git a/static/animg/fuwu/f_gl.png b/static/animg/fuwu/f_gl.png
deleted file mode 100755
index 4d9b356..0000000
Binary files a/static/animg/fuwu/f_gl.png and /dev/null differ
diff --git a/static/animg/fuwu/f_hd.png b/static/animg/fuwu/f_hd.png
deleted file mode 100755
index d6c392a..0000000
Binary files a/static/animg/fuwu/f_hd.png and /dev/null differ
diff --git a/static/animg/fuwu/f_hua.png b/static/animg/fuwu/f_hua.png
deleted file mode 100755
index 26f30cf..0000000
Binary files a/static/animg/fuwu/f_hua.png and /dev/null differ
diff --git a/static/animg/fuwu/f_jqr.png b/static/animg/fuwu/f_jqr.png
deleted file mode 100755
index 95d26bf..0000000
Binary files a/static/animg/fuwu/f_jqr.png and /dev/null differ
diff --git a/static/animg/fuwu/f_lxs.png b/static/animg/fuwu/f_lxs.png
deleted file mode 100755
index 2f61e44..0000000
Binary files a/static/animg/fuwu/f_lxs.png and /dev/null differ
diff --git a/static/animg/fuwu/f_qj.png b/static/animg/fuwu/f_qj.png
deleted file mode 100755
index 813719c..0000000
Binary files a/static/animg/fuwu/f_qj.png and /dev/null differ
diff --git a/static/animg/fuwu/f_shib.png b/static/animg/fuwu/f_shib.png
deleted file mode 100755
index 77194b4..0000000
Binary files a/static/animg/fuwu/f_shib.png and /dev/null differ
diff --git a/static/animg/fuwu/f_shop.png b/static/animg/fuwu/f_shop.png
deleted file mode 100755
index 78f389a..0000000
Binary files a/static/animg/fuwu/f_shop.png and /dev/null differ
diff --git a/static/animg/fuwu/f_sp.png b/static/animg/fuwu/f_sp.png
deleted file mode 100755
index 3536825..0000000
Binary files a/static/animg/fuwu/f_sp.png and /dev/null differ
diff --git a/static/animg/fuwu/f_tc.png b/static/animg/fuwu/f_tc.png
deleted file mode 100755
index aa2b813..0000000
Binary files a/static/animg/fuwu/f_tc.png and /dev/null differ
diff --git a/static/animg/fuwu/f_ts.png b/static/animg/fuwu/f_ts.png
deleted file mode 100755
index f0851e9..0000000
Binary files a/static/animg/fuwu/f_ts.png and /dev/null differ
diff --git a/static/animg/fuwu/f_wu.png b/static/animg/fuwu/f_wu.png
deleted file mode 100755
index fe68671..0000000
Binary files a/static/animg/fuwu/f_wu.png and /dev/null differ
diff --git a/static/animg/fuwu/f_xl.png b/static/animg/fuwu/f_xl.png
deleted file mode 100755
index 1ed47e6..0000000
Binary files a/static/animg/fuwu/f_xl.png and /dev/null differ
diff --git a/static/animg/fuwu/f_yue.png b/static/animg/fuwu/f_yue.png
deleted file mode 100755
index fbe0d66..0000000
Binary files a/static/animg/fuwu/f_yue.png and /dev/null differ
diff --git a/static/animg/fuwu/f_yul.png b/static/animg/fuwu/f_yul.png
deleted file mode 100755
index e45995e..0000000
Binary files a/static/animg/fuwu/f_yul.png and /dev/null differ
diff --git a/static/animg/fuwu/f_zx.png b/static/animg/fuwu/f_zx.png
deleted file mode 100755
index 08f2bfa..0000000
Binary files a/static/animg/fuwu/f_zx.png and /dev/null differ
diff --git a/static/animg/fuwu/feiyi.png b/static/animg/fuwu/feiyi.png
deleted file mode 100755
index be9b62a..0000000
Binary files a/static/animg/fuwu/feiyi.png and /dev/null differ
diff --git a/static/animg/fuwu/fujin2x.png b/static/animg/fuwu/fujin2x.png
new file mode 100755
index 0000000..37d105b
Binary files /dev/null and b/static/animg/fuwu/fujin2x.png differ
diff --git a/static/animg/fuwu/gonglve2x.png b/static/animg/fuwu/gonglve2x.png
new file mode 100755
index 0000000..3880fc7
Binary files /dev/null and b/static/animg/fuwu/gonglve2x.png differ
diff --git a/static/animg/fuwu/huodong2x.png b/static/animg/fuwu/huodong2x.png
new file mode 100755
index 0000000..d648427
Binary files /dev/null and b/static/animg/fuwu/huodong2x.png differ
diff --git a/static/animg/fuwu/jianyi-bg2x.png b/static/animg/fuwu/jianyi-bg2x.png
new file mode 100755
index 0000000..f618f6b
Binary files /dev/null and b/static/animg/fuwu/jianyi-bg2x.png differ
diff --git a/static/animg/fuwu/jianyi-jiantou2x.png b/static/animg/fuwu/jianyi-jiantou2x.png
new file mode 100755
index 0000000..7fa1853
Binary files /dev/null and b/static/animg/fuwu/jianyi-jiantou2x.png differ
diff --git a/static/animg/fuwu/jingqu2x.png b/static/animg/fuwu/jingqu2x.png
new file mode 100755
index 0000000..c6f97aa
Binary files /dev/null and b/static/animg/fuwu/jingqu2x.png differ
diff --git a/static/animg/fuwu/jiudian2x.png b/static/animg/fuwu/jiudian2x.png
new file mode 100755
index 0000000..5f3fa6c
Binary files /dev/null and b/static/animg/fuwu/jiudian2x.png differ
diff --git a/static/animg/fuwu/lefu2x.png b/static/animg/fuwu/lefu2x.png
new file mode 100755
index 0000000..6594ad1
Binary files /dev/null and b/static/animg/fuwu/lefu2x.png differ
diff --git a/static/animg/fuwu/meishi2x.png b/static/animg/fuwu/meishi2x.png
new file mode 100755
index 0000000..9da0240
Binary files /dev/null and b/static/animg/fuwu/meishi2x.png differ
diff --git a/static/animg/fuwu/tousu-bg2x.png b/static/animg/fuwu/tousu-bg2x.png
new file mode 100755
index 0000000..0de6aa1
Binary files /dev/null and b/static/animg/fuwu/tousu-bg2x.png differ
diff --git a/static/animg/fuwu/tousu-jiantou2x.png b/static/animg/fuwu/tousu-jiantou2x.png
new file mode 100755
index 0000000..9fd47e5
Binary files /dev/null and b/static/animg/fuwu/tousu-jiantou2x.png differ
diff --git a/static/animg/fuwu/wenchuang2x.png b/static/animg/fuwu/wenchuang2x.png
new file mode 100755
index 0000000..2c74134
Binary files /dev/null and b/static/animg/fuwu/wenchuang2x.png differ
diff --git a/static/animg/fuwu/wenhuaguan.png b/static/animg/fuwu/wenhuaguan.png
deleted file mode 100755
index ce93478..0000000
Binary files a/static/animg/fuwu/wenhuaguan.png and /dev/null differ
diff --git a/static/animg/fuwu/xiangcunyou.png b/static/animg/fuwu/xiangcunyou.png
deleted file mode 100755
index 3272851..0000000
Binary files a/static/animg/fuwu/xiangcunyou.png and /dev/null differ
diff --git a/static/animg/fuwu/xianlu2x.png b/static/animg/fuwu/xianlu2x.png
new file mode 100755
index 0000000..95e23c0
Binary files /dev/null and b/static/animg/fuwu/xianlu2x.png differ
diff --git a/static/animg/fuwu/yanxuejidi.png b/static/animg/fuwu/yanxuejidi.png
deleted file mode 100755
index 87567c9..0000000
Binary files a/static/animg/fuwu/yanxuejidi.png and /dev/null differ
diff --git a/static/animg/fuwu/zhibo.png b/static/animg/fuwu/zhibo.png
deleted file mode 100755
index 6922b52..0000000
Binary files a/static/animg/fuwu/zhibo.png and /dev/null differ
diff --git a/static/animg/personCenter/touxiang.png b/static/animg/personCenter/touxiang.png
index 657de75..6073682 100755
Binary files a/static/animg/personCenter/touxiang.png and b/static/animg/personCenter/touxiang.png differ
diff --git a/subPageB/cate/xiongan/xiongan-html.vue b/subPageB/cate/xiongan/xiongan-html.vue
deleted file mode 100644
index def9a0d..0000000
--- a/subPageB/cate/xiongan/xiongan-html.vue
+++ /dev/null
@@ -1,147 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- 关于雄安
-
-
-
- 雄安新区（Xiongan New
- Area）位于中国河北省保定市境内，2017年4月1日中共中央、国务院决定设立的国家级新区。地处北京、天津、保定腹地，规划范围涵盖河北省雄县、容城、安新等3个小县及周边部分区域，对雄县、容城、安新3县及周边区域实行托管，是中国（河北）自由贸易试验区组成部分。
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 一方城
- 两轴线
- 五组团
- 十景苑
- 千年林
- 万顷波
-
-
-
-
-
-
-
-
-
-
-
-
-
- 三季有花 四季有绿
-
-
- 近日，中国雄安集团发布了《雄安新区2020年植树造林项目信息预告》。截至去年年底，雄安新区在前期新造林11万亩基础上，继续高起点规划、高标准建设20万亩异龄、复层、混交的近自然“千年秀林”，雄安新区总造林面积扩展至31万亩，树种达200种，植树1400万棵。
- 根据省委、省政府工作部署，2020年，雄安新区“千年秀林”计划植树造林10万亩，主要包括环淀林带、河流生态廊道、道路生态廊道和部分林地斑块及生态湿地游憩林等规划林地。
- 据了解，在今年的植树造林计划中，环淀绿化带造林项目主要位于容城县平王乡和安新县大王镇、安州镇、刘李庄镇等周边林带。道路和河流生态廊道造林项目主要包括白洋淀大道两侧50米宽绿化和大广高速及唐河两侧规划林带等区域。林地斑块造林项目范围主要包括昝岗林地斑块、赵北口林地斑块、安新林地斑块、马家寨林地斑块、刘李庄林地斑块和老河头林地斑块；生态游憩林造林项目主要位于雄县龙湾镇和容城县容城镇等周边区域。
-
-
-
-
-
-
- 景点推荐
-
-
-
-
-
-
-
- 雄安集团发布了《雄安新区2020年植树造
-
-
-
- 雄安集团发布了《雄安新区2020年植树造
-
-
-
- 雄安集团发布了《雄安新区2020年植树造
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/subPageB/cate/xiongan/xiongan.vue b/subPageB/cate/xiongan/xiongan.vue
deleted file mode 100644
index 7ee17e9..0000000
--- a/subPageB/cate/xiongan/xiongan.vue
+++ /dev/null
@@ -1,337 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- {{msgDetail.title}}
-
-
-
-
-
-
-
-
-
-
-
- 收起
-
-
-
-
-
-
-
-
-
-
- {{item.title}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{mes.subtitle}}
-
-
-
-
-
-
-
-
-
- 景点推荐
-
-
-
-
-
-
-
- {{item.sname}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/components/refresh_3.1.vue b/subPageB/components/refresh_3.1.vue
similarity index 100%
rename from components/refresh_3.1.vue
rename to subPageB/components/refresh_3.1.vue
diff --git a/components/refresh_3.vue b/subPageB/components/refresh_3.vue
similarity index 100%
rename from components/refresh_3.vue
rename to subPageB/components/refresh_3.vue
diff --git a/components/uni-calendar/calendar.js b/subPageB/components/uni-calendar/calendar.js
similarity index 100%
rename from components/uni-calendar/calendar.js
rename to subPageB/components/uni-calendar/calendar.js
diff --git a/components/uni-calendar/uni-calendar-item.vue b/subPageB/components/uni-calendar/uni-calendar-item.vue
similarity index 100%
rename from components/uni-calendar/uni-calendar-item.vue
rename to subPageB/components/uni-calendar/uni-calendar-item.vue
diff --git a/components/uni-calendar/uni-calendar.vue b/subPageB/components/uni-calendar/uni-calendar.vue
similarity index 100%
rename from components/uni-calendar/uni-calendar.vue
rename to subPageB/components/uni-calendar/uni-calendar.vue
diff --git a/components/uni-calendar/util.js b/subPageB/components/uni-calendar/util.js
similarity index 100%
rename from components/uni-calendar/util.js
rename to subPageB/components/uni-calendar/util.js
diff --git a/subPageB/order/order.vue b/subPageB/order/order.vue
index 672e5ad..25c45dc 100644
--- a/subPageB/order/order.vue
+++ b/subPageB/order/order.vue
@@ -80,7 +80,7 @@