diff --git a/api/model/index.js b/api/model/index.js
index 3bd6c97..d1c271b 100644
--- a/api/model/index.js
+++ b/api/model/index.js
@@ -1,215 +1,11 @@
// 首页相关接口
const api = {
- // 获取首页轮播图
- getRiceBanner: {
- url: '/index_common/getRiceBanner',
+ // 首页-查询banner图列表
+ queryBannerList: {
+ url: '/index/queryBannerList',
method: 'GET',
},
- // 获取首页常规产品【废弃】
- // getRiceCommonProductList: {
- // url: '/index_common/getRiceCommonProductList',
- // method: 'GET',
- // },
- // 获取首页跳转图标
- getRiceIconList: {
- url: '/index_common/getRiceIconList',
- method: 'GET',
- },
- // 获取首页新闻详情
- getRiceNewsDetail: {
- url: '/index_common/getCommonNewsDetail',
- method: 'GET',
- },
- // 获取首页新闻列表
- getRiceNewsList: {
- url: '/index_common/getRiceNewsList',
- method: 'GET',
- },
- // 获取首页公告列表
- getRiceNoticeList: {
- url: '/index_common/getRiceNoticeList',
- method: 'GET',
- },
- // 获取首页商品详情
- getRiceProductDetail: {
- url: '/index_common/getRiceProductDetail',
- method: 'GET',
- },
- // 获取首页体验产品
- getRiceProductList: {
- url: '/index_common/getRiceProductList',
- method: 'GET',
- },
- // 查询分类接口
- getCategoryList: {
- url: '/index_common/getCategoryList',
- method: 'GET',
- },
- // 新查询分类以及商品数据接口
- getCategoryPidList: {
- url: '/index_common/getCategoryPidList',
- method: 'GET',
- debounce : 250,
- },
- // 查询一级分类接口
- getPidList: {
- url: '/index_common/getCategoryPidList',
- method: 'GET',
- },
- // 获取分类分页商品列表接口
- getClassShopPageList: {
- url: '/index_common/getClassShopPageList',
- method: 'GET',
- },
- // 加入购物车
- addCart: {
- url: '/index_common/addCart',
- method: 'GET',
- auth: true,
- showLoading: true,
- limit : 500,
- },
- // 删除购物车信息
- deleteCart: {
- url: '/index_common/deleteCart',
- method: 'DELETE',
- auth: true,
- showLoading: true,
- },
- // 修改购物车信息数量
- updateCartNum: {
- url: '/index_common/updateCartNum',
- method: 'POST',
- auth: true,
- debounce: 300,
- },
- // 创建订单
- createOrder: {
- url: '/index_common/createOrder',
- method: 'GET',
- auth: true,
- limit: 1000,
- showLoading: true,
- },
- // 创建订单-再次支付
- createOrderTwo: {
- url: '/index_common/createOrderTwo',
- method: 'GET',
- auth: true,
- limit: 1000,
- showLoading: true,
- },
- // 多商品创建订单
- createSumOrder: {
- url: '/index_common/createSumOrder',
- method: 'POST',
- auth: true,
- limit: 1000,
- showLoading: true,
- },
- // 多商品订单再次支付
- createSumOrderAgain: {
- url: '/index_common/createSumOrderAgain',
- method: 'POST',
- auth: true,
- limit: 1000,
- showLoading: true,
- },
- // 确认收货
- confirmOrder: {
- url: '/index_common/confirmOrder',
- method: 'GET',
- auth: true,
- limit: 1000,
- showLoading: true,
- },
- // 取消订单
- cancelOrder: {
- url: '/index_common/cancelOrder',
- method: 'GET',
- auth: true,
- limit: 1000,
- showLoading: true,
- },
- // 获取首页广告列表
- getRiceProductList: {
- url: '/index_common/getRiceAdList',
- method: 'GET',
- },
- // 获取首页广告列表
- getRiceAdDetail: {
- url: '/index_common/getRiceAdDetail',
- method: 'GET',
- },
- //获取优惠券信息
- getRiceCouponList: {
- url: '/info_common/getRiceCouponList',
- method: 'GET',
- },
- //增加或者修改合伙人申请信息
- addOrUpdateCommonUser: {
- url: '/index_common/addOrUpdateCommonUser',
- method: 'POST',
- },
- //根据用户查询渠合伙人申请信息表单
- getCommonUser: {
- url: '/index_common/getCommonUser',
- method: 'GET'
- },
- //提交反馈信息
- addFeedback: {
- url: '/info_common/addFeedback',
- method: 'POST'
- },
- // 获取我的直接推荐间接推荐用户列表带分页
- getHanHaiMemberUser: {
- url: '/info_common/getHanHaiMemberUser',
- method: 'GET'
- },
- // 获取祝福背景图
- getRiceBlessing: {
- url: '/index_common/getRiceBlessing',
- method: 'GET'
- },
- // 随机获取祝福语
- getRiceBlessingWords: {
- url: '/index_common/getRiceBlessingWords',
- method: 'GET'
- },
- // 根据订单标识修改订单祝福语背景
- updateOrderBlessing: {
- url: '/index_common/updateOrderBlessing',
- method: 'POST',
- auth : true,
- limit : 1000,
- },
- // 1.收礼流程 =》点击收礼
- getGiveShop: {
- url: '/index_common/getGiveShop',
- method: 'GET',
- auth : true,
- limit : 1000,
- },
- // 2.点击抽奖 =》抽奖
- getGiveShopLottery: {
- url: '/index_common/getGiveShopLottery',
- method: 'GET',
- auth : true,
- limit : 1000,
- },
- // 获取我的礼品订单
- getMyGiftOrder: {
- url: '/index_common/getMyGiftOrder',
- method: 'GET',
- auth : true,
- },
- // 获取我的礼品订单详情
- getMyGiftOrderDetail: {
- url: '/index_common/getMyGiftOrderDetail',
- method: 'GET',
- auth : true,
- },
}
export default api
\ No newline at end of file
diff --git a/common.scss b/common.scss
index 1e22371..3eb63c2 100644
--- a/common.scss
+++ b/common.scss
@@ -60,6 +60,9 @@
font-weight: 400;
line-height: 1.4;
}
+.page__view.highlight {
+ background: linear-gradient(#DAF3FF, #FBFEFF 400rpx, #FBFEFF);
+}
.btn {
width: auto;
@@ -78,10 +81,6 @@
padding: 0 !important;
}
-/deep/ .uv-calendar-month__days__day {
- // height: 60px !important;
-}
-
/deep/ .uv-calendar-month__days__day__select__top-info,
/deep/ .uv-calendar-month__days__day__select__buttom-info {
white-space: nowrap;
@@ -93,4 +92,13 @@
/deep/ .uv-number-box__input {
font-size: 40rpx;
+}
+
+/deep/ .uv-steps-item__wrapper {
+ background: transparent !important;
+}
+
+/deep/ .uv-steps-item__line {
+ background: #F3F3F3 !important;
+ transform: translateY(9px) !important;
}
\ No newline at end of file
diff --git a/components/base/tabbar.vue b/components/base/tabbar.vue
index 51a5d5d..67f2bb2 100644
--- a/components/base/tabbar.vue
+++ b/components/base/tabbar.vue
@@ -43,6 +43,13 @@
"title": "分类",
key: 'category',
},
+ {
+ "selectedIconPath": "/static/image/tabbar/growing-active.png",
+ "iconPath": "/static/image/tabbar/growing.png",
+ "pagePath": "/pages/index/growing",
+ "title": "成长档案",
+ key: 'growing',
+ },
{
"selectedIconPath": "/static/image/tabbar/user-center-active.png",
"iconPath": "/static/image/tabbar/user-center.png",
diff --git a/components/growing/recordsView.vue b/components/growing/recordsView.vue
new file mode 100644
index 0000000..c86054d
--- /dev/null
+++ b/components/growing/recordsView.vue
@@ -0,0 +1,113 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ record.createTime }}
+
+
+
+ {{ record.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/growing/userCard.vue b/components/growing/userCard.vue
new file mode 100644
index 0000000..7372103
--- /dev/null
+++ b/components/growing/userCard.vue
@@ -0,0 +1,212 @@
+
+
+
+
+
+
+
+ 学生
+
+
+
+ 战斗世界
+ ID：5625354
+
+
+ 8
+ 成就
+
+
+ 68
+ 足迹
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/config.js b/config.js
index d8c3365..203e425 100644
--- a/config.js
+++ b/config.js
@@ -8,7 +8,7 @@ import uvUI from '@/uni_modules/uv-ui-tools'
Vue.use(uvUI);
// 当前环境
-const type = 'dev'
+const type = 'prod'
// 环境配置
@@ -17,7 +17,7 @@ const config = {
baseUrl : 'http://www.gcosc.fun:82',
},
prod : {
- baseUrl : 'http://xxx.xxx.xxx/xxx',
+ baseUrl : 'https://www.hongyujiaoyu.com/studytour-admin/studytour',
}
}
diff --git a/pages.json b/pages.json
index 84af214..569ce73 100644
--- a/pages.json
+++ b/pages.json
@@ -12,6 +12,15 @@
"navigationBarTitleText": ""
}
},
+ {
+ "path": "pages/index/growing",
+ "style": {
+ "navigationBarTitleText": "",
+ "componentPlaceholder": {
+ "record-form-popup": "view"
+ }
+ }
+ },
{
"path": "pages/index/center",
"style": {
@@ -69,6 +78,18 @@
},
{
"path": "coupon/index"
+ },
+ {
+ "path": "growing/activity/search"
+ },
+ {
+ "path": "growing/activity/index"
+ },
+ {
+ "path": "growing/achievement/index"
+ },
+ {
+ "path": "member/switch"
}
]
}],
diff --git a/pages/index/growing.vue b/pages/index/growing.vue
new file mode 100644
index 0000000..e9555ae
--- /dev/null
+++ b/pages/index/growing.vue
@@ -0,0 +1,193 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 8903ae4..9f2d252 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -50,7 +50,7 @@
-
+
@@ -93,13 +93,14 @@
}
},
onLoad() {
+ // this.$utils.navigateTo(`/pages_order/growing/activity/index`)
// uni.navigateTo({
// url: `/pages_order/order/orderConfirm/index`
// })
// return
- uni.navigateTo({
- url: `/pages_order/order/orderDetail/index`
- })
+ // uni.navigateTo({
+ // url: `/pages_order/order/orderDetail/index`
+ // })
// let id = '1948353988875821058'
// uni.navigateTo({
@@ -176,20 +177,6 @@
]
this.total = this.list.length
},
- onCategoryChange(e) {
- const { classId } = e || {}
-
- if (classId) {
- this.queryParams.classId = classId
- } else {
- delete this.queryParams.classId
- }
-
- this.queryParams.pageNo = 1
- this.queryParams.pageSize = 10
- this.getData()
-
- },
},
}
diff --git a/pages_order/comment/commentCard.vue b/pages_order/comment/commentCard.vue
index bb56e3f..f660607 100644
--- a/pages_order/comment/commentCard.vue
+++ b/pages_order/comment/commentCard.vue
@@ -10,15 +10,8 @@
{{ data.user.name }}
{{ $dayjs(data.createTime).format('YYYY-MM-DD') }}
-
-
-
-
-
{{ data.content }}
@@ -42,6 +35,20 @@
+
+
+
+
+
@@ -67,37 +74,21 @@
}
},
methods: {
- async fetchDelete() {
-
- uni.showToast({
- icon: 'loading',
- title: '正在删除',
- });
-
- try {
- await this.$fetch('deleteEvaluate', { id: this.data.id })
-
- uni.showToast({
- icon: 'success',
- title: '删除成功',
- });
-
- this.$emit('deleteSucc')
-
- } catch (err) {
-
- }
- },
- onDelete() {
- uni.showModal({
- title: '确认删除？',
- success : e => {
- if(e.confirm){
- this.fetchDelete()
- }
- }
- })
- }
+ onComment() {
+ // todo
+
+ this.$emit('change')
+ },
+ onLike() {
+ // todo
+
+ this.$emit('change')
+ },
+ onCancelLike() {
+ // todo
+
+ this.$emit('change')
+ },
},
}
diff --git a/pages_order/components/formRate.vue b/pages_order/components/formRate.vue
new file mode 100644
index 0000000..db84145
--- /dev/null
+++ b/pages_order/components/formRate.vue
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/components/formTextarea.vue b/pages_order/components/formTextarea.vue
new file mode 100644
index 0000000..b5aa5a3
--- /dev/null
+++ b/pages_order/components/formTextarea.vue
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/components/formUpload.vue b/pages_order/components/formUpload.vue
new file mode 100644
index 0000000..4faf324
--- /dev/null
+++ b/pages_order/components/formUpload.vue
@@ -0,0 +1,105 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/coupon/index.vue b/pages_order/coupon/index.vue
index 66d2d63..f9d8826 100644
--- a/pages_order/coupon/index.vue
+++ b/pages_order/coupon/index.vue
@@ -13,12 +13,12 @@
activeColor="#00A9FF"
@change="onRadioChange"
>
-
-
-
+
+
+
diff --git a/pages_order/growing/achievement/index.vue b/pages_order/growing/achievement/index.vue
new file mode 100644
index 0000000..76961e5
--- /dev/null
+++ b/pages_order/growing/achievement/index.vue
@@ -0,0 +1,175 @@
+
+
+
+
+
+
+
+
+
+
+ 共获得8枚成就
+ 新获得
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/growing/achievement/recordsView.vue b/pages_order/growing/achievement/recordsView.vue
new file mode 100644
index 0000000..9392d2b
--- /dev/null
+++ b/pages_order/growing/achievement/recordsView.vue
@@ -0,0 +1,112 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ record.name }}
+
+
+
+
+
+
+ {{ child.label }}
+ {{ child.createTime }}
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/growing/activity/index.vue b/pages_order/growing/activity/index.vue
new file mode 100644
index 0000000..8914cc2
--- /dev/null
+++ b/pages_order/growing/activity/index.vue
@@ -0,0 +1,277 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/growing/activity/markPopup.vue b/pages_order/growing/activity/markPopup.vue
new file mode 100644
index 0000000..db9d76a
--- /dev/null
+++ b/pages_order/growing/activity/markPopup.vue
@@ -0,0 +1,261 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/growing/activity/recordFormPopup.vue b/pages_order/growing/activity/recordFormPopup.vue
new file mode 100644
index 0000000..bb68559
--- /dev/null
+++ b/pages_order/growing/activity/recordFormPopup.vue
@@ -0,0 +1,353 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/growing/activity/reloateProjectPopup.vue b/pages_order/growing/activity/reloateProjectPopup.vue
new file mode 100644
index 0000000..973ec38
--- /dev/null
+++ b/pages_order/growing/activity/reloateProjectPopup.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/growing/activity/search.vue b/pages_order/growing/activity/search.vue
new file mode 100644
index 0000000..f7a3f91
--- /dev/null
+++ b/pages_order/growing/activity/search.vue
@@ -0,0 +1,171 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/growing/activity/sortBar.vue b/pages_order/growing/activity/sortBar.vue
new file mode 100644
index 0000000..db77d7f
--- /dev/null
+++ b/pages_order/growing/activity/sortBar.vue
@@ -0,0 +1,107 @@
+
+
+ 地点
+
+ 主题
+
+
+
+
+
+
+
+ 时间
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/member/memberCard.vue b/pages_order/member/memberCard.vue
new file mode 100644
index 0000000..79abb6e
--- /dev/null
+++ b/pages_order/member/memberCard.vue
@@ -0,0 +1,95 @@
+
+
+
+
+
+
+ {{ typeDesc }}
+
+ 绑定人：
+ {{ data.name }}
+
+
+ 申请人ID：
+ {{ data.userId }}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/member/switch.vue b/pages_order/member/switch.vue
new file mode 100644
index 0000000..0748ee4
--- /dev/null
+++ b/pages_order/member/switch.vue
@@ -0,0 +1,139 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/order/orderConfirm/infoPopup.vue b/pages_order/order/orderConfirm/infoPopup.vue
index 780f76a..39cb851 100644
--- a/pages_order/order/orderConfirm/infoPopup.vue
+++ b/pages_order/order/orderConfirm/infoPopup.vue
@@ -67,7 +67,6 @@
-
diff --git a/static/image/icon-comment.png b/static/image/icon-comment.png
new file mode 100644
index 0000000..9c380bf
Binary files /dev/null and b/static/image/icon-comment.png differ
diff --git a/static/image/icon-like-active.png b/static/image/icon-like-active.png
new file mode 100644
index 0000000..3c72318
Binary files /dev/null and b/static/image/icon-like-active.png differ
diff --git a/static/image/icon-like.png b/static/image/icon-like.png
new file mode 100644
index 0000000..dc3897a
Binary files /dev/null and b/static/image/icon-like.png differ
diff --git a/static/image/icon-mark-highlight.png b/static/image/icon-mark-highlight.png
new file mode 100644
index 0000000..5af0676
Binary files /dev/null and b/static/image/icon-mark-highlight.png differ
diff --git a/static/image/icon-mark.png b/static/image/icon-mark.png
new file mode 100644
index 0000000..1676f42
Binary files /dev/null and b/static/image/icon-mark.png differ
diff --git a/static/image/icon-question.png b/static/image/icon-question.png
new file mode 100644
index 0000000..d3979f2
Binary files /dev/null and b/static/image/icon-question.png differ
diff --git a/static/image/temp-37.png b/static/image/temp-37.png
new file mode 100644
index 0000000..0297c3f
Binary files /dev/null and b/static/image/temp-37.png differ
diff --git a/static/image/temp-38.png b/static/image/temp-38.png
new file mode 100644
index 0000000..0b8b9fd
Binary files /dev/null and b/static/image/temp-38.png differ
diff --git a/static/image/temp-39.png b/static/image/temp-39.png
new file mode 100644
index 0000000..ac6fe9d
Binary files /dev/null and b/static/image/temp-39.png differ
diff --git a/static/image/temp-40.png b/static/image/temp-40.png
new file mode 100644
index 0000000..cd2388b
Binary files /dev/null and b/static/image/temp-40.png differ
diff --git a/static/image/temp-41.png b/static/image/temp-41.png
new file mode 100644
index 0000000..06ba3b4
Binary files /dev/null and b/static/image/temp-41.png differ
diff --git a/static/image/temp-42.png b/static/image/temp-42.png
new file mode 100644
index 0000000..0522e17
Binary files /dev/null and b/static/image/temp-42.png differ
diff --git a/static/image/temp-43.png b/static/image/temp-43.png
new file mode 100644
index 0000000..8d1e0f2
Binary files /dev/null and b/static/image/temp-43.png differ
diff --git a/static/image/temp-44.png b/static/image/temp-44.png
new file mode 100644
index 0000000..b59ef24
Binary files /dev/null and b/static/image/temp-44.png differ
diff --git a/static/image/temp-45.png b/static/image/temp-45.png
new file mode 100644
index 0000000..b32f54b
Binary files /dev/null and b/static/image/temp-45.png differ
diff --git a/static/image/temp-46.png b/static/image/temp-46.png
new file mode 100644
index 0000000..92fec3d
Binary files /dev/null and b/static/image/temp-46.png differ
diff --git a/static/image/temp-47.png b/static/image/temp-47.png
new file mode 100644
index 0000000..d12387e
Binary files /dev/null and b/static/image/temp-47.png differ
diff --git a/static/image/temp-48.png b/static/image/temp-48.png
new file mode 100644
index 0000000..6dcbf83
Binary files /dev/null and b/static/image/temp-48.png differ
diff --git a/static/image/temp-49.png b/static/image/temp-49.png
new file mode 100644
index 0000000..610764f
Binary files /dev/null and b/static/image/temp-49.png differ
diff --git a/store/store.js b/store/store.js
index f03720a..55ba193 100644
--- a/store/store.js
+++ b/store/store.js
@@ -15,6 +15,7 @@ const store = new Vuex.Store({
travelerList: null,
orderInfo: null,
couponInfo: null,
+ memberInfo: null,
},
getters: {
// 角色 true为水洗店 false为酒店 ： 身份判断如果不需要，可以删除
@@ -116,6 +117,9 @@ const store = new Vuex.Store({
setCouponInfo(state, data) {
state.couponInfo = data
},
+ setMemberInfo(state, data) {
+ state.memberInfo = data
+ },
},
actions: {
async collect(state, id) {