diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 582561b..9b0d791 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -1,16 +1,20 @@ -{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/ - // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数 - "version": "0.0", - "configurations": [{ - "app-plus" : - { - "launchtype" : "local" - }, - "default" : - { - "launchtype" : "local" - }, - "type" : "uniCloud" - } +{ + // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/ + // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数 + "version" : "0.0", + "configurations" : [ + { + "app-plus" : { + "launchtype" : "local" + }, + "default" : { + "launchtype" : "local" + }, + "type" : "uniCloud" + }, + { + "playground" : "standard", + "type" : "uni-app:app-android" + } ] } diff --git a/components/tabBar/tabBar.vue b/components/tabBar/tabBar.vue index 068e768..18aee8e 100644 --- a/components/tabBar/tabBar.vue +++ b/components/tabBar/tabBar.vue @@ -12,7 +12,7 @@ - 工单 + {{ title }} @@ -57,7 +57,14 @@ } }, props: { - msg: String|Number + msg: { + type: String|Number, + default: '' + }, + title: { + type: String, + default: '工单' + }, }, onLoad() { this.userInfo = getUserInfo(); diff --git a/config.js b/config.js index 369c868..5fcf339 100644 --- a/config.js +++ b/config.js @@ -1,12 +1,14 @@ // 应用全局配置 module.exports = { // baseUrl: 'https://www.nuoyunr.com', - // baseUrl: 'http://192.168.1.17:48080', - baseUrl: "http://localhost:48080", + // baseUrl: 'http://124.222.105.7:48080', + baseUrl: 'http://192.168.1.17:48080', + // baseUrl: "http://localhost:48080", imagesUrl: 'http://shequ.0315e.com/static/images/pages/', baseImageUrl: 'https://www.nuoyunr.com/minio/', shareUrl: 'https://www.lighting-it.cn/share?inviteId=', wsUrl: 'ws://192.168.1.17:48080', + //com.carService.qx // 应用信息 appInfo: { // 应用名称 diff --git a/manifest.json b/manifest.json index b0e635b..043a56d 100644 --- a/manifest.json +++ b/manifest.json @@ -41,9 +41,27 @@ ] }, /* ios打包配置 */ - "ios" : {}, + "ios" : { + "dSYMs" : false + }, /* SDK配置 */ "sdkConfigs" : {} + }, + "nativePlugins" : { + "Ba-KeepAlive" : { + "__plugin_info__" : { + "name" : "安卓保活（采用多种主流技术） Ba-KeepAlive", + "description" : "原生保活插件，支持市面上大部分机型，Android4.4到13.0 。为定位、推送、websocket、定时任务、蓝牙、聊天等保驾护航（**注意：**不保证支持所有机型和场景，建议先试用再购买）", + "platforms" : "Android", + "url" : "https://ext.dcloud.net.cn/plugin?id=9423", + "android_package_name" : "com.carService.qx", + "ios_bundle_id" : "", + "isCloud" : true, + "bought" : 1, + "pid" : "9423", + "parameters" : {} + } + } } }, /* 快应用特有相关 */ diff --git a/pages-order/orderList/orderList.vue b/pages-order/orderList/orderList.vue index 2aa47ef..ba848bb 100644 --- a/pages-order/orderList/orderList.vue +++ b/pages-order/orderList/orderList.vue @@ -34,7 +34,8 @@ - + + diff --git a/pages-repair/apply/newWare.vue b/pages-repair/apply/newWare.vue index fa5a212..f15caab 100644 --- a/pages-repair/apply/newWare.vue +++ b/pages-repair/apply/newWare.vue @@ -58,7 +58,7 @@ - + {{ item.corpName }} @@ -153,6 +153,9 @@ export default { }, methods: { + cs(e){ + this.checkedCorpIdList =e.detail.value + }, /** * 初始化配件数据 */ @@ -290,10 +293,14 @@ export default { return } //组装可用的子公司 + + console.log(this.allCompanyList,"this.checkedCorpIdList") + debugger if(this.checkedCorpIdList.length>0){ this.formData.corpId = this.checkedCorpIdList.join() } //组装所属分类 + this.formData.status = "01" this.formData.type = this.allTypeList[this.typeIndex].id this.formData.unit = this.allUnitList[this.unitIndex].value this.formData.dataForm = this.allFromList[this.fromIndex].value diff --git a/pages-warehouse/home/home.vue b/pages-warehouse/home/home.vue index b40ad31..3ea433e 100644 --- a/pages-warehouse/home/home.vue +++ b/pages-warehouse/home/home.vue @@ -88,7 +88,7 @@ - + diff --git a/pages-warehouse/inOutWarehouse/inOutWarehouse.vue b/pages-warehouse/inOutWarehouse/inOutWarehouse.vue index 1626ebb..12b526f 100644 --- a/pages-warehouse/inOutWarehouse/inOutWarehouse.vue +++ b/pages-warehouse/inOutWarehouse/inOutWarehouse.vue @@ -38,7 +38,7 @@ - + 采购 {{isReceive?'通知领料':'通知退料'}} diff --git a/pages-warehouse/inOutWarehouse/part.vue b/pages-warehouse/inOutWarehouse/part.vue index 6045acc..fdf2b73 100644 --- a/pages-warehouse/inOutWarehouse/part.vue +++ b/pages-warehouse/inOutWarehouse/part.vue @@ -5,7 +5,7 @@ 供应商 - + 查询 @@ -17,11 +17,11 @@ - 单价 + 单价 - 数量 + 数量 @@ -325,6 +325,7 @@ export default { .formLabel { font-size: 32rpx; color: #333333; + width: 50px; } .formValue { diff --git a/pages/index/index.vue b/pages/index/index.vue index 08b7164..6c9c70c 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -10,10 +10,21 @@ export default { data() { return { - + keepLive: { + channelId: 'Ba-KeepAlive', + channelName: "Ba-KeepAlive", + title: "汽修小助手正在运行", + content: "汽修小助手正在运行", + dataResult: "", + type: undefined + } } }, onLoad() { + // #ifdef APP + //保活技术 + this.register() + // #endif if(getToken()){ //跳转首页 //判断是否是仓管，仓管需要跳单独的首页 @@ -32,10 +43,21 @@ uni.navigateTo({ url: '/pages/login/login' }) - } + } }, methods: { - + register() { //注册 + console.log(keepAlivePlugin, 'keepAlive'); + keepAlivePlugin.register({ + channelId: this.keepLive.channelId, + channelName: this.keepLive.channelName, + title: this.keepLive.title, + content: this.keepLive.content, + }, + (res) => { + console.log('保活注册', res); + }); + }, } }