diff --git a/pages.json b/pages.json index c1f1c30..2caea8a 100644 --- a/pages.json +++ b/pages.json @@ -816,6 +816,21 @@ "navigationBarTitleText": "测试页面" } }] + }, + { + "root": "pages/billOfLading", + "pages": [{ + "path": "index", + "style": { + "navigationBarTitleText": "提单" + } + }, { + "path": "detail", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom" + } + }] } ], "globalStyle": { diff --git a/pages/billOfLading/detail.vue b/pages/billOfLading/detail.vue new file mode 100644 index 0000000..927d441 --- /dev/null +++ b/pages/billOfLading/detail.vue @@ -0,0 +1,426 @@ + + + diff --git a/pages/billOfLading/index.vue b/pages/billOfLading/index.vue new file mode 100644 index 0000000..c6fe547 --- /dev/null +++ b/pages/billOfLading/index.vue @@ -0,0 +1,459 @@ + + + + + \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index ea6a48c..940e046 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -4694,6 +4694,22 @@ + + { //init @@ -44,37 +44,37 @@ export default { } let ModuleGuid = '' let obj = Store.state.userData.AuthorityInfo - for (let key in obj){ + for (let key in obj) { // 经管 财务 - if (key==='f0889950-f98a-40de-a369-613efeed2579' || key==='c021bbca-3c0a-478d-81e7-87e81ef80e05' ){ - if (obj[key]===1){ - if (ModuleGuid===''){ + if (key === 'f0889950-f98a-40de-a369-613efeed2579' || key === 'c021bbca-3c0a-478d-81e7-87e81ef80e05') { + if (obj[key] === 1) { + if (ModuleGuid === '') { ModuleGuid = key - }else{ - ModuleGuid +=`,${key}` + } else { + ModuleGuid += `,${key}` } } } } - if (method == 'POST' && !isWebApi) { requstOptions.header = { 'content-type': 'application/x-www-form-urlencoded;charset=utf-8', - 'ServerpartCodes':Store.state.userData.UserCityAuthority, + 'ServerpartCodes': Store.state.userData.UserCityAuthority, 'ProvinceCode': Store.state.userData.ProvinceCode, - 'ModuleGuid':ModuleGuid, - 'WeChat_AppId' : 'wxa99ef047735c031e', - 'memberShipId' : !data.memberShipId ? (Store.state.userData.Membership_Id || '') :data.memberShipId, + 'ModuleGuid': ModuleGuid, + 'WeChat_AppId': 'wxa99ef047735c031e', + 'memberShipId': !data.memberShipId ? (Store.state.userData.Membership_Id || '') : data.memberShipId, 'SourcePlatform': 'minProgram' } - }else{ + } else { requstOptions.header = { - 'ServerpartCodes':Store.state.userData.UserCityAuthority, + 'ServerpartCodes': Store.state.userData.UserCityAuthority, 'ProvinceCode': Store.state.userData.ProvinceCode, - 'ModuleGuid':ModuleGuid, - 'WeChat_AppId' : 'wxa99ef047735c031e', - 'memberShipId' : !data.memberShipId ? (Store.state.userData.Membership_Id || '') :data.memberShipId, - 'SourcePlatform': 'minProgram' + 'ModuleGuid': ModuleGuid, + 'WeChat_AppId': 'wxa99ef047735c031e', + 'memberShipId': !data.memberShipId ? (Store.state.userData.Membership_Id || '') : data.memberShipId, + 'SourcePlatform': 'minProgram', + "UserID": Store.state.userData.UserIdEncrypted, } } requstOptions.success = (res) => { @@ -82,7 +82,7 @@ export default { //服务器返回数据 if (res && (res.statusCode === 200 || res.statusCode === 304 || res.statusCode === 400)) { if (res.data && ((res.data.ResultCode != '999' && res.data.ResultCode != undefined) || - (res.data.Result_Code != '999' && res.data.Result_Code != undefined))) { + (res.data.Result_Code != '999' && res.data.Result_Code != undefined))) { resolve(res.data); } else if (typeof res.data == 'object') { // 兼容招标投标模块 resolve(res.data); @@ -118,7 +118,7 @@ export default { } //网络请求 uni.request(requstOptions) - }).catch(function(reason, request) { + }).catch(function (reason, request) { uni.showToast({ title: reason, @@ -128,4 +128,4 @@ export default { return promise; } -} +} \ No newline at end of file