diff --git a/api/apiRoute.js b/api/apiRoute.js
index e6f80fe..7841748 100644
--- a/api/apiRoute.js
+++ b/api/apiRoute.js
@@ -66,6 +66,20 @@ export default {
return res;
})
},
+ //公共端-获取全部课程列表
+ common_getCourseAll(data = {}) {
+ let url = '/common/getCourseAll'
+ return http.get(url, data).then(res => {
+ return res;
+ })
+ },
+ //公共端-获取全部班级列表
+ common_getClassAll(data = {}) {
+ let url = '/common/getClassAll'
+ return http.get(url, data).then(res => {
+ return res;
+ })
+ },
//公共端-教师/销售端验证旧密码是否正确
common_personnelCheckOldPwd(data = {}) {
let url = '/personnel/checkOldPwd'
@@ -643,6 +657,28 @@ export default {
})
},
+ //学生端-订单管理-列表
+ xy_orderTableList(data = {}) {
+ let url = '/xy/orderTable'
+ return http.get(url, data).then(res => {
+ return res;
+ })
+ },
+ //学生端-订单管理-详情
+ xy_orderTableInfo(data = {}) {
+ let url = '/xy/orderTable/info'
+ return http.get(url, data).then(res => {
+ return res;
+ })
+ },
+
+ //学生端-订单管理-添加
+ xy_orderTableAdd(data = {}) {
+ let url = '/xy/orderTable/add'
+ return http.post(url, data).then(res => {
+ return res;
+ })
+ },
diff --git a/pages.json b/pages.json
index 7bec910..b8379c2 100644
--- a/pages.json
+++ b/pages.json
@@ -207,7 +207,7 @@
{
"path" : "pages/common/contract_list",
"style": {
- "navigationBarTitleText": "合同列表",
+ "navigationBarTitleText": "订单列表",
"navigationStyle": "default",
"navigationBarBackgroundColor": "#292929",
"navigationBarTextStyle": "white"
diff --git a/pages/common/contract_list.vue b/pages/common/contract_list.vue
index b20a320..6f8c762 100644
--- a/pages/common/contract_list.vue
+++ b/pages/common/contract_list.vue
@@ -1,4 +1,4 @@
-
+
@@ -8,7 +8,7 @@
scroll-y="true"
:lower-threshold="lowerThreshold"
@scrolltolower="loadMoreData"
- style="height: 90vh;"
+ style="height: 83vh;"
>
- 企业合同
- 下载合同
+ 订单状态：{{v.order_status == 'pending' ? '待支付':'已支付' }}
+
- 合同名称：
- {{v.title}}
+ 客户姓名：
+ {{ v.resource_id_name || ''}}
+
+
+ 付款类型：
+
+ {{ v.payment_type === 'cash' ? '现金支付' : v.payment_type === 'scan_code' ? '扫码支付' : '订阅支付' }}
+
+
+
+
+ 订单金额：
+ ￥{{ v.order_amount || ''}}
+
+
+
+ 课程：
+ {{ v.course_id_name || ''}}
+
+
+
+ 班级：
+ {{ v.class_id_name }}
+
+
- 签署方：
- {{v.signatory_a}}
+ 人员：
+ {{ v.staff_id_name || ''}}
+
- 签署方：
- {{v.signatory_b}}
+ 支付时间：
+ {{ v.payment_time || '' }}
+
+
+
+
+
+
+
+ 创建订单
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ (formData.payment_type) ? formData.payment_type_name : '点击选择' }}
+
+
+
+
+
+
+
+
+
+
+ {{ (formData.course_id) ? formData.course_id_name : '点击选择' }}
+
+
+
+
+
+
+
+
+
+
+ {{ (formData.class_id) ? formData.class_id_name : '点击选择' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 确定
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/market/clue/clue_info.vue b/pages/market/clue/clue_info.vue
index f91da5e..bec3426 100644
--- a/pages/market/clue/clue_info.vue
+++ b/pages/market/clue/clue_info.vue
@@ -290,6 +290,9 @@
followList:[],
//通话记录列表
listCallUp:[],
+
+ //当前登录的员工信息
+ userInfo:{},
}
},
onLoad(options) {
@@ -301,10 +304,25 @@
methods: {
async init(){
await this.getInfo()//客户详情
- // this.getFollowList()//获取跟进记录
+ this.getUserInfo()//获取当前登录的员工信息
// this.getListCallUp()//获取通话记录
},
+ //获取当前登录的员工信息
+ async getUserInfo(){
+ let res = await apiRoute.getPersonnelInfo({})
+ if (res.code != 1) {
+ uni.showToast({
+ title: res.msg,
+ icon: 'none'
+ })
+ return
+ }
+
+ this.userInfo = res.data
+ // console.log('员工',this.userInfo)
+ },
+
//获取客户详情
async getInfo(){
let data = {
@@ -379,8 +397,13 @@
//跳转页面-订单列表
openViewOrder() {
let resource_id = this.clientInfo.resource_id//客户资源id
+ let resource_name = this.clientInfo.customerResource.name || ''//客户资源id姓名
+
+ let staff_id = this.userInfo.id//员工id
+ let staff_id_name = this.userInfo.name || ''//员工姓名
+
this.$navigateTo({
- url: `/pages/market/clue/order_list?resource_id=${resource_id}`
+ url: `/pages/market/clue/order_list?resource_id=${resource_id}&resource_name=${resource_name}&staff_id=${staff_id}&staff_id_name=${staff_id_name}`
})
},
diff --git a/pages/market/clue/order_list.vue b/pages/market/clue/order_list.vue
index 0ef299a..8566f5f 100644
--- a/pages/market/clue/order_list.vue
+++ b/pages/market/clue/order_list.vue
@@ -8,7 +8,7 @@
scroll-y="true"
:lower-threshold="lowerThreshold"
@scrolltolower="loadMoreData"
- style="height: 90vh;"
+ style="height: 83vh;"
>
- 订单状态
+ 订单状态：{{v.order_status == 'pending' ? '待支付':'已支付' }}
客户姓名：
- {{ v.resource_id_name }}
+ {{ v.resource_id_name || ''}}
@@ -34,12 +34,12 @@
订单金额：
- ￥{{ v.order_amount }}
+ ￥{{ v.order_amount || ''}}
课程：
- {{ v.course_id_name }}
+ {{ v.course_id_name || ''}}
@@ -49,25 +49,177 @@
人员：
- {{ v.staff_id_name }}
+ {{ v.staff_id_name || ''}}
支付时间：
- {{ v.payment_time }}
+ {{ v.payment_time || '' }}
+
+ 创建订单
+
+
+
+
+ 创建订单
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ (formData.payment_type) ? formData.payment_type_name : '点击选择' }}
+
+
+
+
+
+
+
+
+
+
+ {{ (formData.course_id) ? formData.course_id_name : '点击选择' }}
+
+
+
+
+
+
+
+
+
+
+ {{ (formData.class_id) ? formData.class_id_name : '点击选择' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 确定
+
+
+
+
+
+
+