From f450ca1e0848ec91907104a8b7e90263f1adc62a Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Mon, 22 May 2023 13:55:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=95=86=E5=9F=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppSuperMarket/AppSuperMarket.vue         | 39 ++++++++-----------
 .../pingchang/AppSuperMarket/myOrderList.vue  |  6 +--
 .../pingchang/AppSuperMarket/placeOrder.vue   |  4 +-
 .../AppSuperMarket/productDetails.vue         |  4 +-
 4 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/src/project/pingchang/AppSuperMarket/AppSuperMarket.vue b/src/project/pingchang/AppSuperMarket/AppSuperMarket.vue
index 618d1145..d5a9bf70 100644
--- a/src/project/pingchang/AppSuperMarket/AppSuperMarket.vue
+++ b/src/project/pingchang/AppSuperMarket/AppSuperMarket.vue
@@ -76,7 +76,7 @@
 </template>
 
 <script>
-import {mapState} from "vuex";
+import {mapState, mapActions} from "vuex";
 
 export default {
   name: 'AppSuperMarket',
@@ -109,27 +109,20 @@ export default {
   computed: {
     ...mapState(['user']),
   },
-  onLoad(option) {
-    this.openId = option.openId
-    this.userId = option.userId
-    this.integralUserId = option.integralUserId
-    this.getTotal()
-    this.$dict.load(['integralSGType']).then(() => {
-      this.getList()
-    })
+  onLoad() {
+    this.$dict.load(['integralSGType'])
   },
   onShow() {
     document.title = '积分商城'
-    this.getTotal()
+    this.$nextTick(() => {
+      this.getAccount().then(() => {
+        this.total = this.user.girdIntegral || 0
+        this.getListInit()
+      })
+    })
   },
   methods: {
-    getTotal() {
-      this.$http.post(`/app/appintegraluser/integralUserInfoFD?integralUserId=${this.integralUserId}`).then(res => {
-        if (res?.data) {
-          this.total = res.data.integral || 0
-        }
-      })
-    },
+    ...mapActions(['getAccount']),
     getListInit() {
       this.goodsList = []
       this.leftList = []
@@ -138,15 +131,15 @@ export default {
       this.getList()
     },
     getList() {
-      this.$http.post(`/app/appintegralsupermarketshop/goodsListWXCP`, null, {
+      this.$http.post(`/app/appintegralsupermarketshop/goodsListGird`, null, {
         params: {
           goodsType: this.currentTabs,  //商品类型，0：全部、1：免费兑、2：京东低价商品，默认0
           orderType: this.currentType == 0 ? 1 : 0,  //排序类型，0：积分升序、1：上架时间倒序，默认0
           filterIntegral: this.currentType == 2 ? true : false,  //过滤我可兑换的，默认false
           integralRange: this.currentType == 1 ? this.currentPoint : '',  //积分区间类型，0：全部、1：50分以下、2:100分以下、3：200分以下、4：5000分以下默认0
           current: this.current,
-          userId: this.userId,
-          openId: this.openId
+          // userId: this.userId,
+          // openId: this.openId
         }
       }).then(res => {
         if (res.code === 0) {
@@ -174,14 +167,14 @@ export default {
       this.getListInit()
     },
     toProductDetail(item) {
-      uni.navigateTo({url: `./productDetails?shopGoodsId=${item.shopGoodsId}&total=${this.total}&userId=${this.userId}`})
+      uni.navigateTo({url: `./productDetails?shopGoodsId=${item.shopGoodsId}&total=${this.total}`})
     },
     toMyOrder() {
-      uni.navigateTo({url: `./myOrderList?userId=${this.userId}`})
+      uni.navigateTo({url: `./myOrderList`})
     },
     toOrder(item) {
       if(this.total >= item.integralPrice && item.stock > 0) {
-        uni.navigateTo({url: `./placeOrder?shopGoodsId=${item.shopGoodsId}&total=${this.total}&backLevel=3&userId=${this.userId}`})
+        uni.navigateTo({url: `./placeOrder?shopGoodsId=${item.shopGoodsId}&total=${this.total}&backLevel=2`})
       }
     },
   },
diff --git a/src/project/pingchang/AppSuperMarket/myOrderList.vue b/src/project/pingchang/AppSuperMarket/myOrderList.vue
index a42eede0..a1834bd6 100644
--- a/src/project/pingchang/AppSuperMarket/myOrderList.vue
+++ b/src/project/pingchang/AppSuperMarket/myOrderList.vue
@@ -57,14 +57,12 @@ export default {
       },
       list: [],
       current: 1,
-      userId: ''
     }
   },
   computed: {
     ...mapState(['user']),
   },
   onLoad(option) {
-    this.userId = option.userId
     this.$dict.load(['integralSGOStatus', 'integralSGType']).then(() => {
       this.getList()
     })
@@ -83,7 +81,7 @@ export default {
         params: {
           current: this.current,
           status: this.currentTabs == 0 ? '' : this.currentTabs - 1,
-          createUserId: this.userId
+          createUserId: this.user.girdMemberId
         }
       }).then(res => {
         if (res.code === 0) {
@@ -110,7 +108,7 @@ export default {
       });
     },
     cancelOrder(item) {
-      this.$http.post(`/app/appintegralsupermarketorder/cancelForXCX?id=${item.id}`).then(res => {
+      this.$http.post(`/app/appintegralsupermarketorder/cancelForGird?id=${item.id}`).then(res => {
         if (res.code === 0) {
           this.getListInit()
         }
diff --git a/src/project/pingchang/AppSuperMarket/placeOrder.vue b/src/project/pingchang/AppSuperMarket/placeOrder.vue
index 2b898415..a00c0966 100644
--- a/src/project/pingchang/AppSuperMarket/placeOrder.vue
+++ b/src/project/pingchang/AppSuperMarket/placeOrder.vue
@@ -96,12 +96,12 @@ export default {
       this.show = false
     },
     confirmOrder() {
-      this.$http.post(`/app/appintegralsupermarketorder/addWXCP`,  {
+      this.$http.post(`/app/appintegralsupermarketorder/addGird`,  {
         shopId: this.goodsInfo.shopId,
         goodsId: this.goodsInfo.id,
         remarks: this.value,
         quantity: this.goodsNum,
-        createUserId: this.userId
+        createUserId: this.user.girdMemberId
       }).then(res => {
         if (res.code === 0) {
           this.toSuccess()
diff --git a/src/project/pingchang/AppSuperMarket/productDetails.vue b/src/project/pingchang/AppSuperMarket/productDetails.vue
index a4bb064e..f5bf297f 100644
--- a/src/project/pingchang/AppSuperMarket/productDetails.vue
+++ b/src/project/pingchang/AppSuperMarket/productDetails.vue
@@ -34,7 +34,6 @@ export default {
       shopGoodsId: '',
       goodsInfo: {},
       total: 0,
-      userId: ''
     }
   },
   computed: {
@@ -42,7 +41,6 @@ export default {
   },
   onLoad(option) {
     this.shopGoodsId = option.shopGoodsId
-     this.userId = option.userId
     this.total = option.total
     this.$dict.load(['integralSGType']).then(() => {
       this.getDetail()
@@ -61,7 +59,7 @@ export default {
     },
     toOrder() {
       if(this.total >= this.goodsInfo.integralPrice && this.goodsInfo.stock > 0 && this.goodsInfo.status == 1) {
-        uni.navigateTo({url: `./placeOrder?shopGoodsId=${this.goodsInfo.shopGoodsId}&total=${this.total}&backLevel=4&userId=${this.userId}`})
+        uni.navigateTo({url: `./placeOrder?shopGoodsId=${this.goodsInfo.shopGoodsId}&total=${this.total}&backLevel=4`})
       }
     },
   },