From 87b4f9e646ba88b7a4f5924deacc7984786ed5d2 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 06 二月 2025 18:15:04 +0800
Subject: [PATCH] ll
---
h5/pages.json | 7 ++
h5/pages/polling/detail.vue | 4
h5/pages/polling/point.vue | 10 +-
admin/src/views/stock/components/config.js | 5 +
h5/pages/polling/empty.vue | 49 ++++++++++++++++
h5/utils/service.js | 4
admin/src/views/stock/out.vue | 2
h5/static/side/default_empty@2x.png | 0
admin/src/views/stock/record.vue | 2
h5/pages/login.vue | 80 +++++++++++++++-----------
h5/pages/polling/task.vue | 2
11 files changed, 117 insertions(+), 48 deletions(-)
diff --git a/admin/src/views/stock/components/config.js b/admin/src/views/stock/components/config.js
index f03110b..819a718 100644
--- a/admin/src/views/stock/components/config.js
+++ b/admin/src/views/stock/components/config.js
@@ -3,13 +3,14 @@
{ name: '棰嗙敤閫�鍥�', id: 1, type: 0 },
{ name: '搴撳瓨璋冩暣', id: 2, type: 0 },
{ name: '鍏跺畠鍏ュ簱', id: 3, type: 0 },
- // { name: '鐩樼泩鍏ュ簱', id: 4, type: 0 },
+ { name: '鐩樼泩鍏ュ簱', id: 4, type: 0 },
+
{ name: '棰嗙敤鍑哄簱', id: 5, type: 1 },
{ name: '浠撳簱鍑哄崟', id: 6, type: 1 },
{ name: '璋冩暣鍑哄簱', id: 7, type: 1 },
{ name: '閲囪喘鍑哄簱', id: 8, type: 1 },
{ name: '鍏跺畠鍑哄簱', id: 9, type: 1 },
- // { name: '鐩樺嚭鍑哄簱', id: 10, type: 1 },
+ { name: '鐩樺嚭鍑哄簱', id: 10, type: 1 },
]
export const rules = {
warehouseId: [{ required: true, message: '璇烽�夋嫨', trigger: 'blur' }],
diff --git a/admin/src/views/stock/out.vue b/admin/src/views/stock/out.vue
index c94aedf..f181d40 100644
--- a/admin/src/views/stock/out.vue
+++ b/admin/src/views/stock/out.vue
@@ -87,7 +87,7 @@
label: '鍑哄簱绫诲瀷',
labelCode: 'name',
valueCode: 'id',
- options: StoreTypeOps.filter(i => i.type == 0)
+ options: StoreTypeOps.filter(i => i.type == 1)
},
],
online: true
diff --git a/admin/src/views/stock/record.vue b/admin/src/views/stock/record.vue
index b2e1863..94cc276 100644
--- a/admin/src/views/stock/record.vue
+++ b/admin/src/views/stock/record.vue
@@ -5,7 +5,7 @@
<el-button @click="handleEx()" v-permissions="['business:ywoutinboundrecord:exportExcel']">瀵煎嚭</el-button>
</div>
<el-table v-loading="loading" :data="list" stripe>
- <el-table-column prop="doneDate" label="鍗曟嵁鏃ユ湡" min-width="90" show-overflow-tooltip />
+ <el-table-column prop="doneDate" label="鍗曟嵁鏃ユ湡" min-width="100" show-overflow-tooltip />
<el-table-column prop="materialCode" label="鐗╂枡缂栫爜" min-width="90" show-overflow-tooltip />
<el-table-column prop="materialName" label="鐗╂枡鍚嶇О" min-width="90" show-overflow-tooltip />
<el-table-column prop="carCodeFront" label="鐗╂枡鍒嗙被" min-width="120" show-overflow-tooltip>
diff --git a/h5/pages.json b/h5/pages.json
index 908bd3a..f5f619d 100644
--- a/h5/pages.json
+++ b/h5/pages.json
@@ -118,6 +118,13 @@
{
"navigationBarTitleText" : "浠诲姟涓績"
}
+ },
+ {
+ "path" : "pages/polling/empty",
+ "style" :
+ {
+ "navigationBarTitleText" : "鎵爜宸℃"
+ }
}
],
"globalStyle": {
diff --git a/h5/pages/login.vue b/h5/pages/login.vue
index dc65036..2a7e31a 100644
--- a/h5/pages/login.vue
+++ b/h5/pages/login.vue
@@ -29,8 +29,8 @@
loginPost,
getUserInfo,
sendSMsPost,
- ywWxAuthorize,
-
+ ywWxAuthorize,
+
getRecordByUserPoint
} from '@/api'
import {
@@ -45,7 +45,7 @@
form: {
phone: '',
code: ''
- },
+ },
ywinfo: {},
downTime: 0,
code: ''
@@ -53,11 +53,11 @@
},
onLoad(option) {
console.log('onLoad');
- // https://zhcg.fnwtzx.com/#/pages/login?type=0&ywid=ywid
- const ywinfo = uni.getStorageSync('ywinfo') || {}
- if (ywinfo.ywid && (ywinfo.type || ywinfo.type == 0)) {
- this.ywinfo = ywinfo
- uni.setStorageSync('ywinfo', {})
+ // https://zhcg.fnwtzx.com/#/pages/login?type=0&ywid=ywid
+ const ywinfo = uni.getStorageSync('ywinfo') || {}
+ if (ywinfo.ywid && (ywinfo.type || ywinfo.type == 0)) {
+ this.ywinfo = ywinfo
+ uni.setStorageSync('ywinfo', {})
}
if (option.ywid || option.ywid == 0) {
uni.setStorageSync('ywinfo', {
@@ -83,7 +83,7 @@
code: code || this.code
}).then(res => {
if (res.code === 200) {
- console.log('res', res);
+ // console.log('res', res);
that.$store.commit('setOpenId', res.data.openid)
if (res.data.token && res.data.token != '') {
that.$store.commit('setToken', res.data.token)
@@ -91,13 +91,19 @@
that.$store.commit('setUserInfo', ress.data)
})
const ywinfo = this.ywinfo
- if (ywinfo.ywid && (ywinfo.type || ywinfo.type == 0)) {
- getRecordByUserPoint({pointCode: ywinfo.ywid}).then(res => {
- if(res.data && res.data.id){
- uni.redirectTo({
- url: "/pages/polling/point?id=" + res.data.id
- })
- }
+ if (ywinfo.ywid && (ywinfo.type || ywinfo.type == 0)) {
+ getRecordByUserPoint({
+ pointCode: ywinfo.ywid
+ }).then(res => {
+ if (res.data && res.data.id) {
+ uni.redirectTo({
+ url: "/pages/polling/point?id=" + res.data.id
+ })
+ } else {
+ uni.redirectTo({
+ url: "/pages/polling/empty"
+ })
+ }
})
} else {
setTimeout(() => {
@@ -111,8 +117,8 @@
})
} else {
// let url = 'https://zhcg.fnwtzx.com/yunwei_h5'
- // const appID = 'wx95ac1efb67f0330d'
- let url = 'https://dmtest.ahapp.net/yunwei_h5'
+ // const appID = 'wx95ac1efb67f0330d'
+ let url = 'https://dmtest.ahapp.net/yunwei_h5'
const appID = 'wx4d7c10bdec51942b'
let uri = encodeURIComponent(url)
let authURL =
@@ -145,22 +151,28 @@
this.setToken(res.data)
this.showToast('鐧诲綍鎴愬姛')
getUserInfo().then(ress => {
- this.setUserInfo(ress.data)
- const ywinfo = this.ywinfo
- if (ywinfo.ywid && (ywinfo.type || ywinfo.type == 0)) {
- getRecordByUserPoint({pointCode: ywinfo.ywid}).then(res => {
- getRecordByUserPoint({pointCode: ywinfo.ywid}).then(res => {
- if(res.data && res.data.id){
- uni.redirectTo({
- url: "/pages/polling/point?id=" + res.data.id
- })
- }
- })
- })
- } else {
- uni.redirectTo({
- url: "/pages/index"
- })
+ this.setUserInfo(ress.data)
+ const ywinfo = this.ywinfo
+ if (ywinfo.ywid && (ywinfo.type || ywinfo.type == 0)) {
+ // getRecordByUserPoint({pointCode: ywinfo.ywid}).then(res => {
+ getRecordByUserPoint({
+ pointCode: ywinfo.ywid
+ }).then(res => {
+ if (res.data && res.data.id) {
+ uni.redirectTo({
+ url: "/pages/polling/point?id=" + res.data.id
+ })
+ } else {
+ uni.redirectTo({
+ url: "/pages/polling/empty"
+ })
+ }
+ })
+ // })
+ } else {
+ uni.redirectTo({
+ url: "/pages/index"
+ })
}
})
}
diff --git a/h5/pages/polling/detail.vue b/h5/pages/polling/detail.vue
index 2f2620a..202dfeb 100644
--- a/h5/pages/polling/detail.vue
+++ b/h5/pages/polling/detail.vue
@@ -42,7 +42,7 @@
<template v-if="item.status == 1">
<view class="line">
<view class="la">宸℃缁撴灉锛�</view>
- <view class="val" :class="{ red: item.dealStatus == 1 }">{{ item.dealStatus == 0 ? '姝ｅ父' : '寮傚父' }}</view>
+ <view class="val" :class="{ red: item.dealStatus == 1 }">{{ item.dealStatus == 0 ? '姝ｅ父' : item.dealStatus == 1 ? '寮傚父' : '-' }}</view>
</view>
<view class="line">
<view class="la">宸℃鏃堕棿锛�</view>
@@ -181,7 +181,7 @@
this.info = res.data
let time = new Date(res.data.startDate).getTime()
console.log('res.data.startDate', new Date().getTime());
- this.flag = new Date().getTime() > time && (this.info.status == 0 || this.info.status == 1)
+ this.flag = new Date().getTime() > time && (this.info.status == 0 || this.info.status == 1 || this.info.status == 2)
})
ywPatrolTaskRecord({
capacity: 999,
diff --git a/h5/pages/polling/empty.vue b/h5/pages/polling/empty.vue
new file mode 100644
index 0000000..00181a5
--- /dev/null
+++ b/h5/pages/polling/empty.vue
@@ -0,0 +1,49 @@
+<template>
+ <view class="main_app">
+ <image class="logo" src="@/static/side/default_empty@2x.png" mode=""></image>
+ <view class="btn" @click="backHome">杩斿洖涓婚〉</view>
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+
+ };
+ },
+ methods: {
+ backHome(){
+ uni.redirectTo({
+ url: '/pages/index'
+ })
+ }
+ }
+ }
+</script>
+
+<style lang="scss">
+.main_app{
+ .logo{
+ width: 272rpx;
+ height: 228rpx;
+ margin: 60% auto 0;
+ }
+ .btn{
+ position: fixed;
+ bottom: 64rpx;
+ left: 40rpx;
+ width: 670rpx;
+ height: 88rpx;
+ background: #0068FF;
+ box-shadow: 0rpx 8rpx 20rpx 0rpx rgba(0,104,255,0.3);
+ border-radius: 44rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-weight: 500;
+ font-size: 32rpx;
+ color: #FFFFFF;
+ }
+}
+</style>
diff --git a/h5/pages/polling/point.vue b/h5/pages/polling/point.vue
index 122737b..a71efb0 100644
--- a/h5/pages/polling/point.vue
+++ b/h5/pages/polling/point.vue
@@ -8,7 +8,7 @@
<template v-if="info.status == 1">
<view class="line">
<div class="la">宸℃缁撴灉锛�</div>
- <div class="val primaryColor" :class="{red: info.dealStatus == 1}">{{ info.dealStatus == 0 ? '姝ｅ父' : '寮傚父' }}
+ <div class="val primaryColor" :class="{red: info.dealStatus == 1}">{{ info.dealStatus == 0 ? '姝ｅ父' : info.dealStatus == 1 ? '寮傚父' : '-' }}
</div>
</view>
<view class="line">
@@ -141,10 +141,10 @@
id: 1,
name: '寮傚父'
},
- {
- id: '',
- name: '璺宠繃'
- },
+ // {
+ // id: 2,
+ // name: '璺宠繃'
+ // },
]
],
diff --git a/h5/pages/polling/task.vue b/h5/pages/polling/task.vue
index e76a9cc..0fcaf6b 100644
--- a/h5/pages/polling/task.vue
+++ b/h5/pages/polling/task.vue
@@ -44,7 +44,7 @@
<view class="line" @click="itemClick(item)">鎵ц鏃堕棿锛歿{ item.startDate.slice(11, 16) }} 鑷� {{ item.endDate.slice(11, 16) }}</view>
<view class="line">
<view @click="itemClick(item)">瀹屾垚鎯呭喌锛歿{item.finishNum || 0}}/{{item.patrolNum}}</view>
- <view v-if="param.queryStatus == '0,1' && item.flag && (item.status == 0 || item.status == 1)" class="btn" @click="openSc(item)">
+ <view v-if="param.queryStatus == '0,1' && item.flag && (item.status == 0 || item.status == 1 || item.status == 2)" class="btn" @click="openSc(item)">
<image src="@/static/side/ic_saoma@2x.png" class="saoma" mode=""></image>
<view>鎵爜宸℃</view>
</view>
diff --git a/h5/static/side/default_empty@2x.png b/h5/static/side/default_empty@2x.png
new file mode 100644
index 0000000..72c83fd
--- /dev/null
+++ b/h5/static/side/default_empty@2x.png
Binary files differ
diff --git a/h5/utils/service.js b/h5/utils/service.js
index 0a05213..6df5176 100644
--- a/h5/utils/service.js
+++ b/h5/utils/service.js
@@ -37,10 +37,10 @@
if (data.code === 500 || data.code === 5112) {
uni.clearStorageSync()
return uni.navigateTo({
- url: '/pages/login/login'
+ url: '/pages/login'
})
}
- return
+ return resolve(data)
}
resolve(data)
// return response.data
--
Gitblit v1.9.3