From 30ad9dfce942798708902a4e87ac980786524fbf Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Tue, 2 Jul 2024 19:18:24 +0800
Subject: [PATCH] add

---
 config/app.js                |  4 ++--
 pageQuota/vipUser/index.vue  |  2 +-
 pages/login/login.vue        |  4 ++--
 pagesOrder/settle/settle.vue | 13 +++++++------
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/config/app.js b/config/app.js
index 0d6283a..f1f7802 100644
--- a/config/app.js
+++ b/config/app.js
@@ -2,8 +2,8 @@ let BASE_URL
 let WSS_URL
 import store from "@/store/user.js"
 // 环境
-let env = "dev"
-// let env = "prod"
+// let env = "dev"
+let env = "prod"
 // let env = "release";
 // let env = "local";
 
diff --git a/pageQuota/vipUser/index.vue b/pageQuota/vipUser/index.vue
index f36033d..66f3f2c 100644
--- a/pageQuota/vipUser/index.vue
+++ b/pageQuota/vipUser/index.vue
@@ -556,7 +556,7 @@
 					mobile: formData.mobile
 				})
 				formData2.mobile = formData.mobile
-				if (data.user_ship == 4) return;
+				if (data.user_ship == 4 || data.user_ship == 0) return;
 				if (Role.value == 1) {
 					uni.$u.toast('该用户已是会员请使用追加经营资金进行收款')
 					currentTab.value = 1
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 0471e5a..42304f4 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -16,10 +16,10 @@
 						<up-button @click="weixinLogin" color="#20B128" size="large"><up-icon color="#fff"
 								size="28"></up-icon>手机号快捷登录</up-button>
 					</view>
-					<view class="btn">
+					<!-- 	<view class="btn">
 						<up-button @click="navgo('/pages/login/test')" color="#20B128" size="large"><up-icon
 								name="account-fill" color="#fff" size="28"></up-icon>真-手机号快捷登录</up-button>
-					</view>
+					</view> -->
 					<!-- <view class="btn">
             <up-button @click="officialCode" color="#20B128" size="large"><up-icon name="weixin-fill" color="#fff"
                 size="28"></up-icon>公众号授权</up-button>
diff --git a/pagesOrder/settle/settle.vue b/pagesOrder/settle/settle.vue
index 01a6af5..3a6489d 100644
--- a/pagesOrder/settle/settle.vue
+++ b/pagesOrder/settle/settle.vue
@@ -36,8 +36,8 @@
 			<view class="address-info"
 				style='display: flex;justify-content: space-between;width: 690rpx;align-items: center;'>
 				<view class="top" style="align-items: flex-start;">
-					<view style="color: #333;width: 190rpx;">
-						<view style="margin: 0 10rpx;color:#20B128;text-align: center;">推荐自提点</view>
+					<view style="color: #333;width: 200rpx;">
+						<view style="margin: 0 10rpx;color:#20B128;">推荐自提点</view>
 						<view class="isreser"> {{reservation?"次日可提":"当日可提" }}
 						</view>
 					</view>
@@ -110,13 +110,13 @@
 		</view>
 
 		<view class="m-card order-remark">
-			<view style="display: flex;align-items: center;">
+			<!-- <view style="display: flex;align-items: center;">
 				<text style="margin-right: 20rpx;">是否存货</text>
 				<up-radio-group v-model="is_storage" placement="row">
 					<up-radio activeColor="#20b128" label="立即提货" :name="0" style="margin-right: 10rpx;"></up-radio>
 					<up-radio activeColor="#20b128" label="全部存货" :name="1"></up-radio>
 				</up-radio-group>
-			</view>
+			</view> -->
 			<view class="head-title" style="margin-top: 20rpx;">
 				<text>订单备注</text>
 				<text>{{formData.remark.length}}/140</text>
@@ -575,12 +575,13 @@
 <style lang="scss">
 	.isreser {
 		// margin: 0 10rpx;
-		margin-top: 5rpx;
+		// margin-top: 5rpx;
 		color: black;
 		background-color: #F6EECD;
-		padding: 5rpx 10rpx;
+		// padding: 5rpx 4rpx;
 		border-radius: 10rpx;
 		text-align: center;
+		width: 95%;
 	}
 
 	.m-card {