Skip to content

梁建民 / scmMiniprogram

Go to a project
Commit 4b80da3f by liangjianmin
Options

bug

parent 9b2a5027
Inline Side-by-side
Showing with 122 additions and 57 deletions
assets/css/payment/index.scss
.payment-index { .payment-index {
.search-box { .search-box {
border-top: 1px solid #cad9e0; border-top: 1px solid #cad9e0;
padding: 0 24rpx;
height: 100rpx; height: 100rpx;
background: #ffffff; background: #ffffff;
.box { .box {
height: 60rpx; height: 60rpx;
position: relative; position: relative;
flex: 0 0 50%;
.iconfont { .iconfont {
position: absolute; position: absolute;
right: 49rpx; right: 49rpx;
...@@ -18,13 +16,18 @@ ...@@ -18,13 +16,18 @@
.uni-input { .uni-input {
font-size: 26rpx; font-size: 26rpx;
&:-webkit-input-placeholder { &:-webkit-input-placeholder {
color: #404547; color: #404547;
} }
} }
&:first-child { &.w1 {
padding-left: 24rpx;
flex: 0 0 487rpx;
border-right: 1px solid #cad9e0; border-right: 1px solid #cad9e0;
} }
&.ml{ &.w2 {
flex: 0 0 238rpx;
}
&.ml {
margin-left: 23rpx; margin-left: 23rpx;
} }
} }
...@@ -138,3 +141,7 @@ ...@@ -138,3 +141,7 @@
color: #6e767a; color: #6e767a;
} }
} }
.uni-date-editor--x .uni-date__icon-clear {
top: 5px !important;
right: -8px !important;
}
assets/css/waitpayment/index.scss
...@@ -79,6 +79,7 @@ ...@@ -79,6 +79,7 @@
position: relative; position: relative;
margin-left: 67rpx; margin-left: 67rpx;
height: 100rpx; height: 100rpx;
border-bottom: 1rpx solid #cad9e0;
.iconfont { .iconfont {
position: absolute; position: absolute;
right: 24rpx; right: 24rpx;
...@@ -94,13 +95,25 @@ ...@@ -94,13 +95,25 @@
} }
} }
.btn { .btn {
width: 702rpx; width: 400rpx;
height: 88rpx; height: 88rpx;
background: #197adb; background: #197adb;
border-radius: 4rpx; border-radius: 4rpx;
font-size: 28rpx; font-size: 28rpx;
color: #ffffff; color: #ffffff;
margin: 0 auto; }
.canel {
width: 200rpx;
height: 88rpx;
border: 1px solid #197adb;
border-radius: 4rpx;
font-size: 28rpx;
color: #197adb;
}
.bottom{
margin-left: 67rpx;
margin-right: 24rpx;
margin-top: 24rpx;
} }
} }
} }
......
pages/index/index.vue
...@@ -65,10 +65,10 @@ ...@@ -65,10 +65,10 @@
</template> </template>
<template v-else> <template v-else>
<!-- 登录无数据--> <!-- 登录无数据-->
<view class="no-data row verCenter rowCenter" v-if="is_login"> <navigator class="no-data row verCenter rowCenter" v-if="is_login" open-type="switchTab" url="/pages/question/list" hover-class="none">
<text class="text">暂无最新问题，</text> <text class="text">暂无最新问题，</text>
<text class="hove">查看更多问题</text> <text class="hove">查看更多问题</text>
</view> </navigator>
<!-- 未登录状态 --> <!-- 未登录状态 -->
<view class="no-data column verCenter rowCenter" v-else> <view class="no-data column verCenter rowCenter" v-else>
<view class="row verCenter"> <view class="row verCenter">
...@@ -139,10 +139,10 @@ ...@@ -139,10 +139,10 @@
</view> </view>
<template v-else> <template v-else>
<!-- 登录无数据--> <!-- 登录无数据-->
<view class="no-data row verCenter rowCenter" v-if="is_login == true"> <navigator class="no-data row verCenter rowCenter" v-if="is_login == true" open-type="switchTab" url="/pages/order/index" hover-class="none">
<text class="text">暂无最新订单，</text> <text class="text">暂无最新订单，</text>
<text class="hove">查看完整订单</text> <text class="hove">查看完整订单</text>
</view> </navigator>
<!-- 未登录状态 --> <!-- 未登录状态 -->
<view class="no-data column verCenter rowCenter" v-if="is_login == false"> <view class="no-data column verCenter rowCenter" v-if="is_login == false">
<view class="row verCenter"> <view class="row verCenter">
...@@ -193,16 +193,17 @@ export default { ...@@ -193,16 +193,17 @@ export default {
if (res.data.data.length > 0) { if (res.data.data.length > 0) {
this.order_num = res.data.order_num; this.order_num = res.data.order_num;
this.total = res.data.total; this.total = res.data.total;
this.order_list = this.order_list.concat(res.data.data); this.order_list = res.data.data;
} else { } else {
this.flag = true; this.flag = true;
} }
} else if (res.err_code === 20045) { } else if (res.err_code === 20045) {
this.order_list = [];
this.is_login = false; this.is_login = false;
this.flag = true; this.flag = true;
} else if (res.err_code === 20046) { } else if (res.err_code === 20046) {
this.total = 0;
this.flag = true; this.flag = true;
this.is_login = true;
} else { } else {
this.flag = true; this.flag = true;
} }
...@@ -224,8 +225,7 @@ export default { ...@@ -224,8 +225,7 @@ export default {
).then(res => { ).then(res => {
if (res.err_code === 0) { if (res.err_code === 0) {
if (res.data.data.length > 0) { if (res.data.data.length > 0) {
this.total = res.data.wait_handle_num; this.list = res.data.data;
this.list = this.list.concat(res.data.data);
} else { } else {
this.flag = true; this.flag = true;
this.more = 'noMore'; this.more = 'noMore';
...@@ -234,7 +234,10 @@ export default { ...@@ -234,7 +234,10 @@ export default {
this.is_login = false; this.is_login = false;
this.flag = true; this.flag = true;
this.more = 'noMore'; this.more = 'noMore';
this.total = 0; this.list = [];
} else if (res.err_code === 20046) {
this.flag = true;
this.is_login = true;
} else { } else {
this.flag = true; this.flag = true;
this.more = 'noMore'; this.more = 'noMore';
......
pages/mine/login.vue
...@@ -3,15 +3,17 @@ ...@@ -3,15 +3,17 @@
<text class="logo"></text> <text class="logo"></text>
<text class="title">SCM商务系统</text> <text class="title">SCM商务系统</text>
<view class="form-box column rowCenter verCenter"> <view class="form-box column rowCenter verCenter">
<view class="input-box row verCenter"> <form report-submit="true" bindsubmit="userSubmit">
<text class="iconfont icon-riqi1"></text> <view class="input-box row verCenter">
<input type="text" placeholder="请输入登录账号" v-model="account" /> <text class="iconfont icon-riqi1"></text>
</view> <input type="text" placeholder="请输入登录账号" v-model="account" />
<view class="input-box row verCenter"> </view>
<text class="iconfont icon-a-riqi11"></text> <view class="input-box row verCenter">
<input type="password" placeholder="请输入登录密码" v-model="pwd" /> <text class="iconfont icon-a-riqi11"></text>
</view> <input type="password" placeholder="请输入登录密码" v-model="pwd" />
<button class="btn row rowCenter verCenter" @click="submit()">绑定账号</button> </view>
<button class="btn row rowCenter verCenter" @click="submit()">绑定账号</button>
</form>
</view> </view>
<view class="copyright">©2021深圳市猎芯供应链有限公司 ALL RIGHTS RESERVED</view> <view class="copyright">©2021深圳市猎芯供应链有限公司 ALL RIGHTS RESERVED</view>
</view> </view>
...@@ -69,9 +71,17 @@ export default { ...@@ -69,9 +71,17 @@ export default {
true true
).then(res => { ).then(res => {
if (res.err_code === 0) { if (res.err_code === 0) {
uni.setStorageSync('token', res.data.token); wx.requestSubscribeMessage({
uni.navigateBack({ tmplIds: ['67KexDoluOH6YII26RcD1j6q6vCUeSTr90Y8KiQHzEo'],
delta: 2 success(json) {
console.log(json.errMsg == 'requestSubscribeMessage:ok')
if (json.errMsg == 'requestSubscribeMessage:ok') {
uni.setStorageSync('token', res.data.token);
uni.navigateBack({
delta: 2
});
}
}
}); });
} else { } else {
uni.showToast({ uni.showToast({
......
pages/order/detail.vue
...@@ -267,11 +267,11 @@ ...@@ -267,11 +267,11 @@
<text class="t1">收货信息:</text> <text class="t1">收货信息:</text>
<view class="address row verCenter"> <view class="address row verCenter">
<text class="iconfont icon-dingwei"></text> <text class="iconfont icon-dingwei"></text>
<text class="t1">{{ detail.order_hongkong.hk_com_delivery_id_cn.consignee }}</text> <text class="t1">{{ detail.inland_delivery.address.consignee }}</text>
<text class="t2">{{ detail.order_hongkong.hk_com_delivery_id_cn.mobile }}</text> <text class="t2">{{ detail.inland_delivery.address.mobile }}</text>
</view> </view>
<text class="address-detail"> <text class="address-detail">
{{ detail.order_hongkong.hk_com_delivery_id_cn.city_info || '' }}{{ detail.order_hongkong.hk_com_delivery_id_cn.detail_address || '' }} {{ detail.inland_delivery.address.city_info || '' }}{{ detail.inland_delivery.address.detail_address || '' }}
</text> </text>
</view> </view>
</template> </template>
......
pages/order/index.vue
...@@ -13,9 +13,7 @@ ...@@ -13,9 +13,7 @@
</view> </view>
<view class="show-box" v-if="shade_flag"> <view class="show-box" v-if="shade_flag">
<view class="input-box row verCenter"> <view class="input-box row verCenter">
<picker :value="index" :range="suppliers" range-key="supplier_name" @change="bindPickerChange"> <input type="text" placeholder="请输入供应商" class="uni-input" disabled="disabled" :value="suppliers[index].supplier_name" />
<input type="text" placeholder="请输入供应商" class="uni-input" disabled="disabled" :value="suppliers[index].supplier_name" />
</picker>
</view> </view>
<view class="input-time row verCenter"><uni-datetime-picker v-model="datetimerange" type="daterange" rangeSeparator="至" /></view> <view class="input-time row verCenter"><uni-datetime-picker v-model="datetimerange" type="daterange" rangeSeparator="至" /></view>
<view class="btn row rowCenter verCenter" @click="submit()">查 询</view> <view class="btn row rowCenter verCenter" @click="submit()">查 询</view>
......
pages/payment/detail.vue
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</view> </view>
<view class="pp row verCenter"> <view class="pp row verCenter">
<text class="t1">付款编号:</text> <text class="t1">付款编号:</text>
<text class="t2">{{ detail['付款编码'] }}</text> <text class="t2">{{ paymentNumber}}</text>
</view> </view>
<view class="pp row verCenter"> <view class="pp row verCenter">
<text class="t1">付款单位:</text> <text class="t1">付款单位:</text>
......
pages/payment/index.vue
<template> <template>
<view class="payment-index"> <view class="payment-index">
<view class="search-box row bothSide verCenter"> <view class="search-box row bothSide verCenter">
<view class="box row verCenter"> <view class="box row verCenter w1"><uni-datetime-picker @change="change" v-model="datetimerange" type="daterange" rangeSeparator="至" /></view>
<picker mode="date" :value="date" @change="bindDateChange"><input type="text" placeholder="请选择交易时间" class="uni-input" :value="date" /></picker> <view class="box row verCenter w2">
<text class="iconfont icon-Chevron"></text> <picker :value="index" :range="currency" @change="bindPickerChange"><input type="text" placeholder="付汇币别" class="uni-input" :value="currency[index]" /></picker>
</view>
<view class="box row verCenter ml">
<picker :value="index" :range="currency" @change="bindPickerChange">
<input type="text" placeholder="请选择付汇币别" class="uni-input" :value="currency[index]" />
</picker>
<text class="iconfont icon-Chevron"></text> <text class="iconfont icon-Chevron"></text>
</view> </view>
</view> </view>
...@@ -75,6 +70,8 @@ export default { ...@@ -75,6 +70,8 @@ export default {
loading: true, loading: true,
status: 'more', status: 'more',
date: '', date: '',
datetimerange: ['', ''],
index: -1,
currency: [], currency: [],
contentText: { contentText: {
contentdown: '下拉加载更多', contentdown: '下拉加载更多',
...@@ -115,8 +112,24 @@ export default { ...@@ -115,8 +112,24 @@ export default {
} }
}); });
}, },
change(e) {
console.log(e);
this.list = [];
this.page = 1;
this.datetimerange = e;
this.getData();
},
getData() { getData() {
this.request(API.GetPaymentList, 'GET', { currency: this.param.currency, tradeDateTo: this.param.tradeDateTo }, this.loading).then(res => { this.request(
API.GetPaymentList,
'GET',
{
currency: this.param.currency,
tradeDateFrom: this.datetimerange[0] || '',
tradeDateTo: this.datetimerange[1] || ''
},
this.loading
).then(res => {
if (res.err_code === 0) { if (res.err_code === 0) {
if (res.data.length > 0) { if (res.data.length > 0) {
this.list = res.data; this.list = res.data;
...@@ -165,6 +178,6 @@ export default { ...@@ -165,6 +178,6 @@ export default {
}; };
</script> </script>
<style scoped lang="scss"> <style lang="scss">
@import '../../assets/css/payment/index.scss'; @import '../../assets/css/payment/index.scss';
</style> </style>
pages/waitpayment/index.vue
...@@ -17,8 +17,16 @@ ...@@ -17,8 +17,16 @@
<input type="text" placeholder="请输入供应商" class="uni-input" disabled="disabled" :value="suppliers[index].supplier_name" /> <input type="text" placeholder="请输入供应商" class="uni-input" disabled="disabled" :value="suppliers[index].supplier_name" />
</picker> </picker>
</view> </view>
<view class="input-time row verCenter"><uni-datetime-picker v-model="datetimerange" type="daterange" rangeSeparator="至" /></view> <view class="input-time row verCenter">
<view class="btn row rowCenter verCenter" @click="submit()">查 询</view> <picker :value="index" :range="currency" @change="bindPickerChange">
<input type="text" placeholder="付汇币别" class="uni-input" :value="currency[index]" />
</picker>
<text class="iconfont icon-Chevron"></text>
</view>
<view class="row bottom bothSide">
<view class="btn row rowCenter verCenter" @click="submit()">查 询</view>
<view class="canel row rowCenter verCenter" @click="canel()">重 置</view>
</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -92,8 +100,8 @@ export default { ...@@ -92,8 +100,8 @@ export default {
index: -1, index: -1,
suppliers: [], suppliers: [],
status: 'more', status: 'more',
date: '', index: -1,
datetimerange: ['', ''], currency: [],
contentText: { contentText: {
contentdown: '下拉加载更多', contentdown: '下拉加载更多',
contentrefresh: '加载数据中...', contentrefresh: '加载数据中...',
...@@ -101,7 +109,8 @@ export default { ...@@ -101,7 +109,8 @@ export default {
}, },
param: { param: {
entrustNumber: '', entrustNumber: '',
supplierName: '' supplierName: '',
settleMentCurrency: ''
} }
}; };
}, },
...@@ -115,12 +124,24 @@ export default { ...@@ -115,12 +124,24 @@ export default {
}, },
onLoad() { onLoad() {
this.getUserSuppliers(); this.getUserSuppliers();
this.getcurrency();
}, },
onShow() { onShow() {
this.list = []; this.list = [];
this.getData(); this.getData();
}, },
methods: { methods: {
getcurrency() {
this.request(API.Getcurrency, 'GET', {}, false).then(res => {
if (res.err_code === 0) {
var arr = [];
for (let i in res.data) {
arr.push(res.data[i]);
}
this.currency = arr;
}
});
},
getUserSuppliers() { getUserSuppliers() {
this.request(API.GetUserSuppliers, 'POST', {}, false).then(res => { this.request(API.GetUserSuppliers, 'POST', {}, false).then(res => {
if (res.err_code == 0) { if (res.err_code == 0) {
...@@ -162,8 +183,7 @@ export default { ...@@ -162,8 +183,7 @@ export default {
page: this.page, page: this.page,
entrustNumber: this.param.entrustNumber, entrustNumber: this.param.entrustNumber,
supplierName: this.param.supplierName, supplierName: this.param.supplierName,
dateFrom: this.datetimerange[0] || '', settleMentCurrency: this.settleMentCurrency
dateTo: this.datetimerange[1] || ''
}, },
this.loading this.loading
).then(res => { ).then(res => {
...@@ -190,10 +210,11 @@ export default { ...@@ -190,10 +210,11 @@ export default {
this.reset(); this.reset();
this.getData(); this.getData();
}, },
bindDateChange(e) { bindPickerChangeCurrenty(e) {
console.log('picker发送选择改变，携带值为', e.target.value); console.log('picker发送选择改变，携带值为', e.target.value);
this.date = e.target.value; this.index = e.target.value;
this.param.end_time = e.target.value; this.param.settleMentCurrency = this.currency[e.target.value];
this.reset();
this.getData(); this.getData();
}, },
getDate(type) { getDate(type) {
......
util/api.js
//const API_BASE = 'https://api.ichunt.com'; const API_BASE = 'https://api.ichunt.com';
const API_BASE = 'http://supplyapi.liexin.com' //const API_BASE = 'http://supplyapi.liexin.com'
const API = { const API = {
/** /**
......
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 sign in to comment