diff --git a/components/beauty-calendar/beauty-calendar.vue b/components/beauty-calendar/beauty-calendar.vue new file mode 100644 index 0000000..739fc65 --- /dev/null +++ b/components/beauty-calendar/beauty-calendar.vue @@ -0,0 +1,433 @@ + + + + + diff --git a/components/mx-datepicker/mx-datepicker.vue b/components/mx-datepicker/mx-datepicker.vue new file mode 100644 index 0000000..08e569a --- /dev/null +++ b/components/mx-datepicker/mx-datepicker.vue @@ -0,0 +1,819 @@ + + + + + diff --git a/manifest.json b/manifest.json index 732d117..3e545b2 100644 --- a/manifest.json +++ b/manifest.json @@ -23,34 +23,30 @@ /* android打包配置 */ "android" : { "permissions" : [ - "", + "", + "", + "", + "", + "", "", - "", - "", "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", + "", "", - "", - "", - "", - "", - "", "" ] }, /* ios打包配置 */ "ios" : {}, /* SDK配置 */ - "sdkConfigs" : {} + "sdkConfigs" : { + "ad" : {}, + "oauth" : {}, + "geolocation" : {}, + "push" : {}, + "speech" : { + "ifly" : {} + } + } } }, /* 快应用特有相关 */ diff --git a/model/index.js b/model/index.js index aefa17b..9f22ce3 100644 --- a/model/index.js +++ b/model/index.js @@ -32,6 +32,11 @@ module.exports = { appraise(data){ return request('/demay/ssm/memberCs/appraise','post',data); }, + // 会员查询消费记录 (会员小程序-会员查询消费记录) + selectByMember(data){ + return request('/demay/ssm/memberCs/selectByMember','post',data); + }, + /** --------------------------------员工 -------------------------------------------------------*/ @@ -59,6 +64,12 @@ module.exports = { achiCommList(data){ return request('/demay/ssm/staff/achiCommList','post',data); }, + // 查询门店员工会员评价记录list 会员微信小程序-查询门店员工会员评价记录list + selectMemberCsByStaff(data){ + return request('/demay/ssm/memberCs/selectMemberCsByStaff','post',data); + }, + + diff --git a/pages.json b/pages.json index bd57ce2..2f5823c 100644 --- a/pages.json +++ b/pages.json @@ -4,7 +4,7 @@ "path": "pages/tabBar/mySet/mySet", "style": { "navigationBarTitleText": "我的", - "navigationBarBackgroundColor": "#ff0000", + "navigationBarBackgroundColor": "#e83131", "app-plus": { "bounce": "vertical", "titleNView": { @@ -16,7 +16,7 @@ }, { "path": "pages/tabBar/mySet/common/message/message", "style": { - "navigationBarBackgroundColor": "#ff0000", + "navigationBarBackgroundColor": "#e83131", "navigationBarTitleText": "我的信息", "enablePullDownRefresh": false, "app-plus": { @@ -30,7 +30,7 @@ }, { "path": "pages/tabBar/mySet/common/my-card/my-card", "style": { - "navigationBarBackgroundColor": "#ff0000", + "navigationBarBackgroundColor": "#e83131", "navigationBarTitleText": "我的卡包", "enablePullDownRefresh": false, "app-plus": { @@ -44,8 +44,8 @@ }, { "path": "pages/tabBar/mySet/common/expense/expense", "style": { - "navigationBarBackgroundColor": "#ff0000", - "navigationBarTitleText": "消费记录", + "navigationBarBackgroundColor": "#e83131", + "navigationBarTitleText": "评价记录", "enablePullDownRefresh": false, "app-plus": { "bounce": "vertical", @@ -58,7 +58,7 @@ }, { "path": "pages/tabBar/mySet/common/change-password/change-password", "style": { - "navigationBarBackgroundColor": "#ff0000", + "navigationBarBackgroundColor": "#e83131", "navigationBarTitleText": "修改密码", "enablePullDownRefresh": false, "app-plus": { @@ -72,7 +72,7 @@ }, { "path": "pages/login/login", "style": { - "navigationBarBackgroundColor": "#ff0000", + "navigationBarBackgroundColor": "#e83131", "navigationBarTitleText": "登录", "app-plus": { "titleNView": { @@ -84,7 +84,7 @@ }, { "path": "pages/tabBar/mySet/common/expense/appraise/appraise", "style": { - "navigationBarBackgroundColor": "#ff0000", + "navigationBarBackgroundColor": "#e83131", "navigationBarTitleText": "服务评价", "enablePullDownRefresh": false, "app-plus": { @@ -98,7 +98,7 @@ }, { "path": "pages/tabBar/myHome/myHome", "style": { - "navigationBarBackgroundColor": "#ff0000", + "navigationBarBackgroundColor": "#e83131", "navigationBarTitleText": "首页", "enablePullDownRefresh": false, "app-plus": { @@ -112,7 +112,7 @@ }, { "path": "pages/tabBar/myHome/service-log/service-log", "style": { - "navigationBarBackgroundColor": "#ff0000", + "navigationBarBackgroundColor": "#e83131", "navigationBarTitleText": "疗程服务日志", "app-plus": { "titleNView": { @@ -123,7 +123,7 @@ }, { "path": "pages/tabBar/myHome/sales-commission/sales-commission", "style": { - "navigationBarBackgroundColor": "#ff0000", + "navigationBarBackgroundColor": "#e83131", "navigationBarTitleText": "业绩提成", "enablePullDownRefresh": false, "app-plus": { @@ -137,7 +137,7 @@ }, { "path": "pages/tabBar/myHome/client-evaluation/client-evaluation", "style": { - "navigationBarBackgroundColor": "#ff0000", + "navigationBarBackgroundColor": "#e83131", "navigationBarTitleText": "客户评价", "enablePullDownRefresh": false, "app-plus": { @@ -171,7 +171,7 @@ }, { "path": "pages/tabBar/myHome/sales-commission/sales-month/sales-month", "style": { - "navigationBarBackgroundColor": "#ff0000", + "navigationBarBackgroundColor": "#e83131", "navigationBarTitleText": "本月业绩提成", "enablePullDownRefresh": false, "app-plus": { @@ -185,7 +185,7 @@ }, { "path": "pages/tabBar/myHome/sales-commission/last-month/last-month", "style": { - "navigationBarBackgroundColor": "#ff0000", + "navigationBarBackgroundColor": "#e83131", "navigationBarTitleText": "上月业绩提成", "enablePullDownRefresh": false, "app-plus": { @@ -198,7 +198,7 @@ }, { "path": "pages/tabBar/myHome/sales-commission/classify/classify", "style": { - "navigationBarBackgroundColor": "#ff0000", + "navigationBarBackgroundColor": "#e83131", "navigationBarTitleText": "分类", "enablePullDownRefresh": false, "app-plus": { @@ -212,7 +212,7 @@ }, { "path": "pages/tabBar/myHome/sales-commission/detail/detail", "style": { - "navigationBarBackgroundColor": "#ff0000", + "navigationBarBackgroundColor": "#e83131", "navigationBarTitleText": "明细", "enablePullDownRefresh": false, "app-plus": { @@ -222,8 +222,67 @@ } } } + }, { + "path": "pages/tabBar/mySet/common/expense-record/expense-record", + "style": { + "navigationBarBackgroundColor": "#e83131", + "navigationBarTitleText": "消费记录", + "enablePullDownRefresh": false, + "app-plus": { + "bounce": "vertical", + "titleNView": { + "titleColor": "#eeeeee" + } + } + } + + } + + , { + "path": "pages/tabBar/myHome/todays-star/todays-star", + "style": { + "navigationBarBackgroundColor": "#e83131", + "navigationBarTitleText": "今日之星", + "enablePullDownRefresh": false, + "app-plus": { + "bounce": "vertical", + "titleNView": { + "titleColor": "#eeeeee" + } + } + } } - ], + ,{ + "path" : "pages/tabBar/myHome/reservation/reservation", + "style": { + "navigationBarBackgroundColor": "#e83131", + "navigationBarTitleText": "我的预约", + "enablePullDownRefresh": false, + "app-plus": { + "bounce": "vertical", + "titleNView": { + "titleColor": "#eeeeee" + } + } + } + + } + ,{ + "path" : "pages/tabBar/myHome/service-feedback/service-feedback", + "style": { + "navigationBarBackgroundColor": "#e83131", + "navigationBarTitleText": "服务反馈", + "enablePullDownRefresh": false, + "app-plus": { + "bounce": "vertical", + "titleNView": { + "titleColor": "#eeeeee" + } + } + } + + } + ], "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "uni-app", diff --git a/pages/tabBar/myHome/all-powerful/全能页面.txt b/pages/tabBar/myHome/all-powerful/全能页面.txt new file mode 100644 index 0000000..e69de29 diff --git a/pages/tabBar/myHome/client-evaluation/client-evaluation.vue b/pages/tabBar/myHome/client-evaluation/client-evaluation.vue index ece5df7..12084fb 100644 --- a/pages/tabBar/myHome/client-evaluation/client-evaluation.vue +++ b/pages/tabBar/myHome/client-evaluation/client-evaluation.vue @@ -1,35 +1,28 @@ @@ -226,6 +170,26 @@ border-radius: 20upx; } + .operation { + width: 100%; + height: 80upx; + background-color: #FFFFFF; + } + + .operation view { + padding: 10upx 0; + display: inline-block; + text-align: center; + } + + .operation view:nth-child(2n-1) { + width: 30%; + } + + .operation view:nth-child(2n) { + width: 40%; + } + .client-appraise .appraise { padding: 5upx 5%; font-size: 24upx; diff --git a/pages/tabBar/myHome/client-evaluation/个人客户评价.txt b/pages/tabBar/myHome/client-evaluation/个人客户评价.txt new file mode 100644 index 0000000..e69de29 diff --git a/pages/tabBar/myHome/client-follow/客户跟进.txt b/pages/tabBar/myHome/client-follow/客户跟进.txt new file mode 100644 index 0000000..e69de29 diff --git a/pages/tabBar/myHome/myHome.vue b/pages/tabBar/myHome/myHome.vue index 0728324..8fdd77c 100644 --- a/pages/tabBar/myHome/myHome.vue +++ b/pages/tabBar/myHome/myHome.vue @@ -1,6 +1,6 @@