搞搞搞

src/App.vue

@@ -138,7 +138,7 @@ getUserFromStorageIfNeed()
 
 const isShowFeedBack = ref(false)
 function onClickFeedBack() {
-  if (store.state.loginStatus === store.getters.loginStatusEnum.wxUser) {
+  if (process.env.VUE_APP_CLI_MODE === 'dev' || store.state.loginStatus === store.getters.loginStatusEnum.wxUser) {
     isShowFeedBack.value = true
   } else {
     location.href = `https://open.weixin.qq.com/connect/qrconnect?appid=wx3d4f2e0cfc3b8e54&redirect_uri=https%3A%2F%2Fsit-wuxicishan.4dage.com%2F%23%2Flogin-temp&response_type=code&scope=snsapi_login&state=${encodeURIComponent(route.name)}#wechat_redirect`
@@ -146,7 +146,7 @@ function onClickFeedBack() {
 }
 
 function onClickShop() {
-  if (store.state.loginStatus === store.getters.loginStatusEnum.wxUser) {
+  if (process.env.VUE_APP_CLI_MODE === 'dev' || store.state.loginStatus === store.getters.loginStatusEnum.wxUser) {
     router.push({
       name: 'ShopView'
     })
@@ -154,29 +154,6 @@ function onClickShop() {
     location.href = `https://open.weixin.qq.com/connect/qrconnect?appid=wx3d4f2e0cfc3b8e54&redirect_uri=https%3A%2F%2Fsit-wuxicishan.4dage.com%2F%23%2Flogin-temp&response_type=code&scope=snsapi_login&state=${encodeURIComponent('ShopView')}#wechat_redirect`
   }
 }
-
-function onClickLoveForest() {
-  if (store.state.loginStatus === store.getters.loginStatusEnum.wxUser) {
-    router.push({
-      name: 'LoveForest'
-    })
-  } else {
-    ElMessageBox.confirm(
-      '需登录后才能体验',
-      '提示',
-      {
-        confirmButtonText: '去登录',
-        cancelButtonText: '取消',
-        type: 'message',
-      }
-    ).then(() => {
-      router.push({
-        name: 'LoveForest'
-      })
-    }).catch(() => {
-    })
-  }
-}
 </script>
 
 <style lang="less">

src/api.js

@@ -61,10 +61,17 @@ export function getUserFromStorageIfNeed() {
   if (!store.state.token || !store.state.userInfo) {
     const lastToken = localStorage.getItem('token')
     const lastUserInfoStr = localStorage.getItem('userInfo')
-    if (lastToken && lastUserInfoStr) {
-      store.commit('setLoginStatus', store.getters.loginStatusEnum.wxUser)
-      store.commit('setToken', lastToken)
-      store.commit('setUserInfo', JSON.parse(lastUserInfoStr))
+    if (process.env.VUE_APP_CLI_MODE !== 'dev') {
+      if (lastToken && lastUserInfoStr) {
+        store.commit('setLoginStatus', store.getters.loginStatusEnum.wxUser)
+        store.commit('setToken', lastToken)
+        store.commit('setUserInfo', JSON.parse(lastUserInfoStr))
+      }
+    } else {
+      if (lastToken) {
+        store.commit('setLoginStatus', store.getters.loginStatusEnum.wxUser)
+        store.commit('setToken', lastToken)
+      }
     }
   }
 }

src/views/ShopView.vue

@@ -182,6 +182,7 @@ getShopContact().then((res) => {
  */
 const prizeList = ref([])
 const pageNumber = ref(0)
+const total = ref(0)
 function onClickPrevPage() {
   if (pageNumber.value > 0) {
     pageNumber.value--
@@ -192,13 +193,16 @@ function onClickNextPage() {
     pageNumber.value++
   }
 }
-const total = ref(0)
 const haveNextPage = computed(() => {
   return total.value > ((pageNumber.value + 1) * 8)
 })
-getPrizeList(pageNumber.value, 8).then((res) => {
-  total.value = res.total
-  prizeList.value = res.records
+watch(pageNumber, (v) => {
+  getPrizeList(v + 1, 8).then((res) => {
+    total.value = res.total
+    prizeList.value = res.records
+  })
+}, {
+  immediate: true,
 })
 
 const isShowRedeem = ref(false)
@@ -213,9 +217,6 @@ getRedeemRecord().then((res) => {
   redeemRecord.value = res
 })
 
-
-
-
 </script>
 
 <style lang="less" scoped>
@@ -278,6 +279,7 @@ getRedeemRecord().then((res) => {
   >ul.prize-list{
     flex: 0 0 auto;
     width: calc(1400 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
+    height: calc((393 * 2 + 25) / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
     >li.prize{
       display: inline-block;
       width: calc(322 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));