Browse Source

修复弹窗滑动问题

test
qb 1 year ago
parent
commit
67e4578b11
  1. 7
      compoment/tiplist/tiplist.vue
  2. 4
      config/host.js
  3. 5
      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

@ -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

@ -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/'
/** /**

5
manifest.json

@ -2,8 +2,8 @@
"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" : {
@ -184,3 +184,4 @@
} }
// "custom":false, // "custom":false,
/* */ /* */

7
pagesHome/pages/ScanUp/ScanUp.vue

@ -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

@ -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

@ -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

@ -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": {

Loading…
Cancel
Save