Ver Fonte

结算管理

lilei há 3 anos atrás
pai
commit
394a0a7448

+ 2 - 16
pages.json

@@ -183,22 +183,8 @@
 		    "path" : "pages/digitalShelf/settlementManage/settlementManage",
 		    "path" : "pages/digitalShelf/settlementManage/settlementManage",
 		    "style" :                                                                                    
 		    "style" :                                                                                    
 		    {
 		    {
-		        "navigationBarTitleText": "结算管理",
-		        "enablePullDownRefresh": false,
-				"app-plus":{
-					"titleNView": {
-						"titleAlign": "left",
-						"buttons": [ //原生标题栏按钮配置,
-							{
-								"text": "\ue6d0 结算记录" ,//原生标题栏增加分享按钮,点击事件可通过页面的 onNavigationBarButtonTap 函数进行监听
-								"fontSrc": "/static/iconfont/iconfont.ttf",
-								"fontSize": "14",
-								"width":"100px",
-								"color":"#FFFFFF"
-							}
-						]
-					}
-				}
+		        "navigationBarTitleText": "付款结算",
+		        "enablePullDownRefresh": false
 		    }
 		    }
 		    
 		    
 		}
 		}

+ 13 - 2
pages/digitalShelf/settlementManage/settlementAyDetail.vue

@@ -41,7 +41,7 @@
 			</scroll-view>
 			</scroll-view>
 		</view>
 		</view>
 		<view class="footer" v-if="totalMount">
 		<view class="footer" v-if="totalMount">
-			<u-button :throttle-time="100" @click="toPay" :style="{background:'#1283d4',color:'#fff'}" shape="circle" type="success">
+			<u-button :throttle-time="100" @click="toPay" :custom-style="{background:'#1283d4',color:'#fff'}" shape="circle" type="success">
 				立即支付(¥{{totalMount}})
 				立即支付(¥{{totalMount}})
 			</u-button>
 			</u-button>
 		</view>
 		</view>
@@ -84,7 +84,8 @@
 			}
 			}
 		},
 		},
 		onLoad(opts) {
 		onLoad(opts) {
-			this.info =  JSON.parse(decodeURIComponent(opts.data.replace(/%/g, '%25')))
+			// this.info =  JSON.parse(decodeURIComponent(opts.data.replace(/%/g, '%25')))
+			this.getDetail()
 			this.month = opts.month
 			this.month = opts.month
 			this.mothTitle = (opts.month!=-1?(opts.month+'月'):'全部') + '待结算'
 			this.mothTitle = (opts.month!=-1?(opts.month+'月'):'全部') + '待结算'
 			this.waitSettleAmount = this.info.waitSettleAmount
 			this.waitSettleAmount = this.info.waitSettleAmount
@@ -97,6 +98,15 @@
 			this.getAyDjsList()
 			this.getAyDjsList()
 		},
 		},
 		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
@@ -168,6 +178,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;

+ 2 - 2
pages/digitalShelf/settlementManage/settlementManage.vue

@@ -8,7 +8,7 @@
 					¥<text>{{info.usedAmount}}</text>
 					¥<text>{{info.usedAmount}}</text>
 				</view>
 				</view>
 				<view>
 				<view>
-					<u-button :throttle-time="100" size="mini" @click="viewDetail" :style="{background:'#1283d4',color:'#fff'}" shape="circle" type="success">查看详情</u-button>
+					<u-button :throttle-time="100" size="mini" @click="viewDetail" :custom-style="{background:'#1283d4',color:'#fff'}" shape="circle" type="success">查看详情</u-button>
 				</view>
 				</view>
 			</view>
 			</view>
 			<view class="sxjs-head-grid flex align-center justify_between">
 			<view class="sxjs-head-grid flex align-center justify_between">
@@ -30,7 +30,7 @@
 					¥<text>{{info.waitSettleAmount}}</text>
 					¥<text>{{info.waitSettleAmount}}</text>
 				</view>
 				</view>
 				<view v-if="info.waitSettleAmount">
 				<view v-if="info.waitSettleAmount">
-					<u-button :throttle-time="100" size="mini" @click="viewDetail('-1')" :style="{background:'#1283d4',color:'#fff'}" shape="circle" type="success">查看详情</u-button>
+					<u-button :throttle-time="100" size="mini" @click="viewDetail('-1')" :custom-style="{background:'#1283d4',color:'#fff'}" shape="circle" type="success">查看详情</u-button>
 				</view>
 				</view>
 			</view>
 			</view>
 			<view class="jsList">
 			<view class="jsList">

+ 16 - 4
pages/digitalShelf/settlementManage/settlementSxDetail.vue

@@ -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;

+ 2 - 2
pages/morePage/morePage.vue

@@ -31,10 +31,10 @@
 				<u-icon size="36" name="rmb-circle"></u-icon> <text>结算管理</text>
 				<u-icon size="36" name="rmb-circle"></u-icon> <text>结算管理</text>
 			</view>
 			</view>
 			<u-cell-group :border="false">
 			<u-cell-group :border="false">
-				<u-cell-item title="结算记录" :title-style="{fontSize:'1em'}">
+				<u-cell-item title="结算记录" @click="toPage('/pages/digitalShelf/settlementRecord/settlementRecord')" :title-style="{fontSize:'1em'}">
 					<text slot="icon"></text>
 					<text slot="icon"></text>
 				</u-cell-item>
 				</u-cell-item>
-				<u-cell-item title="付款结算" :title-style="{fontSize:'1em'}">
+				<u-cell-item title="付款结算" @click="toPage('/pages/digitalShelf/settlementManage/settlementManage')" :title-style="{fontSize:'1em'}">
 					<text slot="icon"></text>
 					<text slot="icon"></text>
 				</u-cell-item>
 				</u-cell-item>
 			</u-cell-group>
 			</u-cell-group>