Skip to content

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

调试ios模拟器兼容性

parent 0bab7fe5
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2709 additions and 2599 deletions
components/uni-list.vue
View file @ 97345d64
......@@ -11,7 +11,7 @@
</list>
<!-- #endif -->
<!-- #ifdef H5 || MP-WEIXIN || MP-QQ -->
<scroll-view class="uni-list" :enableBackToTop="enableBackToTop" :scroll-y="scrollY" @scrolltolower="loadMore">
<scroll-view class="uni-list" :enableBackToTop="enableBackToTop" :show-scrollbar='false' :scroll-y="scrollY" @scrolltolower="loadMore">
<slot />
</scroll-view>
<!-- #endif -->
......
pages.json
View file @ 97345d64
......@@ -263,7 +263,7 @@
"titleSize": "17px",
"backgroundColor": "transparent",
"titleText": "客户选择",
"autoBackButton": false,
"autoBackButton": true,
"buttons": [{
"type": "none",
"text": "选择",
......@@ -406,7 +406,7 @@
"titleSize": "17px",
"backgroundColor": "#fff",
"titleText": "生产下单",
"autoBackButton": false,
"autoBackButton": true,
"buttons": [{
"type": "none",
"text": "新增",
......@@ -427,7 +427,7 @@
"titleSize": "17px",
"backgroundColor": "#fff",
"titleText": "生产计划",
"autoBackButton": false,
"autoBackButton": true,
"buttons": [{
"type": "none",
"text": "提交",
......
pages/address-manage/address-manage.nvue
View file @ 97345d64
......@@ -2,8 +2,9 @@
<view class="order view">
<view class="status_bar" :style="navHeight"></view>
<view class="listview">
<view class="cell-list">
<view class="cell-list-block" @click="check" v-for="item in 10" :key='item'>
<list class="cell-list" :show-scrollbar='false'>
<cell @click="check" v-for="item in 10" :key='item'>
<view class="cell-list-block">
<text class="icon-address">张</text>
<view class="cell-list-block__content">
<view class="list-block-item">
......@@ -22,9 +23,10 @@
<text class="list-block-item__desc">天津天津市静海县华佗大道529号</text>
</view>
</view>
</view>
</view>
</cell>
</list>
</view>
</view>
</template>
......@@ -81,17 +83,19 @@
.order {
flex: 1;
background: #f8f9fa;
background: #f0f4f5;
}
.listview {
flex: 1;
flex-direction: column;
padding: 16rpx;
padding:16rpx;
}
.cell-list {
flex: 1;
flex-direction: column;
background: #f0f4f5;
}
.icon-address {
......@@ -147,8 +151,14 @@
margin-right: 28rpx;
}
.list-block-item__desc{
font-size: 24rpx;
color: #333;
}
.cell-list-block {
display: flex;
flex: 1;
margin-bottom: 16rpx;
background: #fff;
border-radius: 8px;
......
pages/apply-delivery/apply-delivery-checkin.nvue
View file @ 97345d64
......@@ -104,7 +104,7 @@
}
.text-block {
over-overflow: hidden;
overlow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......
pages/funds-confirm/funds-confirm.nvue
View file @ 97345d64
......@@ -134,7 +134,7 @@
}
.text-block {
over-overflow: hidden;
overlow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......
pages/group-buy/group-baseinfo.nvue
View file @ 97345d64
......@@ -34,7 +34,7 @@
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
</view>
</view>
<view class="text-block">
<view class="text-block" @click="selectAddress">
<text class="middle-date">收货单位</text>
<view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell">
......@@ -163,7 +163,7 @@
}
.text-block {
over-overflow: hidden;
overlow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......
pages/group-buy/order-upload.nvue
View file @ 97345d64
......@@ -127,7 +127,7 @@
}
.text-block {
over-overflow: hidden;
overlow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......
pages/group-buy/quota-order.nvue
View file @ 97345d64
......@@ -114,7 +114,7 @@
.text-block {
over-overflow: hidden;
overlow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......
pages/message/message.nvue
View file @ 97345d64
......@@ -11,6 +11,7 @@
</view>
<text class="dot">2</text>
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
<view class="line"></view>
</view>
<view class="cell-list-block" @click="goMessageList('read')">
<image class="icon-address" src="@/static/image/uc_setting@3x.png" mode="aspectFit"></image>
......@@ -133,8 +134,7 @@
align-items: center;
}
.cell-list-block:after {
content: '';
.line {
position: absolute;
width: 750rpx;
left: 40rpx;
......@@ -147,9 +147,11 @@
.dot {
width: 44rpx;
height: 36rpx;
line-height: 36rpx;
background: #ff0f00;
border-radius: 18rpx;
color: #fff;
font-size: 22rpx;
margin-right: 28rpx;
text-align: center;
}
......
pages/no-quota/order-upload.nvue
View file @ 97345d64
......@@ -127,7 +127,7 @@
}
.text-block {
over-overflow: hidden;
overlow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......
pages/no-quota/quota-order.nvue
View file @ 97345d64
......@@ -117,7 +117,7 @@
.text-block {
over-overflow: hidden;
overlow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......
pages/order-detail-group/order-detail-group.nvue
View file @ 97345d64
......@@ -340,7 +340,7 @@
}
.item-block {
over-overflow: hidden;
overlow: hidden;
}
.item-block-label {
......
pages/order-detail-noquota/order-detail-noquota.nvue
View file @ 97345d64
......@@ -296,7 +296,7 @@
}
.item-block {
over-overflow: hidden;
overlow: hidden;
}
.item-block-label {
......
pages/order-detail-quota/order-detail-quota.nvue
View file @ 97345d64
......@@ -312,7 +312,7 @@
}
.item-block {
over-overflow: hidden;
overlow: hidden;
}
.item-block-label {
......
pages/produce-material/produce-plan.nvue
View file @ 97345d64
......@@ -173,7 +173,7 @@
.text-block {
over-overflow: hidden;
overlow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......
pages/produce-order/order-list.nvue
View file @ 97345d64
......@@ -5,7 +5,7 @@
<view class="middle view planout-block-item">
<view class="item-block item-block-code">
<text class="item-block-label">单号：TP10000021</text>
<button class="item-block-btn" type="default">待审批</button>
<button class="item-block-btn" type="default"><text class="item-block-btn__text">待审批</text></button>
</view>
<view class="item-block item-block-name">
<text class="item-block-label item-block__label">配额生产计划</text>
......@@ -204,10 +204,13 @@
height: 48rpx;
line-height: 48rpx;
background: #f61d30;
border-radius: 8rpx 200rpx 200rpx 8rpx;
border-radius: 80rpx 200rpx 200rpx 80rpx;
text-align: center;
}
.item-block-btn__text{
font-size: 12px;
color: #fff;
text-align: center;
}
.item-block-name {
......
pages/produce-order/produce-order.nvue
View file @ 97345d64
<template>
<view class="page-news">
<view class="status_bar" :style="navHeight"></view>
<view class="conditon-block" :class="{'conditon-block-auto':ishowDetail}">
<view class="conditon-block" :style="conditionTop" :class="{'conditon-block-auto':ishowDetail}">
<view class="filter-title">
<button type="default" class="filter-btn filter-btn-active">一周内</button>
<button type="default" @click="handleFilter(item)" :class="{'filter-btn-active':item === filterActiveIndex}" class="filter-btn" v-for="item in 3" :key='item'>{{item}}月内</button>
<button type="default" class="filter-btn filter-btn-active"><text class="filter-btn__text filter-btn-active__text">一周内</text></button>
<button type="default" @click="handleFilter(item)" :class="{'filter-btn-active':item === filterActiveIndex}"
class="filter-btn" v-for="item in 3" :key='item'><text class="filter-btn__text" :class="{'filter-btn-active__text':item === filterActiveIndex}">{{item}}月内</text></button>
<image @click="handleShowDetail" class="icon-arrow" :class="{'icon-arrow-rotate':ishowDetail}"
src="@/static/image/arrow_up@3x.png" mode="aspectFit"></image>
</view>
<view class="filter-content">
<button type="default" @click="handleFilter(item+3)" class="filter-btn" :class="{'filter-btn-active':item+3 === filterActiveIndex}" v-for="item in 9" :key='item'>{{item+3}}月内</button>
<button type="default" @click="handleFilter(item+3)" class="filter-btn"
:class="{'filter-btn-active':item+3 === filterActiveIndex}" v-for="item in 9" :key='item'>
<text class="filter-btn__text" :class="{'filter-btn-active__text':item+3 === filterActiveIndex}">{{item+3}}月内</text></button>
</view>
</view>
<uni-list ref="list" class="listview" :enableBackToTop="true" :scroll-y="true" @scrolltolower="loadMore()">
<uni-list :style="listTop" ref="list" class="listview" :enableBackToTop="true" :scroll-y="true" @scrolltolower="loadMore()">
<uni-refresh class="refresh" @refresh="onrefresh" @pullingdown="onpullingdown"
:display="refreshing ? 'show' : 'hide'">
<div class="refresh-view">
......@@ -100,6 +103,16 @@
'height': `${this.sysinfo.safeArea.top + 44}px`
}
},
conditionTop(){
return {
'top': `${this.sysinfo.safeArea.top + 44 + 4}px`
}
},
listTop(){
return {
'top': `${this.sysinfo.safeArea.top + 120}px`
}
},
...mapState(['sysinfo'])
},
onNavigationBarButtonTap(e){
......@@ -195,6 +208,7 @@
});
},
loadMore(e) {
console.log('loadMore')
this.loadData();
},
clear() {
......@@ -308,7 +322,7 @@
}
.conditon-block{
position: absolute;
position: fixed;
left: 0;
top: 88rpx;
right: 0;
......@@ -323,7 +337,7 @@
}
.conditon-block-auto{
height: auto;
height: 460rpx;
overflow:auto;
max-height:230px;
}
......@@ -342,27 +356,42 @@
transform: rotate(180deg);
}
.filter-title{
display: flex;
}
.filter-btn{
flex: 0 0 148rpx;
flex: 1;
min-width:148rpx;
max-width:148rpx;
height: 68rpx;
line-height: 68rpx;
line-height:unset;
background: #f8f8f8;
border-radius: 16rpx;
color: #8e8e8e;
font-size: 24rpx;
margin-right: 20rpx;
margin-bottom: 20rpx;
margin-left: 0;
border: 2rpx solid #f8f8f8;
}
.filter-btn__text{
height: 68rpx;
line-height: 68rpx;
color: #8e8e8e;
font-size: 24rpx;
}
.filter-btn-active{
background: #f61d30;
color: #fff;
border: 2rpx solid #f61d30;
box-shadow: 0px 4rpx 12rpx 0px rgba(255,29,50,0.56);
}
.filter-btn-active__text{
color: #fff;
}
.filter-content{
display: flex;
flex-wrap: wrap;
......
pages/produce-order/produce-plan.nvue
View file @ 97345d64
......@@ -8,10 +8,10 @@
</view>
<switch class="summary-num" color='red' :checked="isChecked" @change="switchChange" />
</view>
<view class="summary-line summary-line-last">
<!-- <view class="summary-line summary-line-last">
<text>材料保证金</text>
<text>0.00</text>
</view>
</view> -->
</view>
<view class="planout-block">
......@@ -19,6 +19,7 @@
<image class="planout-block-icon" src="@/static/image/shop_more@3x.png" mode="aspectFit"></image>
</view>
<scroll-view class="scroll-area view" :scroll-top="scrollTop" scroll-y="true" :show-scrollbar='false'>
<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">
......@@ -50,11 +51,13 @@
</view>
</view>
<template v-slot:right>
<view class="swipe-right-block" @click="handleDel"><text class="swipe-right-block__text">删除</text>
<view class="swipe-right-block" @click="handleDel"><text
class="swipe-right-block__text">删除</text>
</view>
</template>
</uni-swipe-action-item>
</uni-swipe-action>
</scroll-view>
<uni-popup ref="popup" background-color="#fff" @change="change" :mask-click='false'>
<view class="popup-content">
......@@ -85,7 +88,8 @@
export default {
data() {
return {
isChecked:false,
isChecked: false,
scrollTop:0,
orderNo: '',
}
},
......@@ -97,7 +101,7 @@
},
...mapState(['sysinfo'])
},
onNavigationBarButtonTap(e){
onNavigationBarButtonTap(e) {
this.$refs.popup.open('center')
},
methods: {
......@@ -153,7 +157,7 @@
position: relative;
flex-direction: column;
padding: 32rpx 16rpx 0;
overflow-y: scroll;
background: #f0f4f5;
}
.middle {
......@@ -169,7 +173,7 @@
.text-block {
over-overflow: hidden;
overlow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......@@ -257,7 +261,7 @@
justify-content: space-between;
}
.summary-line-last{
.summary-line-last {
margin-top: 12rpx;
padding-right: 8rpx;
}
......@@ -280,16 +284,21 @@
width: 152rpx;
background: linear-gradient(90deg, #fb4d61, #ff0f00 100%);
border-radius: 0px 8px 8px 0px;
display: flex;
align-items: center;
justify-content: center;
}
.swipe-right-block__text {
width: 152rpx;
display: flex;
align-items: center;
justify-content: center;
color: #fff;
font-size: 34rpx;
font-weight: 500;
text-align: center;
padding-left: 24rpx;
}
.planout-block {
......@@ -314,6 +323,7 @@
.planout-block-item {
flex: 1;
width: 750rpx;
}
/deep/ .uni-popup__wrapper {
......@@ -327,7 +337,7 @@
width: 580rpx;
height: 408rpx;
background: #ffffff;
border-radius: 20rpx;
border-radius: 24rpx;
}
.popup-content-head {
......@@ -370,6 +380,7 @@
color: #ff0f00;
font-weight: 500;
border-radius: 32rpx;
font-size: 22rpx;
}
.popup-content-foot__sure {
......@@ -378,5 +389,4 @@
background: #ff1d32;
border: 1px solid #ff1d32;
}
</style>
pages/purchase-plan/purchase-plan.nvue
View file @ 97345d64
......@@ -135,7 +135,7 @@
height: 284rpx;
opacity: 0.72;
margin-top: -88rpx;
background: linear-gradient(232deg, #f4e2e2 25%, #faf3f3 98%);
background-image: linear-gradient(232deg, #f4e2e2 25%, #faf3f3 98%);
}
.lists {
......@@ -143,6 +143,7 @@
flex-direction: column;
overflow-y: scroll;
background: #f0f4f5;
flex: 1;
height: 100%;
}
......@@ -159,7 +160,7 @@
}
.text-block {
over-overflow: hidden;
overlow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......@@ -227,7 +228,7 @@
}
.item-block {
over-overflow: hidden;
overlow: hidden;
}
.item-block-label {
......@@ -268,6 +269,7 @@
background: #f8f8f8;
border-radius: 20rpx;
padding: 32rpx;
margin-top: 32rpx;
}
.block-detal-item {
......
pages/purchase-receive/purchase-receive.nvue
View file @ 97345d64
......@@ -2,6 +2,7 @@
<view class="lists">
<view class="status_bar" :style="navHeight">
</view>
<scroll-view class="scroll-area view" :scroll-top="scrollTop" show-scrollbar='false' scroll-y="true">
<view class="main">
<view class="middle view">
<view class="text-block">
......@@ -9,7 +10,8 @@
<view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell">
<view class="uni-list-cell-db">
<picker class="picker-block" @change="bindPickerChange" :value="index" :range="array">
<picker class="picker-block" @change="bindPickerChange" :value="index"
:range="array">
<text class="uni-input">{{array[index]}}</text>
</picker>
</view>
......@@ -22,7 +24,8 @@
<view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell">
<view class="uni-list-cell-db">
<picker class="picker-block" @change="bindPickerChange" :value="index" :range="array">
<picker class="picker-block" @change="bindPickerChange" :value="index"
:range="array">
<text class="uni-input">{{array[index]}}</text>
</picker>
</view>
......@@ -35,7 +38,8 @@
<view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell">
<view class="uni-list-cell-db">
<picker class="picker-block" @change="bindPickerChange" :value="index" :range="array">
<picker class="picker-block" @change="bindPickerChange" :value="index"
:range="array">
<text class="uni-input">{{array[index]}}</text>
</picker>
</view>
......@@ -51,7 +55,8 @@
<view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell">
<view class="uni-list-cell-db">
<picker class="picker-block" @change="bindPickerChange" :value="index" :range="array">
<picker class="picker-block" @change="bindPickerChange" :value="index"
:range="array">
<text class="uni-input">{{array[index]}}</text>
</picker>
</view>
......@@ -64,7 +69,8 @@
<view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell">
<view class="uni-list-cell-db">
<picker class="picker-block" @change="bindPickerChange" :value="index" :range="array">
<picker class="picker-block" @change="bindPickerChange" :value="index"
:range="array">
<text class="uni-input">{{array[index]}}</text>
</picker>
</view>
......@@ -77,7 +83,8 @@
<view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell">
<view class="uni-list-cell-db">
<picker class="picker-block" @change="bindPickerChange" :value="index" :range="array">
<picker class="picker-block" @change="bindPickerChange" :value="index"
:range="array">
<text class="uni-input">{{array[index]}}</text>
</picker>
</view>
......@@ -111,7 +118,9 @@
<text class="middle-date title-first__text">上传文件</text>
</view>
<view class="upload-block">
<uni-file-picker ref='files' :auto-upload='false' v-model="fileList" file-mediatype="image" :imageStyles="imageStyles" @select="select" @progress="progress" @success="success" @fail='fail'>
<uni-file-picker ref='files' :auto-upload='false' v-model="fileList" file-mediatype="image"
:imageStyles="imageStyles" @select="select" @progress="progress" @success="success"
@fail='fail'>
<text>+</text>
</uni-file-picker>
</view>
......@@ -135,6 +144,7 @@
</button>
</view>
</view>
</scroll-view>
</view>
</template>
......@@ -148,9 +158,10 @@
return {
array: ['2021', '2020', '2019', '2018'],
index: 0,
quantity:'',
remark:'',
quantity: '',
remark: '',
fileList: [],
scrollTop: 0
}
},
computed: {
......@@ -159,7 +170,7 @@
'height': `${this.sysinfo.safeArea.top + 44}px`
}
},
imageStyles(){
imageStyles() {
return {
width: 64,
height: 64,
......@@ -188,7 +199,7 @@
},
// 上传成功
success(e) {
console.log('上传成功',e)
console.log('上传成功', e)
},
// 上传失败
fail(e) {
......@@ -222,11 +233,14 @@
flex: 1;
flex-direction: column;
background: #f0f4f5;
overflow-y:scroll;
overflow-y: scroll;
}
.main {
.scroll-area{
flex: 1;
}
.main {
margin: 0 16rpx;
flex-direction: column;
border-radius: 16rpx;
......@@ -241,7 +255,7 @@
}
.text-block {
over-overflow: hidden;
overlow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......@@ -286,7 +300,7 @@
flex: 1;
}
.uni-input{
.uni-input {
font-size: 14px;
color: $text-base-color;
}
......@@ -297,11 +311,11 @@
top: 40rpx;
width: 7px;
height: 10px;
z-index:10;
z-index: 10;
}
.remark-text {
width: 100%;
flex: 1;
height: 220rpx;
background: #f5f6f7;
border-radius: 4px;
......@@ -330,41 +344,41 @@
margin-bottom: 40rpx;
}
.uni-file-picker{
.uni-file-picker {
width: 100%;
height: 100%;
}
/deep/ .uni-file-picker__container{
/deep/ .uni-file-picker__container {
width: 100%;
height: 100%;
}
.receive-record-view{
padding:40rpx 48rpx;
.receive-record-view {
padding: 40rpx 48rpx;
}
.receive-record{
.receive-record {
color: #555555;
font-size: 28rpx;
margin-bottom: 8rpx;
margin-top: 32rpx;
}
.receive-record-info{
.receive-record-info {
display: flex;
flex-direction: column;
justify-content: center;
}
.record-info-title{
.record-info-title {
color: #333;
font-size: 28rpx;
font-weight: 500;
margin-bottom: 16rpx;
}
.record-info-des{
.record-info-des {
color: #999;
font-size: 24rpx;
}
......@@ -382,7 +396,6 @@
width: 750rpx;
height: 140rpx;
padding: 0 32rpx;
background-color: #fff;
justify-content: space-between;
align-items: center;
}
......
pages/purchase/purchase.nvue
View file @ 97345d64
......@@ -2,6 +2,7 @@
<view class="lists">
<view class="status_bar" :style="navHeight">
</view>
<scroll-view class="scroll-area view" :scroll-top="scrollTop" show-scrollbar='false' scroll-y="true">
<view class="main">
<view class="middle view">
<view class="text-block">
......@@ -9,7 +10,8 @@
<view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell">
<view class="uni-list-cell-db">
<picker class="picker-block" @change="bindPickerChange" :value="index" :range="array">
<picker class="picker-block" @change="bindPickerChange" :value="index"
:range="array">
<text class="uni-input">{{array[index]}}</text>
</picker>
</view>
......@@ -23,7 +25,8 @@
<view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell">
<view class="uni-list-cell-db">
<picker class="picker-block" @change="bindPickerChange" :value="index" :range="array">
<picker class="picker-block" @change="bindPickerChange" :value="index"
:range="array">
<text class="uni-input">{{array[index]}}</text>
</picker>
</view>
......@@ -40,7 +43,8 @@
<view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell">
<view class="uni-list-cell-db">
<picker class="picker-block" @change="bindPickerChange" :value="index" :range="array">
<picker class="picker-block" @change="bindPickerChange" :value="index"
:range="array">
<text class="uni-input">{{array[index]}}</text>
</picker>
</view>
......@@ -53,7 +57,8 @@
<view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell">
<view class="uni-list-cell-db">
<picker class="picker-block" @change="bindPickerChange" :value="index" :range="array">
<picker class="picker-block" @change="bindPickerChange" :value="index"
:range="array">
<text class="uni-input">{{array[index]}}</text>
</picker>
</view>
......@@ -66,7 +71,8 @@
<view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell">
<view class="uni-list-cell-db">
<picker class="picker-block" @change="bindPickerChange" :value="index" :range="array">
<picker class="picker-block" @change="bindPickerChange" :value="index"
:range="array">
<text class="uni-input">{{array[index]}}</text>
</picker>
</view>
......@@ -112,7 +118,8 @@
<view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell">
<view class="uni-list-cell-db">
<picker class="picker-block" @change="bindPickerChange" :value="index" :range="array">
<picker class="picker-block" @change="bindPickerChange" :value="index"
:range="array">
<text class="uni-input">{{array[index]}}</text>
</picker>
</view>
......@@ -125,7 +132,8 @@
<view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell">
<view class="uni-list-cell-db">
<picker class="picker-block" @change="bindPickerChange" :value="index" :range="array">
<picker class="picker-block" @change="bindPickerChange" :value="index"
:range="array">
<text class="uni-input">{{array[index]}}</text>
</picker>
</view>
......@@ -157,7 +165,8 @@
<view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell">
<view class="uni-list-cell-db">
<picker class="picker-block" @change="bindPickerChange" :value="index" :range="array">
<picker class="picker-block" @change="bindPickerChange" :value="index"
:range="array">
<text class="uni-input">{{array[index]}}</text>
</picker>
</view>
......@@ -172,6 +181,7 @@
</button>
</view>
</view>
</scroll-view>
</view>
</template>
......@@ -185,7 +195,8 @@
return {
array: ['2021', '2020', '2019', '2018'],
index: 0,
quantity:'',
quantity: '',
scrollTop: 0
}
},
computed: {
......@@ -197,7 +208,7 @@
...mapState(['sysinfo'])
},
methods: {
selectClient(){
selectClient() {
uni.navigateTo({
url: `/pages/select-client/select-client`
});
......@@ -239,11 +250,14 @@
flex: 1;
flex-direction: column;
background: #f0f4f5;
overflow-y:scroll;
overflow-y: scroll;
}
.main {
.scroll-area{
flex: 1;
}
.main {
margin: 0 16rpx;
flex-direction: column;
border-radius: 16rpx;
......@@ -258,7 +272,7 @@
}
.text-block {
over-overflow: hidden;
overlow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......@@ -303,7 +317,7 @@
flex: 1;
}
.uni-input{
.uni-input {
font-size: 14px;
color: $text-base-color;
}
......@@ -314,7 +328,7 @@
top: 40rpx;
width: 7px;
height: 10px;
z-index:10;
z-index: 10;
}
.bottom {
......@@ -324,7 +338,7 @@
}
.btn {
width: 100%;
flex: 1;
height: 92rpx;
margin: 0 auto 48rpx;
background: $wly-primary-color;
......
pages/quota/order-upload.nvue
View file @ 97345d64
......@@ -128,7 +128,7 @@
}
.text-block {
over-overflow: hidden;
overlow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......
pages/quota/quota-order.nvue
View file @ 97345d64
......@@ -195,7 +195,7 @@
.text-block {
over-overflow: hidden;
overlow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......
pages/select-business/select-business.nvue
View file @ 97345d64
......@@ -189,7 +189,7 @@
}
.text-block {
over-overflow: hidden;
overlow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......
pages/select-client/select-client.nvue
View file @ 97345d64
......@@ -33,11 +33,14 @@
</button>
</view>
<scroll-view class="scroll-area view" :scroll-top="scrollTop" scroll-y="true" :style="scrollHeight">
<uni-swipe-action class="planout-block-lists">
<uni-swipe-action-item v-for="(item,index) in lists" :key='item.id' :auto-close="false" :disabled='true' :show="isOpened" @click="handleClick">
<uni-swipe-action-item v-for="(item,index) in lists" :key='item.id' :auto-close="false"
:disabled='true' :show="isOpened" @click="handleClick">
<template v-slot:left>
<view class="swipe-right-block" @click="handleChecked($event,item, index)"><text
class="swipe-right-block__text" :class="{'swipe-right-block__active':item.checked}"></text>
class="swipe-right-block__text"
:class="{'swipe-right-block__active':item.checked}"></text>
</view>
</template>
<view class="middle view planout-block-item">
......@@ -46,16 +49,17 @@
</view>
<view class="item-block item-block-name">
<text class="item-block-label item-block__label">步步高</text>
<text class="item-block__label">电商配额酒年度计划(1-5月)</text>
<text class="item-block__label item-block__value">电商配额酒年度计划(1-5月)</text>
</view>
<view class="item-block">
<text class="item-block-label-des">名称</text>
<text class="item-block-label-des">类型</text>
<text class="item-block-label-des item-block__value">类型</text>
</view>
</view>
</uni-swipe-action-item>
</uni-swipe-action>
</scroll-view>
</view>
</view>
</template>
......@@ -71,23 +75,44 @@
isOpened: 'none',
array: ['2021', '2020', '2019', '2018'],
index: 0,
lists:[
lists: [{
id: 1,
checked: false,
product: '新品五粮液',
quantity: 2,
price: 100
},
{
id: 2,
checked: false,
product: '新品五粮液91 52%',
quantity: 4,
price: 200
},
{
id: 3,
checked: false,
product: '新品五粮液91 52%',
quantity: 4,
price: 200
},
{
id:1,
checked:false,
product:'新品五粮液',
quantity:2,
price:100
id: 4,
checked: false,
product: '新品五粮液91 52%',
quantity: 4,
price: 200
},
{
id:2,
checked:false,
product:'新品五粮液91 52%',
quantity:4,
price:200
id: 5,
checked: false,
product: '新品五粮液91 52%',
quantity: 4,
price: 200
}
],
selectedGroupClient:{}
selectedGroupClient: {},
scrollTop: 0
}
},
computed: {
......@@ -97,20 +122,27 @@
'height': `${this.sysinfo.safeArea.top + 44}px`
}
},
scrollHeight() {
return {
'height': `${this.sysinfo.safeArea.height - 312 - 44}px`
}
},
},
onNavigationBarButtonTap(e){
console.log('onNavigationBarButtonTap：',e);
onNavigationBarButtonTap(e) {
console.log('onNavigationBarButtonTap：', e);
this.isOpened = this.isOpened === 'none' ? 'left' : 'none';
// #ifdef APP-PLUS
let webView = this.$mp.page.$getAppWebview();
console.log('webView',webView)
console.log('webView', webView)
webView.setTitleNViewButtonStyle(0, {
text: this.isOpened === 'none' ? '选择' : '完成',
});
// #endif
if(this.isOpened === 'none'){
uni.$emit('selectedGroupClient',{selectedGroupClient:this.selectedGroupClient})
if (this.isOpened === 'none') {
uni.$emit('selectedGroupClient', {
selectedGroupClient: this.selectedGroupClient
})
uni.navigateBack({})
}
},
......@@ -122,23 +154,23 @@
console.log('picker发送选择改变，携带值为', e.detail.value)
this.index = e.detail.value
},
handleClick(e,content,index){
console.log('click当前索引：',e,content, index);
handleClick(e, content, index) {
console.log('click当前索引：', e, content, index);
},
handleChecked(e,item,index){
console.log('当前索引：',e, index);
this.lists.forEach((cur)=>{
if(cur.id === item.id){
handleChecked(e, item, index) {
console.log('当前索引：', e, index);
this.lists.forEach((cur) => {
if (cur.id === item.id) {
cur.checked = !cur.checked
}else{
} else {
cur.checked = false
}
})
if(item.checked === true){
if (item.checked === true) {
// this.selectedGroupClient.push(item)
this.selectedGroupClient = item
}else{
} else {
// const selectIndex = this.selectedGroupClient.findIndex((saleplan)=>{
// return saleplan.id === item.id
// })
......@@ -163,6 +195,10 @@
flex-direction: column;
}
page {
background: #f0f4f5;
}
.header-bg {
height: 284rpx;
opacity: 0.72;
......@@ -171,11 +207,10 @@
}
.lists {
flex: 1;
position: relative;
flex-direction: column;
overflow-y: scroll;
background: #f0f4f5;
height: 100%;
}
.main {
......@@ -191,7 +226,7 @@
}
.text-block {
over-overflow: hidden;
overlow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......@@ -251,6 +286,7 @@
.planout-block-lists {
display: flex;
flex-direction: column;
overflow: hidden;
}
.uni-swipe {
......@@ -279,7 +315,7 @@
width: 52rpx;
height: 52rpx;
border-radius: 50%;
background-color:$wly-primary-color ;
background-color: $wly-primary-color;
}
.planout-block {
......@@ -293,20 +329,21 @@
.planout-block-item {
flex: 1;
width: 750rpx;
}
.item-block{
.item-block {
display: flex;
justify-content: space-between;
over-overflow: hidden;
overflow: hidden;
}
.item-block-label{
.item-block-label {
font-size: 24rpx;
color: #888;
}
.item-block__label{
.item-block__label {
flex: 1;
text-align: left;
font-size: 28rpx;
......@@ -316,23 +353,27 @@
text-overflow: ellipsis;
}
.item-block-code{
.item-block-code {
padding-bottom: 16rpx;
border-bottom: 1px solid #f4f5f6;
}
.item-block-name{
.item-block-name {
padding-top: 24rpx;
padding-bottom: 8rpx;
}
.item-block-label-des{
.item-block-label-des {
flex: 1;
text-align: left;
font-size: 24rpx;
color: #999;
}
.item-block__value {
flex: 1.4;
}
.btn {
flex: 1;
height: 92rpx;
......@@ -344,4 +385,8 @@
color: #fff;
font-size: 34rpx;
}
.scroll-area{
overflow:hidden;
}
</style>
pages/select-group-client/select-group-client.nvue
View file @ 97345d64
......@@ -193,7 +193,7 @@
}
.text-block {
over-overflow: hidden;
overlow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......
pages/select-product/select-product.nvue
View file @ 97345d64
......@@ -190,7 +190,7 @@
}
.text-block {
over-overflow: hidden;
overlow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......
pages/select-sale-plan/select-sale-plan.nvue
View file @ 97345d64
......@@ -211,7 +211,7 @@
}
.text-block {
over-overflow: hidden;
overlow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......
pages/ticket-order/ticket-order.nvue
View file @ 97345d64
......@@ -8,7 +8,8 @@
<view class="tab-bar-list-wrapper">
<view class="uni-tab-item" v-for="(tab,index) in tabList" :key="tab.id" :ref="'tabitem'+index">
<text :id="tab.id" :data-id="index" :data-current="index" class="uni-tab-item-title"
:class="{'uni-tab-item-title-active':tabIndex==index}" @click="ontabtap">{{tab.name}}</text>
:class="{'uni-tab-item-title-active':tabIndex==index}"
@click="ontabtap">{{tab.name}}</text>
</view>
</view>
<view class="scroll-view-indicator">
......@@ -18,15 +19,23 @@
</view>
</scroll-view>
<view class="conditon-block" :class="{'conditon-block-auto':ishowDetail}">
<view class="conditon-block" :style="conditionTop" :class="{'conditon-block-auto':ishowDetail}">
<view class="filter-title">
<button type="default" class="filter-btn filter-btn-active">一周内</button>
<button type="default" @click="handleFilter(item)" :class="{'filter-btn-active':item === filterActiveIndex}" class="filter-btn" v-for="item in 3" :key='item'>{{item}}月内</button>
<button type="default" class="filter-btn filter-btn-active"><text
class="filter-btn__text filter-btn-active__text">一周内</text></button>
<button type="default" @click="handleFilter(item)"
:class="{'filter-btn-active':item === filterActiveIndex}" class="filter-btn" v-for="item in 3"
:key='item'>
<text class="filter-btn__text"
:class="{'filter-btn-active__text':item === filterActiveIndex}">{{item}}月内</text></button>
<image @click="handleShowDetail" class="icon-arrow" :class="{'icon-arrow-rotate':ishowDetail}"
src="@/static/image/arrow_up@3x.png" mode="aspectFit"></image>
</view>
<view class="filter-content">
<button type="default" @click="handleFilter(item+3)" class="filter-btn" :class="{'filter-btn-active':item+3 === filterActiveIndex}" v-for="item in 9" :key='item'>{{item+3}}月内</button>
<button type="default" @click="handleFilter(item+3)" class="filter-btn"
:class="{'filter-btn-active':item+3 === filterActiveIndex}" v-for="item in 9" :key='item'><text
class="filter-btn__text"
:class="{'filter-btn-active__text':item+3 === filterActiveIndex}">{{item+3}}月内</text></button>
</view>
</view>
......@@ -89,8 +98,8 @@
tabbarWidth: 0,
tabListSize: {},
_touchTabIndex: 0,
ishowDetail:false,
filterActiveIndex:0,
ishowDetail: false,
filterActiveIndex: 0,
}
},
computed: {
......@@ -105,6 +114,11 @@
'height': `${this.sysinfo.safeArea.top + 44}px`
}
},
conditionTop() {
return {
'top': `${this.sysinfo.safeArea.top + 44 + 42}px`
}
},
...mapState(['sysinfo'])
},
onReady() {
......@@ -289,7 +303,7 @@
handleShowDetail() {
this.ishowDetail = !this.ishowDetail
},
handleFilter(item){
handleFilter(item) {
this.filterActiveIndex = item
}
}
......@@ -297,8 +311,9 @@
</script>
<style lang="scss">
.ticket-order-page{
.ticket-order-page {
flex-direction: column;
flex: 1;
}
/* #ifndef APP-PLUS */
......@@ -372,20 +387,26 @@
transition-property: left;
}
.conditon-block{
.conditon-block {
position: fixed;
left: 0;
top: 172rpx;
right: 0;
bottom: 0;
z-index: 10;
width: 750rpx;
height: 124rpx;
overflow:hidden;
overflow: hidden;
background-color: #fff;
display: flex;
flex-direction: column;
padding: 40rpx 32rpx 0 16rpx;
}
.conditon-block-auto{
height: auto;
overflow:auto;
max-height:230px;
.conditon-block-auto {
height: 460rpx;
overflow: auto;
max-height: 230px;
}
.icon-arrow {
......@@ -403,27 +424,41 @@
}
.filter-btn{
flex: 0 0 148rpx;
.filter-btn {
flex: 1;
min-width: 148rpx;
max-width: 148rpx;
height: 68rpx;
line-height: 68rpx;
line-height: unset;
background: #f8f8f8;
border-radius: 16rpx;
color: #8e8e8e;
font-size: 24rpx;
margin-right: 20rpx;
margin-bottom: 20rpx;
margin-left: 0;
border: 2rpx solid #f8f8f8;
}
.filter-btn-active{
.filter-btn__text {
height: 68rpx;
line-height: 68rpx;
color: #8e8e8e;
font-size: 24rpx;
}
.filter-btn-active {
background: #f61d30;
color: #fff;
border: 2rpx solid #f61d30;
box-shadow: 0px 4rpx 12rpx 0px rgba(255,29,50,0.56);
box-shadow: 0px 4rpx 12rpx 0px rgba(255, 29, 50, 0.56);
}
.filter-btn-active__text {
color: #fff;
}
.filter-content{
.filter-content {
display: flex;
flex-wrap: wrap;
}
......
pages/usercenter/usercenter.nvue
View file @ 97345d64
......@@ -66,7 +66,7 @@
</view>
</view>
<view class="bottom">
<!-- <view class="bottom">
<view class="cell-list">
<view class="cell-list-block">
<image class="icon-address" src="@/static/image/uc_address@3x.png" mode="aspectFit"></image>
......@@ -78,7 +78,7 @@
<text class="cell-list-block__title">设置</text>
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
</view>
</view>
</view> -->
</view>
</view>
</template>
......@@ -225,7 +225,7 @@
}
.entry-block {
width: 25%;
width: 160rpx;
flex-direction: column;
align-items: center;
justify-content: center;
......
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