Compare commits
No commits in common. "ba755bbdd81d13694d0b806bb8233a0f2a5ae7da" and "2e8d5a198dcf80ed2b5adfd3ee22f4e420b97cb3" have entirely different histories.
ba755bbdd8
...
2e8d5a198d
5
App.vue
5
App.vue
@ -26,16 +26,11 @@ export default {
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
.tm-poup-wk{
|
||||
height: initial!important;
|
||||
}
|
||||
.u-upload__button{
|
||||
width: 404rpx!important;
|
||||
height: 306rpx!important;
|
||||
}
|
||||
.u-tabbar__content {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
height: 166rpx;
|
||||
}
|
||||
.u-border-top {
|
||||
|
||||
17
pages.json
17
pages.json
@ -157,23 +157,22 @@
|
||||
},
|
||||
"uniIdRouter": {},
|
||||
"tabBar": {
|
||||
"custom": true,
|
||||
"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": "首页"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@ -153,9 +153,8 @@ export default {
|
||||
console.log(this.orderingInfo,'orderingInfo')
|
||||
if (this.$mp.query.ID) {
|
||||
this.ID=this.$mp.query.ID
|
||||
this.getData()
|
||||
}
|
||||
|
||||
this.getData()
|
||||
uni.createSelectorQuery().select('.title-block').boundingClientRect(data => {
|
||||
let res = uni.getSystemInfoSync();
|
||||
const distance = res.windowHeight - data.bottom;
|
||||
|
||||
@ -17,22 +17,16 @@
|
||||
name="6"
|
||||
multiple
|
||||
:maxCount="1"
|
||||
width="404rpx"
|
||||
height="306rpx"
|
||||
width="250"
|
||||
height="150"
|
||||
>
|
||||
<div style="width: 404rpx;height: 306rpx;background: #000;border-radius: 20rpx;display: flex;flex-direction: column;align-items: center;justify-content: center">
|
||||
<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>-->
|
||||
<image src="https://cdn.uviewui.com/uview/demo/upload/positive.png"
|
||||
mode="widthFix" style="width: 404rpx;height: 306rpx;"></image>
|
||||
</u-upload>
|
||||
<!-- <image :src="info.artworkImg"></image>-->
|
||||
</div>
|
||||
<tm-poup v-model="show_2" position="bottom">
|
||||
<div class="poup1" >
|
||||
<tm-poup height="700" v-model="show_2" position="bottom">
|
||||
<div class="poup1">
|
||||
<div class="content1">
|
||||
<div class="wrap1">更换您的寄存地址</div>
|
||||
<div @click="show_2=false" class="wrap2">
|
||||
@ -122,7 +116,7 @@
|
||||
<div class="wrap1_1_1">画作编号</div>
|
||||
<div class="wrap1_1_2"></div>
|
||||
<div class="wrap1_1_3">
|
||||
<input style="color: #939393;font-size: 24rpx;" v-model="info.artworkNum" placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请输入画作编号"/>
|
||||
<input style="color: #939393;font-size: 24rpx;" v-model="info.artworkNum" placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="info.artworkNum"/>
|
||||
</div>
|
||||
<div class="wrap1_1_4"></div>
|
||||
</div>
|
||||
@ -130,7 +124,7 @@
|
||||
<div class="wrap1_1_1">画作名称</div>
|
||||
<div class="wrap1_1_2"></div>
|
||||
<div class="wrap1_1_3">
|
||||
<input style="color: #939393;font-size: 24rpx;" v-model="info.artworkName" placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请输入画作名称"/>
|
||||
<input style="color: #939393;font-size: 24rpx;" v-model="info.artworkName" placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="info.artworkName"/>
|
||||
</div>
|
||||
<div class="wrap1_1_4"></div>
|
||||
</div>
|
||||
@ -138,7 +132,7 @@
|
||||
<div class="wrap1_1_1">画家名称</div>
|
||||
<div class="wrap1_1_2"></div>
|
||||
<div class="wrap1_1_3">
|
||||
<input style="color: #939393;font-size: 24rpx;" v-model="info.artistName" placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请输入画家名称"/>
|
||||
<input style="color: #939393;font-size: 24rpx;" v-model="info.artistName" placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="info.artistName"/>
|
||||
</div>
|
||||
<div class="wrap1_1_4">
|
||||
</div>
|
||||
@ -147,7 +141,7 @@
|
||||
<div class="wrap1_1_1">画作平尺数</div>
|
||||
<div class="wrap1_1_2"></div>
|
||||
<div class="wrap1_1_3">
|
||||
<input style="color: #939393;font-size: 24rpx;" v-model="info.artworkSquareSize" placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请输入画作平尺数"/>
|
||||
<input style="color: #939393;font-size: 24rpx;" v-model="info.artworkSquareSize" placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="info.artworkSquareSize"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -155,28 +149,29 @@
|
||||
</div>
|
||||
<div class="content4">
|
||||
<div class="wrap1">
|
||||
<div class="wrap1_1" @click="show_2=true">
|
||||
<div class="wrap1_1">
|
||||
<div class="wrap1_1_1">寄存地址</div>
|
||||
<div class="wrap1_1_2"></div>
|
||||
<div class="wrap1_1_3">
|
||||
<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="请选择寄存地址"/>
|
||||
<input placeholder-style="color: #939393;font-size: 24rpx;"
|
||||
:placeholder="warehouseID?addressList.find(x=>x.ID===warehouseID).address:'寄存地址'"/>
|
||||
</div>
|
||||
<div class="wrap1_1_4"></div>
|
||||
<div class="wrap1_1_5">
|
||||
<div @click="show_2=true" class="wrap1_1_5">
|
||||
<image src="../../static/zu611@3x.png"></image>
|
||||
</div>
|
||||
</div>
|
||||
<div class="wrap1_1" @click="show_1=true">
|
||||
<div class="wrap1_1">
|
||||
<div class="wrap1_1_1">寄存时限</div>
|
||||
<div class="wrap1_1_2"></div>
|
||||
<div class="wrap1_1_3">
|
||||
<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="请选择寄存时限"/>
|
||||
<input placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="cycleId?cycleList.find(x=>x.ID===cycleId).name:'寄存时限'"/>
|
||||
</div>
|
||||
<div class="wrap1_1_5">
|
||||
<div @click="show_1=true" class="wrap1_1_5">
|
||||
<image src="../../static/zu612@3x.png"></image>
|
||||
</div>
|
||||
|
||||
<div class="wrap1_1_4">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="wrap2"></div>
|
||||
@ -236,6 +231,11 @@ export default {
|
||||
url: ''//二维码扫码的结果用户发起请求的body体
|
||||
}
|
||||
},
|
||||
onLoad(e) {
|
||||
if (e) {
|
||||
this.url = e.url
|
||||
}
|
||||
},
|
||||
watch:{
|
||||
cycleId(newValue){
|
||||
this.obtainAmount()
|
||||
@ -244,8 +244,7 @@ export default {
|
||||
},
|
||||
mounted() {
|
||||
this.getCycle()
|
||||
if (this.$mp.query.url){
|
||||
this.url=this.$mp.query.url
|
||||
if (this.url){
|
||||
this.getDetailUrl()
|
||||
}
|
||||
this.getAddress()
|
||||
@ -269,8 +268,9 @@ export default {
|
||||
});
|
||||
})
|
||||
},
|
||||
deletePic() {
|
||||
this.fileList1=[]
|
||||
// 删除图片
|
||||
deletePic(event) {
|
||||
this[`fileList${event.name}`].splice(event.index, 1)
|
||||
},
|
||||
// 新增图片
|
||||
async afterRead(event) {
|
||||
@ -297,42 +297,7 @@ export default {
|
||||
}
|
||||
},
|
||||
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={
|
||||
cycleId:this.cycleId,
|
||||
warehouseID:this.warehouseID,
|
||||
@ -527,7 +492,6 @@ picker-view {
|
||||
padding-top: 28rpx;
|
||||
padding-left: 30rpx;
|
||||
padding-right: 30rpx;
|
||||
margin-bottom: 72rpx;
|
||||
|
||||
& > .content6 {
|
||||
margin-top: 26rpx;
|
||||
@ -629,7 +593,6 @@ picker-view {
|
||||
}
|
||||
|
||||
.poup {
|
||||
margin-bottom: 72rpx;
|
||||
padding-top: 28rpx;
|
||||
padding-left: 30rpx;
|
||||
padding-right: 30rpx;
|
||||
|
||||
@ -219,22 +219,13 @@ export default {
|
||||
}
|
||||
},
|
||||
touchMove(e, index) {
|
||||
if (this.mainList[index].artworkStatus!==5){
|
||||
return
|
||||
}
|
||||
this.mainList[index].distanceX = e.touches[0].clientX - this.startX;
|
||||
},
|
||||
touchStart(e, index) {
|
||||
if (this.mainList[index].artworkStatus!==5){
|
||||
return
|
||||
}
|
||||
this.mainList[index].isRight = true
|
||||
this.startX = e.touches[0].clientX;
|
||||
},
|
||||
touchEnd(index) {
|
||||
if (this.mainList[index].artworkStatus!==5){
|
||||
return
|
||||
}
|
||||
if (this.mainList[index].distanceX < -((144 / 750) * this.windowWidth)) {
|
||||
this.mainList[index].distanceX = -((144 / 750) * this.windowWidth);
|
||||
} else {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<div class="order-details" >
|
||||
<title-block class="title-block" title="订单库">
|
||||
<title-block class="title-block" title="2订单库">
|
||||
<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>
|
||||
</template>
|
||||
@ -8,7 +8,7 @@
|
||||
<div :style="{height:`${distance}px`}" style="overflow-y: auto">
|
||||
<div style="padding-bottom: 128rpx">
|
||||
<div class="content2">
|
||||
<image :src="info.artworkImg"></image>
|
||||
<image src="../../static/zu709@3x.png"></image>
|
||||
</div>
|
||||
<div class="content3">
|
||||
<div class="wrap1">
|
||||
|
||||
@ -48,10 +48,10 @@
|
||||
</view>
|
||||
<view class="tips">*请携带您的画作在时限之前到达寄存地</view>
|
||||
<view class="btns">
|
||||
<view @click="goHome" style="width: 280rpx;height:64rpx;border-radius: 40rpx;">
|
||||
<view style="width: 280rpx;height:64rpx;border-radius: 40rpx;">
|
||||
<u-button text="返回首页" shape="circle" color="#626262"></u-button>
|
||||
</view>
|
||||
<view @click="goDetails" style="width: 280rpx;height:64rpx;border-radius: 40rpx">
|
||||
<view style="width: 280rpx;height:64rpx;border-radius: 40rpx">
|
||||
<u-button text="查看订单详情" shape="circle" color="#699A70"></u-button>
|
||||
</view>
|
||||
</view>
|
||||
@ -72,16 +72,6 @@ export default {
|
||||
this.getData()
|
||||
},
|
||||
methods: {
|
||||
goDetails(){
|
||||
uni.navigateTo({
|
||||
url: `/pages/order-goods/order-details?ID=${this.$mp.query.ID}`,
|
||||
});
|
||||
},
|
||||
goHome(){
|
||||
uni.switchTab({
|
||||
url: "/pages/home/index",
|
||||
});
|
||||
},
|
||||
async getData() {
|
||||
const data1 = {
|
||||
ID: Number(this.$mp.query.ID)
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 399 B |
@ -7,21 +7,21 @@ let tab1 = [{
|
||||
{
|
||||
"text": "订单",
|
||||
"pagePath": "pages/order-goods/index",
|
||||
"iconPath": "https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/cf65acab-6d46-4d2a-af07-3f1daf09139c.png",
|
||||
"selectedIconPath": "https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/a5710018-3791-4e0c-b698-caee9bbb642b.png"
|
||||
"iconPath": "../../static/tabbar/home.png",
|
||||
"selectedIconPath": "../../static/tabbar/home-active.png"
|
||||
},
|
||||
{
|
||||
"text": "合同",
|
||||
"pagePath": "pages/contract/index",
|
||||
"iconPath": "https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/17b5895b-6572-49de-b710-4b318fe0776c.png",
|
||||
"selectedIconPath": "https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/c37e0bb7-8702-4d6f-8caf-d62abcf07845.png"
|
||||
"iconPath": "../../static/tabbar/home.png",
|
||||
"selectedIconPath": "../../static/tabbar/home-active.png"
|
||||
}
|
||||
,
|
||||
{
|
||||
"text": "我的",
|
||||
"pagePath": "pages/mine/index",
|
||||
"iconPath": "https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/bc489115-daba-4457-a8de-f151d7caf610.png",
|
||||
"selectedIconPath": "https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/91cae751-1b5a-441d-aa09-aecca60c8519.png"
|
||||
"iconPath": "../../static/tabbar/home.png",
|
||||
"selectedIconPath": "../../static/tabbar/home-active.png"
|
||||
}
|
||||
]
|
||||
export default tab1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user