Merge branch 'master' of git.huaml.com:zhh/front-end

hdApp/src/admin/custom/addCustom.vue

@@ -15,7 +15,7 @@
           <input v-model="form.confirmMobile1" type="number" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="confirmMobile1" placeholder="客户手机号" />
         </tui-list-cell>
       </view>
-      <view class="app-footer">
+      <view>
         <div class="btn-wrap">
           <button class="admin-button-com blue big" formType="submit">确认</button>
         </div>

hdApp/src/admin/home/member.vue

@@ -2,12 +2,11 @@
   <view class="app-main app-content">
 
     <view class="input-wrap_box">
-      <view>
-        <AppSearchModule placeholder="这里搜索" @input="searchFn"/>
+      <button class="admin-button-com middle blue" @click="changeSearchStyle()">{{ searchStyle==0?'尾号':'名称' }}</button>
+      <view class="search-container">
+        <AppSearchModule placeholder="这里搜索" v-model="searchText" @input="searchFn"/>
       </view>
-      <view style="padding:0 0upx 0 10upx;" >
-				<button class="admin-button-com middle blue" @click="addCustom()">添加客户</button>
-			</view>
+      <button class="admin-button-com middle blue" @click="addCustom()">添加客户</button>
     </view>
     <view class="app-tabs">
       <app-tabs :tabs="tabs" :isFixed="false" :top="50" :currentTab="tabIndex" :height="100" @change="change" itemWidth="25%" :isAdd="false" />
@@ -117,7 +116,9 @@ export default {
           type:3
         }
       ],
-      customType:0
+      customType:0,
+      searchStyle:0,
+      searchText:''
     };
   },
   onPullDownRefresh() {
@@ -138,6 +139,12 @@ export default {
   onLoad() {
   },
   methods: {
+    changeSearchStyle(){
+      this.searchStyle = this.searchStyle == 0 ? 1 : 0
+      this.searchText = ''
+      this.resetList()
+      this.getMyCustomList()
+    },
     change(e) {
       if (this.tabIndex == e.index) {
         return false;
@@ -148,24 +155,18 @@ export default {
       this.resetList();
       this.getMyCustomList();
     },
-    invite(){
-      this.$msg('开发中')
-      return false
-      this.pageTo({url: '/admin/cg/member'})
-    },
     addCustom(){
       this.pageTo({url: '/admin/custom/addCustom'})
     },
     init() {
       this.getMyCustomList()      
     },
-    searchFn(e) {
+    searchFn() {
       this.resetList();
-      this.seekVal = e;
       this.getMyCustomList()
     },
     getMyCustomList() {
-      return getList({ search:"", page:this.list.page,type:this.customType,name: this.seekVal }).then(res => {
+      return getList({page:this.list.page,type:this.customType,searchText:this.searchText,searchStyle:this.searchStyle }).then(res => {
         if(res.code == 1){
           this.completes(res)
         }
@@ -214,9 +215,19 @@ export default {
   height: 100upx;
   display: flex;
   align-items: center;
-  padding: 0 10upx;
-  & > view:nth-child(1) {
+  padding: 0 20upx;
+  gap: 20upx;
+  
+  .admin-button-com {
+    flex-shrink: 0;
+    min-width: 120upx;
+  }
+  
+  .search-container {
     flex: 1;
+    min-width: 0;
+    display: flex;
+    align-items: center;
   }
 }
 

hdPad/src/pages/home/components/customList.vue

@@ -10,13 +10,8 @@
 
         <view class="search-container">
             <view class="search-box">
-                <input 
-                    type="text" 
-                    v-model="searchKeyword" 
-                    placeholder="客户名称或手机尾号" 
-                    class="search-input" 
-                    @input="handleSearch"
-                />
+                <text class="search-style" @click="changeSearchStyle()">{{ searchStyle == 0 ? '尾号' : '名称' }}</text>
+                <input type="text" v-model="searchText" placeholder="客户名称或手机尾号" class="search-input" @input="handleSearch" @focus="clearSearch()" />
                 <text class="clear-btn" @tap="clearSearch">清空</text>
             </view>
             <view class="number-keyboard">
@@ -95,14 +90,21 @@ export default {
             type:0,
             selCustomId:0,
             sn:'',
-            searchKeyword: '',
+            searchText: '',
             searchTimer: null,
+            searchStyle:0
         }
     },
     created(){
         this.getCustomData()
     },
     methods:{
+        changeSearchStyle(){
+            this.searchStyle = this.searchStyle == 0 ? 1 : 0
+            this.searchText = ''
+            this.resetList()
+            this.getCustomData()
+        },
         refreshList(){
             this.resetList()
             this.getCustomData()
@@ -121,7 +123,6 @@ export default {
                 clearTimeout(this.searchTimer)
                 this.searchTimer = null
             }
-            
             this.resetList()
             this.getCustomData()
         },
@@ -131,14 +132,13 @@ export default {
                 clearTimeout(this.searchTimer)
                 this.searchTimer = null
             }
-            
-            this.searchKeyword = ''
+            this.searchText = ''
             this.resetList()
             this.getCustomData()
         },
         appendNumber(num) {
             this.$util.hitVoice()
-            this.searchKeyword += num.toString()
+            this.searchText += num.toString()
             // 清除之前的定时器
             if (this.searchTimer) {
                 clearTimeout(this.searchTimer)
@@ -158,10 +158,7 @@ export default {
             }
         },
         getCustomData(){
-            let params = {page:this.list.page,pageSize:20,type:this.type}
-            if (this.searchKeyword) {
-                params.keyword = this.searchKeyword
-            }
+            let params = {page:this.list.page,pageSize:20,type:this.type,searchStyle:this.searchStyle,searchText:this.searchText}
             return getCustomList(params).then(res=>{
                 if(res.code == 1){
                     this.completes(res)
@@ -219,7 +216,15 @@ export default {
             background-color: #f5f5f5;
             border-radius: 5upx;
             margin-bottom: 5upx;
-            
+            .search-style{
+                width: 18%;
+                height: 30upx;
+                line-height: 30upx;
+                text-align: center;
+                background-color: #fff;
+                border-radius: 3upx;
+                font-size: 12upx;
+            }
             .search-input {
                 flex: 1;
                 height: 30upx;

hdh5/admin/ghs/pay.vue

@@ -7,7 +7,7 @@
 				<text class="currency">¥</text>
 				<text class="amount">{{ displayAmount }}</text>
 			</view>
-			<view class="amount-tip">请输入金额</view>
+			<button class="clear-amount-btn" @click="changeAmount(0)">清空金额</button>
 		</view>
 
 		<!-- 客户信息卡片 -->
@@ -24,7 +24,7 @@
 				</view>
 			</view>
 			<view class="debt-info" v-if="Number(customInfo.remainDebtAmount) > 0">
-				<view class="debt-amount">
+				<view class="debt-amount" @click="changeAmount(customInfo.remainDebtAmount)">
 					<text class="debt-label">待结金额</text>
 					<text class="debt-value">¥{{ customInfo.remainDebtAmount }}</text>
 				</view>
@@ -63,42 +63,13 @@
 				class="pay-button" 
 				:class="{ disabled: !canPay }"
 				:disabled="!canPay"
-				@click="showConfirmDialog"
+				@click="handlePay"
 			>
 				<text class="button-text">支付宝支付</text>
 			</button>
 		</view>
 
-		<!-- 确认支付弹框 -->
-		<view class="confirm-dialog" v-if="showConfirm" @click="hideConfirmDialog">
-			<view class="dialog-content" @click.stop>
-				<view class="dialog-header">
-					<text class="dialog-title">提示</text>
-					<view class="close-btn" @click="hideConfirmDialog">
-						<text class="iconfont icon-close">×</text>
-					</view>
-				</view>
-				
-				<view class="dialog-body">
-					<view class="confirm-amount-section">
-						<text class="confirm-label">支付金额</text>
-						<view class="confirm-amount-display">
-							<text class="confirm-currency">¥</text>
-							<text class="confirm-amount">{{ displayAmount }}</text>
-						</view>
-					</view>
-					
-					<view class="confirm-tips">
-						<text class="tip-text">确认金额无误</text>
-					</view>
-				</view>
-				
-				<view class="dialog-footer">
-					<button class="cancel-btn" @click="hideConfirmDialog">取消</button>
-					<button class="confirm-btn" @click="handlePay">确认</button>
-				</view>
-			</view>
-		</view>
+
 	</view>
 </template>
 
@@ -150,8 +121,7 @@ export default {
 			amountBuffer: '0',
 			updateScheduled: false,
 			updateTimer: null,
-			// 弹框状态
-			showConfirm: false,
+
 			id:0,
 			salt:'',
 			ghsInfo:[],
@@ -191,6 +161,10 @@ export default {
 
 	},
 	methods: {
+		changeAmount(amount){
+			this.currentAmount = amount
+			this.updateDisplay()
+		},
 		// 优化：添加触摸反馈
 		handleTouchStart(e) {
 			const target = e.currentTarget;
@@ -334,22 +308,11 @@ export default {
 			}
 		},
 
-		// 显示确认弹框
-		showConfirmDialog() {
-			if (!this.canPay) return;
-			this.showConfirm = true;
-		},
 
-		// 隐藏确认弹框
-		hideConfirmDialog() {
-			this.showConfirm = false;
-		},
 		// 处理支付
 		handlePay() {
 			if (!this.canPay) return;
 			const amount = parseFloat(this.currentAmount);
-			// 隐藏弹框
-			this.hideConfirmDialog();
 			// 简化验证：只要大于0就能支付
 			if (amount <= 0) {
 				uni.showToast({
@@ -469,7 +432,7 @@ export default {
 	
 	.amount-label {
 		color: rgba(255, 255, 255, 0.8);
-		font-size: 28upx;
+		font-size: 34upx;
 		margin-bottom: 20upx;
 	}
 	
@@ -494,9 +457,18 @@ export default {
 		}
 	}
 	
-	.amount-tip {
-		color: rgba(255, 255, 255, 0.6);
-		font-size: 24upx;
+	.clear-amount-btn {
+		color: rgb(226, 219, 219);
+		font-size: 22upx;
+		margin-top: 20upx;
+		background: transparent;
+		border: 1upx solid rgb(226, 219, 219);
+		border-radius: 12upx;
+		padding: 6upx 12upx;
+		transition: all 0.3s ease;
+		cursor: pointer;
+		width: auto;
+		display: inline-block;
 	}
 }
 
@@ -795,206 +767,6 @@ export default {
 	}
 }
 
-// 确认支付弹框样式
-.confirm-dialog {
-	position: fixed;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	background: rgba(0, 0, 0, 0.6);
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	z-index: 9999;
-	animation: fadeIn 0.3s ease;
-	
-	.dialog-content {
-		width: 85%;
-		max-width: 700upx;
-		background: #fff;
-		border-radius: 25upx;
-		overflow: hidden;
-		animation: slideUp 0.3s ease;
-		box-shadow: 0 20upx 60upx rgba(0, 0, 0, 0.2);
-		
-		.dialog-header {
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			padding: 40upx 40upx 30upx;
-			border-bottom: 1upx solid #f0f0f0;
-			background: linear-gradient(135deg, #f8f9fa 0%, #e9ecef 100%);
-			
-			.dialog-title {
-				font-size: 36upx;
-				font-weight: 600;
-				color: #333;
-			}
-			
-			.close-btn {
-				width: 60upx;
-				height: 60upx;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				border-radius: 50%;
-				background: rgba(0, 0, 0, 0.1);
-				cursor: pointer;
-				transition: all 0.2s ease;
-				
-				&:active {
-					background: rgba(0, 0, 0, 0.2);
-					transform: scale(0.95);
-				}
-				
-				.iconfont {
-					font-size: 32upx;
-					color: #666;
-					font-weight: bold;
-				}
-			}
-		}
-		
-		.dialog-body {
-			padding: 50upx 40upx;
-			
-			.confirm-amount-section {
-				text-align: center;
-				margin-bottom: 40upx;
-				
-				.confirm-label {
-					display: block;
-					font-size: 28upx;
-					color: #666;
-					margin-bottom: 25upx;
-					font-weight: 500;
-				}
-				
-				.confirm-amount-display {
-					display: flex;
-					align-items: baseline;
-					justify-content: center;
-					
-					.confirm-currency {
-						font-size: 60upx;
-						font-weight: 600;
-						color: #ff6b6b;
-						margin-right: 10upx;
-					}
-					
-					.confirm-amount {
-						font-size: 100upx;
-						font-weight: 700;
-						color: #ff6b6b;
-						font-family: 'Arial', sans-serif;
-						text-shadow: 0 2upx 10upx rgba(255, 107, 107, 0.3);
-					}
-				}
-			}
-			
-			.confirm-tips {
-				text-align: center;
-				padding: 20upx 30upx;
-				background: rgba(255, 107, 107, 0.1);
-				border-radius: 15upx;
-				border-left: 4upx solid #ff6b6b;
-				
-				.tip-text {
-					font-size: 26upx;
-					color: #666;
-					line-height: 1.5;
-				}
-			}
-		}
-		
-		.dialog-footer {
-			display: flex;
-			border-top: 1upx solid #f0f0f0;
-			padding: 30upx 40upx;
-			gap: 20upx;
-			
-			.cancel-btn, .confirm-btn {
-				flex: 1;
-				height: 100upx;
-				border: none;
-				font-size: 32upx;
-				font-weight: 600;
-				transition: all 0.2s ease;
-				border-radius: 50upx;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				position: relative;
-				overflow: hidden;
-				
-				&::before {
-					content: '';
-					position: absolute;
-					top: 0;
-					left: 0;
-					right: 0;
-					bottom: 0;
-					background: linear-gradient(135deg, rgba(255, 255, 255, 0.1) 0%, rgba(255, 255, 255, 0.05) 100%);
-					opacity: 0;
-					transition: opacity 0.2s ease;
-				}
-				
-				&:active::before {
-					opacity: 1;
-				}
-				
-				&:active {
-					transform: scale(0.98);
-				}
-			}
-			
-			.cancel-btn {
-				background: linear-gradient(135deg, #f8f9fa 0%, #e9ecef 100%);
-				color: #666;
-				border: 2upx solid #dee2e6;
-				box-shadow: 0 2upx 8upx rgba(0, 0, 0, 0.1);
-				
-				&:active {
-					background: linear-gradient(135deg, #e9ecef 0%, #dee2e6 100%);
-					border-color: #ced4da;
-					box-shadow: 0 1upx 4upx rgba(0, 0, 0, 0.15);
-				}
-			}
-			
-			.confirm-btn {
-				background: linear-gradient(135deg, #ff6b6b 0%, #ff5252 100%);
-				color: #fff;
-				box-shadow: 0 4upx 20upx rgba(255, 107, 107, 0.3);
-				
-				&:active {
-					background: linear-gradient(135deg, #ff5252 0%, #ff4444 100%);
-					box-shadow: 0 2upx 10upx rgba(255, 107, 107, 0.4);
-				}
-			}
-		}
-	}
-}
 
-// 弹框动画
-@keyframes fadeIn {
-	from {
-		opacity: 0;
-	}
-	to {
-		opacity: 1;
-	}
-}
-
-@keyframes slideUp {
-	from {
-		opacity: 0;
-		transform: translateY(50upx) scale(0.9);
-	}
-	to {
-		opacity: 1;
-		transform: translateY(0) scale(1);
-	}
-}
 
 </style>

hdh5/unpackage/dist/build/web/assets/admin-cg-alipay.C8Kj3hnx.js → hdh5/unpackage/dist/build/web/assets/admin-cg-alipay.Bm7982M_.js

@@ -1 +1 @@
-import{s as a,f as e,l as t,c as n,w as s,e as o,k as i,i as r,o as d,b as p}from"./index-DMMsC0U2.js";import{p as l}from"./index.CB3gWUfu.js";import{_ as h}from"./_plugin-vue_export-helper.CWsnGXwh.js";const c=h({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,h,c,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{c as default};
+import{s as a,f as e,k as t,c as n,w as s,e as o,j as i,i as r,o as d,b as p}from"./index-CWzVacIH.js";import{p as l}from"./index.CvWM8Ibx.js";import{_ as h}from"./_plugin-vue_export-helper.Dm2AQb3V.js";const c=h({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,h,c,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{c as default};

hdh5/unpackage/dist/build/web/assets/admin-clear-alipay.DAW9W-Q9.js → hdh5/unpackage/dist/build/web/assets/admin-clear-alipay.BMsiaufK.js

@@ -1 +1 @@
-import{s as a,f as e,l as t,c as n,w as s,e as o,k as i,i as r,o as d,b as p}from"./index-DMMsC0U2.js";import{a as l}from"./index.CB3gWUfu.js";import{_ as c}from"./_plugin-vue_export-helper.CWsnGXwh.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,f as e,k as t,c as n,w as s,e as o,j as i,i as r,o as d,b as p}from"./index-CWzVacIH.js";import{a as l}from"./index.CvWM8Ibx.js";import{_ as c}from"./_plugin-vue_export-helper.Dm2AQb3V.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.CB3gWUfu.js → hdh5/unpackage/dist/build/web/assets/index.CvWM8Ibx.js

@@ -1 +1 @@
-import{h as a}from"./_plugin-vue_export-helper.CWsnGXwh.js";const p=async p=>a.post("/purchase/ali-pay",p),s=async p=>a.post("/purchase-clear/ali-pay",p);export{s as a,p};
+import{h as a}from"./_plugin-vue_export-helper.Dm2AQb3V.js";const p=async p=>a.post("/purchase/ali-pay",p),s=async p=>a.post("/purchase-clear/ali-pay",p);export{s as a,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-DMMsC0U2.js"></script>
+    <script type="module" crossorigin src="/assets/index-CWzVacIH.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-Dzn8UyOo.css">
   </head>
   <body>

mallApp/src/pages.json

@@ -67,7 +67,7 @@
         {
             "root": "pages/pay",
             "pages": [
-                { "path": "index", "style": { "navigationBarTitleText": "" } }
+                { "path": "index", "style": { "navigationBarTitleText": "扫码付款" } }
             ]
         },
         {

mallApp/src/pages/home/recent.vue

@@ -44,9 +44,9 @@
                   <view class="section_1 flex-col">
                     <image class="logo" :src="item.smallAvatar" />
                   </view>
-                  <view class="text-group_7 flex-col justify-between">
+                                     <view class="text-group_7 flex-col justify-start">
                     <text class="text_8">{{item.name}}</text>
-                    <text class="text_9">{{item.address}}{{item.floor}}</text>
+                    <text class="text_9">{{item.dist}}{{item.address}}{{item.floor}}</text>
                   </view>
                 </view>
                 <view class="box_4 flex-col"></view>
@@ -75,7 +75,11 @@
                 </view>
               </view>
 
-              <view class="button_4 flex-col" @click.stop="bug(item)"><text class="text_13">买花</text></view>
+              <view class="button_4 flex-col" @click.stop="bug(item)"><text class="text_13">花材</text></view>
+
+              <view class="button_9 flex-col" @click.stop="hs(item)"><text class="text_13">花束</text></view>
+
+              <view class="button_15 flex-col" @click.stop="tj(item)"><text class="text_13">图集</text></view>
 
               </view>
           </view>
@@ -195,6 +199,12 @@ export default {
     bug(item){
       this.pageTo({ url:'/pages/item/item?account='+item.shopId+'&hdId='+item.id})
     },
+    hs(item){
+      this.pageTo({ url:'/pages/home/category?id='+item.id+'&account='+item.shopId})
+    },
+    tj(item){
+      this.pageTo({ url:'/pages/home/mall?id='+item.id+'&account='+item.shopId})
+    },
     init () {
       this.getMyHdList()
     },
@@ -279,10 +289,10 @@ page {
         margin-bottom: 25upx;
         overflow: hidden;
         
-        .image-text_7 {
-          width: 674upx;
-          height: 120upx;
-          margin: 40upx 0 0 31upx;
+                 .image-text_7 {
+           width: 674upx;
+           height: 180upx;
+           margin: 40upx 0 0 31upx;
           
           .section_1 {
             width: 120upx;
@@ -295,10 +305,10 @@ page {
             }
           }
           
-          .text-group_7 {
-            width: 533upx;
-            height: 99upx;
-            margin-top: 5upx;
+                     .text-group_7 {
+             width: 533upx;
+             height: 100upx;
+             margin-top: 5upx;
             
             .text_8 {
               width: 458upx;
@@ -314,17 +324,17 @@ page {
             }
             
             .text_9 {
-              width: 250upx;
-              height: 29upx;
-              color: rgba(153, 153, 153, 1);
-              font-size: 26upx;
-              text-align: left;
-              white-space: nowrap;
-              text-overflow: ellipsis;
-              line-height: 29upx;
-              margin-top: 10upx;
-              overflow: hidden;
-            }
+               width: 250upx;
+               height: 29upx;
+               color: rgba(153, 153, 153, 1);
+               font-size: 26upx;
+               text-align: left;
+               white-space: nowrap;
+               text-overflow: ellipsis;
+               line-height: 29upx;
+               margin-top: 20upx;
+               overflow: hidden;
+             }
           }
         }
         
@@ -385,17 +395,55 @@ page {
           }
         }
 
-        .button_4 {
-          height: 80upx;
-          line-height: 80upx;
-          text-align: center;
-          background-color: #FF2842;
-          width: 130upx;
-          position: absolute;
-          right: 100upx;
-          top: 105upx;
-          border-radius: 20upx;
-          z-index: 10;
+                 .button_4 {
+           height: 80upx;
+           line-height: 80upx;
+           text-align: center;
+           background-color: #FF2842;
+           width: 130upx;
+           position: absolute;
+           right: 45upx;
+           top: 165upx;
+           border-radius: 20upx;
+           z-index: 10;
+          
+          .text_13 {
+            color: rgba(255, 255, 255, 1);
+            font-size: 30upx;
+            font-weight: bold;
+          }
+        }
+
+                 .button_9 {
+           height: 80upx;
+           line-height: 80upx;
+           text-align: center;
+           background-color: #FF2842;
+           width: 130upx;
+           position: absolute;
+           right: 225upx;
+           top: 165upx;
+           border-radius: 20upx;
+           z-index: 10;
+          
+          .text_13 {
+            color: rgba(255, 255, 255, 1);
+            font-size: 30upx;
+            font-weight: bold;
+          }
+        }
+
+                 .button_15 {
+           height: 80upx;
+           line-height: 80upx;
+           text-align: center;
+           background-color: #FF2842;
+           width: 130upx;
+           position: absolute;
+           right: 405upx;
+           top: 165upx;
+           border-radius: 20upx;
+           z-index: 10;
           
           .text_13 {
             color: rgba(255, 255, 255, 1);
@@ -490,12 +538,12 @@ page {
             background-color: white;
             border-radius: 20upx;
             padding: 0;
-            min-width: 400upx;
+            min-width: 600upx;
             box-shadow: 0 10upx 30upx rgba(0, 0, 0, 0.3);
             overflow: hidden;
             
             .popup-item {
-              padding: 35upx 40upx;
+              padding: 55upx 60upx;
               border-bottom: 1upx solid #f0f0f0;
               text-align: center;
               cursor: pointer;
@@ -517,7 +565,7 @@ page {
               
               text {
                 color: #333;
-                font-size: 32upx;
+                font-size: 44upx;
                 font-weight: 500;
                 position: relative;
                 z-index: 1;

mallApp/src/pages/pay/index.vue

@@ -4,8 +4,9 @@
 		<div class="delivery-wrap" v-if="!$util.isEmpty(orderShop)">
 			<div class="shop-logo-wrap" v-if="!$util.isEmpty(orderShop)">
 				<div class="logo-img">
-					<img :src="orderShop.merchant.smallLogoUrl | default_img" alt mode="widthFix" />
+					<img :src="smallAvatar" alt mode="widthFix" />
 				</div>
+				<div class="shop-name">{{ showName }}</div>
 			</div>
 			<div class="module-com pay-input-wrap">
 				<pay-input-module :focus="inpFocus" :num="amount" @focusFn="focusFn" @blurFn="blurFn" @clickKey="clickKeyFn" />
@@ -29,8 +30,7 @@
 			
 			<div class="btn-wrap">
 				<button v-if="!$util.isEmpty(shopUser) && shopUser.userAsset.balance && shopUser.userAsset.balance != '0.00'" class="button-com red" @click="balancePayFn">余额支付</button>
-				<button class="button-com green" v-if="isWxMiniapp()" @click="wexinPayFn">微信支付</button>
-				<button class="button-com red" v-else @click="aliPayFn">支付宝支付</button>
+				<button class="button-com green" @click="wexinPayFn">微信支付</button>
 			</div>
 		</div>
 
@@ -112,7 +112,9 @@
 				// 优惠折扣
 				discountArr: false,
 				// 未设置密码
-				setPassModal: false
+				setPassModal: false,
+				showName:'',
+				smallAvatar:''
 			}
 		},
 		computed: {
@@ -142,9 +144,9 @@
 				}
 				getOrderShop(true).then(res => {
 					this.inpFocus = true
-					uni.setNavigationBarTitle({
-						title: `向【${res.shop.showName}】付款`
-					})
+
+					this.showName = res.shop.showName
+					this.smallAvatar = res.shop.smallAvatar
 					this.$refs.couponSel._getUserDiscount().then(status => {
 						this.discountArr = status
 					})
@@ -358,17 +360,22 @@
 			}
 		}
 		.shop-logo-wrap {
-			padding-bottom: 20upx;
-			@include disFlex(center, center);
+			padding-bottom: 40upx;
+			padding-top: 20upx;
+			text-align: center;
 			.logo-img {
 				width: 120upx;
 				border-radius: 50%;
-				margin: 10upx auto;
-				// margin-right: 20upx;
+				margin: 0 auto 20upx;
 				img {
 					border-radius: 50%;
 				}
 			}
+			.shop-name {
+				font-size: 38upx;
+				color: #333;
+				font-weight: bold;
+			}
 		}
 		// 可选优惠
 		.discount-wrap {
@@ -397,8 +404,16 @@
 			.button-com {
 				display: block;
 				margin-bottom: 20upx;
-				padding-top: 30upx;
-				padding-bottom: 30upx;
+				padding-top: 50upx;
+				padding-bottom: 50upx;
+				height: 120upx;
+				line-height: 20upx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				font-size: 32upx;
+				font-weight: 600;
+				border-radius: 30upx;
 				&:last-child {
 					margin-bottom: 0;
 				}

mallh5/pages/pay/index.vue

@@ -59,7 +59,7 @@
 				class="pay-button" 
 				:class="{ disabled: !canPay }"
 				:disabled="!canPay"
-				@click="showConfirmDialog"
+				@click="handlePay"
 			>
 				<text class="button-text">支付宝支付</text>
 			</button>
@@ -337,7 +337,7 @@ export default {
 			if (!this.canPay) return;
 			const amount = parseFloat(this.currentAmount);
 			// 隐藏弹框
-			this.hideConfirmDialog();
+			//this.hideConfirmDialog();
 			// 简化验证：只要大于0就能支付
 			if (amount <= 0) {
 				uni.showToast({

mallh5/unpackage/dist/build/web/assets/pages-pay-demo.DKbUWRD_.js → mallh5/unpackage/dist/build/web/assets/pages-pay-demo.Brbaf00c.js

@@ -1 +1 @@
-import{c as e,w as a,i as o,o as t,a as n}from"./index-BAY5fNlH.js";import{_ as s}from"./_plugin-vue_export-helper.BCo6x5W8.js";const r=s({name:"index",data:()=>({}),computed:{},onLoad(e){},methods:{}},[["render",function(s,r,d,u,i,m){const p=o;return t(),e(p,null,{default:a((()=>[n(" 您好 ")])),_:1})}]]);export{r as default};
+import{c as e,w as a,i as o,o as t,a as n}from"./index-L-mm2gf-.js";import{_ as s}from"./_plugin-vue_export-helper.BCo6x5W8.js";const r=s({name:"index",data:()=>({}),computed:{},onLoad(e){},methods:{}},[["render",function(s,r,d,u,i,m){const p=o;return t(),e(p,null,{default:a((()=>[n(" 您好 ")])),_:1})}]]);export{r as default};

mallh5/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-BAY5fNlH.js"></script>
+    <script type="module" crossorigin src="/assets/index-L-mm2gf-.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-Dzn8UyOo.css">
   </head>
   <body>