From 4220fd42add6c0bc755b9a6748a7264dd45fb44d Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Thu, 20 Jun 2024 18:45:16 +0800
Subject: [PATCH] add

---
 components/pwdKeyBord.vue           | 117 ++--------------------------
 config/app.js                       |   4 +-
 pages.json                          |   7 --
 pages/index/index.vue               |   6 +-
 pages/login/login.vue               |   4 +-
 pages/my/my.vue                     |   2 +-
 pagesOrder/setPayPassword/index.vue |   1 -
 7 files changed, 15 insertions(+), 126 deletions(-)

diff --git a/components/pwdKeyBord.vue b/components/pwdKeyBord.vue
index 4a59bf8..b0646cd 100644
--- a/components/pwdKeyBord.vue
+++ b/components/pwdKeyBord.vue
@@ -1,5 +1,5 @@
 <template>
-	<up-popup ref="popup" type="bottom" :mask-background-color="isPay?'rgba(0,0,0,.8)':'transparent'" safeArea
+	<!-- <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">
@@ -39,117 +39,14 @@
 				</view>
 			</view>
 		</view>
-	</up-popup>
+	</up-popup> -->
+	<view class="">
+		sds
+
+	</view>
 </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>
+<script setup></script>
 
 <style lang="scss" scoped>
 	.popup-wrap {
diff --git a/config/app.js b/config/app.js
index ab2ac5f..85facca 100644
--- a/config/app.js
+++ b/config/app.js
@@ -1,8 +1,8 @@
 let BASE_URL
 import store from "@/store/user.js"
 // 环境
-let env = "dev"
-// let env = "prod"
+// let env = "dev"
+let env = "prod"
 // let env = "liu";
 
 switch (env) {
diff --git a/pages.json b/pages.json
index 3f307fa..ed62957 100644
--- a/pages.json
+++ b/pages.json
@@ -161,13 +161,6 @@
 						"navigationBarTitleText": "确认订单",
 						"enablePullDownRefresh": false
 					}
-				},
-				{
-					"path": "setPayPassword/index",
-					"style": {
-						"navigationBarTitleText": "设置密码",
-						"enablePullDownRefresh": false
-					}
 				}
 			]
 		},
diff --git a/pages/index/index.vue b/pages/index/index.vue
index bb65144..7e4c2c4 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -223,8 +223,8 @@
 	import useUserStore from "@/store/user";
 	const userStore = useUserStore();
 	const STORE_INFO = reactive({
-		id: 23,
-		store_name: "新"
+		id: 4,
+		store_name: "农(特)产品直营店"
 	})
 
 	const getStoreInfoFn = () => {
@@ -342,7 +342,7 @@
 
 	const where = ref({
 		page_no: 1,
-		page_size: 10,
+		page_size: 15,
 		name: '',
 		order: '',
 		store_name: '',
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 7e22e2e..35ce671 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 name="weixin-fill"
 								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="weixin-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/pages/my/my.vue b/pages/my/my.vue
index 7109249..91f413a 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -108,7 +108,7 @@
 		<view class="card">
 			<up-cell-group>
 				<up-cell title="我的地址" :isLink="true" url="/pagesOrder/addressList/addressList"></up-cell>
-				<up-cell title="支付密码" :isLink="true" url="/pagesOrder/setPayPassword/index"></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
index b31d12c..ef8854e 100644
--- a/pagesOrder/setPayPassword/index.vue
+++ b/pagesOrder/setPayPassword/index.vue
@@ -23,7 +23,6 @@
 </template>
 
 <script setup>
-	import pwdKeyBord from '@/components/pwdKeyBord.vue'
 	import {
 		ref
 	} from "vue"