diff --git a/app/pages.json b/app/pages.json index c684964..ff50762 100644 --- a/app/pages.json +++ b/app/pages.json @@ -171,6 +171,20 @@ }, { "path": "pages/index/components/b_combination", "style": {} + }, + { + "path": "pages/about/index", + "style": { + "navigationBarTitleText": "关于我们", + "navigationBarBackgroundColor": "#409EFF", + "app-plus": { + // #ifdef APP-PLUS + "titleNView": { + "type": "default" + } + // #endif + } + } } ], @@ -931,18 +945,18 @@ "selectedIconPath": "static/images/1-002.png", "text": "首页" }, - { - "pagePath": "pages/goods_cate/goods_cate", - "iconPath": "static/images/2-001.png", - "selectedIconPath": "static/images/2-002.png", - "text": "分类" - }, - { - "pagePath": "pages/order_addcart/order_addcart", - "iconPath": "static/images/3-001.png", - "selectedIconPath": "static/images/3-002.png", - "text": "购物车" - }, + // { + // "pagePath": "pages/goods_cate/goods_cate", + // "iconPath": "static/images/2-001.png", + // "selectedIconPath": "static/images/2-002.png", + // "text": "分类" + // }, + // { + // "pagePath": "pages/order_addcart/order_addcart", + // "iconPath": "static/images/3-001.png", + // "selectedIconPath": "static/images/3-002.png", + // "text": "购物车" + // }, { "pagePath": "pages/user/index", "iconPath": "static/images/4-001.png", diff --git a/app/pages/about/index.vue b/app/pages/about/index.vue new file mode 100644 index 0000000..6c0e795 --- /dev/null +++ b/app/pages/about/index.vue @@ -0,0 +1,183 @@ + + + + + \ No newline at end of file diff --git a/app/pages/index/index.vue b/app/pages/index/index.vue index cb53012..e46a9a5 100644 --- a/app/pages/index/index.vue +++ b/app/pages/index/index.vue @@ -112,7 +112,8 @@ 通知公告 - + + diff --git a/app/pages/supply_chain/repair/index.vue b/app/pages/supply_chain/repair/index.vue index 6aae84a..d441480 100644 --- a/app/pages/supply_chain/repair/index.vue +++ b/app/pages/supply_chain/repair/index.vue @@ -423,6 +423,16 @@ export default { }; }); + // 生成当前时间,格式为yyyy-MM-dd HH:mm:ss + const now = new Date(); + const year = now.getFullYear(); + const month = String(now.getMonth() + 1).padStart(2, '0'); + const day = String(now.getDate()).padStart(2, '0'); + const hours = String(now.getHours()).padStart(2, '0'); + const minutes = String(now.getMinutes()).padStart(2, '0'); + const seconds = String(now.getSeconds()).padStart(2, '0'); + const reportTime = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; + const payload = { // phone: this.form.phone.trim(), faultDesc: this.form.faultDesc.trim(), @@ -430,7 +440,8 @@ export default { houseId: this.selectedHouseId, houseName: this.selectedHouseName, files: imagefiles, - faultType: this.form.faultType + faultType: this.form.faultType, + reportTime: reportTime }; try { diff --git a/app/pages/user/index.vue b/app/pages/user/index.vue index 7e0922c..5d19caa 100644 --- a/app/pages/user/index.vue +++ b/app/pages/user/index.vue @@ -13,15 +13,15 @@ 请点击登录 - {{userInfo.nickname}} - + {{userInfo.nickname || '未设置用户名'}} + {{userInfo.vipName || ''}} - {{userInfo.phone}} + {{phoneDesensitization(userInfo.phone)}} @@ -29,7 +29,7 @@ 绑定手机号 - + {{userInfo.nowMoney && uid ?Number(userInfo.nowMoney).toFixed(2):0}} 余额 @@ -49,7 +49,7 @@ - + 订单中心 @@ -70,7 +70,7 @@ - + + - + + 关于我们 + + 退出登录 @@ -135,17 +139,20 @@ toLogin } from '@/libs/login.js'; import { - getCity - } from '@/api/api.js'; - import { - mapGetters - } from "vuex"; - // #ifdef H5 - import Auth from '@/libs/wechat'; - // #endif - // #ifdef MP - import authorize from '@/components/Authorize'; - // #endif + getCity + } from '@/api/api.js'; + import { + getLogout + } from '@/api/user.js'; + import { + mapGetters + } from "vuex"; + // #ifdef H5 + import Auth from '@/libs/wechat'; + // #endif + // #ifdef MP + import authorize from '@/components/Authorize'; + // #endif const app = getApp(); export default { components: { @@ -156,6 +163,7 @@ computed: mapGetters(['isLogin', 'chatUrl', 'userInfo', 'uid']), data() { return { + showShop: false, orderMenu: [{ img: '/static/images/order1.png', title: '待付款', @@ -243,6 +251,11 @@ } }, methods: { + // 手机号脱敏处理 + phoneDesensitization(phone) { + if (!phone) return ''; + return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2'); + }, // 记录会员访问 // setVisit(){ // setVisit({ @@ -367,6 +380,36 @@ expires: oneDay * 7 }); //设置七天过期时间 }) + }, + // 退出登录 + outLogin: function() { + let that = this; + uni.showModal({ + title: '提示', + content: '确认退出登录?', + success: function(res) { + if (res.confirm) { + getLogout() + .then(res => { + that.$store.commit("LOGOUT"); + uni.reLaunch({ + url: '/pages/index/index' + }); + }) + .catch(err => { + console.log(err); + }); + } else if (res.cancel) { + console.log('用户点击取消'); + } + } + }); + }, + // 跳转到关于我们页面 + goAboutUs() { + uni.navigateTo({ + url: '/pages/about/index' + }); } } } @@ -380,6 +423,7 @@ .bg { position: absolute; + z-index: 0; left: 0; top: 0; width: 100%; @@ -670,5 +714,19 @@ padding: 0 8rpx; border: 1px solid #ee5a52; } + + .aboutUs, + .logOut { + position: relative; + font-size: 32rpx; + text-align: center; + width: 690rpx; + height: 90rpx; + border-radius: 45rpx; + margin: 30rpx auto 0 auto; + z-index: 1; + color: white; + border: 2rpx solid white !important; + } } \ No newline at end of file diff --git a/app/pages/users/user_info/index.vue b/app/pages/users/user_info/index.vue index 6e48153..8ad338c 100644 --- a/app/pages/users/user_info/index.vue +++ b/app/pages/users/user_info/index.vue @@ -23,7 +23,7 @@ - @@ -112,6 +112,11 @@ } }, methods: { + // 手机号脱敏处理 + phoneDesensitization(phone) { + if (!phone) return ''; + return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2'); + }, // 授权关闭 authColse: function(e) { this.isShowAuth = e