From 57513aa6aa3374271212c022219b9104321c21ad Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期四, 14 九月 2023 10:16:13 +0800
Subject: [PATCH] 小程序
---
minipro_standard/pages/plannedDistribution/plannedDistribution.vue | 6 +++++-
minipro_standard/pages_adjust/components/multipleMaterial.vue | 2 +-
h5_standard/.env.production | 4 ++--
h5_standard/src/views/tabPage/my.vue | 10 ++++++----
h5_standard/public/redirect.html | 9 +++++----
minipro_standard/components/myTabber.vue | 9 +++++++--
minipro_standard/pages/plannedProgress/plannedProgress.vue | 4 ++--
minipro_standard/pages_inspect/pages/equipmentInspection/equipmentInspection.vue | 2 ++
minipro_standard/common/config.js | 3 ++-
h5_standard/.env | 2 +-
h5_standard/src/views/tabPage/toBeHandled.vue | 1 +
11 files changed, 34 insertions(+), 18 deletions(-)
diff --git a/h5_standard/.env b/h5_standard/.env
index 7bc42be..d1bac03 100644
--- a/h5_standard/.env
+++ b/h5_standard/.env
@@ -1,5 +1,5 @@
# 鎺ュ彛鍓嶇紑 _api_api_test
-VUE_APP_API_PREFIX = '/doumeeplant'
+VUE_APP_API_PREFIX = '/api'
# 涓婁笅鏂囪矾寰� --> 榛樿./锛堝彲浠ラ儴缃插湪鏈嶅姟鍣ㄤ换鎰忚矾寰勶級
VUE_APP_CONTEXT = './'
diff --git a/h5_standard/.env.production b/h5_standard/.env.production
index f7750fc..9d57589 100644
--- a/h5_standard/.env.production
+++ b/h5_standard/.env.production
@@ -20,7 +20,7 @@
# 娴嬭瘯
# VUE_APP_API = 'https://dmtest.ahapp.net/doumeeplant_api_test/'
-VUE_APP_API = 'https://127.0.0.1/doumeeplant/'
+#VUE_APP_API = 'https://127.0.0.1/doumeeplant/'
# 婕旂ず
-#VUE_APP_API = 'https://www.mes.red/doumeeplant/'
+VUE_APP_API = 'https://www.mes.red/api/'
diff --git a/h5_standard/public/redirect.html b/h5_standard/public/redirect.html
index b0485c9..edfbff1 100644
--- a/h5_standard/public/redirect.html
+++ b/h5_standard/public/redirect.html
@@ -9,15 +9,16 @@
var url = window.location.href
if (url.indexOf('?code') === -1) {
let query = url.split('?')[1]
- // let tempUrl = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_url=https://www.mes.red/h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect`
- // let tempUrl = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_url=https://dmtest.ahapp.net/doumeeplant_h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect`
- let tempUrl = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_url=https://lingyang.mes.show:1801/h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect`
+ let tempUrl = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_uri=https://www.mes.red/h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect`
+ // let tempUrl = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_uri=https://dmtest.ahapp.net/doumeeplant_h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect`
+ // let tempUrl = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_uri=https://lingyang.mes.show:1801/h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect`
+ // let tempUrl = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_uri=https://www.mes.red/lingyangh5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect`
window.location.replace(tempUrl)
} else {
var code = url.substring(url.indexOf('?') + 6, url.indexOf('&'))
// let href1 = `https://www.mes.red/h5/#/wxLogin?code=${code}`
// let href1 = `https://dmtest.ahapp.net/doumeeplant_h5/#/wxLogin?code=${code}`
- let href1 = `https://lingyang.mes.show:1801/h5/#/wxLogin?code=${code}`
+ let href1 = `https://www.mes.red/lingyangh5/#/wxLogin?code=${code}`
window.location.replace(href1)
}
</script>
diff --git a/h5_standard/src/views/tabPage/my.vue b/h5_standard/src/views/tabPage/my.vue
index 9d8007c..33d1794 100644
--- a/h5_standard/src/views/tabPage/my.vue
+++ b/h5_standard/src/views/tabPage/my.vue
@@ -22,7 +22,7 @@
</div>
</div>
</div>
- <div class="box_out" v-if="store.state.env && (store.state.env == 'WX' || store.state.env == 'XCX')" @click="loginOut"><span>閫�鍑虹櫥褰�</span></div>
+ <div class="box_out" @click="loginOut"><span>閫�鍑虹櫥褰�</span></div>
</div>
<van-popup v-model:show="show" position="bottom" round :style="{ height: '50%' }">
<van-picker
@@ -78,10 +78,12 @@
}).then(res => {
if (res.code === 200) {
// window.parent.postMessage('闃垮悍', '*')
- // let href = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_url=https://www.mes.red/h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect'
- // let href = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_url=https://dmtest.ahapp.net/doumeeplant_h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect'
- let href = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_url=https://lingyang.mes.show:1801/h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect'
+ let href = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_uri=https://www.mes.red/h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect'
+ // let href = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_uri=https://dmtest.ahapp.net/doumeeplant_h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect'
+ // let href = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_uri=https://lingyang.mes.show:1801/h5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect'
+ // let href = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx6ea339a336f26380&redirect_uri=https://www.mes.red/lingyangh5/redirect.html&response_type=code&scope=snsapi_base&state=#wechat_redirect'
window.open(href)
+ // window.location.replace(href)
}
})
}
diff --git a/h5_standard/src/views/tabPage/toBeHandled.vue b/h5_standard/src/views/tabPage/toBeHandled.vue
index 4da7c81..e1c00aa 100644
--- a/h5_standard/src/views/tabPage/toBeHandled.vue
+++ b/h5_standard/src/views/tabPage/toBeHandled.vue
@@ -270,6 +270,7 @@
list.value.push(...res.data.records)
} else {
finished.value = true
+ loading.value = false
}
}).catch(err => {
refreshing.value = false
diff --git a/minipro_standard/common/config.js b/minipro_standard/common/config.js
index 4d9f1fa..b55d63d 100644
--- a/minipro_standard/common/config.js
+++ b/minipro_standard/common/config.js
@@ -2,7 +2,8 @@
// baseUrl: 'http://106.14.20.42/test_hfznzz/',
// baseUrl: 'https://hefei.dtkey.cn/test_hfznzz/',
// baseUrl: '/doumeeplant_api',
- baseUrl: 'https://dmtest.ahapp.net/doumeeplant_api',
+ baseUrl: 'https://dmtest.ahapp.net/doumeeplant_api',
+ // baseUrl: 'http://192.168.0.15:10021',
phoneRegular: /^1[3456789]\d{9}$/,
mailboxRegular: /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/,
positiveInteger: /^[0-9]*[1-9][0-9]*$/,
diff --git a/minipro_standard/components/myTabber.vue b/minipro_standard/components/myTabber.vue
index b8b5250..b29f6ec 100644
--- a/minipro_standard/components/myTabber.vue
+++ b/minipro_standard/components/myTabber.vue
@@ -7,8 +7,8 @@
activeColor="#222"
inactiveColor="#666"
:safeAreaInsetBottom="true">
- <u-tabbar-item text="寰呭姙">
- <view class="" slot="active-icon">
+ <u-tabbar-item text="寰呭姙" :badge="upcomingNum.d">
+ <view class="" slot="active-icon">
<image src="@/static/nav_daiban_sel@2x.png" class="icon-style" mode=""></image>
</view>
<view class="" slot="inactive-icon">
@@ -36,6 +36,8 @@
</template>
<script>
+ import { mapState } from 'vuex'
+
export default {
name:"myTabbar",
props: {
@@ -46,6 +48,9 @@
value: 0
};
},
+ computed: {
+ ...mapState(['upcomingNum'])
+ },
methods: {
click(index) {
// console.log('click', index);
diff --git a/minipro_standard/pages/plannedDistribution/plannedDistribution.vue b/minipro_standard/pages/plannedDistribution/plannedDistribution.vue
index 2f3dbb6..6266952 100644
--- a/minipro_standard/pages/plannedDistribution/plannedDistribution.vue
+++ b/minipro_standard/pages/plannedDistribution/plannedDistribution.vue
@@ -119,7 +119,11 @@
// 鐐瑰嚮褰撳墠椤�
clickItem(i) {
this.list.forEach((item, index) => {
- item.isActive = i === index
+ if (i === index) {
+ item.isActive = !item.isActive
+ } else {
+ item.isActive = false
+ }
})
},
// 鎼滅储
diff --git a/minipro_standard/pages/plannedProgress/plannedProgress.vue b/minipro_standard/pages/plannedProgress/plannedProgress.vue
index 4db1f02..fe0ae90 100644
--- a/minipro_standard/pages/plannedProgress/plannedProgress.vue
+++ b/minipro_standard/pages/plannedProgress/plannedProgress.vue
@@ -333,8 +333,8 @@
capacity: this.listData.capacity,
model: {
mixParam: this.listData.mixParam,
- startDate: this.listData.startDate,
- endDate: this.listData.endDate,
+ planDateStartDate: this.listData.startDate,
+ planDateEndDate: this.listData.endDate,
procedureIdList: this.listData.procedureIds ? this.listData.procedureIds : [],
factoryId: this.listData.departIds,
statusList: this.listData.cateIds
diff --git a/minipro_standard/pages_adjust/components/multipleMaterial.vue b/minipro_standard/pages_adjust/components/multipleMaterial.vue
index 9334255..c8187aa 100644
--- a/minipro_standard/pages_adjust/components/multipleMaterial.vue
+++ b/minipro_standard/pages_adjust/components/multipleMaterial.vue
@@ -9,7 +9,7 @@
scroll-y="true"
@scrolltolower="loadMore">
<view v-for="(item1, index) in list" :key="index" class="flex mb20" @click="jump(index)">
- <view class="img36 mr20 pt10">
+ <view class="img36 mr20 pt10" style="position: relative;">
<u-checkbox-group style="display: block;" name="" @change="jump(index)">
<u-checkbox :checked="item1.isActive"></u-checkbox>
</u-checkbox-group>
diff --git a/minipro_standard/pages_inspect/pages/equipmentInspection/equipmentInspection.vue b/minipro_standard/pages_inspect/pages/equipmentInspection/equipmentInspection.vue
index b7d1f75..fb83d85 100644
--- a/minipro_standard/pages_inspect/pages/equipmentInspection/equipmentInspection.vue
+++ b/minipro_standard/pages_inspect/pages/equipmentInspection/equipmentInspection.vue
@@ -259,6 +259,7 @@
mediaType: ['image', 'video'],
sourceType: ['album', 'camera'],
success: (chooseImageRes) => {
+ uni.showLoading({ title: '涓婁紶涓�' });
const tempFilePaths = chooseImageRes.tempFiles;
for (let i = 0; i < tempFilePaths.length; i++) {
uni.uploadFile({
@@ -285,6 +286,7 @@
typec,
url: res.data.url
})
+ uni.hideLoading();
}
});
}
--
Gitblit v1.9.3