Commit 017a1b96 authored by 陈红林's avatar 陈红林

'销售折扣查询特殊活动修改'

parent ddf52827
{ {
"name" : "五粮液易商", "name" : "五粮液易商",
// "appid" : "__UNI__EDB6A1F", // "appid" : "__UNI__EDB6A1F",
"appid" : "__UNI__EDB6A1F", "appid" : "__UNI__1EABC74",
"description" : "订货系统", "description" : "订货系统",
"versionName" : "1.1.38", "versionName" : "1.1.42",
"versionCode" : 10138, "versionCode" : 10142,
"transformPx" : false, "transformPx" : false,
"app-plus" : { "app-plus" : {
/* 5+App特有相关 */ /* 5+App特有相关 */
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<view class="tab-bar-list"> <view class="tab-bar-list">
<view style="position: absolute;left: 0;top: 0;"> <view style="position: absolute;left: 0;top: 0;">
<picker mode="selector" :range="typeArr" @change="typeChange"> <picker mode="selector" :range="typeArr" @change="typeChange">
<view class="uni-tab-item-title-picker">{{ typeArr[typeIndex] }} <image src="/static/image/arrow_down@3x.png" mode="widthFix"></image></view> <view class="uni-tab-item-title-picker"><text style="font-size: 28rpx;">{{ typeArr[typeIndex] }}</text> <image class="uni-tab-item-title-picker-image" src="/static/image/arrow_down@3x.png" mode="widthFix"></image></view>
</picker> </picker>
</view> </view>
...@@ -596,17 +596,16 @@ uni-button:after { ...@@ -596,17 +596,16 @@ uni-button:after {
width: 170rpx; width: 170rpx;
justify-content: center; justify-content: center;
color: $text-base-color; color: $text-base-color;
font-size: 28rpx; font-size: 28rpx !important;
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
font-weight: 400; font-weight: 400;
align-items: center; align-items: center;
image{
width: 28rpx;
margin-left: 10rpx;
}
} }
.uni-tab-item-title-picker-image{
width: 24rpx !important;
margin-left: 10rpx !important;
}
.uni-tab-item-title-active { .uni-tab-item-title-active {
color: $tabbar-color; color: $tabbar-color;
font-weight: 500; font-weight: 500;
......
...@@ -230,7 +230,6 @@ export default { ...@@ -230,7 +230,6 @@ export default {
this.isNoData = false; this.isNoData = false;
this.requestParams.time = new Date().getTime() + ''; this.requestParams.time = new Date().getTime() + '';
const obj = JSON.parse(JSON.stringify(this.conditions)); const obj = JSON.parse(JSON.stringify(this.conditions));
console.log(obj);
const params = { const params = {
...this.condition, ...this.condition,
...obj, ...obj,
...@@ -251,7 +250,9 @@ export default { ...@@ -251,7 +250,9 @@ export default {
} }
!params.state[0].low && delete params.state; !params.state[0].low && delete params.state;
let res = null; let res = null;
console.log('123213',params)
res = await getDhkApp(params); res = await getDhkApp(params);
console.log('123213124124',res)
if (res.msgtype == 'S') { if (res.msgtype == 'S') {
this.isLoading = false; this.isLoading = false;
if (refresh) { if (refresh) {
......
...@@ -201,6 +201,7 @@ class Request { ...@@ -201,6 +201,7 @@ class Request {
config.baseUrl = 'http://218.89.67.37:8001/wlySap' config.baseUrl = 'http://218.89.67.37:8001/wlySap'
// config.baseUrl = 'http://221.10.127.60:5000/wlySap' // config.baseUrl = 'http://221.10.127.60:5000/wlySap'
} }
console.log(config.baseUrl)
} catch (e) { } catch (e) {
console.log('error', e) console.log('error', e)
} }
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
{"@platforms":["android","iPhone","iPad"],"id":"__UNI__EDB6A1F","name":"五粮液易商","version":{"name":"1.1.38","code":10138},"description":"订货系统","launch_path":"","developer":{"name":"","email":"","url":""},"permissions":{"Barcode":{},"Camera":{},"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","render":"always","uniNView":{"path":"pages/login/login.js"}},"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"}}},"splashscreen":{"iosStyle":"common"},"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\"/>","<uses-permission android:name=\"com.samsung.android.providers.context.permission.WRITE_USE_APP_FEATURE_SURVEY\"/>"],"abiFilters":["armeabi-v7a","arm64-v8a","x86"],"targetSdkVersion":""},"apple":{"dSYMs":false,"urlschemewhitelist":"uumbs","urltypes":"uusafeportalwly","idfa":false},"plugins":{"ad":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"nativePlugins":{"AndroidLMY-ToastPlus":{"__plugin_info__":{"name":"ToastPlus","description":"原生Toast","platforms":"Android,iOS","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"allowsInlineMediaPlayback":true,"safearea":{"background":"rgba(250,250,250,0.90)","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"3.99","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_red@3x.png","text":"首页"},{"pagePath":"pages/go-order/go-order","iconPath":"static/image/tab_order@3x.png","selectedIconPath":"static/image/tab_order_red@3x.png","text":"下单"},{"pagePath":"pages/purchase/purchase","iconPath":"static/image/tab_purchase@3x.png","selectedIconPath":"static/image/tab_purchase_red@3x.png","text":"要货"},{"pagePath":"pages/usercenter/usercenter","iconPath":"static/image/tab_my@3x.png","selectedIconPath":"static/image/tab_my_red@3x.png","text":"我的"}],"height":"50px"}}} {"@platforms":["android","iPhone","iPad"],"id":"__UNI__1EABC74","name":"五粮液易商","version":{"name":"1.1.38","code":10138},"description":"订货系统","launch_path":"","developer":{"name":"","email":"","url":""},"permissions":{"Barcode":{},"Camera":{},"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","render":"always","uniNView":{"path":"pages/login/login.js"}},"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"}}},"splashscreen":{"iosStyle":"common"},"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\"/>","<uses-permission android:name=\"com.samsung.android.providers.context.permission.WRITE_USE_APP_FEATURE_SURVEY\"/>"],"abiFilters":["armeabi-v7a","arm64-v8a","x86"],"targetSdkVersion":""},"apple":{"dSYMs":false,"urlschemewhitelist":"uumbs","urltypes":"uusafeportalwly","idfa":false},"plugins":{"ad":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"nativePlugins":{"AndroidLMY-ToastPlus":{"__plugin_info__":{"name":"ToastPlus","description":"原生Toast","platforms":"Android,iOS","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"allowsInlineMediaPlayback":true,"safearea":{"background":"rgba(250,250,250,0.90)","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"4.75","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_red@3x.png","text":"首页"},{"pagePath":"pages/go-order/go-order","iconPath":"static/image/tab_order@3x.png","selectedIconPath":"static/image/tab_order_red@3x.png","text":"下单"},{"pagePath":"pages/purchase/purchase","iconPath":"static/image/tab_purchase@3x.png","selectedIconPath":"static/image/tab_purchase_red@3x.png","text":"要货"},{"pagePath":"pages/usercenter/usercenter","iconPath":"static/image/tab_my@3x.png","selectedIconPath":"static/image/tab_my_red@3x.png","text":"我的"}],"height":"50px"}}}
\ No newline at end of file \ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
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