diff --git a/components/base/tabbar.vue b/components/base/tabbar.vue index ad879c9..bbff9ef 100644 --- a/components/base/tabbar.vue +++ b/components/base/tabbar.vue @@ -3,13 +3,13 @@ - @@ -36,33 +36,29 @@ "selectedIconPath": "/static/image/tabbar/home-a.png", "iconPath": "/static/image/tabbar/home.png", "pagePath": "/pages/index/index", - "title": "首页" + "title": "首页", + key : 'home', }, { - "selectedIconPath": "/static/image/tabbar/category-a.png", - "iconPath": "/static/image/tabbar/category.png", - "pagePath": "/pages/index/category", - "title": "分类", - isNotShop : true, - }, - { - "selectedIconPath": "/static/image/tabbar/order-a.png", - "iconPath": "/static/image/tabbar/order.png", - "pagePath": "/pages/index/order", - "title": "订单中心" + "selectedIconPath": "/static/image/tabbar/member-a.png", + "iconPath": "/static/image/tabbar/member.png", + "pagePath": "/pages/index/member", + "title": "会员", + key : 'member', }, { "selectedIconPath": "/static/image/tabbar/cart-a.png", "iconPath": "/static/image/tabbar/cart.png", "pagePath": "/pages/index/cart", "title": "购物车", - isNotShop : true, + key : 'cart', }, { "selectedIconPath": "/static/image/tabbar/center-a.png", "iconPath": "/static/image/tabbar/center.png", "pagePath": "/pages/index/center", - "title": "个人中心" + "title": "我的", + key : 'center', } ] }; diff --git a/components/config/PrivacyAgreementPoup.vue b/components/config/PrivacyAgreementPoup.vue index 6eda2c6..e9f23f2 100644 --- a/components/config/PrivacyAgreementPoup.vue +++ b/components/config/PrivacyAgreementPoup.vue @@ -10,7 +10,7 @@ - 欢迎来到酒店布草!我们根据最新的法律法规、监管政策要求，更新了《用户协议》和《隐私政策》,请您认真阅读。 + 欢迎来到三只青蛙小程序!我们根据最新的法律法规、监管政策要求，更新了《用户协议》和《隐私政策》,请您认真阅读。 @@ -18,7 +18,7 @@ - 同意《酒店布草隐私政策》 + 同意《三只青蛙小程序隐私政策》 以及《用户协议》 diff --git a/pages.json b/pages.json index e8910a4..b4b9e5b 100644 --- a/pages.json +++ b/pages.json @@ -28,6 +28,13 @@ "style": { "navigationBarTitleText": "" } + }, + { + "path" : "pages/index/member", + "style" : + { + "navigationBarTitleText" : "" + } } ], "preloadRule": { diff --git a/pages/index/cart.vue b/pages/index/cart.vue index 4c9a7c2..96c8ba3 100644 --- a/pages/index/cart.vue +++ b/pages/index/cart.vue @@ -77,7 +77,7 @@ - + diff --git a/pages/index/center.vue b/pages/index/center.vue index 151e503..df4ad28 100644 --- a/pages/index/center.vue +++ b/pages/index/center.vue @@ -18,36 +18,13 @@ 今天是您来的的第32天 - - 角色切换 - - - - - - - 我的用户 - - - - - 客户：王生 - - - 剩余水洗布：198 - - - - - - - + @@ -120,7 +97,7 @@ - + @@ -136,24 +113,12 @@ userShopCommission, }, computed: { - ...mapGetters(['userShop']), }, data() { return { } }, methods: { - headBtn() { - let self = this - uni.showModal({ - title: '演示切换角色之后的效果', - success(res) { - if (res.confirm) { - self.$store.state.shop = !self.$store.state.shop - } - } - }) - }, } } @@ -267,40 +232,6 @@ } } - .userShop { - .userList { - .title { - font-size: 32rpx; - font-weight: 900; - padding: 20rpx; - } - - .list { - display: flex; - flex-wrap: wrap; - - .item { - width: 270rpx; - margin: 20rpx; - display: flex; - flex-direction: column; - padding: 40rpx 30rpx; - background-color: #fff; - border-radius: 30rpx; - line-height: 60rpx; - - .name {} - - .num { - color: $uni-color; - font-weight: 600; - font-size: 28rpx; - } - } - } - } - } - .user { .line { display: flex; diff --git a/pages/index/index.vue b/pages/index/index.vue index dc9e069..a9f7fd6 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,31 +1,19 @@ @@ -118,24 +51,16 @@ import PrivacyAgreementPoup from '@/components/config/PrivacyAgreementPoup.vue' import Position from '@/utils/position.js' import tabber from '@/components/base/tabbar.vue' - import productList from '@/components/user/productList.vue' import { mapGetters } from 'vuex' - // import selectArea from '../../components/selectArea.vue'; export default { components : { tabber, - productList, PrivacyAgreementPoup, }, data() { return { area: '长沙', - text : '长沙市刘师傅在服务过程中客户投诉“服务过程中有不文明的行为”.....', - queryParams: { - pageNo: 1, - pageSize: 10, - title: '' - }, + notice : '长沙市刘师傅在服务过程中客户投诉“服务过程中有不文明的行为”.....', bannerList: [ { url: 'https://cdn.uviewui.com/uview/swiper/swiper3.png', @@ -147,264 +72,108 @@ url: 'https://cdn.uviewui.com/uview/swiper/swiper3.png', }, ], + baseList : [ + { + image : '/static/image/home/1.png', + title : '关于我们', + }, + { + image : '/static/image/home/1.png', + title : '产品介绍', + }, + { + image : '/static/image/home/2.png', + title : '促销活动', + }, + { + image : '/static/image/home/3.png', + title : '商城', + }, + { + image : '/static/image/home/4.png', + title : '邀请好友', + }, + { + image : '/static/image/home/5.png', + title : '新闻中心', + }, + { + image : '/static/image/home/6.png', + title : '校企合作', + }, + { + image : '/static/image/home/7.png', + title : '联系我们', + }, + ], productList: [], + keyword : '', } }, computed : { - ...mapGetters(['userShop']), }, methods: { - //显示选择地区 - showSelectArea() { - // this.$refs.selectArea.open() - }, - //搜索地址 - searchAddress() { - Position.getLocation(res => { - Position.selectAddress(res.longitude, res.latitude, success => { - let address = this.extractProvinceAndCity(success) - this.queryParams.title = address.city - }) - }) - }, - //提取用户选择的地址信息(省市县信息) - extractProvinceAndCity(res) { //提取用户选择的地址信息(省市) - if (!res.address && res.name) { //用户直接选择城市的逻辑 - return { - province: '', - city: res.name - }; - } - - if (res.address) { //用户选择了详细地址，要从详细地址中提取出省市县信息 - // 使用正则表达式匹配省市县 - const regex = /(?[\u4e00-\u9fa5]+?省)(?[\u4e00-\u9fa5]+?(?:市|自治州|盟|地区))/; - const match = res.address.match(regex); - if (match) { // 如果匹配成功，则返回省和市的信息 - return { - province: match.groups.province, - city: match.groups.city - }; - } - } - - return { //用户没选择地址就点了确定按钮 - province: '', - city: '' - } - }, } } diff --git a/pages_order/auth/wxLogin.vue b/pages_order/auth/wxLogin.vue index 96925fc..7c223f3 100644 --- a/pages_order/auth/wxLogin.vue +++ b/pages_order/auth/wxLogin.vue @@ -4,7 +4,7 @@ - 欢迎使用酒店桌布租赁平台 + 欢迎使用三只青蛙小程序 diff --git a/pages_order/auth/wxUserInfo.vue b/pages_order/auth/wxUserInfo.vue index f72f89c..a371883 100644 --- a/pages_order/auth/wxUserInfo.vue +++ b/pages_order/auth/wxUserInfo.vue @@ -1,7 +1,7 @@