mkm/OfficeApp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

物流信息

Browse Source
This commit is contained in:
zmj 2024-01-26 18:13:40 +08:00
parent 80e26dc7de
commit 9b283de926
15 changed files with 99 additions and 281 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/test.js Normal file
View File

@ -0,0 +1,6 @@
import oahttp from "@/utils/oahttp.js";
/**
* 任务列表
*/
export const addUserInfo = (data) => oahttp.post('/index/addVillagerInfo', data)

9
components/logistiComptent/logistiCard/logistiBriefCard.vue
View File

@ -7,8 +7,8 @@
<u-icon name="arrow-right" color="black" size="20"></u-icon>
</view> -->
<view>订单编号:&nbsp;&nbsp;{{goodsInfo.order_sn}}</view>
<view class='status' :style="{color:goodsInfo.status==0?'#2B63E3':'#FF8056'}">
{{goodsInfo.status==0?"待取货":"待配送"}}
<view class='status' :style="{color:goodsInfo.status==0?'#2B63E3':goodsInfo.status==2?'#47BE62':'#FF8056'}">
{{goodsInfo.status==0?"待取货":goodsInfo.status==2? "已完成": "待配送"}}
</view>
</view>
<view class="content">
@ -97,11 +97,12 @@
},
goDetil(id) {
uni.navigateTo({
url: `/pages/logistics/${this.goodsInfo.status==1?"logisticDetil":"deliveryDetil"}?id=${id}`,
url: `/pages/logistics/${this.goodsInfo.status==0?"deliveryDetil":"logisticDetil"}?id=${id}`,
})
}
},
}
@ -147,6 +148,8 @@
color: white;
border-radius: 10rpx;
font-size: 22rpx;
width: 30rpx;
text-align: center;
}

6
config/app.js
View File

@ -10,7 +10,7 @@ const env = 'dev'; // 开发
switch (env) {
case 'prod':
httpApi = 'https://new-worker.lihaink.cn/' //正式
httpApiTwo = 'https://new-worker.lihaink.cn/' //正式环境
httpApiTwo = 'https://logistics.lihaink.cn/' //正式环境
httpApiThree = 'https://new-worker.lihaink.cn/' //正式
break;
case 'prew':
@ -19,8 +19,8 @@ switch (env) {
httpApiTwo = 'https://preview-logistics.lihaink.cn' //预上线
break;
case 'local':
httpApi = 'http://192.168.1.23:8083' //预上线
httpApiThree = 'http://192.168.1.23:8083' //预上线
httpApi = 'http://192.168.1.13:8083' //预上线
httpApiThree = 'http://192.168.1.13:8083' //预上线
httpApiTwo = 'https://ceshi-logistics.lihaink.cn' //测试环境
break;
default:

4
manifest.json
View File

@ -3,8 +3,8 @@
// "appid" : "__UNI__3A527D1",
"appid": "__UNI__A495155",
"description": "",
"versionName": "1.0.6",
"versionCode": 106,
"versionName": "1.1.1",
"versionCode": 111,
"transformPx": false,
/* 5+App特有相关 */
"app-plus": {

4
pages.json
View File

@ -13,13 +13,13 @@
}
},
{
"path": "pages/test/index",
"path": "pages/test/Information",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/test/main",
"path": "pages/test/choseIdentity",
"style": {
"navigationStyle": "custom"
}

3
pages/logistics/deliveryDetil.vue
View File

@ -95,7 +95,6 @@
</view>
<view style="margin-top: 200rpx;height: 1px;">
<!-- 565 -->
</view>
<view class="btn" v-if="!is_captain">
<u-button @click="qrqodeFn" type="primary" style="background-color: #0122C7;border: 0;">
@ -109,7 +108,7 @@
<view class="warp">
<view class="rect">
<view class="cont">
骑手送货完成
骑手取货完成
</view>
</view>
</view>

63
pages/oaHome/FirstOrderLog.vue
View File

@ -1,19 +1,6 @@
<template>
<!-- <view class="card">
<view class="li" v-for="item,index in orderList.lists" :key='index'>
<view class="">
订单编号: {{item.order_no}}
</view>
<view class="">
订单金额: <text style="color: #FF4141;">{{item.order_money}}</text>
</view>
</view>
</view> -->
<view class="">
<view class="head">
<view class="money">
总资产（元）
<view class="" style="margin-top: 35rpx;font-size: 35rpx;">
@ -21,7 +8,6 @@
</view>
</view>
</view>
<view class="cont" v-if='show'>
<view class="tit">
订单明细
@ -50,23 +36,16 @@
￥{{item.order_money}}
</view>
</view>
</view>
<view class="">
订单编号:{{item.order_no}}
</view>
<!-- <view class="tit" style="font-size: 28rpx;">
{{item.order_no}}
</view>
<view class="">
￥{{item.order_money}}
</view> -->
</view>
</view>
<view class="" v-if='orderList.length==0'>
<u-empty icon="/static/newWork/index/empty.png" iconSize='200' width='300' height="300" marginTop='50'
textColor='#BFD7FF' text="没有更多了~"></u-empty>
</view>
</view>
</view>
</template>
@ -90,47 +69,17 @@
},
methods: {
async getFirstOrderLogList() {
let res = await getFirstOrderLog()
// for (let key in res.data.lists) {
// this.orderList.push(res.data.lists[key])
// }
this.orderList = res.data.lists
console.log(this.orderList)
// res.data.lists.forEach(item => {
// console.log(item)
// })
}
},
onLoad(option) {
this.getFirstOrderLogList()
this.money = Number(option.money)
// setTimeout(() => {
// this.show = true
// }, 3000)
}
// onReachBottom() {
// if (this.flag) return
// let {
// page_no,
// page_size
// } = this
// let that = this
// this.status = "loading"
// page_no += 1
// this.flag = true
// getFirstOrderLog({
// page_no,
// page_size
// }).then(res => {
// that.orderList = that.orderList.concat(res.data)
// this.flag = false
// if (!res.data.data.length) {
// this.status = "nomore"
// this.flag = true
// }
// })
// },
}
</script>

13
pages/oaHome/accountLog.vue
View File

@ -11,9 +11,6 @@
</view>
<view class="cont">
<!-- <u-tag :text="item.remark" type="success" plain v-for="item,index in orderList" :key='index' class="li"></u-tag> -->
<view class="tit">
收益明细
</view>
@ -39,8 +36,12 @@
</view>
</view>
</view>
<u-loadmore :status="status" v-if='orderList.length>0' />
<u-loadmore :status="status" />
<view class="" v-if='orderList.length==0'>
<u-empty icon="/static/newWork/index/empty.png" iconSize='200' width='300' height="300" marginTop='50'
textColor='#BFD7FF' text="没有更多了~"></u-empty>
</view>
</view>
</view>
@ -102,10 +103,6 @@
</script>
<style lang="scss" scoped>
page {
background-color: #F9FBFF;
}
.head {
width: 750rpx;
background-color: #2B63E3;

37
pages/oaHome/oaHome.vue
View File

@ -17,7 +17,8 @@
<u--image :showLoading="true" width="134rpx" height="134rpx"
:src="myOaInfo.avatar || '../../static/img/public/avatar.png'" shape="circle"></u--image>
</view>
<view class="identity" @click="navgo('/pages/test/index') ">
<view class="identity" @click="navgo('/pages/test/choseIdentity') ">
<!-- <view class="identity"> -->
身份：{{ myOaInfo.user_role_name}}
</view>
@ -97,17 +98,17 @@
</view>
<logistiBriefCard v-for="(item, index) in orderList" :key="index" :goodsInfo="item">
</logistiBriefCard>
<u-loadmore :status="status" />
<u-loadmore :status="status" v-if='orderList.length>0' />
<u-empty v-else icon="/static/newWork/index/empty.png" iconSize='200' width='300' height="300"
marginTop='50' textColor='#BFD7FF' text="没有更多订单了~"></u-empty>
</view>
<u-overlay :show="showCode" @click="showCode=false" :opacity="0.1">
<view class="code" id='code'>
<view class="code-img">
<view class="" style="margin: 0 auto;width: 440rpx;">
<uqrcode ref="uqrcode" canvas-id="qrcode"
:value="`https://crmeb-test.shop.lihaink.cn/download/index.html?code=${myOaInfo.invite_code}`"
:size=440 sizeUnit='rpx'>
<uqrcode ref="uqrcode" canvas-id="qrcode" :value="myOaInfo.share_url" :size=440 sizeUnit='rpx'>
</uqrcode>
</view>
@ -395,15 +396,15 @@
if (uni.getStorageSync('USER_INFO')) {
let userData = JSON.parse(uni.getStorageSync('USER_INFO'))
this.initUserInfo(userData);
// console.log(545)
}
await this.$onLaunched;
this.is_captain = JSON.parse(uni.getStorageSync("USER_INFO") || '{}')?.is_captain
this.options.data = bj;
this.getOrderList()
await this.$onLaunched;
},
async onShow() {
this.initTask()
this.getOrderList()
await this.$onLaunched;
if (uni.getStorageSync('uniMP')) this.uniMP = true;
userInfo().then(({
@ -474,12 +475,6 @@
}
},
methods: {
serchOrder() {
},
copyCode() {
let that = this
uni.setClipboardData({
@ -539,8 +534,6 @@
async initTask() {
let res = await taskListApi()
this.taskList = res.data
console.log(this.taskList)
},
initUserInfo(data = null) {
@ -583,12 +576,12 @@
this.navTo(url);
},
async getOrderList() {
console.log("getorder")
this.id = this.myOaInfo.id;
let res = await getList({
user_id: this.id,
user_type: this.is_captain,
keywords: this.keywords
keywords: this.keywords,
status: '0,1,2,3'
});
this.orderList = res.data.data;
},
@ -606,6 +599,7 @@
async onPullDownRefresh() {
this.initTask()
this.getOrderList()
await this.$store.dispatch('initConfig');
uni.stopPullDownRefresh();
@ -621,7 +615,8 @@
user_id: this.id,
keywords: this.keywords,
user_type: this.is_captain,
page_num: this.page_num
page_num: this.page_num,
status: '0,1,2,3'
}).then(res => {
that.orderList = that.orderList.concat(res.data.data)
this.flag = false

2
pages/otherSetting/otherSetting.vue
View File

@ -9,7 +9,7 @@
<view class="text">{{ item.name }}</view>
</view>
<view style="display: flex;align-items: center;">
<view v-if="i==0">1.0.1</view>
<view v-if="i==0">{{version}}</view>
<uni-icons type="forward"></uni-icons>
</view>
</view>

87
pages/test/index.vue → pages/test/Information.vue
View File

@ -63,19 +63,15 @@
:style=" {transform:isOpen[0]? 'rotate(180deg)' :'rotate(0)'} " />
</view>
<view class="finsh" v-if='!isOpen[0] && SaveList[0]'>
<view class="finsh-top">
</view>
<view class="finsh-top" />
<view class="finsh-cont">
已完成
</view>
</view>
</view>
</view>
<view class="card-content" :style="{height:isOpen[0]?'0':'620rpx',padding: isOpen[0]?'0':'20rpx' } "
style="height: 0;padding: 0;">
<view class="form-tit">
<view class="" :style="{color:SaveList[0]?'#FF5E0C':'' }">
房子出租需求
@ -83,7 +79,6 @@
<view class="submit" v-if='!SaveList[0]' @click="sava(0)">
保存
</view>
</view>
<view class="form">
<view class="item">
@ -156,20 +151,16 @@
:style=" {transform:isOpen[1]? 'rotate(180deg)' :'rotate(0)'} " />
</view>
<view class="finsh" v-if='!isOpen[1] && SaveList[1]'>
<view class="finsh-top">
</view>
<view class="finsh-top" />
<view class="finsh-cont">
已完成
</view>
</view>
</view>
</view>
<view class="card-content" :style="{height:isOpen[1]?'0':'860rpx',padding: isOpen[1]?'0':'20rpx' } "
style="height: 0;padding: 0;">
<view class="form-tit">
<view class="">
空闲土地出租需求
@ -258,8 +249,6 @@
</view>
<!-- content -->
<view class="">
<view class="card">
<view class="card-tit">
@ -536,10 +525,7 @@
</view>
</view>
</view>
</view>
</view>
<!-- content -->
@ -643,16 +629,12 @@
</view>
<!-- content -->
<view class="login-btn" @click="submit"
:style="{background:saveNum<3 ? '#F5F5F5':'',color:saveNum<3 ? '#ADADAD':'' }">
确认登录
</view>
<u-overlay :show="show" @click="show = false">
<u-overlay :show="showOverly" @click="showOverly = false">
<view class="warp">
<view class="toast">
<view class="toast-tit">
@ -674,19 +656,22 @@
</template>
<script>
import {
addUserInfo
} from "@/api/test.js"
export default {
data() {
return {
userInfo: {
name: ""
},
value: [],
showPicker: false,
showOverly: false,
isOpen: [true, true, true, true, true],
SaveList: [false, false, false, false, false],
columns: [
['是', '否']
],
formData: {
shop_user_id: "",
shop_user_id: 1,
name: "",
contact: "",
family_count: "",
@ -697,13 +682,10 @@
idle_asset_rent_info: {},
house_decoration_construction: {}
},
show: false,
showText: {
title: "",
content: ""
},
isOpen: [true, true, true, true, true],
SaveList: [false, false, false, false, false],
textList: [{
title: "房子出租需求",
content: "宅基地出租（通过展示自己长期不在老家居住的宅基地，平台匹配宅基地租给有需求的打造，实现与原有宅基地所有者合作达到闲置资产增收）"
@ -730,46 +712,54 @@
},
computed: {
saveNum() {
return this.SaveList.filter(item => item === true).length;
},
},
methods: {
showFn(i) {
this.showText = this.textList[i]
this.show = true
this.showOverly = true
},
open(index) {
// this.isOpen = [false, false, false, false, false]
this.isOpen.forEach((item, i) => {
open(index) {
this.isOpen.forEach((item, i) => {
if (i == index) {
this.isOpen.splice(index, 1, this.isOpen[index] ? false : true);
} else {
this.isOpen.splice(i, 1, true);
}
})
},
confirmPicker(e) {
this.formData[this.value[0]][this.value[1]] = (e.value)[0]
this.showPicker = false
},
openPicker(e) {
this.showPicker = true
this.value = e
},
console.log(this.value)
},
submit() {
console.log(this.formData)
async submit() {
if (this.saveNum <= 3) return
this.formData.land_rent_info = JSON.stringify(this.formData.land_rent_info)
this.formData.product_info = JSON.stringify(this.formData.product_info)
this.formData.idle_asset_rent_info = JSON.stringify(this.formData.idle_asset_rent_info)
this.formData.house_decoration_construction = JSON.stringify(this.formData
.house_decoration_construction)
let res = await addUserInfo({
...this.formData
})
},
sava(index) {
this.SaveList.splice(index, 1, true);
this.open(index)
@ -779,13 +769,6 @@
}
</script>
<style lang="scss" scoped>
// page {
// background: linear-gradient(to bottom, #FFF4DB, #FFEAC3);
// min-height: 100vh;
// font-size: 28rpx;
// }
.box {
background: linear-gradient(to bottom, #FFF4DB, #FFEAC3);
min-height: 100vh;
@ -816,7 +799,6 @@
display: flex;
flex-direction: column;
justify-content: space-between;
}
.item {
@ -992,11 +974,6 @@
font-size: 30rpx;
color: white;
margin: 50rpx auto;
// position: absolute;
// bottom: 50rpx;
// left: 50%;
// transform: translateX(-50%);
// transition: 300ms;
}
.login-btn:active {

35
pages/test/main.vue → pages/test/choseIdentity.vue
View File

@ -1,36 +1,40 @@
<template>
<view class="box">
<!-- <view class="bg">
</view> -->
<u--image src="/static/test/bg.png" width="750rpx" height="660rpx" style="position: absolute; top: 0;" />
<view class="li">
<u--image src="/static/test/JM.png" width="690rpx" height="200rpx" style="position: absolute;" />
<view class="btn">
我是居民用户
</view>
</view>
<!-- <view class="" style="margin: 100rpx auto;width: 690rpx;">
<u--image src="/static/test/JM.png" width="690rpx" height="200rpx" />
</view> -->
<view class="li" style="margin-top: 50rpx;" @click="navgo('/pages/test/Information')">
<u--image src="/static/test/NM.png" width="690rpx" height="200rpx" style="position: absolute;" />
<view class="btn">
我是农民用户
</view>
</view>
</view>
</template>
<script>
export default {
methods: {
navgo(url) {
uni.navigateTo({
url
})
}
}
}
</script>
<style lang='scss' scoped>
.box {
width: 750rpx;
height: 100vh;
background: linear-gradient(to bottom, #FFF4DB, #FFEAC3);
padding-top: 400rpx;
height: 1624rpx;
background-image: url('/static/test/SYBJ.png');
background-size: 100% 100%;
padding-top: 500rpx;
}
.bg {
@ -47,7 +51,6 @@
margin: 0rpx auto;
width: 690rpx;
height: 200rpx;
background-image: url('/static/test/JM.png');
background-size: 100% 100%;
position: relative;

BIN
static/test/NM.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 122 KiB

BIN
static/test/SYBJ.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 300 KiB

111
test.vue
View File

@ -1,111 +0,0 @@
<template>
<view class="personnel_list">
<view class="cards">
<view class="cards_head">
<text style="font-size: 32rpx">最后更新:2020-25-2</text>
<text>更新档案</text>
<text>查看档案</text>
</view>
<view class="cards_content">
<view class="right">
<view class="">
<text>人员姓名 :</text>
<text> { item.name }</text>
</view>
<view class="">
<text>联系电话 :</text>
<text>{ item.phone }</text>
</view>
<view class="">
<text>所属片区 :</text>
<text> 所属片区 </text>
</view>
</view>
<view class="left">
<view class="cir">
<u--image class="u_avatar" :showLoading="true" :src="'../../static/img/public/man.png'"
width="112.28rpx" height="112.28rpx" shape="circle"></u--image>
</view>
</view>
</view>
</view>
</view>
</template>
<style lang="scss">
.personnel_list {
padding: 28rpx 0;
margin-bottom: 130rpx;
.cards {
margin: 0 auto;
margin-bottom: 28rpx;
width: 694rpx;
background: #ffffff;
border-radius: 30rpx;
opacity: 1;
overflow: hidden;
// box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
.cards_head {
padding: 28rpx;
background-color: $theme-oa-color;
color: white;
height: 100rpx;
display: flex;
justify-content: space-between;
}
.cards_content {
padding: 28rpx;
display: flex;
justify-content: space-between;
.left {
text-align: center;
// padding: 15rpx 25rpx;
padding-top: 20rpx;
width: 160rpx;
background-color: $theme-oa-color;
color: white;
border-radius: 40rpx;
.cir {
width: 120rpx;
height: 120rpx;
background-color: #ffffff;
margin-left: 25rpx;
border-radius: 120rpx;
position: relative;
}
}
.right {
display: flex;
flex-direction: column;
justify-content: space-between;
view {
text:nth-child(2) {
margin-left: 20rpx;
}
}
}
}
.u_avatar {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
}
}
</style>