Просмотр исходного кода

结账问题和小程序可以选择待付款

shish 4 лет назад
Родитель
Сommit
c65bcf3b0e
2 измененных файлов с 63 добавлено и 6 удалено
  1. 12 2
      ghsApp/src/admin/billing/affirm.vue
  2. 51 4
      ghsApp/src/pagesArrears/details.vue

+ 12 - 2
ghsApp/src/admin/billing/affirm.vue

@@ -102,9 +102,9 @@
 
           <tui-list-cell class="line-cell" :hover="false" :arrow="false">
             <view class="tui-title">结账方式</view>
-            <button @click="form.hasPay = 0" v-if="isScanEnv" class="admin-button-com middle" :class="form.hasPay == 0 ? 'blue' : 'default'">待付款</button>
             <button @click="form.hasPay = 2" class="admin-button-com middle" :class="form.hasPay == 2 ? 'blue' : 'default'">欠款</button>
             <button @tap="form.hasPay = 1" class="admin-button-com middle" :class="form.hasPay == 1 ? 'blue' : 'default'">已付款</button>
+            <button @click="form.hasPay = 0" class="admin-button-com middle" :class="form.hasPay == 0 ? 'blue' : 'default'">待付款</button>
           </tui-list-cell>
 
           <tui-list-cell class="line-cell" :arrow="true" v-if="form.hasPay == 1">
@@ -403,7 +403,17 @@ export default {
           this.$msg(hasError);
           return false;
         }
-        self.$util.confirmModal({content:'确认提交'},() => {
+        let name = '确认提交'
+        if(this.form.hasPay == 0){
+          name = '确认待付款?'
+        }else if(this.form.hasPay == 1){
+          name = '确认已付款?!!'
+        }else if(this.form.hasPay == 2){
+          name = '确认记欠款??'
+        }else{
+          name = '确认提交'
+        }
+        self.$util.confirmModal({content:name},() => {
           self.formSubmit()
         })
     },

+ 51 - 4
ghsApp/src/pagesArrears/details.vue

@@ -5,7 +5,7 @@
 			<view class="top-row">
 				<view class="info-item">
 					<image class="logo" :src="customInfo.smallAvatar"/>
-					<text class="name">{{ customInfo.name || "" }}</text>
+					<text class="name">{{ customInfo.name || "" }}{{device}} </text>
 				</view>
 				<DateSelect class="bar" top="0" @selectDateFn="selectDateFn" defaultShowName='时间' />
 			</view>
@@ -18,7 +18,7 @@
 				<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(detailsList)" />
 			</block>
 		</view>
-		<view class="bar-view">
+		<view :class="device == 'ios' ? 'ios-bar-view':'android-bar-view'">
 			<template>
 				<view class="info-view">
 					<view class="details-select" @click="checkFn()" >
@@ -69,7 +69,8 @@ export default {
 			payWay:0,
 			searchTime:'',
 			startTime:'',
-			endTime:''
+			endTime:'',
+			device:'android'
 		};
 	},
 	onPullDownRefresh() {
@@ -81,6 +82,9 @@ export default {
 		this.initData().then(res => {
 			uni.stopPullDownRefresh();
 		});
+
+		this.device = uni.getSystemInfoSync().platform
+
 	},
 	computed: {
 		selectList() {
@@ -284,7 +288,50 @@ export default {
 		flex: 1;
 		padding-bottom: 100upx;
 	}
-	.bar-view {
+	.ios-bar-view {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 0 30upx;
+		width: 100%;
+		height: 100upx;
+		background: #fff;
+		box-shadow: 0upx -1upx 6upx 0upx rgba(4, 0, 0, 0.06);
+		.info-view {
+			display: flex;
+			align-items: center;
+			color: #333;
+			font-size: 24upx;
+			.iconfont {
+				font-size: 32upx;
+				color: #dddddd;
+			}
+			.price {
+				margin: 0 3upx;
+				color: $redColor;
+				font-size: 30upx;
+			}
+			.unit {
+				margin: 0 3upx;
+				color: $redColor;
+				font-size: 30upx;
+			}
+		}
+		.btn-view {
+			display: flex;
+			.admin-button-com {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin: 0 6upx;
+				width: 200upx;
+				height: 70upx;
+				font-size: 30upx;
+			}
+		}
+	}
+	.android-bar-view {
+		position: fixed;
 		bottom: 0;
 		display: flex;
 		justify-content: space-between;