diff --git a/apis/index.js b/apis/index.js index 9be41a3..33e6bb6 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://api.douhuotest.douhuofalv.com/api/', //测试环境 + // apiUrl : 'https://douhuo.douhuofalv.com/api/', + apiUrl : 'https://api.douhuotest.douhuofalv.com/api/', //测试环境 timeout : 60000 } diff --git a/apis/interfaces/pay.js b/apis/interfaces/pay.js index 12085dc..ac79a0d 100644 --- a/apis/interfaces/pay.js +++ b/apis/interfaces/pay.js @@ -32,7 +32,6 @@ const umsPay = (orderId, data) => { // 银联支付补差价 const diffUmsPay = (orderId, data) => { - console.log(data) return request({ url: 'pay/diff/' + orderId + '/ums', data @@ -59,7 +58,59 @@ const umsFree = (orderNo, type) => { return request({ url : 'app/services/recharge/' + orderNo + '/ums', data : { type }, - method: 'POST' + method: 'POST' + }) +} + +// 斗拱支付 +const dgPay = (orderId, data) => { + return request({ + url : 'pay/order/' + orderId + '/dg', + data + }) +} + +// 斗拱支付补差价 +const diffDgPay = (orderId, data) => { + return request({ + url: 'pay/diff/' + orderId + '/dg', + data + }) +} + +// 斗拱支付自由服务包 +const dgFree = (orderNo, type) => { + return request({ + url : 'app/services/recharge/' + orderNo + '/dg', + data : { ...type }, + method: 'POST' + }) +} + +// 银联综法支付 +const umsSynthesize = data => { + return request({ + url : 'pay/cashier_desk/ums', + data, + method: 'POST' + }) +} + +// 抖拱综法支付 +const dgSynthesize = data => { + return request({ + url : 'pay/cashier_desk/dg', + data, + method: 'POST' + }) +} + +// 火力值综法支付 +const coinSynthesize = data => { + return request({ + url : 'pay/cashier_desk/score', + data, + method: 'POST' }) } @@ -70,5 +121,11 @@ export { diffUmsPay, umsState, umsFree, - umsFreeInfo + umsFreeInfo, + dgPay, + diffDgPay, + dgFree, + umsSynthesize, + dgSynthesize, + coinSynthesize } \ No newline at end of file diff --git a/apis/interfaces/synthesis.js b/apis/interfaces/synthesis.js new file mode 100644 index 0000000..d24438a --- /dev/null +++ b/apis/interfaces/synthesis.js @@ -0,0 +1,276 @@ +/** + * 手太欠 + * 愿这世界都如故事里一样 美好而动人~ + */ + +import { request } from '../index' + +// 获取综法订单数据数量 +const synthesisCount = (data) =>{ + return request({ + url: "synthesis/data/orders_count", + data: data + }) +} + + +// 综法咨询-一次免费列表 +const synthList = () =>{ + return request({ + url: "synthesis/index" + }) +} + +// 综法咨询-一次免费详情 +const synthDet = (synthesis_id) =>{ + return request({ + url: "synthesis/index/" + synthesis_id + }) +} + + +// 综法咨询-一次免费创建单 +const synthPost = (synthesis_id, data) =>{ + return request({ + url: "synthesis/index/" + synthesis_id + "/order", + method: 'POST', + data: data + }) +} + +// 综法咨询-年费服务包列表 +const yearSynthList = data =>{ + return request({ + url: "synthesis/services", + data: data + }) +} + +// 综法咨询-年费服务包详情 +const yearSynthInfo = (service_id) =>{ + return request({ + url: "synthesis/services/" + service_id + }) +} + + +// 综法咨询-年费服务包创建单 +const yearSynthPost = (service_id, data) =>{ + return request({ + url : "synthesis/services/" + service_id + "/buy", + method : 'POST', + data : data + }) +} + +// 综法咨询-案件委托列表 +const entrustList = () =>{ + return request({ + url: "synthesis/entrusts" + }) +} + +// 综法咨询-案件委托子分类 +const entrustSon = data =>{ + return request({ + url: "synthesis/entrust/all", + data: data + }) +} + + +// 综法咨询-案件委托详情 +const entrustInfo = (entrust_id) =>{ + return request({ + url: "synthesis/entrust/" + entrust_id + }) +} + + +// 综法咨询-案件委托创建单 +const entrustPost = (entrust_id, data) =>{ + return request({ + url: "synthesis/entrust/" + entrust_id + "/order", + method: 'POST', + data: data + }) +} + +// 综法咨询-拓展服务列表 +const expandsList = () =>{ + return request({ + url: "synthesis/expands", + }) +} + + +// 综法咨询-拓展服务详情 +const expandsInfo = (expand_id) =>{ + return request({ + url: "synthesis/expand/" + expand_id + }) +} + +// 综法咨询-拓展服务创建单 +const expandsPost = (expand_id, data) =>{ + return request({ + url: "synthesis/expand/" + expand_id + "/order", + method: 'POST', + data: data + }) +} + +// 综法咨询-年费服务包微信支付 +const yearSynthPay = (service_order_id, data) =>{ + return request({ + url: "pay/service_order/" + service_order_id + "/wechat", + data: data + }) +} + +// 年费订单-列表 +const yearOrder = data =>{ + return request({ + url: "synthesis/services/orders", + data: data + }) +} + +// 年费订单-详情 +const yearOrderSee = (order_id) =>{ + return request({ + url: "synthesis/services/order/" + order_id + }) +} + +// 咨询单-列表 +const seekOrder = data =>{ + return request({ + url: "synthesis/orders", + data: data + }) +} + + +// 咨询订单-详情 +const seekOrderSee = (synthesis_order_id) =>{ + return request({ + url: "synthesis/order/" + synthesis_order_id + }) +} + +// 委托单-列表 +const entrustOrder = data =>{ + return request({ + url: "synthesis/entrust/orders", + data: data + }) +} + +// 拓展单-列表 +const expandOrder = data =>{ + return request({ + url: "synthesis/expand/orders", + data: data + }) +} + +// 年费费--线下打款 +const offlineOpen = (data) =>{ + return request({ + url: "pay/offline/pay", + method: 'POST', + data: data + }) +} + +// 查看打款凭证-查看提交信息 +const bankSee = (pay_id, data) =>{ + return request({ + url: "pay/offline/" + pay_id + "/show", + data: data + }) +} + +// 编辑打款凭证 +const bankEdit = (pay_id, data) =>{ + return request({ + url: "pay/offline/" + pay_id + "/edit", + method: 'POST', + data: data + }) +} + + +// 获取线下打款银行 +const bankInfo = (data) =>{ + return request({ + url: "pay/offline/bank" + }) +} + +// 咨询单-补差价列表 +const diffPrices = data =>{ + return request({ + url: "synthesis/diff_prices", + data: data + }) +} + + +// 咨询单-创建补差价 +const entrustPay = data =>{ + return request({ + url: "synthesis/diff_prices/create", + method: 'POST', + data: data + }) +} + +// 咨询单-取消补差价 +const cancelPrices = (diff_price_id) =>{ + return request({ + url: "synthesis/diff_prices/" + diff_price_id, + method: 'DELETE' + }) +} + +// 获取签约地址 +const esignUrl = (data) =>{ + return request({ + url: "synthesis/esign/sign_url", + data: data + }) +} + +export { + synthesisCount, + synthList, + synthDet, + synthPost, + yearSynthList, + yearSynthInfo, + yearSynthPost, + entrustList, + entrustSon, + entrustInfo, + entrustPost, + expandsList, + expandsInfo, + expandsPost, + yearSynthPay, + yearOrder, + yearOrderSee, + seekOrder, + seekOrderSee, + entrustOrder, + expandOrder, + offlineOpen, + bankSee, + bankEdit, + bankInfo, + diffPrices, + entrustPay, + cancelPrices, + esignUrl +} diff --git a/apis/interfaces/synthesisOrder.js b/apis/interfaces/synthesisOrder.js new file mode 100644 index 0000000..05bb3e4 --- /dev/null +++ b/apis/interfaces/synthesisOrder.js @@ -0,0 +1,157 @@ + +/** + * Web唐明明 + * 匆匆数载恍如梦，岁月迢迢华发增。 + * 碌碌无为枉半生，一朝惊醒万事空。 + * moduleName: 综法订单 + */ + +import { request } from '../index' + +// 年费订单 +const servicesOrder = (data) =>{ + return request({ + url : "app/synthesis/services/orders", + data + }) +} + +// 咨询订单 +const synthesisOrder = (data) =>{ + return request({ + url : "app/synthesis/orders", + data + }) +} + +// 委托订单 +const entrustOrder = (data) =>{ + return request({ + url : "app/synthesis/entrusts/orders", + data + }) +} + +// 拓展订单 +const expandOrder = (data) =>{ + return request({ + url : "app/synthesis/expands/orders", + data + }) +} + +// 年费订单 - 详情 +const servicesInfo = service_id => { + return request({ + url : 'app/synthesis/service/order/' + service_id + }) +} + +// 咨询订单 - 详情 +const synthesisInfo = service_id => { + return request({ + url : 'app/synthesis/order/' + service_id + }) +} + +// 委托订单 - 详情 +const entrustInfo = service_id => { + return request({ + url : 'app/synthesis/entrust/order/' + service_id + }) +} + +// 拓展订单 - 详情 +const expandInfo = service_id => { + return request({ + url : 'app/synthesis/expand/order/' + service_id + }) +} + +// 订单详情 +const oderinfo = (order_id, order_type) => { + return request({ + url : 'pay/cashier_desk/info', + data : { + order_id, + order_type + }, + method : 'POST' + }) +} + +// 创建补差价订单 +const orderDiff = (order_type, order_id, price) => { + return request({ + url : 'synthesis/diff_prices/create', + data : { + order_type, + order_id, + price + }, + method : 'POST' + }) +} + +// 补差价列表 +const orderDiffList = (order_id, order_type) => { + return request({ + url : 'synthesis/diff_prices', + data : { + order_type, + order_id, + } + }) +} + +// 取消补差价 +const orderDiffCancel = (diff_price_id) => { + return request({ + url : 'synthesis/diff_prices/' + diff_price_id, + method : 'DELETE' + }) +} + +// 补差价详情 +const orderDiffInfo = (diff_price_id) => { + return request({ + url : 'synthesis/diff_prices/' + diff_price_id, + }) +} + +// 取消订单 +const cancelOrder = (type, id) => { + let url + switch (type){ + case 'service': + url = "synthesis/services/order/" + break; + case 'entrust': + url = "synthesis/entrust/order/" + break; + case 'expand': + url = "synthesis/expand/order/" + break; + } + return request({ + url : url + id, + method : 'DELETE' + }) +} + +export { + servicesOrder, + synthesisOrder, + entrustOrder, + expandOrder, + servicesInfo, + synthesisInfo, + entrustInfo, + expandInfo, + oderinfo, + orderDiff, + orderDiffList, + orderDiffCancel, + orderDiffInfo, + cancelOrder +} diff --git a/apis/interfaces/user.js b/apis/interfaces/user.js index 68b244d..b8672bd 100644 --- a/apis/interfaces/user.js +++ b/apis/interfaces/user.js @@ -172,6 +172,14 @@ const getFlows = id => { }) } +// 获取所有省市数据 +const createCity = (data) =>{ + return request({ + url: "region/pro_city", + data: data + }) +} + export { relations, code, @@ -192,5 +200,6 @@ export { getTeam, getTeamLogs, getSignLogs, - getFlows + getFlows, + createCity } diff --git a/apis/interfaces/work.js b/apis/interfaces/work.js index a101599..3e7e84d 100644 --- a/apis/interfaces/work.js +++ b/apis/interfaces/work.js @@ -29,8 +29,19 @@ const sign = () => { }) } +// 获取综法订单统计 +const synthesisCount = () => { + return request({ + url : 'synthesis/data/orders_count', + data : { + channel : 'manage' + } + }) +} + export { index, rights, - sign + sign, + synthesisCount } \ No newline at end of file diff --git a/components/entrustOrder.vue b/components/entrustOrder.vue new file mode 100644 index 0000000..b7b26ac --- /dev/null +++ b/components/entrustOrder.vue @@ -0,0 +1,190 @@ + + + + + \ No newline at end of file diff --git a/components/expandOrder.vue b/components/expandOrder.vue new file mode 100644 index 0000000..addf652 --- /dev/null +++ b/components/expandOrder.vue @@ -0,0 +1,185 @@ + + + + + \ No newline at end of file diff --git a/components/mould-input.vue b/components/mould-input.vue new file mode 100644 index 0000000..43c6b44 --- /dev/null +++ b/components/mould-input.vue @@ -0,0 +1,67 @@ + + + + + \ No newline at end of file diff --git a/components/servicesOrder.vue b/components/servicesOrder.vue new file mode 100644 index 0000000..11396ee --- /dev/null +++ b/components/servicesOrder.vue @@ -0,0 +1,185 @@ + + + + + \ No newline at end of file diff --git a/components/synthesisOrder.vue b/components/synthesisOrder.vue new file mode 100644 index 0000000..4ef2090 --- /dev/null +++ b/components/synthesisOrder.vue @@ -0,0 +1,144 @@ + + + + + \ No newline at end of file diff --git a/dhdg-pay/dgali-pay.html b/dhdg-pay/dgali-pay.html new file mode 100644 index 0000000..31fe437 --- /dev/null +++ b/dhdg-pay/dgali-pay.html @@ -0,0 +1,57 @@ + + + + + + + 抖火收银台 + + + +
+ 抖火法律 +

抖火支付宝收银台

+ + + +
河北抖火法律咨询服务有限公司
+
+ + + \ No newline at end of file diff --git a/dhdg-pay/index.html b/dhdg-pay/index.html new file mode 100644 index 0000000..4b2d93c --- /dev/null +++ b/dhdg-pay/index.html @@ -0,0 +1,56 @@ + + + + + + + 抖火收银台 + + + +
+ 抖火法律 +

抖火收银台

+ + + +
河北抖火法律咨询服务有限公司
+
+ + + \ No newline at end of file diff --git a/dhdg-pay/logo.png b/dhdg-pay/logo.png new file mode 100644 index 0000000..a37edc1 Binary files /dev/null and b/dhdg-pay/logo.png differ diff --git a/js_sdk/wa-permission/permission.js b/js_sdk/wa-permission/permission.js new file mode 100644 index 0000000..5df5623 --- /dev/null +++ b/js_sdk/wa-permission/permission.js @@ -0,0 +1,272 @@ +/** + * 本模块封装了Android、iOS的应用权限判断、打开应用权限设置界面、以及位置系统服务是否开启 + */ + +var isIos +// #ifdef APP-PLUS +isIos = (plus.os.name == "iOS") +// #endif + +// 判断推送权限是否开启 +function judgeIosPermissionPush() { + var result = false; + var UIApplication = plus.ios.import("UIApplication"); + var app = UIApplication.sharedApplication(); + var enabledTypes = 0; + if (app.currentUserNotificationSettings) { + var settings = app.currentUserNotificationSettings(); + enabledTypes = settings.plusGetAttribute("types"); + console.log("enabledTypes1:" + enabledTypes); + if (enabledTypes == 0) { + console.log("推送权限没有开启"); + } else { + result = true; + console.log("已经开启推送功能!") + } + plus.ios.deleteObject(settings); + } else { + enabledTypes = app.enabledRemoteNotificationTypes(); + if (enabledTypes == 0) { + console.log("推送权限没有开启!"); + } else { + result = true; + console.log("已经开启推送功能!") + } + console.log("enabledTypes2:" + enabledTypes); + } + plus.ios.deleteObject(app); + plus.ios.deleteObject(UIApplication); + return result; +} + +// 判断定位权限是否开启 +function judgeIosPermissionLocation() { + var result = false; + var cllocationManger = plus.ios.import("CLLocationManager"); + var status = cllocationManger.authorizationStatus(); + result = (status != 2) + console.log("定位权限开启：" + result); + // 以下代码判断了手机设备的定位是否关闭，推荐另行使用方法 checkSystemEnableLocation + /* var enable = cllocationManger.locationServicesEnabled(); + var status = cllocationManger.authorizationStatus(); + console.log("enable:" + enable); + console.log("status:" + status); + if (enable && status != 2) { + result = true; + console.log("手机定位服务已开启且已授予定位权限"); + } else { + console.log("手机系统的定位没有打开或未给予定位权限"); + } */ + plus.ios.deleteObject(cllocationManger); + return result; +} + +// 判断麦克风权限是否开启 +function judgeIosPermissionRecord() { + var result = false; + var avaudiosession = plus.ios.import("AVAudioSession"); + var avaudio = avaudiosession.sharedInstance(); + var permissionStatus = avaudio.recordPermission(); + console.log("permissionStatus:" + permissionStatus); + if (permissionStatus == 1684369017 || permissionStatus == 1970168948) { + console.log("麦克风权限没有开启"); + } else { + result = true; + console.log("麦克风权限已经开启"); + } + plus.ios.deleteObject(avaudiosession); + return result; +} + +// 判断相机权限是否开启 +function judgeIosPermissionCamera() { + var result = false; + var AVCaptureDevice = plus.ios.import("AVCaptureDevice"); + var authStatus = AVCaptureDevice.authorizationStatusForMediaType('vide'); + console.log("authStatus:" + authStatus); + if (authStatus == 3) { + result = true; + console.log("相机权限已经开启"); + } else { + console.log("相机权限没有开启"); + } + plus.ios.deleteObject(AVCaptureDevice); + return result; +} + +// 判断相册权限是否开启 +function judgeIosPermissionPhotoLibrary() { + var result = false; + var PHPhotoLibrary = plus.ios.import("PHPhotoLibrary"); + var authStatus = PHPhotoLibrary.authorizationStatus(); + console.log("authStatus:" + authStatus); + if (authStatus == 3) { + result = true; + console.log("相册权限已经开启"); + } else { + console.log("相册权限没有开启"); + } + plus.ios.deleteObject(PHPhotoLibrary); + return result; +} + +// 判断通讯录权限是否开启 +function judgeIosPermissionContact() { + var result = false; + var CNContactStore = plus.ios.import("CNContactStore"); + var cnAuthStatus = CNContactStore.authorizationStatusForEntityType(0); + if (cnAuthStatus == 3) { + result = true; + console.log("通讯录权限已经开启"); + } else { + console.log("通讯录权限没有开启"); + } + plus.ios.deleteObject(CNContactStore); + return result; +} + +// 判断日历权限是否开启 +function judgeIosPermissionCalendar() { + var result = false; + var EKEventStore = plus.ios.import("EKEventStore"); + var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(0); + if (ekAuthStatus == 3) { + result = true; + console.log("日历权限已经开启"); + } else { + console.log("日历权限没有开启"); + } + plus.ios.deleteObject(EKEventStore); + return result; +} + +// 判断备忘录权限是否开启 +function judgeIosPermissionMemo() { + var result = false; + var EKEventStore = plus.ios.import("EKEventStore"); + var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(1); + if (ekAuthStatus == 3) { + result = true; + console.log("备忘录权限已经开启"); + } else { + console.log("备忘录权限没有开启"); + } + plus.ios.deleteObject(EKEventStore); + return result; +} + +// Android权限查询 +function requestAndroidPermission(permissionID) { + return new Promise((resolve, reject) => { + plus.android.requestPermissions( + [permissionID], // 理论上支持多个权限同时查询，但实际上本函数封装只处理了一个权限的情况。有需要的可自行扩展封装 + function(resultObj) { + var result = 0; + for (var i = 0; i < resultObj.granted.length; i++) { + var grantedPermission = resultObj.granted[i]; + console.log('已获取的权限：' + grantedPermission); + result = 1 + } + for (var i = 0; i < resultObj.deniedPresent.length; i++) { + var deniedPresentPermission = resultObj.deniedPresent[i]; + console.log('拒绝本次申请的权限：' + deniedPresentPermission); + result = 0 + } + for (var i = 0; i < resultObj.deniedAlways.length; i++) { + var deniedAlwaysPermission = resultObj.deniedAlways[i]; + console.log('永久拒绝申请的权限：' + deniedAlwaysPermission); + result = -1 + } + resolve(result); + // 若所需权限被拒绝,则打开APP设置界面,可以在APP设置界面打开相应权限 + // if (result != 1) { + // gotoAppPermissionSetting() + // } + }, + function(error) { + console.log('申请权限错误：' + error.code + " = " + error.message); + resolve({ + code: error.code, + message: error.message + }); + } + ); + }); +} + +// 使用一个方法，根据参数判断权限 +function judgeIosPermission(permissionID) { + if (permissionID == "location") { + return judgeIosPermissionLocation() + } else if (permissionID == "camera") { + return judgeIosPermissionCamera() + } else if (permissionID == "photoLibrary") { + return judgeIosPermissionPhotoLibrary() + } else if (permissionID == "record") { + return judgeIosPermissionRecord() + } else if (permissionID == "push") { + return judgeIosPermissionPush() + } else if (permissionID == "contact") { + return judgeIosPermissionContact() + } else if (permissionID == "calendar") { + return judgeIosPermissionCalendar() + } else if (permissionID == "memo") { + return judgeIosPermissionMemo() + } + return false; +} + +// 跳转到**应用**的权限页面 +function gotoAppPermissionSetting() { + if (isIos) { + var UIApplication = plus.ios.import("UIApplication"); + var application2 = UIApplication.sharedApplication(); + var NSURL2 = plus.ios.import("NSURL"); + // var setting2 = NSURL2.URLWithString("prefs:root=LOCATION_SERVICES"); + var setting2 = NSURL2.URLWithString("app-settings:"); + application2.openURL(setting2); + + plus.ios.deleteObject(setting2); + plus.ios.deleteObject(NSURL2); + plus.ios.deleteObject(application2); + } else { + // console.log(plus.device.vendor); + var Intent = plus.android.importClass("android.content.Intent"); + var Settings = plus.android.importClass("android.provider.Settings"); + var Uri = plus.android.importClass("android.net.Uri"); + var mainActivity = plus.android.runtimeMainActivity(); + var intent = new Intent(); + intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS); + var uri = Uri.fromParts("package", mainActivity.getPackageName(), null); + intent.setData(uri); + mainActivity.startActivity(intent); + } +} + +// 检查系统的设备服务是否开启 +// var checkSystemEnableLocation = async function () { +function checkSystemEnableLocation() { + if (isIos) { + var result = false; + var cllocationManger = plus.ios.import("CLLocationManager"); + var result = cllocationManger.locationServicesEnabled(); + console.log("系统定位开启:" + result); + plus.ios.deleteObject(cllocationManger); + return result; + } else { + var context = plus.android.importClass("android.content.Context"); + var locationManager = plus.android.importClass("android.location.LocationManager"); + var main = plus.android.runtimeMainActivity(); + var mainSvr = main.getSystemService(context.LOCATION_SERVICE); + var result = mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER); + console.log("系统定位开启:" + result); + return result + } +} + +module.exports = { + judgeIosPermission: judgeIosPermission, + requestAndroidPermission: requestAndroidPermission, + checkSystemEnableLocation: checkSystemEnableLocation, + gotoAppPermissionSetting: gotoAppPermissionSetting +} diff --git a/manifest.json b/manifest.json index 1140d8b..7d4570f 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name" : "抖火", "appid" : "__UNI__C305C03", "description" : "纵有疾风起，人生不言弃", - "versionName" : "1.4.3", + "versionName" : "1.4.6", "versionCode" : 104, "transformPx" : false, /* 5+App特有相关 */ @@ -95,17 +95,17 @@ } }, "nativePlugins" : { - "Pdf-Plugin" : { + "Html5App-openFile" : { "__plugin_info__" : { - "name" : "Pdf-Plugin", - "description" : "此插件为uni小程序Android原生插件,用于加载网络pdf,支持水印和缩放", - "platforms" : "Android", - "url" : "https://ext.dcloud.net.cn/plugin?id=11384", + "name" : "Android 和 IOS 办公Office文档 doc docx ppt pdf 浏览支持离线浏览", + "description" : "支持格式：doc,docx,ppt,pptx,xls,xlsx,txt,pdf,epub,支持64位手机", + "platforms" : "Android,iOS", + "url" : "https://ext.dcloud.net.cn/plugin?id=477", "android_package_name" : "io.douhuofalv.com", "ios_bundle_id" : "io.douhuofalv.com", "isCloud" : true, "bought" : 1, - "pid" : "11384", + "pid" : "477", "parameters" : {} } } diff --git a/pages.json b/pages.json index 9eca141..94a4334 100644 --- a/pages.json +++ b/pages.json @@ -547,6 +547,7 @@ }, { "path": "pages/im/msg", "name": "ImMsg", + "auth": true, "style": { "navigationBarTitleText": "消息", "enablePullDownRefresh": false, @@ -555,19 +556,191 @@ }, { "path": "pages/user/signLog", "name": "SignLog", + "auth": true, "style": { "navigationBarTitleText": "合同记录", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#FFFFFF" } }, { - "path": "pages/user/contract", + "path": "pages/user/contract", "name": "SignContract", + "auth": true, "style": { "navigationBarTitleText": "合同", - "enablePullDownRefresh": false, + "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#FFFFFF" } + }, { + "path": "pages/synthesize/individual", + "name": "Individual", + "auth": true, + "style": { + "navigationBarTitleText": "个人全年法律", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#FFFFFF" + } + }, { + "path": "pages/synthesize/entrust", + "name": "Entrust", + "auth": true, + "style": { + "navigationBarTitleText": "案件委托", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#FFFFFF" + } + }, { + "path": "pages/synthesize/enterprise", + "name": "Enterprise", + "auth": true, + "style": { + "navigationBarTitleText": "企业全年法律", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#FFFFFF" + } + + }, { + "path": "pages/synthesize/service", + "name": "Service", + "auth": true, + "style": { + "navigationBarTitleText": "拓展服务", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#FFFFFF" + } + }, { + "path": "pages/synthesize/order", + "name": "SynthesizeOrder", + "auth": true, + "style": { + "navigationBarTitleText": "订单列表", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#FFFFFF" + } + }, { + "path": "pages/synthesize/servicesInfo", + "name": "OrderServicesInfo", + "auth": true, + "style": { + "navigationBarTitleText": "年费订单详情", + "enablePullDownRefresh": false, + "navigationStyle": "custom", + "app-plus": { + "titleNView": { + "type": "transparent" + } + } + } + }, { + "path": "pages/synthesize/synthesisInfo", + "name": "OrderSynthesisInfo", + "auth": true, + "style": { + "navigationBarTitleText": "咨询订单详情", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": { + "type": "transparent" + } + } + } + }, { + "path": "pages/synthesize/expandInfo", + "name": "OrderExpandInfo", + "auth": true, + "style": { + "navigationBarTitleText": "委托订单详情", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": { + "type": "transparent" + } + } + } + }, { + "path": "pages/synthesize/entrustInfo", + "name": "OrderEntrustInfo", + "auth": true, + "style": { + "navigationBarTitleText": "委托订单详情", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": { + "type": "transparent" + } + } + } + }, { + "path": "pages/synthesize/PersonWrite", + "name": "PersonWrite", + "auth": true, + "style": { + "navigationBarTitleText": "个人法律咨询365服务包", + "enablePullDownRefresh": false + } + }, { + "path": "pages/pay/bankPay", + "name": "BankPay", + "auth": true, + "style": { + "navigationBarTitleText": "银行打款支付", + "enablePullDownRefresh": false + } + }, { + "path": "pages/synthesize/entrustCivil", + "name": "EntrustCivil", + "auth": true, + "style": { + "navigationBarTitleText": "案件委托-民事诉讼", + "enablePullDownRefresh": false, + "backgroundColor": "#FFF" + } + + }, { + "path": "pages/synthesize/entrustWrite", + "name": "EntrustWrite", + "auth": true, + "style": { + "navigationBarTitleText": "案件委托-", + "enablePullDownRefresh": false, + "backgroundColor": "#FFF" + } + }, { + "path": "pages/synthesize/standWrite", + "name": "StandWrite", + "auth": true, + "style": { + "navigationBarTitleText": "企业全年法律-购买", + "enablePullDownRefresh": false, + "backgroundColor": "#FFF" + } + }, { + "path": "pages/synthesize/expandWrite", + "name": "ExpandWrite", + "auth": true, + "style": { + "navigationBarTitleText": "拓展服务-", + "enablePullDownRefresh": false, + "backgroundColor": "#FFF" + } + }, { + "path": "pages/synthesize/difference", + "name": "Difference", + "auth": true, + "style": { + "navigationBarTitleText": "订单补差价", + "enablePullDownRefresh": false + } + }, { + "path": "pages/synthesize/feeWrite", + "name": "FeeWrite", + "auth": true, + "style": { + "navigationBarTitleText": "个人法律咨询", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#FFF" + } + }], "globalStyle": { "navigationBarTextStyle": "black", diff --git a/pages/auth/registered.vue b/pages/auth/registered.vue index c508375..4226003 100644 --- a/pages/auth/registered.vue +++ b/pages/auth/registered.vue @@ -24,7 +24,7 @@ - + diff --git a/pages/index/index.vue b/pages/index/index.vue index ee95bd2..2aff17f 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -34,7 +34,7 @@ - + @@ -71,14 +71,46 @@ 综法产品 - 更多 - - + + - 2022年尊享综法服务包 - ￥2200 + + 个人全年法律 + 咨询服务 抖火法律 + + ￥365.00/年 + + + + + + + 案件委托 + 咨询服务 抖火法律 + + ￥200元起 + + + + + + + 企业全年法律 + 咨询服务 抖火法律 + + ￥3650.00起/年 + + + + + + + 拓展服务 + 咨询服务 抖火法律 + + ￥500元起 @@ -247,10 +279,8 @@ // console.log(this.bannerArr[e]) }, // 点击轮播图跳转自由服务包 - clickFree(){ - uni.navigateTo({ - url:'/pages/index/free' - }) + onView(name){ + this.$Router.push({ name }) }, // 获取城市数据 getRegion(id){ @@ -382,21 +412,30 @@ .colum-flex{ display: flex; flex-direction: column; - justify-content: space-around; + justify-content: space-between; height: 180rpx; .title{ - line-height: 40rpx; - font-size: 28rpx; + font-size: 34rpx; color: #111111; + line-height: 40rpx; + margin-bottom: 10rpx; + @extend .nowrap; + } + .subtitle{ + font-size: 28rpx; + color: gray; + line-height: 40rpx; + @extend .nowrap; } .price{ - line-height: 40rpx; font-weight: bold; color: #d51959; - font-size: 38rpx; + font-size: 36rpx; + line-height: 40rpx; text{ font-size: 80%; } + @extend .nowrap; } } } diff --git a/pages/pay/bankPay.vue b/pages/pay/bankPay.vue new file mode 100644 index 0000000..f934b29 --- /dev/null +++ b/pages/pay/bankPay.vue @@ -0,0 +1,344 @@ + + + + + diff --git a/pages/pay/pay.vue b/pages/pay/pay.vue index 3425605..b9185a7 100644 --- a/pages/pay/pay.vue +++ b/pages/pay/pay.vue @@ -4,42 +4,61 @@ 实付金额 ￥{{total}} + + 火力值：{{totalFire}} + 当前火力值比例1:{{rate}} + 订单号:{{orderNo}} - - - + 使用火力值抵扣 @@ -59,6 +78,28 @@ + + + + 支付二维码 + + + + + + 请使用{{payQrType == 'app' ? '微信': '支付宝'}}扫码 + + + + + + @@ -68,8 +109,23 @@ \ No newline at end of file diff --git a/pages/synthesize/difference.vue b/pages/synthesize/difference.vue new file mode 100644 index 0000000..81c5fb2 --- /dev/null +++ b/pages/synthesize/difference.vue @@ -0,0 +1,313 @@ + + + + + diff --git a/pages/synthesize/enterprise.vue b/pages/synthesize/enterprise.vue new file mode 100644 index 0000000..897de9a --- /dev/null +++ b/pages/synthesize/enterprise.vue @@ -0,0 +1,310 @@ + + + + + \ No newline at end of file diff --git a/pages/synthesize/entrust.vue b/pages/synthesize/entrust.vue new file mode 100644 index 0000000..2ca13c6 --- /dev/null +++ b/pages/synthesize/entrust.vue @@ -0,0 +1,457 @@ + + + + + \ No newline at end of file diff --git a/pages/synthesize/entrustCivil.vue b/pages/synthesize/entrustCivil.vue new file mode 100644 index 0000000..75e2dba --- /dev/null +++ b/pages/synthesize/entrustCivil.vue @@ -0,0 +1,628 @@ + + + + + \ No newline at end of file diff --git a/pages/synthesize/entrustInfo.vue b/pages/synthesize/entrustInfo.vue new file mode 100644 index 0000000..a7a52cf --- /dev/null +++ b/pages/synthesize/entrustInfo.vue @@ -0,0 +1,214 @@ + + + + + + diff --git a/pages/synthesize/entrustWrite.vue b/pages/synthesize/entrustWrite.vue new file mode 100644 index 0000000..4619c26 --- /dev/null +++ b/pages/synthesize/entrustWrite.vue @@ -0,0 +1,553 @@ + + + + + \ No newline at end of file diff --git a/pages/synthesize/expandInfo.vue b/pages/synthesize/expandInfo.vue new file mode 100644 index 0000000..a0f8b61 --- /dev/null +++ b/pages/synthesize/expandInfo.vue @@ -0,0 +1,214 @@ + + + + + + diff --git a/pages/synthesize/expandWrite.vue b/pages/synthesize/expandWrite.vue new file mode 100644 index 0000000..dcdbef1 --- /dev/null +++ b/pages/synthesize/expandWrite.vue @@ -0,0 +1,442 @@ + + + + + \ No newline at end of file diff --git a/pages/synthesize/feeWrite.vue b/pages/synthesize/feeWrite.vue new file mode 100644 index 0000000..d5a0361 --- /dev/null +++ b/pages/synthesize/feeWrite.vue @@ -0,0 +1,420 @@ + + + + + \ No newline at end of file diff --git a/pages/synthesize/individual.vue b/pages/synthesize/individual.vue new file mode 100644 index 0000000..79b8dd8 --- /dev/null +++ b/pages/synthesize/individual.vue @@ -0,0 +1,291 @@ + + + + + \ No newline at end of file diff --git a/pages/synthesize/order.vue b/pages/synthesize/order.vue new file mode 100644 index 0000000..6bc167f --- /dev/null +++ b/pages/synthesize/order.vue @@ -0,0 +1,486 @@ + + + + + diff --git a/pages/synthesize/service.vue b/pages/synthesize/service.vue new file mode 100644 index 0000000..3dd4cdb --- /dev/null +++ b/pages/synthesize/service.vue @@ -0,0 +1,169 @@ + + + + + \ No newline at end of file diff --git a/pages/synthesize/servicesInfo.vue b/pages/synthesize/servicesInfo.vue new file mode 100644 index 0000000..ded7083 --- /dev/null +++ b/pages/synthesize/servicesInfo.vue @@ -0,0 +1,211 @@ + + + + + diff --git a/pages/synthesize/standWrite.vue b/pages/synthesize/standWrite.vue new file mode 100644 index 0000000..efc18c8 --- /dev/null +++ b/pages/synthesize/standWrite.vue @@ -0,0 +1,473 @@ + + + + + \ No newline at end of file diff --git a/pages/synthesize/synthesisInfo.vue b/pages/synthesize/synthesisInfo.vue new file mode 100644 index 0000000..660f149 --- /dev/null +++ b/pages/synthesize/synthesisInfo.vue @@ -0,0 +1,213 @@ + + + + + diff --git a/pages/transfers/lists.vue b/pages/transfers/lists.vue index f891818..f967bff 100644 --- a/pages/transfers/lists.vue +++ b/pages/transfers/lists.vue @@ -172,9 +172,6 @@ status: this.tabs[this.tabsCurrent].val, type : this.type }).then(res => { - - console.log(res) - let { data } = res; this.orders = data }).catch(err => { diff --git a/pages/user/contract.vue b/pages/user/contract.vue index 6e6c72e..89628d1 100644 --- a/pages/user/contract.vue +++ b/pages/user/contract.vue @@ -26,7 +26,7 @@ 合同文件列表 - + {{item.fileName}} {{item.fileId}} @@ -35,7 +35,7 @@ 附件文件列表 - + {{item.fileName}} {{item.fileId}} @@ -45,7 +45,9 @@ diff --git a/pages/work/refundOrder.vue b/pages/work/refundOrder.vue index 9e12110..ab43b02 100644 --- a/pages/work/refundOrder.vue +++ b/pages/work/refundOrder.vue @@ -38,6 +38,8 @@ + + @@ -56,7 +58,14 @@ export default { data() { return { - orders: [] + orders : [], + // 分页 + page : { + current : 1, + has_more: false, + }, + pagesShow : false, + status : '' }; }, created() { @@ -66,10 +75,15 @@ // 获取列表 getList(){ refunds({ - status: '' + status: '', + page : this.page.current }).then(res => { - let { data } = res; - this.orders = data + let { data, page } = res; + let atList = page.current == 1 ? [] : this.orders + + this.orders = atList.concat(data) + this.page = page + this.pagesShow = false }).catch(err => { uni.showToast({ title: err.message, @@ -77,6 +91,16 @@ }) }) } + }, + onReachBottom() { + this.pagesShow = true; + if(this.page.has_more){ + this.status = 'loading'; + this.page.current++ + this.getList() + return + } + this.status = 'nomore'; } } diff --git a/static/code/btn.png b/static/code/btn.png index 4df7102..dd69ae2 100644 Binary files a/static/code/btn.png and b/static/code/btn.png differ diff --git a/static/code/code_btn.png b/static/code/code_btn.png index 148bcdb..dc28300 100644 Binary files a/static/code/code_btn.png and b/static/code/code_btn.png differ diff --git a/static/icons/img_add.png b/static/icons/img_add.png new file mode 100644 index 0000000..bd03fac Binary files /dev/null and b/static/icons/img_add.png differ diff --git a/static/icons/synthesize_icon.png b/static/icons/synthesize_icon.png new file mode 100644 index 0000000..837e93f Binary files /dev/null and b/static/icons/synthesize_icon.png differ diff --git a/static/icons/takeIcon_01.png b/static/icons/takeIcon_01.png new file mode 100644 index 0000000..ba7ee53 Binary files /dev/null and b/static/icons/takeIcon_01.png differ diff --git a/static/icons/takeIcon_02.png b/static/icons/takeIcon_02.png new file mode 100644 index 0000000..9fc0d8c Binary files /dev/null and b/static/icons/takeIcon_02.png differ diff --git a/static/icons/takeIcon_03.png b/static/icons/takeIcon_03.png new file mode 100644 index 0000000..e190709 Binary files /dev/null and b/static/icons/takeIcon_03.png differ diff --git a/static/icons/takeIcon_04.png b/static/icons/takeIcon_04.png new file mode 100644 index 0000000..4daf416 Binary files /dev/null and b/static/icons/takeIcon_04.png differ diff --git a/static/icons/takeIcon_05.png b/static/icons/takeIcon_05.png new file mode 100644 index 0000000..b7b5b79 Binary files /dev/null and b/static/icons/takeIcon_05.png differ diff --git a/static/imgs/cover_img.png b/static/imgs/cover_img.png new file mode 100644 index 0000000..6de9619 Binary files /dev/null and b/static/imgs/cover_img.png differ diff --git a/static/synthesize/icon_00.png b/static/synthesize/icon_00.png new file mode 100644 index 0000000..b8660c0 Binary files /dev/null and b/static/synthesize/icon_00.png differ diff --git a/static/synthesize/icon_01.png b/static/synthesize/icon_01.png new file mode 100644 index 0000000..a628c32 Binary files /dev/null and b/static/synthesize/icon_01.png differ diff --git a/static/synthesize/icon_02.png b/static/synthesize/icon_02.png new file mode 100644 index 0000000..8f4b1b1 Binary files /dev/null and b/static/synthesize/icon_02.png differ diff --git a/static/synthesize/icon_03.png b/static/synthesize/icon_03.png new file mode 100644 index 0000000..3518ca7 Binary files /dev/null and b/static/synthesize/icon_03.png differ diff --git a/static/synthesize/img_00.png b/static/synthesize/img_00.png new file mode 100644 index 0000000..a36d113 Binary files /dev/null and b/static/synthesize/img_00.png differ diff --git a/static/synthesize/img_01.png b/static/synthesize/img_01.png new file mode 100644 index 0000000..6a82d2d Binary files /dev/null and b/static/synthesize/img_01.png differ diff --git a/static/synthesize/img_02.png b/static/synthesize/img_02.png new file mode 100644 index 0000000..4ae1b1c Binary files /dev/null and b/static/synthesize/img_02.png differ diff --git a/static/synthesize/img_03.png b/static/synthesize/img_03.png new file mode 100644 index 0000000..61a89f7 Binary files /dev/null and b/static/synthesize/img_03.png differ diff --git a/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue b/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue index fb3a9e1..440eead 100644 --- a/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue +++ b/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue @@ -299,7 +299,7 @@ .uni-data-tree { flex: 1; position: relative; - font-size: 14px; + font-size: 14px; } .error-text { @@ -315,11 +315,11 @@ flex-wrap: nowrap; font-size: 30rpx; /* line-height: 35px; */ - padding: 0 10px; + padding: 0; padding-right: 5px; overflow: hidden; height: 90rpx; - background: #F6F6F6; + background: transparent; border-radius: 10rpx; /* #ifndef APP-NVUE */ box-sizing: border-box;