From 48cc5f9c2ae84153774601ef6fbff10979c40a84 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Tue, 19 Mar 2024 09:32:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/payment/get_payment.vue | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/pages/payment/get_payment.vue b/pages/payment/get_payment.vue
index 15b438e..1727b01 100644
--- a/pages/payment/get_payment.vue
+++ b/pages/payment/get_payment.vue
@@ -2,15 +2,18 @@
 	<view class="container">
 		<view v-if="!isWeixin" class="v-navbar">
 			<u-navbar title="提货付款" :safeAreaInsetTop="false" :fixed="false" @leftClick="leftClick" bgColor="transparent"
-				leftIconColor="#fff" :titleStyle="{color:'#fff',fontWeight:'bold',fontSize:'32rpx'}">
+				leftIconColor="#333" :titleStyle="{color:'#333',fontWeight:'bold',fontSize:'32rpx'}">
 			</u-navbar>
 		</view>
-		<!-- <view style="height: 150rpx;"></view> -->
-		<view class="wrap">
+		<view style="height: 50rpx;"></view>
+		<view class="wrap" >
 			<view class="shop">
 				<image src="@/static/shop_logo.webp" style="width: 62rpx;height: 54rpx;" />
-				<text class="shop-name">{{mer_name}}</text>
+				<text class="shop-name" v-if="mer_name">{{mer_name||''}}</text>
 			</view>
+      <uni-popup type="bottom" ref="pop">
+        <view style="height: 500rpx;background-color: #fff;width: 100%;"></view>
+      </uni-popup>
 
 			<!-- 付款金额 -->
 			<view class="v-con">
@@ -44,13 +47,13 @@
 				</view>
 			</view>
 
-			<view class="v-btn-wrap" v-if="cartForm.total_amount" @click="submitOrder">
-				<view class="v-btn">{{cartForm.total_amount}}元 确认支付</view>
+			<view class="v-btn-wrap" @click="cartForm.total_amount?submitOrder():null">
+				<view class="v-btn">{{cartForm.total_amount||0}}元 确认支付</view>
 			</view>
 
 			<!-- 登陆 -->
-			<authorize :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" @onLoadFun="onLoadFun">
-			</authorize>
+			<!-- <authorize :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" @onLoadFun="onLoadFun">
+			</authorize> -->
 		</view>
 
 		<!-- 无商户信息提示 -->
@@ -90,7 +93,8 @@
 		data() {
 			return {
 				isEmpty: true,
-				isWeixin: this.$wechat.isWeixin(),
+				// isWeixin: this.$wechat.isWeixin(),
+				isWeixin: false,
 				cartForm: {
 					product_id: '',
 					product_attr_unique: '',
@@ -125,7 +129,6 @@
 		onLoad(opt) {
 			that = this;
 			this.mer_id = opt.mer_id;
-
 		},
 		onShow() {
 			this.getProductInfoByMerid(this.mer_id);
@@ -146,6 +149,9 @@
 
 		},
 		methods: {
+      test(){
+        this.$refs.pop.open()
+      },
 			validateDecimal(event) {
 				let val = (that.cartForm.total_amount.match(/^\d*(\.?\d{0,2})/g)[0]) || ''
 				that.$nextTick(() => {
@@ -231,16 +237,17 @@
 			},
 
 			getProductInfoByMerid(merid, money) {
-				if (!that.cartForm.total_amount) return;
+				// if (!that.cartForm.total_amount) return;
 				getProductInfo({
 					mer_id: that.mer_id,
 					money: that.cartForm.total_amount
 				}).then(res => {
+          console.log(res);
 					if (!that.cartForm.total_amount) {
 						this.mer_name = res.data.merchant;
 					} else {
 						that.merchantInfo = res.data.list;
-						this.mer_name = res.data.merInfo;
+						// this.mer_name = res.data.merInfo;
 					}
 				}).catch((err) => {
 					that.tips = err.message || err.smg || err;