diff --git a/pages.json b/pages.json index 12b22ad..bcb9bb3 100644 --- a/pages.json +++ b/pages.json @@ -156,6 +156,20 @@ "navigationBarTitleText": "", "navigationStyle": "custom" } + }, + { + "path": "areaPlanMonth", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom" + } + }, + { + "path": "servicePlanMonth", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom" + } } ] }, @@ -173,6 +187,24 @@ } ] }, + { + "root": "pages/projectWarning", + "pages": [ + { + "path": "index", + "style": { + "navigationBarTitleText": "分润比例切换" + } + }, + { + "path": "detail", + "style": { + "navigationBarTitleText": "分润比例切换", + "navigationStyle": "custom" + } + } + ] + }, { "root": "pages/map", "pages": [ diff --git a/pages/commercialBI/areaPlanMonth.vue b/pages/commercialBI/areaPlanMonth.vue new file mode 100644 index 0000000..18c0710 --- /dev/null +++ b/pages/commercialBI/areaPlanMonth.vue @@ -0,0 +1,395 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pages/commercialBI/servicePlanMonth.vue b/pages/commercialBI/servicePlanMonth.vue new file mode 100644 index 0000000..21f397b --- /dev/null +++ b/pages/commercialBI/servicePlanMonth.vue @@ -0,0 +1,644 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pages/commercialBI/yearPlan.vue b/pages/commercialBI/yearPlan.vue index e9904f0..e15596e 100644 --- a/pages/commercialBI/yearPlan.vue +++ b/pages/commercialBI/yearPlan.vue @@ -2,6 +2,9 @@ + + + @@ -18,30 +21,57 @@ - + - - + + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -51,12 +81,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -66,13 +133,13 @@ + + + - - - @@ -82,11 +149,18 @@ + + + + + + + @@ -97,16 +171,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -244,7 +366,6 @@ - @@ -264,6 +385,7 @@ + @@ -313,6 +435,7 @@ + @@ -322,6 +445,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pages/projectWarning/components/listUnit.vue b/pages/projectWarning/components/listUnit.vue new file mode 100644 index 0000000..b654fc3 --- /dev/null +++ b/pages/projectWarning/components/listUnit.vue @@ -0,0 +1,128 @@ + + + + + + diff --git a/pages/projectWarning/detail.vue b/pages/projectWarning/detail.vue new file mode 100644 index 0000000..f816bfc --- /dev/null +++ b/pages/projectWarning/detail.vue @@ -0,0 +1,505 @@ + + + + diff --git a/pages/projectWarning/index.vue b/pages/projectWarning/index.vue new file mode 100644 index 0000000..4773072 --- /dev/null +++ b/pages/projectWarning/index.vue @@ -0,0 +1,384 @@ + + + + diff --git a/pages/userCenter/userCenter.vue b/pages/userCenter/userCenter.vue index 265fd27..5b98c84 100644 --- a/pages/userCenter/userCenter.vue +++ b/pages/userCenter/userCenter.vue @@ -217,6 +217,15 @@ import Tabbar from "../../components/tabbar/tabbar.vue"; isNotice:false, imagePath: '/static/images/user/dataVerification.svg', }, + { + id:'b0b63a75-56c9-4f1d-aacb-a26e62b47e3e', + name: '分润切换', + homeUrl: '/pages/projectWarning/index', + notice:0, + value: 3, + isNotice:false, + imagePath: 'https://eshangtech.com/ShopICO/ahyd-BID/index/changeMoney.svg', + }, ], }, { diff --git a/util/api.js b/util/api.js index 993d8e2..84b88d8 100644 --- a/util/api.js +++ b/util/api.js @@ -12,7 +12,7 @@ const publicOptions = (() => { // 获取本机的信息 })() export default { - /** + /** * 自定义post,get函数，返回Promise * @param {String} url 接口网址 * @param {arrayObject} data 要传的数组对象 例如: {name: '武当山道士', age: 32} @@ -42,10 +42,33 @@ export default { data: data, method: method, } + let ModuleGuid = '' + let obj = Store.state.userData.AuthorityInfo + for (let key in obj){ + // 经管 财务 + if (key==='f0889950-f98a-40de-a369-613efeed2579' || key==='c021bbca-3c0a-478d-81e7-87e81ef80e05' ){ + if (obj[key]===1){ + if (ModuleGuid===''){ + ModuleGuid = key + }else{ + ModuleGuid +=`,${key}` + } + } + } + } if (method == 'POST' && !isWebApi) { requstOptions.header = { - 'content-type': 'application/x-www-form-urlencoded;charset=utf-8' + 'content-type': 'application/x-www-form-urlencoded;charset=utf-8', + 'ServerpartCodes':Store.state.userData.UserCityAuthority, + 'ProvinceCode': Store.state.userData.ProvinceCode, + 'ModuleGuid':ModuleGuid + } + }else{ + requstOptions.header = { + 'ServerpartCodes':Store.state.userData.UserCityAuthority, + 'ProvinceCode': Store.state.userData.ProvinceCode, + 'ModuleGuid':ModuleGuid } } requstOptions.success = (res) => {