From f9a08075abe43538ca4e40fe29f6a247028c9fc7 Mon Sep 17 00:00:00 2001
From: wx-jincw <jin.chenwei@iwhalecloud.com>
Date: Sat, 27 Dec 2025 15:08:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=A2=E5=8D=95=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/manifest.json                       |  6 +-
 app/pages/users/order_confirm/index.vue | 88 ++++++++++++++-----------
 app/static/html/pc.html                 |  6 +-
 3 files changed, 54 insertions(+), 46 deletions(-)

diff --git a/app/manifest.json b/app/manifest.json
index b8daba4..81ed053 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
 {
-    "name" : "甄味馆商城",
+    "name" : "商城",
     "appid" : "__UNI__B905528",
-    "description" : "甄味馆商城",
+    "description" : "商城",
     "versionName" : "1.0.0",
     "versionCode" : 1001,
     "transformPx" : false,
@@ -172,7 +172,7 @@
         "async" : {
             "timeout" : 200000
         },
-        "title" : "甄味馆"
+        "title" : "商城"
     },
     "plus" : {
         "statusbar" : {
diff --git a/app/pages/users/order_confirm/index.vue b/app/pages/users/order_confirm/index.vue
index a5b8281..87ca6db 100644
--- a/app/pages/users/order_confirm/index.vue
+++ b/app/pages/users/order_confirm/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class='order-submission'>
-			<view class="allAddress" :style="store_self_mention ? '':'padding-top:10rpx;'">
+			<!-- <view class="allAddress" :style="store_self_mention ? '':'padding-top:10rpx;'">
 				<view class="nav acea-row">
 					<view class="item font-color" :class="shippingType == 0 ? 'on' : 'on2'" @tap="addressType(0)"
 						v-if='store_self_mention'></view>
@@ -42,11 +42,11 @@
 				<view class='line'>
 					<image src='/static/images/line.jpg'></image>
 				</view>
-			</view>
+			</view> -->
 			<view class="pad30">
 				<orderGoods :cartInfo="cartInfo" :orderProNum="orderProNum"></orderGoods>
 				<view class='wrapper borRadius14'>
-					<view class='item acea-row row-between-wrapper' @tap='couponTap'
+					<!-- <view class='item acea-row row-between-wrapper' @tap='couponTap'
 						v-if="!orderInfoVo.bargainId && !orderInfoVo.combinationId && !orderInfoVo.seckillId && productType==='normal'">
 						<view>优惠券</view>
 						<view class='discount'>{{couponTitle}}
@@ -57,7 +57,6 @@
 					<view class='item acea-row row-between-wrapper'
 						v-if="!orderInfoVo.bargainId && !orderInfoVo.combinationId && !orderInfoVo.seckillId && productType==='normal'">
 						<view>积分抵扣</view>
-					<!-- 	 -->
 						<view class='discount acea-row row-middle'>
 							<view> {{useIntegral ? "剩余积分":"当前积分"}}
 								<text class='num font-color'>{{useIntegral ? orderInfoVo.surplusIntegral : orderInfoVo.userIntegral || 0}}</text>
@@ -66,13 +65,13 @@
 								<checkbox :checked='useIntegral ? true : false' :disabled="orderInfoVo.userIntegral==0 && !useIntegral"/>
 							</checkbox-group>
 						</view>
-					</view>
+					</view> -->
 					<!-- <view class='item acea-row row-between-wrapper'
 						v-if="priceGroup.vipPrice > 0 && userInfo.vip && !pinkId && !BargainId && !combinationId && !seckillId">
 						<view>会员优惠</view>
 						<view class='discount'>-￥{{priceGroup.vipPrice}}</view>
 					</view> -->
-					<view class='item acea-row row-between-wrapper' v-if='shippingType==0'>
+					<!-- <view class='item acea-row row-between-wrapper' v-if='shippingType==0'>
 						<view>快递费用</view>
 						<view class='discount' v-if='parseFloat(orderInfoVo.freightFee) > 0'>
 							+￥{{orderInfoVo.freightFee}}
@@ -94,7 +93,7 @@
 									@blur='phone'></input>
 							</view>
 						</view>
-					</view>
+					</view> -->
 					<!-- <view class='item acea-row row-between-wrapper' wx:else>
 		      <view>自提门店</view>
 		      <view class='discount'>{{system_store.name}}</view>
@@ -105,7 +104,7 @@
 							value="" name="mark" placeholder='请添加备注（150字以内）'></textarea>
 					</view>
 				</view>
-				<view class='wrapper borRadius14'>
+				<!-- <view class='wrapper borRadius14'>
 					<view class='item'>
 						<view>支付方式</view>
 						<view class='list'>
@@ -122,7 +121,7 @@
 							</view>
 						</view>
 					</view>
-				</view>
+				</view> -->
 				<view class='moneyList borRadius14'>
 					<view class='item acea-row row-between-wrapper'>
 						<view>商品总价：</view>
@@ -627,6 +626,15 @@
 			getOrderPay: function(orderNo, message) {
 				let that = this;
 				let goPages = '/pages/order_pay_status/index?order_id=' + orderNo + '&msg=' + message;
+				uni.hideLoading();
+				return that.$util.Tips({
+					title: '支付成功',
+					icon: 'success'
+				}, {
+					tab: 5,
+					url: goPages
+				});
+				return;
 				wechatOrderPay({
 					orderNo: orderNo,
 					payChannel: that.payChannel,
@@ -911,32 +919,32 @@
 				let that = this,
 					data = {};
 
-				if (!that.payType) return that.$util.Tips({
-					title: '请选择支付方式'
-				});
-				if (!that.address.addressId && !that.shippingType) return that.$util.Tips({
-					title: '请选择收货地址'
-				});
-				if (that.shippingType == 1) {
-					if (that.contacts == "" || that.contactsTel == "") {
-						return that.$util.Tips({
-							title: '请填写联系人或联系人电话'
-						});
-					}
-					if (!/^1(3|4|5|7|8|9|6)\d{9}$/.test(that.contactsTel)) {
-						return that.$util.Tips({
-							title: '请填写正确的手机号'
-						});
-					}
-					if (!/^[\u4e00-\u9fa5\w]{2,16}$/.test(that.contacts)) {
-						return that.$util.Tips({
-							title: '请填写您的真实姓名'
-						});
-					}
-					if (that.storeList.length == 0) return that.$util.Tips({
-						title: '暂无门店,请选择其他方式'
-					});
-				}
+				// if (!that.payType) return that.$util.Tips({
+				// 	title: '请选择支付方式'
+				// });
+				// if (!that.address.addressId && !that.shippingType) return that.$util.Tips({
+				// 	title: '请选择收货地址'
+				// });
+				// if (that.shippingType == 1) {
+				// 	if (that.contacts == "" || that.contactsTel == "") {
+				// 		return that.$util.Tips({
+				// 			title: '请填写联系人或联系人电话'
+				// 		});
+				// 	}
+				// 	if (!/^1(3|4|5|7|8|9|6)\d{9}$/.test(that.contactsTel)) {
+				// 		return that.$util.Tips({
+				// 			title: '请填写正确的手机号'
+				// 		});
+				// 	}
+				// 	if (!/^[\u4e00-\u9fa5\w]{2,16}$/.test(that.contacts)) {
+				// 		return that.$util.Tips({
+				// 			title: '请填写您的真实姓名'
+				// 		});
+				// 	}
+				// 	if (that.storeList.length == 0) return that.$util.Tips({
+				// 		title: '暂无门店,请选择其他方式'
+				// 	});
+				// }
 				data = {
 					realName: that.contacts,
 					phone: that.contactsTel,
@@ -951,11 +959,11 @@
 					payChannel: that.payChannel||'weixinh5'
 
 				};
-				if (data.payType == 'yue' && parseFloat(that.userInfo.nowMoney) < parseFloat(that.totalPrice))
-					return that.$util
-						.Tips({
-							title: '余额不足！'
-						});
+				// if (data.payType == 'yue' && parseFloat(that.userInfo.nowMoney) < parseFloat(that.totalPrice))
+				// 	return that.$util
+				// 		.Tips({
+				// 			title: '余额不足！'
+				// 		});
 				uni.showLoading({
 					title: '订单支付中'
 				});
diff --git a/app/static/html/pc.html b/app/static/html/pc.html
index e15b16b..80fee3a 100644
--- a/app/static/html/pc.html
+++ b/app/static/html/pc.html
@@ -4,11 +4,11 @@
 		<meta charset="utf-8">
 		<meta http-equiv="X-UA-Compatible" content="IE=edge">
 		<meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1">
-		<title>甄味馆</title>
+		<title>商城</title>
 		<meta name="Copyright" content="helang">
 		<!-- <link rel="shortcut icon" type="image/png" href="/uniapp-extend/static/logo.png"> -->
-		<meta name="keywords" content="甄味馆">
-		<meta name="description" content="甄味馆">
+		<meta name="keywords" content="商城">
+		<meta name="description" content="商城">
 		<style type="text/css">
 			body {
 				margin: 0;