Skip to content

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

修复ios兼容问题

parent d25de266
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 688 additions and 360 deletions
manifest.json
View file @ 4051e2d0
{
"name" : "五粮液APP",
"appid" : "__UNI__343534B",
"description" : "订货系统",
"versionName" : "1.0.0",
"versionCode" : "100",
"transformPx" : false,
"app-plus" : {
/* 5+App特有相关 */
"usingComponents" : true,
"nvueCompiler" : "uni-app",
"nvueStyleCompiler" : "uni-app",
"splashscreen" : {
"alwaysShowBeforeRender" : true,
"waiting" : true,
"autoclose" : true,
"delay" : 0
},
"nvue" : {
"flex-direction" : "row"
},
"modules" : {},
/* 模块配置 */
"distribute" : {
/* 应用发布信息 */
"android" : {
/* android打包配置 */
"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" ]
},
"ios" : {},
/* ios打包配置 */
"sdkConfigs" : {
"ad" : {}
},
"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"
}
}
}
}
},
/* SDK配置 */
"quickapp" : {},
/* 快应用特有相关 */
"mp-weixin" : {
/* 小程序特有相关 */
"appid" : "",
"setting" : {
"urlCheck" : false
},
"usingComponents" : true
},
"h5" : {
"devServer" : {
"https" : false,
"port" : "8080",
"disableHostCheck" : true,
"proxy" : {
"/sap" : {
"target" : "http://10.0.134.45:8000",
"changeOrigin" : true
},
"/crm-app" : {
"target" : "http://10.0.135.139",
// "target" : "http://10.2.4.2",
"changeOrigin" : true
}
}
}
}
{
"name": "五粮液APP",
"appid": "__UNI__343534B",
"description": "订货系统",
"versionName": "1.0.0",
"versionCode": "100",
"transformPx": false,
"app-plus": {
/* 5+App特有相关 */
"usingComponents": true,
"nvueCompiler": "uni-app",
"nvueStyleCompiler": "uni-app",
"splashscreen": {
"alwaysShowBeforeRender": true,
"waiting": true,
"autoclose": true,
"delay": 0
},
"nvue": {
"flex-direction": "row"
},
"modules": {},
/* 模块配置 */
"distribute": {
/* 应用发布信息 */
"android": {
/* android打包配置 */
"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"]
},
"ios": {},
/* ios打包配置 */
"sdkConfigs": {
"ad": {}
},
"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"
}
}
}
}
},
/* SDK配置 */
"quickapp": {},
/* 快应用特有相关 */
"mp-weixin": {
/* 小程序特有相关 */
"appid": "",
"setting": {
"urlCheck": false
},
"usingComponents": true
},
"h5": {
"devServer": {
"https": false,
"port": "8080",
"disableHostCheck": true,
"proxy": {
"/sap": {
"target": "http://10.0.135.139/wlySap",
// "target" : "http://10.0.134.45:8000",
"changeOrigin": true
},
"/crm-app": {
"target": "http://10.0.135.139",
// "target" : "http://10.2.4.2",
"changeOrigin": true
}
}
}
}
}
pages.json
View file @ 4051e2d0
......@@ -257,6 +257,22 @@
},
"enablePullDownRefresh": true
}
}, {
"path": "pages/select-paint-design/select-paint-design",
"style": {
"app-plus": {
"titleNView": {
"titleAlign": "left",
"titleColor": "#333",
"titleSize": "17px",
"backgroundColor": "#fff",
"titleText": "祝福语选择",
"autoBackButton": true
},
"bounce": "none"
},
"enablePullDownRefresh": true
}
}, {
"path": "pages/purchase/purchase",
"style": {
......@@ -427,8 +443,8 @@
"titleText": "采购计划",
"autoBackButton": true
}
},
"enablePullDownRefresh": true
}
// "enablePullDownRefresh": true
}
},
{
......
pages/account-inquiry/account-inquiry.nvue
View file @ 4051e2d0
......@@ -146,7 +146,7 @@
flex-direction: column;
margin-top: -164rpx;
padding: 0 16rpx;
overflow-y: scroll;
// overflow-y: scroll;
}
.list-wrapper {
......@@ -257,7 +257,7 @@
font-size: 32rpx;
color: #333;
font-weight: 500;
white-space: nowrap;
// white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
......
pages/apply-delivery/apply-delivery-list.nvue
View file @ 4051e2d0
<template>
<view class="lists">
<uni-list ref="list" class="scroll-wrapper" :enableBackToTop="true" :scroll-y="true" @scrolltolower="loadMore()">
<uni-list ref="list" class="scroll-wrapper" :enableBackToTop="true" :scroll-y="true"
@scrolltolower="loadMore()">
<uni-cell class="middle view" v-for="item in 3" :key='item'>
<view class="middle-wrapper">
<view class="middle-plan">
<image class="icon_plan" src="@/static/image/icon_plan@3x.png" mode=""></image>
<text class="middle-title">五粮液1618</text>
</view>
<view class="text-block">
<text class="middle-date">规格</text>
<text class="middle-date-des">52% 500ml *4</text>
</view>
<view class="text-block">
<text class="middle-date">未发货件数</text>
<text class="middle-date-des">300</text>
</view>
<view class="text-block">
<text class="middle-date">本月计划件数</text>
<text class="middle-date-des">200</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">
<input type="text" v-model="applyNum" class="picker-block" />
</view>
</view>
</view>
</view>
</view>
<view v-if="item == 3" class="blank"></view>
<view class="bottom" :style="btnStyle">
<button class="btn btn-l" type="default" @tap="preStep">
<text class="btn-text btn-text-l">上一步</text>
</button>
<button class="btn" type="default" @tap="nextStep">
<text class="btn-text">下一步</text>
</button>
<view class="middle-wrapper">
<view class="middle-plan">
<image class="icon_plan" src="@/static/image/icon_plan@3x.png" mode=""></image>
<text class="middle-title">五粮液1618</text>
</view>
<view class="text-block">
<text class="middle-date">规格</text>
<text class="middle-date-des">52% 500ml *4</text>
</view>
<view class="text-block">
<text class="middle-date">未发货件数</text>
<text class="middle-date-des">300</text>
</view>
<view class="text-block">
<text class="middle-date">本月计划件数</text>
<text class="middle-date-des">200</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">
<input type="text" v-model="applyNum" class="picker-block" />
</view>
</view>
</view>
</view>
</view>
<view v-if="item == 3" class="blank"></view>
<view class="bottom" :style="btnStyle">
<button class="btn btn-l" type="default" @tap="preStep">
<text class="btn-text btn-text-l">上一步</text>
</button>
<button class="btn" type="default" @tap="nextStep">
<text class="btn-text">下一步</text>
</button>
</view>
</uni-cell>
</uni-list>
......@@ -64,7 +65,7 @@
computed: {
btnStyle() {
return {
'bottom':`${this.sysinfo.safeAreaInsets.bottom + 56}px`
'bottom': `${this.sysinfo.safeAreaInsets.bottom + 56}px`
}
},
listsStyle() {
......@@ -75,8 +76,8 @@
...mapState(['sysinfo'])
},
methods: {
loadMore(e) {
console.log('loadMore');
loadMore(e) {
console.log('loadMore');
},
nextStep(e) {
this.$emit('click', 'deliveryCheckIn')
......@@ -93,25 +94,25 @@
flex-direction: column;
}
.lists {
overflow:hidden;
flex-direction: column;
.lists {
overflow: hidden;
flex-direction: column;
padding: 0 16rpx 0;
background: $background-color-1;
// background-color: green;
}
.scroll-wrapper{
overflow-y:scroll;
}
.middle-wrapper{
flex-direction: column;
background-color: #fff;
border-radius: 16rpx;
box-shadow: 0px 2px 4px 0px #dbe4ee;
padding: 32rpx 64rpx 64rpx 48rpx;
margin-bottom: 24rpx;
background: $background-color-1;
// background-color: green;
}
.scroll-wrapper {
// overflow-y:scroll;
}
.middle-wrapper {
flex-direction: column;
background-color: #fff;
border-radius: 16rpx;
box-shadow: 0px 2px 4px 0px #dbe4ee;
padding: 32rpx 64rpx 64rpx 48rpx;
margin-bottom: 24rpx;
}
.middle-plan {
......@@ -171,18 +172,18 @@
flex: 1;
font-size: 14px;
color: $text-base-color;
}
.blank{
height:220rpx ;
}
.blank {
height: 220rpx;
}
.bottom {
position: fixed;
left: 16rpx;
right: 16rpx;
margin-top: 50rpx;
z-index:100;
right: 16rpx;
margin-top: 50rpx;
z-index: 100;
justify-content: space-between;
}
......
pages/group-buy/group-baseinfo.nvue
View file @ 4051e2d0
......@@ -23,6 +23,17 @@
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
</view>
</view>
<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">
<view class="uni-list-cell-db">
<text class="middle-date-des">{{selectedAddress.NAME_ORG1}}</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">
......@@ -37,12 +48,15 @@
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
</view>
</view>
<view class="text-block" @click="selectAddress">
<text class="middle-date">收货单位</text>
<view class="text-block" v-if="condition.ZZFLD000099===1">
<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">{{selectedAddress.NAME_ORG1}}</text>
<picker class="picker-block" @change="bindPickerPaintDesignChange" mode="selector"
range-key='value' :value="paintDesignIndex" :range="paintDesignPicker">
<text class="uni-input-text">{{ paintDesignPicker[paintDesignIndex].value}}</text>
</picker>
</view>
</view>
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
......@@ -50,7 +64,7 @@
</view>
<view class="text-block">
<text class="middle-date">外箱喷码内容</text>
<input class="middle-date-des" type="text" v-model="condition.ZZFLD000098" placeholder="请填写" />
<input class="middle-date-des" type="text" disabled v-model="condition.ZZFLD000098" placeholder="" />
</view>
<view class="text-block">
<text class="middle-date">联系人</text>
......@@ -126,6 +140,20 @@
'product_info': {},
}],
HEADINFO: {},
paintDesignIndex: 0,
paintDesignPicker: [{
key: 'O',
value: '团购订单'
},
{
key: 'U',
value: '团购单位',
},
{
key: "S",
value: '祝福语',
}
],
}
},
computed: {
......@@ -201,11 +229,17 @@
_this.condition.ZZFLD00002M = TEL_NUMBER
_this.condition.ZZFLD00002N = STREET
})
uni.$on('selectedPaintDesign', function(data) {
console.log('监听到事件来自 selectedPaintDesign ，携带参数 msg 为：', data);
_this.condition.ZZFLD000098 = data.selectedPaintDesign.zzfld000098
})
},
onUnload() {
uni.$off('selectedBusiness')
uni.$off('selectedGroupClient2')
uni.$off('selectedAddress')
uni.$off('selectedPaintDesign')
},
methods: {
// 初始化订单数据
......@@ -230,6 +264,23 @@
console.log('picker发送选择改变，携带值为', e.detail.value)
this.condition.ZZFLD000099 = e.detail.value
},
bindPickerPaintDesignChange(e) {
console.log('picker发送选择改变，携带值为', e.detail.value)
this.paintDesignIndex = e.detail.value
switch (e.detail.value) {
case 0:
this.condition.ZZFLD000098 = this.condition.GRPUTID
break;
case 1:
this.condition.ZZFLD000098 = this.selectedGroupClient.OBJNAME
break;
case 2:
this.selectPaintDesign()
break;
default:
break;
}
},
selectGroupClient() {
uni.navigateTo({
url: `/pages/select-group-client/select-group-client?from=groupBaseInfo&mode=&index=`
......@@ -245,6 +296,11 @@
url: `/pages/address-manage/address-manage?from=groupBaseInfo&head=${JSON.stringify(this.HEADINFO)}`
});
},
selectPaintDesign() {
uni.navigateTo({
url: `/pages/select-paint-design/select-paint-design`
});
},
nextStep() {
let groupOrder = {
'ITEM': this.planinnerLists,
......
pages/group-buy/order-upload.nvue
View file @ 4051e2d0
......@@ -181,7 +181,7 @@
position: relative;
flex-direction: column;
padding: 0 16rpx;
overflow-y: scroll;
// overflow-y: scroll;
}
.middle {
......
pages/my-order/my-order.nvue
View file @ 4051e2d0
......@@ -205,7 +205,7 @@
return;
}
if (this.pageList[preloadIndex].dataList.length === 0) {
this.loadTabData(preloadIndex);
// this.loadTabData(preloadIndex);
}
// #ifdef APP-PLUS || H5 || MP-WEIXIN || MP-QQ
......
pages/my-order/order-item.nvue
View file @ 4051e2d0
......@@ -102,9 +102,9 @@
}
.item-block-btn__text {
width: 140rpx;
width: 180rpx;
height: 48rpx;
line-height: 44rpx;
line-height: 48rpx;
font-size: 12px;
color: #fff;
}
......
pages/no-quota/order-upload.nvue
View file @ 4051e2d0
......@@ -207,7 +207,7 @@
position: relative;
flex-direction: column;
padding: 0 16rpx;
overflow-y: scroll;
// overflow-y: scroll;
}
.middle {
......
pages/no-quota/quota-order.nvue
View file @ 4051e2d0
......@@ -354,7 +354,7 @@
position: relative;
flex-direction: column;
padding: 0 16rpx;
overflow-y: scroll;
// overflow-y: scroll;
}
.middle {
......
pages/order-detail-group/order-detail-group.nvue
View file @ 4051e2d0
......@@ -243,7 +243,7 @@
flex-direction: column;
flex: 1;
background: #f0f4f5;
overflow-y: scroll;
// overflow-y: scroll;
}
.main {
......@@ -314,7 +314,7 @@
}
.item-block-btn__text {
width: 160rpx;
width: 180rpx;
height: 48rpx;
line-height: 48rpx;
font-size: 12px;
......
pages/order-detail-noquota/order-detail-noquota.nvue
View file @ 4051e2d0
......@@ -178,7 +178,7 @@
handleShowReceiveDetail() {
this.ishowReceiveDetail = !this.ishowReceiveDetail
if (this.ishowReceiveDetail === true) {
this.receiveInfoHeight = `${260*this.ITEM.length}`
this.receiveInfoHeight = `${270*this.ITEM.length}`
} else {
this.receiveInfoHeight = '145'
}
......@@ -276,7 +276,7 @@
}
.title-info__status-text {
width: 160rpx;
width: 180rpx;
font-size: 12px;
}
......
pages/order-detail-quota/order-detail-quota.nvue
View file @ 4051e2d0
......@@ -221,7 +221,7 @@
this.ishowReceiveDetail = !this.ishowReceiveDetail
if (this.ishowReceiveDetail === true) {
let len = this.ITEM_INNER.length + this.ITEM_OUTER.length
this.receiveInfoHeight = `${230*len}`
this.receiveInfoHeight = `${340*len}`
} else {
this.receiveInfoHeight = '132'
}
......@@ -248,7 +248,7 @@
.lists {
position: relative;
flex-direction: column;
overflow-y: scroll;
// overflow-y: scroll;
background: #f0f4f5;
height: 100%;
}
......@@ -309,7 +309,7 @@
}
.title-info__status-text {
width: 160rpx;
width: 180rpx;
font-size: 12px;
color: #fff;
}
......@@ -384,7 +384,7 @@
}
.order-middle-auto {
height: auto;
// height: auto;
}
.middle {
......
pages/produce-material/produce-material.nvue
View file @ 4051e2d0
......@@ -283,7 +283,7 @@
}
this.condition.DATUM.HIGH = timeRangeFormat('now')
this.loadData(true)
this.onrefresh()
}
}
}
......
pages/produce-order/produce-order.nvue
View file @ 4051e2d0
......@@ -244,7 +244,11 @@
onrefresh(e) {
this.refreshData();
// #ifdef APP-NVUE
this.$refs.list.resetLoadmore();
try {
this.$refs.list.resetLoadmore();
} catch (e) {
console.log('onrefresh', e)
}
// #endif
},
onpullingdown(e) {
......@@ -280,7 +284,7 @@
}
this.condition.DATUM.HIGH = timeRangeFormat('now')
this.loadData(true)
this.onrefresh()
}
}
}
......
pages/purchase-plan/purchase-plan.nvue
View file @ 4051e2d0
......@@ -39,7 +39,11 @@
</view>
</view>
<list class="scroll-area view" loadmoreoffset='100' @loadmore="scrolltolower" :show-scrollbar='false'>
<list ref="list" class="scroll-area view" loadmoreoffset='100' @loadmore="scrolltolower"
:show-scrollbar='false'>
<refresh @refresh="refresh" :display="refreshing ? 'show' : 'hide'">
<!-- <loading-indicator></loading-indicator> -->
</refresh>
<cell v-for="(item,index) in lists" :key="item.plan_number">
<view class="scroll-item">
<view class="item-block item-block-code">
......@@ -75,6 +79,11 @@
</view>
</view>
</cell>
<cell>
<view class="loading-more" v-if='lists.length>2'>
<text class="loading-more-text">{{loadingText}}</text>
</view>
</cell>
<view class="planout-block-item__last"> </view>
</list>
......@@ -102,6 +111,8 @@
return {
scrollTop: 0,
isOpened: 'none',
loadingText: '加载中...',
refreshing: false,
condition: {
MV_BP: '0081000010',
ROLE: 'WLYALL',
......@@ -153,17 +164,17 @@
},
},
onPullDownRefresh() {
console.log('refresh');
this.reset()
this.getSalesPlan(true)
setTimeout(function() {
uni.stopPullDownRefresh();
}, 600);
},
// onPullDownRefresh() {
// console.log('refresh');
// this.reset()
// this.getSalesPlan(true)
// setTimeout(function() {
// uni.stopPullDownRefresh();
// }, 600);
// },
created() {
this.condition.RT_GJAHR[0].LOW = timeFormat(new Date(), 'yyyy')
this.condition.MV_BP = this.userInfo.code
this.condition.MV_BP = '0081000010' || this.userInfo.code
this.reset()
this.getSalesPlanTypes(true);
},
......@@ -210,6 +221,24 @@
this.lists = this.lists.concat(dataMap)
}
setTimeout(() => {
this.refreshing = false;
}, 300)
},
refresh(e) {
this.refreshing = true;
this.reset()
this.getSalesPlan(true)
// #ifdef APP-NVUE
try {
// console.log('-------', this.$refs.list)
this.$refs.list.resetLoadmore();
} catch (e) {
console.log('onrefresh', e)
}
// #endif
},
scrolltolower() {
console.log('onReachBottom');
......@@ -218,6 +247,7 @@
this.getSalesPlan()
} else {
this.loadParams.isDone = true
this.loadingText = '-- 到底了 --'
}
},
reset() {
......@@ -229,8 +259,8 @@
}
this.page.PAGE = 1
this.lists = []
this.loadingText = '加载中'
},
async getSalesPlanTypes() {
const res = await apiSalesPlanTypesSelect()
this.selectedSalePlanTypes = res.DATA
......@@ -291,7 +321,6 @@
flex-direction: column;
margin-top: -164rpx;
padding: 0 16rpx;
overflow: hidden;
}
.scroll-area {
......@@ -465,4 +494,18 @@
color: #fff;
font-size: 34rpx;
}
.loading-more {
flex: 1;
align-items: center;
justify-content: center;
padding-top: 14px;
padding-bottom: 14px;
text-align: center;
}
.loading-more-text {
font-size: 12px;
color: #999;
}
</style>
pages/purchase-receive/purchase-receive.nvue
View file @ 4051e2d0
......@@ -233,10 +233,10 @@
flex: 1;
flex-direction: column;
background: #f0f4f5;
overflow-y: scroll;
// overflow-y: scroll;
}
.scroll-area{
.scroll-area {
flex: 1;
}
......@@ -422,4 +422,4 @@
.btn-text-l {
color: $wly-primary-color;
}
</style>
</style>
pages/select-paint-design/select-paint-design.nvue 0 → 100644
View file @ 4051e2d0
<template>
<view class="order view">
<view class="status_bar" :style="navHeight"></view>
<view class="listview">
<list class="cell-list" v-if="lists.length > 0" :show-scrollbar='false' loadmoreoffset='100'
@loadmore="scrolltolower">
<cell @click="handleChecked(item)" v-for="item in lists" :key='item.zcode'>
<view class="cell-list-block">
<view class="cell-list-block__content">
<view class="list-block-item">
<text class="list-block-item__title1">{{item.zzfld000098}}</text>
</view>
</view>
</view>
</cell>
<cell>
<view class="loading-more" v-if='lists.length>14'>
<text class="loading-more-text">{{loadingText}}</text>
</view>
</cell>
</list>
<no-data class="no-data" v-else @retry="loadMore"></no-data>
</view>
</view>
</template>
<script>
import {
mapState
} from 'vuex'
import {
apiGetPengmaInfo
} from '@/servers/groupOrder.js'
import noData from '@/components/nodata.nvue';
export default {
components: {
noData
},
data() {
return {
loadingText: '加载中...',
condition: {},
loadParams: {
total: 0,
totalPage: 1,
isDone: false,
isRefresh: false
},
lists: [],
selectedPaintDesign: {},
toPageParams: {
page: '',
head: ""
}
}
},
computed: {
navHeight() {
return {
'height': `${this.sysinfo.safeArea.top + 44}px`
}
},
...mapState(['sysinfo', 'userInfo'])
},
onLoad(option) {
console.log('select-saleplan', option)
if (option && option.from) {
const {
from,
head
} = option
this.toPageParams.page = from
this.toPageParams.head = JSON.parse(head)
}
},
onPullDownRefresh() {
console.log('refresh');
this.getPengmaInfo()
setTimeout(function() {
uni.stopPullDownRefresh();
}, 600);
},
created() {
this.getPengmaInfo()
},
methods: {
async getPengmaInfo(isRefresh) {
uni.showLoading({
title: '加载中'
});
setTimeout(function() {
uni.hideLoading();
}, 2000);
const res = await apiGetPengmaInfo()
uni.hideLoading();
this.lists = res.info
this.loadingText = '-- 到底了 --'
},
scrolltolower() {
},
handleChecked(item) {
this.selectedPaintDesign = item
uni.$emit('selectedPaintDesign', {
selectedPaintDesign: item
})
uni.navigateBack()
},
loadMore() {
// this.getPengmaInfo()
}
}
}
</script>
<style lang="scss" scoped>
.view {
flex-direction: column;
}
/* #ifndef APP-PLUS */
page {
width: 100%;
min-height: 100%;
display: flex;
background: #fff;
}
.status_bar {
height: var(--status-bar-height);
background: #fff;
}
/* #endif */
.order {
flex: 1;
background: #f0f4f5;
}
.listview {
flex: 1;
flex-direction: column;
padding: 16rpx;
border-radius: 8px;
}
.cell-list {
flex: 1;
flex-direction: column;
background: #fff;
padding: 0 50rpx 40rpx 50rpx;
}
.icon-address {
width: 88rpx;
height: 88rpx;
line-height: 88rpx;
text-align: center;
background: #fff4f4;
font-size: 28rpx;
color: #ff1d32;
font-weight: 500;
border-radius: 50%;
margin-right: 32rpx;
}
.cell-list-block__content {
display: flex;
flex: 1;
flex-direction: column;
}
.list-block-item {
display: flex;
align-items: center;
}
.list-block-item__title1 {
color: #333;
font-weight: 400;
font-size: 28rpx;
}
.list-block-item__label {
color: #999999;
font-size: 24rpx;
margin-right: 16rpx;
}
.list-block-item__value {
color: #333333;
font-size: 12px;
}
.cell-list-block__desc {
color: #333;
font-size: 12px;
}
.icon-arrow {
width: 18rpx;
height: 22rpx;
margin-right: 28rpx;
}
.list-block-item__desc {
font-size: 24rpx;
color: #333;
}
.cell-list-block {
display: flex;
flex: 1;
height: 100rpx;
background: #fff;
align-items: center;
border-bottom: 1px solid #f4f5f6;
}
.loading-more {
flex: 1;
align-items: center;
justify-content: center;
padding-top: 14px;
padding-bottom: 14px;
text-align: center;
}
.loading-more-text {
font-size: 12px;
color: #999;
}
</style>
pages/ticket-order/ticket-order.nvue
View file @ 4051e2d0
......@@ -178,6 +178,7 @@
// #endif
},
onswiperscroll(e) {
// console.log('onswiperchange*********')
if (this.isTap) {
return;
}
......@@ -193,7 +194,7 @@
return;
}
if (this.pageList[preloadIndex].dataList.length === 0) {
this.loadTabData(preloadIndex);
// this.loadTabData(preloadIndex);
}
// #ifdef APP-PLUS || H5 || MP-WEIXIN || MP-QQ
......
pages/usercenter/usercenter.nvue
View file @ 4051e2d0
......@@ -5,8 +5,8 @@
<view class="userinfo">
<image class="avatar" src="@/static/image/avatar@3x.png" mode=""></image>
<view class="nick-block">
<text class="nick-block--name">{{userInfo.name || '苏州新川商贸有限公司'}}</text>
<text class="nick-block--no">编号：{{userInfo.code}}</text>
<text class="nick-block--name">{{userInfo.name || '--'}}</text>
<text class="nick-block--no">编号：{{userInfo.code*1}}</text>
</view>
</view>
<view class="amount-card">
......@@ -104,10 +104,6 @@
apiGetBpPrice
} from '@/servers/common.js'
import {
apiGetSalesOrder
} from '@/servers/salesOrder.js'
export default {
onLoad() {
this.winHeight = `height:${this.sysinfo.safeArea.height}px`
......@@ -126,23 +122,6 @@
},
async created() {
this.getBpPrice()
// const parm = {
// "user_bp": "50000215",
// "role": "WLY001",
// "page": "1",
// "pagesize": "1",
// "PROCESS_TYPE": [{
// "SIGN": "I",
// "OPTION": "EQ",
// "LOW": "ZS02"
// }],
// "zzfld00002j": [{
// "SIGN": "I",
// "OPTION": "EQ",
// "LOW": "V013"
// }]
// }
// apiGetSalesOrder(parm)
},
methods: {
async getBpPrice() {
......@@ -229,7 +208,7 @@
height: 40rpx;
line-height: 40rpx;
font-size: 24rpx;
background: rgba($color: #fff, $alpha: 0.66);
background: #fff;
border-radius: 20rpx;
color: #555555;
padding: 0 16rpx;
......
servers/api.helper.js
View file @ 4051e2d0
......@@ -135,7 +135,7 @@ class Request {
constructor() {
this.config = {
baseUrl: 'http://10.0.134.45:8000', // 请求的根域名
baseUrl: 'http://10.0.135.139', // 请求的根域名
// 默认的请求头
header: {},
method: 'POST',
......@@ -157,7 +157,7 @@ class Request {
request: (config) => {
config.header['Authorization'] = `Basic ${Base64.encode('wangpc:LZY888@@')}`;
try {
if (config.url.indexOf('crm-app') !== -1 && config.url.indexOf('crm-app/login') === -
if (config.url.indexOf('crm-app/login') === -
1 &&
store.state.vuex_token) {
config.header['X-Auth-Token'] = store.state.vuex_token
......@@ -166,7 +166,8 @@ class Request {
if (config.url.indexOf('crm-app') !== -1) {
config.baseUrl = 'http://10.0.135.139'
} else {
config.baseUrl = 'http://10.0.134.45:8000'
config.baseUrl = 'http://10.0.135.139/wlySap'
// config.baseUrl = 'http://10.0.134.45:8000'
}
} catch (e) {
console.log('error', e)
......
servers/groupOrder.js
View file @ 4051e2d0
......@@ -30,6 +30,16 @@ export async function apiUpdateGroupOrder(params) {
return res
}
/**
* 获取喷码内容
* @param
* @returns {Promise<AxiosResponse<T>>}
*/
export async function apiGetPengmaInfo(params) {
const res = await apiHelper.post('/sap/bc/ztpm/oprord/pengmainfo', params)
return res
}
export default {
apiInitGroupData,
apiUpdateGroupData,
......
servers/http.interceptor.js
View file @ 4051e2d0
......@@ -16,7 +16,7 @@ const install = (Vue, vm) => {
// 请求拦截，配置Token等参数
http.interceptor.request = (config) => {
config.header['Authorization'] = `Basic ${Base64.encode('wangpc:LZY888@@')}`;
if (config.url.indexOf('crm-app') !== -1 && config.url.indexOf('crm-app/login') === -1 && vm.$store
if (config.url.indexOf('crm-app/login') === -1 && vm.$store
.state.vuex_token) {
config.header['X-Auth-Token'] = vm.$store.state.vuex_token;
}
......
unpackage/dist/dev/app-plus/app-service.js
View file @ 4051e2d0
This diff is collapsed.
unpackage/dist/dev/app-plus/app-view.js
View file @ 4051e2d0
......@@ -175,6 +175,7 @@ __definePage('pages/select-group-client/select-group-client', function () {retur
__definePage('pages/select-client/select-client', function () {return Vue.extend(__webpack_require__(/*! pages/select-client/select-client.vue?mpType=page */ 148).default);});
/***/ }),
unpackage/dist/dev/app-plus/pages/login/login.js
View file @ 4051e2d0
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/app-plus/pages/usercenter/usercenter.js
View file @ 4051e2d0
This source diff could not be displayed because it is too large. You can view the blob instead.
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