From 1a8af2f26be01eef1007e098740d8d25802b7825 Mon Sep 17 00:00:00 2001 From: THK3121 Date: Wed, 27 Sep 2023 19:06:47 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E8=B5=84=E8=B4=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/bussness.js | 10 + api/index.js | 28 + components/business/talk.vue | 692 ++++++++++++++++ config/app.js | 7 +- pages.json | 1388 ++++++++++++++++---------------- pages/business/business.vue | 207 ++++- pages/business/talkDetail.vue | 701 ++++++++++++++++ pages/business/talkDetil1.nvue | 224 ++++++ static/img/bussness/Plus.png | Bin 0 -> 2915 bytes static/img/bussness/SP.png | Bin 0 -> 5848 bytes static/img/bussness/XC.png | Bin 0 -> 5791 bytes utils/aa.js | 118 +++ 12 files changed, 2658 insertions(+), 717 deletions(-) create mode 100644 api/bussness.js create mode 100644 api/index.js create mode 100644 components/business/talk.vue create mode 100644 pages/business/talkDetail.vue create mode 100644 pages/business/talkDetil1.nvue create mode 100644 static/img/bussness/Plus.png create mode 100644 static/img/bussness/SP.png create mode 100644 static/img/bussness/XC.png create mode 100644 utils/aa.js diff --git a/api/bussness.js b/api/bussness.js new file mode 100644 index 0000000..7b3ee17 --- /dev/null +++ b/api/bussness.js @@ -0,0 +1,10 @@ +import oahttp from "@/utils/aa.js"; + +/** + * 绑定scoket + */ +export const bindScoket = (data) => oahttp.post('/im/doBindUid', data) +// 发送消息 +export const sendMsgApi = (data) => oahttp.post('/im/sendMessage', data) +// 发送文件 +// export const sendFileApi = (data) => oahttp.post('/im/doBindUid', data) \ No newline at end of file diff --git a/api/index.js b/api/index.js new file mode 100644 index 0000000..6c38943 --- /dev/null +++ b/api/index.js @@ -0,0 +1,28 @@ +// let Token = localStorage.getItem("token") +let Token = uni.getStorageSync("token") +let request = (METHOD, URL, DATA) => { + return new Promise((reslove, reject) => { + uni.request({ + url: 'https://ceshi-im.lihaink.cn/' + URL, + method: METHOD, + data: { + ...DATA + }, + header: { + 'content-type': 'application/json', + "Authorization": Token || "" + + }, + success: function(res) { + reslove(res) + }, + fail: function(err) { + reject(err) + }, + + }); + }) +} + + +export default request; \ No newline at end of file diff --git a/components/business/talk.vue b/components/business/talk.vue new file mode 100644 index 0000000..5b54724 --- /dev/null +++ b/components/business/talk.vue @@ -0,0 +1,692 @@ + + + + + \ No newline at end of file diff --git a/config/app.js b/config/app.js index 164dda3..7094130 100644 --- a/config/app.js +++ b/config/app.js @@ -1,10 +1,11 @@ let httpApiThree; let httpApi; // 总域名 let httpApiTwo; // 物流系统域名 +let httpApiTest -// const env = 'dev'; // 开发 +const env = 'dev'; // 开发 // const env = 'prod'; // 生产 -const env = 'prew'; // 预上线 +// const env = 'prew'; // 预上线 switch (env) { case 'prod': @@ -21,6 +22,7 @@ switch (env) { httpApi = 'https://ceshi-worker-task.lihaink.cn' //测试 httpApiThree = 'https://ceshi-worker-task.lihaink.cn' //测试 httpApiTwo = 'https://ceshi-logistics.lihaink.cn' //测试环境 + httpApiTest = 'http://192.168.1.12:8081' //测试环境 } @@ -48,6 +50,7 @@ module.exports = { HTTP_REQUEST_URL: httpApi, HTTP_REQUEST_URL_THREE: httpApiThree, HTTP_REQUEST_URL_TWO: httpApiTwo, + httpApiTest: httpApiTest, // #ifdef H5 //H5接口是浏览器地址 diff --git a/pages.json b/pages.json index 1087349..471397c 100644 --- a/pages.json +++ b/pages.json @@ -1,751 +1,761 @@ { - "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages - { - "path": "pages/oaHome/oaHome", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": true, - "app-plus": { - "titleNView": false - }, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } - }, - { - "path": "pages/oaLogin/oaLogin", - "style": { - "navigationBarTitleText": "登录", - "app-plus": { - "titleNView": false, - "bounce": "none" - }, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages + { + "path": "pages/oaHome/oaHome", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": true, + "app-plus": { + "titleNView": false + }, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/oaLogin/oaLogin", + "style": { + "navigationBarTitleText": "登录", + "app-plus": { + "titleNView": false, + "bounce": "none" + }, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, - { - "path": "pages/business/business", - "style": { - "navigationBarTitleText": "商机信息", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, + { + "path": "pages/business/business", + "style": { + "navigationBarTitleText": "商机信息", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, - { - "path": "pages/index/index", - "style": { - "navigationBarTitleText": "uni-app", - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } - }, - { - "path": "pages/oaExamine/oaExamine", - "style": { - "navigationBarTitleText": "审批", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } - }, - { - "path": "pages/oaTask/oaTask", - "style": { - "navigationBarTitleText": "今日任务", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } - }, - { - "path": "pages/oaMy/oaMy", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": true, - "app-plus": { - "titleNView": false - }, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } - }, { - "path": "pages/oaManager/oaManager", - "style": { - "navigationBarTitleText": "片区经理", - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, + { + "path": "pages/business/talkDetail", + "style": { + "navigationBarTitleText": "商机信息", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "pages/oaNews/oaNews", - "style": { - "navigationBarTitleText": "公告详情", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, + { + "path": "pages/index/index", + "style": { + "navigationBarTitleText": "uni-app", + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/oaExamine/oaExamine", + "style": { + "navigationBarTitleText": "审批", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/oaTask/oaTask", + "style": { + "navigationBarTitleText": "今日任务", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/oaMy/oaMy", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": true, + "app-plus": { + "titleNView": false + }, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + }, { + "path": "pages/oaManager/oaManager", + "style": { + "navigationBarTitleText": "片区经理", + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "pages/logistics/index", - "style": { - "navigationBarTitleText": "订单列表", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "pages/oaNews/oaNews", + "style": { + "navigationBarTitleText": "公告详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "pages/logistics/te", - "style": { - "navigationBarTitleText": "测试", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "pages/logistics/index", + "style": { + "navigationBarTitleText": "订单列表", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "pages/logistics/logisticDetil", - "style": { - "navigationBarTitleText": "订单详情", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "pages/logistics/te", + "style": { + "navigationBarTitleText": "测试", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "pages/logistics/deliveryDetil", - "style": { - "navigationBarTitleText": "配送信息", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "pages/logistics/logisticDetil", + "style": { + "navigationBarTitleText": "订单详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "pages/logistics/post", - "style": { - "navigationBarTitleText": "驿站", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "pages/logistics/deliveryDetil", + "style": { + "navigationBarTitleText": "配送信息", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "pages/updatePassword/updatePassword", - "style": { - "navigationBarTitleText": "修改密码", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "pages/logistics/post", + "style": { + "navigationBarTitleText": "驿站", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "uni_modules/guyue-updater/pages/updater", - "style": { - "app-plus": { - "animationDuration": 200, - "animationType": "fade-in", - "background": "transparent", - "backgroundColorTop": "transparent", - "bounce": "none", - "popGesture": "none", - "scrollIndicator": false, - "titleNView": false - }, - "backgroundColor": "transparent", - "disableScroll": true, - "navigationStyle": "custom" - } - }, { - "path": "pages/moreFun/moreFun", - "style": { - "navigationBarTitleText": "更多功能", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "pages/updatePassword/updatePassword", + "style": { + "navigationBarTitleText": "修改密码", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "pages/otherSetting/otherSetting", - "style": { - "navigationBarTitleText": "其他设置", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } - }, { - "path": "pages/webView/webView", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "uni_modules/guyue-updater/pages/updater", + "style": { + "app-plus": { + "animationDuration": 200, + "animationType": "fade-in", + "background": "transparent", + "backgroundColorTop": "transparent", + "bounce": "none", + "popGesture": "none", + "scrollIndicator": false, + "titleNView": false + }, + "backgroundColor": "transparent", + "disableScroll": true, + "navigationStyle": "custom" + } + }, { + "path": "pages/moreFun/moreFun", + "style": { + "navigationBarTitleText": "更多功能", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - } - ], - "subPackages": [{ - "root": "pages/views", - "name": "views", - "pages": [{ - "path": "application", - "style": { - "navigationBarTitleText": "地图首页", - "enablePullDownRefresh": false - } - }, - { - "path": "new_task", - "style": { - "navigationBarTitleText": "新建任务", - "enablePullDownRefresh": false - } - }, - { - "path": "com_approve", - "style": { - "navigationBarTitleText": "通用审批", - "enablePullDownRefresh": false - } - }, { - "path": "personal_center", - "style": { - "navigationBarTitleText": "个人中心1", - "enablePullDownRefresh": false - } + }, { + "path": "pages/otherSetting/otherSetting", + "style": { + "navigationBarTitleText": "其他设置", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + }, { + "path": "pages/webView/webView", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "task_details", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } + } + ], + "subPackages": [{ + "root": "pages/views", + "name": "views", + "pages": [{ + "path": "application", + "style": { + "navigationBarTitleText": "地图首页", + "enablePullDownRefresh": false + } + }, + { + "path": "new_task", + "style": { + "navigationBarTitleText": "新建任务", + "enablePullDownRefresh": false + } + }, + { + "path": "com_approve", + "style": { + "navigationBarTitleText": "通用审批", + "enablePullDownRefresh": false + } + }, { + "path": "personal_center", + "style": { + "navigationBarTitleText": "个人中心1", + "enablePullDownRefresh": false + } - }, { - "path": "personal_center_two", - "style": { - "navigationBarTitleText": "个人中心2", - "enablePullDownRefresh": false - } + }, { + "path": "task_details", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } - }, { - "path": "public_document", - "style": { - "navigationBarTitleText": "公司公示文档", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "personal_center_two", + "style": { + "navigationBarTitleText": "个人中心2", + "enablePullDownRefresh": false + } - }, { - "path": "leave_request", - "style": { - "navigationBarTitleText": "请假申请", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "public_document", + "style": { + "navigationBarTitleText": "公司公示文档", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - } - ] - }, { - "root": "subpkg", - "name": "subpkg", - "pages": [{ - "path": "personnel/personnel", - "style": { - "navigationBarTitleText": "人员管理", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "leave_request", + "style": { + "navigationBarTitleText": "请假申请", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "finance/finance", - "style": { - "navigationBarTitleText": "财务管理", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + } + ] + }, { + "root": "subpkg", + "name": "subpkg", + "pages": [{ + "path": "personnel/personnel", + "style": { + "navigationBarTitleText": "人员管理", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "topUp/topUp", - "style": { - "navigationBarTitleText": "账户充值", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white", - "app-plus": { - "titleNView": { - "buttons": [{ - "color": "#fff", - "text": "充值记录", - "fontSize": "15", - "width": "90" - }] - } - } - } + }, { + "path": "finance/finance", + "style": { + "navigationBarTitleText": "财务管理", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "contract/contract", - "style": { - "navigationBarTitleText": "合同管理", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0022C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "topUp/topUp", + "style": { + "navigationBarTitleText": "账户充值", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white", + "app-plus": { + "titleNView": { + "buttons": [{ + "color": "#fff", + "text": "充值记录", + "fontSize": "15", + "width": "90" + }] + } + } + } - }, { - "path": "contractDetail/contractDetail", - "style": { - "navigationBarTitleText": "合同详情", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "contract/contract", + "style": { + "navigationBarTitleText": "合同管理", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0022C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "pdfView/pdfView", - "style": { - "navigationBarTitleText": "合同内容", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "contractDetail/contractDetail", + "style": { + "navigationBarTitleText": "合同详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "companyInfo/companyInfo", - "style": { - "navigationBarTitleText": "公司信息", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "pdfView/pdfView", + "style": { + "navigationBarTitleText": "合同内容", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "companySign/companySign", - "style": { - "navigationBarTitleText": "签约公司详情", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "companyInfo/companyInfo", + "style": { + "navigationBarTitleText": "公司信息", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "personnelDetails/personnelDetails", - "style": { - "navigationBarTitleText": "人员详细信息", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "companySign/companySign", + "style": { + "navigationBarTitleText": "签约公司详情", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "orderDetail/orderDetail", - "style": { - "navigationBarTitleText": "流水详情", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "personnelDetails/personnelDetails", + "style": { + "navigationBarTitleText": "人员详细信息", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "withdrawDeposit/withdrawDeposit", - "style": { - "navigationBarTitleText": "提现余额", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white", - "app-plus": { - "titleNView": { - "buttons": [{ - "color": "#fff", - "text": "提现记录", - "fontSize": "15", - "width": "90" - }] - } - } - } - }, { - "path": "withdrawDeposit/company", - "style": { - "navigationBarTitleText": "提现", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white", - "app-plus": { - "titleNView": { - "buttons": [{ - "color": "#fff", - "text": "提现记录", - "fontSize": "15", - "width": "90" - }] - } - } - } - }, { - "path": "withdrawList/withdrawList", - "style": { - "navigationBarTitleText": "提现记录", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "orderDetail/orderDetail", + "style": { + "navigationBarTitleText": "流水详情", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "noticeList/noticeList", - "style": { - "navigationBarTitleText": "公告列表", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "withdrawDeposit/withdrawDeposit", + "style": { + "navigationBarTitleText": "提现余额", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white", + "app-plus": { + "titleNView": { + "buttons": [{ + "color": "#fff", + "text": "提现记录", + "fontSize": "15", + "width": "90" + }] + } + } + } + }, { + "path": "withdrawDeposit/company", + "style": { + "navigationBarTitleText": "提现", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white", + "app-plus": { + "titleNView": { + "buttons": [{ + "color": "#fff", + "text": "提现记录", + "fontSize": "15", + "width": "90" + }] + } + } + } + }, { + "path": "withdrawList/withdrawList", + "style": { + "navigationBarTitleText": "提现记录", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "topUpList/topUpList", - "style": { - "navigationBarTitleText": "充值记录", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "noticeList/noticeList", + "style": { + "navigationBarTitleText": "公告列表", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "companyAdmin/companyAdmin", - "style": { - "navigationBarTitleText": "公司管理", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "topUpList/topUpList", + "style": { + "navigationBarTitleText": "充值记录", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "newPersonnel/newPersonnel", - "style": { - "navigationBarTitleText": "新增人员", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "companyAdmin/companyAdmin", + "style": { + "navigationBarTitleText": "公司管理", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "archives/archives", - "style": { - "navigationBarTitleText": "档案管理", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "newPersonnel/newPersonnel", + "style": { + "navigationBarTitleText": "新增人员", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "newArchives/newArchives", - "style": { - "navigationBarTitleText": "信息登记", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "archives/archives", + "style": { + "navigationBarTitleText": "档案管理", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "updateArchives/updateArchives", - "style": { - "navigationBarTitleText": "信息更新", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "newArchives/newArchives", + "style": { + "navigationBarTitleText": "信息登记", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "fixedAssets/fixedAssets", - "style": { - "navigationBarTitleText": "固定资产", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "updateArchives/updateArchives", + "style": { + "navigationBarTitleText": "信息更新", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "taskAdmin/taskAdmin", - "style": { - "navigationBarTitleText": "任务管理", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "fixedAssets/fixedAssets", + "style": { + "navigationBarTitleText": "固定资产", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "archivesDetail/archivesDetail", - "style": { - "navigationBarTitleText": "档案详情", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "taskAdmin/taskAdmin", + "style": { + "navigationBarTitleText": "任务管理", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "captain/captain", - "style": { - "navigationBarTitleText": "队长列表", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "archivesDetail/archivesDetail", + "style": { + "navigationBarTitleText": "档案详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "companyFinance/companyFinance", - "style": { - "navigationBarTitleText": "公司财务", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "captain/captain", + "style": { + "navigationBarTitleText": "队长列表", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "companyUnsign/companyUnsign", - "style": { - "navigationBarTitleText": "未签约公司列表", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "companyFinance/companyFinance", + "style": { + "navigationBarTitleText": "公司财务", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "submit/submit", - "style": { - "navigationBarTitleText": "提交审核", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "companyUnsign/companyUnsign", + "style": { + "navigationBarTitleText": "未签约公司列表", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "dispatching/dispatching", - "style": { - "navigationBarTitleText": "任务:宣传配送", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "submit/submit", + "style": { + "navigationBarTitleText": "提交审核", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "blockTransaction/blockTransaction", - "style": { - "navigationBarTitleText": "任务:片区交易", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "dispatching/dispatching", + "style": { + "navigationBarTitleText": "任务:宣传配送", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "fileTask/fileTask", - "style": { - "navigationBarTitleText": "已更新商机", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "blockTransaction/blockTransaction", + "style": { + "navigationBarTitleText": "任务:片区交易", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "property/index", - "style": { - "navigationBarTitleText": "资产管理", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "fileTask/fileTask", + "style": { + "navigationBarTitleText": "已更新商机", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "property/chosseCompany", - "style": { - "navigationBarTitleText": "选择公司", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "property/index", + "style": { + "navigationBarTitleText": "资产管理", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "property/vehicle", - "style": { - "navigationBarTitleText": "三轮车游走", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "property/chosseCompany", + "style": { + "navigationBarTitleText": "选择公司", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "property/vehicle_a", - "style": { - "navigationBarTitleText": "三轮车详情", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "property/vehicle", + "style": { + "navigationBarTitleText": "三轮车游走", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "property/success", - "style": { - "navigationBarTitleText": "生成合同", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "property/vehicle_a", + "style": { + "navigationBarTitleText": "三轮车详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "property/contractList", - "style": { - "navigationBarTitleText": "合同列表", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "property/success", + "style": { + "navigationBarTitleText": "生成合同", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "buyShare/buyShare", - "style": { - "navigationBarTitleText": "任务:入股任务", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "property/contractList", + "style": { + "navigationBarTitleText": "合同列表", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "otherTask/otherTask", - "style": { - "navigationBarTitleText": "任务:其他任务", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "buyShare/buyShare", + "style": { + "navigationBarTitleText": "任务:入股任务", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "property/agencyList", - "style": { - "navigationBarTitleText": "签约列表", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "otherTask/otherTask", + "style": { + "navigationBarTitleText": "任务:其他任务", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "shareCapital/shareCapital", - "style": { - "navigationBarTitleText": "股金管理", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "property/agencyList", + "style": { + "navigationBarTitleText": "签约列表", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "merchantAudit/merchantAudit", - "style": { - "navigationBarTitleText": "商户入驻审核", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "shareCapital/shareCapital", + "style": { + "navigationBarTitleText": "股金管理", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "merchantTransaction/merchantTransaction", - "style": { - "navigationBarTitleText": "商户交易审核", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "merchantAudit/merchantAudit", + "style": { + "navigationBarTitleText": "商户入驻审核", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "merchantDetails/merchantDetails", - "style": { - "navigationBarTitleText": "商户详情", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "merchantTransaction/merchantTransaction", + "style": { + "navigationBarTitleText": "商户交易审核", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "serviceTask/serviceTask4", - "style": { - "navigationBarTitleText": "督促团队学习", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } - }, { - "path": "serviceTask/serviceTask", - "style": { - "navigationBarTitleText": "任务", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "merchantDetails/merchantDetails", + "style": { + "navigationBarTitleText": "商户详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "complaint/complaint", - "style": { - "navigationBarTitleText": "投诉反馈", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "serviceTask/serviceTask4", + "style": { + "navigationBarTitleText": "督促团队学习", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + }, { + "path": "serviceTask/serviceTask", + "style": { + "navigationBarTitleText": "任务", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }] - }], - "globalStyle": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "uni-app", - "navigationBarBackgroundColor": "#F8F8F8", - "backgroundColor": "#F8F8F8" - }, - "tabBar": { - "color": "#282828", - "selectedColor": "#0122C7", - "borderStyle": "white", - "backgroundColor": "#ffffff", - "list": [{ - "pagePath": "pages/oaHome/oaHome", - "text": "首页", - "iconPath": "static/tabs-icon/home.png", - "selectedIconPath": "static/tabs-icon/home-a.png" - }, - { - "pagePath": "pages/oaExamine/oaExamine", - "text": "审批", - "iconPath": "static/tabs-icon/Task.png", - "selectedIconPath": "static/tabs-icon/Task-a.png" - }, - { - "pagePath": "pages/oaTask/oaTask", - "text": "任务", - "iconPath": "static/tabs-icon/approval.png", - "selectedIconPath": "static/tabs-icon/approval-a.png" - }, - // { - // "pagePath": "pages/oaManager/oaManager", - // "text": "片区经理", - // "iconPath": "static/tabs-icon/manager.png", - // "selectedIconPath": "static/tabs-icon/manager-a.png" - // }, - { - "pagePath": "pages/business/business", - "text": "商机", - "iconPath": "static/tabs-icon/manager.png", - "selectedIconPath": "static/tabs-icon/manager-a.png" - }, - { - "pagePath": "pages/oaMy/oaMy", - "text": "我的", - "iconPath": "static/tabs-icon/my.png", - "selectedIconPath": "static/tabs-icon/my-a.png" - } - ] - }, - "uniIdRouter": {} + }, { + "path": "complaint/complaint", + "style": { + "navigationBarTitleText": "投诉反馈", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + + }] + }], + "globalStyle": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "uni-app", + "navigationBarBackgroundColor": "#F8F8F8", + "backgroundColor": "#F8F8F8" + }, + "tabBar": { + "color": "#282828", + "selectedColor": "#0122C7", + "borderStyle": "white", + "backgroundColor": "#ffffff", + "list": [{ + "pagePath": "pages/oaHome/oaHome", + "text": "首页", + "iconPath": "static/tabs-icon/home.png", + "selectedIconPath": "static/tabs-icon/home-a.png" + }, + { + "pagePath": "pages/oaExamine/oaExamine", + "text": "审批", + "iconPath": "static/tabs-icon/Task.png", + "selectedIconPath": "static/tabs-icon/Task-a.png" + }, + { + "pagePath": "pages/oaTask/oaTask", + "text": "任务", + "iconPath": "static/tabs-icon/approval.png", + "selectedIconPath": "static/tabs-icon/approval-a.png" + }, + // { + // "pagePath": "pages/oaManager/oaManager", + // "text": "片区经理", + // "iconPath": "static/tabs-icon/manager.png", + // "selectedIconPath": "static/tabs-icon/manager-a.png" + // }, + { + "pagePath": "pages/business/business", + "text": "商机", + "iconPath": "static/tabs-icon/manager.png", + "selectedIconPath": "static/tabs-icon/manager-a.png" + }, + { + "pagePath": "pages/oaMy/oaMy", + "text": "我的", + "iconPath": "static/tabs-icon/my.png", + "selectedIconPath": "static/tabs-icon/my-a.png" + } + ] + }, + "uniIdRouter": {} } \ No newline at end of file diff --git a/pages/business/business.vue b/pages/business/business.vue index f943cfa..15a1b68 100644 --- a/pages/business/business.vue +++ b/pages/business/business.vue @@ -1,34 +1,189 @@ - \ No newline at end of file diff --git a/pages/business/talkDetail.vue b/pages/business/talkDetail.vue new file mode 100644 index 0000000..f41c76a --- /dev/null +++ b/pages/business/talkDetail.vue @@ -0,0 +1,701 @@ + + + + + \ No newline at end of file diff --git a/pages/business/talkDetil1.nvue b/pages/business/talkDetil1.nvue new file mode 100644 index 0000000..eb396f1 --- /dev/null +++ b/pages/business/talkDetil1.nvue @@ -0,0 +1,224 @@ + + + + + \ No newline at end of file diff --git a/static/img/bussness/Plus.png b/static/img/bussness/Plus.png new file mode 100644 index 0000000000000000000000000000000000000000..a90ff8650345f2643b159bec8b93fb94a8bb0567 GIT binary patch literal 2915 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 N002ovPDHLkV1gTMfNB5$ literal 0 HcmV?d00001 diff --git a/static/img/bussness/SP.png b/static/img/bussness/SP.png new file mode 100644 index 0000000000000000000000000000000000000000..a786f632b32c4ffb5d16eebfcb61a9da623511c0 GIT binary patch literal 5848 zcmeHL`9D-||DG8mW6KO#5*btoNm<6uSO(d*WY>aZ8x^C%*fREHjj<$K_6pfzlBJI| z>)1jjgUG&Qo#*uV{`mb9p67>i?(;hLb>HW`-LLC?t|${D3@Z~a69@!i)zj571IG2g z7wi;pSG8Pv2@K$eW*9W6qK|J01mb$Br=?+mbNHS0G?rVtw$r$m1vaFDlwd>DEr#Y5 zixPA+xHrJ*#TzxDyoe|mPIfWH&`O?pGcrRw56|}PPaT;XJ?Bmm{R0)sLkyQjg+?=_ z{SfS0-dh$x(V1rsT}yH%I<}NFltj*aWN)n)Rwz0!KR&kfA9?Gp!5f|YK5ijEvmjYB z9R7(=+?f2HfhHO5BO8uqhPx#~^OFOFCN6{*U&?bAn?EJkrr(K8Wft6h>yWJbE7wGH zyR5YIP#h75%xi(0X683LF+eWr;@caEgw)iO6v?u(vb!OjSKiS}6s-IVm{yB&6GGI) z^CM0nK@da6m5X@_W?io=EiET0vr!UGVg;G~3p5=qT14j@ieSnO%|pB}qY@UK$&X!` z1pfp_rs_hbKYBaPOiWCWBj6(8PqgUaAn-+qSy!d_<;z#@PuBiUaE?dQ6Z;pWUYMQS zfDK&fIeWqnRaa*Ni_J^T&(Ejbw6dyT+2j#*>fgGgD<&Y4=d02i$_)pF@Ic)Oi!S8H zj-oE+7NqP2!(_9*I0TEO1_)|~M24sTMD;aM?c~L0(XX%8RaAJLMbzlOR`FqkAmIt> zp0{p|S5eOw(U8FOHwr0)E{9Q2u`?!Q0&w&`;Dwizl$3z=ty}ePv9X#^iGs3CWp8>! zR;rceEH_jgDILy2Oosv}$^1z`F%;Jbar@_FI#v0fuyW*is7&}ilCbKt9mu%nO54Z+^Uy_!_|lBu+CO?3HVKK7hk^m0*%8*i8di0& zK1++-9;^mXgbvavMm>&#s`xtZ`z8Xu5?BrPIgO%(NXj!63V^^^B^o3tKcz zE%}KDr-Z^lunQN~Ta+PE9B3B9MUV?%S1L?bEbRlH%p`bV<4)Ha`WG_mYDD#|x7W=v z(1p7oof7fMzVa<}H)1^1-GKbkL*P{q<@8XzC-Ct5y!tb^2@(VrCxwZ@#x8-tldIr1 zhW~;7J3=s2c(}J#)SD?kRAJvJn$|tw-Ev$w6&@YUO=MVUq_-K0oW4=6Eo)Xv^ zq5u?(!f2Gx@99sO%}1Lz4yc*l#SIOLi3unjiMb>r#V8}C-!i`T^6_H7Y=D}w#h<@; z*U*sl(^j9-_EJ&K%j9d(QKO1z81GdlP*(8CzJ;Y_!H7I@Nf-oPzVo(sh)wNCz4Fs8 z@9*&sn9TnCc$*q`?KC^zC^exscN0KR;ycwJrh8x5)OxH-zjCj0-n2`s_e*&ahMZ;j z4i>*zk^gZfNJ&#tv0AK%=*wguxHIy~(@{*01=6Qm8NB!1e|s)Q$|Ya6Jrg^i%{`#7 zKup^AOVy_noMqXTF}7AYSbXyew-6UfNwxKQz52Zo^EO&hj02B1KgHL6JXmmJ=}m%a zv{{Pcqs7@ua;^7FHZD}JW_V--A!X_Ly&)y&WPd?-)w)UI_L)N{(y2SJ%74w_$>Qrs zLXu1;f?`+>mP~rOH)<1U-@n#GF+urU!hoJUlo%_=q(1yT#OBORP^Sp|q z#K|97^yT{Y%98)o4~hE0)Ja@*-jlU)4#CHdgI!Hc&dRvK?Vl_aaM}EMs(U`dwKs#4 zH%Elrr?@QfKuzW~t8%QkI*C^)&Glu#W~4tWClmdqastk*7(4#%PGk$`RsC02okLsh z-u)n9U4_T_DeC{2zc`&eR=2LyL_t~Hy0uivpX1ZY7+lQJF8@o$7z7#hajkMv+yBWy z)2S>kADK-ozFFxY<28knY_=e-PpnfC)GFrY;Ifu8=XsD2!!DJ>4Bo!qZe^$0|hq#IIa9_Ii@iHB>T#BXV^U9ExI z#$g=m;`ENIzj~|r-pLz^$*01!Ye7diWuwkTM;J;-B8cs0HOArmpk=(;2`>1!+J9}j z!H#$9i!$zZ4BHeXQNiQ7&hYb%9+{%}JT0IOFqEGHSGjkJGb!;(@u=|}jMcREaCLG@ z%KmbrA=yA!?qbr&=6+Mo(07Zk&nmc?iAh#@eWP0gDyT4V8+lC<0)<6)gt4je*d+P0 zV%?p|7519TskiAJq#WyfoM)-5)K*uEnSh0?0)ptSEP#Je?(ivtOUi-II!U`b>X?YN zV2WS^&8j&+jZ9FW^3d+*drsD>a-B#&J6I~x6ltv*5}UAxf-$pgu9h3GEZdoin5LgB zmv?+Tk|k&71ReY%@FQa~@9XWkfjHU)NeSyd3KeC_EaGk#v_H?9^k_VsSGFhcaCd*7d^G>O%J9z)_h$%|cvrP93)6|3j}pm7PRAzZ zuY*B58#w+f@=y$Cwo=`4MdQnGF|l(nRDNRs1uPK2VX@kL=tWt=OH3uGos6m7xN%P* z5_8YU^=Hc$ri6xml|4J_nmpR{ACLP+EI&+9#Rgf5DP7&&9G&9yn!qk;A3es=Thv~0 zo9>Q*Ys!PoJEOL*lQghiPUjN?cI8E-_JP>u-s?_n$3E4yKS``xD$L|PnT$Pqo#0v- z!|7nu`kX--Ezn^covBe$Azux;Ouqnm0GQjNozdzQ-+zB!Wo=>^S z9!V95dQkbP_H#C7E7$+N!QF^A9WcID(G}8;YT&^)R{1Hokpw zX(#8>-)Yo}srj*-+ccfp>gFBqp;lpOwGIrYbV5UKub(FAmkI;e)sE!cE!iuZlcb-) zl+e;lTC2jkl$$wT9g%9@em=~#Xlq7DJnV8Vug)y6qW#>x!D#YLspda()(-}h4-YrHr7*mSF)I3{ z(?Rg6%Njy3)Eh{AhK#iDPhG{sl@A=>8IMi_WB+p(tAd((5X5NMGm=Mxbe7X6IZ8a} zE;aFHK@~wD=+BRDiKsYJ9*EUa{fs9-GEC`7$NTH}+`O%^anZF2ps;q5lpk@ytg|jb zi5lQao0{lUiCgSr?>o-X4SUmV8jrDbuV<(RHpH8-sv?~p6X8Cm=zEfG0BkHi@xCJy zGVC2PqoQ?oCqPcIt1zkg>Z0JgOQV1%Tu$6IpRs(ba;0}9v< zX&_f#ZLq0UXql~6oRr#1r>4KhziU8Xc{o6kEm_qJBp6W|{P1CG-|XNgqIm*xCCrm2 zq-NQ8To5`1p(l=B;L6$kyx_qpp5A6Qn(4>z*By@sXT?0Wps9(~|Kfl!MBdXbc-PJr z#n)x?eh&24moKRg>;7r@kk=|_od51w#4WeSy_%%6XMB?Ho>t9!uFdy|#bbCYig69p-n|?2~^ZWysVWNmW$TYFA3c8T*WxDm7r90XC0nB7uBv8kJn0E1nzq^voiG zFX7v-k5_eOW0}%3Iptni&O8btQdv)9n;*7yYZDLoUgsWQi~o&F|mI%=o10V@wWcL&;6hp!KCK5O>t<7WYt^#oEKmU3Gq zwbPRU%9l1Ku&havR3~AlBS*ZWW>oT}m#3;d;Z;w(HAs?Lq(YtB9Kur5AtMnndSwKb z51Wr$52%*{MB;I8+j8#KZ+3~B2YPr-amA8MpBCa&Vo8E5Uv|G1CZ_R?mSfct*r^G$ zEcweU=ao@4jHT2G65|Dp9NZ6oABQlV5In~WUCYUVc<-z0Ma6+dMp=uylitQFj_ogk z?QoLvzx?AfV%o>;j>h||Rh_sV1s;|E$Wrp>D);T=_cw_=&2Itc->u~d(QK$IEPTG& zxYkUvF)uWDT~c!Sfjo1<*CvbY{e_&!pi2=m*!{P!9b1A+uro4AyJipR` zutbckQLR-*xqTB(8sL)#H$ruDXEIfGe4Q1H$!&HU5VHB;V(8R6>D3sg=)cPM`CN&` z&6`8!#wwgJbf9s>D;Qyk`a;+_$u?_bpIcss*^4#N0`F zxP1tL#DBfqckrOm@Au-*B;!J>avSaKAlyxg|3+o=K{QhYI-i+e);(G6pXcmGAjoOg zVH3(fB01Y45hjDeFGi;++cqBL>rlQh8qlmB{|;2n%Uu*9Z830&7*#i1D58}N?!dsE zKO341@Q*bX=yezA+S3&~ux;)$dU= z{-)aqJbve0xCs0z5E!|5KCp(m02nxQH*gRz1!%r0UlDNV|3LpeAyEGb2p(v{Zilci z5{AdK1NxK~*Sd|Mmg7a^tEa#~ov7>A$I~|%z@&$9kDyR6+(ZajVAr=ss)P@S{vW1F z!wLMayNWc4qk!3PNW*??#VU`b}=$Cv}iuCjMtvTw!4B_v>%x)20S(2J+^lydvXi`|n& z?9&A30ljJndI9nHp}oItnA5}hsZVIa{a0RcyudcA<nC@#JFrtadmZlg_4pIcjt!}Aml)m{!C;6F-+#h zlorw{LOl*XXVr<#7UNQp!M-sOB?iutLfX*;wOjR2D1FG_g{p$GvX$trF8!bsNgFhM zPwLaX)!&Z+5Siene*b-&Wf>5Lk4GiHuUQEActeaP7`_Mxeg#hd z6$}A^s|Y>^?!>w<3%ci7W4L@iT^GB@(7$z}r$vkMr-%|v8K7v!b%`wr00R^Bdp_!A zAy|uF_GFGg_ct^&l(Kng{=8l@(Z(3tfHawd?ji=5glufAtZH-Lzkeyu(S9Y0ehT&S z|7p8Qh#fe(?wu_?9UNrGr=NB1&>uaD$1e~r=y5>|j0PY~qmZOO{YBE;(7XM;KFa+TLi3~x~7^aBJC zgHhcvAUKG$4XH)+hS{%Vw!8RQ9@lCGdsd7Gpu<=ZdwdxmufvN@L7yPL*cZnviVX+4 z$x|4UtntaTu{YirYE{)58)X1NQYr*PBO+oVhJLT`h@x{Q-uf?~?hAABYvf+eFRjUY znYzq7aC{#L!HSE4?N=U-j*eFI#(sFEt8|QiWP{q|UU6WiU$Yj#RS^M#J`k@=iFx7U zxDy+Cn!vWLMVGJGDu=gU5rANyLLsRZe4=fcxn)Z^U^mrFzU=I5LB!QI$;~5X_W@I> zFSeGJXC#N`HuE9fE~;U`!nG|;wxAiTH98P_XzFd2mquixA5)TIjZP zA*xEe0LM%|0?~&s#+UT24UbRdlTI%v+>gb>Wi?6ZZ?8K~1)v-7JFjSugCHD-o)NZ- z^}l3mLYAMin6gUg=)<8Sl9m0wNE?bpiLXhCX6-!^RU8CP<{-P0PVb0hqQE*dF_t_& z>!pC-S0(E|IH^Ap0s=2dYGWLw8p#FvePD;PgT?W&5kvP*b5Ski0_!N+;!4m6tUh=@ zJEa8Y!R3@sHiBOl$0q|2g-KS=_%N&o9K^!H0#%HNz5=f_1A)iHSiT?mPtX6KXbAF; zj*J*hhHh|&?QIPYeEEVc!Nt{jPm1wd_Yx;cEM-hirVJDr!h}`uAW`2B2%L?LO>Y~n zJ2#qk@wjNu#;v73%H~=diqG`g=cqYRtzZ>yk#l5Quhd`;>{KwJFA1}6WPV|b|K~`R z)O@ z86I@~Su9F=JcR!H*iM(Lho`4|%L5J#zP7VexCZ+pCVn|D!qKobyEZaRI;4NcAL60R@?iKTjbWtP{qFe zOx}f%zKIaJ*?4^*-!_#o4X;8Z$t!*948f%m1M_HDN9Ue)DbPNO~F! zfP!y3*gvG{w)%2)xqU0n4@bYO`}wX@GD$@Jg<{VqxGiH=6&g)re`FHK(LmU6B^uA9 zD>>+H#Rb*Z{dm{|SO8p#t!QF51p+nT6o zh=Grsk++rNAx#nw!t5*Yq)Hj$1DKHN1A`;JVocVsi!rY{I#{04Hv)w?PC~%EG&8h9I$~mN{NPC@WxUGh* zFBBO7>++{c8IV^oW-a|@QBIpvX!Xg^>ec5n9Bo1xVu^JRPD!?DK*E343@=8)v|}h4 z%*yzt@GCrQU_m0k5Bo9IL_K`?ACIAOyOumAB7Dfst(Qh({mb2S6beb_J(?IzYbJ9J z#pvNL!vlow^nLcr(w*7Y#iv|N86?qE!>g1Q7oshz-Fl9NVV=BsnGmAG>OHbE=G}zw zP7>Mfy#GHN$!Qh4a;v1yneL1Z=6nWY~^lb}F@iW-ODd--h(RB(4cX z#u!~=0dpZ*ZWS7VW<2MG9GfnqnwOnDcdlpd<%=(!qK_??c z|0gYFv10cYC1!hST)dwOrY@w}I29ym|CaSugCg~>>@NUkS!G%13F_npVADxs?XE#d z#jf4je{L70VUcYP^wrD^jG2c85X=DdK4aFbw04NF_EB)Dx<|WHh?S&QK*kAy4O_Mk zp2~vhBUO=NAwN#rzwvT>_JfK!rhG#d7rwV;L$tD#PgCt^hLy2%3%lUd-|?DuC`X0@ z&kJH)6s^GbAx{LYAi0Jcs^Ejp-JTn-^DUCy=ru(B%ujHbxYyxD9-BX-to%?#PRlId zM^#%E?z3I=7s!@3q#~5`U^b z=HBMwbPs*~YuG|}uE8|37S}1`Kn8>5e~#94Hof#FyjL*7J2eD!D!uuTT<-y-aZ7piI5mP z`r6$$sGxK-lGZZK!yC+GtnKd=wA&>UzbxeVClWCo{%@E=sY~&Ke@8d3ug6I^Y2wOT zU`q^^(cfDuT#cWa?@!)asUX@LUMmm(8T(TgKmDAYqstN#N<5BZga`Z>sk(E@efKun zdqS&-F!OYKw};?n>{Jark(^VO3(?GZLHeuqcX#F$6jxK_EScd2`T&6_^7TyMI5wHU3{#I2$(lVSC$id2-|l+lPTo6gjgx>4)-3`Vhe zzSjWwC^jEaXQ7JtE@ioIA@l~e$#XOFyLx!79)~;1idcMeQl|<( zSmb_(Rf6+G6TpqQYH5et9xhcj$_Y8O58Pf7vtwTGDyGUFtAF!hefvV8%OdlTsmuap zlI+%CotL8w%z!+-p99Qmj+! zUhFM$|MWck@s`)^?(<7V<^VdcW=_Q|)Dk!>=fPUiT78Icesx zF{pjLBM!PSXtcGp#WsxHXr)u7pe6xexCZ(>W<6fH@hOnsjd%s7^dEpF{#GE}Zn`F+ z^^N8;aV{o^eL7*1OG*0s!)GDBY=5=VfPl>|d zPR4F8vqF5|6&|Nay8ixQuX}N>t5`&qCP2)OhaV3;HZO=~kd-^A*)n@2d`nwCyvYJo0Z27x<;YHRW9ScTRAfv^1ZKLTyT#}wA5;=i~< zk!NsD6K$Q$OLq&%nt^ueZ3>mar;l_~*Le6Ki5bO{!se9K$cpWJVL9E>xLc3kw9ma1 zb0z8&N}`=uav#txB2P?w3k7KP{>cTZ@%bjd_K=hG_NWZg^=s-qVH?{u(MUh2s1J=L zWL?7H!a3+|0nFpb2r>wgzNU8;YAX#QRm>Rr!5;yfUo||2ouv#SUTMWN;sL9I;kK=? zUU7UH2vQq|YS+OU0Lx%V2t&$wBWTuZQku|zy$19nBdoyi5&7^FM_7b_$M9_QEqJ8~ z2<-4N>ASc%aHelE;oM+r4lKTmk&J}600WRwg*r5Omj6uV|0pugaq=}6yKUr8sxttgZXel?q{&t5F zPIR5zSr8!Mcz_RPOcxKu7D_ky5TFXESX`+?_3;aY?3m}5hmij`GQt(9 zTawFj^}mP?QDzj2{!|Og&ib)MBs2o#UQsNQ((XaS?Kl$gbdS3l8cK;TjN8t51v^j`VSFG9_bXy4MNgGtHs)S-aBPZC{8txuYWz*_M!zWV0qn3O!c&8eA>4#`u$;<+b*2rTz-(Flgi z!oXuOi~7TXO}8dnUTgo)^w#Uh3|=SU5#}xj-QH+fPOhE3Qd_Srj05 z1l&roh~yhB1<4vLc@IeU0`bYDKf8>*1~2Ey5uJXU*W zWq4p8^n$thq5jf7RW0wG#H+Vf1n76R!=owaKQR;BzJ;NW+F@1n_ zWv5x3LALE?Sa=j0zpkPwCAe3-Bjl+^#k^>4sN%RWz(T@;nW=9ld~@EVS!A<%x>-S$ zd`xejOj#QH_APYc*UcDev30RZ>{UTXX%6kKq`j^_m#2rv{7GI8r%U|x`o}cRr~EIS z)?0G9DAiAIhm%FTG8zs@rLnhiEj*MCEIk_x { + // uni.showLoading({ + // title: '加载中' + // }) + uni.request({ + // url: Url + '/api/v1' + url, + url: Url + '/api' + url, + method: method || 'GET', + header: { + ...header + + }, + data: method != 'GET' ? data || {} : {}, + params: method == 'GET' ? data : {}, + success: (res) => { + // uni.hideLoading() + if (noVerify) + // reslove(res.data, res); + reslove(res.data); + else if (res.data.code == -1) { + store.commit("LOGOUT"); + store.commit("SET_REQUEST", false); + reject(res.data); + } else if (res.data.code == 0) { + // uni.hideLoading(); + if (res.data.show != 1 && res.data.msg != '无登录信息') { + uni.showToast({ + title: res.data.msg || '请检查网络', + icon: 'none', + }) + } + reject(res.data); + } else if (res.data.code == 1) { + store.commit("SET_REQUEST"); + reslove(res.data); + } else if (res.data.code == 200) { + store.commit("SET_REQUEST"); + reslove(res.data.data); + } else if ([410000, 410001, 410002, 40000].indexOf(res.data.code) !== -1) { + toLogin(); + reject(res.data); + } else if (res.data.code == 501) { + // uni.reLaunch({ + // url: '/pages/error/index' + // }) + reject(res.data); + } else { + // uni.hideLoading(); + uni.showToast({ + title: res.data.msg || '请检查网络', + icon: 'none' + }) + reject(res.data.msg || '请检查网络'); + } + }, + fail: (message) => { + // uni.hideLoading() + uni.showToast({ + title: '网络错误', + icon: 'none' + }) + reject('请求失败'); + } + }) + }); +} + +const oahttp = {}; + +['options', 'get', 'post', 'put', 'head', 'delete', 'trace', 'connect'].forEach((method) => { + oahttp[method] = (api, data, opt) => baseRequestTwo(api, method, data, opt || {}) +}); + +export default oahttp; \ No newline at end of file From f3305df1caf8b929baf22b8f3356b172f1729b3c Mon Sep 17 00:00:00 2001 From: THK3121 Date: Thu, 28 Sep 2023 18:36:15 +0800 Subject: [PATCH 02/20] im --- api/bussness.js | 8 +- components/business/talk.vue | 4 + config/app.js | 2 +- pages/business/business.vue | 803 +++++++++++++++++++++++++----- pages/business/talkDetail.vue | 9 +- pages/logistics/logisticDetil.vue | 2 +- utils/aa.js | 2 +- 7 files changed, 685 insertions(+), 145 deletions(-) diff --git a/api/bussness.js b/api/bussness.js index 7b3ee17..dc0dcd7 100644 --- a/api/bussness.js +++ b/api/bussness.js @@ -3,8 +3,10 @@ import oahttp from "@/utils/aa.js"; /** * 绑定scoket */ -export const bindScoket = (data) => oahttp.post('/im/doBindUid', data) +export const bindScoket = (data) => oahttp.post('/common/im/doBindUid', data) // 发送消息 -export const sendMsgApi = (data) => oahttp.post('/im/sendMessage', data) +export const sendMsgApi = (data) => oahttp.post('/common/im/sendMessage', data) // 发送文件 -// export const sendFileApi = (data) => oahttp.post('/im/doBindUid', data) \ No newline at end of file +export const sendFileApi = (data) => oahttp.post('/common/im/sendFileMsg', data) +// 消息列表 +export const getMsgListApi = (data) => oahttp.post('/common/im/msgList', data) diff --git a/components/business/talk.vue b/components/business/talk.vue index 5b54724..2380032 100644 --- a/components/business/talk.vue +++ b/components/business/talk.vue @@ -627,8 +627,12 @@ padding: 20rpx 0; position: fixed; box-sizing: border-box; + // bottom: 400px; + padding-bottom: 500px; + /* #ifdef APP-PLUS */ bottom: 0px; padding-bottom: 10px; + /* #endif */ .send-col { display: flex; diff --git a/config/app.js b/config/app.js index 7094130..45f647e 100644 --- a/config/app.js +++ b/config/app.js @@ -22,7 +22,7 @@ switch (env) { httpApi = 'https://ceshi-worker-task.lihaink.cn' //测试 httpApiThree = 'https://ceshi-worker-task.lihaink.cn' //测试 httpApiTwo = 'https://ceshi-logistics.lihaink.cn' //测试环境 - httpApiTest = 'http://192.168.1.12:8081' //测试环境 + httpApiTest = 'http://192.168.1.16:8081' //测试环境 } diff --git a/pages/business/business.vue b/pages/business/business.vue index 15a1b68..c708f3f 100644 --- a/pages/business/business.vue +++ b/pages/business/business.vue @@ -1,189 +1,728 @@ - \ No newline at end of file diff --git a/pages/business/talkDetail.vue b/pages/business/talkDetail.vue index f41c76a..1f2d4ad 100644 --- a/pages/business/talkDetail.vue +++ b/pages/business/talkDetail.vue @@ -170,11 +170,6 @@ return { a: "https://img1.baidu.com/it/u=716638254,3920932970&fm=253&app=138&size=w931&n=0&f=JPEG&fmt=auto?sec=1695920400&t=aeec3d0e86c23759d5f82b3757e9b442", list: [ - - - - - ], value: "", showPlus: false, @@ -597,8 +592,8 @@ .content { padding: 0 20rpx; - min-height: 100vh; - // height: 89vh; + // min-height: 100vh; + height: 89vh; background-color: #F6F7FD; overflow: auto; padding-top: 10rpx; diff --git a/pages/logistics/logisticDetil.vue b/pages/logistics/logisticDetil.vue index d637c6f..b97bd63 100644 --- a/pages/logistics/logisticDetil.vue +++ b/pages/logistics/logisticDetil.vue @@ -97,7 +97,7 @@ - 收获详情 + 收货详情 diff --git a/utils/aa.js b/utils/aa.js index 629a9f0..1a7164a 100644 --- a/utils/aa.js +++ b/utils/aa.js @@ -48,7 +48,7 @@ function baseRequestTwo(url, method, data, { // }) uni.request({ // url: Url + '/api/v1' + url, - url: Url + '/api' + url, + url: Url + url, method: method || 'GET', header: { ...header From 2e6ea98e21785e6ad44f825c9fcaaa3239b0bcc4 Mon Sep 17 00:00:00 2001 From: THK3121 Date: Sat, 7 Oct 2023 18:56:59 +0800 Subject: [PATCH 03/20] =?UTF-8?q?=E4=B8=8A=E5=95=86=E6=9C=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/bussness.js | 4 +- config/app.js | 2 +- pages.json | 1 - pages/business/business.vue | 214 ++++++++++++++++-------------------- 4 files changed, 98 insertions(+), 123 deletions(-) diff --git a/api/bussness.js b/api/bussness.js index dc0dcd7..1a00163 100644 --- a/api/bussness.js +++ b/api/bussness.js @@ -5,8 +5,10 @@ import oahttp from "@/utils/aa.js"; */ export const bindScoket = (data) => oahttp.post('/common/im/doBindUid', data) // 发送消息 -export const sendMsgApi = (data) => oahttp.post('/common/im/sendMessage', data) +export const sendMsgApi = (data) => oahttp.post('/common/im/sendTextMsg', data) // 发送文件 export const sendFileApi = (data) => oahttp.post('/common/im/sendFileMsg', data) // 消息列表 export const getMsgListApi = (data) => oahttp.post('/common/im/msgList', data) +// 片区经理id +export const getAreaManagerApi = (data) => oahttp.post('/common/im/getAreaManager', data) diff --git a/config/app.js b/config/app.js index 45f647e..1db8661 100644 --- a/config/app.js +++ b/config/app.js @@ -22,7 +22,7 @@ switch (env) { httpApi = 'https://ceshi-worker-task.lihaink.cn' //测试 httpApiThree = 'https://ceshi-worker-task.lihaink.cn' //测试 httpApiTwo = 'https://ceshi-logistics.lihaink.cn' //测试环境 - httpApiTest = 'http://192.168.1.16:8081' //测试环境 + httpApiTest = 'http://192.168.1.9:8081' //测试环境 } diff --git a/pages.json b/pages.json index 471397c..4e43f79 100644 --- a/pages.json +++ b/pages.json @@ -29,7 +29,6 @@ "path": "pages/business/business", "style": { "navigationBarTitleText": "商机信息", - "enablePullDownRefresh": true, "navigationBarBackgroundColor": "#0122C7", "navigationBarTextStyle": "white" } diff --git a/pages/business/business.vue b/pages/business/business.vue index c708f3f..f32bb76 100644 --- a/pages/business/business.vue +++ b/pages/business/business.vue @@ -18,12 +18,11 @@ - - + - + @@ -38,9 +37,9 @@ - + - 点击预览 + @@ -54,12 +53,12 @@ - - + + - {{item.content}} + {{item.content}} - + - 点击预览 + + @@ -144,8 +144,6 @@ - - @@ -163,14 +161,13 @@ @@ -572,22 +458,6 @@ font-size: 24rpx; } - - - - // .storeName { - // position: fixed; - // text-align: center; - // background-color: white; - // font-weight: bold; - // height: 80rpx; - // width: 100vw; - // z-index: 9; - // display: flex; - // align-items: center; - // justify-content: space-between; - // } - .topflag { height: 80rpx; background-color: #F6F7FD; @@ -596,9 +466,8 @@ .content { padding: 0 20rpx; // min-height: 100vh; - height: 89vh; + min-height: 95vh; background-color: #F6F7FD; - overflow: auto; padding-top: 10rpx; // padding-bottom: 50px; From be0045b4b09a0a21b29d7876d219170aa807d5dc Mon Sep 17 00:00:00 2001 From: THK3121 Date: Mon, 9 Oct 2023 20:22:16 +0800 Subject: [PATCH 05/20] =?UTF-8?q?im=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 16 +- config/app.js | 6 +- pages.json | 25 +- pages/business/business.vue | 316 +++++----- pages/business/talkDetil1.nvue | 224 ------- pages/oaHome/oaHome.vue | 74 ++- static/mp3/im.mp3 | Bin 0 -> 7149 bytes static/mp3/im.wav | Bin 0 -> 1258 bytes .../chatMang/index.vue | 560 ++++++++---------- subpkg/property/buyCar.vue | 64 ++ utils/aa.js | 201 ++++--- 11 files changed, 703 insertions(+), 783 deletions(-) delete mode 100644 pages/business/talkDetil1.nvue create mode 100644 static/mp3/im.mp3 create mode 100644 static/mp3/im.wav rename pages/business/talkDetail.vue => subpkg/chatMang/index.vue (51%) create mode 100644 subpkg/property/buyCar.vue diff --git a/App.vue b/App.vue index f67f4da..61c08ab 100644 --- a/App.vue +++ b/App.vue @@ -64,13 +64,23 @@ } }, onShow: function() { - const audioContext = uni.createInnerAudioContext() - // 设置音频文件地址 - audioContext.src = '/static/mp3/order.mp3' + jpushModule.initJPushService() + // const audioContext = uni.createInnerAudioContext() + // // 设置音频文件地址 + // audioContext.src = '/static/mp3/order.mp3' // 播放音频 //#ifdef APP-PLUS jpushModule.addNotificationListener(res => { + const audioContext = uni.createInnerAudioContext() + if(res.content.includes('：')){ + audioContext.src = '/static/mp3/im.wav' + audioContext.play() + uni.vibrateLong(); + console.log("im") + return + } if (res.notificationEventType == 'notificationOpened') return + audioContext.src = '/static/mp3/order.mp3' audioContext.play() uni.vibrateLong(); console.log("app的监听") diff --git a/config/app.js b/config/app.js index 1db8661..dfa40af 100644 --- a/config/app.js +++ b/config/app.js @@ -3,8 +3,8 @@ let httpApi; // 总域名 let httpApiTwo; // 物流系统域名 let httpApiTest -const env = 'dev'; // 开发 -// const env = 'prod'; // 生产 +// const env = 'dev'; // 开发 +const env = 'prod'; // 生产 // const env = 'prew'; // 预上线 switch (env) { @@ -22,7 +22,7 @@ switch (env) { httpApi = 'https://ceshi-worker-task.lihaink.cn' //测试 httpApiThree = 'https://ceshi-worker-task.lihaink.cn' //测试 httpApiTwo = 'https://ceshi-logistics.lihaink.cn' //测试环境 - httpApiTest = 'http://192.168.1.9:8081' //测试环境 + httpApiTest = 'http://192.168.1.13:8081' //测试环境 } diff --git a/pages.json b/pages.json index 61c09e0..edb8cd7 100644 --- a/pages.json +++ b/pages.json @@ -31,10 +31,8 @@ "navigationBarTitleText": "商机信息", "navigationBarBackgroundColor": "#0122C7", "navigationBarTextStyle": "white", - "app-plus": { - //手机软键盘升起不让其将页面头部上推 - "softinputMode": "adjustResize" - } + "enablePullDownRefresh": true + } }, @@ -277,6 +275,16 @@ "navigationBarTextStyle": "white" } + },{ + "path": "chatMang/index", + "style": { + "navigationBarTitleText": "聊天", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": true + } + }, { "path": "topUp/topUp", "style": { @@ -593,6 +601,15 @@ "navigationBarTextStyle": "white" } + }, { + "path": "property/buyCar", + "style": { + "navigationBarTitleText": "车辆购买", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + }, { "path": "property/success", "style": { diff --git a/pages/business/business.vue b/pages/business/business.vue index ba3f1fb..ba66194 100644 --- a/pages/business/business.vue +++ b/pages/business/business.vue @@ -1,14 +1,16 @@ - - - \ No newline at end of file diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue index 6b9cea5..d7f7181 100644 --- a/pages/oaHome/oaHome.vue +++ b/pages/oaHome/oaHome.vue @@ -110,6 +110,25 @@ + + + + + + {{managerInfo.manager_name}} + + + + + 99 + + + + + + + + 工作管理 @@ -215,6 +234,9 @@ import { import { noticeList } from "@/api/notice.js"; +import { + getAreaManagerApi + } from "@/api/bussness.js" // import tabbar from '../components/tabbar' import { getIndexListAPI, @@ -241,6 +263,7 @@ export default { }, data () { return { + brange:0, options: { data: '', }, @@ -248,6 +271,7 @@ export default { page_num: 1, flag: false, uniMP: false, + managerInfo:{}, id: "", is_captain: 0, notArr: [], @@ -292,11 +316,16 @@ export default { await this.$onLaunched; this.is_captain = JSON.parse(uni.getStorageSync("USER_INFO")||'{}')?.is_captain this.options.data = bj; + let user_id= JSON.parse( uni.getStorageSync("USER_INFO")).id + getAreaManagerApi({user_id}).then(res=>{ + console.log(res.data) + this.managerInfo=res.data + }) //#ifdef APP-PLUS let that = this; jpushModule.addNotificationListener(function (result) { if (!that.notArr.includes(result.messageID)) { - that.$refs.globalPopup.showPopu(); + // that.$refs.globalPopup.showPopu(); that.getOrderList(); console.log("idnex的"); that.notArr.push(result.messageID); @@ -408,14 +437,21 @@ export default { methods: { // 通知 noticeFn () { - const audioContext = uni.createInnerAudioContext() - audioContext.src = '/static/mp3/order.mp3' - jpushModule.addNotificationListener(res => { + jpushModule.addNotificationListener(res => { + const audioContext = uni.createInnerAudioContext() + if(res.content.includes('：')){ + audioContext.src = '/static/mp3/im.wav' + audioContext.play() + uni.vibrateLong(); + console.log("im") + return + } if (res.notificationEventType == 'notificationOpened') return + audioContext.src = '/static/mp3/order.mp3' audioContext.play() uni.vibrateLong(); this.getOrderList() - this.$refs.globalPopup.showPopu(); + // this.$refs.globalPopup.showPopu(); console.log("index的监听") }) }, @@ -958,4 +994,32 @@ export default { } } } +.chat{ + margin-top: 1000px; + // margin-top: 2000rpx; + width: 694.74rpx; + margin: 0 auto; + background-color: white; + border-radius: 12px; + padding:20rpx; + // padding-top: 10rpx; + padding-right: 24rpx; + display: flex; + justify-content: space-between; + align-items: center; + .chat-l{ + display: flex; + align-items: center; + } +} +.brange{ + color: white; + background-color: red; + width: 40rpx; + height: 40rpx; + border-radius: 40rpx; + font-size: 12px; + text-align: center; + lighting-color: 40rpx; +} \ No newline at end of file diff --git a/static/mp3/im.mp3 b/static/mp3/im.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..dc94c500a0424a1559c5ca18a52a4892b9875c4d GIT binary patch literal 7149 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 UhSafQ#jitPP@))oRG_G{lXmP`HUIzs literal 0 HcmV?d00001 diff --git a/pages/business/talkDetail.vue b/subpkg/chatMang/index.vue similarity index 51% rename from pages/business/talkDetail.vue rename to subpkg/chatMang/index.vue index 1f2d4ad..f6c738f 100644 --- a/pages/business/talkDetail.vue +++ b/subpkg/chatMang/index.vue @@ -1,29 +1,21 @@ - \ No newline at end of file diff --git a/utils/aa.js b/utils/aa.js index 1a7164a..ce76829 100644 --- a/utils/aa.js +++ b/utils/aa.js @@ -1,118 +1,127 @@ import { - httpApiTest, - HEADER, - TOKENNAME, + HTTP_REQUEST_URL_THREE, + HEADER, + TOKENNAME, } from '@/config/app'; import { - Toast + Toast } from '../libs/uniApi'; // import { checkLogin } from '../libs/login'; import store from '../store'; function toLogin() { - uni.showToast({ - title: '请先登录', - icon: 'none', - duration: 1000 - }); + uni.showToast({ + title: '请先登录', + icon: 'none', + duration: 1000 + }); } function baseRequestTwo(url, method, data, { - noAuth = false, - noVerify = false + noAuth = false, + noVerify = false, + onReLogin = false }) { - let Url = httpApiTest, - header = HEADER; - if (!noAuth) { - // 已经未登录了,禁止请求 - if (!store.state.config.request) return Promise.reject({ - msg: '未登录' - }); - //登录过期自动登录 - if (!store.state.app.token) { - toLogin(); - store.commit("SET_REQUEST", false); - return Promise.reject({ - msg: '未登录' - }); - } - } + let Url = HTTP_REQUEST_URL_THREE, + header = HEADER; + if (!noAuth) { + // 已经未登录了,禁止请求 + if (!store.state.config.request) return Promise.reject({ + msg: '未登录' + }); + //登录过期自动登录 + if (!store.state.app.token) { + toLogin(); + store.commit("SET_REQUEST", false); + return Promise.reject({ + msg: '未登录' + }); + } + } - // if (store.state.app.token) header[TOKENNAME] = 'Bearer ' + store.state.app.token; - if (store.state.app.token) header[TOKENNAME] = store.state.app.token; + // if (store.state.app.token) header[TOKENNAME] = 'Bearer ' + store.state.app.token; + if (store.state.app.token) header[TOKENNAME] = store.state.app.token; - // header[TOKENNAME] = 'Bearer sdjflidshjgfkbdasgjmasbgvhauuiavhkesvndkaesbvkjsdbv'; - return new Promise((reslove, reject) => { - // uni.showLoading({ - // title: '加载中' - // }) - uni.request({ - // url: Url + '/api/v1' + url, - url: Url + url, - method: method || 'GET', - header: { - ...header - - }, - data: method != 'GET' ? data || {} : {}, - params: method == 'GET' ? data : {}, - success: (res) => { - // uni.hideLoading() - if (noVerify) - // reslove(res.data, res); - reslove(res.data); - else if (res.data.code == -1) { - store.commit("LOGOUT"); - store.commit("SET_REQUEST", false); - reject(res.data); - } else if (res.data.code == 0) { - // uni.hideLoading(); - if (res.data.show != 1 && res.data.msg != '无登录信息') { - uni.showToast({ - title: res.data.msg || '请检查网络', - icon: 'none', - }) - } - reject(res.data); - } else if (res.data.code == 1) { - store.commit("SET_REQUEST"); - reslove(res.data); - } else if (res.data.code == 200) { - store.commit("SET_REQUEST"); - reslove(res.data.data); - } else if ([410000, 410001, 410002, 40000].indexOf(res.data.code) !== -1) { - toLogin(); - reject(res.data); - } else if (res.data.code == 501) { - // uni.reLaunch({ - // url: '/pages/error/index' - // }) - reject(res.data); - } else { - // uni.hideLoading(); - uni.showToast({ - title: res.data.msg || '请检查网络', - icon: 'none' - }) - reject(res.data.msg || '请检查网络'); - } - }, - fail: (message) => { - // uni.hideLoading() - uni.showToast({ - title: '网络错误', - icon: 'none' - }) - reject('请求失败'); - } - }) - }); + // header[TOKENNAME] = 'Bearer sdjflidshjgfkbdasgjmasbgvhauuiavhkesvndkaesbvkjsdbv'; + return new Promise((reslove, reject) => { + // uni.showLoading({ + // title: '加载中' + // }) + uni.request({ + // url: Url + '/api/v1' + url, + url: Url + url, + method: method || 'GET', + header: { + ...header + }, + data: method != 'GET' ? data || {} : {}, + params: method == 'GET' ? data : {}, + success: (res) => { + if (noVerify) + reslove(res.data); + else if (res.data.code == -1) { + if(onReLogin) { + store.commit('LOGOUT'); + return reject(); + } + // 如果登录超时,自动重新登录并且继续发送请求 + store.dispatch("RE_LOGIN", { + url: url, + method: method, + data: data, + opt: { + noAuth, + noVerify + } + }).then((e)=>{ + reslove(e); + }).catch((err)=>{ + reject(res.data); + }) + // store.commit("SET_REQUEST", false); + } else if (res.data.code == 0) { + if (res.data.msg != '无登录信息') { + uni.showToast({ + title: res.data.msg || '请检查网络', + icon: 'none', + }) + } + reject(res.data); + } else if (res.data.code == 1) { + store.commit("SET_REQUEST"); + reslove(res.data); + } else if (res.data.code == 200) { + store.commit("SET_REQUEST"); + reslove(res.data.data); + } else if ([410000, 410001, 410002, 40000].indexOf(res.data.code) !== -1) { + toLogin(); + reject(res.data); + } else if (res.data.code == 501) { + reject(res.data); + } else { + uni.showToast({ + title: res.data.msg || '请检查网络', + icon: 'none' + }) + reject(res.data.msg || '请检查网络'); + } + }, + fail: (message) => { + // uni.hideLoading() + uni.showToast({ + title: '网络错误', + icon: 'none' + }) + reject('请求失败'); + } + }) + }); } const oahttp = {}; ['options', 'get', 'post', 'put', 'head', 'delete', 'trace', 'connect'].forEach((method) => { - oahttp[method] = (api, data, opt) => baseRequestTwo(api, method, data, opt || {}) + oahttp[method] = (api, data, opt) => baseRequestTwo(api, method, data, opt || {}) }); export default oahttp; \ No newline at end of file From 8de048e341ae0857e8883d968e350177e22fd933 Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Mon, 9 Oct 2023 23:32:04 +0800 Subject: [PATCH 06/20] =?UTF-8?q?=E4=B8=89=E8=BD=AE=E8=BD=A6=E8=B4=AD?= =?UTF-8?q?=E4=B9=B0=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 2 +- pages/business/business.vue | 641 ++---------------------------------- subpkg/property/buyCar.vue | 98 +++++- 3 files changed, 121 insertions(+), 620 deletions(-) diff --git a/App.vue b/App.vue index 61c08ab..0c5a12b 100644 --- a/App.vue +++ b/App.vue @@ -64,12 +64,12 @@ } }, onShow: function() { - jpushModule.initJPushService() // const audioContext = uni.createInnerAudioContext() // // 设置音频文件地址 // audioContext.src = '/static/mp3/order.mp3' // 播放音频 //#ifdef APP-PLUS + jpushModule.initJPushService() jpushModule.addNotificationListener(res => { const audioContext = uni.createInnerAudioContext() if(res.content.includes('：')){ diff --git a/pages/business/business.vue b/pages/business/business.vue index ba66194..f943cfa 100644 --- a/pages/business/business.vue +++ b/pages/business/business.vue @@ -1,623 +1,34 @@ + \ No newline at end of file diff --git a/subpkg/property/buyCar.vue b/subpkg/property/buyCar.vue index 2fb58e6..913ccb4 100644 --- a/subpkg/property/buyCar.vue +++ b/subpkg/property/buyCar.vue @@ -1,5 +1,5 @@ \ No newline at end of file From 8965c01b235f039cb53f3b5e9d0615a8328a0f6c Mon Sep 17 00:00:00 2001 From: THK3121 Date: Tue, 10 Oct 2023 18:44:37 +0800 Subject: [PATCH 07/20] =?UTF-8?q?=E4=B8=89=E8=BD=AE=E8=BD=A6=E8=B4=AD?= =?UTF-8?q?=E4=B9=B0=E5=93=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 22 +++++++++++++++++++++- config/app.js | 6 +++--- pages/oaHome/oaHome.vue | 23 +++++++++++++++-------- subpkg/chatMang/index.vue | 26 +++++++++++++++++++++++++- subpkg/property/buyCar.vue | 24 ++++++++++++++++++++++-- subpkg/property/index.vue | 4 ++++ 6 files changed, 90 insertions(+), 15 deletions(-) diff --git a/App.vue b/App.vue index 0c5a12b..560e0bc 100644 --- a/App.vue +++ b/App.vue @@ -21,11 +21,16 @@ // uni.showModal({ // content: info.referrerInfo.extraData // }) - +// console.log('App Launch:',info); if (info.referrerInfo?.extraData?.uniMP) { //监听宿主App通讯数据 uni.onHostEventReceive((event, data) => { if(event=='getLocation') uni.$emit('uniMP_getLocation', data); + else if(event=='im'){ + uni.navigateTo({ + url:'/subpkg/chatMang/index' + }) + } }); uni.setStorageSync('uniMP', info.referrerInfo?.extraData?.uniMP); uni.setStorageSync('APP_token', info.referrerInfo?.extraData?.token); @@ -64,10 +69,25 @@ } }, onShow: function() { + // uni.onHostEventReceive((event, data) => { + // // if(event=='getLocation') uni.$emit('uniMP_getLocation', data); + // }); // const audioContext = uni.createInnerAudioContext() // // 设置音频文件地址 // audioContext.src = '/static/mp3/order.mp3' // 播放音频 + uni.onHostEventReceive((event,data)=>{ + if(event=='im'){ + uni.navigateTo({ + url:'/subpkg/chatMang/index' + }) + }else if(event=='re_id'){ + uni.setStorageSync("re_id",data) + } + // console.log('Receive event('+event+') from HOST: '+JSON.stringify(data)); + + + }); //#ifdef APP-PLUS jpushModule.initJPushService() jpushModule.addNotificationListener(res => { diff --git a/config/app.js b/config/app.js index dfa40af..c573f3d 100644 --- a/config/app.js +++ b/config/app.js @@ -3,8 +3,8 @@ let httpApi; // 总域名 let httpApiTwo; // 物流系统域名 let httpApiTest -// const env = 'dev'; // 开发 -const env = 'prod'; // 生产 +const env = 'dev'; // 开发 +// const env = 'prod'; // 生产 // const env = 'prew'; // 预上线 switch (env) { @@ -22,7 +22,7 @@ switch (env) { httpApi = 'https://ceshi-worker-task.lihaink.cn' //测试 httpApiThree = 'https://ceshi-worker-task.lihaink.cn' //测试 httpApiTwo = 'https://ceshi-logistics.lihaink.cn' //测试环境 - httpApiTest = 'http://192.168.1.13:8081' //测试环境 + httpApiTest = 'http://192.168.1.11:8081' //测试环境 } diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue index d7f7181..2053cfe 100644 --- a/pages/oaHome/oaHome.vue +++ b/pages/oaHome/oaHome.vue @@ -119,8 +119,8 @@ - - 99 + + {{managerInfo.msg_num}} @@ -131,7 +131,7 @@ - 工作管理 + 工作管理 @@ -45,7 +50,15 @@ - {{item.content}} + + + + {{item.content}} + + + {{item.content}} + + 选择该车辆为监管车辆 - + + + + @@ -66,12 +74,24 @@ a:"https://tse3-mm.cn.bing.net/th/id/OIP-C.0xzWZj1_A-nzJiUBxrk8XQHaEo?w=298&h=186&c=7&r=0&o=5&pid=1.7", carList:[1,1,1,1,1,1,,1,1,], showPop:false, - checkList:[1,1,1,1,1,1,1,1] + checkList:[1,1,1,1,1,1,1,1], + checkboxValue1:[], + arr:[] } } ,methods:{ + checkboxChange(i){ + if(this.arr.includes(i)){ + // this.arr + }else{ + + this.arr.push(i) + } + + console.log(this.arr) + }, close() { this.showPop=false }, diff --git a/subpkg/property/index.vue b/subpkg/property/index.vue index 4a3f178..fb31876 100644 --- a/subpkg/property/index.vue +++ b/subpkg/property/index.vue @@ -11,6 +11,10 @@ + + + + From 96d0fb5e813d896e2418057a7cbdcf50071e5f5c Mon Sep 17 00:00:00 2001 From: THK3121 Date: Wed, 11 Oct 2023 15:54:26 +0800 Subject: [PATCH 08/20] =?UTF-8?q?=E4=B8=89=E8=BD=AE=E8=BD=A6=E8=B4=AD?= =?UTF-8?q?=E4=B9=B0=E9=A1=B5=E9=9D=A2=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/file.js | 67 +++---- api/property.js | 4 + pages/oaLogin/oaLogin.vue | 106 +++++------ subpkg/chatMang/index.vue | 332 ++++++++++++++++++---------------- subpkg/property/buyCar.vue | 287 ++++++++++++++++++----------- subpkg/property/index.vue | 67 ++++--- subpkg/property/vehicle_a.vue | 10 + 7 files changed, 494 insertions(+), 379 deletions(-) diff --git a/api/file.js b/api/file.js index 486153d..fa09bf5 100644 --- a/api/file.js +++ b/api/file.js @@ -1,45 +1,50 @@ import { - HTTP_REQUEST_URL_THREE, - HEADER, - TOKENNAME, + HTTP_REQUEST_URL_THREE, + HEADER, + TOKENNAME, } from '@/config/app'; -import { Toast } from '../libs/uniApi'; +import { + Toast +} from '../libs/uniApi'; // import { checkLogin } from '../libs/login'; import store from '../store'; function toLogin() { - store.commit("LOGOUT"); - uni.showToast({ - title: '请登录', - icon: 'none', - duration: 1000 - }); + store.commit("LOGOUT"); + uni.showToast({ + title: '请登录', + icon: 'none', + duration: 1000 + }); } function upLoad(url, data) { - let Url = HTTP_REQUEST_URL_THREE, - header = {} - if (store.state.app.token) header[TOKENNAME] = store.state.app.token; - return new Promise((reslove, reject) => { - uni.uploadFile({ - url: Url + '/api' + url, - filePath: data.filePath, - name: data.name, - success: (uploadFileRes) => { - uploadFileRes.data = JSON.parse(uploadFileRes.data) - if(uploadFileRes.data.code==1) reslove(uploadFileRes.data) - else Toast('网络错误') - }, - fail: (err) => { - Toast('网络错误') - } - }) - }); + let Url = HTTP_REQUEST_URL_THREE, + header = {} + if (store.state.app.token) header[TOKENNAME] = store.state.app.token; + return new Promise((reslove, reject) => { + uni.uploadFile({ + url: Url + '/api' + url, + filePath: data.filePath, + name: data.name, + success: (uploadFileRes) => { + uploadFileRes.data = JSON.parse(uploadFileRes.data) + if (uploadFileRes.data.code == 1) reslove(uploadFileRes.data) + else Toast('网络错误') + }, + fail: (err) => { + Toast('网络错误') + } + }) + }); } -export const upLoadImage = (data)=>{ - return upLoad('/upload/image', data) +export const upLoadImage = (data) => { + return upLoad('/upload/image', data) } export const VIDEO_URL = HTTP_REQUEST_URL_THREE + '/api/upload/video' -export const FILE_URL = HTTP_REQUEST_URL_THREE + '/api/upload/file' \ No newline at end of file +export const FILE_URL = HTTP_REQUEST_URL_THREE + '/api/upload/file' +// im文件上传 +// export const VIDEO_URL_IM = HTTP_REQUEST_URL_THREE + '/api/upload/video' +export const FILE_URL_IM = HTTP_REQUEST_URL_THREE + '/common/im/sendFileMsg' \ No newline at end of file diff --git a/api/property.js b/api/property.js index 0d6cfbb..5e316fa 100644 --- a/api/property.js +++ b/api/property.js @@ -14,6 +14,10 @@ export const upVehicleApi = (data) => oahttp.post('/vehicle/rentApply', data) export const applycarApi = (data) => oahttp.post('/vehicle/rentApply', data) // 显示轨迹 export const locusApi = (data) => oahttp.post('/vehicle/vehicleTrack', data) +// 获取可购买车辆列表 +export const canBuyCarListApi = (data) => oahttp.post('/vehicle/vehicleTrack', data) +// 购买车辆 +export const buyCarApi = (data) => oahttp.post('/vehicle/vehicleTrack', data) // 当前车辆位置信息 // export const locusApi = (data) => oahttp.post('/vehicle/vehicleTrack', data) // api / getCarLocal diff --git a/pages/oaLogin/oaLogin.vue b/pages/oaLogin/oaLogin.vue index b9c5ba2..626e3d4 100644 --- a/pages/oaLogin/oaLogin.vue +++ b/pages/oaLogin/oaLogin.vue @@ -1,10 +1,10 @@ + + \ No newline at end of file From e203b2bdd52298ff7eca5b7104cf283356cf3bfc Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Wed, 18 Oct 2023 09:04:06 +0800 Subject: [PATCH 10/20] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 193af11..4e7797f 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "里海社区", "appid" : "__UNI__B5B1EDD", "description" : "", - "versionName" : "1.2.3", - "versionCode" : 123, + "versionName" : "1.2.4", + "versionCode" : 124, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { From 6580c6f7cdd93e8b4d6bc0921eaefec6b4637af8 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Wed, 18 Oct 2023 09:05:00 +0800 Subject: [PATCH 11/20] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=9F=9F=E5=90=8D?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/app.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/app.js b/config/app.js index 7991a47..667bd25 100644 --- a/config/app.js +++ b/config/app.js @@ -5,6 +5,7 @@ let httpApiTwo; // 物流系统域名 // const env = 'dev'; // 开发 const env = 'prod'; // 生产 // const env = 'prew'; // 预上线 +// const env = 'local'; // 本地 switch (env) { case 'prod': @@ -17,6 +18,11 @@ switch (env) { httpApiThree = 'https://preview-worker-task.lihaink.cn' //预上线 httpApiTwo = 'https://preview-logistics.lihaink.cn' //预上线 break; + case 'local': + httpApi = 'http://192.168.1.12:8001' //预上线 + httpApiThree = 'http://192.168.1.12:8001' //预上线 + httpApiTwo = 'http://192.168.1.12:8001' //预上线 + break; default: httpApi = 'https://ceshi-worker-task.lihaink.cn' //测试 httpApiThree = 'https://ceshi-worker-task.lihaink.cn' //测试 From f72111d5691a5e4f2626ff3f9aa62012c93f3bef Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Wed, 18 Oct 2023 09:54:43 +0800 Subject: [PATCH 12/20] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 34 ++-------------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/pages.json b/pages.json index 6b13a39..66341e0 100644 --- a/pages.json +++ b/pages.json @@ -294,38 +294,8 @@ } ], - "subPackages": [{ - "root": "pages/views", - "name": "views", - "pages": [{ - "path": "application", - "style": { - "navigationBarTitleText": "地图首页", - "enablePullDownRefresh": false - } - }, - { - "path": "new_task", - "style": { - "navigationBarTitleText": "新建任务", - "enablePullDownRefresh": false - } - }, - { - "path": "com_approve", - "style": { - "navigationBarTitleText": "通用审批", - "enablePullDownRefresh": false - } - }, { - "path": "personal_center", - "style": { - "navigationBarTitleText": "个人中心1", - "enablePullDownRefresh": false - } - } - ], - "subPackages": [{ + "subPackages": [ + { "root": "pages/views", "name": "views", "pages": [{ From 3558026d1e55dd95fdf1b7436c81d8c422753f5e Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Wed, 18 Oct 2023 16:26:54 +0800 Subject: [PATCH 13/20] ceshui --- App.vue | 235 +++++++++++++++--------------- api/property.js | 6 +- config/app.js | 6 +- subpkg/property/agencyList.vue | 12 +- subpkg/property/buyCar.vue | 113 +++++++------- subpkg/property/chosseCompany.vue | 14 +- subpkg/property/contractList.vue | 2 +- subpkg/property/index.vue | 35 +++-- subpkg/property/vehicle_a.vue | 18 ++- 9 files changed, 241 insertions(+), 200 deletions(-) diff --git a/App.vue b/App.vue index 560e0bc..6151d7c 100644 --- a/App.vue +++ b/App.vue @@ -1,125 +1,132 @@ \ No newline at end of file diff --git a/api/property.js b/api/property.js index 5e316fa..e016efe 100644 --- a/api/property.js +++ b/api/property.js @@ -1,5 +1,5 @@ import oahttp from "@/utils/oahttp.js"; -import oahttp2 from "@/utils/logistics.js"; + // http://logistics.lihaink.cn/api/getCarHistory /** * 车辆列表 @@ -15,9 +15,9 @@ export const applycarApi = (data) => oahttp.post('/vehicle/rentApply', data) // 显示轨迹 export const locusApi = (data) => oahttp.post('/vehicle/vehicleTrack', data) // 获取可购买车辆列表 -export const canBuyCarListApi = (data) => oahttp.post('/vehicle/vehicleTrack', data) +export const canBuyCarListApi = (data) => oahttp.get('/vehicle/getFreeCars', data) // 购买车辆 -export const buyCarApi = (data) => oahttp.post('/vehicle/vehicleTrack', data) +export const buyCarApi = (data) => oahttp.post('/vehicle/buyCars', data) // 当前车辆位置信息 // export const locusApi = (data) => oahttp.post('/vehicle/vehicleTrack', data) // api / getCarLocal diff --git a/config/app.js b/config/app.js index c573f3d..3bc16c6 100644 --- a/config/app.js +++ b/config/app.js @@ -1,7 +1,7 @@ let httpApiThree; let httpApi; // 总域名 let httpApiTwo; // 物流系统域名 -let httpApiTest + const env = 'dev'; // 开发 // const env = 'prod'; // 生产 @@ -22,7 +22,7 @@ switch (env) { httpApi = 'https://ceshi-worker-task.lihaink.cn' //测试 httpApiThree = 'https://ceshi-worker-task.lihaink.cn' //测试 httpApiTwo = 'https://ceshi-logistics.lihaink.cn' //测试环境 - httpApiTest = 'http://192.168.1.11:8081' //测试环境 + //测试环境 } @@ -50,7 +50,7 @@ module.exports = { HTTP_REQUEST_URL: httpApi, HTTP_REQUEST_URL_THREE: httpApiThree, HTTP_REQUEST_URL_TWO: httpApiTwo, - httpApiTest: httpApiTest, + // #ifdef H5 //H5接口是浏览器地址 diff --git a/subpkg/property/agencyList.vue b/subpkg/property/agencyList.vue index 0699270..a607ffa 100644 --- a/subpkg/property/agencyList.vue +++ b/subpkg/property/agencyList.vue @@ -13,9 +13,15 @@ {{item.create_time.slice(0, 10)}} - + {{item.company_b_name}}提出租赁车辆一辆 + + {{item.company_b_name}}上传自有车辆一辆 + + + {{item.company_b_name}}提出解除租赁 + @@ -64,6 +70,10 @@ background-color: #FF7C32; color: white; padding: 0 10rpx; + font-size: 24rpx; + // line-height: rpx; + display: flex; + align-items: center; width: 200rpx; height: 50rpx; margin-right: 10rpx; diff --git a/subpkg/property/buyCar.vue b/subpkg/property/buyCar.vue index 4cccbac..0c0ebc8 100644 --- a/subpkg/property/buyCar.vue +++ b/subpkg/property/buyCar.vue @@ -13,29 +13,33 @@ - + - 车牌号: {{item.lincense}} + 车牌号: {{item.license}} - + + + 当前状态: 当前使用中 - - 当前状态: 平台公司闲置中 + + 当前状态: 闲置中 + - + - + 选择该车辆为监管车辆 @@ -55,12 +59,12 @@ - + - {{item.lincense}} + {{item.license}} - + @@ -86,53 +90,54 @@ queryCar: '', a: "https://tse3-mm.cn.bing.net/th/id/OIP-C.0xzWZj1_A-nzJiUBxrk8XQHaEo?w=298&h=186&c=7&r=0&o=5&pid=1.7", carList: [], - carListI: [{ - checked: [], - lincense: '川Y103D1' - }, { - checked: [], - lincense: '川Y103D6' - }, { - checked: [], - lincense: '川Y103D5' - }, { - checked: [], - lincense: '川Y103D4' - }, { - checked: [], - lincense: '川Y103D3' - }, { - checked: [], - lincense: '川Y103D2' - }], + carListI: [], showPop: false, - carCheckeList: [1, 1, 1, 1, 1, 1, 1, 1], + carCheckeList: [], carCheckedArr: [] } }, methods: { buyCarFn() { + + if (this.carCheckedArr.length == 0) { Toast("请先选择车辆!") return } - // buyCarApi({}).then(res => { - // Toast("购买成功!") - // setTimeout(() => { - // uni.navigateTo({ - // url: '/subpkg/property/index' - // }) - // }, 500) - // }) - uni.navigateTo({ - url: '/subpkg/property/index' + let data = [] + this.carList.forEach(item => { + this.carCheckedArr.forEach(items => { + if (item.id == items) { + data.push({ + id: item.id, + license: item.license + }) + } + }) }) + let datas = JSON.stringify(data) + + buyCarApi({ + cars: datas + }).then(res => { + Toast("申请成功!") + setTimeout(() => { + uni.redirectTo({ + url: '/subpkg/property/index' + }) + }, 1000) + + }) + // uni.navigateTo({ + // url: '/subpkg/property/index' + // }) }, queryCarFn() { this.carList = [] this.carListI.forEach(item => { - if (item.lincense.includes(this.queryCar)) { + // console.log(item.license) + if (item.license.includes(this.queryCar)) { this.carList.push(item) } }) @@ -147,11 +152,11 @@ } else { this.carCheckedArr.push(i) } - // console.log(this.carCheckedArr) + console.log(this.carCheckedArr) }, popChange(index) { this.checkboxChange(index) - console.log(this.carCheckedArr) + // console.log(this.carCheckedArr) }, close() { this.showPop = false @@ -165,11 +170,18 @@ } }, - onLoad() { - // canBuyCarListApi({}).then(res => { - // this.carListI = res.data - // }) - this.carList = Array.from(this.carListI); + onLoad(option) { + // console.log(option.license) + canBuyCarListApi().then(res => { + res.data.forEach(item => { + if (item.license == option.license) { + item.flag = true + } + }) + + this.carListI = res.data + this.carList = Array.from(this.carListI); + }) } @@ -185,7 +197,6 @@ padding: 20rpx; background-color: #fff; - // padding-bottom: 200rpx; .car-info { display: flex; justify-content: space-between; @@ -220,7 +231,7 @@ // margin-right: 30rpx; width: 182.5rpx; display: flex; - // justify-content: ; + // justify-tent: ; flex-direction: column; align-items: center; position: relative; @@ -238,7 +249,7 @@ height: 100rpx; position: fixed; bottom: 0; - z-index: 1000000; + z-index: 1000; width: 100vw; box-sizing: border-box; border-radius: 30rpx 30rpx 0 0; diff --git a/subpkg/property/chosseCompany.vue b/subpkg/property/chosseCompany.vue index 0212da2..5df8813 100644 --- a/subpkg/property/chosseCompany.vue +++ b/subpkg/property/chosseCompany.vue @@ -46,12 +46,12 @@ 自有车辆 - + - + - 车牌号：{{dataList.cars_info.license}} + 车牌号：{{item.license}} @@ -133,7 +133,7 @@ {{typeFn( dataList.type) }} - {{'2023-03-03'}} + {{dataList.update_time}} @@ -202,11 +202,11 @@ this.dataList = res.data.vehicleContract this.carList = res.data.vehicleRentCars this.checked = [this.carList[0]?.car_id] || '' - this.dataList.cars_info = JSON.parse(this.dataList.cars_info) || "" + // if (this.dataList.status == 3) { // uni.navigateBack() // } - console.log(this.dataList.cars_info.pic) + if (this.carList.length > 0 || this.dataList.cars_info) { this.flag1 = false } @@ -244,7 +244,7 @@ return "租赁合同" } if (status == 1) { - return "自有车两" + return "自有车辆" } if (status == 2) { "解除合同" diff --git a/subpkg/property/contractList.vue b/subpkg/property/contractList.vue index 67c5842..4d472f7 100644 --- a/subpkg/property/contractList.vue +++ b/subpkg/property/contractList.vue @@ -30,7 +30,7 @@ export default { data() { return { - datasList: [1, 2, 3], + datasList: [], } }, onLoad() { diff --git a/subpkg/property/index.vue b/subpkg/property/index.vue index 8c719cc..e0e6077 100644 --- a/subpkg/property/index.vue +++ b/subpkg/property/index.vue @@ -4,6 +4,7 @@ + @@ -43,7 +44,7 @@ - 上传头像 + 上传车辆图片 @@ -59,8 +60,6 @@ - - @@ -77,6 +76,7 @@ ... + @@ -85,11 +85,10 @@ - + 您的购车申请已经提交，我们正在加快审核中，请耐心等待，在此期间您可以继续使用车辆完成配送任务哦~ ... - @@ -106,16 +105,16 @@ + + - - - + @@ -139,7 +138,7 @@ - 上传头像 + 上传车辆图片 @@ -213,7 +212,6 @@ - @@ -309,7 +307,7 @@ leaseApi, upVehicleApi, getAgencyDetailApi, - getvehicleDetailApi, + // getvehicleDetailApi, villageCompanyApi, } from "@/api/property.js" @@ -352,7 +350,7 @@ }, onLoad() { - this.initIndex() + // this.initIndex() setTimeout(() => { this.flag = true }) @@ -368,21 +366,27 @@ methods: { // 初始化页面 initIndex() { - let type = (JSON.parse(Cache.get("USER_INFO")).company.company_type) + let type = this.$store.state.app.userInfo.company.company_type + this.company_type = type // 小组公司 if (type == 18) { villageCompanyApi().then(res => { this.showLoading = false this.datas = res.data - this.step = res.data?.status || 9999 + console.log(res.data?.id) + if (res.data?.id) { + this.step = res.data?.status + } else { + this.step = 9999 + + } if (this.step == 3) { uni.redirectTo({ url: `/subpkg/property/vehicle_a?id=${res.data.cars_info.id}` }) } }) - } // 镇街公司 else { @@ -441,7 +445,6 @@ }) }, 2000) }) - this.show = false this.noInfo = false diff --git a/subpkg/property/vehicle_a.vue b/subpkg/property/vehicle_a.vue index 9bcc7ab..b21fa64 100644 --- a/subpkg/property/vehicle_a.vue +++ b/subpkg/property/vehicle_a.vue @@ -24,7 +24,9 @@ 行驶总里程: {{datas.mileage}} - 自有车辆 + 购买车辆 + 租赁车辆 + 自有车辆 承租公司: @@ -68,7 +70,9 @@ - 《租赁合同》 + 《租赁合同》 + 《自有车辆合同》 + 《购车合同》 {{ datas.create_time}} @@ -85,7 +89,8 @@ - + @@ -173,6 +178,11 @@ url }) }, + navTo2(url) { + uni.redirectTo({ + url + }) + }, // 计算到期时间 overDateFn(date) { var specifiedDate = new Date(date); @@ -218,7 +228,7 @@ end_time: `${this.queryData} 23:59:59`, start_time: `${this.queryData} 00:00:00`, }).then(res => { - console.log(res.data) + // console.log(res.data) this.markers[0].latitude = res.data[0].latitude this.markers[0].longitude = res.data[0].longitude this.polyline = [{ From ce5e98f8fe86617ffb8affdd7d558f54b5b1fa86 Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Thu, 19 Oct 2023 09:04:58 +0800 Subject: [PATCH 14/20] =?UTF-8?q?=E4=B8=89=E8=BD=AE=E8=BD=A6=E8=B4=AD?= =?UTF-8?q?=E4=B9=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- subpkg/property/index.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/subpkg/property/index.vue b/subpkg/property/index.vue index e0e6077..d3b5f19 100644 --- a/subpkg/property/index.vue +++ b/subpkg/property/index.vue @@ -176,6 +176,7 @@ 可监管车辆数量 {{datas.monitor_num}} + 购买车辆 {{datas.buy_num}} 租赁 {{datas.rent_num}}(待审核:{{datas.apply_num}}) @@ -230,7 +231,8 @@ {{item.rent_user.user_name}} 自有车辆 - 租赁车辆 + 租赁车辆 + 购买车辆 @@ -393,8 +395,7 @@ getvehicleListApi().then(res => { this.datas = res.data res.data.apply.length >= 2 ? this.applicationList = res.data.apply : this.applicationList = - res - .data.apply.slice(0, 2) + res.data.apply.slice(0, 2) this.dataList = res.data.car_list this.showLoading = false }) From 5b18e4c495288ea4b522f5f74536e5f4f098fe12 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Thu, 19 Oct 2023 11:42:49 +0800 Subject: [PATCH 15/20] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=E9=95=87?= =?UTF-8?q?=E5=85=AC=E5=8F=B8=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/task.js | 7 +- components/task/taskItem.vue | 38 +- config/app.js | 4 +- pages.json | 764 +++++++++--------- subpkg/townTask/marketTask10.vue | 277 +++++++ .../serviceTask4.vue | 4 +- .../serviceTask.vue => townTask/townTask.vue} | 10 +- 7 files changed, 697 insertions(+), 407 deletions(-) create mode 100644 subpkg/townTask/marketTask10.vue rename subpkg/{serviceTask => townTask}/serviceTask4.vue (98%) rename subpkg/{serviceTask/serviceTask.vue => townTask/townTask.vue} (91%) diff --git a/api/task.js b/api/task.js index d52461d..06c7593 100644 --- a/api/task.js +++ b/api/task.js @@ -44,9 +44,14 @@ export const taskOtherTaskCommit = (data) => oahttp.post('/task/commit_other_tas /** * 任务:服务任务详情 */ -export const serviceTaskDetails = (data) => oahttp.get('/task/service_task_detail', data) +export const townTaskDetails = (data) => oahttp.get('/task/service_task_detail', data) /** * 任务:提交督促小组服务团队学习任务 */ export const serviceTask4Commit = (data) => oahttp.post('/task/commit_town_task_type4', data) + +/** + * 任务:数字农贸宣传、加工业务建设和招商任务提交 + */ +export const marketTask10Commit = (data) => oahttp.post('/task/commit_town_task_type_marketing_director_10', data) diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue index 9df0226..598be73 100644 --- a/components/task/taskItem.vue +++ b/components/task/taskItem.vue @@ -66,7 +66,7 @@ 进行中 + v-else-if="townService(datas.type)"> {{extend.total-extend.not_done_count||0}}/{{extend.total||0}} @@ -119,7 +119,12 @@ }, data() { return { - extend: {} + extend: {}, + // 以下从左至右分别为: 服务部长,市场部长,负责人 + taskRoleTypeList: ['town_task_type', 'town_task_type_marketing_director', 'town_task_type_master'], + townServiceList: [44,45,46,47,48,49,50], // 镇农科服务部长任务 + navToTownServiceList: [44,45,46,48,49,50], // 镇农科服务部长跳转/subpkg/townTask/townTask的任务 0 + navToTownMarketList: [51,53,54,55,57,58,59] // 镇农科市场部长跳转/subpkg/townTask/townTask的任务 1 }; }, mounted() { @@ -145,6 +150,10 @@ // if ((this.$props.datas.type != 31) && this.$props.datas.status !== 2 && this.$props.datas.status !== 1) { // return this.$props.datas.status == 3 ? Toast('任务已完成!') : Toast('任务已结束!'); // } + if(this.navToTownServiceList.includes(this.$props.datas.type)) + return this.navTo(`/subpkg/townTask/townTask?task_id=${this.$props.datas?.id}&type_value=${this.taskRoleTypeList[0]}`); + if(this.navToTownMarketList.includes(this.$props.datas.type)) + return this.navTo(`/subpkg/townTask/townTask?task_id=${this.$props.datas?.id}&type_value=${this.taskRoleTypeList[1]}`); switch (this.$props.datas.type) { case 31: if (this.$store.state.app.userInfo.admin_id) this.navTo( @@ -165,32 +174,21 @@ case 35: this.navTo(`/subpkg/buyShare/buyShare?task_id=${this.$props.datas?.id}`); break; - case 44: - this.navTo(`/subpkg/serviceTask/serviceTask?task_id=${this.$props.datas?.id}`); - break; - case 45: - this.navTo(`/subpkg/serviceTask/serviceTask?task_id=${this.$props.datas?.id}`); - break; - case 46: - this.navTo(`/subpkg/serviceTask/serviceTask?task_id=${this.$props.datas?.id}`); - break; case 47: - this.navTo(`/subpkg/serviceTask/serviceTask4?task_id=${this.$props.datas?.id}`); + this.navTo(`/subpkg/townTask/serviceTask4?task_id=${this.$props.datas?.id}`); break; - case 48: - this.navTo(`/subpkg/serviceTask/serviceTask?task_id=${this.$props.datas?.id}`); - break; - case 49: - this.navTo(`/subpkg/serviceTask/serviceTask?task_id=${this.$props.datas?.id}`); - break; - case 50: - this.navTo(`/subpkg/serviceTask/serviceTask?task_id=${this.$props.datas?.id}`); + case 60: + this.navTo(`/subpkg/townTask/marketTask10?task_id=${this.$props.datas?.id}&stage=${this.$props.datas?.stage}`); break; default: this.navTo(''); break; } }, + // 服务部长任务 + townService(type){ + return this.townServiceList.includes(type); + }, isTimeInRange() { const now = new Date(); const startTime = new Date(now.getTime()); diff --git a/config/app.js b/config/app.js index d8a0857..b4029a6 100644 --- a/config/app.js +++ b/config/app.js @@ -2,8 +2,8 @@ let httpApiThree; let httpApi; // 总域名 let httpApiTwo; // 物流系统域名 -// const env = 'dev'; // 开发 -const env = 'prod'; // 生产 +const env = 'dev'; // 开发 +// const env = 'prod'; // 生产 // const env = 'prew'; // 预上线 // const env = 'local'; // 本地 diff --git a/pages.json b/pages.json index 66341e0..308d5a7 100644 --- a/pages.json +++ b/pages.json @@ -294,8 +294,7 @@ } ], - "subPackages": [ - { + "subPackages": [{ "root": "pages/views", "name": "views", "pages": [{ @@ -391,50 +390,50 @@ "root": "subpkg", "name": "subpkg", "pages": [{ - "path": "personnel/personnel", - "style": { - "navigationBarTitleText": "人员管理", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + "path": "personnel/personnel", + "style": { + "navigationBarTitleText": "人员管理", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "finance/finance", - "style": { - "navigationBarTitleText": "财务管理", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "finance/finance", + "style": { + "navigationBarTitleText": "财务管理", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "topUp/topUp", - "style": { - "navigationBarTitleText": "账户充值", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white", - "app-plus": { - "titleNView": { - "buttons": [{ - "color": "#fff", - "text": "充值记录", - "fontSize": "15", - "width": "90" - }] + }, { + "path": "topUp/topUp", + "style": { + "navigationBarTitleText": "账户充值", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white", + "app-plus": { + "titleNView": { + "buttons": [{ + "color": "#fff", + "text": "充值记录", + "fontSize": "15", + "width": "90" + }] + } } } - } - }, { - "path": "contract/contract", - "style": { - "navigationBarTitleText": "合同管理", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0022C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "contract/contract", + "style": { + "navigationBarTitleText": "合同管理", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0022C7", + "navigationBarTextStyle": "white" + } }, { "path": "topUpDeposit/topUpDeposit", @@ -455,50 +454,50 @@ "navigationBarTextStyle": "white" } - }, { - "path": "contractDetail/contractDetail", - "style": { - "navigationBarTitleText": "合同详情", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "contractDetail/contractDetail", + "style": { + "navigationBarTitleText": "合同详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "pdfView/pdfView", - "style": { - "navigationBarTitleText": "合同内容", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "pdfView/pdfView", + "style": { + "navigationBarTitleText": "合同内容", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "companyInfo/companyInfo", - "style": { - "navigationBarTitleText": "公司信息", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "companyInfo/companyInfo", + "style": { + "navigationBarTitleText": "公司信息", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "companySign/companySign", - "style": { - "navigationBarTitleText": "签约公司详情", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "companySign/companySign", + "style": { + "navigationBarTitleText": "签约公司详情", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "personnelDetails/personnelDetails", - "style": { - "navigationBarTitleText": "人员详细信息", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "personnelDetails/personnelDetails", + "style": { + "navigationBarTitleText": "人员详细信息", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } }, { "path": "orderDetail/orderDetail", @@ -509,122 +508,122 @@ "navigationBarTextStyle": "white" } - }, { - "path": "withdrawDeposit/withdrawDeposit", - "style": { - "navigationBarTitleText": "提现余额", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white", - "app-plus": { - "titleNView": { - "buttons": [{ - "color": "#fff", - "text": "提现记录", - "fontSize": "15", - "width": "90" - }] + }, { + "path": "withdrawDeposit/withdrawDeposit", + "style": { + "navigationBarTitleText": "提现余额", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white", + "app-plus": { + "titleNView": { + "buttons": [{ + "color": "#fff", + "text": "提现记录", + "fontSize": "15", + "width": "90" + }] + } } } - } - }, { - "path": "withdrawDeposit/company", - "style": { - "navigationBarTitleText": "提现", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white", - "app-plus": { - "titleNView": { - "buttons": [{ - "color": "#fff", - "text": "提现记录", - "fontSize": "15", - "width": "90" - }] + }, { + "path": "withdrawDeposit/company", + "style": { + "navigationBarTitleText": "提现", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white", + "app-plus": { + "titleNView": { + "buttons": [{ + "color": "#fff", + "text": "提现记录", + "fontSize": "15", + "width": "90" + }] + } } } - } - }, { - "path": "withdrawList/withdrawList", - "style": { - "navigationBarTitleText": "提现记录", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "withdrawList/withdrawList", + "style": { + "navigationBarTitleText": "提现记录", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "noticeList/noticeList", - "style": { - "navigationBarTitleText": "公告列表", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "noticeList/noticeList", + "style": { + "navigationBarTitleText": "公告列表", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "topUpList/topUpList", - "style": { - "navigationBarTitleText": "充值记录", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "topUpList/topUpList", + "style": { + "navigationBarTitleText": "充值记录", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "companyAdmin/companyAdmin", - "style": { - "navigationBarTitleText": "公司管理", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "companyAdmin/companyAdmin", + "style": { + "navigationBarTitleText": "公司管理", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "newPersonnel/newPersonnel", - "style": { - "navigationBarTitleText": "新增人员", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "newPersonnel/newPersonnel", + "style": { + "navigationBarTitleText": "新增人员", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "archives/archives", - "style": { - "navigationBarTitleText": "档案管理", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "archives/archives", + "style": { + "navigationBarTitleText": "档案管理", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "newArchives/newArchives", - "style": { - "navigationBarTitleText": "信息登记", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "newArchives/newArchives", + "style": { + "navigationBarTitleText": "信息登记", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "updateArchives/updateArchives", - "style": { - "navigationBarTitleText": "信息更新", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "updateArchives/updateArchives", + "style": { + "navigationBarTitleText": "信息更新", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "fixedAssets/fixedAssets", - "style": { - "navigationBarTitleText": "固定资产", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "fixedAssets/fixedAssets", + "style": { + "navigationBarTitleText": "固定资产", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } }, { "path": "taskAdmin/taskAdmin", @@ -635,222 +634,231 @@ "navigationBarTextStyle": "white" } - }, { - "path": "archivesDetail/archivesDetail", - "style": { - "navigationBarTitleText": "档案详情", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "archivesDetail/archivesDetail", + "style": { + "navigationBarTitleText": "档案详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "captain/captain", - "style": { - "navigationBarTitleText": "队长列表", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "captain/captain", + "style": { + "navigationBarTitleText": "队长列表", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "companyFinance/companyFinance", - "style": { - "navigationBarTitleText": "公司财务", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "companyFinance/companyFinance", + "style": { + "navigationBarTitleText": "公司财务", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "companyUnsign/companyUnsign", - "style": { - "navigationBarTitleText": "未签约公司列表", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "companyUnsign/companyUnsign", + "style": { + "navigationBarTitleText": "未签约公司列表", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "submit/submit", - "style": { - "navigationBarTitleText": "提交审核", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "submit/submit", + "style": { + "navigationBarTitleText": "提交审核", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "dispatching/dispatching", - "style": { - "navigationBarTitleText": "任务:宣传配送", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "dispatching/dispatching", + "style": { + "navigationBarTitleText": "任务:宣传配送", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "blockTransaction/blockTransaction", - "style": { - "navigationBarTitleText": "任务:片区交易", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "blockTransaction/blockTransaction", + "style": { + "navigationBarTitleText": "任务:片区交易", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "fileTask/fileTask", - "style": { - "navigationBarTitleText": "已更新商机", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "fileTask/fileTask", + "style": { + "navigationBarTitleText": "已更新商机", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "property/index", - "style": { - "navigationBarTitleText": "资产管理", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "property/index", + "style": { + "navigationBarTitleText": "资产管理", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "property/chosseCompany", - "style": { - "navigationBarTitleText": "选择公司", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "property/chosseCompany", + "style": { + "navigationBarTitleText": "选择公司", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "property/vehicle", - "style": { - "navigationBarTitleText": "三轮车游走", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "property/vehicle", + "style": { + "navigationBarTitleText": "三轮车游走", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "property/vehicle_a", - "style": { - "navigationBarTitleText": "三轮车详情", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "property/vehicle_a", + "style": { + "navigationBarTitleText": "三轮车详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "property/success", - "style": { - "navigationBarTitleText": "生成合同", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "property/success", + "style": { + "navigationBarTitleText": "生成合同", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "property/contractList", - "style": { - "navigationBarTitleText": "合同列表", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "property/contractList", + "style": { + "navigationBarTitleText": "合同列表", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "buyShare/buyShare", - "style": { - "navigationBarTitleText": "任务:入股任务", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "buyShare/buyShare", + "style": { + "navigationBarTitleText": "任务:入股任务", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "otherTask/otherTask", - "style": { - "navigationBarTitleText": "任务:其他任务", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "otherTask/otherTask", + "style": { + "navigationBarTitleText": "任务:其他任务", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "property/agencyList", - "style": { - "navigationBarTitleText": "签约列表", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "property/agencyList", + "style": { + "navigationBarTitleText": "签约列表", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "shareCapital/shareCapital", - "style": { - "navigationBarTitleText": "股金管理", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "shareCapital/shareCapital", + "style": { + "navigationBarTitleText": "股金管理", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "merchantAudit/merchantAudit", - "style": { - "navigationBarTitleText": "商户入驻审核", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "merchantAudit/merchantAudit", + "style": { + "navigationBarTitleText": "商户入驻审核", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "merchantTransaction/merchantTransaction", - "style": { - "navigationBarTitleText": "商户交易审核", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "merchantTransaction/merchantTransaction", + "style": { + "navigationBarTitleText": "商户交易审核", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "merchantDetails/merchantDetails", - "style": { - "navigationBarTitleText": "商户详情", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "merchantDetails/merchantDetails", + "style": { + "navigationBarTitleText": "商户详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "serviceTask/serviceTask4", - "style": { - "navigationBarTitleText": "督促团队学习", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } - }, { - "path": "serviceTask/serviceTask", - "style": { - "navigationBarTitleText": "任务", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + },{ + "path": "townTask/marketTask10", + "style": { + "navigationBarTitleText": "任务详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + }, { + "path": "townTask/serviceTask4", + "style": { + "navigationBarTitleText": "督促团队学习", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + }, { + "path": "townTask/townTask", + "style": { + "navigationBarTitleText": "任务详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "complaint/complaint", - "style": { - "navigationBarTitleText": "投诉反馈", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "complaint/complaint", + "style": { + "navigationBarTitleText": "投诉反馈", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }] + } + ] }], "globalStyle": { "navigationBarTextStyle": "black", diff --git a/subpkg/townTask/marketTask10.vue b/subpkg/townTask/marketTask10.vue new file mode 100644 index 0000000..1610084 --- /dev/null +++ b/subpkg/townTask/marketTask10.vue @@ -0,0 +1,277 @@ + + + + + \ No newline at end of file diff --git a/subpkg/serviceTask/serviceTask4.vue b/subpkg/townTask/serviceTask4.vue similarity index 98% rename from subpkg/serviceTask/serviceTask4.vue rename to subpkg/townTask/serviceTask4.vue index af705a9..8cdbb38 100644 --- a/subpkg/serviceTask/serviceTask4.vue +++ b/subpkg/townTask/serviceTask4.vue @@ -57,7 +57,7 @@ upLoadImage, } from "@/api/file.js"; import { Toast } from "../../libs/uniApi"; - import { serviceTaskDetails, serviceTask4Commit } from "@/api/task.js" + import { townTaskDetails, serviceTask4Commit } from "@/api/task.js" export default { data() { return { @@ -95,7 +95,7 @@ methods: { async initTask() { this.skeleton = true; - let res = await serviceTaskDetails({ + let res = await townTaskDetails({ id: this.taskInfo.id }); this.taskInfo = res.data; diff --git a/subpkg/serviceTask/serviceTask.vue b/subpkg/townTask/townTask.vue similarity index 91% rename from subpkg/serviceTask/serviceTask.vue rename to subpkg/townTask/townTask.vue index 7498888..ab1aa6c 100644 --- a/subpkg/serviceTask/serviceTask.vue +++ b/subpkg/townTask/townTask.vue @@ -18,7 +18,7 @@