diff --git a/README.md b/README.md index cc51a9e..5d6ca39 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # dou-Fire -抖火App \ No newline at end of file +抖火App ( 现在线上版本 2023-12-15) \ No newline at end of file diff --git a/apis/index.js b/apis/index.js index cee64b3..cc2a4dd 100644 --- a/apis/index.js +++ b/apis/index.js @@ -10,8 +10,8 @@ import router from '../router' // 基础配置 const config = { - // apiUrl : 'https://douhuo.douhuofalv.com/api/', - apiUrl : 'https://douhuo.demos.uzchain.tech/api/', //测试环境 + apiUrl : 'https://douhuo.douhuofalv.com/api/', + // apiUrl : 'https://douhuo.demos.uzchain.tech/api/', //测试环境 timeout : 60000 } diff --git a/apis/interfaces/custom.js b/apis/interfaces/custom.js new file mode 100644 index 0000000..cb7bb0f --- /dev/null +++ b/apis/interfaces/custom.js @@ -0,0 +1,48 @@ + +/** + * Web -zdx + * moduleName: 线下业务订单类型 + */ + +import { request } from '../index' + +// 获取业务类型 +const customTypes = () =>{ + return request({ + url: "custom_type/index", + }) +} + +// 提交办理线下订单 +const customTypeStore = (customType,data) => { + return request({ + url : `custom_type/${customType}/store`, + method : "POST", + data + }) +} + + +// 取消线下订单 +const customTypeCancel = (orderId, data) => { + return request({ + url : `custom_type/order/${orderId}/cancel`, + method : 'DELETE', + data + }) +} + +// 线下订单列表 +const customTypelists = data => { + return request({ + url : 'custom_type/order/lists', + data + }) +} + +export { + customTypes, + customTypeStore, + customTypeCancel, + customTypelists +} diff --git a/apis/interfaces/order.js b/apis/interfaces/order.js index 8ccf0e0..b8a9789 100644 --- a/apis/interfaces/order.js +++ b/apis/interfaces/order.js @@ -216,6 +216,16 @@ const orderLog = (id, page) => { }) } +// 通用订单详情 +const unifyInfo = data => { + return request({ + url : 'unify/order/info', + method : 'POST', + data + }) +} + + // 支付订单 export { lists, @@ -243,5 +253,6 @@ export { getConfirmSchemeInfo, sbuConfirmScheme, orderCancel, - orderLog + orderLog, + unifyInfo } diff --git a/main.js b/main.js index f37200f..da565a1 100644 --- a/main.js +++ b/main.js @@ -1,26 +1,10 @@ import App from './App' - import Vue from 'vue' -import uView from "uview-ui"; -import store from './store' -import { router, RouterMount } from 'router' -import Mylink from './node_modules/uni-simple-router/dist/link.vue' +Vue.config.productionTip = false -import { INIT } from './im/INIT' - -// (async () => { - Vue.component('my-link', Mylink) - Vue.use(uView) - Vue.use(router) - - // await INIT(); - - Vue.config.productionTip = false - App.mpType = 'app' - const app = new Vue({ - store, - ...App - }) - app.$mount() -// })() +App.mpType = 'app' +const app = new Vue({ + ...App +}) +app.$mount() diff --git a/manifest.json b/manifest.json index 5a15ead..8c4c842 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "抖火法律", "appid" : "__UNI__C305C03", "description" : "纵有疾风起,人生不言弃", - "versionName" : "1.6.4", - "versionCode" : 1064, + "versionName" : "1.6.5", + "versionCode" : 1065, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages.json b/pages.json index d1c42a1..622f76a 100644 --- a/pages.json +++ b/pages.json @@ -889,6 +889,13 @@ "navigationBarTitleText" : "账户咨询办理", "enablePullDownRefresh" : false } + },{ + "path" : "pages/management/account2", + "name" : "MagAccount2", + "style" : { + "navigationBarTitleText" : "线下账户咨询办理", + "enablePullDownRefresh" : false + } }, { "path" : "pages/management/delegation", @@ -906,6 +913,14 @@ "enablePullDownRefresh" : false, "navigationBarBackgroundColor": "#FFFFFF" } + },{ + "path" : "pages/work/account2", + "name" : "AccountWork2", + "style" : { + "navigationBarTitleText" : " 线下订单", + "enablePullDownRefresh" : false, + "navigationBarBackgroundColor": "#FFFFFF" + } },{ "path" : "pages/work/delegation", "name" : "DelegationWork", @@ -914,6 +929,16 @@ "enablePullDownRefresh" : false, "navigationBarBackgroundColor": "#FFFFFF" } + }, + { + "path" : "pages/orderInfo/orderInfo", + "name" : "OrderInfo", + "style" : { + "navigationBarTitleText" : "", + "enablePullDownRefresh" : false, + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#353ef4" + } }], "globalStyle": { "navigationBarTextStyle": "black", diff --git a/pages/management/account2.vue b/pages/management/account2.vue new file mode 100644 index 0000000..6e899f0 --- /dev/null +++ b/pages/management/account2.vue @@ -0,0 +1,151 @@ + + + + + diff --git a/pages/orderInfo/orderInfo.vue b/pages/orderInfo/orderInfo.vue new file mode 100644 index 0000000..8f18e1e --- /dev/null +++ b/pages/orderInfo/orderInfo.vue @@ -0,0 +1,122 @@ + + + + + + diff --git a/pages/user/index.vue b/pages/user/index.vue index 79265c6..2019722 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -43,12 +43,6 @@ - - - 识别demo - - - 火力值 diff --git a/pages/work/account.vue b/pages/work/account.vue index 57b8d1a..c53e144 100644 --- a/pages/work/account.vue +++ b/pages/work/account.vue @@ -56,6 +56,7 @@ 取消订单 立即支付 + 查看详情 @@ -155,6 +156,16 @@ } }) }, + // 订单详情 + onInfo(obj){ + this.$Router.push({ + name : 'OrderInfo', + params : { + id : obj.order_id, + orderType : obj.order_type.replace(/\\/g, '-') + } + }) + }, // 复制订单号码 copyNo(no){ uni.setClipboardData({ diff --git a/pages/work/account2.vue b/pages/work/account2.vue new file mode 100644 index 0000000..a07ac21 --- /dev/null +++ b/pages/work/account2.vue @@ -0,0 +1,331 @@ + + + + + diff --git a/pages/work/delegation.vue b/pages/work/delegation.vue index aa146b4..435feb6 100644 --- a/pages/work/delegation.vue +++ b/pages/work/delegation.vue @@ -56,6 +56,7 @@ 取消订单 立即支付 + 查看详情 @@ -155,6 +156,16 @@ } }) }, + // 订单详情 + onInfo(obj){ + this.$Router.push({ + name : 'OrderInfo', + params : { + id : obj.order_id, + orderType : obj.order_type.replace(/\\/g, '-') + } + }) + }, // 复制订单号码 copyNo(no){ uni.setClipboardData({ diff --git a/pages/work/index.vue b/pages/work/index.vue index 9782fe8..65d728e 100644 --- a/pages/work/index.vue +++ b/pages/work/index.vue @@ -64,7 +64,6 @@ - @@ -115,15 +114,22 @@ 去查看 + + + + 线下订单 + 线下咨询类订单 + + 去查看 + - @@ -254,7 +260,7 @@ success : res => { switch (res.tapIndex){ case 0: - this.onNav('OfflineCreate') + this.onNav('MagAccount2') break; case 1: this.onNav('OrderCreate', { type: 'self' }) diff --git a/static/icons/icon_04.png b/static/icons/icon_04.png new file mode 100644 index 0000000..6a2ca16 Binary files /dev/null and b/static/icons/icon_04.png differ