页面

src/components/fly-login/fly-login.vue

@@ -85,7 +85,7 @@ const onSubmit = async () => {
   height: 100%;
   display: flex;
   bottom: 0;
-  z-index: 999;
+  z-index: 999 !important;
   position: fixed;
   inset: 0;
 

src/layouts/fg-tabbar/tabbarList.ts

@@ -50,8 +50,8 @@ export const tabbarList = [
 ]
 
 const _tabbar = {
-  color: '#2d2d2d',
+  color: '#333333',
-  selectedColor: '#ff0000',
+  selectedColor: '#87d76b',
   backgroundColor: '#F8F8F8',
   borderStyle: 'black',
   height: '60px',

src/pages.json

@@ -15,8 +15,8 @@
     }
   },
   "tabBar": {
-    "color": "#2d2d2d",
+    "color": "#333333",
-    "selectedColor": "#ff0000",
+    "selectedColor": "#87d76b",
     "backgroundColor": "#F8F8F8",
     "borderStyle": "black",
     "height": "60px",

src/pages/my/components/wx-login.vue

@@ -19,7 +19,7 @@
           style="backdrop-filter: blur(2rpx); border-radius: 10rpx"
         >
           <view class="p-4">
-            <view class="flex items-center leading-6" v-if="hasLogin">
+            <view class="flex items-center leading-6" v-if="islogin">
               <image class="w-18 h-18 rounded-full" :src="userStore.userInfo?.avatar"></image>
 
               <view class="ml-2 flex-content-column">
@@ -70,18 +70,25 @@
                 icon: '/static/icons/my3.png',
                 color: 'blue',
               },
+              // {
+              //   name: '浏览记录',
+              //   url: '/pages/users/browsingHistory/index',
+              //   type: 2,
+              //   icon: '/static/icons/my4.png',
+              //   color: 'blue',
+              // },
               {
-                name: '浏览记录',
+                name: '平台客服',
-                url: '/pages/users/browsingHistory/index',
+                url: '17309090670',
                 type: 2,
                 icon: '/static/icons/my4.png',
                 color: 'blue',
               },
 
               {
-                name: '平台客服',
+                name: '上传商品',
-                url: '17309090670',
+                url: '/pages/my/uploadProduct',
-                type: 2,
+                type: 1,
                 icon: '/static/icons/my5.png',
                 color: 'red',
               },
@@ -92,19 +99,19 @@
                 icon: '/static/icons/my7.png',
                 color: 'red',
               },
-              {
+              // {
-                name: '上传商品',
+              //   name: '上传商品',
-                url: '/pages/my/uploadProduct',
+              //   url: '/pages/my/uploadProduct',
-                type: 1,
+              //   type: 1,
-                icon: '/static/icons/rural_ecommerce.png',
+              //   icon: '/static/icons/rural_ecommerce.png',
-                color: 'red',
+              //   color: 'red',
-              },
+              // },
             ]"
           >
             <wd-grid-item use-slot>
               <view class="p-2">
                 <wd-img radius="20rpx" :width="'60rpx'" :height="'60rpx'" :src="item.icon" />
-                <view class="ps-2 pt-2 pb-2 text-center color-black font-size-3">
+                <view class="p-2 text-center color-black font-size-3">
                   {{ item.name }}
                 </view>
               </view>
@@ -118,48 +125,64 @@
   </view>
 </template>
 
-<script lang="ts" setup name="WxLogin">
+<script lang="ts" name="WxLogin">
 import { useUserStore } from '@/store'
-import { getUrl, getWebUrl } from '@/utils'
+import { getUrl, getWebUrl, getShopWebUrl, hasLogin } from '@/utils'
-const show = ref(false)
+// const userStore = useUserStore()
-const userStore = useUserStore()
+import { defineComponent } from 'vue'
-console.log('获取用户信息', userStore.userInfo)
+
-const hasLogin = computed(() => userStore.userInfo?.id)
+export default defineComponent({
-const logout = () => {
+  data() {
-  uni.showModal({
+    return {
-    title: '确认退出当前账号？',
+      islogin: false,
-    success: (res) => {
+      show: false,
-      if (res.confirm) {
+      userStore: useUserStore(),
-        userStore.logout()
+    }
+  },
+  onLoad(option) {},
+  methods: {
+    // logout() {
+    //   uni.showModal({
+    //     title: '确认退出当前账号？',
+    //     success: (res) => {
+    //       if (res.confirm) {
+    //         userStore.logout()
+    //       }
+    //     },
+    //   })
+    // },
+    more(item) {
+      this.islogin = hasLogin()
+      if (this.islogin === false) {
+        this.show = true
+        return
+      }
+      if (this.islogin === true) {
+        // console.log(item)
+        if (item.type == 1) {
+          getUrl(item.url)
+        } else if (item.type == 2) {
+          getWebUrl(item.url)
+        } else if (item.type == 3) {
+          getShopWebUrl(item.url)
+        }
       }
     },
-  })
+  },
-}
+})
 
-function more(item) {
+// const show = ref(false)
-  // if (!hasLogin.value) {
+// const userStore = useUserStore()
-  //   show.value = true
+// console.log('获取用户信息', userStore.userInfo)
-  //   return
+// // const hasLogin = computed(() => userStore.userInfo?.id)
-  // }
+// const logout = () => {
-  if (item.name == '平台客服') {
+//   uni.showModal({
-    uni.showModal({
+//     title: '确认退出当前账号？',
-      title: '提示',
+//     success: (res) => {
-      content: ' 确定拨打客服电话:' + 17309090670 + '吗？',
+//       if (res.confirm) {
-      success: function (res) {
+//         userStore.logout()
-        if (res.confirm) {
+//       }
-          uni.makePhoneCall({
+//     },
-            phoneNumber: 17309090670,
+//   })
-          })
+// }
-        }
-      },
-    })
-    return
-  }
-
-  if (item.type == 1) {
-    getUrl(item.url)
-  } else if (item.type == 2) {
-    getWebUrl(item.url)
-  }
-}
 </script>

src/pages/my/index.vue

@@ -13,7 +13,7 @@
 import { useUserStore } from '@/store'
 import { http } from '@/utils/http'
 import WxLogin from './components/wx-login.vue'
-const userStore = useUserStore()
+// const userStore = useUserStore()
 // const hasLogin = computed(() => userStore.userInfo?.nickname)
 
 // userStore.wxLogin()

src/style/index.scss

@@ -48,11 +48,11 @@ page {
 }
 
 .color-black {
-  color: #333333ff !important;
+  color: #333333 !important;
 }
 
 .color-gary {
-  color: #999999ff !important;
+  color: #999999 !important;
 }
 
 .default-color {