更新

hdh5/admin/ghs/pay.vue

@@ -10,7 +10,6 @@
 				<text class="pay-merchant__avatar-text">{{ merchantInitial }}</text>
 			</view>
 			<view class="pay-merchant__meta">
-				<text class="pay-merchant__label">付款给</text>
 				<text class="pay-merchant__name">{{ merchantName }}</text>
 			</view>
 		</view>
@@ -32,32 +31,44 @@
 				v-if="hasOutstanding"
 				class="pay-debt-tip"
 				@click="fillOutstanding">
-				<text class="pay-debt-tip__label">待结金额</text>
-				<text class="pay-debt-tip__value">¥{{ outstandingAmount }}</text>
-				<text class="pay-debt-tip__action">填入</text>
+				<view class="pay-debt-tip__left">
+					<text class="pay-debt-tip__label">待结金额</text>
+					<text class="pay-debt-tip__value">¥{{ outstandingAmount }}</text>
+				</view>
+				<view class="pay-debt-tip__btn">
+					<text class="pay-debt-tip__action">一键填入</text>
+				</view>
 			</view>
+		</view>
 
-			<!-- 次级文字入口，不抢金额视觉 -->
-			<view class="pay-links">
-				<text
-					v-if="showGatheringBtn"
-					class="pay-link pay-link--debt"
-					@click="goGathering">查看待结订单</text>
-				<text
+		<!-- 账户与明细：独立信息卡，居中排版 -->
+		<view class="pay-extra-card">
+			<view v-if="displayCustomName" class="pay-account">
+				<view class="pay-account__meta">
+					<text class="pay-account__name">付款人：{{ displayCustomName }}</text>
+				</view>
+			</view>
+			<view
+				class="pay-action-row"
+				:class="{
+					'pay-action-row--single': !showGatheringBtn,
+					'pay-action-row--with-account': !!displayCustomName
+				}">
+				<view
 					v-if="showGatheringBtn"
-					class="pay-link__dot">|</text>
-				<text
-					class="pay-link"
-					:class="{ 'pay-link--disabled': !id }"
-					@click="goBalanceChange">查看余额明细</text>
+					class="pay-action-chip pay-action-chip--debt"
+					@click="goGathering">
+					<text class="pay-action-chip__text">查看待结订单</text>
+				</view>
+				<view
+					class="pay-action-chip"
+					:class="{ 'pay-action-chip--disabled': !id }"
+					@click="goBalanceChange">
+					<text class="pay-action-chip__text">查看余额明细</text>
+				</view>
 			</view>
 		</view>
 
-		<!-- 客户角标（谁在付） -->
-		<view v-if="displayCustomName" class="pay-payer">
-			<text class="pay-payer__text">付款账户：{{ displayCustomName }}</text>
-		</view>
-
 		<!-- 底部：支付宝式数字键盘 + 右侧付款键 -->
 		<view class="pay-keyboard-wrap">
 			<view class="pay-keyboard">
@@ -513,74 +524,164 @@ export default {
 	display: flex;
 	flex-direction: row;
 	align-items: center;
+	justify-content: space-between;
 	margin-top: 28upx;
-	padding: 18upx 20upx;
+	padding: 20upx 22upx;
 	background: #fff7f0;
 	border-radius: 12upx;
 	box-sizing: border-box;
 }
 
+.pay-debt-tip__left {
+	display: flex;
+	flex-direction: row;
+	align-items: baseline;
+	flex: 1;
+	min-width: 0;
+}
+
 .pay-debt-tip__label {
-	font-size: 28upx;
+	font-size: 26upx;
 	color: #999;
-	line-height: 34upx;
+	line-height: 36upx;
+	flex-shrink: 0;
 }
 
 .pay-debt-tip__value {
 	margin-left: 12upx;
-	flex: 1;
 	font-size: 32upx;
 	font-weight: 600;
 	color: #ff6a00;
-	line-height: 34upx;
+	line-height: 36upx;
+}
+
+.pay-debt-tip__btn {
+	flex-shrink: 0;
+	padding: 8upx 20upx;
+	background: #1677ff;
+	border-radius: 28upx;
 }
 
 .pay-debt-tip__action {
-	font-size: 28upx;
-	color: #1677ff;
-	line-height: 34upx;
+	font-size: 24upx;
+	color: #fff;
+	line-height: 32upx;
+}
+
+/* 账户 + 明细入口：白卡居中 */
+.pay-extra-card {
+	margin: 20upx 24upx 0;
+	padding: 28upx 24upx 30upx;
+	background: #fff;
+	border-radius: 16upx;
+	box-sizing: border-box;
 }
 
-.pay-links {
+.pay-account {
 	display: flex;
 	flex-direction: row;
 	align-items: center;
 	justify-content: center;
-	flex-wrap: wrap;
-	margin-top: 28upx;
 }
 
-.pay-link {
-	font-size: 40upx;
+.pay-account__badge {
+	width: 56upx;
+	height: 56upx;
+	border-radius: 50%;
+	background: #e8f3ff;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	flex-shrink: 0;
+}
+
+.pay-account__badge-text {
+	font-size: 24upx;
 	color: #1677ff;
-	line-height: 36upx;
+	font-weight: 600;
+	line-height: 1;
 }
 
-.pay-link--debt {
-	color: #ff6a00;
+.pay-account__meta {
+	margin-left: 16upx;
+	display: flex;
+	flex-direction: column;
+	align-items: flex-start;
+	min-width: 0;
 }
 
-.pay-link--disabled {
-	opacity: 0.45;
+.pay-account__label {
+	font-size: 22upx;
+	color: #999;
+	line-height: 30upx;
 }
 
-.pay-link__dot {
-	margin-left: 16upx;
-	margin-right: 16upx;
-	font-size: 24upx;
-	color: #ddd;
-	line-height: 36upx;
+.pay-account__name {
+	margin-top: 2upx;
+	font-size: 30upx;
+	font-weight: 600;
+	color: #222;
+	line-height: 40upx;
 }
 
-.pay-payer {
-	padding: 20upx 40upx 0;
-	text-align: center;
+.pay-action-row {
+	display: flex;
+	flex-direction: row;
+	align-items: stretch;
+	justify-content: center;
 }
 
-.pay-payer__text {
-	font-size: 40upx;
-	color: #999;
-	line-height: 34upx;
+.pay-action-row--with-account {
+	margin-top: 28upx;
+	padding-top: 28upx;
+	border-top: 1upx solid #f0f0f0;
+}
+
+.pay-action-row--single .pay-action-chip {
+	width: 300upx;
+	flex: none;
+}
+
+.pay-action-chip {
+	flex: 1;
+	max-width: 300upx;
+	height: 72upx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	box-sizing: border-box;
+	background: #f5f9ff;
+	border: 1upx solid #d6e4ff;
+	border-radius: 36upx;
+	margin-left: 20upx;
+
+	&:first-child {
+		margin-left: 0;
+	}
+}
+
+.pay-action-chip--debt {
+	background: #fff7f0;
+	border-color: #ffd8b8;
+}
+
+.pay-action-chip--debt .pay-action-chip__text {
+	color: #ff6a00;
+}
+
+.pay-action-chip--disabled {
+	opacity: 0.45;
+}
+
+.pay-action-chip:active {
+	opacity: 0.85;
+}
+
+.pay-action-chip__text {
+	font-size: 26upx;
+	color: #1677ff;
+	line-height: 36upx;
+	font-weight: 500;
 }
 
 /* 底部键盘：左 3×4 数字区 + 右通栏付款 */

hdh5/unpackage/dist/build/web/assets/admin-cg-alipay.k6azjR7h.js → hdh5/unpackage/dist/build/web/assets/admin-cg-alipay.4vHlnHIy.js

@@ -1 +1 @@
-import{s as a,j as e,u as t,c as n,w as s,f as o,q as i,i as r,o as d,e as p}from"./index-LPP7NGZ3.js";import{c as l}from"./index.Z5dSr7gx.js";import{_ as c}from"./_plugin-vue_export-helper.DOpTCobP.js";const h=c({name:"alipay",components:{},mixins:[],data:()=>({payUrl:"",hasRenew:1}),computed:{},onLoad(a){let e=a.orderSn?a.orderSn:"";this.payInit(e)},mounted(){},methods:{init(){},go(){1==this.hasRenew&&(window.location.href=this.payUrl)},payInit(e){if(""==e)return a({title:"没有找到订单编号",icon:"none",duration:1500}),!1;l({orderSn:e}).then((e=>{if(0==e.code)return a({title:e.msg,icon:"none",duration:1500}),!1;this.hasRenew=e.data.hasRenew?e.data.hasRenew:0,e.data.hasRenew&&1==e.data.hasRenew&&(this.payUrl=e.data.payUrl,window.location.href=this.payUrl)}))}}},[["render",function(a,l,c,h,w,u){const m=i,f=r;return d(),e("div",{class:"app-content pay-wrap"},[t("div",{class:"delivery-wrap"},[t("div",{class:"btn-wrap"},[1==w.hasRenew?(d(),n(m,{key:0,class:"button-com red",onClick:l[0]||(l[0]=a=>u.go())},{default:s((()=>[p("正在打开支付宝...")])),_:1})):o("",!0),0==w.hasRenew?(d(),n(f,{key:1,style:{"margin-top":"50upx","font-size":"40upx","font-weight":"bold","text-align":"center"}},{default:s((()=>[p("商家还未开通此功能")])),_:1})):o("",!0)])])])}],["__scopeId","data-v-1045a385"]]);export{h as default};
+import{s as a,j as e,u as t,c as n,w as s,f as o,q as i,i as r,o as d,e as p}from"./index-DeJtk6D2.js";import{c as l}from"./index.BnW6rNB5.js";import{_ as c}from"./_plugin-vue_export-helper.oz4gR9WW.js";const h=c({name:"alipay",components:{},mixins:[],data:()=>({payUrl:"",hasRenew:1}),computed:{},onLoad(a){let e=a.orderSn?a.orderSn:"";this.payInit(e)},mounted(){},methods:{init(){},go(){1==this.hasRenew&&(window.location.href=this.payUrl)},payInit(e){if(""==e)return a({title:"没有找到订单编号",icon:"none",duration:1500}),!1;l({orderSn:e}).then((e=>{if(0==e.code)return a({title:e.msg,icon:"none",duration:1500}),!1;this.hasRenew=e.data.hasRenew?e.data.hasRenew:0,e.data.hasRenew&&1==e.data.hasRenew&&(this.payUrl=e.data.payUrl,window.location.href=this.payUrl)}))}}},[["render",function(a,l,c,h,w,u){const m=i,f=r;return d(),e("div",{class:"app-content pay-wrap"},[t("div",{class:"delivery-wrap"},[t("div",{class:"btn-wrap"},[1==w.hasRenew?(d(),n(m,{key:0,class:"button-com red",onClick:l[0]||(l[0]=a=>u.go())},{default:s((()=>[p("正在打开支付宝...")])),_:1})):o("",!0),0==w.hasRenew?(d(),n(f,{key:1,style:{"margin-top":"50upx","font-size":"40upx","font-weight":"bold","text-align":"center"}},{default:s((()=>[p("商家还未开通此功能")])),_:1})):o("",!0)])])])}],["__scopeId","data-v-1045a385"]]);export{h as default};

hdh5/unpackage/dist/build/web/assets/admin-clear-alipay.-Kv53ZOD.js → hdh5/unpackage/dist/build/web/assets/admin-clear-alipay.Byx0Xuiw.js

@@ -1 +1 @@
-import{s as a,j as e,u as t,c as n,w as s,f as o,q as i,i as r,o as d,e as p}from"./index-LPP7NGZ3.js";import{b as l}from"./index.Z5dSr7gx.js";import{_ as c}from"./_plugin-vue_export-helper.DOpTCobP.js";const h=c({name:"alipay",components:{},mixins:[],data:()=>({payUrl:"",hasRenew:1}),computed:{},onLoad(a){let e=a.orderSn?a.orderSn:"";this.payInit(e)},mounted(){},methods:{init(){},go(){1==this.hasRenew&&(window.location.href=this.payUrl)},payInit(e){if(""==e)return a({title:"没有找到订单号",icon:"none",duration:1500}),!1;l({orderSn:e}).then((e=>{if(0==e.code)return a({title:e.msg,icon:"none",duration:1500}),!1;this.hasRenew=e.data.hasRenew?e.data.hasRenew:0,e.data.hasRenew&&1==e.data.hasRenew&&(this.payUrl=e.data.payUrl,window.location.href=this.payUrl)}))}}},[["render",function(a,l,c,h,w,u){const m=i,f=r;return d(),e("div",{class:"app-content pay-wrap"},[t("div",{class:"delivery-wrap"},[t("div",{class:"btn-wrap"},[1==w.hasRenew?(d(),n(m,{key:0,class:"button-com red",onClick:l[0]||(l[0]=a=>u.go())},{default:s((()=>[p("正在打开支付宝...")])),_:1})):o("",!0),0==w.hasRenew?(d(),n(f,{key:1,style:{"margin-top":"50upx","font-size":"40upx","font-weight":"bold","text-align":"center"}},{default:s((()=>[p("商家还未开通此功能")])),_:1})):o("",!0)])])])}],["__scopeId","data-v-12a9cc21"]]);export{h as default};
+import{s as a,j as e,u as t,c as n,w as s,f as o,q as i,i as r,o as d,e as p}from"./index-DeJtk6D2.js";import{b as l}from"./index.BnW6rNB5.js";import{_ as c}from"./_plugin-vue_export-helper.oz4gR9WW.js";const h=c({name:"alipay",components:{},mixins:[],data:()=>({payUrl:"",hasRenew:1}),computed:{},onLoad(a){let e=a.orderSn?a.orderSn:"";this.payInit(e)},mounted(){},methods:{init(){},go(){1==this.hasRenew&&(window.location.href=this.payUrl)},payInit(e){if(""==e)return a({title:"没有找到订单号",icon:"none",duration:1500}),!1;l({orderSn:e}).then((e=>{if(0==e.code)return a({title:e.msg,icon:"none",duration:1500}),!1;this.hasRenew=e.data.hasRenew?e.data.hasRenew:0,e.data.hasRenew&&1==e.data.hasRenew&&(this.payUrl=e.data.payUrl,window.location.href=this.payUrl)}))}}},[["render",function(a,l,c,h,w,u){const m=i,f=r;return d(),e("div",{class:"app-content pay-wrap"},[t("div",{class:"delivery-wrap"},[t("div",{class:"btn-wrap"},[1==w.hasRenew?(d(),n(m,{key:0,class:"button-com red",onClick:l[0]||(l[0]=a=>u.go())},{default:s((()=>[p("正在打开支付宝...")])),_:1})):o("",!0),0==w.hasRenew?(d(),n(f,{key:1,style:{"margin-top":"50upx","font-size":"40upx","font-weight":"bold","text-align":"center"}},{default:s((()=>[p("商家还未开通此功能")])),_:1})):o("",!0)])])])}],["__scopeId","data-v-12a9cc21"]]);export{h as default};

hdh5/unpackage/dist/build/web/assets/index.CCNT6-ik.js → hdh5/unpackage/dist/build/web/assets/index.B5J2UtYN.js

@@ -1 +1 @@
-import{h as e}from"./_plugin-vue_export-helper.DOpTCobP.js";const g=g=>e.get("/ghs/get-ghs-data",g),s=g=>e.get("/ghs-balance-change/list",g);export{s as b,g};
+import{h as e}from"./_plugin-vue_export-helper.oz4gR9WW.js";const g=g=>e.get("/ghs/get-ghs-data",g),s=g=>e.get("/ghs-balance-change/list",g);export{s as b,g};

hdh5/unpackage/dist/build/web/assets/index.Z5dSr7gx.js → hdh5/unpackage/dist/build/web/assets/index.BnW6rNB5.js

@@ -1 +1 @@
-import{h as a}from"./_plugin-vue_export-helper.DOpTCobP.js";const s=async s=>a.post("/purchase/ali-pay",s),e=async s=>a.post("/purchase-clear/ali-pay",s),p=async s=>a.get("/purchase/debt-list",s),c=async s=>a.get("/ghs/detail",s),r=async s=>a.post("/purchase-clear/create-order",s);export{r as a,e as b,s as c,c as g,p};
+import{h as a}from"./_plugin-vue_export-helper.oz4gR9WW.js";const s=async s=>a.post("/purchase/ali-pay",s),e=async s=>a.post("/purchase-clear/ali-pay",s),p=async s=>a.get("/purchase/debt-list",s),c=async s=>a.get("/ghs/detail",s),r=async s=>a.post("/purchase-clear/create-order",s);export{r as a,e as b,s as c,c as g,p};

hdh5/unpackage/dist/build/web/index.html

@@ -16,7 +16,7 @@
 	<script src="/static/web/quill-1.3.7.min.js"></script>
     <!--preload-links-->
     <!--app-context-->
-    <script type="module" crossorigin src="/assets/index-LPP7NGZ3.js"></script>
+    <script type="module" crossorigin src="/assets/index-DeJtk6D2.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-BvquTqJD.css">
   </head>
   <body>