From 56ab4cb220046974b752bb435fe5c77924b83d81 Mon Sep 17 00:00:00 2001
From: sx <2427911852@qq.com>
Date: Wed, 12 Feb 2025 17:03:02 +0800
Subject: [PATCH] =?UTF-8?q?2025.02.12=20=E5=B7=A5=E4=BD=9C=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jiuyi2/common/js/config.js                    |  4 +
 jiuyi2/components/index/teen.vue              |  8 +-
 jiuyi2/components/mine/payPwd.vue             | 73 +++++++++++++--
 .../components/public/keyboard/keyboard.scss  | 43 +++++++++
 .../components/public/keyboard/keyboard.vue   | 89 +++++++++++++++++++
 .../shop/productList/productList.vue          |  2 +
 jiuyi2/manifest.json                          |  4 +-
 jiuyi2/pages/index/index.nvue                 |  8 +-
 jiuyi2/pages/index/integralMall.vue           |  2 +-
 jiuyi2/pages/mine/setting/secondPwd.vue       | 21 +++--
 jiuyi2/pages/news/news.vue                    | 11 ++-
 jiuyi2/pages/shop/commodity/index.vue         |  2 +-
 jiuyi2/pages/shop/commodity/payment.vue       | 11 ++-
 jiuyi2/pages/shop/settle.vue                  |  8 +-
 14 files changed, 248 insertions(+), 38 deletions(-)
 create mode 100644 jiuyi2/components/public/keyboard/keyboard.scss
 create mode 100644 jiuyi2/components/public/keyboard/keyboard.vue

diff --git a/jiuyi2/common/js/config.js b/jiuyi2/common/js/config.js
index a7122f2c..f0a386bf 100644
--- a/jiuyi2/common/js/config.js
+++ b/jiuyi2/common/js/config.js
@@ -21,6 +21,10 @@ const config = {
 			name: '余额',
 			icon: '/static/balance.png',
 		},
+		durian: {
+			name: '榴莲果',
+			icon: '/static/fruit.png',
+		},
 	},
 	// 腾讯im聊天
 	TChat: {
diff --git a/jiuyi2/components/index/teen.vue b/jiuyi2/components/index/teen.vue
index 34b58671..da486c86 100644
--- a/jiuyi2/components/index/teen.vue
+++ b/jiuyi2/components/index/teen.vue
@@ -14,17 +14,23 @@
 	} = getCurrentInstance()
 	const emit = defineEmits(['setting'])
 
+	// 打开
 	function open() {
 		proxy.$refs.teen.open()
 	}
 
+	// 关闭
 	function close() {
 		proxy.$refs.teen.close()
 	}
 
+	// 设置
 	function handleSetting() {
+		// 
+		uni.navigateTo({
+			url: '/pages/mine/setting/teen'
+		})
 		proxy.$refs.teen.close()
-		emit('setting')
 	}
 
 	// 
diff --git a/jiuyi2/components/mine/payPwd.vue b/jiuyi2/components/mine/payPwd.vue
index 797e6738..b2a58e50 100644
--- a/jiuyi2/components/mine/payPwd.vue
+++ b/jiuyi2/components/mine/payPwd.vue
@@ -9,7 +9,9 @@
 		defineExpose,
 		ref,
 		getCurrentInstance,
-		defineEmits
+		defineEmits,
+		onMounted,
+		nextTick
 	} from 'vue';
 	import {
 		useStore
@@ -20,13 +22,27 @@
 	import api from '@/api/index.js'
 	// 加密
 	import CryptoJS from 'crypto-js';
+	// 条形码输入框
+	import codeInput from '@/components/mine/codeInput.vue'
+	// 软键盘
+	import keyboard from '@/components/public/keyboard/keyboard.vue'
+
 	// 
 	const props = defineProps({
 		// 是否验证
 		check: {
 			type: Boolean,
 			default: false
-		}
+		},
+		// 金额
+		price: {
+			type: [Number, String],
+		},
+		// 单位
+		unitKey: {
+			type: String,
+			default: 'balance'
+		},
 	})
 
 	// 
@@ -41,6 +57,15 @@
 	const pwd = ref('')
 	// 用户信息
 	const userinfo = computed(() => store.state.userinfo)
+	// 单位
+	const unit = computed(() => {
+		let config = util.config.payType
+		return config[props.unitKey] || {}
+	})
+
+	onMounted(() => {
+		console.log('onMounted', keyboard, proxy.$refs)
+	})
 
 	// 打开弹窗
 	function open() {
@@ -64,6 +89,28 @@
 		}, 500)
 	}
 
+	/**
+	 * 支付键盘回调
+	 * @param {Object} val
+	 */
+	function KeyInfo(val) {
+		// 判断是否输入的是删除键
+		if (val.keyCode === 8) {
+			// 删除最后一位
+			pwd.value = pwd.value.slice(0, -1)
+			return
+		}
+		// 如果大于六位
+		if (pwd.value.length >= 6) return
+		// 判断是否输入的是.
+		else if (val.keyCode == 190) {
+			// 输入.无效
+		} else {
+			pwd.value += val.key
+			// passwordArr.push(val.key);
+		}
+	}
+
 	// 确认
 	function handleConfirm() {
 		if (!/^\d{6}$/.test(pwd.value)) {
@@ -106,18 +153,30 @@
 </script>
 
 <template>
-	<uni-popup ref="pwdRef" type="center">
-		<view class="pwdAlt popMid plr30 bfff">
-			<view class="title mtb30 f30">验证二级密码</view>
+	<uni-popup ref="pwdRef" type="bottom">
+		<view class="pwdAlt popBot plr30 bfff">
+			<view class="header rows mtb30 f30">
+				<view class="title ">验证二级密码</view>
+				<uni-icons type="closeempty" @click="close()" />
+			</view>
 
-			<view class="inputBox mtb20 plr30">
-				<input v-model="pwd" :maxlength="6" type="number" placeholder="输入二级密码" />
+			<view class="tac f48" v-if="price || unit">
+				<text>￥{{price}}</text>
+				<text>{{unit.name}}</text>
+			</view>
+
+			<view class="line mtb20 plr30">
+				<codeInput v-model:modelValue="pwd" />
+				<!-- <input v-model="pwd" :maxlength="6" type="number" placeholder="输入二级密码" /> -->
 			</view>
 
 			<view class="btns mtb30 rows">
 				<view class="btn lg cancel plr40 f1" @click="$refs.pwdRef.close()">取消</view>
 				<view class="btn lg black plr40 f1" @click="handleConfirm">验证</view>
 			</view>
+
+			<!-- 安全键盘 -->
+			<keyboard ref="CodeKeyboard" passwrdType="pay" @KeyInfo="KeyInfo"  />
 		</view>
 	</uni-popup>
 </template>
diff --git a/jiuyi2/components/public/keyboard/keyboard.scss b/jiuyi2/components/public/keyboard/keyboard.scss
new file mode 100644
index 00000000..bc28eabd
--- /dev/null
+++ b/jiuyi2/components/public/keyboard/keyboard.scss
@@ -0,0 +1,43 @@
+.page-total{
+	// position: fixed;
+	// left: 0;
+	// bottom: 0;
+	// width: 100%;
+	// background-color: #f6f6f6;
+}
+
+.key-list{
+	display: flex;
+	flex-wrap: wrap;
+	align-items: center;
+	padding: 1% 3%;
+	height: 90%;
+	margin-top: 20rpx;
+	.list{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 32%;
+		height: 92rpx;
+		background-color: #FFFFFF;
+		border-radius: 10rpx;
+		box-shadow: 0 0 10rpx rgba(0,0,0,0.1);
+		margin-right: 1.7%;
+		margin-bottom: 16rpx;
+		text{
+			font-size: 38rpx;
+			font-weight: bold;
+			color: #222222;
+		}
+	}
+	.list:nth-child(3n){
+		margin-right: 0;
+	}
+	.special{
+		background-color: #f6f6f6;
+		box-shadow: none;
+		text{
+			color: #959595;
+		}
+	}
+}
\ No newline at end of file
diff --git a/jiuyi2/components/public/keyboard/keyboard.vue b/jiuyi2/components/public/keyboard/keyboard.vue
new file mode 100644
index 00000000..e1ff3d2f
--- /dev/null
+++ b/jiuyi2/components/public/keyboard/keyboard.vue
@@ -0,0 +1,89 @@
+<template>
+	<view class="page-total">
+		<view class="key-list">
+			<view class="list" v-for="(item,index) in keyList" :class="{'special':item.keyCode==190||item.keyCode==8}"
+				@click="onKeyList(item,index)" :key="item.keyCode">
+				<text>{{item.key}}</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				keyList: [{
+					key: 1,
+					en: '',
+					keyCode: 49,
+				}, {
+					key: 2,
+					en: 'ABC',
+					keyCode: 50,
+				}, {
+					key: 3,
+					en: 'ABC',
+					keyCode: 51,
+				}, {
+					key: 4,
+					en: 'ABC',
+					keyCode: 52,
+				}, {
+					key: 5,
+					en: 'ABC',
+					keyCode: 53,
+				}, {
+					key: 6,
+					en: 'ABC',
+					keyCode: 54,
+				}, {
+					key: 7,
+					en: 'ABC',
+					keyCode: 55,
+				}, {
+					key: 8,
+					en: 'ABC',
+					keyCode: 56,
+				}, {
+					key: 9,
+					en: 'ABC',
+					keyCode: 57,
+				}, {
+					key: '',
+					en: 'ABC',
+					keyCode: 190,
+				}, {
+					key: 0,
+					en: 'ABC',
+					keyCode: 48,
+				}, {
+					key: '删除',
+					en: 'DEL',
+					keyCode: 8,
+				}, ],
+				keyIndex: -1,
+			};
+		},
+		props: {
+			passwrdType: {
+				type: String,
+				default: 'pay'
+			}
+		},
+		methods: {
+			/**
+			 * 密码键盘按下
+			 * @param {Object} item
+			 * @param {Number} index
+			 */
+			onKeyList(item, index) {
+				this.$emit('KeyInfo', item);
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import 'keyboard.scss';
+</style>
\ No newline at end of file
diff --git a/jiuyi2/components/shop/productList/productList.vue b/jiuyi2/components/shop/productList/productList.vue
index 46768968..33cb6680 100644
--- a/jiuyi2/components/shop/productList/productList.vue
+++ b/jiuyi2/components/shop/productList/productList.vue
@@ -90,6 +90,8 @@
 				content: rs.msg,
 				showCancel: false,
 			})
+		}).finally(rs => {
+			uni.stopPullDownRefresh()
 		})
 	}
 
diff --git a/jiuyi2/manifest.json b/jiuyi2/manifest.json
index 67c19413..79dd23e6 100644
--- a/jiuyi2/manifest.json
+++ b/jiuyi2/manifest.json
@@ -2,8 +2,8 @@
     "name" : "九亿",
     "appid" : "__UNI__08B31BC",
     "description" : "",
-    "versionName" : "1.0.4",
-    "versionCode" : 1004,
+    "versionName" : "1.0.5",
+    "versionCode" : 1005,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/jiuyi2/pages/index/index.nvue b/jiuyi2/pages/index/index.nvue
index f5bf6ddb..efd7523f 100644
--- a/jiuyi2/pages/index/index.nvue
+++ b/jiuyi2/pages/index/index.nvue
@@ -578,7 +578,7 @@
 	// 视频暂停
 	function handleVideoOnPause() {
 		if (proxy.$refs.discRef) proxy.$refs.discRef.pause()
-		// readSecondPause()
+		readSecondPause()
 	}
 
 	/**
@@ -724,10 +724,6 @@
 					<cell class="cell" :style="[{height: viewSize.height + 'px'}]" :ref="`cellRef` + index"
 						v-for="(secItem,secIndex) in item.listData()" :key="secItem.id" @click.stop>
 						<!-- <template v-if="current[tabIndex] < secIndex + 2 && current[tabIndex] > secIndex - 2"> -->
-						<view class="pa t0 l0 r0 b0 fmid" :style="{zIndex: 99,}">
-							<text class="f32 cfff">{{current[tabIndex]}}</text>
-							<text class="f32 cfff">{{index}}</text>
-						</view>
 
 						<!-- 视频 -->
 						<indexVideo :ref="'videoRef' + index" :tabIndex="index" :current="current[tabIndex]"
@@ -754,7 +750,7 @@
 	<!-- 快捷收藏 -->
 	<fastCollect ref="fastCollectRef" />
 	<!-- 青少年模式 -->
-	<teen ref="teenRef" @setting="showAlarm" />
+	<teen ref="teenRef" />
 	<!-- 长按菜单 -->
 	<moreMenu ref="moreMenuRef" @changeSpeed="handleSpeed" />
 	<!-- 闹钟弹窗 -->
diff --git a/jiuyi2/pages/index/integralMall.vue b/jiuyi2/pages/index/integralMall.vue
index 02d5f34c..f78a2614 100644
--- a/jiuyi2/pages/index/integralMall.vue
+++ b/jiuyi2/pages/index/integralMall.vue
@@ -120,7 +120,7 @@
 	</view>
 
 	<!-- 购买卷轴 -->
-	<payPwd ref="payPwdRef" @confirm="buyScroll" />
+	<payPwd ref="payPwdRef" @confirm="buyScroll" :price="scrollItem.scrollSeedMoney" unitKey="balance" />
 </template>
 
 <style lang="scss">
diff --git a/jiuyi2/pages/mine/setting/secondPwd.vue b/jiuyi2/pages/mine/setting/secondPwd.vue
index 35cdacff..3cb2c9ce 100644
--- a/jiuyi2/pages/mine/setting/secondPwd.vue
+++ b/jiuyi2/pages/mine/setting/secondPwd.vue
@@ -20,6 +20,9 @@
 	import CryptoJS from 'crypto-js';
 	// 
 	import codeInput from '@/components/mine/codeInput.vue'
+	// 软键盘
+	import keyboard from '@/components/public/keyboard/keyboard.vue'
+
 	const {
 		proxy
 	} = getCurrentInstance()
@@ -41,11 +44,6 @@
 		return result
 	})
 
-	onReady(() => {
-		// 弹出安全键盘
-		proxy.$refs.CodeKeyboard.show();
-	})
-
 	// 下一步
 	function handleNext() {
 		const data = {
@@ -198,8 +196,19 @@
 	</view>
 
 	<!-- 安全键盘 -->
-	<cc-defineKeyboard ref="CodeKeyboard" passwrdType="pay" @KeyInfo="KeyInfo" />
+	<!-- <cc-defineKeyboard ref="CodeKeyboard" passwrdType="pay" @KeyInfo="KeyInfo" /> -->
+	<view class="keyboard">
+		<keyboard ref="CodeKeyboard" passwrdType="pay" @KeyInfo="KeyInfo" />
+	</view>
 </template>
 
 <style lang="scss">
+	// 软键盘
+	.keyboard {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: #f8f8f8;
+	}
 </style>
\ No newline at end of file
diff --git a/jiuyi2/pages/news/news.vue b/jiuyi2/pages/news/news.vue
index e35e775f..a729f9cf 100644
--- a/jiuyi2/pages/news/news.vue
+++ b/jiuyi2/pages/news/news.vue
@@ -43,11 +43,11 @@
 			name: '即时消息',
 			load: false,
 		},
-		// {
-		// 	key: 'video',
-		// 	name: '视讯消息',
-		// 	load: false,
-		// },
+		{
+			key: 'video',
+			name: '视讯消息',
+			load: false,
+		},
 		// {
 		// 	key: 'video',
 		// 	name: '商城消息',
@@ -202,7 +202,6 @@
 
 			<!-- 群组 -->
 			<swiper-item>
-				<!-- <groupList v-if="menuList[1].load" /> -->
 				<msgList v-if="menuList[1].load" />
 				<view class="loading" v-else>正在加载</view>
 			</swiper-item>
diff --git a/jiuyi2/pages/shop/commodity/index.vue b/jiuyi2/pages/shop/commodity/index.vue
index 52149fb3..e21f1cc7 100644
--- a/jiuyi2/pages/shop/commodity/index.vue
+++ b/jiuyi2/pages/shop/commodity/index.vue
@@ -333,7 +333,7 @@
 			<!-- 商品名称 -->
 			<view class="name mtb20 f34 c333 t2hd">{{detail.name}}</view>
 
-			<view class="history mtb20 rows" v-if="0">
+			<view class="history mtb20 rows">
 				<view class="c666 f28">商品修改历史</view>
 				<uni-icons type="right" />
 			</view>
diff --git a/jiuyi2/pages/shop/commodity/payment.vue b/jiuyi2/pages/shop/commodity/payment.vue
index 2de66ee3..4687a71c 100644
--- a/jiuyi2/pages/shop/commodity/payment.vue
+++ b/jiuyi2/pages/shop/commodity/payment.vue
@@ -3,6 +3,7 @@
 		ref,
 		reactive,
 		getCurrentInstance,
+		computed,
 	} from 'vue'
 	import {
 		onReachBottom,
@@ -28,8 +29,6 @@
 	} = getCurrentInstance()
 	// 订单id
 	const orderId = ref('')
-	// 支付方式
-	const paytype = ref('')
 	// 订单详情
 	const detail = reactive({
 		createTime: '',
@@ -38,6 +37,10 @@
 	})
 	// 支付方式列表
 	const paytypeList = reactive([])
+	// 支付方式
+	const paytype = ref('')
+	// 支付单项
+	const payTypeItem = computed(() => paytypeList.find(item => item.paymentMethod == paytype.value) || {})
 	// 当前时间
 	const date = reactive(new Date())
 
@@ -162,7 +165,7 @@
 		}
 
 		// 打开
-		proxy.$refs.secondPwd.open()
+		proxy.$refs.secondPwdRef.open()
 	}
 </script>
 
@@ -253,7 +256,7 @@
 	</view>
 
 	<!-- 二级密码 -->
-	<secondPwd ref="secondPwd" :check="true" @confirm="handleSubmit" />
+	<secondPwd ref="secondPwdRef" :check="true" @confirm="handleSubmit" :unitKey="paytype" :price="detail.totalPrice" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/jiuyi2/pages/shop/settle.vue b/jiuyi2/pages/shop/settle.vue
index ef5ca6b8..5669b77d 100644
--- a/jiuyi2/pages/shop/settle.vue
+++ b/jiuyi2/pages/shop/settle.vue
@@ -54,9 +54,9 @@
 	// 二级密码回调
 	const pwdCb = ref('')
 	// 用户信息
-	const userinfo = computed(() => {
-		return store.state.userinfo
-	})
+	const userinfo = computed(() => store.state.userinfo)
+	// 系统配置
+	const config = computed(() => store.state.config)
 
 	onLoad(() => {
 		// 获取商家入驻状态
@@ -577,7 +577,7 @@
 	</template>
 
 	<!-- 二级密码 -->
-	<payPwd ref="payPwdRef" :check="true" @confirm="handlePayPwd" />
+	<payPwd ref="payPwdRef" :check="true" :price="config.DEPOSIT_ALLOCATION" @confirm="handlePayPwd" />
 </template>
 
 <style lang="scss">