From 0956a9dbd5c6b31eddbc5e719e8ee13ea723af3e Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 14 Sep 2024 09:13:05 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=E6=96=87=E4=BB=B6=E5=92=8C=E9=A1=B5=E9=9D=A2=E9=80=BB=E8=BE=91?=
=?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E9=87=87=E8=B4=AD?=
=?UTF-8?q?=E5=92=8C=E8=AE=A2=E5=8D=95=E8=8E=B7=E5=8F=96=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/app.js | 4 +-
pages/index/index.vue | 10 ++-
uni_modules/uview-plus/package-lock.json | 62 +++++++++++++++++++
uni_modules/uview-plus/package.json | 35 ++++++-----
.../uview-plus/types/package-lock.json | 20 ++++++
uni_modules/uview-plus/types/package.json | 3 +
6 files changed, 114 insertions(+), 20 deletions(-)
create mode 100644 uni_modules/uview-plus/package-lock.json
create mode 100644 uni_modules/uview-plus/types/package-lock.json
diff --git a/config/app.js b/config/app.js
index dea5d28..d8d8126 100644
--- a/config/app.js
+++ b/config/app.js
@@ -3,9 +3,9 @@ let WSS_URL
import store from "@/store/user.js"
// 环境
// let env = "dev"
-// let env = "prod"
+let env = "prod"
// let env = "release";
-let env = "local";
+// let env = "local";
switch (env) {
case 'dev':
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 61f3829..f98fa38 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -182,6 +182,10 @@
¥{{item[priceKey.op_price]}}
+
+
+ {{item.tag}}
+
-->
-
+
+
@@ -648,6 +653,9 @@
const goodRef = ref(null);
const goodData = ref({});
const openGoodPopup = (item) => { // 打开数量/重量弹窗
+ if(item.is_lack==1){
+ return false
+ }
navTo(false)
if (!userStore.token || !userStore.userInfo.mobile) return;
goodData.value = item;
diff --git a/uni_modules/uview-plus/package-lock.json b/uni_modules/uview-plus/package-lock.json
new file mode 100644
index 0000000..42d8c46
--- /dev/null
+++ b/uni_modules/uview-plus/package-lock.json
@@ -0,0 +1,62 @@
+{
+ "name": "uview-plus",
+ "version": "3.2.14",
+ "lockfileVersion": 3,
+ "requires": true,
+ "packages": {
+ "": {
+ "name": "uview-plus",
+ "version": "3.2.14",
+ "dependencies": {
+ "clipboard": "^2.0.11",
+ "dayjs": "^1.11.3",
+ "uview-plus": "file:"
+ },
+ "engines": {
+ "HBuilderX": "^3.1.0"
+ }
+ },
+ "node_modules/clipboard": {
+ "version": "2.0.11",
+ "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.11.tgz",
+ "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
+ "dependencies": {
+ "good-listener": "^1.2.2",
+ "select": "^1.1.2",
+ "tiny-emitter": "^2.0.0"
+ }
+ },
+ "node_modules/dayjs": {
+ "version": "1.11.13",
+ "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
+ "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
+ },
+ "node_modules/delegate": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
+ "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
+ },
+ "node_modules/good-listener": {
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
+ "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==",
+ "dependencies": {
+ "delegate": "^3.1.2"
+ }
+ },
+ "node_modules/select": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
+ "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA=="
+ },
+ "node_modules/tiny-emitter": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
+ "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
+ },
+ "node_modules/uview-plus": {
+ "resolved": "",
+ "link": true
+ }
+ }
+}
diff --git a/uni_modules/uview-plus/package.json b/uni_modules/uview-plus/package.json
index 6c89b3d..402d44c 100644
--- a/uni_modules/uview-plus/package.json
+++ b/uni_modules/uview-plus/package.json
@@ -5,21 +5,21 @@
"version": "3.2.14",
"description": "uview-plus已兼容vue3,全面的组件和便捷的工具会让您信手拈来,如鱼得水",
"keywords": [
- "uview",
- "uview-plus",
- "ui",
- "ui",
- "uni-app",
- "uni-app",
- "ui"
- ],
- "main": "index.js",
+ "uview",
+ "uview-plus",
+ "ui",
+ "ui",
+ "uni-app",
+ "uni-app",
+ "ui"
+ ],
+ "main": "index.js",
"repository": "https://github.com/ijry/uview-plus",
"engines": {
"HBuilderX": "^3.1.0"
},
- "dcloudext": {
- "sale": {
+ "dcloudext": {
+ "sale": {
"regular": {
"price": "0.00"
},
@@ -35,8 +35,8 @@
"data": "无",
"permissions": "无"
},
- "npmurl": "https://www.npmjs.com/package/uview-plus",
- "type": "component-vue"
+ "npmurl": "https://www.npmjs.com/package/uview-plus",
+ "type": "component-vue"
},
"uni_modules": {
"dependencies": [],
@@ -44,8 +44,8 @@
"platforms": {
"cloud": {
"tcb": "y",
- "aliyun": "y",
- "alipay": "n"
+ "aliyun": "y",
+ "alipay": "n"
},
"client": {
"Vue": {
@@ -85,9 +85,10 @@
},
"dependencies": {
"clipboard": "^2.0.11",
- "dayjs": "^1.11.3"
+ "dayjs": "^1.11.3",
+ "uview-plus": "file:"
},
"publishConfig": {
- "registry": "https://registry.npmjs.org/"
+ "registry": "https://registry.npmjs.org/"
}
}
diff --git a/uni_modules/uview-plus/types/package-lock.json b/uni_modules/uview-plus/types/package-lock.json
new file mode 100644
index 0000000..baaf150
--- /dev/null
+++ b/uni_modules/uview-plus/types/package-lock.json
@@ -0,0 +1,20 @@
+{
+ "name": "@uview-plus/types",
+ "version": "3.2.5",
+ "lockfileVersion": 3,
+ "requires": true,
+ "packages": {
+ "": {
+ "name": "@uview-plus/types",
+ "version": "3.2.5",
+ "license": "MIT",
+ "dependencies": {
+ "@uview-plus/types": "file:"
+ }
+ },
+ "node_modules/@uview-plus/types": {
+ "resolved": "",
+ "link": true
+ }
+ }
+}
diff --git a/uni_modules/uview-plus/types/package.json b/uni_modules/uview-plus/types/package.json
index 172c665..5817772 100644
--- a/uni_modules/uview-plus/types/package.json
+++ b/uni_modules/uview-plus/types/package.json
@@ -22,5 +22,8 @@
"homepage": "https://github.com/ijry/uview-plus#readme",
"publishConfig": {
"registry": "https://registry.npmjs.org/"
+ },
+ "dependencies": {
+ "@uview-plus/types": "file:"
}
}