Merge branch 'master' into redesign‌-260706

ghs/src/views/assets/cgItem.vue

@@ -22,9 +22,6 @@
 						</span>
 						<span v-if="Number(nextDayDeduct) > 0" style="font-size:15px;font-weight:bold;margin-left:15px;color:#e67e22;">隔天售后扣减：¥{{ formatNum(nextDayDeduct) }}</span>
 					</div>
-					<div class="cg-tip">
-						数量、金额已按售后扣减（隔天售后记在通过日，可为负）。入库日不含隔天退货量。
-					</div>
 				</div>
 			</template>
 
@@ -201,12 +198,4 @@ export default {
   display: block;
   line-height: 1.6;
 }
-.cg-tip {
-  display: block;
-  width: 100%;
-  margin-top: 8px;
-  font-size: 13px;
-  color: #1c89e0;
-  line-height: 1.6;
-}
 </style>

ghs/src/views/assets/incomeClass.vue

@@ -12,11 +12,6 @@
 			<template #slot-export-due>
 				<el-button type="primary" size="mini" style="margin-left:60px;" @click="exportData()">导出数据</el-button>
 			</template>
-			<template #slot-class-tip>
-				<div class="class-tip">
-					采购成本、销售收入已按售后扣减（隔天售后记在通过日，分类成本/收入可为负）。采购仅退款、销售仅退款含隔天通过日金额。
-				</div>
-			</template>
 			<template #table-column-income="{scope}">
 				<div :style="negStyle(scope.row.income)">{{ formatNum(scope.row.income) }}</div>
 			</template>
@@ -180,7 +175,7 @@ export default {
 						'flex1'
 					],
 					[ 'data-table' ],
-                    ['slot-class-tip','flex1']
+                    ['flex1']
 				])
 				.done();
 			    app.refresh();
@@ -199,13 +194,4 @@ export default {
 .shop-list {
   height: 100%;
 }
-.class-tip {
-  display: block;
-  width: 100%;
-  margin-top: 10px;
-  padding: 0 4px;
-  font-size: 13px;
-  color: #1c89e0;
-  line-height: 1.6;
-}
 </style>

ghs/src/views/assets/incomeOutItem.vue

@@ -12,11 +12,6 @@
 			<template #slot-export-due>
 				<el-button type="primary" size="mini" style="margin-left:60px;" @click="exportData()">导出数据</el-button>
 			</template>
-			<template #slot-item-tip>
-				<div class="item-tip">
-					采购成本、销售收入已按售后扣减（隔天售后记在通过日，花材成本/收入/数量可为负）。采购仅退款、销售仅退款含隔天通过日金额。
-				</div>
-			</template>
 			<template #table-column-income="{scope}">
 				<div :style="negStyle(scope.row.income)">{{ formatNum(scope.row.income) }}</div>
 			</template>
@@ -177,7 +172,7 @@ export default {
 						'flex1'
 					],
 					[ 'data-table' ],
-                    ['slot-item-tip','flex1']
+                    ['flex1']
 				])
 				.done();
 			    app.refresh();
@@ -196,13 +191,4 @@ export default {
 .shop-list {
   height: 100%;
 }
-.item-tip {
-  display: block;
-  width: 100%;
-  margin-top: 10px;
-  padding: 0 4px;
-  font-size: 13px;
-  color: #1c89e0;
-  line-height: 1.6;
-}
 </style>

ghs/src/views/assets/itemSale.vue

@@ -25,9 +25,6 @@
 						</span>
 						<span v-if="Number(nextDayDeduct) > 0" style="font-size:15px;font-weight:bold;margin-left:15px;color:#e67e22;">隔天售后扣减：¥{{ formatNum(nextDayDeduct) }}</span>
 					</div>
-					<div class="sale-tip">
-						数量、金额、毛利已按售后扣减（隔天售后记在通过日，可为负）。仅退款只扣金额不扣扎数。
-					</div>
 				</div>
 			</template>
 
@@ -210,12 +207,4 @@ export default {
   display: block;
   line-height: 1.6;
 }
-.sale-tip {
-  display: block;
-  width: 100%;
-  margin-top: 8px;
-  font-size: 13px;
-  color: #1c89e0;
-  line-height: 1.6;
-}
 </style>

ghs/src/views/in/refund-list.vue

@@ -1,3 +1,6 @@
+<!--
+  PC 采购售后记录列表：售后类型后展示「售后时间」（当天/隔天），对齐小程序 pagesPurchase/refundList。
+-->
 <template>
 	<div class="app-list-content">
 		<x-crud class="liu-crud-wrap" @load="onLoad">
@@ -12,6 +15,13 @@
 				{{ scope.row.refundType==1?'退货并退款':'仅退款' }}
 			</template>
 
+			<!-- sameDay=0 隔天售后，否则当天售后 -->
+			<template #table-column-sameDay="{scope}">
+				<span :style="Number(scope.row.sameDay) === 0 ? 'color:#e67e22;font-weight:bold;' : ''">
+					{{ Number(scope.row.sameDay) === 0 ? '隔天售后' : '当天售后' }}
+				</span>
+			</template>
+
             <template #table-column-status="{scope}">
 				{{ scope.row.status==0?'审核中': scope.row.status==1? '已完成' : '其它' }}
 			</template>
@@ -48,6 +58,11 @@
 				<el-select size="mini" v-model="currentStaffName" placeholder="操作人" style="width:110px;margin-left:8px;" @change="getKdStaff" :clearable="true">
 					<el-option v-for="item in staffList" :key="item.id" :label="item.name" :value="item.id"></el-option>
 				</el-select>
+				<!-- 售后时间：当天 sameDay=1 / 隔天 sameDay=0；清空为全部 -->
+				<el-select size="mini" v-model="sameDayFilter" placeholder="售后时间" style="width:110px;margin-left:8px;" @change="onSameDayChange" :clearable="true">
+					<el-option label="当天售后" :value="1"></el-option>
+					<el-option label="隔天售后" :value="0"></el-option>
+				</el-select>
 				<span style="margin-left:9px;font-size:16px;">采购单日期：</span>
 				<el-date-picker v-model="currentDateList" type="daterange" align="right" unlink-panels range-separator="至" start-placeholder="开始日期" @change="getSearchDate" value-format="yyyy-MM-dd"
 					class="custom-date-picker" end-placeholder="结束日期" :picker-options="pickerOptions" size="mini" style="margin-right:8px;">
@@ -139,6 +154,8 @@ export default {
 			refundSearchTime:'',
 			currentRefundDateList:[],
 			status:'-1',
+			/** 售后时间筛选：null=全部，1=当天，0=隔天 */
+			sameDayFilter: null,
 			totalRefundPrice:0,
 			currentGhsName:'',
 			currentGhsId:0,
@@ -178,6 +195,14 @@ export default {
 			this.currentStaffId = e
       		this.refreshData()
 		},
+		/** 切换售后时间筛选后刷新列表 */
+		onSameDayChange(){
+			this.refreshData()
+		},
+		/** 请求参数 sameDay：-1全部 / 1当天 / 0隔天 */
+		sameDayQuery(){
+			return (this.sameDayFilter === 0 || this.sameDayFilter === 1) ? this.sameDayFilter : -1
+		},
 		getSearchDate(){
 			if (this.$util.isEmpty(this.currentDateList)) {
 				this.searchTime = ''
@@ -204,11 +229,11 @@ export default {
 		},
 		refreshData(){
       		this.app.refresh({status:this.tabIndex,searchTime:this.searchTime,startTime:this.startTime,endTime:this.endTime,refundSearchTime:this.refundSearchTime,refundStartTime:this.refundStartTime,
-				refundEndTime:this.refundEndTime,shopAdminId:this.currentStaffId,status:this.status,ghsId:this.currentGhsId})
+				refundEndTime:this.refundEndTime,shopAdminId:this.currentStaffId,status:this.status,ghsId:this.currentGhsId,sameDay:this.sameDayQuery()})
     	},
 		exportData(){
 			this.$service.cgRefund.getList({status:this.tabIndex,searchTime:this.searchTime,startTime:this.startTime,endTime:this.endTime,refundSearchTime:this.refundSearchTime,refundStartTime:this.refundStartTime,
-				refundEndTime:this.refundEndTime,shopAdminId:this.currentStaffId,status:this.status,pageSize:9999999,export:1,ghsId:this.currentGhsId}).then(res => {
+				refundEndTime:this.refundEndTime,shopAdminId:this.currentStaffId,status:this.status,pageSize:9999999,export:1,ghsId:this.currentGhsId,sameDay:this.sameDayQuery()}).then(res => {
 				if(res.file){
 					window.location.href = res.file
 				}
@@ -293,6 +318,12 @@ export default {
 							align: 'center',
 							width: 110
 						},
+						{
+							prop: 'sameDay',
+							label: '售后时间',
+							align: 'center',
+							width: 100
+						},
 						{
 							prop: 'shopAdminName',
 							label: '操作人',

ghs/src/views/order/refund-list.vue

@@ -1,3 +1,6 @@
+<!--
+  PC 销售售后记录列表：展示售后类型后增加「售后时间」（当天/隔天），对齐小程序 refundList。
+-->
 <template>
 	<div class="app-list-content">
 		<x-crud class="liu-crud-wrap" @load="onLoad">
@@ -12,6 +15,13 @@
 				{{ scope.row.refundType==1?'退货并退款':'仅退款' }}
 			</template>
 
+			<!-- sameDay=0 隔天售后，否则当天售后 -->
+			<template #table-column-sameDay="{scope}">
+				<span :style="Number(scope.row.sameDay) === 0 ? 'color:#e67e22;font-weight:bold;' : ''">
+					{{ Number(scope.row.sameDay) === 0 ? '隔天售后' : '当天售后' }}
+				</span>
+			</template>
+
 			<template #table-column-cause="{scope}">
 				{{ scope.row.cause==0?'质量问题' : scope.row.cause==1 ?'多开错开': scope.row.cause==2 ? '打包原因' : scope.row.cause==3 ? '物流原因' : '其它'}}
 			</template>
@@ -56,6 +66,11 @@
 				<el-select size="mini" v-model="currentStaffName" placeholder="操作人" style="width:110px;margin-left:8px;" @change="getKdStaff" :clearable="true">
 					<el-option v-for="item in staffList" :key="item.id" :label="item.name" :value="item.id"></el-option>
 				</el-select>
+				<!-- 售后时间：当天 sameDay=1 / 隔天 sameDay=0；清空为全部 -->
+				<el-select size="mini" v-model="sameDayFilter" placeholder="售后时间" style="width:110px;margin-left:8px;" @change="onSameDayChange" :clearable="true">
+					<el-option label="当天售后" :value="1"></el-option>
+					<el-option label="隔天售后" :value="0"></el-option>
+				</el-select>
 				<span style="margin-left:9px;font-size:18px;">订单日期：</span>
 				<el-date-picker v-model="currentDateList" type="daterange" align="right" unlink-panels range-separator="至" start-placeholder="开始日期" @change="getSearchDate" value-format="yyyy-MM-dd"
 					class="custom-date-picker" end-placeholder="结束日期" :picker-options="pickerOptions" size="mini" style="margin-right:8px;">
@@ -157,6 +172,8 @@ export default {
 			refundSearchTime:'',
 			currentRefundDateList:[],
 			status:'-1',
+			/** 售后时间筛选：null=全部，1=当天，0=隔天 */
+			sameDayFilter: null,
 			totalRefundPrice:0,
 			currentCustomName:'',
 			currentCustomId:0,
@@ -205,6 +222,14 @@ export default {
 			this.currentStaffId = e
       		this.refreshData()
 		},
+		/** 切换售后时间筛选后刷新列表 */
+		onSameDayChange(){
+			this.refreshData()
+		},
+		/** 请求参数 sameDay：-1全部 / 1当天 / 0隔天 */
+		sameDayQuery(){
+			return (this.sameDayFilter === 0 || this.sameDayFilter === 1) ? this.sameDayFilter : -1
+		},
 		getSearchDate(){
 			if (this.$util.isEmpty(this.currentDateList)) {
 				this.searchTime = ''
@@ -231,11 +256,11 @@ export default {
 		},
 		refreshData(){
       		this.app.refresh({status:this.tabIndex,searchTime:this.searchTime,startTime:this.startTime,endTime:this.endTime,refundSearchTime:this.refundSearchTime,refundStartTime:this.refundStartTime,
-				refundEndTime:this.refundEndTime,shopAdminId:this.currentStaffId,status:this.status,customId:this.currentCustomId})
+				refundEndTime:this.refundEndTime,shopAdminId:this.currentStaffId,status:this.status,customId:this.currentCustomId,sameDay:this.sameDayQuery()})
     	},
 		exportData(){
 			this.$service.refund.getRefundList({status:this.tabIndex,searchTime:this.searchTime,startTime:this.startTime,endTime:this.endTime,refundSearchTime:this.refundSearchTime,refundStartTime:this.refundStartTime,
-				refundEndTime:this.refundEndTime,shopAdminId:this.currentStaffId,status:this.status,pageSize:9999999,export:1,customId:this.currentCustomId}).then(res => {
+				refundEndTime:this.refundEndTime,shopAdminId:this.currentStaffId,status:this.status,pageSize:9999999,export:1,customId:this.currentCustomId,sameDay:this.sameDayQuery()}).then(res => {
 				if(res.file){
 					window.location.href = res.file
 				}
@@ -314,6 +339,12 @@ export default {
 							align: 'center',
 							width: 120
 						},
+						{
+							prop: 'sameDay',
+							label: '售后时间',
+							align: 'center',
+							width: 100
+						},
 						{
 							prop: 'book',
 							label: '类型',

ghsApp/src/admin/stat/cgItem.vue

@@ -21,11 +21,8 @@
 						<t-th><view @click="rankByFn('num')">总数量<i class="iconfont iconsanjiao_xia"></i></view></t-th>
 						<t-th><view @click="rankByFn('amount')">总金额<i class="iconfont iconsanjiao_xia"></i></view></t-th>
 						</t-tr>
-						<view style="color:#1c89e0;font-size:24upx;margin:10upx;line-height:1.5;">
-							数量、金额已按售后扣减（隔天售后记在通过日，可为负）。入库日不含隔天退货量。
-						</view>
 						<view v-if="Number(nextDayDeduct) > 0" style="color:#e67e22;font-size:26upx;margin:0 10upx 10upx 10upx;font-weight:bold;">
-							本时段隔天售后扣减：¥{{ nextDayDeduct }}
+							隔天售后扣减：¥{{ nextDayDeduct }}
 						</view>
 						<block v-if="itemList && !$util.isEmpty(itemList)">
 							<view v-for="(item, index) in itemList" :key="index">

ghsApp/src/admin/stat/cgStat.vue

@@ -20,11 +20,8 @@
 						<view style="font-size:30upx;margin:10upx 0 10upx 10upx;">总金额：
 							<text :style="totalActPrice < 0 ? 'color:#e74c3c;font-weight:bold;' : ''">{{ totalActPrice }}</text>
 						</view>
-						<view style="color:#1c89e0;font-size:24upx;margin:0 10upx 10upx 10upx;line-height:1.5;">
-							金额已按售后扣减（隔天售后记在通过日，可为负；订单数不减）。
-						</view>
 						<view v-if="Number(nextDayDeduct) > 0" style="color:#e67e22;font-size:26upx;margin:0 10upx 10upx 10upx;font-weight:bold;">
-							本时段隔天售后扣减：¥{{ nextDayDeduct }}
+							隔天售后扣减：¥{{ nextDayDeduct }}
 						</view>
 						<view v-for="(item, index) in displayList" :key="index">
 							<t-tr>

ghsApp/src/admin/stat/cgYj.vue

@@ -21,11 +21,8 @@
 						<t-th>订单数</t-th>
 						<t-th>金额</t-th>
 						</t-tr>
-						<view style="color:#1c89e0;font-size:24upx;margin:10upx;line-height:1.5;">
-							金额已按售后扣减（隔天售后记在通过日，可为负；订单数不减）。
-						</view>
 						<view v-if="Number(nextDayDeduct) > 0" style="color:#e67e22;font-size:26upx;margin:0 10upx 10upx 10upx;font-weight:bold;">
-							本时段隔天售后扣减：¥{{ nextDayDeduct }}
+							隔天售后扣减：¥{{ nextDayDeduct }}
 						</view>
 						<block v-if="staffList && !$util.isEmpty(staffList)">
 							<view v-for="(cgItem, index) in staffList" :key="index">

ghsApp/src/admin/stat/customSale.vue

@@ -26,11 +26,8 @@
 							<t-th>成本</t-th>
 							<t-th>利润</t-th>
 						</t-tr>
-						<view style="color:#1c89e0;font-size:24upx;margin:10upx;line-height:1.5;">
-							金额、利润已按售后扣减（隔天售后记在通过日，可为负；笔数不减）。扎数：当天售后未从开单扎数扣除，隔天退货会在通过日扣扎数。成本仍取开单剩余成本。
-						</view>
 						<view v-if="Number(nextDayDeduct) > 0" style="color:#e67e22;font-size:26upx;margin:0 10upx 10upx 10upx;font-weight:bold;">
-							本时段隔天售后扣减：¥{{ nextDayDeduct }}
+							隔天售后扣减：¥{{ nextDayDeduct }}
 						</view>
 						<block v-if="displayList && !$util.isEmpty(displayList)">
 							<view v-for="(item, index) in displayList" :key="index">
@@ -56,11 +53,6 @@
 								{{profile.totalNum||0}}笔¥{{formatNum(profile.totalAmount)}} 成本¥{{ formatNum(profile.totalCost) }} 利润¥{{ formatNum(profile.totalProfit) }}
 							</view>
 						</t-td></t-tr>
-						<t-tr><t-td>
-							<view style="color:#1c89e0;font-size:28upx;">
-								从2025年11月20号起是准确数据，之前的数据不准确
-							</view>
-						</t-td></t-tr>
 					</t-table>
 				</block>
 			</view>

ghsApp/src/admin/stat/productSale.vue

@@ -27,11 +27,8 @@
 								</view>
 							</t-td>
 						</t-tr>
-						<view style="color:#1c89e0;font-size:24upx;margin:0 10upx 10upx 10upx;line-height:1.5;">
-							数量、金额、毛利已按售后扣减（隔天售后记在通过日，可为负）。仅退款只扣金额不扣扎数。与 PC 花材销量同源接口。
-						</view>
 						<view v-if="Number(nextDayDeduct) > 0" style="color:#e67e22;font-size:26upx;margin:0 10upx 10upx 10upx;font-weight:bold;">
-							本时段隔天售后扣减：¥{{ nextDayDeduct }}
+							隔天售后扣减：¥{{ nextDayDeduct }}
 						</view>
 						<block v-if="displayList && !$util.isEmpty(displayList)">
 							<view v-for="(item, index) in displayList" :key="index">

ghsApp/src/admin/stat/profit.vue

@@ -15,9 +15,6 @@
 							<t-th>类型</t-th>
 							<t-th>金额</t-th>
 						</t-tr>
-						<view style="color:#1c89e0;font-size:24upx;margin:10upx;line-height:1.5;">
-							「采购隔天退货」按售后通过日记账（含退货并退款与仅退款）；花材采购按入库日。
-						</view>
 						<block v-for="(item, inIndex) in profit.income" :key="inIndex">
 							<t-tr v-if="Number(item.amount)!=0">
 								<t-td>

ghsApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "销花宝",
     "appid" : "__UNI__BD781B0",
     "description" : "鲜花批发销售管理系统",
-    "versionName" : "1.3.20",
-    "versionCode" : 1320,
+    "versionName" : "1.3.26",
+    "versionCode" : 1326,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

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:'确认提交？'},() => {

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;

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:'确认提交？'},() => {

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() {

hdApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜",
     "appid" : "__UNI__4079DC1",
     "description" : "花店管家婆",
-    "versionName" : "2.4.8",
-    "versionCode" : 248,
+    "versionName" : "2.5.0",
+    "versionCode" : 250,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

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;

开发http/ghsApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "销花宝",
     "appid" : "__UNI__BD781B0",
     "description" : "鲜花批发销售管理系统",
-    "versionName" : "1.3.18",
-    "versionCode" : 1320,
+    "versionName" : "1.3.26",
+    "versionCode" : 1326,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

开发http/hdApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜",
     "appid" : "__UNI__4079DC1",
     "description" : "花店管家婆",
-    "versionName" : "2.4.8",
-    "versionCode" : 248,
+    "versionName" : "2.5.0",
+    "versionCode" : 250,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

开发https/ghsApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "销花宝",
     "appid" : "__UNI__BD781B0",
     "description" : "鲜花批发销售管理系统",
-    "versionName" : "1.3.20",
-    "versionCode" : 1320,
+    "versionName" : "1.3.26",
+    "versionCode" : 1326,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

开发https/hdApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜",
     "appid" : "__UNI__4079DC1",
     "description" : "花店管家婆",
-    "versionName" : "2.4.8",
-    "versionCode" : 248,
+    "versionName" : "2.5.0",
+    "versionCode" : 250,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

线上/ghsApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "销花宝",
     "appid" : "__UNI__BD781B0",
     "description" : "鲜花批发销售管理系统",
-    "versionName" : "1.3.20",
-    "versionCode" : 1320,
+    "versionName" : "1.3.26",
+    "versionCode" : 1326,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

线上/hdApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜",
     "appid" : "__UNI__4079DC1",
     "description" : "花店管家婆",
-    "versionName" : "2.4.8",
-    "versionCode" : 248,
+    "versionName" : "2.5.0",
+    "versionCode" : 250,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {