Browse Source

新增人脸识别页面

master
longjieli 4 months ago
parent
commit
19845825dc
15 changed files with 64 additions and 561 deletions
  1. +2
    -2
      components/base/tabbar.vue
  2. +41
    -24
      pages.json
  3. +0
    -259
      pages/index/cart.vue
  4. +2
    -2
      pages/index/center.vue
  5. +8
    -5
      pages/index/index.vue
  6. +0
    -260
      pages/index/order.vue
  7. +0
    -0
      pages_order/auth/login.vue
  8. +2
    -2
      pages_order/auth/wxUserInfo.vue
  9. +0
    -0
      pages_order/autonym/autonym.vue
  10. +9
    -7
      pages_order/record/record.vue
  11. +0
    -0
      pages_order/static/autonym/autoym-bg.png
  12. +0
    -0
      pages_order/static/login/user.png
  13. BIN
      static/image/cart/1.png
  14. BIN
      static/image/cart/2.png
  15. BIN
      static/image/product/favorable.png

+ 2
- 2
components/base/tabbar.vue View File

@ -48,7 +48,7 @@
if(index == this.select){ if(index == this.select){
return return
} }
uni.redirectTo({
uni.reLaunch({
url: item.pagePath url: item.pagePath
}) })
}, },
@ -72,7 +72,7 @@
height: 120rpx; height: 120rpx;
// padding-bottom: env(safe-area-inset-bottom); // padding-bottom: env(safe-area-inset-bottom);
padding: 10rpx 0rpx; padding: 10rpx 0rpx;
z-index: 999999;
z-index: 9999;
bottom: 0; bottom: 0;
left: 0; left: 0;
color: #BCBCBC; color: #BCBCBC;


+ 41
- 24
pages.json View File

@ -1,15 +1,6 @@
{ {
"pages": [{
"path": "pages/login/login",
"style": {
"navigationBarTitleText": "登录"
}
}, {
"path": "pages/login/wxUserInfo",
"style": {
"navigationBarTitleText": "用户信息"
}
}, {
"pages": [
{
"path": "pages/index/index", "path": "pages/index/index",
"style": { "style": {
"navigationBarTitleText": "打卡" "navigationBarTitleText": "打卡"
@ -20,6 +11,7 @@
"style": { "style": {
"navigationBarTitleText": "我的" "navigationBarTitleText": "我的"
} }
<<<<<<< HEAD
}, },
{ {
"path": "pages/record/record", "path": "pages/record/record",
@ -40,21 +32,46 @@
{ {
"navigationBarTitleText" : "" "navigationBarTitleText" : ""
} }
=======
>>>>>>> 260f70e59eebfa09281d5d57173337efd210e7dc
} }
], ],
// "preloadRule": {
// "pages/index/index": {
// "network": "all",
// "packages": ["pages_order"]
// }
// },
// "subPackages": [{
// "root": "pages_order",
// "pages": [{
// "path": "order/orderDetail"
// }
// ]
// }],
"preloadRule": {
"pages/index/index": {
"network": "all",
"packages": ["pages_order"]
}
},
"subPackages": [{
"root": "pages_order",
"pages": [
{
"path": "auth/login",
"style": {
"navigationBarTitleText": "登录"
}
},
{
"path": "auth/wxUserInfo",
"style": {
"navigationBarTitleText": "用户信息"
}
},
{
"path": "record/record",
"style": {
"navigationBarTitleText": "打卡记录"
}
},
{
"path" : "autonym/autonym",
"style" :
{
"navigationBarTitleText" : ""
}
}
]
}],
"globalStyle": { "globalStyle": {
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarTitleText": "酒店桌布", "navigationBarTitleText": "酒店桌布",


+ 0
- 259
pages/index/cart.vue View File

@ -1,259 +0,0 @@
<template>
<view class="page">
<navbar/>
<view class="user">
<uv-checkbox-group
shape="circle"
v-model="checkboxValue">
<uv-swipe-action>
<view
v-for="(item, index) in list"
:key="index">
<view style="margin-top: 20rpx;"></view>
<uv-swipe-action-item
:options="options">
<view class="item">
<view class="checkbox">
<uv-checkbox
:name="item.id"
activeColor="#FA5A0A"
size="40rpx"
icon-size="35rpx"
></uv-checkbox>
</view>
<image
class="image"
src="https://img95.699pic.com/photo/50058/1378.jpg_wh860.jpg"
mode=""></image>
<view class="info">
<view class="title">
<view class="">
{{ item.title }}
</view>
<view class="">
<uv-number-box v-model="item.num"
@change="valChange"></uv-number-box>
</view>
</view>
<view class="unit">
规格{{ item.unit }}
<uv-icon name="arrow-down"></uv-icon>
</view>
<view class="price">
<text>{{ item.price }}</text>
</view>
</view>
</view>
</uv-swipe-action-item>
</view>
</uv-swipe-action>
</uv-checkbox-group>
<view class="action">
<view class="icon">
<image src="/static/image/cart/1.png" mode=""></image>
<view class="num">
{{ checkboxValue.length }}
</view>
</view>
<view class="price">
<view class="count">
合计
<view class="">
<text>{{ totalPrice }}</text>
</view>
</view>
<view class="text">
{{ checkboxValue.length }}已享受更低优惠
</view>
</view>
<view class="btn">
去结算
</view>
</view>
</view>
<tabber select="3" />
</view>
</template>
<script>
import tabber from '@/components/base/tabbar.vue'
export default {
components: {
tabber,
},
data() {
return {
value : 0,
checkboxValue : [],
options: [
{
text: '删除',
style: {
backgroundColor: '#FA5A0A'
}
},
],
list : [
{
id : 1,
title : '桌布租赁',
num : 1,
price : 299,
unit : '120*40*75【桌子尺寸】',
},
{
id : 2,
title : '桌布租赁',
num : 1,
price : 299,
unit : '120*40*75【桌子尺寸】',
},
],
}
},
computed: {
totalPrice(){
if (!this.checkboxValue.length) {
return 0
}
let price = 0
this.list.forEach(n => {
if(this.checkboxValue.includes(n.id)){
price += n.price * n.num
}
})
return price
},
},
methods: {
valChange(){
},
}
}
</script>
<style scoped lang="scss">
.page {
padding-bottom: 200rpx;
/deep/ .uv-swipe-action{
width: 100%;
}
}
.user {
.item{
background-color: #fff;
display: flex;
padding: 30rpx;
.checkbox{
display: flex;
justify-content: center;
align-items: center;
}
.image{
width: 200rpx;
height: 200rpx;
border-radius: 20rpx;
}
.info{
flex: 1;
.title{
display: flex;
padding: 10rpx 20rpx;
justify-content: space-between;
}
.unit{
font-size: 24rpx;
padding: 10rpx 20rpx;
color: #717171;
display: flex;
align-items: center;
}
.price{
color: $uni-color;
font-size: 28rpx;
padding: 10rpx 20rpx;
text{
font-size: 36rpx;
font-weight: 900;
}
}
}
}
.action{
width: 700rpx;
position: fixed;
bottom: 220rpx;
left: 25rpx;
background-color: #fff;
height: 100rpx;
border-radius: 50rpx;
box-shadow: 0 0 6rpx 6rpx #00000010;
display: flex;
justify-content: center;
align-items: center;
overflow: hidden;
.icon{
position: relative;
width: 80rpx;
height: 80rpx;
margin: 0 20rpx;
image{
width: 80rpx;
height: 80rpx;
}
.num{
position: absolute;
right: 10rpx;
top: 0rpx;
background-color: $uni-color;
color: #fff;
font-size: 18rpx;
border-radius: 50%;
height: 30rpx;
width: 30rpx;
display: flex;
justify-content: center;
align-items: center;
}
}
.price{
.count{
display: flex;
font-size: 26rpx;
align-items: center;
view{
color: $uni-color;
margin-left: 10rpx;
text{
font-size: 32rpx;
font-weight: 900;
}
}
}
.text{
font-size: 20rpx;
color: #717171;
}
}
.btn{
margin-left: auto;
background-color: $uni-color;
height: 100%;
padding: 0 50rpx;
color: #fff;
display: flex;
justify-content: center;
align-items: center;
}
}
}
</style>

+ 2
- 2
pages/index/center.vue View File

@ -55,11 +55,11 @@
clickMenu(index){ clickMenu(index){
if(index == 1){ if(index == 1){
uni.navigateTo({ uni.navigateTo({
url: "/pages/record/record"
url: "/pages_order/record/record"
}) })
}else if(index == 2){ }else if(index == 2){
uni.navigateTo({ uni.navigateTo({
url: "/pages/autonym/autonym"
url: "/pages_order/autonym/autonym"
}) })
} }
} }


+ 8
- 5
pages/index/index.vue View File

@ -42,7 +42,7 @@
</div> </div>
<!-- tab栏 --> <!-- tab栏 -->
<tabbar v-if="!broadsideShow" :select="0"></tabbar>
<tabbar :select="0"></tabbar>
<!-- 侧边栏 --> <!-- 侧边栏 -->
<broadside ref="broadside"></broadside> <broadside ref="broadside"></broadside>
@ -50,8 +50,8 @@
</template> </template>
<script> <script>
import tabbar from '../../components/base/tabbar.vue'
import broadside from '../../components/broadside/broadside.vue'
import tabbar from '@/components/base/tabbar.vue'
import broadside from '@/components/broadside/broadside.vue'
export default { export default {
name: "Home", name: "Home",
@ -61,7 +61,6 @@
}, },
data() { data() {
return { return {
broadsideShow: false, //
latitude: 39.909, latitude: 39.909,
longitude: 116.39742, longitude: 116.39742,
covers: [] covers: []
@ -81,7 +80,6 @@
// //
openBroadside() { openBroadside() {
this.$refs.broadside.open() this.$refs.broadside.open()
this.broadsideShow = true;
}, },
// //
@ -97,8 +95,13 @@
latitude: res.latitude, latitude: res.latitude,
longitude: res.longitude, longitude: res.longitude,
iconPath: '/static/image/home/location.png', iconPath: '/static/image/home/location.png',
<<<<<<< HEAD
width: 30, width: 30,
height: 30 height: 30
=======
width : 38,
height : 30,
>>>>>>> 260f70e59eebfa09281d5d57173337efd210e7dc
}) })
}, },
fail() { fail() {


+ 0
- 260
pages/index/order.vue View File

@ -1,260 +0,0 @@
<template>
<view class="page">
<navbar
title="订单中心"
/>
<uv-tabs :list="tabs"
:activeStyle="{color : '#FD5100', fontWeight : 600}"
lineColor="#FD5100"
lineHeight="8rpx"
lineWidth="50rpx"
@click="clickTabs"></uv-tabs>
<view v-if="orderList.length > 0" class="list">
<view class="item"
v-for="(item, index) in orderList.records"
@click="toOrderDetail(item.id)"
:key="index">
<view class="top">
<view class="service">
<text>{{item.projectId_dictText}}</text>
<text>{{item.type_dictText}}</text>
</view>
<view class="status">
<text> {{item.state_dictText}}</text>
</view>
</view>
<view class="content">
<view class="left">
<image mode="aspectFill" :src="item.image"></image>
</view>
<view class="right">
<view class="text-hidden-1">
客户姓名{{item.name}}
</view>
<view class="text-hidden-1">
产品规格{{item.unit}}
</view>
<view class="text-hidden-1">
租赁地址{{item.address}}
</view>
<!-- <view class="text-hidden-1">
总计时间{{item.useTime}}分钟
</view> -->
</view>
</view>
<view class="bottom">
<view class="price">
总价格<text class="num">{{item.money}}</text>
</view>
<view class="b1">
查看物流
</view>
<!-- <view @click.stop="toPayOrder(item)" class="b2" v-if="item.state == 0">
立即付款
</view>
<view class="b1" @click.stop="moreOrder(item.projectId,toPlaceorder)" v-if="item.state == 3">
再来一单
</view>
<view class="b2" @click.stop="toEvaluate(item.id,item.projectId,item.technicianId)" v-if="item.state == 3">
立即评价
</view>
<view class="b2" @click.stop="moreOrder(item.projectId,toPlaceorder)" v-if="item.state == 4">
再来一单
</view> -->
</view>
</view>
</view>
<tabber select="2"/>
</view>
</template>
<script>
import tabber from '@/components/base/tabbar.vue'
import { mapGetters } from 'vuex'
export default {
components : {
tabber,
},
data() {
return {
tabs: [{
name: '全部'
},
{
name: '租赁押金'
},
{
name: '水洗租赁'
},
{
name: '破损换货'
},
{
name: '退货退款'
}
],
queryParams: {
pageNo: 1,
pageSize: 10
},
// orderList: [
// {
// money : 99.99,
// address : '广广C32802',
// name : '**',
// phone : '150*****091',
// unit : '120*40*75',
// image : 'https://img95.699pic.com/photo/50058/1378.jpg_wh860.jpg',
// state_dictText : '',
// }
// ], //
orderList : {
records : [],
total : 0,
},
state : -1,
}
},
onShow() {
this.orderPage()
},
//
onReachBottom() {
if(this.queryParams.pageSize < this.orderList.total){
this.queryParams.pageSize += 10
this.orderPage()
}
},
methods: {
orderPage(){
let queryParams = {
...this.queryParams,
}
if(this.state != -1){
queryParams.state = this.state
}
this.$api('orderPage', queryParams, res => {
if(res.code == 200){
this.orderList = res.result
}
})
},
//tab
clickTabs(index) {
if (index == 0) {
this.state = -1;
} else {
this.state = index - 1;
}
this.queryParams.pageSize = 10
this.orderPage()
},
//
toOrderDetail(id) {
uni.navigateTo({
url: '/pages_order/order/orderDetail?id=' + id
})
},
getOrderList(){
},
}
}
</script>
<style scoped lang="scss">
.page{
}
.list {
.item {
width: calc(100% - 40rpx);
background-color: #fff;
margin: 20rpx;
box-sizing: border-box;
border-radius: 16rpx;
padding: 30rpx;
.top {
display: flex;
justify-content: space-between;
align-items: center;
font-size: 30rpx;
.service {}
.status {
font-size: 26rpx;
font-weight: 600;
}
}
.content {
display: flex;
margin: 10rpx 0;
.left {
width: 150rpx;
height: 150rpx;
border-radius: 10rpx;
image {
width: 150rpx;
height: 150rpx;
border-radius: 10rpx;
}
}
.right {
width: calc(100% - 160rpx);
color: #777;
font-size: 24rpx;
padding-left: 20rpx;
line-height: 40rpx;
background-color: #F8F8F8;
}
}
.bottom {
display: flex;
justify-content: space-between;
font-size: 25rpx;
.price {
font-weight: 900;
text {
color: #ff780099;
font-size: 30rpx;
}
}
.b1 {
border: 1px solid #777;
color: #777;
box-sizing: border-box;
}
.b2 {
background: linear-gradient(178deg, #4FD3BC, #60C285);
color: #fff;
}
view {
margin: 12rpx;
border-radius: 28rpx;
padding: 8rpx 28rpx;
margin-bottom: 0;
}
}
}
}
</style>

pages/login/login.vue → pages_order/auth/login.vue View File


pages/login/wxUserInfo.vue → pages_order/auth/wxUserInfo.vue View File

@ -46,7 +46,7 @@
data() { data() {
return { return {
userInfo: { userInfo: {
headImage: '/static/image/login/user.png', //
headImage: '../static/login/user.png', //
nickName: '', nickName: '',
name: '' name: ''
} }
@ -91,7 +91,7 @@
// } // }
// }) // })
uni.navigateTo({
uni.reLaunch({
url: "/pages/index/index" url: "/pages/index/index"
}) })
}) })

pages/autonym/autonym.vue → pages_order/autonym/autonym.vue View File


pages/record/record.vue → pages_order/record/record.vue View File

@ -2,7 +2,15 @@
<template> <template>
<view class="record"> <view class="record">
<!-- 自定义导航栏 --> <!-- 自定义导航栏 -->
<uni-nav-bar dark :fixed="true" shadow background-color="var(--main-color)" status-bar left-icon="left" title="签到记录" @clickLeft="toHome" />
<uni-nav-bar
dark
:fixed="true"
shadow
background-color="var(--main-color)"
status-bar
left-icon="left"
title="签到记录"
@clickLeft="$utils.navigateBack" />
<!-- 签到日历 --> <!-- 签到日历 -->
<view class="sign-calendar main"> <view class="sign-calendar main">
@ -120,12 +128,6 @@
`${currentMonth < 10 ? "0" + currentMonth : currentMonth}.${currentDay < 10 ? "0" + currentDay : currentDay}` `${currentMonth < 10 ? "0" + currentMonth : currentMonth}.${currentDay < 10 ? "0" + currentDay : currentDay}`
}, },
//
toHome(){
uni.navigateTo({
url: "/pages/index/index"
})
}
} }
} }
</script> </script>

static/image/autonym/autoym-bg.png → pages_order/static/autonym/autoym-bg.png View File


static/image/login/user.png → pages_order/static/login/user.png View File


BIN
static/image/cart/1.png View File

Before After
Width: 36  |  Height: 36  |  Size: 1.9 KiB

BIN
static/image/cart/2.png View File

Before After
Width: 72  |  Height: 72  |  Size: 5.4 KiB

BIN
static/image/product/favorable.png View File

Before After
Width: 60  |  Height: 15  |  Size: 282 B

Loading…
Cancel
Save