diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 472ec0d..e301f76 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -17,7 +17,11 @@
"type" : "uni-app:app-android"
},
{
+ "bundleId" : "io.douhuofalv.com",
+ "certificateFile" : "/Users/tmoct5/Documents/App证书/抖火/抖火法律苹果证书/DevDouhuoApp.p12",
+ "certificateProfileFile" : "/Users/tmoct5/Documents/App证书/抖火/抖火法律苹果证书/DevDouhuoApp.mobileprovision",
"playground" : "custom",
+ "runSignStatus" : 0,
"type" : "uni-app:app-ios"
}
]
diff --git a/apis/interfaces/offline.js b/apis/interfaces/offline.js
new file mode 100644
index 0000000..28ab05c
--- /dev/null
+++ b/apis/interfaces/offline.js
@@ -0,0 +1,98 @@
+
+/**
+ * Web唐明明
+ * 匆匆数载恍如梦,岁月迢迢华发增。
+ * 碌碌无为枉半生,一朝惊醒万事空。
+ * moduleName: 线下业务
+ */
+
+import { request } from '../index'
+
+// 主业务类型
+const business = () =>{
+ return request({
+ url: "offline/index",
+ })
+}
+
+// 获取主业务机构
+const institution = id =>{
+ return request({
+ url: "offline/" + id + "/institution",
+ })
+}
+
+//
+
+// 获取机构表单数据
+const institutionType = id => {
+ return request({
+ url: "offline/institution/" + id + "/type",
+ })
+}
+
+// 提交用户办理信息
+const submitStore = data => {
+ console.log(data)
+ return request({
+ url : "offline/store",
+ method : "POST",
+ data
+ })
+}
+
+// 配置服务包
+const service = orderId => {
+ return request({
+ url : 'offline/' + orderId + '/service',
+ method : 'POST'
+ })
+}
+
+// 添加服务包
+const serviceAdd = (orderId, items) => {
+ return request({
+ url : 'offline/' + orderId + '/service/calculate',
+ method : 'POST',
+ data : {
+ items
+ }
+ })
+}
+
+// 删除服务包
+const serviceRemove = (id, data) => {
+ return request({
+ url : 'offline/' + id + '/service/remove',
+ method : 'POST',
+ data
+ })
+}
+
+// 完成分配
+const serviceOver = orderId => {
+ return request({
+ url : 'offline/' + orderId + '/service/over',
+ method : 'POST',
+ })
+}
+
+// 订单列表
+const lists = data => {
+ return request({
+ url : 'offline/orders/lists',
+ data
+ })
+}
+
+export {
+ business,
+ institution,
+ institutionType,
+ submitStore,
+ service,
+ serviceAdd,
+ serviceRemove,
+ serviceOver,
+ lists
+}
diff --git a/pages.json b/pages.json
index 4cc1cdf..19de60f 100644
--- a/pages.json
+++ b/pages.json
@@ -827,6 +827,60 @@
"enablePullDownRefresh": false,
"navigationBarBackgroundColor" : "#FFFFFF"
}
+ },{
+ "path" : "pages/offline/create",
+ "name" : "OfflineCreate",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor" : "#FFFFFF"
+ }
+ },{
+ "path" : "pages/offline/generate",
+ "name" : "OfflineGenerate",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor" : "#FFFFFF"
+ }
+ },{
+ "path" : "pages/offline/service",
+ "name" : "OfflineService",
+ "auth": true,
+ "style": {
+ "navigationBarTitleText": "分配服务包",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#ffffff",
+ "app-plus": {
+ "titleNView": {
+ "buttons": [{
+ "text": "添加",
+ "color": "#446EFE",
+ "fontSize": "32rpx",
+ "width": "120rpx"
+ }]
+ }
+ }
+ }
+ },{
+ "path" : "pages/offline/orders",
+ "name" : "OfflineOrders",
+ "auth": true,
+ "style": {
+ "navigationBarTitleText": "订单管理",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#ffffff"
+ }
+ },{
+ "path": "pages/offline/orderInfo",
+ "auth": true,
+ "name": "OfflineInfo",
+ "style": {
+ "navigationBarTitleText": "详情",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#446EFE",
+ "navigationBarTextStyle": "white"
+ }
}],
"globalStyle": {
"navigationBarTextStyle": "black",
diff --git a/pages/offline/create.vue b/pages/offline/create.vue
new file mode 100644
index 0000000..1e0ba3d
--- /dev/null
+++ b/pages/offline/create.vue
@@ -0,0 +1,190 @@
+
+
+ 创建新的订单
+ 完善创建订单用户与订单类型
+
+
+ 选择业务类型
+
+
+
+
+ {{item.title || '-'}}
+ {{item.self_type == 'synthesis' ? '相关个人法律咨询服务' : item.subtitle || '-'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/offline/generate.vue b/pages/offline/generate.vue
new file mode 100644
index 0000000..57fec16
--- /dev/null
+++ b/pages/offline/generate.vue
@@ -0,0 +1,554 @@
+
+
+
+ 客户信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+
+ 移出
+
+
+
+
+
+
+ {{item.institution[item.institutionIndex].title}}
+
+
+
+
+
+
+
+
+ {{item.fromType[item.fromIndex].title}}
+
+
+
+
+
+
+
+
+
+
+ 元
+ 天
+
+
+
+
+ *{{formItem.title}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{formItem.options[item.subVal[formItem.key]]}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/offline/orderInfo.vue b/pages/offline/orderInfo.vue
new file mode 100644
index 0000000..51ee7c2
--- /dev/null
+++ b/pages/offline/orderInfo.vue
@@ -0,0 +1,337 @@
+
+
+
+
+
+ {{statusText.text}}
+
+
+
+ {{item.title}}×{{item.number}}
+
+
+
+
+
+ ¥{{item.price}}
+
+
+
+
+ ¥{{serviceTotal}}
+
+
+
+
+ 服务包
+
+
+
+
+
+
+ {{citem.business}}({{citem.type}})
+
+
+
+ ¥{{citem.price}}
+
+
+
+
+
+
+
+ 客户信息
+
+
+ {{user.nickname || '-'}}
+
+
+
+ {{user.sex || '-'}}
+
+
+
+ {{user.username || '-'}}
+
+ 联系客户
+
+
+
+ 法务老师与助理
+
+
+ {{teachers || '-'}}
+
+
+
+ {{tutor || '-'}}
+
+
+
+
+ 订单信息
+
+
+ {{order_no || '-'}}
+
+
+
+ {{created_at || '-'}}
+
+
+
+ {{total || '-'}}
+
+
+
+
+
+
+
+
diff --git a/pages/offline/orders.vue b/pages/offline/orders.vue
new file mode 100644
index 0000000..7c883cb
--- /dev/null
+++ b/pages/offline/orders.vue
@@ -0,0 +1,352 @@
+
+
+
+
+
+
+
+
+
+
+ {{item.order_no}}
+ {{item.status.text}}
+
+
+
+
+
+
+ x{{item.items.length}}
+
+
+
+
+
+ {{citem.institution.title}}({{citem.business_type.title}})
+ ¥{{citem.price}}
+
+
+
+
+ {{item.user.username}}
+
+
+
+ {{item.user.mobile}}
+
+
+
+ ¥{{item.total}}
+
+
+
+ ¥{{item.diff_prices_pays}}
+
+
+
+ {{item.created_at}}
+
+
+
+
+ 匹配服务包
+ 查看订单
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/offline/service.vue b/pages/offline/service.vue
new file mode 100644
index 0000000..6621239
--- /dev/null
+++ b/pages/offline/service.vue
@@ -0,0 +1,468 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{citem.business}}({{citem.type}})
+
+
+
+ ¥{{citem.price}}
+
+
+
+
+ 服务包价格¥{{item.price}}
+
+
+
+
+
+
+ 选择业务
+
+
+
+
+
+ {{item.business}}({{item.type}})
+
+
+
+ {{item.title}}
+
+
+
+ ¥{{item.price}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/synthesize/consultWork.vue b/pages/synthesize/consultWork.vue
index 698fd47..6c0b35a 100644
--- a/pages/synthesize/consultWork.vue
+++ b/pages/synthesize/consultWork.vue
@@ -125,6 +125,10 @@
{{orderCount.refund}}
退款订单
+
+
+ 线下订单
+
diff --git a/pages/work/create.vue b/pages/work/create.vue
index b161f6e..14aa67d 100644
--- a/pages/work/create.vue
+++ b/pages/work/create.vue
@@ -65,8 +65,7 @@
Promise.all([business(), synthList()]).then(res => {
let businessData = res[0]
let synthListData = res[1]
-
- this.businessArr = this.createType === 'other' ? businessData : businessData.concat(synthListData)
+ this.businessArr = this.createType === 'other' || this.createType === 'offline' ? businessData : businessData.concat(synthListData)
this.businessId = this.businessArr[0].business_id
this.selfType = this.businessArr[0].self_type
}).catch(err => {
@@ -128,8 +127,8 @@
})
return
}
- // 金法业务
let busines = this.businessArr.find(val => val.business_id === this.businessId)
+ // 金法业务
this.$Router.replace({
name : 'WorkGenerate',
params : {
diff --git a/pages/work/index.vue b/pages/work/index.vue
index 2f7cf02..e122520 100644
--- a/pages/work/index.vue
+++ b/pages/work/index.vue
@@ -233,11 +233,21 @@
// 创建订单
onCreateOrder(){
uni.showActionSheet({
- itemList: ['个人订单', '客户订单'],
+ itemList: ['线下订单','个人订单', '客户订单'],
success : res => {
- this.onNav('OrderCreate', {
- type: res.tapIndex === 0 ? 'self' : 'other'
- })
+ switch (res.tapIndex){
+ case 0:
+ this.onNav('OfflineCreate')
+ break;
+ case 1:
+ this.onNav('OrderCreate', { type: 'self' })
+ break;
+ case 2:
+ this.onNav('OrderCreate', { type: 'other' })
+ break;
+ }
+
+
}
})
}
diff --git a/static/icons/work_icon_28.png b/static/icons/work_icon_28.png
new file mode 100644
index 0000000..4956b85
Binary files /dev/null and b/static/icons/work_icon_28.png differ