From e902f14d23f54ebace1f7b7dd148607ebbdfd0eb Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Thu, 16 Feb 2023 17:04:10 +0800
Subject: [PATCH] 1

---
 .env.production                        |  4 ++--
 README.md                              | 23 ++++++++---------------
 src/pageB/select_product/cart.vue      |  2 ++
 src/pageB/select_product/com_order.vue | 12 ++----------
 src/pages.json                         |  2 +-
 5 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/.env.production b/.env.production
index 1a032b7..98c2cae 100644
--- a/.env.production
+++ b/.env.production
@@ -1,6 +1,6 @@
 
 ENV = 'production'
 
-# VUE_APP_BASE_API = 'https://jiqu-library.peidikeji.cn/api'
-VUE_APP_BASE_API = 'https://jiqu-library.abcdefg.fun/api'
+VUE_APP_BASE_API = 'https://jiqu-library.peidikeji.cn/api'
+#VUE_APP_BASE_API = 'https://jiqu-library.abcdefg.fun/api'
 
diff --git a/README.md b/README.md
index 51e2a78..2aed43f 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,12 @@
-# mall-app
+# 积趣-图书馆
 
-## Project setup
-```
-yarn install
-```
+uniapp
 
-### Compiles and hot-reloads for development
-```
-yarn serve
-```
+## Rquire
 
-### Compiles and minifies for production
-```
-yarn build
-```
+- nodejs
+- npm
 
-### Customize configuration
-See [Configuration Reference](https://cli.vuejs.org/config/).
+## TODO
+
+- [ ] 子商品库存不足时, 禁用商品规格
diff --git a/src/pageB/select_product/cart.vue b/src/pageB/select_product/cart.vue
index 2a082fe..e642638 100644
--- a/src/pageB/select_product/cart.vue
+++ b/src/pageB/select_product/cart.vue
@@ -106,6 +106,8 @@ export default {
   },
   onLoad(e) {
     this.mid = e.mid
+  },
+  onShow() {
     this.getCartList()
   },
   computed: {
diff --git a/src/pageB/select_product/com_order.vue b/src/pageB/select_product/com_order.vue
index b4410ad..6bf3fd5 100644
--- a/src/pageB/select_product/com_order.vue
+++ b/src/pageB/select_product/com_order.vue
@@ -124,9 +124,6 @@
 
 <script>
   let btnLoading = false;
-  import {
-    add
-  } from '@/utils'
   export default {
     data() {
       return {
@@ -141,9 +138,7 @@
         cuId: null
       };
     },
-    onLoad({
-      id
-    }) {
+    onLoad({ id }) {
       this.cuId = id
     },
 
@@ -231,10 +226,7 @@
           this.goodsList = orderInfo.products;
           this.orderInfo = orderInfo;
         } catch (error) {
-          console.log(error, '32');
-          uni.switchTab({
-            url: '/pages/index/index'
-          })
+          this.couponId = ''
           console.log(error);
         } finally {
           this.isFirstLoading = false
diff --git a/src/pages.json b/src/pages.json
index 2f0f390..c8e74bc 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -549,7 +549,7 @@
         {
           "path": "select_product/cart",
           "style": {
-            "navigationBarTitleText": "搜索商品",
+            "navigationBarTitleText": "购物车",
             "enablePullDownRefresh": false,
             "navigationStyle": "custom"
           }