Skip to content

W
wly-APP
Commit abe5cf09 authored by chuan.liu's avatar chuan.liu
Browse files
Options

新增配额酒下单

parent a92dd115
Hide whitespace changes
Inline Side-by-side
Showing with 663 additions and 8 deletions
pages.json
View file @ abe5cf09
...@@ -84,6 +84,48 @@ ...@@ -84,6 +84,48 @@
} }
} }
} }
},{
"path": "pages/quota/quota",
"style": {
"app-plus": {
"titleNView": {
"titleAlign": "left",
"titleColor": "#333",
"titleSize": "17px",
"backgroundColor": "#fff",
"titleText": "配额订单",
"autoBackButton": true
}
}
}
},{
"path": "pages/no-quota/no-quota",
"style": {
"app-plus": {
"titleNView": {
"titleAlign": "left",
"titleColor": "#333",
"titleSize": "17px",
"backgroundColor": "#fff",
"titleText": "非配额订单",
"autoBackButton": true
}
}
}
},{
"path": "pages/group-buy/group-buy",
"style": {
"app-plus": {
"titleNView": {
"titleAlign": "left",
"titleColor": "#333",
"titleSize": "17px",
"backgroundColor": "#fff",
"titleText": "团购订单",
"autoBackButton": true
}
}
}
}, { }, {
"path": "pages/logistics/logistics", "path": "pages/logistics/logistics",
"style": { "style": {
......
pages/apply-delivery/apply-delivery-checkin.nvue
View file @ abe5cf09
...@@ -152,8 +152,8 @@ ...@@ -152,8 +152,8 @@
position: absolute; position: absolute;
right: 0; right: 0;
top: 16px; top: 16px;
width: 9px; width: 12rpx;
height: 16px; height: 20rpx;
z-index: 10; z-index: 10;
} }
......
pages/go-order/go-order.nvue
View file @ abe5cf09
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<view class="status_bar" :style="navHeight"></view> <view class="status_bar" :style="navHeight"></view>
<view class="listview"> <view class="listview">
<view class="cell-list"> <view class="cell-list">
<view class="cell-list-block"> <view class="cell-list-block" @click="goOrder('quota')">
<image class="icon-address" src="@/static/image/uc_address@3x.png" mode="aspectFit"></image> <image class="icon-address" src="@/static/image/uc_address@3x.png" mode="aspectFit"></image>
<view class="cell-list-block__content"> <view class="cell-list-block__content">
<text class="cell-list-block__title">配额酒单</text> <text class="cell-list-block__title">配额酒单</text>
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</view> </view>
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image> <image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
</view> </view>
<view class="cell-list-block"> <view class="cell-list-block" @click="goOrder('no-quota')">
<image class="icon-address" src="@/static/image/uc_setting@3x.png" mode="aspectFit"></image> <image class="icon-address" src="@/static/image/uc_setting@3x.png" mode="aspectFit"></image>
<view class="cell-list-block__content"> <view class="cell-list-block__content">
<text class="cell-list-block__title">非配额酒单</text> <text class="cell-list-block__title">非配额酒单</text>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</view> </view>
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image> <image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
</view> </view>
<view class="cell-list-block"> <view class="cell-list-block" @click="goOrder('group-buy')">
<image class="icon-address" src="@/static/image/uc_setting@3x.png" mode="aspectFit"></image> <image class="icon-address" src="@/static/image/uc_setting@3x.png" mode="aspectFit"></image>
<view class="cell-list-block__content"> <view class="cell-list-block__content">
<text class="cell-list-block__title">公关团购订单</text> <text class="cell-list-block__title">公关团购订单</text>
...@@ -53,7 +53,11 @@ ...@@ -53,7 +53,11 @@
...mapState(['sysinfo']) ...mapState(['sysinfo'])
}, },
methods: { methods: {
goOrder(type){
uni.navigateTo({
url: `/pages/${type}/${type}`
});
}
} }
} }
</script> </script>
......
pages/group-buy/group-buy.nvue 0 → 100644
View file @ abe5cf09
<template>
<div>
</div>
</template>
<script>
export default {
}
</script>
<style>
</style>
pages/home/home.vue
View file @ abe5cf09
...@@ -413,8 +413,8 @@ ...@@ -413,8 +413,8 @@
} }
.icon-arrow { .icon-arrow {
width: 18rpx; width: 12rpx;
height: 32rpx; height: 20rpx;
} }
} }
......
pages/no-quota/no-quota.nvue 0 → 100644
View file @ abe5cf09
<template>
<div>
</div>
</template>
<script>
export default {
}
</script>
<style>
</style>
pages/quota/index.nvue 0 → 100644
View file @ abe5cf09
<template>
<view class="lists">
<view class="middle upload summary">
<view class="">
<image class="icon_plan" src="@/static/image/icon_plan@3x.png" mode=""></image>
<text class="upload-text">合计金额</text>
</view>
<view>
<text class="summary-num">789*6*4</text>
</view>
</view>
<view class="middle view">
<view class="text-block title-first">
<text class="middle-date title-first__text">计划内</text>
</view>
<view class="text-block">
<text class="middle-date">计划编号</text>
<view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell">
<view class="uni-list-cell-db">
<text class="middle-date-des">请选择</text>
</view>
</view>
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
</view>
</view>
<view class="text-block">
<text class="middle-date">产品</text>
<view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell">
<view class="uni-list-cell-db">
<input class="middle-date-des" type="text" value="" placeholder="请填写" />
</view>
</view>
</view>
</view>
<view class="text-block">
<text class="middle-date">数量（件）</text>
<text class="middle-date-des">789</text>
</view>
<view class="text-block text-block-last">
<text class="middle-date">单价</text>
<text class="middle-date-des">789*6*4</text>
</view>
</view>
<view class="planout-block">
<text class="planout-block-title">计划外</text>
<image class="planout-block-icon" src="@/static/image/shop_more@3x.png" mode="aspectFit"></image>
</view>
<uni-swipe-action class="planout-block-lists">
<uni-swipe-action-item v-for="item in 2" :key='item'>
<view class="middle view planout-block-item">
<view class="text-block title-first">
<text class="middle-date title-first__text">1</text>
</view>
<view class="text-block">
<text class="middle-date">产品</text>
<view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell">
<view class="uni-list-cell-db">
<text class="middle-date-des">请选择</text>
</view>
</view>
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
</view>
</view>
<view class="text-block">
<text class="middle-date">数量（件）</text>
<input class="middle-date-des" type="text" value="" placeholder="请填写" />
</view>
<view class="text-block">
<text class="middle-date">单价</text>
<text class="middle-date-des">789</text>
</view>
<view class="text-block text-block-last">
<text class="middle-date">小计</text>
<text class="middle-date-des">789*6*4</text>
</view>
</view>
<template v-slot:right>
<view class="swipe-right-block" @click="handleDel"><text class="swipe-right-block__text">删除</text>
</view>
</template>
</uni-swipe-action-item>
</uni-swipe-action>
<view class="bottom-area"></view>
<view class="bottom">
<button class="btn btn-l" type="default" @tap="preStep">
<text class="btn-text btn-text-l">上一步</text>
</button>
<button class="btn" type="default" @tap="submit">
<text class="btn-text">下一步</text>
</button>
</view>
</view>
</template>
<script>
export default {
data() {
return {
applyNum: 100
}
},
methods: {
handleDel() {
console.log(1)
},
submit() {
this.$emit('submit')
},
preStep() {
this.$emit('click', 'deliveryList')
},
}
}
</script>
<style lang="scss" scoped>
.view {
flex-direction: column;
}
.lists {
position: relative;
flex-direction: column;
padding: 0 16rpx;
overflow-y: scroll;
}
.middle {
background-color: #fff;
border-radius: 16rpx;
padding: 32rpx 64rpx 40rpx 48rpx;
}
.text-block {
over-overflow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
}
.text-block-last {
margin-bottom: 0;
border-bottom: 0;
}
.middle-date {
flex: 2;
font-size: 28rpx;
line-height: 96rpx;
color: #333;
margin-bottom: 8rpx;
}
.middle-date-des {
flex: 3;
font-size: 28rpx;
line-height: 96rpx;
height: 96rpx;
color: #888;
}
.picker-year {
position: relative;
border-radius: 4px;
align-items: center;
}
.title-first {
border-bottom: 0;
margin-bottom: 24rpx;
}
.title-first__text {
font-size: 28rpx;
color: #333333;
font-weight: 600;
}
.uni-list-cell {
flex: 1;
}
.uni-list-cell-db {
flex: 1;
}
.picker-block {
flex: 1;
}
.icon-arrow {
position: absolute;
right: 0;
top: 16px;
width: 12rpx;
height: 20rpx;
z-index: 10;
}
.upload {
padding: 0;
height: 136rpx;
padding: 48rpx;
margin-bottom: 0;
align-items: center;
}
.upload-text {
flex: 2;
font-size: 14px;
color: #999;
}
.summary {
display: flex;
margin-bottom: 32rpx;
height: 176rpx;
padding: 0 48rpx 0 24rpx;
justify-content: space-between;
}
.icon_plan {
width: 36rpx;
height: 36rpx;
margin-right: 8rpx;
}
.summary-num {
font-size: 32rpx;
color: #333;
font-weight: 500;
}
.planout-block-lists{
display: flex;
flex-direction: column;
}
.uni-swipe {
flex: 1;
margin-bottom: 26rpx;
}
/deep/ .uni-swipe_box {
flex: 1;
}
.swipe-right-block {
width: 152rpx;
background: linear-gradient(90deg, #fb4d61, #ff0f00 100%);
border-radius: 0px 8px 8px 0px;
justify-content: center;
}
.swipe-right-block__text {
display: flex;
align-items: center;
justify-content: center;
color: #fff;
font-size: 34rpx;
font-weight: 500;
}
.planout-block {
display: flex;
justify-content: space-between;
height: 40rpx;
margin-top: 48rpx;
margin-bottom: 32rpx;
padding: 0 24rpx;
}
.planout-block-title {
font-size: 28rpx;
color: #333;
font-weight: 600;
}
.planout-block-icon {
width: 32rpx;
height: 40rpx;
}
.planout-block-item {
flex: 1;
}
.bottom-area {
height: 140rpx;
margin-top: 12rpx;
}
.bottom {
position: fixed;
bottom: 0;
left: 0;
z-index: 10;
width: 750rpx;
height: 140rpx;
padding: 0 32rpx;
background-color: #fff;
justify-content: space-between;
align-items: center;
}
.btn {
flex: 1;
height: 92rpx;
background: $wly-primary-color;
border-radius: 46rpx;
}
.btn-l {
margin-right: 30rpx;
border: 1px solid $wly-primary-color;
background-color: transparent;
}
.btn-text {
color: #fff;
font-size: 34rpx;
}
.btn-text-l {
color: $wly-primary-color;
}
</style>
pages/quota/quota.nvue 0 → 100644
View file @ abe5cf09
<template>
<view class="apply-history view" :style="winHeight">
<view class="status_bar" :style="navHeight"></view>
<view class="header-bg"></view>
<view class="apply-history-wrapper view">
<view ref='top' id="top">
<view class="steps">
<view class="steps__row-container">
<view class="steps__row-line-item">
<view class="steps__row-line steps__row-line--before steps__row-line--hide"></view>
<view class="steps__row-check">
<i class="icon-dot icon-dot-active"></i>
</view>
<view class="steps__row-line steps__row-line--after steps__row-line--active"></view>
</view>
<view class="steps__row-line-item">
<view class="steps__row-line steps__row-line--before" :class="{'steps__row-line--active':deliveryListBeforeLineShow}"></view>
<view class="steps__row-check steps__row-circle">
<i class="icon-dot" :class="{'icon-dot-active':deliveryListBeforeLineShow}"></i>
</view>
<view class="steps__row-line steps__row-line--after" :class="{'steps__row-line--active':!deliveryListAfterLineShow}"></view>
</view>
<view class="steps__row-line-item">
<view class="steps__row-line steps__row-line--before" :class="{'steps__row-line--active':deliveryCheckLineShow}"></view>
<view class="steps__row-check steps__row-circle">
<i class="icon-dot " :class="{'icon-dot-active':deliveryCheckLineShow}"></i>
</view>
<view class="steps__row-line steps__row-line--after steps__row-line--hide"></view>
</view>
</view>
<view class="steps__row-text-container">
<view class="steps__row-text">
<text class="steps__row-title">下单类型</text>
<text class="steps__row-desc"></text>
</view>
<view class="steps__row-text">
<text class="steps__row-title">订购产品</text>
<text class="steps__row-desc"></text>
</view>
<view class="steps__row-text">
<text class="steps__row-title">附件上传</text>
<text class="steps__row-desc"></text>
</view>
</view>
</view>
</view>
<component :style="componentHeight" :is="currentTabComponent" @click="changeComponent" @submit="submit"></component>
</view>
</view>
</template>
<script>
import {
mapState
} from 'vuex'
import index from './index.nvue'
// #ifdef APP-PLUS
const dom = weex.requireModule('dom');
// #endif
export default {
components: {
index
},
data() {
return {
currentTabComponent: 'index',
topHeight:''
}
},
computed: {
deliveryListBeforeLineShow() {
return this.currentTabComponent != 'deliveryPlan'
},
deliveryListAfterLineShow() {
return this.currentTabComponent == 'index'
},
deliveryCheckLineShow(){
return this.currentTabComponent == 'deliveryPlan'
},
componentHeight(){
console.log('componentHeight',`${this.sysinfo.safeArea.height - 44 - this.topHeight}px`,this.sysinfo);
return {
'height':`${this.sysinfo.safeArea.height - 44 - this.topHeight}px`
}
},
winHeight(){
return {
'height':`${this.sysinfo.safeArea.height}px`
}
},
navHeight(){
return {
'height':`${this.sysinfo.safeArea.top + 44}px`
}
},
...mapState(['sysinfo'])
},
onReady() {
// this.winHeight = `height:${this.sysinfo.safeArea.height}px`;
// this.navHeight = `height:${this.sysinfo.safeArea.top + 44}px`;
// #ifdef APP-NVUE
let queryTabSize = uni.createSelectorQuery().in(this);
queryTabSize.select('#top').boundingClientRect();
queryTabSize.exec(rects => {
console.log('rects',rects);
rects.forEach((rect) => {
this.topHeight = rect.height;
})
});
// #endif
// #ifdef H5
uni.createSelectorQuery().in(this).select('#top').boundingClientRect( (res) => {
this.topHeight = res.height;
}).exec();
// #endif
},
onBackPress() {
uni.navigateBack({
delta: 1
})
},
methods: {
changeComponent(com) {
this.currentTabComponent = com;
},
submit() {
console.log('submit')
}
}
}
</script>
<style lang="scss" scoped>
.view {
flex-direction: column;
}
.header-bg {
height: 284rpx;
opacity: 0.72;
margin-top: -88rpx;
background: linear-gradient(232deg, #f4e2e2 25%, #faf3f3 98%);
}
.apply-history {
width: 750rpx;
flex: 1;
background: $background-color-1;
}
.apply-history-wrapper {
margin-top: -164rpx;
}
.top {
position: relative;
background: $background-color-1;
}
.steps {
flex: 1;
flex-direction: column;
margin: 28rpx 0 32rpx;
}
.steps__row-text-container {
align-items: flex-end;
flex-direction: row;
}
.steps__row-text {
flex: 1;
flex-direction: column;
}
.steps__row-title {
font-size: 12px;
line-height: 16px;
text-align: center;
color: $text-base-color;
}
.steps__row-container {
margin-bottom: 16rpx;
}
.steps__row-line-item {
flex: 1;
height: 14px;
line-height: 14px;
align-items: center;
justify-content: center;
}
.steps__row-line--before {
transform: translateX(-1px);
}
.steps__row-line {
flex: 1;
height: 1px;
background-color: #fff;
}
.icon-dot {
width: 16rpx;
height: 16rpx;
background: #E5E5E5;
border-radius: 50%;
}
.icon-dot-active {
background: #ff1d32;
}
.steps__row-line--after {
transform: translateX(1px);
}
.steps__row-line {
flex: 1;
height: 1px;
background-color: #fff;
}
.steps__row-line--active {
background: #ff3e61;
border-radius: 1px;
}
.steps__row-circle {
background: #E5E5E5;
}
.steps__row-line--hide {
background-color: transparent;
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment