xingyy/uni-Identify-quality
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.12.3:3000/xingyy/uni-Identify-quality

Browse Source
This commit is contained in:
Aiden 2023-09-26 11:17:16 +08:00
commit cb511b7c57
11 changed files with 121 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
App.vue
View File

@ -26,14 +26,13 @@ export default {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.tm-poup-wk{
height: initial!important;
}
.u-upload__button{ .u-upload__button{
width: 404rpx!important; width: 404rpx!important;
height: 306rpx!important; height: 306rpx!important;
} }
.u-tabbar__content {
height: 166rpx;
}
.u-border-top {
border: none !important;
}
</style> </style>

12
components/uiq-tabbar/uiq-tabbar.vue
View File

@ -1,11 +1,11 @@
<template> <template>
<view class="tabbar"> <view class="tabbar">
<u-tabbar class="tabbar-ios-fix" :border-top="false" activeColor='#22bf8e' :value="current?current:0" :fixed="true" <u-tabbar :border="false" class="tabbar-ios-fix" activeColor='#22bf8e' :value="current?current:0" :fixed="true"
:placeholder="true" :safeAreaInsetBottom="true" @change="handleTabClick"> @change="handleTabClick">
<u-tabbar-item v-for='(item,index) in tabList' :key="index" :text="item.text"> <u-tabbar-item v-for='(item,index) in tabList' :key="index" :text="item.text">
<image slot="inactive-icon" class="u-page__item__slot-icon" :src="item.iconPath"> <image style="width: 52rpx;height: 52rpx;margin-top: 34rpx" slot="inactive-icon" class="u-page__item__slot-icon" :src="item.iconPath">
</image> </image>
<image slot="active-icon" class="u-page__item__slot-icon" :src="item.selectedIconPath"> <image style="width: 52rpx;height: 52rpx;margin-top: 34rpx" slot="active-icon" class="u-page__item__slot-icon" :src="item.selectedIconPath">
</image> </image>
</u-tabbar-item> </u-tabbar-item>
</u-tabbar> </u-tabbar>
@ -42,7 +42,7 @@ export default {
} }
/*.tabbar-ios-fix { .tabbar-ios-fix {
bottom: calc(120rpx + env(safe-area-inset-bottom)); bottom: calc(120rpx + env(safe-area-inset-bottom));
}*/ }
</style> </style>

17
pages.json
View File

@ -157,22 +157,23 @@
}, },
"uniIdRouter": {}, "uniIdRouter": {},
"tabBar": { "tabBar": {
"custom": true,
"list": [ "list": [
{ {
"pagePath": "pages/home/index", "pagePath": "pages/home/index"
"text": "首页"
}, },
{ {
"pagePath": "pages/mine/index", "pagePath": "pages/mine/index"
"text": "首页"
}, },
{ {
"pagePath": "pages/contract/index", "pagePath": "pages/contract/index"
"text": "首页"
}, },
{ {
"pagePath": "pages/order-goods/index", "pagePath": "pages/order-goods/index"
"text": "首页"
} }
] ]
} }

3
pages/confirm-order/index.vue
View File

@ -153,8 +153,9 @@ export default {
console.log(this.orderingInfo,'orderingInfo') console.log(this.orderingInfo,'orderingInfo')
if (this.$mp.query.ID) { if (this.$mp.query.ID) {
this.ID=this.$mp.query.ID this.ID=this.$mp.query.ID
this.getData()
} }
this.getData()
uni.createSelectorQuery().select('.title-block').boundingClientRect(data => { uni.createSelectorQuery().select('.title-block').boundingClientRect(data => {
let res = uni.getSystemInfoSync(); let res = uni.getSystemInfoSync();
const distance = res.windowHeight - data.bottom; const distance = res.windowHeight - data.bottom;

95
pages/consignment-painting/index.vue
View File

@ -17,16 +17,22 @@
name="6" name="6"
multiple multiple
:maxCount="1" :maxCount="1"
width="250" width="404rpx"
height="150" height="306rpx"
> >
<image src="https://cdn.uviewui.com/uview/demo/upload/positive.png" <div style="width: 404rpx;height: 306rpx;background: #000;border-radius: 20rpx;display: flex;flex-direction: column;align-items: center;justify-content: center">
mode="widthFix" style="width: 404rpx;height: 306rpx;"></image> <div style="margin-bottom: 14rpx">
<image style="width: 38.32rpx;height: 38.2rpx" src="../../static/zu142@3x.png"></image>
</div>
<div style="font-size: 32rpx;color: #fff">上传画作图片</div>
</div>
<!-- <image src="https://cdn.uviewui.com/uview/demo/upload/positive.png"
mode="widthFix" style="width: 404rpx;height: 306rpx;"></image>-->
</u-upload> </u-upload>
<!-- <image :src="info.artworkImg"></image>--> <!-- <image :src="info.artworkImg"></image>-->
</div> </div>
<tm-poup height="700" v-model="show_2" position="bottom"> <tm-poup v-model="show_2" position="bottom">
<div class="poup1"> <div class="poup1" >
<div class="content1"> <div class="content1">
<div class="wrap1">更换您的寄存地址</div> <div class="wrap1">更换您的寄存地址</div>
<div @click="show_2=false" class="wrap2"> <div @click="show_2=false" class="wrap2">
@ -116,7 +122,7 @@
<div class="wrap1_1_1">画作编号</div> <div class="wrap1_1_1">画作编号</div>
<div class="wrap1_1_2"></div> <div class="wrap1_1_2"></div>
<div class="wrap1_1_3"> <div class="wrap1_1_3">
<input style="color: #939393;font-size: 24rpx;" v-model="info.artworkNum" placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="info.artworkNum"/> <input style="color: #939393;font-size: 24rpx;" v-model="info.artworkNum" placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请输入画作编号"/>
</div> </div>
<div class="wrap1_1_4"></div> <div class="wrap1_1_4"></div>
</div> </div>
@ -124,7 +130,7 @@
<div class="wrap1_1_1">画作名称</div> <div class="wrap1_1_1">画作名称</div>
<div class="wrap1_1_2"></div> <div class="wrap1_1_2"></div>
<div class="wrap1_1_3"> <div class="wrap1_1_3">
<input style="color: #939393;font-size: 24rpx;" v-model="info.artworkName" placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="info.artworkName"/> <input style="color: #939393;font-size: 24rpx;" v-model="info.artworkName" placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请输入画作名称"/>
</div> </div>
<div class="wrap1_1_4"></div> <div class="wrap1_1_4"></div>
</div> </div>
@ -132,7 +138,7 @@
<div class="wrap1_1_1">画家名称</div> <div class="wrap1_1_1">画家名称</div>
<div class="wrap1_1_2"></div> <div class="wrap1_1_2"></div>
<div class="wrap1_1_3"> <div class="wrap1_1_3">
<input style="color: #939393;font-size: 24rpx;" v-model="info.artistName" placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="info.artistName"/> <input style="color: #939393;font-size: 24rpx;" v-model="info.artistName" placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请输入画家名称"/>
</div> </div>
<div class="wrap1_1_4"> <div class="wrap1_1_4">
</div> </div>
@ -141,7 +147,7 @@
<div class="wrap1_1_1">画作平尺数</div> <div class="wrap1_1_1">画作平尺数</div>
<div class="wrap1_1_2"></div> <div class="wrap1_1_2"></div>
<div class="wrap1_1_3"> <div class="wrap1_1_3">
<input style="color: #939393;font-size: 24rpx;" v-model="info.artworkSquareSize" placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="info.artworkSquareSize"/> <input style="color: #939393;font-size: 24rpx;" v-model="info.artworkSquareSize" placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请输入画作平尺数"/>
</div> </div>
</div> </div>
</div> </div>
@ -149,29 +155,28 @@
</div> </div>
<div class="content4"> <div class="content4">
<div class="wrap1"> <div class="wrap1">
<div class="wrap1_1"> <div class="wrap1_1" @click="show_2=true">
<div class="wrap1_1_1">寄存地址</div> <div class="wrap1_1_1">寄存地址</div>
<div class="wrap1_1_2"></div> <div class="wrap1_1_2"></div>
<div class="wrap1_1_3"> <div class="wrap1_1_3">
<input placeholder-style="color: #939393;font-size: 24rpx;" <input style="color: #939393;font-size: 24rpx;" disabled :value="warehouseID?addressList.find(x=>x.ID===warehouseID).address:''" placeholder-style="color: #939393;font-size: 24rpx;"
:placeholder="warehouseID?addressList.find(x=>x.ID===warehouseID).address:'寄存地址'"/> placeholder="请选择寄存地址"/>
</div> </div>
<div class="wrap1_1_4"></div> <div class="wrap1_1_4"></div>
<div @click="show_2=true" class="wrap1_1_5"> <div class="wrap1_1_5">
<image src="../../static/zu611@3x.png"></image> <image src="../../static/zu611@3x.png"></image>
</div> </div>
</div> </div>
<div class="wrap1_1"> <div class="wrap1_1" @click="show_1=true">
<div class="wrap1_1_1">寄存时限</div> <div class="wrap1_1_1">寄存时限</div>
<div class="wrap1_1_2"></div> <div class="wrap1_1_2"></div>
<div class="wrap1_1_3"> <div class="wrap1_1_3">
<input placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="cycleId?cycleList.find(x=>x.ID===cycleId).name:'寄存时限'"/> <input style="color: #939393;font-size: 24rpx;" :value="cycleId?cycleList.find(x=>x.ID===cycleId).name:''" disabled placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请选择寄存时限"/>
</div> </div>
<div @click="show_1=true" class="wrap1_1_5"> <div class="wrap1_1_5">
<image src="../../static/zu612@3x.png"></image> <image src="../../static/zu612@3x.png"></image>
</div> </div>
<div class="wrap1_1_4">
</div>
</div> </div>
</div> </div>
<div class="wrap2"></div> <div class="wrap2"></div>
@ -231,11 +236,6 @@ export default {
url: ''//二维码扫码的结果用户发起请求的body体 url: ''//二维码扫码的结果用户发起请求的body体
} }
}, },
onLoad(e) {
if (e) {
this.url = e.url
}
},
watch:{ watch:{
cycleId(newValue){ cycleId(newValue){
this.obtainAmount() this.obtainAmount()
@ -244,7 +244,8 @@ export default {
}, },
mounted() { mounted() {
this.getCycle() this.getCycle()
if (this.url){ if (this.$mp.query.url){
this.url=this.$mp.query.url
this.getDetailUrl() this.getDetailUrl()
} }
this.getAddress() this.getAddress()
@ -268,9 +269,8 @@ export default {
}); });
}) })
}, },
// 删除图片 deletePic() {
deletePic(event) { this.fileList1=[]
this[`fileList${event.name}`].splice(event.index, 1)
}, },
// 新增图片 // 新增图片
async afterRead(event) { async afterRead(event) {
@ -297,7 +297,42 @@ export default {
} }
}, },
async signContract(){ async signContract(){
const checks = [
{
value: this.fileList1.length>0,
message: '请上传画作图片'
},
{
value: this.info.artworkSquareSize,
message: '请输入画作平尺数'
},
{
value: this.info.artistName,
message: '请输入画家名称'
},
{
value: this.info.artworkName,
message: '请输入画作名称'
},
{
value: this.info.artworkNum,
message: '请输入画作编号'
},{
value: this.warehouseID,
message: '请选择寄存地址'
}, {
value: this.cycleId,
message: '请选择寄存时限'
}]
for (const check of checks) {
if (!check.value) {
uni.showToast({
title: check.message,
icon: 'none'
})
return
}
}
const data={ const data={
cycleId:this.cycleId, cycleId:this.cycleId,
warehouseID:this.warehouseID, warehouseID:this.warehouseID,
@ -492,6 +527,7 @@ picker-view {
padding-top: 28rpx; padding-top: 28rpx;
padding-left: 30rpx; padding-left: 30rpx;
padding-right: 30rpx; padding-right: 30rpx;
margin-bottom: 72rpx;
& > .content6 { & > .content6 {
margin-top: 26rpx; margin-top: 26rpx;
@ -593,6 +629,7 @@ picker-view {
} }
.poup { .poup {
margin-bottom: 72rpx;
padding-top: 28rpx; padding-top: 28rpx;
padding-left: 30rpx; padding-left: 30rpx;
padding-right: 30rpx; padding-right: 30rpx;

9
pages/order-goods/index.vue
View File

@ -219,13 +219,22 @@ export default {
} }
}, },
touchMove(e, index) { touchMove(e, index) {
if (this.mainList[index].artworkStatus!==5){
return
}
this.mainList[index].distanceX = e.touches[0].clientX - this.startX; this.mainList[index].distanceX = e.touches[0].clientX - this.startX;
}, },
touchStart(e, index) { touchStart(e, index) {
if (this.mainList[index].artworkStatus!==5){
return
}
this.mainList[index].isRight = true this.mainList[index].isRight = true
this.startX = e.touches[0].clientX; this.startX = e.touches[0].clientX;
}, },
touchEnd(index) { touchEnd(index) {
if (this.mainList[index].artworkStatus!==5){
return
}
if (this.mainList[index].distanceX < -((144 / 750) * this.windowWidth)) { if (this.mainList[index].distanceX < -((144 / 750) * this.windowWidth)) {
this.mainList[index].distanceX = -((144 / 750) * this.windowWidth); this.mainList[index].distanceX = -((144 / 750) * this.windowWidth);
} else { } else {

4
pages/order-goods/order-details.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="order-details" > <div class="order-details" >
<title-block class="title-block" title="2订单库"> <title-block class="title-block" title="订单库">
<template #left> <template #left>
<div> <image style="width: 112rpx;height: 52rpx" src="https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/785cf885-c4c9-44b3-8155-4b39988c7ef8.png" @click="back"></image></div> <div> <image style="width: 112rpx;height: 52rpx" src="https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/785cf885-c4c9-44b3-8155-4b39988c7ef8.png" @click="back"></image></div>
</template> </template>
@ -8,7 +8,7 @@
<div :style="{height:`${distance}px`}" style="overflow-y: auto"> <div :style="{height:`${distance}px`}" style="overflow-y: auto">
<div style="padding-bottom: 128rpx"> <div style="padding-bottom: 128rpx">
<div class="content2"> <div class="content2">
<image src="../../static/zu709@3x.png"></image> <image :src="info.artworkImg"></image>
</div> </div>
<div class="content3"> <div class="content3">
<div class="wrap1"> <div class="wrap1">

16
pages/paySuccess/paySuccess.vue
View File

@ -7,7 +7,7 @@
/> />
<view class="info"> <view class="info">
<view> <view>
<image src="../../static/bbj1@3x.png" mode="scaleToFill" style="width:191rpx;height:146rpx"/> <image :src="info.artworkImg" mode="scaleToFill" style="width:191rpx;height:146rpx"/>
</view> </view>
<view class="info-right"> <view class="info-right">
<view class="info-right-item"> <view class="info-right-item">
@ -48,10 +48,10 @@
</view> </view>
<view class="tips">*请携带您的画作在时限之前到达寄存地</view> <view class="tips">*请携带您的画作在时限之前到达寄存地</view>
<view class="btns"> <view class="btns">
<view style="width: 280rpx;height:64rpx;border-radius: 40rpx;"> <view @click="goHome" style="width: 280rpx;height:64rpx;border-radius: 40rpx;">
<u-button text="返回首页" shape="circle" color="#626262"></u-button> <u-button text="返回首页" shape="circle" color="#626262"></u-button>
</view> </view>
<view style="width: 280rpx;height:64rpx;border-radius: 40rpx"> <view @click="goDetails" style="width: 280rpx;height:64rpx;border-radius: 40rpx">
<u-button text="查看订单详情" shape="circle" color="#699A70"></u-button> <u-button text="查看订单详情" shape="circle" color="#699A70"></u-button>
</view> </view>
</view> </view>
@ -72,6 +72,16 @@ export default {
this.getData() this.getData()
}, },
methods: { methods: {
goDetails(){
uni.navigateTo({
url: `/pages/order-goods/order-details?ID=${this.$mp.query.ID}`,
});
},
goHome(){
uni.switchTab({
url: "/pages/home/index",
});
},
async getData() { async getData() {
const data1 = { const data1 = {
ID: Number(this.$mp.query.ID) ID: Number(this.$mp.query.ID)

BIN
static/zu142@3x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 399 B

12
util/tabbar.js
View File

@ -7,21 +7,21 @@ let tab1 = [{
{ {
"text": "订单", "text": "订单",
"pagePath": "pages/order-goods/index", "pagePath": "pages/order-goods/index",
"iconPath": "../../static/tabbar/home.png", "iconPath": "https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/cf65acab-6d46-4d2a-af07-3f1daf09139c.png",
"selectedIconPath": "../../static/tabbar/home-active.png" "selectedIconPath": "https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/a5710018-3791-4e0c-b698-caee9bbb642b.png"
}, },
{ {
"text": "合同", "text": "合同",
"pagePath": "pages/contract/index", "pagePath": "pages/contract/index",
"iconPath": "../../static/tabbar/home.png", "iconPath": "https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/17b5895b-6572-49de-b710-4b318fe0776c.png",
"selectedIconPath": "../../static/tabbar/home-active.png" "selectedIconPath": "https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/c37e0bb7-8702-4d6f-8caf-d62abcf07845.png"
} }
, ,
{ {
"text": "我的", "text": "我的",
"pagePath": "pages/mine/index", "pagePath": "pages/mine/index",
"iconPath": "../../static/tabbar/home.png", "iconPath": "https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/bc489115-daba-4457-a8de-f151d7caf610.png",
"selectedIconPath": "../../static/tabbar/home-active.png" "selectedIconPath": "https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/91cae751-1b5a-441d-aa09-aecca60c8519.png"
} }
] ]
export default tab1 export default tab1

1
uview-ui/components/u-tabbar/u-tabbar.vue
View File

@ -112,7 +112,6 @@
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "../../libs/css/components.scss"; @import "../../libs/css/components.scss";