From 8a0aad853e2281cde8bec203989e7318ba7ba59f Mon Sep 17 00:00:00 2001 From: SelfRidicule Date: Wed, 13 Mar 2024 15:32:05 +0800 Subject: [PATCH] 1 --- miniprogram/pages/applyType/applyType.js | 63 +++++++++++-------- miniprogram/pages/applyType/applyType.wxml | 2 +- .../settledInApproval/settledInApproval.js | 2 +- miniprogram/pages/complaint/complaint.js | 8 ++- miniprogram/pages/complaint/complaint.json | 3 +- miniprogram/pages/my/my.js | 30 ++++----- 6 files changed, 57 insertions(+), 51 deletions(-) diff --git a/miniprogram/pages/applyType/applyType.js b/miniprogram/pages/applyType/applyType.js index 2cdf35a..2055e53 100644 --- a/miniprogram/pages/applyType/applyType.js +++ b/miniprogram/pages/applyType/applyType.js @@ -1,11 +1,12 @@ -// miniprogram/pages/applyType/applyType.js +const app = getApp() + Page({ /** * 页面的初始数据 */ data: { - + IMG_NAME: app.IMG_NAME, }, /** @@ -16,31 +17,39 @@ Page({ wx.setNavigationBarTitle({ title: options.name }) - switch (options.name) { - case "项目入孵": - this.setData({ - title: options.name, - url: '/pages/applyType/settledIn/settledIn', - image: '/images/apply01.png', - content: '请提前准备好项目入孵申请所需资料，需准备拟注册公司、项目简介、产品简介等相关信息，有商业计划书的需提供商业计划书。' - }) - break - case "企业入驻": - this.setData({ - title: options.name, - url: '/pages/applyType/settledInApproval/settledInApproval', - image: '/images/apply03.png', - content: '请提前准备好进场申请所需资料，需准备法人身份证、营业执照副本、企业简介，并将相关材料上传，有商业计划书的需提交商业计划书' - }) - break - case "厂房申请": - this.setData({ - title: options.name, - url: '/pages/applyType/moveInApply/moveInApply', - image: '/images/apply02.png', - content: '申请厂房请提供公司发展规划、近两年的企业财务状况、员工人数及结构；近两年获得各级政府的项目情况；目前拥有产品/技术情况；近两年知识产权情况及所获认证及荣誉情况等相关资料 （这些是备注在注册/厂房申请“申请理由”处）建议以“上传附件”形式' - }) - } + // switch (options.name) { + // case "项目入孵": + // this.setData({ + // title: options.name, + // url: '/pages/applyType/settledIn/settledIn', + // image: '/images/apply01.png', + // content: '请提前准备好项目入孵申请所需资料，需准备拟注册公司、项目简介、产品简介等相关信息，有商业计划书的需提供商业计划书。' + // }) + // break + // case "企业入驻": + // this.setData({ + // title: options.name, + // url: '/pages/applyType/settledInApproval/settledInApproval', + // image: '/images/apply03.png', + // content: '请提前准备好进场申请所需资料，需准备法人身份证、营业执照副本、企业简介，并将相关材料上传，有商业计划书的需提交商业计划书' + // }) + // break + // case "厂房申请": + // this.setData({ + // title: options.name, + // url: '/pages/applyType/moveInApply/moveInApply', + // image: '/images/apply02.png', + // content: '申请厂房请提供公司发展规划、近两年的企业财务状况、员工人数及结构；近两年获得各级政府的项目情况；目前拥有产品/技术情况；近两年知识产权情况及所获认证及荣誉情况等相关资料 （这些是备注在注册/厂房申请“申请理由”处）建议以“上传附件”形式' + // }) + // } + // + // 企业入驻 + this.setData({ + title: options.name, + url: '/pages/applyType/settledInApproval/settledInApproval', + image: '/profile/static/enterprise/apply03.png', + content: '请提前准备好进场申请所需资料，需准备法人身份证、营业执照副本、企业简介，并将相关材料上传，有商业计划书的需提交商业计划书' + }) wx.setNavigationBarTitle({ title: options.name, }) diff --git a/miniprogram/pages/applyType/applyType.wxml b/miniprogram/pages/applyType/applyType.wxml index 2713ca8..c5a7cd2 100644 --- a/miniprogram/pages/applyType/applyType.wxml +++ b/miniprogram/pages/applyType/applyType.wxml @@ -1,6 +1,6 @@ - + {{title}}注意事项 {{content}} diff --git a/miniprogram/pages/applyType/settledInApproval/settledInApproval.js b/miniprogram/pages/applyType/settledInApproval/settledInApproval.js index eb6e25a..d569e89 100644 --- a/miniprogram/pages/applyType/settledInApproval/settledInApproval.js +++ b/miniprogram/pages/applyType/settledInApproval/settledInApproval.js @@ -54,7 +54,7 @@ Page({ title: '上传中', }) wx.uploadFile({ - url: app.DOMAIN_NAME + '/dfs/upload?originalFilename=' + data[0].name, + url: app.DOMAIN_NAME + '/api/dfs/upload?originalFilename=' + data[0].name, header: { 'Authorization': 'Bearer ' + app.Getopenid() }, diff --git a/miniprogram/pages/complaint/complaint.js b/miniprogram/pages/complaint/complaint.js index 64e89ae..e462f26 100644 --- a/miniprogram/pages/complaint/complaint.js +++ b/miniprogram/pages/complaint/complaint.js @@ -6,9 +6,11 @@ Page({ onLoad(options) { // 页面初始化 options为页面跳转所带来的参数 - wx.setNavigationBarTitle({ - title: options.name - }) + if (options.name) { + wx.setNavigationBarTitle({ + title: options.name + }) + } }, onShow() { diff --git a/miniprogram/pages/complaint/complaint.json b/miniprogram/pages/complaint/complaint.json index 8835af0..f0e4328 100644 --- a/miniprogram/pages/complaint/complaint.json +++ b/miniprogram/pages/complaint/complaint.json @@ -1,3 +1,4 @@ { - "usingComponents": {} + "navigationBarTitleText": "投诉建议", + "usingComponents": {} } \ No newline at end of file diff --git a/miniprogram/pages/my/my.js b/miniprogram/pages/my/my.js index 8c7e05d..45fc149 100644 --- a/miniprogram/pages/my/my.js +++ b/miniprogram/pages/my/my.js @@ -49,21 +49,21 @@ Page({ url: "/pages/my/serviceApply/serviceApply" }, { - name: "园区建议", + name: "投诉建议", url: "/pages/complaint/complaint", }, - { - name: "账号设置", - url: "/pages/my/accountSetting/accountSetting", - }, + // { + // name: "账号设置", + // url: "/pages/my/accountSetting/accountSetting", + // }, { name: "我的服务", url: "/pages/enterpriseServices/myServiceList/myServiceList" }, - { - name: "我的报修", - url: "/pages/parkRepair/parkRepair", - } + // { + // name: "我的报修", + // url: "/pages/parkRepair/parkRepair", + // } ], }, @@ -107,15 +107,9 @@ Page({ navigateTo(e) { if (wx.getStorageSync('userId')) { - if (e.currentTarget.dataset.url == '/pages/parkRepair/parkRepair') { - wx.switchTab({ - url: e.currentTarget.dataset.url, - }) - } else { - wx.navigateTo({ - url: e.currentTarget.dataset.url, - }) - } + wx.navigateTo({ + url: e.currentTarget.dataset.url, + }) } else { app.getlogin() }