|
@@ -46,12 +46,12 @@
|
|
<u-empty :src="`/static/nodata.png`" icon-size="180" text="暂无记录" img-width="180" mode="list"></u-empty>
|
|
<u-empty :src="`/static/nodata.png`" icon-size="180" text="暂无记录" img-width="180" mode="list"></u-empty>
|
|
</view>
|
|
</view>
|
|
<view style="padding: 20upx;">
|
|
<view style="padding: 20upx;">
|
|
- <u-loadmore load-text="正在加载..." v-if="(allData.length>=list.length&&list.length)||status=='loading'" :status="status" />
|
|
|
|
|
|
+ <u-loadmore v-if="(allData.length>=list.length&&list.length)||status=='loading'" :status="status" />
|
|
</view>
|
|
</view>
|
|
</scroll-view>
|
|
</scroll-view>
|
|
</view>
|
|
</view>
|
|
<view class="footer" v-if="tabIndex==0&&info.waitSettleAmount>0">
|
|
<view class="footer" v-if="tabIndex==0&&info.waitSettleAmount>0">
|
|
- <u-button @click="toPay" :throttle-time="100" :style="{background:'#1283d4',color:'#fff'}" shape="circle" type="success">
|
|
|
|
|
|
+ <u-button @click="toPay" :throttle-time="100" :custom-style="{background:'#1283d4',color:'#fff'}" shape="circle" type="success">
|
|
立即支付(¥{{info.waitSettleAmount}})
|
|
立即支付(¥{{info.waitSettleAmount}})
|
|
</u-button>
|
|
</u-button>
|
|
</view>
|
|
</view>
|
|
@@ -60,7 +60,7 @@
|
|
|
|
|
|
<script>
|
|
<script>
|
|
import uniIcons from '@/components/uni-icons/uni-icons.vue';
|
|
import uniIcons from '@/components/uni-icons/uni-icons.vue';
|
|
- import { waitSettleForSx,shelfSettleBillToPay } from '@/api/shelf.js'
|
|
|
|
|
|
+ import { waitSettleForSx,shelfSettleBillToPay,findStoreShelfSettleRule } from '@/api/shelf.js'
|
|
export default {
|
|
export default {
|
|
components: {
|
|
components: {
|
|
uniIcons
|
|
uniIcons
|
|
@@ -80,10 +80,21 @@
|
|
onReady() {
|
|
onReady() {
|
|
},
|
|
},
|
|
onLoad(option) {
|
|
onLoad(option) {
|
|
- this.info = JSON.parse(decodeURIComponent(option.data.replace(/%/g, '%25')))
|
|
|
|
|
|
+ console.log(decodeURIComponent(option.data.replace(/%/g, '%25')))
|
|
|
|
+ // this.info = JSON.parse(decodeURIComponent(option.data.replace(/%/g, '%25')))
|
|
|
|
+ this.getDetail()
|
|
this.getwaitSettleForSx()
|
|
this.getwaitSettleForSx()
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
|
|
+ // 查询详情
|
|
|
|
+ getDetail(){
|
|
|
|
+ findStoreShelfSettleRule().then(res => {
|
|
|
|
+ console.log(res)
|
|
|
|
+ if(res.status == 200){
|
|
|
|
+ this.info = res.data
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ },
|
|
// 去支付
|
|
// 去支付
|
|
toPay(){
|
|
toPay(){
|
|
this.info.shelfOrderSnList = this.shelfOrderSnList
|
|
this.info.shelfOrderSnList = this.shelfOrderSnList
|
|
@@ -149,6 +160,7 @@
|
|
|
|
|
|
<style lang="less">
|
|
<style lang="less">
|
|
.settlement-pages{
|
|
.settlement-pages{
|
|
|
|
+ width: 100%;
|
|
height: 100vh;
|
|
height: 100vh;
|
|
display: flex;
|
|
display: flex;
|
|
flex-direction: column;
|
|
flex-direction: column;
|