Skip to content

W
wly-APP
Commit a26b8b53 authored by xiangzj's avatar xiangzj
Browse files
Options

订单动态接口更换

parent 583ace75
Hide whitespace changes
Inline Side-by-side
Showing with 828 additions and 692 deletions
manifest.json
View file @ a26b8b53
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
// "appid" : "__UNI__EDB6A1F", // "appid" : "__UNI__EDB6A1F",
"appid" : "__UNI__EDB6A1F", "appid" : "__UNI__EDB6A1F",
"description" : "订货系统", "description" : "订货系统",
"versionName" : "1.1.24", "versionName" : "1.1.25",
"versionCode" : "10124", "versionCode" : "10125",
"transformPx" : false, "transformPx" : false,
"app-plus" : { "app-plus" : {
/* 5+App特有相关 */ /* 5+App特有相关 */
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
"changeOrigin" : true "changeOrigin" : true
}, },
"/crm-app" : { "/crm-app" : {
// "target" : "http://10.0.135.61", // "target" : "https://218.89.67.37/",
"target" : "http://221.10.127.60:5000", "target" : "http://221.10.127.60:5000",
"changeOrigin" : true "changeOrigin" : true
}, },
...@@ -155,6 +155,7 @@ ...@@ -155,6 +155,7 @@
}, },
"/uusafe" : { "/uusafe" : {
"target" : "https://zzy.ipincloud.cn:9070", "target" : "https://zzy.ipincloud.cn:9070",
// "target" : "https://apps.wuliangye.com.cn:9076",
"changeOrigin" : true "changeOrigin" : true
} }
} }
......
pages/diy-wine/diy-wine.vue
View file @ a26b8b53
...@@ -301,7 +301,7 @@ ...@@ -301,7 +301,7 @@
'BoxCode': this.orderDetail.INFO.ZZFLD000098, 'BoxCode': this.orderDetail.INFO.ZZFLD000098,
// 'CallbackUrlList': JSON.stringify({WorksbackUrl:''}), // 'CallbackUrlList': JSON.stringify({WorksbackUrl:''}),
'City': this.orderDetail.INFO.ZZFLD000003_TEXT, 'City': this.orderDetail.INFO.ZZFLD000003_TEXT,
// County: this.orderDetail.INFO., 'County': this.orderDetail.INFO.STREET_TEXT,
'MobileNumber': this.orderDetail.INFO.ZZFLD00002M, 'MobileNumber': this.orderDetail.INFO.ZZFLD00002M,
// OrderAmount: "", // OrderAmount: "",
'OrderGoods': JSON.stringify(goodsInfo), 'OrderGoods': JSON.stringify(goodsInfo),
...@@ -311,7 +311,7 @@ ...@@ -311,7 +311,7 @@
"SecretKey": "8B72E5CB394E3CABB56DC8E04AC4DE7F", "SecretKey": "8B72E5CB394E3CABB56DC8E04AC4DE7F",
'StoreCompanyName': this.orderDetail.INFO.CUST_NAME, 'StoreCompanyName': this.orderDetail.INFO.CUST_NAME,
'StoreName': this.orderDetail.INFO.CUST_NAME, 'StoreName': this.orderDetail.INFO.CUST_NAME,
"Sign": md5.hex_md5(`Action=guanying.adapter.crmorder.down&Address=${this.orderDetail.INFO.ZZFLD00002N}&BoxCode=${this.orderDetail.INFO.ZZFLD000098}&City=${this.orderDetail.INFO.ZZFLD000003_TEXT}&MobileNumber=${this.orderDetail.INFO.ZZFLD00002M}&OrderGoods=${JSON.stringify(goodsInfo)}&OutsideCoreOrderID=${this.orderDetail.INFO.OBJECT_ID}&Province=${this.orderDetail.INFO.ZZFLD000002_TEXT}&RealName=${this.orderDetail.INFO.ZZFLD00002L}&StoreCompanyName=${this.orderDetail.INFO.CUST_NAME}&StoreName=${this.orderDetail.INFO.CUST_NAME}&SecretKey=8B72E5CB394E3CABB56DC8E04AC4DE7F`) "Sign": md5.hex_md5(`Action=guanying.adapter.crmorder.down&Address=${this.orderDetail.INFO.ZZFLD00002N}&BoxCode=${this.orderDetail.INFO.ZZFLD000098}&City=${this.orderDetail.INFO.ZZFLD000003_TEXT}&County=${this.orderDetail.INFO.STREET_TEXT}&MobileNumber=${this.orderDetail.INFO.ZZFLD00002M}&OrderGoods=${JSON.stringify(goodsInfo)}&OutsideCoreOrderID=${this.orderDetail.INFO.OBJECT_ID}&Province=${this.orderDetail.INFO.ZZFLD000002_TEXT}&RealName=${this.orderDetail.INFO.ZZFLD00002L}&StoreCompanyName=${this.orderDetail.INFO.CUST_NAME}&StoreName=${this.orderDetail.INFO.CUST_NAME}&SecretKey=8B72E5CB394E3CABB56DC8E04AC4DE7F`)
} }
const res2 = await apiSubmitCustom(params2) const res2 = await apiSubmitCustom(params2)
if(res2.Status !== 'Success'){ if(res2.Status !== 'Success'){
......
pages/login/login.nvue
View file @ a26b8b53
<template> <template>
<view class="login"> <view class="login">
<view class="status_bar"> <view class="status_bar">
</view> </view>
<view class="top"> <view class="top">
<image class="icon-logo" src="../../static/image/logo@3x.png" mode="aspectFit"></image> <image class="icon-logo" src="../../static/image/logo@3x.png" mode="aspectFit"></image>
<text class="title">五粮液易商</text> <text class="title">五粮液易商</text>
</view> </view>
<view class="middle"> <view class="middle">
<view class="account-block" v-show="loginType==='password'"> <view class="account-block" v-show="loginType==='password'">
<input class="account" type="text" v-model="account" placeholder="请输入账号" <input class="account" type="text" v-model="account" placeholder="请输入账号"
placeholder-class='placeholder-text' /> placeholder-class='placeholder-text' />
</view> </view>
<view class="password-block" v-show="loginType==='password'"> <view class="password-block" v-show="loginType==='password'">
<input ref="password" class="password" :cursor='cursorNumber' type='text' :password="!passwordVisible" <input ref="password" class="password" :cursor='cursorNumber' type='text' :password="!passwordVisible"
v-model="password" placeholder="请输入密码" placeholder-class='placeholder-text' /> v-model="password" placeholder="请输入密码" placeholder-class='placeholder-text' />
<template v-if="passwordVisible"> <template v-if="passwordVisible">
<image class="icon-visible" src="../../static/image/visible@3x.png" mode="aspectFit" <image class="icon-visible" src="../../static/image/visible@3x.png" mode="aspectFit"
@click="handlePasswordVisible"></image> @click="handlePasswordVisible"></image>
</template> </template>
<template v-else> <template v-else>
<!-- <input class="password" type="text" v-model="password" placeholder="请输入密码" <!-- <input class="password" type="text" v-model="password" placeholder="请输入密码"
placeholder-class='placeholder-text' /> --> placeholder-class='placeholder-text' /> -->
<image class="icon-visible" src="../../static/image/invisible@3x.png" mode="aspectFit" <image class="icon-visible" src="../../static/image/invisible@3x.png" mode="aspectFit"
@click="handlePasswordVisible"></image> @click="handlePasswordVisible"></image>
</template> </template>
</view> </view>
<!-- <view class="account-block" v-show="loginType==='phone'"> <!-- <view class="account-block" v-show="loginType==='phone'">
<input class="account" type="tel" v-model="phone" placeholder="请输入手机号" <input class="account" type="tel" v-model="phone" placeholder="请输入手机号"
placeholder-class='placeholder-text' /> placeholder-class='placeholder-text' />
</view> --> </view> -->
</view> </view>
<view class="mui-input-row mui-checkbox remember-all"> <view class="mui-input-row mui-checkbox remember-all">
<view class="remember-num"> <view class="remember-num">
<checkbox-group @change="checkboxChangeNum"> <checkbox-group @change="checkboxChangeNum">
<checkbox <checkbox
color="#FF1D32" color="#FF1D32"
id="chkRemNum" id="chkRemNum"
type="checkbox" type="checkbox"
:checked="rememberAt" :checked="rememberAt"
@tap="rememberAt = !rememberAt" @tap="rememberAt = !rememberAt"
class="remember-check" class="remember-check"
> >
</checkbox> </checkbox>
<text for="chkRemNum" class="remember-pass">记住账号</text> <text for="chkRemNum" class="remember-pass">记住账号</text>
</checkbox-group> </checkbox-group>
</view> </view>
<view class=""> <view class="">
<checkbox-group @change="checkboxChange"> <checkbox-group @change="checkboxChange">
<checkbox <checkbox
color="#FF1D32" color="#FF1D32"
id="chkRem" id="chkRem"
type="checkbox" type="checkbox"
:checked="rememberPsw" :checked="rememberPsw"
@tap="rememberPsw = !rememberPsw" @tap="rememberPsw = !rememberPsw"
class="remember-check" class="remember-check"
> >
</checkbox> </checkbox>
<text for="chkRem" class="remember-pass">记住密码</text> <text for="chkRem" class="remember-pass">记住密码</text>
</checkbox-group> </checkbox-group>
</view> </view>
</view> </view>
<view class="bottom"> <view class="bottom">
<button class="btn" type="default" @click="loginBtn" :class="{ 'btn-disabled': disabled }" <button class="btn" type="default" @click="loginBtn" :class="{ 'btn-disabled': disabled }"
:disabled="disabled"><text class="btn-text">{{loginBtnText}}</text></button> :disabled="disabled"><text class="btn-text">{{loginBtnText}}</text></button>
<!-- <view class="actions"> <!-- <view class="actions">
<navigator url="/pages/forgetpassword/forgetpassword"> <navigator url="/pages/forgetpassword/forgetpassword">
<text class="forgetpassword-btn">忘记密码</text> <text class="forgetpassword-btn">忘记密码</text>
</navigator> </navigator>
<text class="phone-btn" @click="fnChangeLogin">{{loginWayText}}</text> <text class="phone-btn" @click="fnChangeLogin">{{loginWayText}}</text>
</view> --> </view> -->
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import { import {
mapMutations, mapMutations,
mapState mapState
} from 'vuex' } from 'vuex'
import { import {
apiLogin, apiLogin,
getIdToken getIdToken
} from '@/servers/user.js' } from '@/servers/user.js'
const ToastPlusModule = uni.requireNativePlugin("ToastPlus") || uni.requireNativePlugin("UUMbsAgentPlugin-Test") const ToastPlusModule = uni.requireNativePlugin("ToastPlus") || uni.requireNativePlugin("UUMbsAgentPlugin-Test")
export default { export default {
data() { data() {
return { return {
accessToken: "", accessToken: "",
account: '', account: '',
// password: 'DO1tjHPW0Z', // password: 'DO1tjHPW0Z',
password: '', password: '',
phone: '', phone: '',
code: '', code: '',
loginType: 'password', loginType: 'password',
passwordVisible: false, passwordVisible: false,
disabled: false, disabled: false,
cursorNumber: 0, cursorNumber: 0,
rememberPsw: true, rememberPsw: true,
rememberAt: true, rememberAt: true,
} flag: false
}, }
computed: { },
...mapState(['userInfo']), computed: {
loginWayText() { ...mapState(['userInfo']),
return this.loginType === 'phone' ? '密码登录' : '手机号登录' loginWayText() {
}, return this.loginType === 'phone' ? '密码登录' : '手机号登录'
loginBtnText() { },
return this.loginType === 'phone' ? '获取验证码' : '登录' loginBtnText() {
} return this.loginType === 'phone' ? '获取验证码' : '登录'
}, }
watch: { },
phone: { watch: {
handler: function(val) { phone: {
if (this.loginType === 'password') { handler: function(val) {
this.disabled = false if (this.loginType === 'password') {
return this.disabled = false
} return
if (/^1\d{10}$/.test(val)) { }
this.disabled = false if (/^1\d{10}$/.test(val)) {
} else { this.disabled = false
this.disabled = true } else {
} this.disabled = true
}, }
immediate: true },
} immediate: true
}, }
onLoad() { },
onLoad() {
ToastPlusModule && this.initEx() ToastPlusModule && this.initEx()
}, },
onShow() { onShow() {
ToastPlusModule && this.authEx() // 判断是否正在等待authEx的返回结果，第一次进入页面默认是false
}, if (!this.flag && !this.accessToken) {
//页面初始加载 ToastPlusModule && this.authEx()
mounted() { }
let that = this; },
//缓存的账号 //页面初始加载
const username = uni.getStorageSync('username') || ''; mounted() {
//缓存的密码 let that = this;
const password = uni.getStorageSync('password') || ''; //缓存的账号
console.log("密码",password,username) const username = uni.getStorageSync('username') || '';
//有缓存就赋值给文本没有就清空 //缓存的密码
that.account = username || '' const password = uni.getStorageSync('password') || '';
that.password = password || '' console.log("密码",password,username)
that.handlePasswordVisible() //有缓存就赋值给文本没有就清空
that.$nextTick(()=>{ that.account = username || ''
setTimeout(function() { that.password = password || ''
that.handlePasswordVisible() that.handlePasswordVisible()
}, 100); that.$nextTick(()=>{
}) setTimeout(function() {
}, that.handlePasswordVisible()
methods: { }, 100);
initEx(){ })
uni.showLoading({ },
title: '加载中' methods: {
}); initEx(){
// 调用同步方法 uni.showLoading({
var obj = ToastPlusModule.registerSyncFunc({ title: '加载中'
appKey: 'com.wuliangye.emobilewlycrm', });
secretKey: '9ab24ae4bfb349cca739ab15b78f1c7f8737eb73', // 调用同步方法
packageName: 'com.uusafe.portal.wly' var obj = ToastPlusModule.registerSyncFunc({
}) appKey: 'com.wuliangye.emobilewlycrm',
console.log(obj) secretKey: '9ab24ae4bfb349cca739ab15b78f1c7f8737eb73',
}, packageName: 'com.uusafe.portal.wly'
checkboxChangeNum(){ })
if (e.detail.value.length == 1) { console.log(obj)
//获取缓存的账号 },
uni.getStorageSync('username',this.account); checkboxChangeNum(){
// uni.getStorageSync('password',this.password); if (e.detail.value.length == 1) {
} else { //获取缓存的账号
uni.removeStorageSync('username'); uni.getStorageSync('username',this.account);
// uni.removeStorageSync('password'); // uni.getStorageSync('password',this.password);
} } else {
}, uni.removeStorageSync('username');
//复选框 // uni.removeStorageSync('password');
checkboxChange: function(e) { }
if (e.detail.value.length == 1) { },
//获取缓存的账号 //复选框
// uni.getStorageSync('username',this.account); checkboxChange: function(e) {
uni.getStorageSync('password',this.password); if (e.detail.value.length == 1) {
} else { //获取缓存的账号
// uni.removeStorageSync('username'); // uni.getStorageSync('username',this.account);
uni.removeStorageSync('password'); uni.getStorageSync('password',this.password);
} } else {
}, // uni.removeStorageSync('username');
// 切换密码可见性 uni.removeStorageSync('password');
handlePasswordVisible() { }
this.passwordVisible = !this.passwordVisible; },
this.$refs.password.blur() // 切换密码可见性
}, handlePasswordVisible() {
authEx(){ this.passwordVisible = !this.passwordVisible;
uni.showLoading({ this.$refs.password.blur()
title: '加载中' },
}); authEx(){
ToastPlusModule.registerExSyncFunc({}, res => { uni.showLoading({
this.accessToken = res.data?.token || res title: '加载中'
this.getIdToken() });
}) // 开启等待被唤醒
}, this.flag = true
ToastPlusModule.registerExSyncFunc({}, res => {
async getIdToken(){ this.flag = false
const params ={ this.accessToken = res.data?.token || res
"uuid": "f3eea700a3686e47038a4b047af6d934DsRudwTZSRY", this.getIdToken()
"accessToken": this.accessToken })
} },
try{
const res = await getIdToken(params) async getIdToken(){
console.log(res,res.errorNumber-0===0) const params ={
if(res.errorNumber - 0 === 0){ "uuid": "f3eea700a3686e47038a4b047af6d934DsRudwTZSRY",
const parmasObj = { "accessToken": this.accessToken
account: res.accounts[0].account, }
idToken: res.accounts[0].idToken, try{
loginType: 'ystoken' const res = await getIdToken(params)
} console.log(res,res.errorNumber-0===0)
this.goLogin(parmasObj, false) if(res.errorNumber - 0 === 0){
}else{ const parmasObj = {
uni.showLoading({ account: res.accounts[0].account,
title: '加载中' idToken: res.accounts[0].idToken,
}); loginType: 'ystoken'
uni.showToast({ }
title: '登录异常', this.goLogin(parmasObj, false)
icon: 'none', }else{
duration: 1500 uni.showLoading({
}); title: '加载中'
console.log(res.errorNumber - 0 === 0,'非') });
return uni.showToast({
} title: '登录异常',
icon: 'none',
}catch(e){ duration: 1500
//TODO handle the exception });
} console.log(res.errorNumber - 0 === 0,'非')
}, return
// 登录 }
loginBtn(){
const parmas = { }catch(e){
username: this.account, //TODO handle the exception
password: this.password, }
loginType: 'App' },
} // 登录
this.goLogin(parmas) loginBtn(){
}, const parmas = {
async goLogin(parmas,isValidate = true) { username: this.account,
if (this.loginType === 'phone') { password: this.password,
uni.navigateTo({ loginType: 'App'
url: `/pages/forgetpassword/get-captcha?phone=${this.phone}&loginType=${this.loginType}` }
}); this.goLogin(parmas)
} else { },
const ispass = isValidate ? await this.validate() : true; async goLogin(parmas,isValidate = true) {
if (!ispass) return; if (this.loginType === 'phone') {
const res = await apiLogin(parmas) uni.navigateTo({
if (res.status === 1) { url: `/pages/forgetpassword/get-captcha?phone=${this.phone}&loginType=${this.loginType}`
//缓存账号和密码 });
if (this.rememberPsw) { } else {
uni.setStorageSync('password', this.password); const ispass = isValidate ? await this.validate() : true;
} else { if (!ispass) return;
uni.removeStorageSync('password'); const res = await apiLogin(parmas)
} if (res.status === 1) {
if(this.rememberAt){ //缓存账号和密码
uni.setStorageSync('username', this.account); if (this.rememberPsw) {
} else { uni.setStorageSync('password', this.password);
uni.removeStorageSync('username'); } else {
} uni.removeStorageSync('password');
// uni.setStorageSync('username', this.account); }
// uni.setStorageSync('password', this.password); if(this.rememberAt){
this.$uStore({ uni.setStorageSync('username', this.account);
name: 'userInfo', } else {
value: { uni.removeStorageSync('username');
...res.data.operator }
} // uni.setStorageSync('username', this.account);
}); // uni.setStorageSync('password', this.password);
this.$uStore({ this.$uStore({
name: 'userBpData', name: 'userInfo',
value: { value: {
...res.data.userBpData ...res.data.operator
} }
}); });
this.$uStore({ this.$uStore({
name: 'vuex_token', name: 'userBpData',
value: res.data.token value: {
}); ...res.data.userBpData
uni.switchTab({ }
url: '/pages/home/home' });
}); this.$uStore({
} name: 'vuex_token',
value: res.data.token
} });
}, uni.switchTab({
fnChangeLogin() { url: '/pages/home/home'
if (this.loginType === 'phone') { });
this.loginType = 'password' }
this.disabled = false
} else { }
this.loginType = 'phone' },
this.disabled = true fnChangeLogin() {
} if (this.loginType === 'phone') {
this.loginType = 'password'
}, this.disabled = false
// 校验input } else {
validate() { this.loginType = 'phone'
return new Promise((resolve, reject) => { this.disabled = true
let flag = true; }
if (this.account == "") {
flag = false; },
uni.showToast({ // 校验input
title: '输入账户不规范', validate() {
icon: 'none', return new Promise((resolve, reject) => {
duration: 1500 let flag = true;
}); if (this.account == "") {
} else if (this.password == '') { flag = false;
flag = false; uni.showToast({
uni.showToast({ title: '输入账户不规范',
title: '输入密码不规范', icon: 'none',
icon: 'none', duration: 1500
duration: 1500 });
}); } else if (this.password == '') {
} flag = false;
uni.showToast({
resolve(flag); title: '输入密码不规范',
}) icon: 'none',
}, duration: 1500
...mapMutations(["$uStore"]), });
} }
}
</script> resolve(flag);
})
<style lang="scss" scoped> },
.mui-checkbox input[type='checkbox']:checked:before { ...mapMutations(["$uStore"]),
color: #00bbb1; }
} }
.login { </script>
display: flex;
flex-direction: column; <style lang="scss" scoped>
padding: 0 40rpx; .mui-checkbox input[type='checkbox']:checked:before {
} color: #00bbb1;
}
.top { .login {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; padding: 0 40rpx;
justify-content: center; }
}
.top {
.icon-logo { display: flex;
width: 128rpx; flex-direction: column;
height: 128rpx; align-items: center;
margin: 88rpx 0 48rpx; justify-content: center;
} }
.title { .icon-logo {
font-size: 20px; width: 128rpx;
color: $text-base-color; height: 128rpx;
} margin: 88rpx 0 48rpx;
}
.middle {
display: flex; .title {
flex-direction: column; font-size: 20px;
margin: 100rpx 0 26rpx; color: $text-base-color;
} }
.placeholder-text { .middle {
font-size: 34rpx; display: flex;
color: $wly-palcehold-color; flex-direction: column;
} margin: 100rpx 0 26rpx;
}
.account {
flex: 1; .placeholder-text {
color: $text-base-color; font-size: 34rpx;
height: 100rpx; color: $wly-palcehold-color;
border-bottom: 1px solid #cfcfcf; }
padding-left: 12rpx;
} .account {
flex: 1;
.password { color: $text-base-color;
flex: 1; height: 100rpx;
color: $text-base-color; border-bottom: 1px solid #cfcfcf;
height: 100rpx; padding-left: 12rpx;
border-bottom: 1px solid #cfcfcf; }
padding-left: 12rpx;
} .password {
flex: 1;
.password-block { color: $text-base-color;
position: relative; height: 100rpx;
height: 100rpx; border-bottom: 1px solid #cfcfcf;
} padding-left: 12rpx;
}
.icon-visible {
position: absolute; .password-block {
right: 24rpx; position: relative;
top: 50rpx; height: 100rpx;
z-index: 10; }
width: 21px;
height: 14px; .icon-visible {
margin-top: -7px; position: absolute;
} right: 24rpx;
top: 50rpx;
.bottom { z-index: 10;
display: flex; width: 21px;
flex-direction: column; height: 14px;
} margin-top: -7px;
}
.btn {
height: 92rpx; .bottom {
background: $wly-primary-color; display: flex;
border-radius: 46rpx; flex-direction: column;
} }
.btn-disabled { .btn {
background: rgba(255, 29, 50, 0.50) !important; height: 92rpx;
color: #fff !important; background: $wly-primary-color;
} border-radius: 46rpx;
}
.btn-text {
color: #fff; .btn-disabled {
font-size: 34rpx; background: rgba(255, 29, 50, 0.50) !important;
} color: #fff !important;
}
.actions {
margin-top: 36rpx; .btn-text {
justify-content: space-between; color: #fff;
} font-size: 34rpx;
}
.forgetpassword-btn {
font-size: 28rpx; .actions {
color: $wly-palcehold-color; margin-top: 36rpx;
} justify-content: space-between;
}
.phone-btn {
font-size: 28rpx; .forgetpassword-btn {
color: #666660; font-size: 28rpx;
} color: $wly-palcehold-color;
.remember-all{ }
margin-bottom: 28rpx;
} .phone-btn {
.remember-num{ font-size: 28rpx;
margin-right: 60rpx; color: #666660;
} }
.remember-check{ .remember-all{
margin-right: 10rpx; margin-bottom: 28rpx;
} }
.remember-pass { .remember-num{
color: #adadad; margin-right: 60rpx;
margin-top: 8rpx; }
font-size: 32rpx; .remember-check{
} margin-right: 10rpx;
/deep/ .uni-checkbox-input{ }
width: 40rpx; .remember-pass {
height: 40rpx; color: #adadad;
} margin-top: 8rpx;
</style> font-size: 32rpx;
}
/deep/ .uni-checkbox-input{
width: 40rpx;
height: 40rpx;
}
</style>
pages/my-order/my-order.nvue
View file @ a26b8b53
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
}, },
mainHeight() { mainHeight() {
return { return {
'height': `${this.sysinfo.safeArea.height - 44 }px`, 'height': `${this.sysinfo.safeArea.height - 30 }px`,
} }
}, },
scrollHeight() { scrollHeight() {
......
pages/order-trends/order-trends.nvue
View file @ a26b8b53
<template> <template>
<view class="lists"> <view class="lists">
<view class="status_bar" :style="navHeight"></view> <view class="status_bar" :style="navHeight"></view>
<view class="header-bg"> <!-- <view class="header-bg">
<image class="header-bg-img" src="@/static/image/nav_bg@3x.png" mode="scaleToFill"></image> <image class="header-bg-img" src="@/static/image/nav_bg@3x.png" mode="scaleToFill"></image>
</view> </view> -->
<view class="main"> <view class="main" :style="mainHeight">
<view class="middle view"> <view class="middle view planout-block-item">
<view class="text-block"> <view class="text-block">
<text class="middle-date">全部订单</text> <text class="middle-date">全部订单</text>
<view class="middle-date-des uni-list picker-year"> <view class="middle-date-des uni-list picker-year">
...@@ -13,9 +13,7 @@ ...@@ -13,9 +13,7 @@
<view class="uni-list-cell-db"> <view class="uni-list-cell-db">
<picker class="picker-block" @change="bindPickerTypesChange($event,'type')" range-key='name' <picker class="picker-block" @change="bindPickerTypesChange($event,'type')" range-key='name'
mode="selector" :value="condition.PROCESS_TYPE_VIEW" :range="salePlanArr"> mode="selector" :value="condition.PROCESS_TYPE_VIEW" :range="salePlanArr">
<view class="uni-input"> <text class="uni-input-text">{{condition.PROCESS_TYPE_VIEW}}</text>
{{condition.PROCESS_TYPE_VIEW}}
</view>
</picker> </picker>
</view> </view>
</view> </view>
...@@ -29,9 +27,7 @@ ...@@ -29,9 +27,7 @@
<view class="uni-list-cell-db"> <view class="uni-list-cell-db">
<picker class="picker-block" @change="bindPickerTypesChange($event,'status')" range-key='name' <picker class="picker-block" @change="bindPickerTypesChange($event,'status')" range-key='name'
mode="selector" :value="condition.ESTAT_VIEW" :range="saleStatusArr"> mode="selector" :value="condition.ESTAT_VIEW" :range="saleStatusArr">
<view class="uni-input"> <text class="uni-input-text">{{condition.ESTAT_VIEW}}</text>
{{condition.ESTAT_VIEW}}
</view>
</picker> </picker>
</view> </view>
</view> </view>
...@@ -45,7 +41,7 @@ ...@@ -45,7 +41,7 @@
<view class="uni-list-cell-db"> <view class="uni-list-cell-db">
<picker class="picker-block" @change="bindPickerYearStartChange" mode="date" <picker class="picker-block" @change="bindPickerYearStartChange" mode="date"
:value="condition.POSTING_DATE" fields='day'> :value="condition.POSTING_DATE" fields='day'>
<text class="uni-input">{{condition.POSTING_DATE}}</text> <text class="uni-input-text">{{condition.POSTING_DATE}}</text>
</picker> </picker>
</view> </view>
</view> </view>
...@@ -62,30 +58,47 @@ ...@@ -62,30 +58,47 @@
<text class="btn-text">查询</text> <text class="btn-text">查询</text>
</button> </button>
</view> </view>
<scroll-view :style='scrollHeight' class="scroll-area" scroll-y="true" lower-threshold='150' <!-- <scroll-view class="scroll-area" scroll-y="true" lower-threshold='150'
@scrolltolower='scrolltolower'> @scrolltolower='scrolltolower'> -->
<list class="scroll-area view" loadmoreoffset='100' show-scrollbar='false' @loadmore="scrolltolower"> <list ref="list" class="scroll-area view" loadmoreoffset='100' @loadmore="scrolltolower"
<cell class="list-cell" v-for="(item,index) in lists" :key='index'> :show-scrollbar='false'>
<view class="middle view planout-block-item"> <refresh @refresh="refresh" :display="refreshing ? 'show' : 'hide'">
<view class="text-block"> <!-- <loading-indicator></loading-indicator> -->
<text class="middle-date">{{item.OBJECT_ID}}</text> </refresh>
<text class="middle-pro-des">{{item.DESCRIPTION}}</text> <cell class="" v-for="(item,index) in lists" :key='index'>
<view class="scroll-item block-detal">
<view class="block-detal-item">
<text class="detal-item-label">创建日期</text>
<text class="detal-item-value">{{item.postingDate}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">{{item.objectId}}</text>
<text class="middle-pro-des">{{item.description}}</text>
</view> </view>
<view class="text-block"> <view class="block-detal-item">
<text class="middle-date">制票通知单</text> <text class="detal-item-label">制票通知单</text>
<text class="middle-date-des">{{item.ZZFLD000007}}/{{item.ZZFLD000009}}</text> <text class="detal-item-value">{{item.zzfld000007}}/{{item.zzfld000009}}</text>
</view> </view>
<view class="text-block"> <view class="block-detal-item">
<text class="middle-date">发货</text> <text class="detal-item-label">本单可发货量(件)</text>
<text class="middle-date-des">{{item.ZDELIVER}}/{{item.ZZFLD000007}}</text> <text class="detal-item-value">{{item.zzfld000007}}</text>
</view>
<view class="block-detal-item block-detal-item-last">
<text class="detal-item-label">已发货(件)</text>
<text class="detal-item-value">{{item.zdeliver}}</text>
</view> </view>
</view> </view>
<view class="empty-block"></view> <view class="empty-block"></view>
<!-- </scroll-view> -->
</cell> </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> </list>
</scroll-view> <!-- </scroll-view> -->
<no-data v-if="lists.length === 0"></no-data>
</view> </view>
</view> </view>
</template> </template>
...@@ -102,14 +115,16 @@ ...@@ -102,14 +115,16 @@
querySysDictionaryDetailsByCode, querySysDictionaryDetailsByCode,
} from '@/servers/purchaseList.js' } from '@/servers/purchaseList.js'
import { import {
querySaleOrder querySaleOrder,
findAppWantGoods
} from '@/servers/breakwords.js' } from '@/servers/breakwords.js'
import timeFormat from '@/uview-ui/libs/function/timeFormat.js' import noData from '@/components/nodata.nvue';
import orderItem from './order-item.nvue';
export default { export default {
data() { data() {
return { return {
refreshing: false,
isOpened: 'none', isOpened: 'none',
loadingText: '加载中...', loadingText: '加载中...',
condition: { condition: {
...@@ -151,6 +166,9 @@ ...@@ -151,6 +166,9 @@
saleStatusArr: [], saleStatusArr: [],
} }
}, },
components: {
noData,
},
computed: { computed: {
...mapState(['sysinfo', 'userInfo']), ...mapState(['sysinfo', 'userInfo']),
navHeight() { navHeight() {
...@@ -158,86 +176,75 @@ ...@@ -158,86 +176,75 @@
'height': `${this.sysinfo.safeArea.top + 44}px` 'height': `${this.sysinfo.safeArea.top + 44}px`
} }
}, },
scrollHeight() { mainHeight() {
return { return {
'height': `${this.sysinfo.safeArea.height - 297- 44 - 20 -40}px` 'height': `${this.sysinfo.safeArea.height - 44 }px`,
} }
}, },
mainHeight() { scrollHeight() {
return { return {
'height': `${this.sysinfo.safeArea.height - 44 }px`, 'height': `${this.sysinfo.safeArea.height - 44 - 156 }px`
} }
}, },
}, },
onNavigationBarButtonTap(e) { // onPullDownRefresh() {
// console.log('onNavigationBarButtonTap：', e, this.isOpened, this.selectedSalePlan); // console.log('refresh');
// if (this.isOpened === 'left' && this.selectedSalePlan && this.selectedSalePlan.PLAN_NUMBER) { // this.reset()
// uni.$emit('selectedSalePlan', { // this.getSalesPlan(true)
// selectedSalePlan: this.selectedSalePlan, // setTimeout(function() {
// index: this.toPageParams.index // uni.stopPullDownRefresh();
// }) // }, 600);
// uni.navigateBack() // },
// return
// }
// this.isOpened = this.isOpened === 'none' ? 'left' : 'none';
// #ifdef APP-PLUS
// let pages = getCurrentPages()
// let page = pages[pages.length - 1]
// let webView = page.$getAppWebview();
// console.log('webView', webView)
// webView.setTitleNViewButtonStyle(0, {
// text: this.isOpened === 'none' ? '选择' : '完成',
// });
// let titleObj = webView.getStyle().titleNView;
// if(!titleObj.buttons){
// returnl
// }
// titleObj.buttons[0].text = 'dd';
// webView.setStyle({
// titleNView:titleObj
// })
// #endif
},
onLoad(option) {
console.log('select-saleplan', option)
if (option && option.from) {
const {
from,
product,
head
} = option
this.toPageParams.product = JSON.parse(product)
this.toPageParams.page = from
this.toPageParams.head = JSON.parse(head)
}
},
onPullDownRefresh() {
console.log('refresh');
this.reset()
this.getSalesPlan(true)
setTimeout(function() {
uni.stopPullDownRefresh();
}, 600);
},
created() { created() {
// this.condition.GJAHR = timeFormat(new Date(), 'yyyy')
// this.condition.MONAT = timeFormat(new Date(), 'mm')
this.reset() this.reset()
this.getSalesPlan(true); this.getSalesPlan(true)
this.getSelectDictDataOrigin('A0043') this.getSelectDictDataOrigin('A0043')
this.getSelectDictDataOrigin('A0041') this.getSelectDictDataOrigin('A0041')
}, },
methods: { methods: {
search() {
this.reset()
this.getSalesPlan(true)
},
bindPickerYearStartChange(e) {
console.log('picker发送选择改变，携带值为', e.detail.value)
this.condition.POSTING_DATE = e.detail.value
},
bindPickerTypesChange(e, type) {
console.log('picker发送选择改变，携带值为', e.detail.value)
const index = e.detail.value || 0
switch (type){
case 'type':
this.condition.PROCESS_TYPE = this.salePlanArr[index].value
this.condition.PROCESS_TYPE_VIEW = this.salePlanArr[index].name
break;
case 'status':
this.condition.ESTAT = this.saleStatusArr[index].value
this.condition.ESTAT_VIEW = this.saleStatusArr[index].name
break;
default:
break;
}
},
getSelectDictDataOrigin(dictcode) { getSelectDictDataOrigin(dictcode) {
querySysDictionaryDetailsByCode({'code': dictcode}) querySysDictionaryDetailsByCode({'code': dictcode})
.then(res => { .then(res => {
if(res.data.Rows.length>0){ if(res.data.Rows.length>0){
switch (dictcode){ switch (dictcode){
case 'A0043': case 'A0043':
this.salePlanArr = res.data.Rows const arr1 = {
name: "全部订单",
value: "",
}
this.salePlanArr = [arr1, ...res.data.Rows]
break; break;
case 'A0041': case 'A0041':
this.saleStatusArr = res.data.Rows const arr2 = {
name: "全部状态",
value: "",
}
this.saleStatusArr = [arr2, ...res.data.Rows]
break; break;
default: default:
break; break;
...@@ -246,11 +253,10 @@ ...@@ -246,11 +253,10 @@
}) })
.catch(() => {}) .catch(() => {})
}, },
bindPickerYearStartChange(e) {
console.log('picker发送选择改变，携带值为', e.detail.value)
this.condition.POSTING_DATE = e.detail.value
},
async getSalesPlan(isRefresh) { async getSalesPlan(isRefresh) {
if (isRefresh) {
this.page.PAGE = 1
}
if (this.loadParams.isDone) { if (this.loadParams.isDone) {
return return
} }
...@@ -261,29 +267,55 @@ ...@@ -261,29 +267,55 @@
POSTING_DATE POSTING_DATE
} = this.condition } = this.condition
const params = { const params = {
'$filter':"PARTNER eq '"+this.userInfo.code+"'"+ pagesize: this.page.PAGESIZE,
" and PROCESS_TYPE eq '" + PROCESS_TYPE+"'"+ page: this.page.PAGE,
" and ESTAT eq '" + ESTAT+"'"+ partner: this.userInfo.code,
" and OBJECT_ID eq '" + OBJECT_ID+"'"+ processType: PROCESS_TYPE,
"and POSTING_DATE eq '" + POSTING_DATE+"'", estat: ESTAT,
'$skip':0, objectId: OBJECT_ID,
'$top':50, postingDate: POSTING_DATE
} }
uni.showLoading({ uni.showLoading({
title: '加载中' title: '加载中'
}); });
setTimeout(function() { setTimeout(function() {
uni.hideLoading(); uni.hideLoading();
}, 2000); }, 2000);
try{ const res = await findAppWantGoods(params)
const res = await querySaleOrder(params) uni.hideLoading();
uni.hideLoading();
const {
Rows,
page,
Total
} = res.data
this.page.PAGE = page * 1
this.loadParams.total = Total * 1
this.loadParams.totalPage = Math.ceil(Total * 1 / this.page.PAGESIZE * 1)
if (isRefresh) {
this.lists = Rows
this.loadParams.isDone = false this.loadParams.isDone = false
this.lists = res.d.results } else {
}catch(e){ this.lists = this.lists.concat(Rows)
//TODO handle the exception
} }
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() { scrolltolower() {
console.log('onReachBottom'); console.log('onReachBottom');
...@@ -306,59 +338,7 @@ ...@@ -306,59 +338,7 @@
this.lists = [] this.lists = []
this.loadingText = '加载中' this.loadingText = '加载中'
}, },
search() {
this.reset()
this.getSalesPlan(true);
},
bindPickerTypesChange(e, type) {
console.log('picker发送选择改变，携带值为', e.detail.value)
const index = e.detail.value || 0
switch (type){
case 'type':
this.condition.PROCESS_TYPE = this.salePlanArr[index].value
this.condition.PROCESS_TYPE_VIEW = this.salePlanArr[index].name
break;
case 'status':
this.condition.ESTAT = this.saleStatusArr[index].value
this.condition.ESTAT_VIEW = this.saleStatusArr[index].name
break;
default:
break;
}
},
bindPickerYearChange(e) {
console.log('picker发送选择改变，携带值为', e.detail.value)
this.condition.GJAHR = e.detail.value
},
handleChecked(e, item, index) {
console.log('当前索引：', e, index);
this.lists.forEach((cur) => {
if (cur.PLAN_NUMBER === item.PLAN_NUMBER) {
cur.checked = !cur.checked
} else {
cur.checked = false
}
})
if (item.checked === true) {
this.selectedSalePlan = item
if (this.selectedSalePlan && this.selectedSalePlan.PLAN_NUMBER) {
uni.$emit('selectedSalePlan', {
selectedSalePlan: this.selectedSalePlan,
index: this.toPageParams.index
})
uni.navigateBack()
}
} else {
// const selectIndex = this.selectedSalePlan.findIndex((saleplan)=>{
// return saleplan.id === item.id
// })
// this.selectedSalePlan.splice(selectIndex,1)
this.selectedSalePlan = {}
}
},
} }
} }
</script> </script>
...@@ -370,9 +350,9 @@ ...@@ -370,9 +350,9 @@
.header-bg { .header-bg {
height: 284rpx; height: 284rpx;
opacity: 0.72;
margin-top: -88rpx; margin-top: -88rpx;
} }
.header-bg-img { .header-bg-img {
width: 750rpx; width: 750rpx;
} }
...@@ -380,26 +360,30 @@ ...@@ -380,26 +360,30 @@
.lists { .lists {
position: relative; position: relative;
flex-direction: column; flex-direction: column;
overflow-y: scroll;
background: #f0f4f5; background: #f0f4f5;
overflow-x: hidden; flex: 1;
} }
.main { .main {
position: relative; position: relative;
flex-direction: column; flex-direction: column;
margin-top: -164rpx;
padding: 0 16rpx; padding: 0 16rpx;
// padding-top: 40rpx;
// background-color: #fff;
}
.scroll-area {
overflow-y: scroll;
background: #f0f4f5;
} }
.middle { .middle {
background-color: #fff; background-color: #fff;
border-radius: 16rpx; border-radius: 16rpx;
padding: 32rpx 64rpx 32rpx 48rpx; padding: 0rpx 64rpx 0rpx 48rpx;
} }
.text-block { .text-block {
display: flex;
overflow: hidden; overflow: hidden;
height: 96rpx; height: 96rpx;
margin-bottom: 14rpx; margin-bottom: 14rpx;
...@@ -420,53 +404,46 @@ ...@@ -420,53 +404,46 @@
} }
.middle-date-des { .middle-date-des {
flex: 2; flex: 3;
font-size: 28rpx; font-size: 28rpx;
line-height: 96rpx; line-height: 96rpx;
height: 96rpx; height: 96rpx;
white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
color: #888; color: #888;
} }
.middle-pro-des {
display: flex;
flex: 2;
font-size: 28rpx;
// height: 96rpx;
color: #888;
margin-top: 10rpx;
align-items: center;
}
.middle-date-select {
color: #888;
}
.middle-date-des-select {
color: #333;
}
.picker-year { .picker-year {
position: relative; position: relative;
border-radius: 4px; border-radius: 4px;
align-items: center; align-items: center;
line-height: normal;
} }
.uni-list-cell { .uni-list-cell {
flex: 1; flex: 1;
height: 96rpx;
line-height: 96rpx;
} }
.uni-list-cell-db { .uni-list-cell-db {
flex: 1; flex: 1;
height: 48px;
line-height: 48px;
} }
.picker-block { .picker-block {
flex: 1; flex: 1;
} }
.uni-input-text {
height: 96rpx;
line-height: 96rpx;
font-size: 14px;
color: #888;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
.icon-arrow { .icon-arrow {
position: absolute; position: absolute;
right: 0; right: 0;
...@@ -476,60 +453,119 @@ ...@@ -476,60 +453,119 @@
z-index: 10; z-index: 10;
} }
.scroll-area {
overflow-y: scroll;
}
.planout-block-lists { .planout-block-lists {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.uni-swipe { .planout-block-item {
// margin: 32rpx 0;
}
.scroll-item {
flex: 1; flex: 1;
margin-bottom: 26rpx; display: flex;
flex-direction: column;
// margin-bottom: 32rpx;
background-color: #fff;
border-radius: 16rpx;
// padding: 32rpx 64rpx 40rpx 48rpx;
} }
/deep/ .uni-swipe_box { .planout-block-item__last {
height: 40px;
}
.item-block {
overflow: hidden;
}
.item-block-label {
font-size: 24rpx;
color: #333;
}
.item-block__label {
flex: 1; flex: 1;
text-align: left;
font-size: 32rpx;
color: #333;
font-weight: 500;
overflow: hidden;
text-overflow: ellipsis;
} }
.swipe-right-block { .item-block-code {
display: flex; padding-bottom: 16rpx;
width: 100rpx;
justify-content: center;
align-items: center;
} }
.swipe-right-block__text { .item-block-name {
display: inline-block; padding-top: 24rpx;
width: 52rpx; padding-bottom: 32rpx;
height: 52rpx;
border-radius: 50%;
background-color: #fff;
} }
.swipe-right-block__active { .item-block-label-des {
width: 52rpx; flex: 1;
height: 52rpx; text-align: left;
border-radius: 50%; font-size: 28rpx;
background-color: $wly-primary-color; color: #333;
}
.item-block-right-des {
flex: 1;
text-align: right;
font-size: 28rpx;
color: #333;
} }
.planout-block { .block-detal {
display: flex; display: flex;
justify-content: space-between; flex-direction: column;
margin-top: 30rpx; background: #f8f8f8;
margin-bottom: 30rpx; border-radius: 20rpx;
padding: 0 24rpx; padding: 0 20rpx;
margin-top: 32rpx;
} }
.planout-block-item { .block-detal-item {
flex: 1; display: flex;
width: 750rpx; overflow: hidden;
margin-bottom: 26rpx; height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
} }
.block-detal-item-last {
margin-bottom: 0;
border-bottom: 0;
}
.detal-item-label {
flex: 2;
font-size: 28rpx;
line-height: 96rpx;
color: #333;
margin-bottom: 8rpx;
}
.detal-item-value {
flex: 2;
font-size: 28rpx;
line-height: 96rpx;
height: 96rpx;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
color: #888;
}
.middle-pro-des {
display: flex;
flex: 2;
font-size: 28rpx;
// height: 96rpx;
color: #888;
margin-top: 10rpx;
align-items: center;
}
.btn { .btn {
flex: 1; flex: 1;
height: 92rpx; height: 92rpx;
...@@ -555,4 +591,57 @@ ...@@ -555,4 +591,57 @@
font-size: 12px; font-size: 12px;
color: #999; color: #999;
} }
.navs-block {
flex-direction: column;
background-color: #fff;
padding-top: 40rpx;
}
.navs-tab {
display: flex;
flex: 1;
align-items: center;
height: 60rpx;
border-bottom: 1px solid #F4F5F6;
padding-bottom: 8rpx;
}
.navs-tab-item {
display: flex;
justify-content: center;
flex: 1;
align-items: center;
height: 50rpx;
overflow: hidden;
}
.search-type-text {
color: #333;
font-size: 28rpx;
}
.icon-arrow-down {
width: 6px;
height: 4px;
margin-left: 16rpx;
}
.planout-block {
display: flex;
justify-content: space-between;
margin-top: 30rpx;
margin-bottom: 30rpx;
padding: 0 24rpx;
}
.btn {
flex: 1;
height: 92rpx;
background: $wly-primary-color;
border-radius: 46rpx;
}
.btn-text {
color: #fff;
font-size: 34rpx;
}
</style> </style>
pages/purchase-main/purchase-main.nvue
View file @ a26b8b53
...@@ -23,15 +23,15 @@ ...@@ -23,15 +23,15 @@
</view> </view>
<view class="text-block"> <view class="text-block">
<text class="middle-date">制票类型</text> <text class="middle-date">制票类型</text>
<text class="middle-date-des">{{orderItem.noticeSheetTypeTextView}}</text> <text class="middle-date-margin-des">{{orderItem.noticeSheetTypeTextView}}</text>
</view> </view>
<view class="text-block"> <view class="text-block">
<text class="middle-date">开票客户</text> <text class="middle-date">开票客户</text>
<text class="middle-date-des">{{orderItem.billCustomer}}</text> <text class="middle-date-margin-des">{{orderItem.billCustomer}}</text>
</view> </view>
<view class="text-block"> <view class="text-block">
<text class="middle-date" @tap="selectClient">订单客户</text> <text class="middle-date" @tap="selectClient">订单客户</text>
<text class="middle-date-des">{{orderItem.customerName}}</text> <text class="middle-date-margin-des">{{orderItem.customerName}}</text>
</view> </view>
<view class="text-block"> <view class="text-block">
<text class="middle-date">渠道类型</text> <text class="middle-date">渠道类型</text>
...@@ -433,7 +433,7 @@ ...@@ -433,7 +433,7 @@
.text-block { .text-block {
overflow: hidden; overflow: hidden;
height: 96rpx; // height: 96rpx;
// margin-bottom: 14rpx; // margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6; border-bottom: 1px solid #f4f5f6;
} }
...@@ -455,10 +455,19 @@ ...@@ -455,10 +455,19 @@
flex: 3; flex: 3;
font-size: 28rpx; font-size: 28rpx;
height: 96rpx; height: 96rpx;
color: $text-base-color;
padding-top: 30rpx; padding-top: 30rpx;
justify-content: start; justify-content: start;
} }
.middle-date-margin-des{
flex: 3;
font-size: 28rpx;
color: $text-base-color;
padding-top: 30rpx;
margin-bottom: 20rpx;
width: 200%;
text-align: left;
justify-content: end;
}
.picker-year { .picker-year {
position: relative; position: relative;
...@@ -535,4 +544,5 @@ ...@@ -535,4 +544,5 @@
line-height: 96rpx; line-height: 96rpx;
color: $text-base-color; color: $text-base-color;
} }
</style> </style>
pages/purchase-plan-detail/purchase-plan-detail.vue
View file @ a26b8b53
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<view class="middle view"> <view class="middle view">
<view class="text-block"> <view class="text-block">
<text class="middle-date">存货分类</text> <text class="middle-date">存货分类</text>
<view class="middle-date-des uni-list picker-year"> <view class="middle-date-pro uni-list picker-year">
<view class="uni-list-cell"> <view class="uni-list-cell">
<view class="uni-list-cell-db"> <view class="uni-list-cell-db">
<text class="uni-input">{{clueDetail.wlybrand_text}}</text> <text class="uni-input">{{clueDetail.wlybrand_text}}</text>
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</view> </view>
<view class="text-block"> <view class="text-block">
<text class="middle-date">客户名称</text> <text class="middle-date">客户名称</text>
<view class="middle-date-des uni-list picker-year"> <view class="middle-date-pro uni-list picker-year">
<view class="uni-list-cell"> <view class="uni-list-cell">
<view class="uni-list-cell-db"> <view class="uni-list-cell-db">
<text class="uni-input">{{clueDetail.cust_name}}</text> <text class="uni-input">{{clueDetail.cust_name}}</text>
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
</view> </view>
<view class="text-block"> <view class="text-block">
<text class="middle-date">计划类型</text> <text class="middle-date">计划类型</text>
<view class="middle-date-des uni-list picker-year"> <view class="middle-date-pro uni-list picker-year">
<view class="uni-list-cell"> <view class="uni-list-cell">
<view class="uni-list-cell-db"> <view class="uni-list-cell-db">
<text class="uni-input">{{clueDetail.plan_type_text}}</text> <text class="uni-input">{{clueDetail.plan_type_text}}</text>
...@@ -266,7 +266,7 @@ ...@@ -266,7 +266,7 @@
.text-block { .text-block {
display: flex; display: flex;
overflow: hidden; overflow: hidden;
height: 96rpx; // height: 96rpx;
border-bottom: 1px solid #f4f5f6; border-bottom: 1px solid #f4f5f6;
} }
...@@ -289,12 +289,22 @@ ...@@ -289,12 +289,22 @@
.middle-date-des { .middle-date-des {
align-items: center; align-items: center;
flex: 5.5; flex: 3;
font-size: 24rpx; font-size: 24rpx;
color: $text-base-color; color: $text-base-color;
height: 96rpx; height: 96rpx;
line-height: 96rpx; line-height: 96rpx;
} }
.middle-date-pro {
align-items: center;
flex: 3;
font-size: 24rpx;
color: $text-base-color;
// height: 96rpx;
// line-height: 96rpx;
display: flex;
margin-top: 30rpx;
}
.uni-input-placeholder { .uni-input-placeholder {
color: #DBDBDB; color: #DBDBDB;
......
pages/purchase-receive/purchase-receive.nvue
View file @ a26b8b53
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
<view class="uni-list-cell-db"> <view class="uni-list-cell-db">
<picker class="picker-block" @change="bindPickerChange($event,'receive')" :value="orderItem.receiveUnitName" <picker class="picker-block" @change="bindPickerChange($event,'receive')" :value="orderItem.receiveUnitName"
range-key='PARTNER_NAME' mode="selector" :range="receiveUnitArr"> range-key='PARTNER_NAME' mode="selector" :range="receiveUnitArr">
<text class="middle-date-address-text">{{orderItem.receiveUnitName}}</text> <text class="middle-date-margin-des">{{orderItem.receiveUnitName}}</text>
</picker> </picker>
</view> </view>
</view> </view>
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
<view class="middle-date-des-unit uni-list picker-year"> <view class="middle-date-des-unit uni-list picker-year">
<view class="uni-list-cell"> <view class="uni-list-cell">
<view class="uni-list-cell-db"> <view class="uni-list-cell-db">
<text class="middle-date-address-text">{{orderItem.spurtCodeUnitName}}</text> <text class="middle-date-margin-des">{{orderItem.spurtCodeUnitName}}</text>
</view> </view>
</view> </view>
<!-- <image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode=""></image> --> <!-- <image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode=""></image> -->
...@@ -589,6 +589,16 @@ ...@@ -589,6 +589,16 @@
line-height: 34rpx; line-height: 34rpx;
align-items: center; align-items: center;
} }
.middle-date-margin-des{
flex: 1;
font-size: 28rpx;
color: #333;
margin-top: 0rpx;
margin-bottom: 20rpx;
width: 200%;
text-align: left;
justify-content: end;
}
.picker-year { .picker-year {
position: relative; position: relative;
align-items: center; align-items: center;
......
servers/api.helper.js
View file @ a26b8b53
...@@ -183,7 +183,7 @@ class Request { ...@@ -183,7 +183,7 @@ class Request {
if (config.url.indexOf('crm-app') !== -1) { if (config.url.indexOf('crm-app') !== -1) {
// config.baseUrl = 'http://10.0.135.61' // config.baseUrl = 'https://crm.wuliangye.com.cn'
config.baseUrl = 'http://221.10.127.60:5000' config.baseUrl = 'http://221.10.127.60:5000'
} else if (config.url.indexOf('adapter') !== -1) { } else if (config.url.indexOf('adapter') !== -1) {
// config.baseUrl = 'http://api.c0331.dev.guanyingyun.com' // config.baseUrl = 'http://api.c0331.dev.guanyingyun.com'
...@@ -197,6 +197,7 @@ class Request { ...@@ -197,6 +197,7 @@ class Request {
config.baseUrl = 'http://221.10.127.60:5000/gateway/zdcx' config.baseUrl = 'http://221.10.127.60:5000/gateway/zdcx'
} else if (config.url.indexOf('uusafe') !== -1) { } else if (config.url.indexOf('uusafe') !== -1) {
config.baseUrl = 'https://zzy.ipincloud.cn:9070' config.baseUrl = 'https://zzy.ipincloud.cn:9070'
// config.baseUrl = 'https://apps.wuliangye.com.cn:9076'
} else { } else {
// http://10.0.134.182:8000 // http://10.0.134.182:8000
config.baseUrl = 'http://221.10.127.60:5000/wlySap' config.baseUrl = 'http://221.10.127.60:5000/wlySap'
......
servers/breakwords.js
View file @ a26b8b53
...@@ -231,3 +231,12 @@ export async function queryNewsListSet(params) { ...@@ -231,3 +231,12 @@ export async function queryNewsListSet(params) {
const res = await apiHelper.get('/sap/opu/odata/sap/ZODATA_APP_006_SRV/SODYNSTATSet', params, {'Content-Type': 'application/json','Accept':'application/json'}) const res = await apiHelper.get('/sap/opu/odata/sap/ZODATA_APP_006_SRV/SODYNSTATSet', params, {'Content-Type': 'application/json','Accept':'application/json'})
return res return res
} }
/**
* 最终订单动态
* @returns {Promise<AxiosResponse<T>>}
*/
export async function findAppWantGoods(params) {
const res = await apiHelper.post('/crm-app/Invinfo/findAppWantGoods', params, {
})
return res
}
\ 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