瀏覽代碼

代码优化

喻文俊 3 年之前
父節點
當前提交
6ed0a35b6c
共有 5 個文件被更改,包括 16 次插入56 次删除
  1. 2 1
      pages/goods/good-floorMore.vue
  2. 2 1
      pages/goods/search.vue
  3. 8 5
      pages/tabBar/user/index.vue
  4. 2 1
      pages/user/activity/activity.vue
  5. 2 48
      store/modules/app.js

+ 2 - 1
pages/goods/good-floorMore.vue

@@ -40,7 +40,7 @@
 <script>
 <script>
 import authorize from '@/common/authorize.js'
 import authorize from '@/common/authorize.js'
 import banner from '@/components/cm-module/homeIndex/banner.vue'
 import banner from '@/components/cm-module/homeIndex/banner.vue'
-import { mapGetters } from 'vuex'
+import { mapGetters, mapActions } from 'vuex'
 export default {
 export default {
     components: {
     components: {
         banner,
         banner,
@@ -79,6 +79,7 @@ export default {
         ...mapGetters(['hasLogin', 'userInfo'])
         ...mapGetters(['hasLogin', 'userInfo'])
     },
     },
     methods: {
     methods: {
+        ...mapActions('cart',['addToCart']),
         //初始化商品数据列表
         //初始化商品数据列表
         fetchProductList() {
         fetchProductList() {
             this.ProductService.QueryProductList({
             this.ProductService.QueryProductList({

+ 2 - 1
pages/goods/search.vue

@@ -96,7 +96,7 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import { mapGetters } from 'vuex'
+import { mapGetters, mapActions } from 'vuex'
 import modalLayer from '@/components/cm-module/modal-layer/modal-layer'
 import modalLayer from '@/components/cm-module/modal-layer/modal-layer'
 import authorize from '@/common/authorize.js'
 import authorize from '@/common/authorize.js'
 import wxLogin from '@/services/wxLogin.js'
 import wxLogin from '@/services/wxLogin.js'
@@ -174,6 +174,7 @@ export default {
         ...mapGetters(['hasLogin'])
         ...mapGetters(['hasLogin'])
     },
     },
     methods: {
     methods: {
+        ...mapActions('cart',['addToCart']),
         InitGetSerachRecord() {
         InitGetSerachRecord() {
             //查询搜索历史记录
             //查询搜索历史记录
             this.ProductService.GetProductSearchHistory({ userId: this.listQuery.userId }).then(response => {
             this.ProductService.GetProductSearchHistory({ userId: this.listQuery.userId }).then(response => {

+ 8 - 5
pages/tabBar/user/index.vue

@@ -101,7 +101,7 @@
 
 
 <script>
 <script>
 import nutBadge from '@/components/thorui/tui-badge/tui-badge.vue'
 import nutBadge from '@/components/thorui/tui-badge/tui-badge.vue'
-import { mapGetters, mapMutations } from 'vuex'
+import { mapGetters, mapMutations, mapActions } from 'vuex'
 import authorize from '@/common/authorize.js'
 import authorize from '@/common/authorize.js'
 import wxLogin from '@/services/wxLogin.js'
 import wxLogin from '@/services/wxLogin.js'
 
 
@@ -120,10 +120,6 @@ export default {
             salesReturnCount: 0, //退货/款角标
             salesReturnCount: 0, //退货/款角标
         }
         }
     },
     },
-    onLoad() {
-        if (!this.hasLogin) return
-        this.GetUserInfoPersonal()
-    },
     computed: {
     computed: {
         ...mapGetters(['hasLogin', 'userInfo','userId','userIdentity'])
         ...mapGetters(['hasLogin', 'userInfo','userId','userIdentity'])
     },
     },
@@ -132,8 +128,15 @@ export default {
             return value > 99 ? '99+' : value
             return value > 99 ? '99+' : value
         }
         }
     },
     },
+    onShow() {
+      if(this.hasLogin){
+          this.getCartNumber()
+          this.GetUserInfoPersonal()
+      }  
+    },
     methods: {
     methods: {
         ...mapMutations('app', ['login', 'logout']),
         ...mapMutations('app', ['login', 'logout']),
+        ...mapActions('cart', ['getCartNumber']),
         //初始化个人中心数据
         //初始化个人中心数据
         GetUserInfoPersonal() {
         GetUserInfoPersonal() {
             this.UserService.GetUserOrderTotal({
             this.UserService.GetUserOrderTotal({

+ 2 - 1
pages/user/activity/activity.vue

@@ -38,7 +38,7 @@
 
 
 <script>
 <script>
 import wxLogin from '@/services/wxLogin.js'
 import wxLogin from '@/services/wxLogin.js'
-import { mapGetters } from 'vuex'
+import { mapGetters, mapActions } from 'vuex'
 import cmDrag from '@/components/cm-module/cm-drag/cm-drag'
 import cmDrag from '@/components/cm-module/cm-drag/cm-drag'
 
 
 export default {
 export default {
@@ -78,6 +78,7 @@ export default {
         ...mapGetters(['hasLogin'])
         ...mapGetters(['hasLogin'])
     },
     },
     methods: {
     methods: {
+        ...mapActions('cart',['addToCart']),
         GetProductActivityDetails() {
         GetProductActivityDetails() {
             //初始化活动详情
             //初始化活动详情
             this.ProductService.GetProductActivityDetails(this.listQuery)
             this.ProductService.GetProductActivityDetails(this.listQuery)

+ 2 - 48
store/modules/app.js

@@ -4,46 +4,10 @@ import { formatDate } from '@/common/utilsTools.js'
 const state = {
 const state = {
     isIphoneX: false,
     isIphoneX: false,
     isIphone: false,
     isIphone: false,
-    isActivity: false
+    isActivity: false,
+    windowHeight: 0,
 }
 }
 const mutations = { 
 const mutations = { 
-    login(state, provider) { //用户身份 1、协销 2、会员机构 3、供应商 4.普通机构
-        state.hasLogin = true
-        state.userInfo = provider
-        uni.setStorage({ //缓存用户登陆状态
-            key: 'userInfo',
-            data: provider
-        })
-    },
-    logout(state) {
-        state.hasLogin = false
-        state.userInfo = {}
-        uni.removeStorage({
-            key: 'userInfo'
-        })
-        uni.removeStorage({
-            key: 'token'
-        })
-    },
-    wxLogin(state, provider) {
-        state.isWxAuthorize = true
-        // console.log(state.isWxAuthorize)
-        state.wechatUserInfo = provider
-        uni.setStorageSync('_WX_State', true)
-        uni.setStorage({ //缓存用户微信授权信息
-            key: 'wechatUserInfo',
-            data: provider
-        })
-    },
-    updateStatus(state, provider) {
-        let TIME = formatDate()
-        console.log(`${TIME}`, provider)
-        state.userInfo = provider
-        uni.setStorage({ //缓存用户登陆状态
-            key: 'userInfo',
-            data: provider
-        })
-    },
     setActivity(state, variable) {
     setActivity(state, variable) {
         state.isActivity = variable
         state.isActivity = variable
     },
     },
@@ -55,16 +19,6 @@ const mutations = {
         //获取设备信息是否为IphoneX
         //获取设备信息是否为IphoneX
         state.isIphone = variable
         state.isIphone = variable
     },
     },
-    setLoginType(state, variable) {
-        //获取设备信息是否为IphoneX
-        state.isLoginType = variable
-        console.log(state.isLoginType)
-    },
-    setLoginProductId(state, variable) {
-        //获取设备信息是否为IphoneX
-        state.isLoginProductId = variable
-        console.log(state.isLoginProductId)
-    },
     setLoginOrderId(state, variable) {
     setLoginOrderId(state, variable) {
         //获取设备信息是否为IphoneX
         //获取设备信息是否为IphoneX
         state.isLoginOrderId = variable
         state.isLoginOrderId = variable