diff --git a/config/mine.js b/config/mine.js
index b3f8dec..257591b 100644
--- a/config/mine.js
+++ b/config/mine.js
@@ -33,6 +33,9 @@ export const getRegionAreaTree = params =>
http.get('/retail-member/api/retail-member/region-tree', { params })
// 获取用户盒数
-
export const getMemberBoxCount = () =>
http.get('/retail-member/api/retail-member/member-box')
+
+// 区域考核记录
+export const getRegionAssessmentRecord = () =>
+ http.get('/bonus/api/region/query')
diff --git a/config/order.js b/config/order.js
index 7797dfc..f9756d3 100644
--- a/config/order.js
+++ b/config/order.js
@@ -50,3 +50,7 @@ export const validRelation = params =>
// 升级订单
export const upgradeOrder = data =>
http.post('/sale/api/retail-order/confirm-upg-order', data)
+
+// 获取会员业绩
+export const getMemberPerformance = () =>
+ http.get('/sale/api/retail-order/member-performance')
diff --git a/config/request.js b/config/request.js
index 1f704ab..f7009c6 100644
--- a/config/request.js
+++ b/config/request.js
@@ -20,7 +20,7 @@ module.exports = vm => {
//#ifdef DEV_SERVER
console.log('DEV_SERVER')
- config.baseURL = 'http://192.168.0.102:8080'
+ config.baseURL = 'http://localhost:8080'
//#endif
//#ifdef QA_SERVER
diff --git a/pages.json b/pages.json
index 5616a97..367fc66 100644
--- a/pages.json
+++ b/pages.json
@@ -124,6 +124,14 @@
"enablePullDownRefresh": true
}
},
+ {
+ "path": "pages/bonus/regional-assessment/index",
+ "style": {
+ "navigationBarTitleText": "区域考核",
+ "navigationBarBackgroundColor": "#fff",
+ "enablePullDownRefresh": true
+ }
+ },
{
"path": "pages/performanceEchart/index",
"style": {
diff --git a/pages/bonus/regional-assessment/index.vue b/pages/bonus/regional-assessment/index.vue
new file mode 100644
index 0000000..21d89af
--- /dev/null
+++ b/pages/bonus/regional-assessment/index.vue
@@ -0,0 +1,208 @@
+
+
+
+
+
+
+
+
+
+ 考核区域
+ {{ item.assessAddress }}
+
+
+ 考核期间
+ {{ item.assessPeriod }}
+
+
+ 开始时间
+ {{ item.assessStartDate }}
+
+
+ 结束时间
+ {{ item.assessEndDate }}
+
+
+
+
+
+
+ 考核日期
+ {{ detail.assessDate }}
+
+
+ 考核状态
+ {{ detail.assessStatusVal }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 6aefd04..1d09590 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -344,7 +344,11 @@ import clTabbar from '@/components/cl-tabbar.vue'
import * as min from '@/config/balance.js'
import * as api from '@/config/login.js'
import { MEMBER_SIGN } from '@/util/common.js'
-import { getRegionSelect, getMemberBoxCount } from '@/config/mine.js'
+import {
+ getRegionSelect,
+ getMemberBoxCount,
+ getMemberPerformance,
+} from '@/config/mine.js'
// import talentList from "@/components/talentList.vue";
export default {
components: {
@@ -465,6 +469,13 @@ export default {
menuKey: '',
ifshow: false,
},
+ {
+ url: '/pages/bonus/regional-assessment/index',
+ name: '区域考核',
+ imgurl: '../../static/images/mark5.png',
+ menuKey: '',
+ ifshow: false,
+ },
// {
// url: '/pages/mine/addNewPv/index',
// name: '新增业绩',
@@ -602,108 +613,6 @@ export default {
this.userInfo = res.data
if (this.userInfo.memberCode == 'CN68880628') {
this.ifSpecial = true
- this.otherMenuList = [
- {
- url: '1',
- name: '我的钱包',
- imgurl: '../../static/images/my_icon1.png',
- menuKey: 'wallet',
- ifshow: false,
- },
- {
- url: '/pages/pickupArea/pickupArea',
- name: '提货专区',
- imgurl: '../../static/images/my_icon3.png',
- menuKey: 'pickGoods',
- ifshow: true,
- },
- // {
- // url: "/pages/memberCard/index",
- // name: '电子会员卡',
- // imgurl: "../../static/images/mark5.png",
- // menuKey: "",
- // ifshow: false,
- // },
- {
- url: '/pages/ticket/index',
- name: '自助购票',
- imgurl: '../../static/images/tickets.png',
- menuKey: 'ticket',
- ifshow: true,
- },
- {
- url: '/pages/selfService/index',
- name: '自助服务',
- imgurl: '../../static/images/my_icon6.png',
- menuKey: 'selfHelp',
- ifshow: true,
- },
- {
- url: '/pages/userSecure/index',
- name: '账号安全',
- imgurl: '../../static/images/my_icon8.png',
- menuKey: '',
- ifshow: true,
- },
- {
- url: '/pages/addressList/index',
- name: '地址管理',
- imgurl: '../../static/images/my_icon9.png',
- menuKey: '',
- ifshow: true,
- },
- {
- url: '/pages/mine/bindBank/index',
- name: '银行信息',
- imgurl: '../../static/images/my_icon10.png',
- menuKey: '',
- ifshow: false,
- },
- {
- url: '2',
- name: '达人榜单',
- imgurl: '../../static/images/my_icon10.png',
- menuKey: '',
- ifdr: 1,
- ifshow: false,
- },
- {
- url: '/pages/mine/myMarket/myMarket',
- name: '我的市场',
- imgurl: '../../static/images/my_icon9.png',
- menuKey: '',
- ifshow: true,
- },
- {
- url: '/pages/mine/globalDistribution/globalDistribution',
- name: '全球分布',
- imgurl: '../../static/images/my_icon9.png',
- menuKey: '',
- },
- {
- url: '/pages/mine/honorHall/honorHall',
- name: '荣誉馆',
- imgurl: '../../static/images/my_icon9.png',
- menuKey: '',
- ifshow: false,
- },
- {
- url: '/pages/mine/giftAddress/list',
- name: '礼品地址',
- imgurl: '../../static/images/mark9.png',
- menuKey: '',
- ifshow: false,
- },
-
- // {
- // url: '/pages/mine/addNewPv/index',
- // name: '新增业绩',
- // imgurl: '../../static/images/mark9.png',
- // menuKey: '',
- // ifshow: false,
-
- // },
- ]
} else {
this.ifSpecial = false
}
diff --git a/pages/pay/index.vue b/pages/pay/index.vue
index 31c7457..a61d739 100644
--- a/pages/pay/index.vue
+++ b/pages/pay/index.vue
@@ -360,26 +360,6 @@
{{ '推荐姓名' }}
{{ orderData.parentName }}
-
-
{{ '安置编号' }}
-
{{ orderData.placeParent }}
-
-
-
{{ '安置姓名' }}
-
{{ orderData.placeParentName }}
-
-
-
{{ '安置位置' }}
-
{{ orderData.placeDeptVal }}
-
-
-
体验中心编号
-
{{ orderData.makerSpaceMemberCode }}
-
-
-
体验中心姓名
-
{{ orderData.makerSpaceMemberName }}
-
{{ '发货方式' }}
{{ orderData.deliveryWayVal }}