Skip to content

W
wms-app
提交 470cc522 authored 作者: 刘旭's avatar 刘旭
浏览文件
操作

测试打印功能，失败

上级 d19716a2
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 354 行增加 和 110 行删除
Dockerfile deleted 100644 → 0
浏览文件 @ d19716a2
FROM nginx
VOLUME /tmp
ENV LANG en_US.UTF-8
RUN echo "\
# gzip config\
gzip on;\
gzip_min_length 1k;\
gzip_comp_level 9;\
gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;\
gzip_vary on;\
gzip_disable "MSIE [1-6]\.";\
server { \
listen 80; \
client_max_body_size 20m; \
fastcgi_buffers 256 128k; \
chunked_transfer_encoding off; \
#listen 443 ssl; \
#ssl on;\
#ssl_certificate /etc/nginx/ssl/7278703_blueelephant.es-erp.com.pem;\
#ssl_certificate_key /etc/nginx/ssl/7278703_blueelephant.es-erp.com.key;\
#ssl_session_timeout 5m;\
location /admin { \
proxy_pass http://yongxingda; \
proxy_set_header Host yongxingda; \
proxy_set_header X-Real-IP \$remote_addr; \
proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for; \
} \
location /wx { \
proxy_pass http://yongxingda; \
proxy_set_header Host yongxingda; \
proxy_set_header X-Real-IP \$remote_addr; \
proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for; \
} \
#解决Router(mode: 'history')模式下，刷新路由地址不能找到页面的问题 \
location / { \
root /var/www/html/; \
index index.html index.htm; \
if (!-e \$request_filename) { \
rewrite ^(.*)\$ /index.html?s=\$1 last; \
break; \
} \
} \
access_log /var/log/nginx/access.log ; \
} " > /etc/nginx/conf.d/default.conf \
&& mkdir -p /var/www \
&& mkdir -p /var/www/html
ADD dist/build/h5 /var/www/html/
EXPOSE 80
docker/docker-compose-build.yml deleted 100644 → 0
浏览文件 @ d19716a2
version: '3'
services:
yongxinda-h5:
build:
context: ../
image: 192.168.0.26:5000/yongxinda-h5
\ No newline at end of file
docker/docker-compose-yongxinda.yml deleted 100644 → 0
浏览文件 @ d19716a2
version: '3'
services:
yongxinda-h5:
image: 1ar8696937.iok.la:22594/yongxinda-h5
container_name: yongxinda-h5
ports:
- "81:80"
- "444:443"
environment:
- TZ=Asia/Shanghai
restart: always
\ No newline at end of file
docker/docker-extranet-compose-build.yml deleted 100644 → 0
浏览文件 @ d19716a2
version: '3'
services:
yongxinda-h5:
build:
context: ../
image: dockerprivatestorage:80/yongxinda-h5
\ No newline at end of file
docker/docker-extranet.sh deleted 100644 → 0
浏览文件 @ d19716a2
cd ../
yarn install
yarn run build:h5
cd docker
docker-compose -f docker-extranet-compose-build.yml build
docker-compose -f docker-extranet-compose-build.yml push
docker/docker.sh deleted 100644 → 0
浏览文件 @ d19716a2
cd ../
yarn install
yarn run build:h5
cd docker
docker-compose -f docker-compose-build.yml build
docker-compose -f docker-compose-build.yml push
\ No newline at end of file
src/components/blueTooth/index.vue 0 → 100644
浏览文件 @ 470cc522
差异被折叠。
src/manifest.json
浏览文件 @ 470cc522
......@@ -21,29 +21,37 @@
},
/* 模块配置 */
"modules" : {
"Bluetooth" : {},
"Barcode" : {},
"Bluetooth" : {}
"Geolocation" : {}
},
/* 应用发布信息 */
"distribute" : {
/* android打包配置 */
"android" : {
"permissions" : [
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
"<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
"<uses-permission android:name=\"android.permission.BLUETOOTH_PRIVILEGED\"/>",
"<uses-permission android:name=\"android.permission.CAMERA\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
"<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
],
"minSdkVersion" : 21
},
......@@ -53,7 +61,12 @@
},
/* SDK配置 */
"sdkConfigs" : {
"ad" : {}
"ad" : {},
"geolocation" : {
"system" : {
"__platform__" : [ "android" ]
}
}
}
}
},
......
src/pages/apply/index.vue
浏览文件 @ 470cc522
......@@ -6,7 +6,7 @@
<u-grid-item v-for="item in res.children" :custom-style="{ 'text-align': 'center' }"
@tap="tapGridItem(item)">
<!-- <svg-icon name="dayin" /> -->
<p class="iconfont icon-dayin" style="color: pink;"></p>
<i class="iconfont icon-dayin" style="color: pink;"></i>
<!-- <svg-icon name="dayin" /> -->
<!-- <i class="iconfont">&#xe609;</i> -->
<view class="grid-text">{{ item.title }}</view>
......
src/pages/home/index.vue
浏览文件 @ 470cc522
......@@ -2,12 +2,13 @@
<view class="wrap">
<u-swiper :list="list" :height="swiperHeight"></u-swiper>
</view>
{{ config.baseUrl }}
<blueTooth />
</template>
<script setup lang='ts'>
import { ref, onMounted } from 'vue'
import config from '@/utils/config'
import blueTooth from '@/components/blueTooth/index.vue'
const list = [{
image: 'https://cdn.uviewui.com/uview/swiper/1.jpg',
......@@ -37,4 +38,7 @@ onMounted(() => {
</script>
<style lang = "scss" scoped>
.wrap {
margin-bottom: 20px;
}
</style>
\ No newline at end of file
src/pages/login/components/loginForm.vue
浏览文件 @ 470cc522
......@@ -47,7 +47,6 @@ let tapLogin = () => {
loginFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
const { data: res } = await login(loginForm)
console.log(res);
if (res.code === 200) {
globalStore.setToken(res.data.token)
uni.reLaunch({
......
src/store/modules/bluetooth.ts 0 → 100644
浏览文件 @ 470cc522
import { defineStore } from 'pinia';
let sysinfo = uni.getSystemInfoSync();
export const useBlueTooth = defineStore({
id: 'blueTooth',
state: () => ({
sysinfo: uni.getSystemInfoSync(),
blueToothList: [],
BLEInformation: {
platform: sysinfo.platform || "",
deviceId: "",
writeCharaterId: "",
writeServiceId: "",
notifyCharaterId: "",
notifyServiceId: "",
readCharaterId: "",
readServiceId: "",
}
}),
getters: {
getBlueTooth(blueToothList: any) {
this.blueToothList = blueToothList;
},
BLEInformationSet(info: any) {
this.BLEInformation = info;
}
},
});
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论