java_project
/
logpm
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修复弹窗滑动问题

test
qb 1 year ago
parent
c62d3a3f93
commit
67e4578b11
7 changed files with 206 additions and 199 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      compoment/tiplist/tiplist.vue
  2. 4
      config/host.js
  3. 367
      manifest.json
  4. 7
      pagesHome/pages/ScanUp/ScanUp.vue
  5. 12
      unpackage/dist/dev/app-plus/app-service.js
  6. 4
      unpackage/dist/dev/app-plus/app.css
  7. 4
      unpackage/dist/dev/app-plus/manifest.json

7
compoment/tiplist/tiplist.vue
Unescape View File

@ -1,5 +1,5 @@
<template> <template>
<view class="maboxbg" @touchmove.stop.prevent v-if="isshow" @click="checkbox(0)"> <view class="maboxbg" @touchmove.stop v-if="isshow" @click="checkbox(0)">
<scroll-view class="modtips" @click.stop.prevent> <scroll-view class="modtips" @click.stop.prevent>
<view class="title"> <view class="title">
{{title||'提示'}} {{title||'提示'}}
@ -624,10 +624,9 @@
width: 420upx; width: 420upx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-start; // justify-content: flex-start;
font-size: 28upx; font-size: 28upx;
padding: 10upx 0; padding: 20upx 0;
margin: 10upx 0;
>image { >image {
width: 30upx; width: 30upx;

4
config/host.js
Unescape View File

@ -12,12 +12,12 @@
// tjj // tjj
// const devhost = 'http://192.168.10.25:13000/' // const devhost = 'http://192.168.10.25:13000/'
// cyz // cyz
// const devhost = 'http://192.168.6.122:8777/' const devhost = 'http://192.168.6.148:9777/'
// const devhost = 'http://192.168.6.141:8777/' // const devhost = 'http://192.168.6.141:8777/'
// cg // cg
// const devhost = 'http://192.168.10.57:13000/' // const devhost = 'http://192.168.10.57:13000/'
// 正式 // 正式
const devhost = 'https://h5uapi.huitongys.com/' // const devhost = 'https://h5uapi.huitongys.com/'
// cg // cg
// const devhost = 'http://192.168.10.200:13000/' // const devhost = 'http://192.168.10.200:13000/'
/** /**

367
manifest.json
Unescape View File

@ -1,186 +1,187 @@
{ {
"name": "货无忧", "name" : "货无忧",
"appid": "__UNI__EB22F37", "appid" : "__UNI__EB22F37",
"description": "", "description" : "",
"versionName": "1.1.02", "versionName" : "1.1.04",
"versionCode": 1102, "versionCode" : 1104,
"transformPx": false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus": { "app-plus" : {
// "custom":false, // "custom":false,
"usingComponents": true, "usingComponents" : true,
"nvueStyleCompiler": "uni-app", "nvueStyleCompiler" : "uni-app",
"compilerVersion": 3, "compilerVersion" : 3,
"splashscreen": { "splashscreen" : {
"alwaysShowBeforeRender": true, "alwaysShowBeforeRender" : true,
"waiting": true, "waiting" : true,
"autoclose": true, "autoclose" : true,
"delay": 0 "delay" : 0
}, },
/* 模块配置 */ /* 模块配置 */
"modules": { "modules" : {
"Bluetooth": {}, "Bluetooth" : {},
"Barcode": {}, "Barcode" : {},
"Camera": {}, "Camera" : {},
"Geolocation": {} "Geolocation" : {}
}, },
/* 应用发布信息 */ /* 应用发布信息 */
"distribute": { "distribute" : {
/* android打包配置 */ /* android打包配置 */
"android": { "android" : {
"permissions": [ "permissions" : [
"<uses-feature android:name=\"android.hardware.camera\"/>", "<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>", "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>", "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.CAMERA\"/>", "<uses-permission android:name=\"android.permission.CAMERA\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>", "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>", "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>", "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>", "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>", "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>", "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>", "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>", "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>" "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
] ]
}, },
/* ios打包配置 */ /* ios打包配置 */
"ios": { "ios" : {
"dSYMs": false, "dSYMs" : false,
"idfa": false "idfa" : false
}, },
/* SDK配置 */ /* SDK配置 */
"sdkConfigs": { "sdkConfigs" : {
"geolocation": { "geolocation" : {
"amap": { "amap" : {
"__platform__": ["android"], "__platform__" : [ "android" ],
"appkey_ios": "f5577fdddf4f68f92bbde932e9e35bd6", "appkey_ios" : "f5577fdddf4f68f92bbde932e9e35bd6",
"appkey_android": "f5577fdddf4f68f92bbde932e9e35bd6" "appkey_android" : "f5577fdddf4f68f92bbde932e9e35bd6"
} }
}, },
"ad": {} "ad" : {}
}, },
"splashscreen": { "splashscreen" : {
"androidStyle": "common", "androidStyle" : "common",
"useOriginalMsgbox": false, "useOriginalMsgbox" : false,
"iosStyle": "common" "iosStyle" : "common"
}, },
"icons": { "icons" : {
"android": { "android" : {
"hdpi": "unpackage/res/icons/72x72.png", "hdpi" : "unpackage/res/icons/72x72.png",
"xhdpi": "unpackage/res/icons/96x96.png", "xhdpi" : "unpackage/res/icons/96x96.png",
"xxhdpi": "unpackage/res/icons/144x144.png", "xxhdpi" : "unpackage/res/icons/144x144.png",
"xxxhdpi": "unpackage/res/icons/192x192.png" "xxxhdpi" : "unpackage/res/icons/192x192.png"
}, },
"ios": { "ios" : {
"appstore": "unpackage/res/icons/1024x1024.png", "appstore" : "unpackage/res/icons/1024x1024.png",
"ipad": { "ipad" : {
"app": "unpackage/res/icons/76x76.png", "app" : "unpackage/res/icons/76x76.png",
"app@2x": "unpackage/res/icons/152x152.png", "app@2x" : "unpackage/res/icons/152x152.png",
"notification": "unpackage/res/icons/20x20.png", "notification" : "unpackage/res/icons/20x20.png",
"notification@2x": "unpackage/res/icons/40x40.png", "notification@2x" : "unpackage/res/icons/40x40.png",
"proapp@2x": "unpackage/res/icons/167x167.png", "proapp@2x" : "unpackage/res/icons/167x167.png",
"settings": "unpackage/res/icons/29x29.png", "settings" : "unpackage/res/icons/29x29.png",
"settings@2x": "unpackage/res/icons/58x58.png", "settings@2x" : "unpackage/res/icons/58x58.png",
"spotlight": "unpackage/res/icons/40x40.png", "spotlight" : "unpackage/res/icons/40x40.png",
"spotlight@2x": "unpackage/res/icons/80x80.png" "spotlight@2x" : "unpackage/res/icons/80x80.png"
}, },
"iphone": { "iphone" : {
"app@2x": "unpackage/res/icons/120x120.png", "app@2x" : "unpackage/res/icons/120x120.png",
"app@3x": "unpackage/res/icons/180x180.png", "app@3x" : "unpackage/res/icons/180x180.png",
"notification@2x": "unpackage/res/icons/40x40.png", "notification@2x" : "unpackage/res/icons/40x40.png",
"notification@3x": "unpackage/res/icons/60x60.png", "notification@3x" : "unpackage/res/icons/60x60.png",
"settings@2x": "unpackage/res/icons/58x58.png", "settings@2x" : "unpackage/res/icons/58x58.png",
"settings@3x": "unpackage/res/icons/87x87.png", "settings@3x" : "unpackage/res/icons/87x87.png",
"spotlight@2x": "unpackage/res/icons/80x80.png", "spotlight@2x" : "unpackage/res/icons/80x80.png",
"spotlight@3x": "unpackage/res/icons/120x120.png" "spotlight@3x" : "unpackage/res/icons/120x120.png"
} }
} }
} }
}, },
"nativePlugins": { "nativePlugins" : {
"MT-TTS": { "MT-TTS" : {
"__plugin_info__": { "__plugin_info__" : {
"name": "MT-TTS语音合成", "name" : "MT-TTS语音合成",
"description": "安卓tts语音合成", "description" : "安卓tts语音合成",
"platforms": "Android", "platforms" : "Android",
"url": "", "url" : "",
"android_package_name": "", "android_package_name" : "",
"ios_bundle_id": "", "ios_bundle_id" : "",
"isCloud": false, "isCloud" : false,
"bought": -1, "bought" : -1,
"pid": "", "pid" : "",
"parameters": {} "parameters" : {}
} }
}, },
"Sunmi-Print-Inner": { "Sunmi-Print-Inner" : {
"__plugin_info__": { "__plugin_info__" : {
"name": "Sunmi-Print-Inner", "name" : "Sunmi-Print-Inner",
"description": "商米打印服务uniapp插件", "description" : "商米打印服务uniapp插件",
"platforms": "Android", "platforms" : "Android",
"url": "", "url" : "",
"android_package_name": "", "android_package_name" : "",
"ios_bundle_id": "", "ios_bundle_id" : "",
"isCloud": false, "isCloud" : false,
"bought": -1, "bought" : -1,
"pid": "", "pid" : "",
"parameters": {} "parameters" : {}
} }
}, },
"LcPrinter": { "LcPrinter" : {
"__plugin_info__": { "__plugin_info__" : {
"name": "LcPrinter", "name" : "LcPrinter",
"description": "打印插件", "description" : "打印插件",
"platforms": "Android", "platforms" : "Android",
"url": "", "url" : "",
"android_package_name": "", "android_package_name" : "",
"ios_bundle_id": "", "ios_bundle_id" : "",
"isCloud": false, "isCloud" : false,
"bought": -1, "bought" : -1,
"pid": "", "pid" : "",
"parameters": {} "parameters" : {}
} }
} }
} }
}, },
/* 快应用特有相关 */ /* 快应用特有相关 */
"quickapp": {}, "quickapp" : {},
/* 小程序特有相关 */ /* 小程序特有相关 */
"mp-weixin": { "mp-weixin" : {
"appid": "wxedb0d10ea46a0113", "appid" : "wxedb0d10ea46a0113",
"setting": { "setting" : {
"urlCheck": false, "urlCheck" : false,
"es6": false, "es6" : false,
"ignoreDevUnusedFiles": false, "ignoreDevUnusedFiles" : false,
"lazyCodeLoading": "requiredComponents", "lazyCodeLoading" : "requiredComponents",
"minified": true "minified" : true
}, },
"usingComponents": true, "usingComponents" : true,
"permission": { "permission" : {
"scope.userFuzzyLocation": { "scope.userFuzzyLocation" : {
"desc": "你的位置信息将用于小程序位置接口的效果展示" "desc" : "你的位置信息将用于小程序位置接口的效果展示"
}, },
"scope.userLocation": { "scope.userLocation" : {
"desc": "你的位置信息将用于小程序位置接口的效果展示" "desc" : "你的位置信息将用于小程序位置接口的效果展示"
} }
}, },
"requiredPrivateInfos": ["getLocation"] "requiredPrivateInfos" : [ "getLocation" ]
}, },
"mp-alipay": { "mp-alipay" : {
"usingComponents": true "usingComponents" : true
}, },
"mp-baidu": { "mp-baidu" : {
"usingComponents": true "usingComponents" : true
}, },
"mp-toutiao": { "mp-toutiao" : {
"usingComponents": true "usingComponents" : true
}, },
"uniStatistics": { "uniStatistics" : {
"enable": false "enable" : false
}, },
"vueVersion": "3" "vueVersion" : "3"
} }
// "custom":false, // "custom":false,
/* 模块配置 */ /* 模块配置 */

7
pagesHome/pages/ScanUp/ScanUp.vue
Unescape View File

@ -338,7 +338,7 @@
let res = await warehouseUpdownTypeupShelfScanGoods(data) let res = await warehouseUpdownTypeupShelfScanGoods(data)
if (res.code == 200) { if (res.code == 200) {
if (Number(details.upshelfScanType) !== 4) { if (Number(details.upshelfScanType) === 1 || Number(details.upshelfScanType) === 2) {
const _uplistarr = [...details.uplistarr] const _uplistarr = [...details.uplistarr]
const _orderCodeArr = [...details.orderCodeArr] const _orderCodeArr = [...details.orderCodeArr]
const _flag = res.data.every(val => { const _flag = res.data.every(val => {
@ -362,6 +362,11 @@
details.orderCodeArr = _orderCodeArr details.orderCodeArr = _orderCodeArr
} }
else if (Number(details.upshelfScanType) === 3) {
if (!res.data) return
details.uplistarr = [...details.uplistarr, ...res.data]
}
else { else {
details.uplistarr = res.data details.uplistarr = res.data
} }

12
unpackage/dist/dev/app-plus/app-service.js vendored
Unescape View File

@ -1747,7 +1747,7 @@ if (uni.restoreGlobal) {
}; };
}; };
const Base64$1 = new Base64(); const Base64$1 = new Base64();
const devhost = "https://h5uapi.huitongys.com/"; const devhost = "http://192.168.6.148:9777/";
const imghost = ""; const imghost = "";
const host = devhost; const host = devhost;
const APPKEY = "h5u:h5u_secret"; const APPKEY = "h5u:h5u_secret";
@ -33301,7 +33301,7 @@ This will fail in production if not fixed.`);
}; };
let res = await warehouseUpdownTypeupShelfScanGoods(data); let res = await warehouseUpdownTypeupShelfScanGoods(data);
if (res.code == 200) { if (res.code == 200) {
if (Number(details.upshelfScanType) !== 4) { if (Number(details.upshelfScanType) === 1 || Number(details.upshelfScanType) === 2) {
const _uplistarr = [...details.uplistarr]; const _uplistarr = [...details.uplistarr];
const _orderCodeArr = [...details.orderCodeArr]; const _orderCodeArr = [...details.orderCodeArr];
const _flag = res.data.every((val) => { const _flag = res.data.every((val) => {
@ -33317,6 +33317,10 @@ This will fail in production if not fixed.`);
return; return;
details.uplistarr = _uplistarr; details.uplistarr = _uplistarr;
details.orderCodeArr = _orderCodeArr; details.orderCodeArr = _orderCodeArr;
} else if (Number(details.upshelfScanType) === 3) {
if (!res.data)
return;
details.uplistarr = [...details.uplistarr, ...res.data];
} else { } else {
details.uplistarr = res.data; details.uplistarr = res.data;
} }
@ -33332,7 +33336,7 @@ This will fail in production if not fixed.`);
utils2.ttsspke(res.audio); utils2.ttsspke(res.audio);
} }
} catch (err) { } catch (err) {
formatAppLog("log", "at pagesHome/pages/ScanUp/ScanUp.vue:381", "err :>> ", err); formatAppLog("log", "at pagesHome/pages/ScanUp/ScanUp.vue:386", "err :>> ", err);
} }
}; };
async function scandata() { async function scandata() {
@ -55379,7 +55383,7 @@ This will fail in production if not fixed.`);
key: 0, key: 0,
class: "maboxbg", class: "maboxbg",
onTouchmove: _cache[14] || (_cache[14] = vue.withModifiers(() => { onTouchmove: _cache[14] || (_cache[14] = vue.withModifiers(() => {
}, ["stop", "prevent"])), }, ["stop"])),
onClick: _cache[15] || (_cache[15] = ($event) => checkbox(0)) onClick: _cache[15] || (_cache[15] = ($event) => checkbox(0))
}, },
[ [

4
unpackage/dist/dev/app-plus/app.css vendored
Unescape View File

@ -850,10 +850,8 @@ body {
width: 13.125rem; width: 13.125rem;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-start;
font-size: 0.875rem; font-size: 0.875rem;
padding: 0.3125rem 0; padding: 0.625rem 0;
margin: 0.3125rem 0;
} }
.modtips .listcheck > uni-view > uni-image[data-v-a3a2f036] { .modtips .listcheck > uni-view > uni-image[data-v-a3a2f036] {
width: 0.9375rem; width: 0.9375rem;

4
unpackage/dist/dev/app-plus/manifest.json vendored
Unescape View File

@ -7,8 +7,8 @@
"id": "__UNI__EB22F37", "id": "__UNI__EB22F37",
"name": "货无忧", "name": "货无忧",
"version": { "version": {
"name": "1.1.02", "name": "1.1.04",
"code": 1102 "code": 1104
}, },
"description": "", "description": "",
"developer": { "developer": {

Write Preview
Loading…
Cancel
Save