Skip to content

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

调适ios模拟器兼容性

parent c22e6c72
Expand all Show whitespace changes
Inline Side-by-side
Showing with 121205 additions and 34998 deletions
pages.json
View file @ 2089dbf0
......@@ -58,6 +58,7 @@
{
"path": "pages/funds-confirm/funds-confirm",
"style": {
"transparentTitle":"always",
"app-plus": {
"titleNView": {
"titleAlign": "left",
......@@ -80,7 +81,10 @@
"backgroundColor": "#fff",
"titleText": "选择下单类型",
"autoBackButton": false,
"splitLine":true
"splitLine":{
"color":"#ccc",
"height":"0.5px"
}
}
}
}
......@@ -136,7 +140,7 @@
"titleSize": "17px",
"backgroundColor": "transparent",
"titleText": "销售计划选择",
"autoBackButton": false,
"autoBackButton": true,
"buttons": [{
"type": "none",
"text": "选择",
......@@ -156,7 +160,7 @@
"titleSize": "17px",
"backgroundColor": "transparent",
"titleText": "产品查询",
"autoBackButton": false,
"autoBackButton": true,
"buttons": [{
"type": "none",
"text": "选择",
......@@ -176,7 +180,7 @@
"titleSize": "17px",
"backgroundColor": "transparent",
"titleText": "商机选择",
"autoBackButton": false,
"autoBackButton": true,
"buttons": [{
"type": "none",
"text": "选择",
......@@ -196,7 +200,7 @@
"titleSize": "17px",
"backgroundColor": "transparent",
"titleText": "团购客户选择",
"autoBackButton": false,
"autoBackButton": true,
"buttons": [{
"type": "none",
"text": "选择",
......@@ -618,11 +622,6 @@
"iconPath": "static/image/shop@3x.png",
"selectedIconPath": "static/image/shop@3x.png",
"text": "要货"
}, {
"pagePath": "pages/shop/shop",
"iconPath": "static/image/shop@3x.png",
"selectedIconPath": "static/image/shop@3x.png",
"text": "要货2"
}, {
"pagePath": "pages/message/message",
"iconPath": "static/image/message@3x.png",
......
pages/funds-confirm/funds-confirm.nvue
View file @ 2089dbf0
<template>
<view class="lists">
<view class="status_bar">
</view>
<view class="status_bar" :style="navHeight"></view>
<view class="header-bg"></view>
<view class="main">
<view class="middle view">
......@@ -13,7 +12,6 @@
<text class="middle-date-des">H533008256</text>
</view>
</view>
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
</view>
</view>
......@@ -25,7 +23,6 @@
<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">
......@@ -66,15 +63,27 @@
</template>
<script>
import {
mapState
} from 'vuex'
export default {
data() {
return {
applyNum: 100,
remark:'',
remark: '',
array: ['2021', '2020', '2019', '2018'],
index: 0,
}
},
computed: {
...mapState(['sysinfo']),
navHeight() {
return {
'height': `${this.sysinfo.safeArea.top + 44}px`
}
},
},
methods: {
bindPickerChange(e) {
console.log('picker发送选择改变，携带值为', e.detail.value)
......@@ -94,7 +103,6 @@
.status_bar {
height: var(--status-bar-height);
height: 44px;
}
.header-bg {
......@@ -149,6 +157,7 @@
flex: 3;
font-size: 28rpx;
color: $text-base-color;
line-height: 96rpx;
}
.picker-year {
......@@ -169,7 +178,7 @@
flex: 1;
}
.uni-input{
.uni-input {
font-size: 14px;
color: $text-base-color;
}
......@@ -180,11 +189,11 @@
top: 40rpx;
width: 7px;
height: 10px;
z-index:10;
z-index: 10;
}
.remark-text {
width: 100%;
flex: 1;
height: 320rpx;
background: #f5f6f7;
border-radius: 4px;
......@@ -194,7 +203,7 @@
.bottom {
margin-top: 68rpx;
padding: 0 16rpx;
justify-content: space-between;
justify-content: center;
}
.btn {
......
pages/home/home.vue
View file @ 2089dbf0
......@@ -204,7 +204,7 @@
display: flex;
flex-direction: column;
box-sizing: border-box;
background-color: #f2f6f7;
background-color: #fff;
padding-bottom: 100rpx;
}
......@@ -228,11 +228,11 @@
left: 16px;
top: var(--status-bar-height);
z-index: 10;
background-color: rgba(255, 255, 255, 0.2);
background-color: rgba(255, 255, 255, 0.25);
border-radius: 16px;
padding-left: 33px;
font-size: 13px;
color: rgba(255, 255, 255, 0.6);
color: rgba(255, 255, 255, 0.8);
.icon-search {
position: absolute;
......@@ -288,7 +288,8 @@
box-sizing: border-box;
background: #ffffff;
border-radius: 32rpx 32rpx 0px 0px;
margin-top: -80rpx;
margin-top: -110rpx;
z-index:10;
}
.block {
......
pages/quota/order-upload.nvue
View file @ 2089dbf0
......@@ -6,7 +6,8 @@
<text class="upload-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>
......@@ -29,7 +30,7 @@
<image class="popup-content-head__icon" src="@/static/image/icon_plan@3x.png" mode=""></image>
</view>
<view class="popup-content-content">
<text class="popup-content-content__title">支付成功</text>
<text class="popup-content-content__title">提交成功</text>
<text class="popup-content-content__title2">订单号：{{ orderNo }}</text>
</view>
<view class="popup-content-foot">
......@@ -50,8 +51,8 @@
fileList: [],
}
},
computed:{
imageStyles(){
computed: {
imageStyles() {
return {
width: 64,
height: 64,
......@@ -61,6 +62,11 @@
}
},
},
onBackPress(event) {
console.log('event', event)
this.$emit('click', 'quotaOrder')
return false
},
methods: {
change(e) {
console.log('当前模式：' + e.type + ',状态：' + e.show);
......@@ -75,7 +81,7 @@
},
// 上传成功
success(e) {
console.log('上传成功',e)
console.log('上传成功', e)
},
// 上传失败
fail(e) {
......@@ -181,12 +187,12 @@
margin-top: 90rpx;
}
.uni-file-picker{
.uni-file-picker {
width: 100%;
height: 100%;
}
/deep/ .uni-file-picker__container{
/deep/ .uni-file-picker__container {
width: 100%;
height: 100%;
}
......@@ -243,7 +249,7 @@
width: 580rpx;
height: 408rpx;
background: #ffffff;
border-radius: 20rpx;
border-radius: 24rpx;
}
.popup-content-head {
......@@ -280,6 +286,7 @@
.popup-content-foot__btn {
width: 152rpx;
height: 60rpx;
font-size: 22rpx;
line-height: 60rpx;
background: #ffedee;
text-align: center;
......
pages/quota/quota-order.nvue
View file @ 2089dbf0
......@@ -9,6 +9,8 @@
<text class="summary-num">789*6*4</text>
</view>
</view>
<scroll-view class="scroll-area view" :scroll-top="scrollTop" scroll-y="true">
<view class="middle view">
<view class="text-block title-first">
<text class="middle-date title-first__text">计划内</text>
......@@ -29,7 +31,8 @@
<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" v-model="selectedSalePlan.product" placeholder="请填写" />
<input class="middle-date-des" type="text" v-model="selectedSalePlan.product"
placeholder="请填写" />
</view>
</view>
</view>
......@@ -50,6 +53,7 @@
<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">
......@@ -69,7 +73,8 @@
</view>
<view class="text-block">
<text class="middle-date">数量（件）</text>
<input class="middle-date-des" type="text" v-model="selectedProduct.quantity" placeholder="请填写" />
<input class="middle-date-des" type="text" v-model="selectedProduct.quantity"
placeholder="请填写" />
</view>
<view class="text-block">
<text class="middle-date">单价</text>
......@@ -81,7 +86,8 @@
</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>
......@@ -97,6 +103,7 @@
<text class="btn-text">下一步</text>
</button>
</view>
</scroll-view>
</view>
</template>
......@@ -105,23 +112,23 @@
data() {
return {
selectedSalePlan: {
id:'请选择',
checked:false,
product:'请填写',
quantity:0,
price:0
id: '请选择',
checked: false,
product: '请填写',
quantity: 0,
price: 0
},
selectedProduct:{
id:'请选择',
checked:false,
product:'请填写',
quantity:0,
price:0
selectedProduct: {
id: '请选择',
checked: false,
product: '请填写',
quantity: 0,
price: 0
}
}
},
onBackPress(event){
console.log('event',event)
onBackPress(event) {
console.log('event', event)
uni.switchTab({
url: `/pages/go-order/go-order`
})
......@@ -130,31 +137,35 @@
mounted() {
console.log('监听到事件来自 update');
let _this = this
uni.$once('selectedSalePlan',function(data){
uni.$once('selectedSalePlan', function(data) {
console.log('监听到事件来自 selectedSalePlan ，携带参数 msg 为：' + data.selectedSalePlan.id);
_this.selectedSalePlan = {...data.selectedSalePlan}
_this.selectedSalePlan = {
...data.selectedSalePlan
}
})
uni.$once('selectedProduct',function(data){
uni.$once('selectedProduct', function(data) {
console.log('监听到事件来自 selectedProduct ，携带参数 msg 为：' + data.selectedProduct.id);
_this.selectedProduct = {...data.selectedProduct}
_this.selectedProduct = {
...data.selectedProduct
}
})
},
methods: {
handleDel() {
console.log(1)
},
selectPlanOrder(){
selectPlanOrder() {
uni.navigateTo({
url: `/pages/select-sale-plan/select-sale-plan`
});
},
selectProduct(){
selectProduct() {
uni.navigateTo({
url: `/pages/select-product/select-product`
});
},
nextStep() {
this.$emit('click','orderUpload')
this.$emit('click', 'orderUpload')
},
preStep() {
uni.switchTab({
......@@ -183,7 +194,7 @@
padding: 32rpx 64rpx 40rpx 48rpx;
}
.summary-block{
.summary-block {
display: flex;
align-items: center;
}
......@@ -290,7 +301,11 @@
font-weight: 500;
}
.planout-block-lists{
.scroll-area{
padding-bottom: 40rpx;
}
.planout-block-lists {
display: flex;
flex-direction: column;
}
......@@ -308,16 +323,20 @@
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 {
......@@ -342,6 +361,7 @@
.planout-block-item {
flex: 1;
width: 750rpx;
}
.bottom-area {
......
pages/quota/quota.nvue
View file @ 2089dbf0
......@@ -84,7 +84,8 @@
componentHeight(){
console.log('componentHeight',`${this.sysinfo.safeArea.height - 44 - this.topHeight}px`,this.sysinfo);
return {
'height':`${this.sysinfo.safeArea.height - 44 - this.topHeight}px`
'height':`${this.sysinfo.safeArea.height - 44 - this.topHeight}px`,
'overflow-y':'scroll'
}
},
winHeight(){
......@@ -120,8 +121,11 @@
// #endif
},
onBackPress() {
uni.navigateBack({
delta: 1
// uni.navigateBack({
// delta: 1
// })
uni.switchTab({
url:"pages/go-order/go-order"
})
},
methods: {
......
static/.DS_Store
View file @ 2089dbf0
No preview for this file type
unpackage/dist/dev/app-plus/app-service.js
View file @ 2089dbf0
This diff is collapsed.
unpackage/dist/dev/app-plus/app-view.js
View file @ 2089dbf0
This diff is collapsed.
unpackage/dist/dev/app-plus/manifest.json
View file @ 2089dbf0
{"@platforms":["android","iPhone","iPad"],"id":"__UNI__343534B","name":"五粮液APP","version":{"name":"1.0.0","code":"100"},"description":"订货系统","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#fff"},"usingComponents":true,"nvueCompiler":"uni-app","nvue":{"flex-direction":"row"},"distribute":{"icons":{"android":{"hdpi":"unpackage/res/icons/72x72.png","xhdpi":"unpackage/res/icons/96x96.png","xxhdpi":"unpackage/res/icons/144x144.png","xxxhdpi":"unpackage/res/icons/192x192.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"google":{"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"],"abiFilters":["armeabi-v7a"]},"apple":{},"plugins":{"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"arguments":"{\"name\":\"me\",\"query\":\"uuid=c4bba940-f69e-11ea-a419-6bafda9d095e&__id__=1\",\"id\":0,\"pathName\":\"pages/home/home\"}","allowsInlineMediaPlayback":true,"safearea":{"background":"rgba(250,250,250,0.90)","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"3.3.13","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"row"},"nvueLaunchMode":"normal"},"tabBar":{"iconWidth":"19px","spacing":"4px","color":"#999999","selectedColor":"#FF1D32","borderStyle":"rgba(250,250,250,0.90)","backgroundColor":"rgba(250,250,250,0.90)","list":[{"pagePath":"pages/home/home","iconPath":"static/image/home@3x.png","selectedIconPath":"static/image/home@3x.png","text":"首页"},{"pagePath":"pages/go-order/go-order","iconPath":"static/image/plan@3x.png","selectedIconPath":"static/image/plan@3x.png","text":"下单"},{"pagePath":"pages/shop/shop","iconPath":"static/image/shop@3x.png","selectedIconPath":"static/image/shop@3x.png","text":"要货"},{"pagePath":"pages/message/message","iconPath":"static/image/message@3x.png","selectedIconPath":"static/image/message@3x.png","text":"消息"},{"pagePath":"pages/usercenter/usercenter","iconPath":"static/image/usercenter@3x.png","selectedIconPath":"static/image/usercenter@3x.png","text":"我的"}],"height":"50px","child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"}}
\ No newline at end of file
{"@platforms":["android","iPhone","iPad"],"id":"__UNI__343534B","name":"五粮液APP","version":{"name":"1.0.0","code":"100"},"description":"订货系统","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#fff"},"usingComponents":true,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","nvue":{"flex-direction":"row"},"distribute":{"icons":{"android":{"hdpi":"unpackage/res/icons/72x72.png","xhdpi":"unpackage/res/icons/96x96.png","xxhdpi":"unpackage/res/icons/144x144.png","xxxhdpi":"unpackage/res/icons/192x192.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"google":{"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"],"abiFilters":["armeabi-v7a"]},"apple":{},"plugins":{"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"arguments":"{\"name\":\"me\",\"query\":\"uuid=c4bba940-f69e-11ea-a419-6bafda9d095e&__id__=1\",\"id\":0,\"pathName\":\"pages/home/home\"}","allowsInlineMediaPlayback":true,"safearea":{"background":"rgba(250,250,250,0.90)","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"3.3.13","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"row"},"nvueLaunchMode":"normal"},"tabBar":{"iconWidth":"19px","spacing":"4px","color":"#999999","selectedColor":"#FF1D32","borderStyle":"rgba(250,250,250,0.90)","backgroundColor":"rgba(250,250,250,0.90)","list":[{"pagePath":"pages/home/home","iconPath":"static/image/home@3x.png","selectedIconPath":"static/image/home@3x.png","text":"首页"},{"pagePath":"pages/go-order/go-order","iconPath":"static/image/plan@3x.png","selectedIconPath":"static/image/plan@3x.png","text":"下单"},{"pagePath":"pages/purchase/purchase","iconPath":"static/image/shop@3x.png","selectedIconPath":"static/image/shop@3x.png","text":"要货"},{"pagePath":"pages/message/message","iconPath":"static/image/message@3x.png","selectedIconPath":"static/image/message@3x.png","text":"消息"},{"pagePath":"pages/usercenter/usercenter","iconPath":"static/image/usercenter@3x.png","selectedIconPath":"static/image/usercenter@3x.png","text":"我的"}],"height":"50px","child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"}}
\ No newline at end of file
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