diff --git a/api/api.js b/api/api.js
index 35fd363..c578284 100644
--- a/api/api.js
+++ b/api/api.js
@@ -305,6 +305,22 @@ const config = {
showLoading : true,
},
+
+
+ // 获取今日是否签到
+ getTodaySign : {
+ url: '/token/getTodaySign',
+ method: 'GET',
+ auth : true,
+ showLoading : true,
+ },
+ // 获取今日是否签到
+ sign : {
+ url: '/token/sign',
+ method: 'POST',
+ auth : true,
+ showLoading : true,
+ },
}
const models = ['order']
diff --git a/api/model/order.js b/api/model/order.js
index 78093ab..acce31e 100644
--- a/api/model/order.js
+++ b/api/model/order.js
@@ -25,14 +25,14 @@ const api = {
// 商城-订单列表
getOrderList : {
url: '/order/getOrderList',
- method: 'POST',
+ method: 'GET',
auth : true,
},
// 商城-订单详情
getOrderDetail : {
url: '/order/getOrderDetail',
- method: 'POST',
+ method: 'GET',
auth : true,
},
}
diff --git a/components/list/activity/activityItem.vue b/components/list/activity/activityItem.vue
index a6cbb75..9837e1a 100644
--- a/components/list/activity/activityItem.vue
+++ b/components/list/activity/activityItem.vue
@@ -7,28 +7,8 @@
-
-
- {{ item.isBrowse }}浏览
-
-
- {{ item.isComment }}条评论
-
-
- 点赞
-
-
-
-
-
- 分享
-
-
-
-
+
+
@@ -37,12 +17,14 @@
import userHeadItem from '@/components/list/dynamic/userHeadItem.vue'
import daynamicInfo from '@/components/list/dynamic/daynamicInfo.vue'
import activityInfo from '@/components/list/activity/activityInfo.vue'
+ import statisticalDataInfo from '@/components/list/statisticalDataInfo.vue'
export default {
mixins: [mixinsSex],
components : {
userHeadItem,
daynamicInfo,
activityInfo,
+ statisticalDataInfo,
},
props: {
item: {},
diff --git a/components/list/dynamic/dynamicItem.vue b/components/list/dynamic/dynamicItem.vue
index db91395..41936ea 100644
--- a/components/list/dynamic/dynamicItem.vue
+++ b/components/list/dynamic/dynamicItem.vue
@@ -5,50 +5,19 @@
-
-
-
- {{ item.isBrowse }}
-
-
-
-
-
-
- {{ item.isComment }}
-
-
-
-
-
-
- 22
-
-
-
-
-
-
-
-
- 0
-
-
-
-
-
-
-
+
+
+
\ No newline at end of file
diff --git a/components/user/createDetailPopup.vue b/components/user/createDetailPopup.vue
index 6438a70..ecfd4ae 100644
--- a/components/user/createDetailPopup.vue
+++ b/components/user/createDetailPopup.vue
@@ -1,20 +1,24 @@
+
+
-
+
+
-
+
-
+
+
+
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 30eec47..f977fc9 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -21,39 +21,38 @@
-
+ >
+
-
- {{ headinfo.name }}
+
+ {{ headInfo.name }}
江华便民生活好帮手
@@ -114,8 +113,7 @@
+ class="dynamicList">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -146,6 +167,7 @@
import createDetailPopup from '@/components/user/createDetailPopup.vue'
import customerServicePopup from '@/components/user/customerServicePopup.vue'
import sharePopup from '@/components/user/sharePopup.vue'
+ import signInOnePopup from '@/components/user/signInOnePopup.vue'
import dynamicItem from '@/components/list/dynamic/dynamicItem.vue'
import mixinsList from '@/mixins/list.js'
import { mapState } from 'vuex'
@@ -159,10 +181,11 @@
dynamicItem,
certificationPopup,
sharePopup,
+ signInOnePopup,
},
data() {
return {
- headinfo: {},
+ // headInfo: {},
menu : [],
mixinsListApi : 'getPostPage',
bannerList : [],
@@ -175,14 +198,15 @@
}
this.getData()
- this.getIndexHeaderInfo()
+ // this.getIndexHeaderInfo()
+ this.$store.commit('getIndexHeaderInfo')
this.getClassifyList()
this.getBannerList()
this.$store.commit('getCategory')
},
onShareAppMessage(res) {
return {
- title: this.headinfo.name,
+ title: this.headInfo.name,
path: '/pages/index/index'
}
},
@@ -190,14 +214,14 @@
this.getUserInfo()
},
onPullDownRefresh() {
- this.getIndexHeaderInfo()
+ // this.getIndexHeaderInfo()
this.getClassifyList()
this.getBannerList()
this.$store.commit('getCategory')
this.getUserInfo()
},
computed: {
- ...mapState(['city', 'category', 'userInfo']),
+ ...mapState(['city', 'category', 'userInfo', 'headInfo']),
},
methods: {
tabsClick(item) {
@@ -224,7 +248,7 @@
getIndexHeaderInfo(){
this.$api('getIndexHeaderInfo',res =>{
if(res.code == 200){
- this.headinfo = res.result
+ this.headInfo = res.result
}
})
},
diff --git a/pages_order/activity/activityDetail.vue b/pages_order/activity/activityDetail.vue
index bcbc6d1..76af975 100644
--- a/pages_order/activity/activityDetail.vue
+++ b/pages_order/activity/activityDetail.vue
@@ -11,27 +11,8 @@
-
-
- {{ detail.isBrowse }}浏览
-
-
- {{ detail.isComment }}条评论
-
-
-
-
-
-
-
+
+
@@ -52,6 +33,7 @@
import userHeadItem from '@/components/list/dynamic/userHeadItem.vue'
import daynamicInfo from '@/components/list/dynamic/daynamicInfo.vue'
import activityInfo from '@/components/list/activity/activityInfo.vue'
+ import statisticalDataInfo from '@/components/list/statisticalDataInfo.vue'
export default {
mixins: [mixinsSex, mixinsList],
components: {
@@ -59,6 +41,7 @@
userHeadItem,
daynamicInfo,
activityInfo,
+ statisticalDataInfo,
},
data() {
return {
diff --git a/pages_order/car/carList.vue b/pages_order/car/carList.vue
index 8fadb05..681798e 100644
--- a/pages_order/car/carList.vue
+++ b/pages_order/car/carList.vue
@@ -9,7 +9,7 @@
placeholder="请输入搜索关键字..." v-model="queryParams.title">
-
+
+
+
+
+
@@ -35,13 +35,13 @@