From de66593e4ab294e1ea438dab7242d7319c14f89e Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Thu, 20 Jun 2024 14:58:05 +0800
Subject: [PATCH] add

---
 components/pwdKeyBord.vue           | 249 ++++++++++++++++++++++++++++
 pages.json                          |   7 +
 pages/cart/cart.vue                 |  11 +-
 pages/index/index.vue               |  12 +-
 pages/my/my.vue                     |   2 +-
 pagesOrder/setPayPassword/index.vue |  12 ++
 static/del.webp                     | Bin 0 -> 1400 bytes
 7 files changed, 286 insertions(+), 7 deletions(-)
 create mode 100644 components/pwdKeyBord.vue
 create mode 100644 pagesOrder/setPayPassword/index.vue
 create mode 100644 static/del.webp

diff --git a/components/pwdKeyBord.vue b/components/pwdKeyBord.vue
new file mode 100644
index 0000000..4a59bf8
--- /dev/null
+++ b/components/pwdKeyBord.vue
@@ -0,0 +1,249 @@
+<template>
+	<up-popup ref="popup" type="bottom" :mask-background-color="isPay?'rgba(0,0,0,.8)':'transparent'" safeArea
+		backgroundColor="transparent" :animation="true" @maskClick="maskClick">
+		<view class="popup-wrap" :style="{'border-radius':isPay?'': 0}">
+			<view class="paybox" v-if="isPay">
+				<view class="paybox-title">
+					<view class="paybox-title-left"></view>
+					<view class="paybox-title-middle">{{title}}</view>
+					<view class="paybox-titler-right" @click="handleClose">
+						<up-icon name="close" size="18" color="#666" />
+					</view>
+				</view>
+				<view class="paybox-input">
+					<u-code-input v-model="value" mode="box" dot readonly></u-code-input>
+				</view>
+			</view>
+
+			<view class="keyboard">
+				<view class="keyboard-left" :style="{width:isPay?'100%':''}">
+					<block v-for="(item,indx) in keys" :key="indx">
+						<view class="keyboard-left-item active del" v-if="item=='del'" @click="handleClick(item)">
+							<image style="width: 48rpx;height: 48rpx;" src="@/static/del.webp" />
+						</view>
+
+						<view class="keyboard-left-item word active" :style="{width:isPay?'0%':'',border:isPay?'0':''}"
+							v-else-if="item == '.'" @click="handleClick(item)">
+							{{isPay?'':item}}
+						</view>
+
+						<view class="keyboard-left-item word active" :style="{width:(isPay && item == '0')?'66.66%':''}"
+							v-else @click="handleClick(item)">
+							{{item}}
+						</view>
+					</block>
+				</view>
+				<view class="keyboard-right" :style="{width:isPay?'0%':''}">
+					<view class="keyboard-right-clear word active" @click="handleClear">清空</view>
+					<view class="keyboard-right-pay word active-pay" @click="handlePay">{{txt}}</view>
+				</view>
+			</view>
+		</view>
+	</up-popup>
+</template>
+
+<script>
+	export default {
+		name: "popups",
+		props: {
+			txt: {
+				type: String,
+				default: '付款'
+			},
+			isPay: { //区分支付密码还是输入数字
+				type: Boolean,
+				default: false
+			},
+			title: {
+				type: String,
+				default: '请输入支付密码'
+			}
+		},
+		data() {
+			return {
+				keys: [1, 2, 3, 4, 5, 6, 7, 8, 9, 0, '.', 'del'],
+				value: '',
+			}
+		},
+
+		watch: {
+			value(newVal, oldVal) {
+				// 输入密码走此处
+				if (newVal.length == 6 && this.isPay) {
+					this.handlePay();
+				}
+			}
+		},
+
+		methods: {
+			// 键盘点击
+			handleClick(item) {
+				if (this.value.length >= 10) return;
+				if (item == ".") {
+					if (!this.value) {
+						this.value = '0.';
+					} else {
+						if (this.value.indexOf('.') > -1) return;
+						this.value = this.value + item;
+					}
+				} else if (item == 'del') {
+					if (this.value == "0.")
+						this.value = this.value.substring(0, 0);
+					else {
+						this.value = this.value.substring(0, this.value.length - 1);
+					}
+				} else if (item == 0) {
+					if (this.isPay) {
+						this.value = this.value + item;
+					} else {
+						if (this.value) {
+							if (this.value.lastIndexOf('.') != -1 && this.value.length - this.value.lastIndexOf('.') == 3)
+								return;
+							this.value = this.value + item;
+						} else {
+							this.value = this.value + item;
+						}
+					}
+				} else {
+					if (this.value.lastIndexOf('.') != -1 && this.value.length - this.value.lastIndexOf('.') == 3) return;
+					this.value = this.value + item;
+				}
+
+				this.$emit('change', this.value);
+			},
+
+			// 清空
+			handleClear() {
+				this.value = '';
+				this.$emit('clear');
+			},
+
+			// 付款
+			handlePay() {
+				// 如果最后一位是. 去除
+				if (this.value && this.value.endsWith('.')) {
+					this.value = this.value.replace('.', '');
+				}
+
+				this.$emit('confirm', this.value);
+				this.handleClose();
+			},
+
+			// 开启
+			handleOpen(type) {
+				if (!type) this.value = "";
+				this.$refs.popup.open();
+			},
+
+			// 关闭
+			handleClose() {
+				this.$refs.popup.close();
+			},
+
+			maskClick() {
+				// 如果最后一位是. 去除
+				if (this.value && this.value.endsWith('.')) {
+					this.value = this.value.replace('.', '');
+				}
+				this.$emit('change', this.value);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.popup-wrap {
+		background-color: #fff;
+		border-radius: 30rpx 30rpx 0 0;
+
+		.paybox {
+			.paybox-title {
+				display: flex;
+				justify-content: space-between;
+				padding: 40rpx;
+
+				.paybox-title-left {}
+
+				.paybox-title-middle {
+					font-size: 30rpx;
+					font-weight: bold;
+					color: #333;
+				}
+
+				.paybox-titler-right {}
+			}
+
+			.paybox-input {
+				display: flex;
+				justify-content: center;
+				margin-bottom: 40rpx;
+
+				:deep(.u-code-input__item) {
+					background-color: #E6E6E6;
+					border-radius: 8rpx;
+					border: 0 !important;
+				}
+			}
+		}
+	}
+
+	.keyboard {
+		display: flex;
+		padding-bottom: 20rpx;
+		border-top: 2rpx solid #E6E6E6;
+
+		.keyboard-left {
+			width: 75%;
+			display: flex;
+			flex-wrap: wrap;
+
+			.keyboard-left-item {
+				width: 33.3%;
+				height: 120rpx;
+				line-height: 102rpx;
+				border-bottom: 2rpx solid #E6E6E6;
+				border-right: 2rpx solid #E6E6E6;
+			}
+
+			.del {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+		}
+
+		.keyboard-right {
+			width: 25%;
+
+			.keyboard-right-clear {
+				width: 100%;
+				height: 120rpx;
+				line-height: 120rpx;
+			}
+
+			.keyboard-right-pay {
+				width: 100%;
+				height: 360rpx;
+				line-height: 360rpx;
+				text-align: center;
+				background-color: #40AE36;
+				color: #fff !important;
+			}
+		}
+
+		.word {
+			font-weight: 600;
+			font-size: 34rpx;
+			color: #000000;
+			text-align: center;
+		}
+
+		.active:active {
+			background-color: rgba(232, 232, 232, 0.5);
+		}
+
+		.active-pay:active {
+			opacity: .9;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index ed62957..3f307fa 100644
--- a/pages.json
+++ b/pages.json
@@ -161,6 +161,13 @@
 						"navigationBarTitleText": "确认订单",
 						"enablePullDownRefresh": false
 					}
+				},
+				{
+					"path": "setPayPassword/index",
+					"style": {
+						"navigationBarTitleText": "设置密码",
+						"enablePullDownRefresh": false
+					}
 				}
 			]
 		},
diff --git a/pages/cart/cart.vue b/pages/cart/cart.vue
index 1e7ddac..be64ca6 100644
--- a/pages/cart/cart.vue
+++ b/pages/cart/cart.vue
@@ -109,8 +109,15 @@
 					</view>
 				</view>
 				<view style="width: 200rpx;">
-					<up-button color="#20b128" shape="circle" :disabled="!checkAll" @click="settleAccounts">去结算<text
-							v-if="checkAll">({{checkAll}})</text></up-button>
+					<up-button color="#20b128" shape="circle" :disabled="!checkAll || c_price0<500  "
+						@click="settleAccounts">
+						<view class="" v-if='c_price0>=500'>
+							去结算<text v-if="checkAll">({{checkAll}})</text>
+						</view>
+						<view class="" v-else>
+							¥500起订
+						</view>
+					</up-button>
 				</view>
 			</view>
 			<view v-else class="btn-boxs">
diff --git a/pages/index/index.vue b/pages/index/index.vue
index a8423e3..ef5a14b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -144,12 +144,15 @@
 									<text>{{item.spec}}</text>
 								</view>
 							</view>
+							<view style="display: flex;" v-if='userStore?.userInfo?.user_ship==1'>
+								<view class="price" style="margin-right: 10rpx;">￥{{item.vip_price}}</view>
+								<text class='price'>会员价</text>
+							</view>
 							<view class="price-btn">
-								<view class="price">￥{{item.price}}</view>
+								<view class="price" style="font-size: 24rpx;">￥{{item.price}}</view>
 								<view class="btn">
 									<u--icon name="plus-circle-fill" size="20" color="#20b128"></u--icon>
 								</view>
-
 							</view>
 						</view>
 					</view>
@@ -169,7 +172,8 @@
         </view> -->
 			</view>
 			<view class="btn">
-				<up-button color="#20b128" :disabled="cartInfo.count==0" @click="settleAccounts">结算</up-button>
+				<up-button color="#20b128" :disabled="cartInfo.total_price<500" @click="settleAccounts">
+					{{cartInfo.total_price<500?"¥500起订":"结算" }} </up-button>
 			</view>
 			<view class="cart" @click="navTo('/pages/cart/cart')">
 				<image src="@/static/icon/cart.png"></image>
@@ -220,7 +224,7 @@
 	const userStore = useUserStore();
 	const STORE_INFO = reactive({
 		id: 23,
-		store_name: "农(特)产品直营店"
+		store_name: "新"
 	})
 
 	const getStoreInfoFn = () => {
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 810aec5..e804321 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -107,8 +107,8 @@
 
 		<view class="card">
 			<up-cell-group>
-				<!-- <up-cell title="我的余额" :isLink="true" url="/pageQuota/Balance/index"></up-cell> -->
 				<up-cell title="我的地址" :isLink="true" url="/pagesOrder/addressList/addressList"></up-cell>
+				<up-cell title="支付密码" :isLink="true" url="/pagesOrder/setPayPassword/index"></up-cell>
 			</up-cell-group>
 		</view>
 
diff --git a/pagesOrder/setPayPassword/index.vue b/pagesOrder/setPayPassword/index.vue
new file mode 100644
index 0000000..be69dd2
--- /dev/null
+++ b/pagesOrder/setPayPassword/index.vue
@@ -0,0 +1,12 @@
+<template>
+	<view>
+		支付密码
+	</view>
+</template>
+
+<script setup>
+	import pwdKeyBord from '@/components/pwdKeyBord.vue'
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/static/del.webp b/static/del.webp
new file mode 100644
index 0000000000000000000000000000000000000000..7348c6ed1603f78f43a0b0ae669cdb845dd9731c
GIT binary patch
literal 1400
zcmWIYbaN|UWnc(*bqWXzu!!JdU|=u+VpTBmbaoCn!3g9sFrEOBEI_H;ypp0IcPE92
z$S4K&2Mmlr2nLDC#RU)+RuZV{+ck*V%eq)q;1}dfNi9wWD)|7!Dn&rcfo>83vPIG%
zYz+`Q3BtAkvCB&eN`PttK<uKBAZH*u1<2M&M`9--v6BmmK<aydYHV_IN<nsk0LXVd
zsd=HnK$-)HWf+PXf*9NxoIw5u@_`_K5d(w8R|W>=2?(*InG6iuTNxN6ZXv`}7BDdI
zw=ghlJC6`Ugh@eSQ6ktl79h!#md3#FX*mM}ZzKbQ@C612u4u3vkig+K1)!7+&|UdJ
zn9h*HkjkLI;K`83kj$V5WElY?)sVpq7{fk|%nS_rst%k2@=q-$skpD4=Uo4h>3{C!
z3#~?n3ROJ&f^5|vc8mYWpWUW+e4>h_*Vj2M`f(5T=SuC8*_JDP!ZY~o-G}jt4GbI(
zhZ%W5j%v94ci-p77e9Z$eC_rB@;!HB;@4lk_WAqkg1z5<{m;&>-x;uVY1Zo8-JfG_
zhs>`1{^xI>*V0>Z$3t?1bx&XV`+4KNZ7Ugaqt|L*{rfp{Z*F#V$mva2wyB&yBV#I>
zkmgmynA=}9>CfaPaaT9#RR8^-rUn#ctI4fzn0Ya5(&A|<U(fKEDtw(Sx&HtDnT!l^
zq6`yQ0w#qV2xL}a3}9A~1jZ&qL)9b(hDkgN*jPM_zA`efPe@s%65_dx=@;uiwW|$v
z?GB!70gON;b#t^%)-6*}$i8iMId9&LZMmD%%GBpB$XmAUZNa1~+xC9{RhPNz`m8PP
zw!JU*Gi}eE;&I$$k2@#~$OI10`Xsa0ZoL)-Bg)=6?OnX&{a;-rB=EagHTnDb{wU3*
zQ-Zu;gq6~BCe>8`C$|H11oqGQ)p=l<0;h6(UGFlds25?;JbG{2^UaUBe4PIAy#4XZ
zjhB9Y=w%Z>ygpUO%;V0B_aDAJS;1nsHh=H$)`Lc0oc)&kV!OEM=i2T1>I#AHWAnGE
zUQ1te;rsjcAeqb3aTV;J7Zv^fB3UD`^PbRDg)c#TB7!M@(=F$`+vJ#Y{q~6*MV{J8
z#xq$uqCYDYZA+0{U2gm3-S+&6^2dWXFBOODU3IN}{D$w|SGoNY7caH2P@4SnphuC+
zi@#b$hT`J4>+0Y4M^9Taq2k`=TN2`x>h=30XK%=<l-*b5pSSJ5V#S(Io4&8O-}wIO
z^`cc<-q-%{`zh4d%{8xLeb$`WZ7MZdVz1&W&i~6PtJwS~>PcmO&H|P8dw;E7b@%>b
zeeWf_F5=CcNh{wyc%^L_w@1a%r0jQm%lau+%G-X<_DTQA?ENGrC*b8T{!b?NC9lht
z?>(utpz7iAi!sx4!|Xnksp&jCF|pD0eGTgoKA$N+*T{HuT@`lSr=@YCYkiUC+xL@h
xwL7<ko`1T?@R&q$4~!@d_1o<d`~8!=QO)$=pa0gv;}#st_h$T!|D(&u0049P?|=XR

literal 0
HcmV?d00001