shish před 8 hodinami
rodič
revize
ed1d76ee79

+ 2 - 1
ghsApp/src/pagesGys/details.vue

@@ -294,7 +294,8 @@ export default {
 				id:JSON.stringify(ids),
 				ghsId:this.ghsInfo.id,
 				modifyPrice:this.modifyPrice,
-				payWay:this.payWay
+				payWay:this.payWay,
+				apiVersion:1
 			}
 			let that = this;
 			that.$util.confirmModal({content:'确认提交?'},() => {

+ 1 - 3
ghsApp/src/pagesGys/detailsItem.vue

@@ -34,7 +34,7 @@
 				<view class="refund-tip refund-tip-next">隔天售后 ¥{{parseFloat(info.nextDayTkPrice)}}</view>
 			</view>
 			<view class="item-row" v-if="hasPartialClear">
-				<view class="price" style="color:red;">已清 ¥{{ hasPayDebt }},剩余待结 ¥{{ parseFloat(remainDebtPrice) }}</view>
+				<view class="price" style="color:red;">部分清,剩余待结 ¥{{ parseFloat(remainDebtPrice) }}</view>
 			</view>
 		</view>
 	</view>
@@ -119,8 +119,6 @@ export default {
 	.details-main {
 		flex: 1;
 		position: relative;
-		// 给右上角「查看明细」留空,避免单号被挡住
-		padding-right: 200upx;
 	}
 	.detail-btn {
 		position: absolute;

+ 2 - 1
ghsApp/src/pagesGys/search.vue

@@ -136,7 +136,8 @@ export default {
 				id:JSON.stringify(ids),
 				ghsId:ghsId,
 				modifyPrice:this.modifyPrice,
-				payWay:this.payWay
+				payWay:this.payWay,
+				apiVersion:1
 			}
 			let that = this;
 			that.$util.confirmModal({content:'确认提交?'},() => {

+ 1 - 1
hdApp/src/admin/ghs/pay.vue

@@ -387,7 +387,7 @@
 					this.$msg('供货商信息加载中,请稍后再试')
 					return
 				}
-				this.pageTo({ url: `/pagesPurchase/gathering?id=${this.id}&salt=${this.salt}&ghsId=${this.id}`, type: 2 })
+				this.pageTo({ url: `/pagesPurchase/gathering?id=${this.id}&salt=${this.salt}&ghsId=${this.id}` })
 			},
 			/** 跳转当前供货商余额变动明细页 */
 			goBalanceChange() {

+ 28 - 56
hdApp/src/pagesPurchase/gathering.vue

@@ -29,18 +29,18 @@
         <AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(detailsList)" />
       </block>
     </view>
-    <DebtListPager
-      :page="debtPage"
-      :page-size="debtPageSize"
-      :total-page="debtTotalPage"
-      :total-num="debtTotalNum"
-      :page-size-options="debtPageSizeOptions"
-      :fixed="device !== 'ios'"
-      @page-change="handleDebtPageChange"
-      @page-size-change="handleDebtPageSizeChange"
-    />
-    <view :class="device == 'ios' ? 'ios-bar-view' : 'android-bar-view'">
-      <template>
+    <!-- 分页器与操作栏包成同一固定层:iOS 微信里子节点各自 position:fixed 会失效,外层统一贴底才能两端一致 -->
+    <view class="page-footer-fixed">
+      <DebtListPager
+        :page="debtPage"
+        :page-size="debtPageSize"
+        :total-page="debtTotalPage"
+        :total-num="debtTotalNum"
+        :page-size-options="debtPageSizeOptions"
+        @page-change="handleDebtPageChange"
+        @page-size-change="handleDebtPageSizeChange"
+      />
+      <view class="bottom-bar-view">
         <view class="info-view">
           <view class="details-select" @click="checkAllFn" >
 						<button class="admin-button-com blue middle" v-if="isAllCheck">全不选</button>
@@ -50,9 +50,9 @@
           <text class="unit">¥</text>
           <text class="price">{{ parseFloat(selectTotalAmount) }}</text>
         </view>
-      </template>
-      <view class="btn-view" >
-        <button class="admin-button-com blue" @click="batchConfirm">付款结清</button>
+        <view class="btn-view" >
+          <button class="admin-button-com blue" @click="batchConfirm">付款结清</button>
+        </view>
       </view>
     </view>
   </view>
@@ -80,13 +80,11 @@ export default {
 			startTime:'',
 			endTime:'',
       ghsId:0,
-      device: 'android',
       justLoaded: false,
       salt: ''
     }
   },
   onLoad() {
-    this.device = uni.getSystemInfoSync().platform
     this.initData()
   },
   onShow () {
@@ -346,7 +344,8 @@ export default {
 		margin-top:80upx;
     padding: 20upx 0;
     flex: 1;
-    padding-bottom: 260upx;
+    /* 给底部固定层(分页器 + 操作栏 + 刘海安全区)留出滚动空间,避免最后几笔被挡住 */
+    padding-bottom: 380upx;
   }
   .debt-multi-page-tip {
     margin: 0 24upx 16upx;
@@ -361,47 +360,20 @@ export default {
     color: #d48806;
     line-height: 46upx;
   }
-  .ios-bar-view {
+  /* 整块贴底:分页器不再单独 fixed,避免 iOS 微信小程序里多层 position:fixed 失效 */
+  .page-footer-fixed {
+    position: fixed;
+    left: 0;
+    right: 0;
     bottom: 0;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 0 30upx;
+    z-index: 99;
     width: 100%;
-    height: 100upx;
-    background: #fff;
+    background-color: #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;
-      .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;
-        width: 200upx;
-        height: 70upx;
-        font-size: 30upx;
-      }
-    }
+    padding-bottom: constant(safe-area-inset-bottom);
+    padding-bottom: env(safe-area-inset-bottom);
   }
-  .android-bar-view {
-    position: fixed;
-    bottom: 0;
+  .bottom-bar-view {
     display: flex;
     justify-content: space-between;
     align-items: center;
@@ -409,7 +381,7 @@ export default {
     width: 100%;
     height: 100upx;
     background: #fff;
-    box-shadow: 0upx -1upx 6upx 0upx rgba(4, 0, 0, 0.06);
+    box-sizing: border-box;
     .info-view {
       display: flex;
       align-items: center;