From 3bc4b861dd85bd1b253898af693ce9693a707209 Mon Sep 17 00:00:00 2001 From: THK3121 Date: Tue, 22 Aug 2023 16:01:58 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 57 +- components/property/vehicleCard.vue | 125 ++++ pages.json | 38 +- pages/oaHome/oaHome.vue | 8 +- static/css/style.scss | 7 +- static/img/home/ZCGL.png | Bin 0 -> 1550 bytes static/img/logistics/QS.png | Bin 3513 -> 1779 bytes static/img/logistics/SJ.png | Bin 3555 -> 1465 bytes static/server/contract.js | 4 +- static/server/server.js | 876 ++++++++++++----------- subpkg/companyInfo/companyInfo.vue | 3 + subpkg/finance/finance.vue | 12 +- subpkg/property/chosseCompany.vue | 126 ++++ subpkg/property/index.vue | 223 ++++++ subpkg/{vehicle => property}/vehicle.vue | 263 +++---- 15 files changed, 1068 insertions(+), 674 deletions(-) create mode 100644 components/property/vehicleCard.vue create mode 100644 static/img/home/ZCGL.png create mode 100644 subpkg/property/chosseCompany.vue create mode 100644 subpkg/property/index.vue rename subpkg/{vehicle => property}/vehicle.vue (60%) diff --git a/App.vue b/App.vue index 981841d..a598798 100644 --- a/App.vue +++ b/App.vue @@ -4,28 +4,6 @@ // #endif export default { onLaunch: async function() { - const audioContext = uni.createInnerAudioContext() - // 设置音频文件地址 - audioContext.src = './static/mp3/order.mp3' - let noticeArr = [] - // 播放音频 - //#ifdef APP-PLUS - jpushModule.addNotificationListener(res => { - if (!noticeArr.includes(res.messageID)) { - console.log(res.messageID) - audioContext.play() - noticeArr.push(res.messageID) - console.log("app的") - uni.vibrateLong({ - success: function() { - console.log('success'); - } - }); - } - - - }) - // #endif console.log('App Launch') try { if (!this.$store.state.app.token) uni.redirectTo({ @@ -49,20 +27,29 @@ // }) }, onShow: function() { + const audioContext = uni.createInnerAudioContext() + // 设置音频文件地址 + audioContext.src = './static/mp3/order.mp3' + let noticeArr = [] + // 播放音频 + //#ifdef APP-PLUS + jpushModule.addNotificationListener(res => { + if (!noticeArr.includes(res.messageID)) { + console.log(res.messageID) + audioContext.play() + noticeArr.push(res.messageID) + console.log("app的") + uni.vibrateLong({ + success: function() { + console.log('success'); + } + }); + } + + + }) + // #endif console.log('App Show') - // 创建内部音频对象 - // const audioContext = uni.createInnerAudioContext() - - // // 设置音频文件地址 - // audioContext.src = './static/mp3/order.mp3' - - // // 播放音频 - // //#ifdef APP-PLUS - // jpushModule.addNotificationListener(res => { - // console.log("监听成功") - // audioContext.play() - // }) - // // #endif }, onHide: function() { console.log('App Hide') diff --git a/components/property/vehicleCard.vue b/components/property/vehicleCard.vue new file mode 100644 index 0000000..374bded --- /dev/null +++ b/components/property/vehicleCard.vue @@ -0,0 +1,125 @@ + + + + + \ No newline at end of file diff --git a/pages.json b/pages.json index d8fea38..b935288 100644 --- a/pages.json +++ b/pages.json @@ -269,14 +269,14 @@ "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", @@ -477,10 +477,28 @@ } }, { - "path": "vehicle/vehicle", + "path": "property/index", + "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, + "enablePullDownRefresh": true, "navigationBarBackgroundColor": "#0122C7", "navigationBarTextStyle": "white" } diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue index 02e2f64..8489208 100644 --- a/pages/oaHome/oaHome.vue +++ b/pages/oaHome/oaHome.vue @@ -96,7 +96,7 @@ + height="65rpx"> {{ item.text }} @@ -258,8 +258,8 @@ that.$refs.globalPopup.showPopu(); that.getOrderList(); console.log("idnex的"); + that.notArr.push(result.messageID); } - that.notArr.push(result.messageID); }); // #endif @@ -291,6 +291,7 @@ // }) // }, async getOrderList() { + console.log("列表") let id = JSON.parse(uni.getStorageSync("USER_INFO")).id || ""; let res = await getList({ user_id: id, @@ -426,6 +427,7 @@ }, }, onPullDownRefresh() { + this.getOrderList(); // this.getIndexList() uni.stopPullDownRefresh(); }, @@ -565,7 +567,7 @@ /* 设置元素宽度，根据需要进行调整 */ .text_time { display: inline-block; - background-color: #ff8c1a; + background-color: #ff7c32; color: white; padding: 5rpx 10rpx; margin-right: 10rpx; diff --git a/static/css/style.scss b/static/css/style.scss index e7db236..18fabf8 100644 --- a/static/css/style.scss +++ b/static/css/style.scss @@ -2,7 +2,12 @@ vertical-align: middle; /* 垂直居中对齐 */ } - +.lg_status1 { + color: #40bc5e; +} +.lg_status2 { + color: #ff7c32; +} .font-bg-red, .font_bg-red { display: inline-block; diff --git a/static/img/home/ZCGL.png b/static/img/home/ZCGL.png new file mode 100644 index 0000000000000000000000000000000000000000..ae0b14a421f96e916ebc70074566735c6d40815f GIT binary patch literal 1550 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 Vjdz##ML_@n002ovPDHLkV1l%GNfQ77 literal 3513 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 diff --git a/static/img/logistics/SJ.png b/static/img/logistics/SJ.png index bbcd672570e01771f61b0f9529e43ceefb52c224..bc6a8c98b1b76d18af09c942912a2e723e341f4e 100644 GIT binary patch literal 1465 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 { - uni.navigateTo({ - url: `/pages/service_hall/party_building?pid=${pid}&title=${t}&village_id=${id}` - }) - } - }, - { - title: '村务动态', - text: '村务信息公开', - src: 'cwdt@2x.png', - color: '#4DB896', - pid: 300, - navCallBack: (pid, t, id) => { - uni.navigateTo({ - url: `/pages/service_hall/party_building?pid=${pid}&title=${t}&village_id=${id}` - }) - } - }, - { - title: '村镇新闻', - text: '村镇新闻资讯', - src: 'czxw@2x.png', - color: '#FFAA33', - pid: 304, - navCallBack: (pid, t, id) => { - uni.navigateTo({ - url: `/pages/service_hall/list?id=${pid}&title=${t}&village_id=${id}` - }) - } - }, - { - title: '文明实践', - text: '文明创建实践', - src: 'wmsj@2x.png', - color: '#FF7A3D', - pid: '', - navCallBack: (pid, t, id) => { - uni.navigateTo({ - url: `/pages/service_hall/opens` - }) - } - } +export const openList = [{ + title: '党建在线', + text: '党建资讯文章', + src: 'djzx@2x.png', + color: '#FF614D', + pid: 295, + navCallBack: (pid, t, id) => { + uni.navigateTo({ + url: `/pages/service_hall/party_building?pid=${pid}&title=${t}&village_id=${id}` + }) + } + }, + { + title: '村务动态', + text: '村务信息公开', + src: 'cwdt@2x.png', + color: '#4DB896', + pid: 300, + navCallBack: (pid, t, id) => { + uni.navigateTo({ + url: `/pages/service_hall/party_building?pid=${pid}&title=${t}&village_id=${id}` + }) + } + }, + { + title: '村镇新闻', + text: '村镇新闻资讯', + src: 'czxw@2x.png', + color: '#FFAA33', + pid: 304, + navCallBack: (pid, t, id) => { + uni.navigateTo({ + url: `/pages/service_hall/list?id=${pid}&title=${t}&village_id=${id}` + }) + } + }, + { + title: '文明实践', + text: '文明创建实践', + src: 'wmsj@2x.png', + color: '#FF7A3D', + pid: '', + navCallBack: (pid, t, id) => { + uni.navigateTo({ + url: `/pages/service_hall/opens` + }) + } + } ] -export const quickLink = [ - { - icon: 'scfw', - src: 'scfw.png', - name: '商超服务', - url: '/pages/fast_track/production', - category_id: 25 - }, - { - icon: 'nfcp', - src: 'nfcp.png', - name: '农副产品', - url: '/pages/fast_track/production', - category_id: 26 - }, { - icon: 'sczl', - src: 'sczl.png', - name: '生产资料', - url: '/pages/fast_track/production', - category_id: 22 - }, { - icon: 'shfw', - src: 'shfw.png', - name: '生活服务', - // url: '/pages/fast_track/service_life', - url: '/pages/fast_track/production', - category_id: 23 - }, { - icon: 'hbxs', - src: 'hbxs.png', - name: '红白喜事', - // url: '/pages/fast_track/red_white_thing', - url: '/pages/fast_track/production', - category_id: 21 - }, { - icon: 'wyly', - src: 'wyly.png', - name: '文娱旅游', - // url: '/pages/fast_track/travel' - }, { - icon: 'fwzx', - src: 'fwzx.png', - name: '房屋装修', - // url: '/pages/fast_track/fitment' - }, { - icon: 'jypx', - src: 'jypx.png', - name: '教育资讯', - // url: '/pages/fast_track/education' - }, { - icon: 'msgy', - src: 'msgy.png', - name: '民生资讯', - // url: '/pages/fast_track/public_benefit' - }, { - icon: 'ylbj', - src: 'ylbj.png', - name: '医疗资讯' - } +export const quickLink = [{ + icon: 'scfw', + src: 'scfw.png', + name: '商超服务', + url: '/pages/fast_track/production', + category_id: 25 + }, + { + icon: 'nfcp', + src: 'nfcp.png', + name: '农副产品', + url: '/pages/fast_track/production', + category_id: 26 + }, { + icon: 'sczl', + src: 'sczl.png', + name: '生产资料', + url: '/pages/fast_track/production', + category_id: 22 + }, { + icon: 'shfw', + src: 'shfw.png', + name: '生活服务', + // url: '/pages/fast_track/service_life', + url: '/pages/fast_track/production', + category_id: 23 + }, { + icon: 'hbxs', + src: 'hbxs.png', + name: '红白喜事', + // url: '/pages/fast_track/red_white_thing', + url: '/pages/fast_track/production', + category_id: 21 + }, { + icon: 'wyly', + src: 'wyly.png', + name: '文娱旅游', + // url: '/pages/fast_track/travel' + }, { + icon: 'fwzx', + src: 'fwzx.png', + name: '房屋装修', + // url: '/pages/fast_track/fitment' + }, { + icon: 'jypx', + src: 'jypx.png', + name: '教育资讯', + // url: '/pages/fast_track/education' + }, { + icon: 'msgy', + src: 'msgy.png', + name: '民生资讯', + // url: '/pages/fast_track/public_benefit' + }, { + icon: 'ylbj', + src: 'ylbj.png', + name: '医疗资讯' + } ] // oaHOme快速入口数据 -export const oaHomeData = [ - { - text: '公司信息', - icon: prefix + 'oa/qjsq@2x.png', - url: '/subpkg/companyInfo/companyInfo', - admin: true - }, - { - text: '人员管理', - icon: prefix + 'oa/ccsq@2x.png', - url: '/subpkg/personnel/personnel', - admin: true - }, - // { - // text: '固定资产', - // icon: prefix + 'oa/wcsq@2x.png', - // url: '/subpkg/fixedAssets/fixedAssets', - // admin: true - // }, - { - text: '合同管理', - icon: prefix + 'oa/cgsq@2x.png', - url: '/subpkg/contract/contract' - }, - // { - // text: '公司管理', - // icon: prefix + 'oa/bxsq@2x.png', - // url: '/subpkg/companyAdmin/companyAdmin', - // admin: true - // }, - { - text: '任务管理', - icon: prefix + 'oa/bxsq@2x.png', - url: '/subpkg/taskAdmin/taskAdmin', - }, - { - text: '档案管理', - icon: prefix + 'oa/bxsq@2x.png', - url: '/subpkg/captain/captain', - admin: true - }, - { - text: '档案管理', - icon: prefix + 'oa/bxsq@2x.png', - url: '/subpkg/archives/archives', - captain: true - }, - // { - // text: '片区经理', - // icon: prefix + 'oa/yzsq@2x.png', - // url: '/pages/oaManager/oaManager', - // admin: true - // }, - { - text: '个人财务', - icon: prefix + 'oa/gengduo@2x.png', - url: '/subpkg/finance/finance' - }, - // { - // text: '出差申请', - // icon: prefix + 'oa/ccsq@2x.png' - // }, - // { - // text: '外出申请', - // icon: prefix + 'oa/wcsq@2x.png' - // }, - // { - // text: '采购申请', - // icon: prefix + 'oa/cgsq@2x.png' - // }, - // { - // text: '物品维修', - // icon: prefix + 'oa/bxsq@2x.png' - // }, - // { - // text: '用章申请', - // icon: prefix + 'oa/yzsq@2x.png' - // }, - // { - // text: '报销申请', - // icon: prefix + 'oa/gengduo@2x.png' - // }, - { - text: '更多', - icon: prefix + 'oa/wpwx@2x.png', - url: '/pages/views/application' - } +export const oaHomeData = [{ + text: '公司信息', + icon: prefix + 'oa/qjsq@2x.png', + // icon: "@/static/img/home/GSXX", + url: '/subpkg/companyInfo/companyInfo', + admin: true + }, + { + text: '人员管理', + icon: prefix + 'oa/ccsq@2x.png', + url: '/subpkg/personnel/personnel', + admin: true + }, + // { + // text: '固定资产', + // icon: prefix + 'oa/wcsq@2x.png', + // url: '/subpkg/fixedAssets/fixedAssets', + // admin: true + // }, + { + text: '合同管理', + // icon: prefix + 'oa/cgsq@2x.png', + icon: "../../static/img/home/GSXX.png", + url: '/subpkg/contract/contract' + }, + // { + // text: '公司管理', + // icon: prefix + 'oa/bxsq@2x.png', + // url: '/subpkg/companyAdmin/companyAdmin', + // admin: true + // }, + { + text: '任务管理', + icon: prefix + 'oa/bxsq@2x.png', + url: '/subpkg/taskAdmin/taskAdmin', + }, + { + text: '档案管理', + icon: prefix + 'oa/bxsq@2x.png', + url: '/subpkg/captain/captain', + admin: true + }, + { + text: '档案管理', + icon: prefix + 'oa/bxsq@2x.png', + url: '/subpkg/archives/archives', + captain: true + }, + // { + // text: '片区经理', + // icon: prefix + 'oa/yzsq@2x.png', + // url: '/pages/oaManager/oaManager', + // admin: true + // }, + { + text: '个人财务', + icon: prefix + 'oa/gengduo@2x.png', + url: '/subpkg/finance/finance' + }, + { + text: '资产管理', + icon: prefix + 'oa/gengduo@2x.png', + url: '/subpkg/property/index' + }, + // { + // text: '出差申请', + // icon: prefix + 'oa/ccsq@2x.png' + // }, + // { + // text: '外出申请', + // icon: prefix + 'oa/wcsq@2x.png' + // }, + // { + // text: '采购申请', + // icon: prefix + 'oa/cgsq@2x.png' + // }, + // { + // text: '物品维修', + // icon: prefix + 'oa/bxsq@2x.png' + // }, + // { + // text: '用章申请', + // icon: prefix + 'oa/yzsq@2x.png' + // }, + // { + // text: '报销申请', + // icon: prefix + 'oa/gengduo@2x.png' + // }, + { + text: '更多', + icon: prefix + 'oa/wpwx@2x.png', + url: '/pages/views/application' + } ] /** * oa-应用中心数据 */ export const appDataList = [{ - title: '假勤', - data: [{ - name: '请假申请', - src: prefix + 'oa/qjsq@2x.png', - url: '/pages/views/leave_request' - }, - { - name: '出差申请', - src: prefix + 'oa/ccsq@2x.png', - url: '' - }, - { - name: '外出申请', - src: prefix + 'oa/wcsq@2x.png', - url: '' - } - ] - }, - { - title: '行政', - data: [{ - name: '物品维修', - src: prefix + 'oa/bxsq@2x.png', - url: '' - }, - { - name: '用章审批', - src: prefix + 'oa/yzsq@2x.png', - url: '' - }, - { - name: '领用审批', - src: prefix + 'oa/lysp@2x.png', - url: '' - } - ] - }, - { - title: '财务', - data: [{ - name: '借款申请', - src: prefix + 'oa/jksq@2x.png', - url: '' - }, - { - name: '付款申请', - src: prefix + 'oa/fksq@2x.png', - url: '' - }, - { - name: '报销申请', - src: prefix + 'oa/gengduo@2x.png', - url: '' - }, - { - name: '采购申请', - src: prefix + 'oa/cgsq@2x.png', - url: '' - }, - { - name: '奖励申请', - src: prefix + 'oa/jlsq@2x.png', - url: '' - }, - { - name: '活动经费', - src: prefix + 'oa/hdjf@2x.png', - url: '' - } - ] - }, - { - title: '人事', - data: [{ - name: '招聘需求', - src: prefix + 'oa/zpxq@2x.png', - url: '' - }] - }, - { - title: '其他', - data: [{ - name: '通用审批', - src: prefix + 'oa/tysp@2x.png', - url: '/pages/views/com_approve' - }] - } + title: '假勤', + data: [{ + name: '请假申请', + src: prefix + 'oa/qjsq@2x.png', + url: '/pages/views/leave_request' + }, + { + name: '出差申请', + src: prefix + 'oa/ccsq@2x.png', + url: '' + }, + { + name: '外出申请', + src: prefix + 'oa/wcsq@2x.png', + url: '' + } + ] + }, + { + title: '行政', + data: [{ + name: '物品维修', + src: prefix + 'oa/bxsq@2x.png', + url: '' + }, + { + name: '用章审批', + src: prefix + 'oa/yzsq@2x.png', + url: '' + }, + { + name: '领用审批', + src: prefix + 'oa/lysp@2x.png', + url: '' + } + ] + }, + { + title: '财务', + data: [{ + name: '借款申请', + src: prefix + 'oa/jksq@2x.png', + url: '' + }, + { + name: '付款申请', + src: prefix + 'oa/fksq@2x.png', + url: '' + }, + { + name: '报销申请', + src: prefix + 'oa/gengduo@2x.png', + url: '' + }, + { + name: '采购申请', + src: prefix + 'oa/cgsq@2x.png', + url: '' + }, + { + name: '奖励申请', + src: prefix + 'oa/jlsq@2x.png', + url: '' + }, + { + name: '活动经费', + src: prefix + 'oa/hdjf@2x.png', + url: '' + } + ] + }, + { + title: '人事', + data: [{ + name: '招聘需求', + src: prefix + 'oa/zpxq@2x.png', + url: '' + }] + }, + { + title: '其他', + data: [{ + name: '通用审批', + src: prefix + 'oa/tysp@2x.png', + url: '/pages/views/com_approve' + }] + } ] /** * oa-个人中心 */ export const myOaData = [ - // { - // name: '流水详情', - // icon: '../../static/icons/runningWater.png', - // url: '/subpkg/orderDetail/orderDetail' - // }, - // { - // name: '管理后台', - // icon: '../../static/icons/backstage.png', - // // url: '/pages/views/personal_center_two' - // }, - { - name: '片区经理', - icon: '../../static/icons/manager.png', - url: '/pages/oaManager/oaManager' - }, - { - name: '安全设置', - icon: '../../static/icons/setting.png', - url: '/pages/updatePasswprd/updatePasswprd' - }, - // { - // name: '管理后台', - // icon: 'custom-icongongzi', - // // url: '/pages/views/personal_center_two' - // }, - // { - // name: '片区经理', - // icon: 'custom-icongongzi', - // url: '/pages/oaManager/oaManager' - // }, - // { - // name: '工资详情', - // icon: 'custom-icongongzi', - // url: '/pages/views/personal_center_two' - // }, - // { - // name: '公示文档', - // icon: 'custom-iconwendang', - // url: '/pages/views/public_document' - // }, - // { - // name: '绑定公众号', - // icon: 'custom-iconweixin' - // }, - // { - // name: '意见反馈', - // icon: 'custom-iconyijian' - // } + // { + // name: '流水详情', + // icon: '../../static/icons/runningWater.png', + // url: '/subpkg/orderDetail/orderDetail' + // }, + // { + // name: '管理后台', + // icon: '../../static/icons/backstage.png', + // // url: '/pages/views/personal_center_two' + // }, + { + name: '片区经理', + icon: '../../static/icons/manager.png', + url: '/pages/oaManager/oaManager' + }, + { + name: '安全设置', + icon: '../../static/icons/setting.png', + url: '/pages/updatePasswprd/updatePasswprd' + }, + // { + // name: '管理后台', + // icon: 'custom-icongongzi', + // // url: '/pages/views/personal_center_two' + // }, + // { + // name: '片区经理', + // icon: 'custom-icongongzi', + // url: '/pages/oaManager/oaManager' + // }, + // { + // name: '工资详情', + // icon: 'custom-icongongzi', + // url: '/pages/views/personal_center_two' + // }, + // { + // name: '公示文档', + // icon: 'custom-iconwendang', + // url: '/pages/views/public_document' + // }, + // { + // name: '绑定公众号', + // icon: 'custom-iconweixin' + // }, + // { + // name: '意见反馈', + // icon: 'custom-iconyijian' + // } ] /* oa-请假类型 */ export const oaLeaveData = [{ - name: '事假', - id: 1 - }, - { - name: '年假', - id: 2 - }, - { - name: '调休假', - id: 3 - }, - { - name: '病假', - id: 4 - }, - { - name: '婚假', - id: 5 - }, - { - name: '丧假', - id: 6 - }, - { - name: '产假', - id: 7 - }, - { - name: '陪产假', - id: 8 - }, - { - name: '其他', - id: 9 - } -] + name: '事假', + id: 1 + }, + { + name: '年假', + id: 2 + }, + { + name: '调休假', + id: 3 + }, + { + name: '病假', + id: 4 + }, + { + name: '婚假', + id: 5 + }, + { + name: '丧假', + id: 6 + }, + { + name: '产假', + id: 7 + }, + { + name: '陪产假', + id: 8 + }, + { + name: '其他', + id: 9 + } +] \ No newline at end of file diff --git a/subpkg/companyInfo/companyInfo.vue b/subpkg/companyInfo/companyInfo.vue index 45baea1..d8aa81c 100644 --- a/subpkg/companyInfo/companyInfo.vue +++ b/subpkg/companyInfo/companyInfo.vue @@ -80,6 +80,9 @@ + + + diff --git a/subpkg/finance/finance.vue b/subpkg/finance/finance.vue index 1c24799..7d500f2 100644 --- a/subpkg/finance/finance.vue +++ b/subpkg/finance/finance.vue @@ -299,8 +299,12 @@ // background-color: red; display: flex; justify-content: space-between; - width: 24vw; + width: auto; line-height: 44px; + + .name { + margin-left: 20rpx; + } } @@ -313,9 +317,9 @@ color: #FFFFFF; - .name { - margin: 0 17.5rpx; - } + // .name { + // margin: 0 17.5rpx; + // } image { width: 40rpx; diff --git a/subpkg/property/chosseCompany.vue b/subpkg/property/chosseCompany.vue new file mode 100644 index 0000000..30fb397 --- /dev/null +++ b/subpkg/property/chosseCompany.vue @@ -0,0 +1,126 @@ + + + + + \ No newline at end of file diff --git a/subpkg/property/index.vue b/subpkg/property/index.vue new file mode 100644 index 0000000..e6acc7e --- /dev/null +++ b/subpkg/property/index.vue @@ -0,0 +1,223 @@ + + + + + \ No newline at end of file diff --git a/subpkg/vehicle/vehicle.vue b/subpkg/property/vehicle.vue similarity index 60% rename from subpkg/vehicle/vehicle.vue rename to subpkg/property/vehicle.vue index 5ef6b54..d661588 100644 --- a/subpkg/vehicle/vehicle.vue +++ b/subpkg/property/vehicle.vue @@ -1,94 +1,47 @@ @@ -316,13 +260,13 @@ .content { padding: 2vh 3vw; - background-color: #F6F7FC; + background-color: #F5F5F5; height: 100vh; box-sizing: border-box; } .map { - height: 40vh; + height: 60vh; border-radius: 2vw; overflow: hidden; @@ -332,10 +276,14 @@ background-color: white; padding: 20rpx 10rpx; + .li { + margin: 20rpx 0; + } + .cir { display: inline-block; width: 2vw; - height: 4vw; + height: 2vw; border-radius: 2vw; margin: 0 20rpx; } @@ -350,55 +298,6 @@ z-index: 9999999; } - - .order_info { - border: none; - background-color: #FF7C32; - border-radius: 2vw; - overflow: hidden; - margin-top: 50rpx; - margin-bottom: 30rpx; - color: white; - - .top { - padding: 1vw 3vw; - - view { - margin: 10rpx 0; - } - - } - - .mark { - background-color: white; - color: #A8A8A8; - padding: 10rpx 20rpx; - - } - - .pro_list { - display: flex; - - text { - - flex: 2 - } - - .goods { - flex: 8; - margin: 0; - - .goods_tit { - margin: 0; - display: flex; - - } - - } - } - - } - .btn { position: fixed;