Skip to content

Commit

Permalink
qianduan
Browse files Browse the repository at this point in the history
  • Loading branch information
lwjlwj47 committed Aug 20, 2024
1 parent 332b897 commit ac0598f
Show file tree
Hide file tree
Showing 184 changed files with 4,693 additions and 342 deletions.
23 changes: 19 additions & 4 deletions front/app.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"pages": [
"pages/first/first",
"pages/firstparty/home/home",
"pages/manage/home/home",
"pages/employee/home/home",
"pages/manage/home/home",
"pages/manage/add_room/add_room",
"pages/firstparty/home/home",
"pages/employee/apply/apply",
"pages/manage/person/person",
"pages/company_profile/company_profile",
Expand All @@ -16,7 +17,6 @@
"pages/firstparty/my/my",
"pages/index/index",
"pages/logs/logs",
"components/navigationbar/navigationbar",
"components/custom-tab-bar/custom-tab-bar",
"pages/firstparty/message/message",
"pages/manage/my/my",
Expand All @@ -35,7 +35,22 @@
"pages/manage/add_person/add_person",
"pages/employee/my/my",
"pages/employee/program/program",
"pages/employee/program_detail/program_detail"
"pages/employee/program_detail/program_detail",
"pages/manage/step/step",
"pages/manage/add_car/add_car",
"pages/manage/add_car_info/add_car_info",
"pages/employee/program_detail_1/program_detail_1",
"pages/employee/equipment/equipment",
"pages/employee/car/car",
"pages/employee/add_car/add_car",
"pages/employee/add_car_info/add_car_info",
"pages/employee/room/room",
"pages/employee/step/step",
"pages/employee/add_room/add_room",
"pages/employee/daily_paper/daily_paper",
"pages/employee/write_paper/write_paper",
"pages/employee/paper/paper",
"pages/employee/reimbursement/reimbursement"
],
"window": {
"navigationBarTextStyle": "black",
Expand Down
4 changes: 2 additions & 2 deletions front/components/custom-tab-bar/custom-tab-bar.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ Component({
},
methods:{
navChange(e) {
if(this.data.index ==1)
if(this.data.index=="1")
{
wx.switchTab({
url:"/pages/firstparty/"+e.currentTarget.dataset.cur+"/"+e.currentTarget.dataset.cur,
})
}
else if (this.data.index == 2)
else if(this.data.index=="2")
{
wx.switchTab({
url: '/pages/manage/'+e.currentTarget.dataset.cur+"/"+e.currentTarget.dataset.cur,
Expand Down
8 changes: 4 additions & 4 deletions front/components/custom-tab-bar/custom-tab-bar.wxml
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
<view class="fu-bar shadow foot">
<view class="cell" bindtap="navChange" data-cur="home">
<view class="image">
<image src="/image/{{pageCur == 'home' ? 'home_red' : 'home'}}.png"></image>
<image src="https://imgur.la/images/2024/08/15/{{pageCur == 'home' ? 'home_red' : 'home'}}.png"></image>
</view>
<view class="{{pageCur == 'home' ? 'text-red' : 'text-gray'}}">首页</view>
</view>
<view class="cell" bindtap="navChange" data-cur="program">
<view class="image">
<image src="/image/{{pageCur == 'program' ? 'program_red' : 'program'}}.png"></image>
<image src="https://imgur.la/images/2024/08/15/{{pageCur == 'program' ? 'program_red' : 'program'}}.png"></image>
</view>
<view class="{{pageCur == 'program' ? 'text-red' : 'text-gray'}}">项目 </view>
<view class="{{pageCur == 'program' ? 'text-red' : 'text-gray'}}">项目</view>
</view>
<view class="cell" bindtap="navChange" data-cur="my">
<view class="image">
<image src="/image/{{pageCur == 'my' ? 'my_red' : 'my'}}.png"></image>
<image src="https://imgur.la/images/2024/08/15/{{pageCur == 'my' ? 'my_red' : 'my'}}.png"></image>
</view>
<view class="{{pageCur == 'my' ? 'text-red' : 'text-gray'}}">我的</view>
</view>
Expand Down
3 changes: 3 additions & 0 deletions front/components/custom-tab-bar/custom-tab-bar.wxss
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
min-height: 100rpx;
justify-content: space-between;
align-items: center;
/* background-color: cadetblue; */
background: rgba(245, 245, 245, 1);
}

.fu-bar.shadow {
Expand All @@ -23,6 +25,7 @@
max-width: 100%;
height: 100rpx;
flex: 1;
padding-top: 10rpx;
}

.fu-bar .cell .image {
Expand Down
69 changes: 0 additions & 69 deletions front/components/navigationbar/navigationbar.js

This file was deleted.

5 changes: 0 additions & 5 deletions front/components/navigationbar/navigationbar.json

This file was deleted.

10 changes: 0 additions & 10 deletions front/components/navigationbar/navigationbar.wxml

This file was deleted.

28 changes: 0 additions & 28 deletions front/components/navigationbar/navigationbar.wxss

This file was deleted.

Binary file removed front/image/1.png
Binary file not shown.
Binary file removed front/image/2.png
Binary file not shown.
Binary file removed front/image/3.png
Binary file not shown.
Binary file removed front/image/4.png
Binary file not shown.
Binary file removed front/image/5.png
Binary file not shown.
Binary file removed front/image/avatar.png
Binary file not shown.
Binary file removed front/image/car.png
Binary file not shown.
Binary file removed front/image/case1.png
Binary file not shown.
Binary file removed front/image/case2.png
Binary file not shown.
Binary file removed front/image/cell1.png
Binary file not shown.
Binary file removed front/image/cell2.png
Binary file not shown.
Binary file removed front/image/company.jpg
Binary file not shown.
Binary file removed front/image/done.png
Binary file not shown.
Binary file removed front/image/equipment-1.png
Binary file not shown.
Binary file removed front/image/equipment-2.png
Binary file not shown.
Binary file removed front/image/equipment-3.png
Binary file not shown.
Binary file removed front/image/equipment-4.png
Binary file not shown.
Binary file removed front/image/examine.png
Binary file not shown.
Binary file removed front/image/home.png
Binary file not shown.
Binary file removed front/image/home_red.png
Binary file not shown.
Binary file removed front/image/my.png
Binary file not shown.
Binary file removed front/image/my_red.png
Binary file not shown.
Binary file removed front/image/person.png
Binary file not shown.
Binary file removed front/image/phone.png
Binary file not shown.
Binary file removed front/image/program.png
Binary file not shown.
Binary file removed front/image/program_red.png
Diff not rendered.
Binary file removed front/image/truck-1.png
Diff not rendered.
Binary file removed front/image/truck-2.png
Diff not rendered.
Binary file removed front/image/truck.png
Diff not rendered.
Binary file removed front/image/unit.png
Diff not rendered.
10 changes: 5 additions & 5 deletions front/pages/company_profile/company_profile.wxml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--pages/company_profile/company_profile.wxml-->
<image src="/image/1.png" style="width: 100%;height: 320rpx;"></image>
<image src="/image/2.png" style="width: 100%;height: 860rpx;"></image>
<image src="/image/3.png" style="width: 100%;height: 884rpx;"></image>
<image src="/image/4.png" style="width: 100%; height: 1308rpx;"></image>
<image src="/image/5.png" style="width: 100%; height: 824rpx;"></image>
<image src="https://img.js.design/assets/img/668d509144a5d5a4179f5090.jpg#2179d207c6d9d4f091cb5d910fc6882b" style="width: 100%;height: 320rpx;"></image>
<image src="https://imgur.la/images/2024/08/15//2.png" style="width: 100%;height: 860rpx;"></image>
<image src="https://imgur.la/images/2024/08/15//3.png" style="width: 100%;height: 884rpx;"></image>
<image src="https://imgur.la/images/2024/08/15//4.png" style="width: 100%; height: 1308rpx;"></image>
<image src="https://imgur.la/images/2024/08/15//5.png" style="width: 100%; height: 824rpx;"></image>
87 changes: 87 additions & 0 deletions front/pages/employee/add_car/add_car.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
// pages/manage/add_car/add_car.js
Page({

/**
* 页面的初始数据
*/
data: {
car:"",
cars:[
{
name:"中国重汽 SITRAK C5H 340马力",
start_time:"2024.06.10",
end_time:"2024.06.16",
image:"https://img.js.design/assets/img/6676f0385e1398b2613d0a74.jpg#c978f030c1acffcdad2fcac973e28def",
person:"张晓军",
info:"津A·88888"

}
]
},

/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {

},

/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {

},

/**
* 生命周期函数--监听页面显示
*/
onShow() {

},

/**
* 生命周期函数--监听页面隐藏
*/
onHide() {

},

/**
* 生命周期函数--监听页面卸载
*/
onUnload() {

},

/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {

},

/**
* 页面上拉触底事件的处理函数
*/
onReachBottom() {

},

/**
* 用户点击右上角分享
*/
onShareAppMessage() {

},
onChange(e) {
console.log(e.detail.value);
},
select_car(e)
{
console.log(e.currentTarget.dataset.key)
wx.navigateTo({
url: '/pages/manage/add_car_info/add_car_info',
})
}
})
9 changes: 9 additions & 0 deletions front/pages/employee/add_car/add_car.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"usingComponents": {
"t-search": "/miniprogram_npm/tdesign-miniprogram/search/search",
"t-image": "/miniprogram_npm/tdesign-miniprogram/image/image",
"t-button": "/miniprogram_npm/tdesign-miniprogram/button/button",
"t-radio": "/miniprogram_npm/tdesign-miniprogram/radio/radio",
"t-radio-group": "/miniprogram_npm/tdesign-miniprogram/radio-group/radio-group"
}
}
15 changes: 15 additions & 0 deletions front/pages/employee/add_car/add_car.wxml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<!--pages/manage/add_car/add_car.wxml-->
<view class="example-search">
<t-search placeholder="请输入车辆信息" shape="round" />
</view>
<view class="container">
<view wx:for="{{cars}}" class='car' bind:tap="select_car" data-key="{{index}}">
<view class="car-name">
<t-image src="{{item.image}}" style="width:160rpx;height:160rpx" ></t-image>
<view style="margin-left: 24rpx;">
<view class="car-name-1">{{item.name}}</view>
<view class="car-time">车辆信息:{{item.info}}</view>
</view>
</view>
</view>
</view>
Loading

0 comments on commit ac0598f

Please sign in to comment.