From dc37c653b4ecd6cf61aaf8e76037679da069beb6 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Sat, 22 Jun 2024 21:11:18 +0800
Subject: [PATCH] add

---
 components/goodPopup.vue    | 181 +++++++++++++++++++-----------------
 config/app.js               |   4 +-
 pageQuota/vipUser/index.vue |   6 +-
 pages/index/index.vue       |  10 +-
 pages/login/login.vue       |   2 +-
 5 files changed, 109 insertions(+), 94 deletions(-)

diff --git a/components/goodPopup.vue b/components/goodPopup.vue
index d8cd2bb..3ce66f7 100644
--- a/components/goodPopup.vue
+++ b/components/goodPopup.vue
@@ -31,15 +31,15 @@
 			<view v-if="datas.is_bulk" class="row">
 				<view>购买重量<text style="color: #F55726;">*</text></view>
 				<view style="flex: 1;">
-					<up-input v-model="datas.cart_num" :cursorSpacing='120' type="digit" border="none" placeholder="请输入购买重量"
-						inputAlign="right"></up-input>
+					<up-input v-model="datas.cart_num" :cursorSpacing='120' type="digit" border="none"
+						placeholder="请输入购买重量" inputAlign="right"></up-input>
 				</view>
 			</view>
 			<view v-else class="row">
 				<view>购买数量<text style="color: #F55726;">*</text></view>
 				<view style="flex: 1;">
-					<up-input v-model="datas.cart_num" :cursorSpacing='120' type="digit" border="none" placeholder="请输入购买数量"
-						inputAlign="right">
+					<up-input ref='foucs1' v-model="datas.cart_num" :cursorSpacing='120' type="digit" border="none"
+						placeholder="请输入购买数量" inputAlign="right">
 						<template #suffix>
 							<span style="color: #20b128;">{{ datas.unit_name }}</span>
 						</template>
@@ -59,107 +59,116 @@
 </template>
 
 <script setup>
-import {
-	computed,
-	ref
-} from "vue"
-import {
-	toast
-} from "../uni_modules/uview-plus";
+	import {
+		computed,
+		nextTick,
+		ref,
 
-const props = defineProps({
-	show: {
-		type: Boolean,
-		default: false
-	},
-})
+	} from "vue"
+	import {
+		toast
+	} from "../uni_modules/uview-plus";
+	import {
+		onShow
+	} from '@dcloudio/uni-app';
 
-const datas = ref({
-	cart_num: ''
-});
-const setData = (e) => {
-	datas.value = e;
-	if (Number(e.batch) > 0) datas.value.cart_num = e.batch;
-	else datas.value.cart_num = '';
+	const foucs1 = ref(null)
+	const props = defineProps({
+		show: {
+			type: Boolean,
+			default: false
+		},
+	})
 
-}
+	const datas = ref({
+		cart_num: ''
+	});
+	const setData = (e) => {
+		datas.value = e;
+		if (Number(e.batch) > 0) datas.value.cart_num = e.batch;
+		else datas.value.cart_num = '';
 
-const emit = defineEmits(['close', 'change']);
-const close = () => {
-	emit('close');
-}
-
-const change = () => {
-	if (+datas.value.cart_num < +datas.value.batch) return uni.$u.toast(
-		`购买数量不能小于${datas.value.batch}${datas.value.unit_name}`);
-	if (subtotal.value <= 0) {
-		uni.$u.toast('金额不可小于等于0');
-		datas.value.cart_num = '';
-		return;
 	}
-	emit('change', datas.value);
-}
 
-const subtotal = computed(() => {
-	let num = +datas.value.cart_num || 0;
-	let sell = +datas.value.sell || +datas.value.price;
-	return Number(num * sell * 100 / 100).toFixed(2)
-})
+	const emit = defineEmits(['close', 'change']);
+	const close = () => {
+		emit('close');
+	}
 
-defineExpose({
-	setData
-})
+	const change = () => {
+		if (+datas.value.cart_num < +datas.value.batch) return uni.$u.toast(
+			`购买数量不能小于${datas.value.batch}${datas.value.unit_name}`);
+		if (subtotal.value <= 0) {
+			uni.$u.toast('金额不可小于等于0');
+			datas.value.cart_num = '';
+			return;
+		}
+		emit('change', datas.value);
+	}
+
+	const subtotal = computed(() => {
+		let num = +datas.value.cart_num || 0;
+		let sell = +datas.value.sell || +datas.value.price;
+		return Number(num * sell * 100 / 100).toFixed(2)
+	})
+
+
+
+	defineExpose({
+		setData,
+		// founcsFn
+	})
 </script>
 
 <style scoped lang="scss">
-.good-popup {
-	padding: 30rpx;
+	.good-popup {
+		padding: 30rpx;
 
-	.head-title {
-		font-weight: bold;
-		text-align: center;
-		margin-bottom: 20rpx;
-	}
-
-	.row {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		padding-bottom: 20rpx;
-		border-bottom: 1rpx solid #f6f6f6;
-		margin-bottom: 20rpx;
-
-		&:last-child {
-			border-bottom: none;
-			margin-bottom: 0;
+		.head-title {
+			font-weight: bold;
+			text-align: center;
+			margin-bottom: 20rpx;
 		}
 
-		.content {
-			.top {
-				display: flex;
+		.row {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding-bottom: 20rpx;
+			border-bottom: 1rpx solid #f6f6f6;
+			margin-bottom: 20rpx;
 
-				view {
-					margin-right: 20rpx;
-				}
+			&:last-child {
+				border-bottom: none;
+				margin-bottom: 0;
 			}
 
-			.bottom {}
-		}
+			.content {
+				.top {
+					display: flex;
 
-		image {
-			width: 40rpx;
-			height: 40rpx;
-			flex-shrink: 0;
+					view {
+						margin-right: 20rpx;
+					}
+				}
+
+				.bottom {}
+			}
+
+			image {
+				width: 40rpx;
+				height: 40rpx;
+				flex-shrink: 0;
+			}
 		}
 	}
-}
 
-@keyframes disappear {
-	to {
-		opacity: 0;
-		/* 渐隐 */
-		transform: scale(0);
-		/* 缩小 */
+	@keyframes disappear {
+		to {
+			opacity: 0;
+			/* 渐隐 */
+			transform: scale(0);
+			/* 缩小 */
+		}
 	}
-}
 </style>
\ No newline at end of file
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/pageQuota/vipUser/index.vue b/pageQuota/vipUser/index.vue
index 4cc6f86..c97133d 100644
--- a/pageQuota/vipUser/index.vue
+++ b/pageQuota/vipUser/index.vue
@@ -82,7 +82,7 @@
 			<view class="vip-card">
 				<text>当前已开通：</text>
 				<up-count-to :startVal="0" :endVal="count"></up-count-to>
-				<text>位{{Role==1?'行业会员':'商户'}}会员</text>
+				<text>位{{Role==1?'行业会员':'商户'}}</text>
 			</view>
 
 			<view class="table">
@@ -160,8 +160,8 @@
 			</view>
 		</view>
 	</up-popup>
-	<up-picker :show="showPop1" :columns="columns" @confirm='conformRole' @close="showPop1=false" @open="showPop1=true"
-		keyName='label_name' confirmColor='#33B83A'></up-picker>
+	<up-picker :show="showPop1" :columns="columns" @confirm='conformRole' @cancel='showPop1=false'
+		@close="showPop1=false" @open="showPop1=true" keyName='label_name' confirmColor='#33B83A'></up-picker>
 
 </template>
 <script setup>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 069caae..5e8b659 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -370,7 +370,8 @@
 		name: '',
 		order: '',
 		store_name: '',
-		store_id: STORE_INFO.id
+		// store_id: 23
+		store_id: 4
 	})
 
 	const loading = ref(true);
@@ -386,6 +387,8 @@
 		if (class_all) class_id = ""; //只能带其中一个
 		if (loadmore) where.value.page_no++;
 		else where.value.page_no = 1;
+		// where.value.store_id = 23
+		where.value.store_id = 4
 		goodListApi({
 			...where.value,
 			class_all: class_all,
@@ -522,8 +525,10 @@
 	const openGoodPopup = (item) => { // 打开数量/重量弹窗
 		goodData.value = item;
 		goodRef.value.setData(item);
+		// goodRef.value.founcsFn();
 		showGoodPopup.value = true;
 
+
 		//统计商品的访问记录
 		productLogApi({
 			product_id: item.product_id,
@@ -607,7 +612,8 @@
 		if (opt.id) {
 			where.value.store_id = opt.id;
 			const info = await shopDetailApi({
-				store_id: opt.id
+				store_id: 4
+				// store_id: 23
 			});
 			// 分享参数至当前用户参数
 			if (opt.spread_uid) {
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 2600075..225fb47 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -16,7 +16,7 @@
 						<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" v-if="config.ENV=='dev'">
+					<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>