+
diff --git a/pages/summaryOfPortraits/components/mapDetail.vue b/pages/summaryOfPortraits/components/mapDetail.vue
index b0b80b4..99b3e55 100644
--- a/pages/summaryOfPortraits/components/mapDetail.vue
+++ b/pages/summaryOfPortraits/components/mapDetail.vue
@@ -91,7 +91,7 @@
{{ formatArea(info.floorArea) }}
占地面积
- m²
+ 亩
@@ -215,7 +215,7 @@
:class="{ 'available': info.synthesisCatering > 0, 'unavailable': !info.synthesisCatering }">
餐饮服务
({{ formatArea(info.synthesisCatering)
- }}m²)
+ }}m²)
@@ -228,13 +228,13 @@
:class="{ 'available': info.LPGStationsArea > 0, 'unavailable': !info.LPGStationsArea }">
加气站
({{ formatArea(info.LPGStationsArea)
- }}m²)
+ }}m²)
充电站
({{ formatArea(info.chargingStationArea)
- }}m²)
+ }}m²)
diff --git a/pages/summaryOfPortraits/index.vue b/pages/summaryOfPortraits/index.vue
index d1677fb..ab3981d 100644
--- a/pages/summaryOfPortraits/index.vue
+++ b/pages/summaryOfPortraits/index.vue
@@ -37,7 +37,7 @@
-->
-
+
@@ -124,12 +124,25 @@ export default {
this.isShowSwiper = true
let seat = uni.getStorageSync('currentService')
console.log('seat', seat)
- this.serviceInfo = seat
- if (this.selectPortrait) {
-
- } else {
- this.selectPortrait = this.query.index ? this.query.index : seat.SERVERPART_NAME === '安徽驿达' ? 1 : 0
+ console.log('this.serviceInfo', JSON.parse(JSON.stringify(this.serviceInfo)))
+ if (this.serviceInfo.SAName !== seat.SAName) {
+ this.serviceInfo = seat
+ this.isHandleOnShow = false
+ this.selectPortrait = -1
+ uni.showLoading()
+ this.$forceUpdate()
+ setTimeout(() => {
+ this.isHandleOnShow = true
+ this.selectPortrait = 0
+ uni.hideLoading()
+ }, 100)
}
+
+ // if (this.selectPortrait) {
+
+ // } else {
+ // this.selectPortrait = this.query.index ? this.query.index : seat.SERVERPART_NAME === '安徽驿达' ? 1 : 0
+ // }
},
onHide() {
this.isShowSwiper = false
@@ -158,15 +171,19 @@ export default {
let lastDay = uni.getStorageSync('lastDay')
let pageList = getCurrentPages()
console.log('pageList', pageList)
- if (pageList.length > 2) {
- uni.navigateBack({
- delta: 1
- })
- } else {
- uni.navigateTo({
- url: `/pages/map/index?time=${lastDay}&serviceInfo=${JSON.stringify(currentService)}`
- })
- }
+ uni.navigateTo({
+ url: `/pages/map/index?time=${lastDay}&serviceInfo=${JSON.stringify(currentService)}`
+ })
+
+ // if (pageList.length > 2) {
+ // uni.navigateBack({
+ // delta: 1
+ // })
+ // } else {
+ // uni.navigateTo({
+ // url: `/pages/map/index?time=${lastDay}&serviceInfo=${JSON.stringify(currentService)}`
+ // })
+ // }
}
}
}
diff --git a/pages/userCenter/userCenter.vue b/pages/userCenter/userCenter.vue
index 1b03bcc..6a3fd30 100644
--- a/pages/userCenter/userCenter.vue
+++ b/pages/userCenter/userCenter.vue
@@ -239,53 +239,53 @@ export default {
//拿到登录用户有权限的内容
this.menu = uni.getMenuButtonBoundingClientRect();
- // 拿到用户头像
- this.handleGetUserAvatar()
- this.dataList[2].list.forEach((item) => {
- for (let key in this.user.AuthorityInfo) {
- if (key === item.id) {
- if (this.user.AuthorityInfo[key] === 1) {
- item.isNotice = true;
- }
- }
- }
- if (item.id === "a927bf4d-f924-4034-b964-d1a8bd401d09") {
- item.isNotice = true;
- }
- });
+ // // 拿到用户头像
+ // this.dataList[2].list.forEach((item) => {
+ // for (let key in this.user.AuthorityInfo) {
+ // if (key === item.id) {
+ // if (this.user.AuthorityInfo[key] === 1) {
+ // item.isNotice = true;
+ // }
+ // }
+ // }
+ // if (item.id === "a927bf4d-f924-4034-b964-d1a8bd401d09") {
+ // item.isNotice = true;
+ // }
+ // });
//拿到登录用户有权限的内容 判断是否有角标
- this.dataList[3].list.forEach((item) => {
- for (let key in this.user.AuthorityInfo) {
- if (key === item.id) {
- if (this.user.AuthorityInfo[key] === 1) {
- item.isNotice = true;
- }
- }
- }
- });
- //拿到登录用户有权限的内容 判断是否有角标
- this.dataList[2].list.forEach((item) => {
- for (let key in this.toDoMsg) {
- if (key === item.id) {
- item.notice = this.toDoMsg[key];
- }
- }
- });
- this.dataList[3].list.forEach((item) => {
- for (let key in this.toDoMsg) {
- if (key === item.id) {
- item.notice = this.toDoMsg[key];
- }
- }
- });
+ // this.dataList[3].list.forEach((item) => {
+ // for (let key in this.user.AuthorityInfo) {
+ // if (key === item.id) {
+ // if (this.user.AuthorityInfo[key] === 1) {
+ // item.isNotice = true;
+ // }
+ // }
+ // }
+ // });
+ // //拿到登录用户有权限的内容 判断是否有角标
+ // this.dataList[2].list.forEach((item) => {
+ // for (let key in this.toDoMsg) {
+ // if (key === item.id) {
+ // item.notice = this.toDoMsg[key];
+ // }
+ // }
+ // });
+ // this.dataList[3].list.forEach((item) => {
+ // for (let key in this.toDoMsg) {
+ // if (key === item.id) {
+ // item.notice = this.toDoMsg[key];
+ // }
+ // }
+ // });
//通过权限来判断是否可以点击跳转
- let userInfo = uni.getStorageSync("vuex");
+ let userInfo = this.user
+ console.log('userInfouserInfouserInfo', userInfo);
if (userInfo && userInfo.WeChat_UserId && userInfo.AuthorityInfo["89a1f248-2113-4d57-84b1-c2e6edb9e8ee"] === 1) {
this.isReturn = false;
} else if (userInfo && userInfo.WeChat_UserId && userInfo.AuthorityInfo["89a1f248-2113-4d57-84b1-c2e6edb9e8ee"] !== 1) {
uni.redirectTo({
- url: `/pages/commercialBI/noData?type=homeIndex`,
+ url: `/pages/commercialBI/noData?type=noAuthor`,
});
}
diff --git a/util/apiPath.js b/util/apiPath.js
index 11fdd27..431cbb1 100644
--- a/util/apiPath.js
+++ b/util/apiPath.js
@@ -11,6 +11,7 @@ export default {
// apiurl: 'https://erysfeipeng.oicp.net/', // web api
testApiurl: 'http://dev.eshangtech.com:8001/', // web api测试接口地址
apiEsUrl: "https://api.eshangtech.com/",
+ samemberUrl: "https://samember.yciccloud.com:8999/",
mobUrl: 'http://192.168.11.125:8000/Coop.Merchant/Handler/handler_ajax.ashx', // 接口
testURL1: 'http://192.168.10.123:8000', // 测试ip
diff --git a/util/index.js b/util/index.js
index 364b2c4..77fb5f7 100644
--- a/util/index.js
+++ b/util/index.js
@@ -37,6 +37,9 @@ export default {
$apiPost: function (controller, data) {
return Api.request('POST', ApiPath.apiEsUrl + controller, data || {}, true)
},
+ $SamemberApiPost: function (controller, data) {
+ return Api.request('POST', ApiPath.samemberUrl + controller, data || {}, true)
+ },
$posGet: function (controller, data) {
return Api.request('GET', ApiPath.posApiurl + controller, data || {}, true)
},