diff --git a/App.vue b/App.vue index 956ca6d..ceafdfd 100644 --- a/App.vue +++ b/App.vue @@ -5,6 +5,10 @@ onShow: function() { this.$store.commit('initConfig') this.$store.commit('getCityList') + + if(uni.getStorageSync('token')){ + this.$store.commit('getMemberInfo') + } }, onHide: function() { } @@ -29,6 +33,8 @@ } } + + .uv-drop-down{ background: transparent !important; border: none !important; diff --git a/api/api.js b/api/api.js index 05cbbdf..6ee2f6a 100644 --- a/api/api.js +++ b/api/api.js @@ -335,6 +335,20 @@ const config = { auth : true, showLoading : true, }, + // 点击查看联系方式 类型 0帖子 1租房 2工作 3门店 + checkGivePhone : { + url: '/token/checkGivePhone', + method: 'POST', + auth : true, + showLoading : true, + }, + + // 查询店铺中的商品、美食 + getGoodsList : { + url: '/token/getGoodsList', + method: 'GET', + auth : true, + }, } const models = ['order'] diff --git a/api/model/order.js b/api/model/order.js index c86c09b..ef66884 100644 --- a/api/model/order.js +++ b/api/model/order.js @@ -42,6 +42,12 @@ const api = { auth : true, showLoading : true, }, + // 查询当前开通会员以及过期时间 + getMemberInfo : { + url: '/order/getMemberInfo', + method: 'GET', + auth : true, + }, } export default api \ No newline at end of file diff --git a/components/list/dynamic/dynamicItem.vue b/components/list/dynamic/dynamicItem.vue index 41936ea..add5186 100644 --- a/components/list/dynamic/dynamicItem.vue +++ b/components/list/dynamic/dynamicItem.vue @@ -5,7 +5,10 @@ - + diff --git a/components/list/statisticalDataInfo.vue b/components/list/statisticalDataInfo.vue index b51abd3..1cce4cf 100644 --- a/components/list/statisticalDataInfo.vue +++ b/components/list/statisticalDataInfo.vue @@ -28,7 +28,13 @@ - + + @@ -39,8 +45,17 @@ } }, + computed : { + title(){ + let key = { + 0 : 'userName', + } + return this.item[key[this.type]] + }, + }, props: { item: {}, + type : {}, }, methods: { diff --git a/components/user/callPhone.vue b/components/user/callPhone.vue index 80bfe20..0251e63 100644 --- a/components/user/callPhone.vue +++ b/components/user/callPhone.vue @@ -1,7 +1,7 @@ @@ -9,7 +9,7 @@ import mixinsSex from '@/mixins/sex.js' export default { mixins: [mixinsSex], - props: ['phone', 'title', 'sexName'], + props: ['phone', 'title', 'sexName', 'type', 'phoneTitle', 'pid'], data() { return { @@ -17,8 +17,28 @@ }, methods: { callPhone(){ - uni.makePhoneCall({ - phoneNumber: this.phone + + let data = { + title : this.phoneTitle, + type : this.type, + id : this.pid + } + + console.log(data); + + if(!data.id || !data.title){ + return uni.showToast({ + title: '缺少参数', + icon: 'none' + }) + } + + this.$api('checkGivePhone', data, res => { + if(res.code == 200){ + uni.makePhoneCall({ + phoneNumber: this.phone + }) + } }) }, } @@ -32,6 +52,7 @@ padding: 8rpx 16rpx; border-radius: 10rpx; margin-left: auto; + font-size: 26rpx; image { width: 20rpx; diff --git a/components/user/productList.vue b/components/user/productList.vue index 29ff668..0bf7ae3 100644 --- a/components/user/productList.vue +++ b/components/user/productList.vue @@ -23,10 +23,12 @@ --> - + 现价￥{{ item.price }}元 - + 原价￥{{ item.oldPrice }} - + 积分兑换 @@ -63,7 +67,9 @@ + + \ No newline at end of file diff --git a/pages_order/components/list/workList/workItem.vue b/pages_order/components/list/workList/workItem.vue index 9284b25..b31ece0 100644 --- a/pages_order/components/list/workList/workItem.vue +++ b/pages_order/components/list/workList/workItem.vue @@ -62,10 +62,18 @@ {{ item.iconTitle }} - 应聘 - + --> + + diff --git a/pages_order/gourmet/gourmetDetail.vue b/pages_order/gourmet/gourmetDetail.vue index 6887290..04da9f7 100644 --- a/pages_order/gourmet/gourmetDetail.vue +++ b/pages_order/gourmet/gourmetDetail.vue @@ -23,15 +23,7 @@ - - - - - - {{ detail.isComment }}条评论 - + + + + + + + + + + + + + + + + + + + + + {{ detail.shopName }} + + + + + + + + + + + + + + + + + .postDetail { padding-bottom: env(safe-area-inset-bottom); - .works { - background-color: #fff; - padding: 40rpx; - border-radius: 20rpx; - - .box { - display: flex; - align-items: center; - - .headPortraitimg { - width: 100rpx; - height: 100rpx; - border-radius: 15rpx; - overflow: hidden; - - image { - width: 100%; - height: 100%; - } + .box { + display: flex; + align-items: center; + + .headPortraitimg { + width: 100rpx; + height: 100rpx; + border-radius: 15rpx; + overflow: hidden; + + image { + width: 100%; + height: 100%; } - - .YaoduUniversalWall { - padding: 0rpx 10rpx; - - .Times { - display: flex; - padding: 5rpx 0rpx; - font-size: 20rpx; - margin-top: 10rpx; - - .Month { - margin: 0rpx 15rpx; - } + } + + .YaoduUniversalWall { + padding: 0rpx 10rpx; + + .Times { + display: flex; + padding: 5rpx 0rpx; + font-size: 20rpx; + margin-top: 10rpx; + + .Month { + margin: 0rpx 15rpx; } - } + } + } + .works { + background-color: #fff; + padding: 40rpx; + border-radius: 20rpx; .personalInformation { display: flex; @@ -196,29 +277,8 @@ } } - .dynamics { - margin-top: 20rpx; - font-size: 28rpx; - // font-weight: bold; - // line-height: 35rpx; - letter-spacing: 3rpx; - } - - .Artworkimages { - display: flex; - flex-wrap: wrap; - - .wrokimg { - margin: 10rpx; - - image { - height: 190rpx; - width: 190rpx; - border-radius: 20rpx; - } - } - } + .bottom { display: flex; margin-top: 20rpx; @@ -237,5 +297,34 @@ } } + .goodList{ + padding: 0 20rpx; + } + + .goodInfo{ + margin: 20rpx; + padding: 20rpx; + background-color: #fff; + border-radius: 30rpx; + .dynamics { + margin-top: 20rpx; + font-size: 28rpx; + letter-spacing: 3rpx; + } + .Artworkimages { + display: flex; + flex-wrap: wrap; + + .wrokimg { + margin: 10rpx; + + image { + height: 190rpx; + width: 190rpx; + border-radius: 20rpx; + } + } + } + } } \ No newline at end of file diff --git a/pages_order/mine/runningWater.vue b/pages_order/mine/runningWater.vue index 9302917..0aee25a 100644 --- a/pages_order/mine/runningWater.vue +++ b/pages_order/mine/runningWater.vue @@ -57,7 +57,7 @@ }, ] }, - x : ['+', '-' , '-' , '+'], + x : ['-' , '+'], status : 0, } }, diff --git a/pages_order/notice/noticeDetail.vue b/pages_order/notice/noticeDetail.vue new file mode 100644 index 0000000..4ba1970 --- /dev/null +++ b/pages_order/notice/noticeDetail.vue @@ -0,0 +1,33 @@ + + + + + diff --git a/pages_order/post/postDetail.vue b/pages_order/post/postDetail.vue index 7f63c40..2897431 100644 --- a/pages_order/post/postDetail.vue +++ b/pages_order/post/postDetail.vue @@ -90,17 +90,6 @@ } }) }, - callPhone(){ - uni.makePhoneCall({ - phoneNumber: this.detail.phone, - success() { - console.log('安卓拨打成功'); - }, - fail() { - console.log('安卓拨打失败'); - } - }) - }, } } diff --git a/pages_order/product/productDetail.vue b/pages_order/product/productDetail.vue index eabafbc..4ccdd75 100644 --- a/pages_order/product/productDetail.vue +++ b/pages_order/product/productDetail.vue @@ -17,19 +17,29 @@ {{ detail.nameSub }} - + 现价￥ {{ detail.price }} + + 原价￥ + {{ + detail.oldPrice + }} + + - + 积分兑换 @@ -90,7 +100,9 @@