From 1c7a0f0f76551c5a5360b1c54e5bd7fec44d9cae Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期二, 12 九月 2023 16:31:50 +0800
Subject: [PATCH] 小程序
---
minipro_standard/pages.json | 10 +
minipro_standard/pages/plannedDistribution/plannedDistribution.vue | 20 +++
minipro_standard/pages_adjust/pages/forgotPassword/forgotPassword.vue | 168 +++++++++++++++++++++++++++++++++
h5_standard/.env.production | 4
h5_standard/src/views/tabPage/my.vue | 3
h5_standard/public/redirect.html | 6
minipro_standard/pages_inspect/pages/equipmentInspection/equipmentInspection.vue | 15 +-
minipro_standard/pages/personal/personal.vue | 2
h5_standard/.env | 4
minipro_standard/pages/changePassword/changePassword.vue | 12 ++
minipro_standard/components/Preview.vue | 38 +++++++
web_standard/.env.development | 4
12 files changed, 265 insertions(+), 21 deletions(-)
diff --git a/h5_standard/.env b/h5_standard/.env
index b39a189..7bc42be 100644
--- a/h5_standard/.env
+++ b/h5_standard/.env
@@ -1,5 +1,5 @@
-# 鎺ュ彛鍓嶇紑 _api
-VUE_APP_API_PREFIX = '/doumeeplant_api_test'
+# 鎺ュ彛鍓嶇紑 _api_api_test
+VUE_APP_API_PREFIX = '/doumeeplant'
# 涓婁笅鏂囪矾寰� --> 榛樿./锛堝彲浠ラ儴缃插湪鏈嶅姟鍣ㄤ换鎰忚矾寰勶級
VUE_APP_CONTEXT = './'
diff --git a/h5_standard/.env.production b/h5_standard/.env.production
index d947993..f7750fc 100644
--- a/h5_standard/.env.production
+++ b/h5_standard/.env.production
@@ -18,7 +18,9 @@
# VUE_APP_API = 'https://hsky.doumee.com/doumeeplant_api/'
# 娴嬭瘯
-VUE_APP_API = 'https://dmtest.ahapp.net/doumeeplant_api_test/'
+# VUE_APP_API = 'https://dmtest.ahapp.net/doumeeplant_api_test/'
+
+VUE_APP_API = 'https://127.0.0.1/doumeeplant/'
# 婕旂ず
#VUE_APP_API = 'https://www.mes.red/doumeeplant/'
diff --git a/h5_standard/public/redirect.html b/h5_standard/public/redirect.html
index c3e3081..b0485c9 100644
--- a/h5_standard/public/redirect.html
+++ b/h5_standard/public/redirect.html
@@ -10,12 +10,14 @@
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://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`
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://dmtest.ahapp.net/doumeeplant_h5/#/wxLogin?code=${code}`
+ let href1 = `https://lingyang.mes.show:1801/h5/#/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 189d497..9d8007c 100644
--- a/h5_standard/src/views/tabPage/my.vue
+++ b/h5_standard/src/views/tabPage/my.vue
@@ -79,7 +79,8 @@
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://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'
window.open(href)
}
})
diff --git a/minipro_standard/components/Preview.vue b/minipro_standard/components/Preview.vue
index a6c4844..007ad0f 100644
--- a/minipro_standard/components/Preview.vue
+++ b/minipro_standard/components/Preview.vue
@@ -4,7 +4,7 @@
<u-icon name="close" size="20"></u-icon>
</div>
<div class="preview_content">
- <u-swiper :list="list" :current="current"></u-swiper>
+ <u-swiper :list="list" :autoplay="false" :height="300" bgColor="rgba(0,0,0,0)" :current="current"></u-swiper>
</div>
</div>
</template>
@@ -30,5 +30,39 @@
</script>
<style lang="scss" scoped>
-
+.preview {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background: rgba(0, 0, 0, 0.8);
+ z-index: 9999;
+ .preview_close {
+ position: fixed;
+ right: 50rpx;
+ top: 50rpx;
+ width: 70rpx;
+ height: 70rpx;
+ border-radius: 50%;
+ background: #B2B2B2;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ z-index: 99999;
+ }
+ .preview_content::v-deep {
+ position: relative;
+ top: 50%;
+ left: 0;
+ transform: translate(0, -50%);
+ .u-swiper {
+ width: 100%;
+ height: 300rpx !important;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ }
+}
</style>
diff --git a/minipro_standard/pages.json b/minipro_standard/pages.json
index 44801d1..4361238 100644
--- a/minipro_standard/pages.json
+++ b/minipro_standard/pages.json
@@ -123,7 +123,7 @@
}
}
- ],
+ ],
"subPackages": [{
"root": "pages_adjust",
"pages": [{
@@ -141,6 +141,14 @@
}
},
{
+ "path" : "pages/forgotPassword/forgotPassword",
+ "style" :
+ {
+ "navigationBarTitleText": "蹇樿瀵嗙爜",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
"path": "pages/newTransfer/newTransfer",
"style": {
"navigationBarTitleText": "鏂板缓杞簱",
diff --git a/minipro_standard/pages/changePassword/changePassword.vue b/minipro_standard/pages/changePassword/changePassword.vue
index 311f0d2..a30bcbd 100644
--- a/minipro_standard/pages/changePassword/changePassword.vue
+++ b/minipro_standard/pages/changePassword/changePassword.vue
@@ -10,6 +10,7 @@
<view class="password_list_item_box">
<input type="password" v-model="form.originalPassword" maxlength="20" placeholder="璇疯緭鍏ュ師瀵嗙爜">
</view>
+ <text class="password_list_item_btn" @click="forgotPassword">蹇樿瀵嗙爜</text>
</view>
<view class="password_list_item">
<text>鏂板瘑鐮�</text>
@@ -47,7 +48,9 @@
methods: {
// 蹇樿瀵嗙爜
forgotPassword() {
-
+ uni.navigateTo({
+ url: '/pages_adjust/pages/forgotPassword/forgotPassword'
+ });
},
// 鎻愪氦淇敼
submit() {
@@ -116,6 +119,13 @@
font-weight: 400;
color: #222222;
}
+ .password_list_item_btn {
+ text-align: right;
+ font-size: 26rpx;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #4275FC;
+ }
.password_list_item_box {
display: flex;
justify-content: space-between;
diff --git a/minipro_standard/pages/personal/personal.vue b/minipro_standard/pages/personal/personal.vue
index 3677e11..7bc7077 100644
--- a/minipro_standard/pages/personal/personal.vue
+++ b/minipro_standard/pages/personal/personal.vue
@@ -2,7 +2,7 @@
<view class="info">
<view class="info_portrait">
<image :src="userInfo.avatar ? userInfo.avatar : avatar" mode="widthFix" />
- <text>鐢ㄦ埛鍚�</text>
+ <text>{{userInfo.companyUser ? userInfo.companyUser.name : ''}}</text>
</view>
<view class="info_list">
<view class="info_list_item">
diff --git a/minipro_standard/pages/plannedDistribution/plannedDistribution.vue b/minipro_standard/pages/plannedDistribution/plannedDistribution.vue
index cbb7d3a..0ce96ac 100644
--- a/minipro_standard/pages/plannedDistribution/plannedDistribution.vue
+++ b/minipro_standard/pages/plannedDistribution/plannedDistribution.vue
@@ -17,7 +17,12 @@
:style="{height: height}">
<view class="fp_list_item" v-for="(item, i) in list" :key="item.id" @click="clickItem(i)">
<view class="fp_list_item_header">
- <u-checkbox :checked="item.isActive"></u-checkbox>
+ <view class="fp_list_item_header_xz">
+ <u-checkbox-group>
+ <u-checkbox :checked="item.isActive"></u-checkbox>
+ </u-checkbox-group>
+ <view class="fp_list_item_header_xz_f"></view>
+ </view>
<text v-if="item.mmodel">{{item.mmodel.name}}</text>
<view class="tags" v-if="item.urgent">浼樺厛{{item.urgent}}</view>
<view class="warning" v-if="item.type === 2">杩斿伐</view>
@@ -312,6 +317,19 @@
.fp_list_item_header {
display: flex;
align-items: center;
+ .fp_list_item_header_xz {
+ width: 40rpx;
+ height: 40rpx;
+ position: relative;
+ .fp_list_item_header_xz_f {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ z-index: 99;
+ }
+ }
text {
max-width: 64%;
overflow: hidden;
diff --git a/minipro_standard/pages_adjust/pages/forgotPassword/forgotPassword.vue b/minipro_standard/pages_adjust/pages/forgotPassword/forgotPassword.vue
new file mode 100644
index 0000000..e4f204f
--- /dev/null
+++ b/minipro_standard/pages_adjust/pages/forgotPassword/forgotPassword.vue
@@ -0,0 +1,168 @@
+<template>
+ <view class="password">
+ <view class="password_tip">
+ <image src="@/static/password_ic_tip@2x.png" alt="" />
+ <text>瀵嗙爜鐢�6-20涓嫳鏂囧瓧姣嶃�佹暟瀛楁垨绗﹀彿缁勬垚</text>
+ </view>
+ <view class="password_list">
+ <view class="password_list_item">
+ <text>褰撳墠缁戝畾</text>
+ <view class="password_list_item_box">
+ <input type="number" disabled v-model="userInfo.companyUser.phone" maxlength="11">
+ </view>
+ </view>
+ <view class="password_list_item">
+ <text>楠岃瘉鐮�</text>
+ <view class="password_list_item_box">
+ <input type="text" v-model="form.verificationCode" maxlength="4" placeholder="璇疯緭鍏ユ墜鏈洪獙璇佺爜">
+ <p @click="getVerificationCode" v-if="!code.isOpen">鑾峰彇楠岃瘉鐮�</p>
+ <p v-else>{{code.num}}</p>
+ </view>
+ </view>
+ <view class="password_list_item">
+ <text>鏂板瘑鐮�</text>
+ <view class="password_list_item_box">
+ <input type="text" v-model="form.newPhone" maxlength="11" placeholder="璇疯緭鍏ユ柊瀵嗙爜">
+ </view>
+ </view>
+ <view class="password_list_item">
+ <text>纭瀵嗙爜</text>
+ <view class="password_list_item_box">
+ <input type="text" v-model="form.newPhone" maxlength="11" placeholder="鍐嶆杈撳叆鏂板瘑鐮�">
+ </view>
+ </view>
+ </view>
+ <view class="password_footer">
+ <button v-preventReClick class="password_footer_submit" @click="submit">
+ <text>瀹屾垚</text>
+ </button>
+ </view>
+ </view>
+</template>
+
+<script>
+ import { mapState } from 'vuex'
+ import { phoneRegular } from '@/common/config.js'
+ export default {
+ data() {
+ return {
+ form: {
+ newPhone: '',
+ verificationCode: ''
+ },
+ code: {
+ num: 60,
+ isOpen: false,
+ timer: 0
+ }
+ };
+ },
+ computed: mapState([
+ 'userInfo'
+ ]),
+ methods: {
+ // 鑾峰彇楠岃瘉鐮�
+ getVerificationCode() {
+ this.code.isOpen = true
+ this.code.timer = setInterval(() => {
+ if (this.code.num === 0) {
+ clearInterval(this.code.timer)
+ this.code.isOpen = false
+ this.code.num = 60
+ }
+ this.code.num = this.code.num - 1
+ }, 1000)
+ },
+ // 鎻愪氦淇敼
+ submit() {
+ // if (!this.form.newPhone) {
+ // uni.showToast({ title: '鏂版墜鏈哄彿涓嶈兘涓虹┖', icon: 'none', duration: 2000 });
+ // } else if (!phoneRegular.test(this.form.newPhone)) {
+ // uni.showToast({ title: '鎵嬫満鍙蜂笉鍚堟硶', icon: 'none', duration: 2000 });
+ // } else if (!this.form.verificationCode) {
+ // uni.showToast({ title: '楠岃瘉鐮佷笉鑳戒负绌�', icon: 'none', duration: 2000 });
+ // } else {
+ // console.log('鍙互鎻愪氦')
+ // }
+ }
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+ .password {
+ width: 100%;
+ .password_tip {
+ padding: 20rpx 30rpx;
+ display: flex;
+ background: #F7F7F7;
+ box-sizing: border-box;
+ image {
+ width: 24rpx;
+ height: 24rpx;
+ margin-right: 10rpx;
+ margin-top: 8rpx;
+ }
+ text {
+ font-size: 24rpx;
+ font-weight: 400;
+ color: #666666;
+ }
+ }
+ .password_list {
+ padding: 0 30rpx;
+ .password_list_item {
+ display: flex;
+ align-items: center;
+ height: 90rpx;
+ border-bottom: 1rpx solid #E5E5E5;
+ text {
+ width: 150rpx;
+ flex-shrink: 0;
+ font-size: 30rpx;
+ font-weight: 400;
+ color: #222222;
+ }
+ .password_list_item_box {
+ display: flex;
+ justify-content: space-between;
+ flex: 1;
+ input {
+ border: none;
+ font-size: 30rpx;
+ }
+ input::-webkit-input-placeholder {
+ font-size: 28rpx;
+ font-weight: 400;
+ color: #B2B2B2;
+ }
+ p {
+ font-size: 26rpx;
+ font-weight: 400;
+ color: #4275FC;
+ }
+ }
+ }
+ }
+ .password_footer {
+ margin-top: 80rpx;
+ padding: 0 30rpx;
+ .password_footer_submit {
+ width: 100%;
+ height: 88rpx;
+ border: none;
+ background: #4275FC;
+ box-shadow: 0 0 12rpx 0 rgba(0, 0, 0, 0.08);
+ border-radius: 8rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ text {
+ font-size: 30rpx;
+ font-weight: 500;
+ color: #FFFFFF;
+ }
+ }
+ }
+ }
+</style>
diff --git a/minipro_standard/pages_inspect/pages/equipmentInspection/equipmentInspection.vue b/minipro_standard/pages_inspect/pages/equipmentInspection/equipmentInspection.vue
index a730917..ef0cd69 100644
--- a/minipro_standard/pages_inspect/pages/equipmentInspection/equipmentInspection.vue
+++ b/minipro_standard/pages_inspect/pages/equipmentInspection/equipmentInspection.vue
@@ -70,7 +70,7 @@
<button class="box_footer_submit" v-preventReClick @click="submit">鎻愪氦</button>
</view>
<!-- 鏌ョ湅澶у浘 -->
- <Preview :list="form.files" :current="current" v-if="isOpen" />
+ <Preview :list="form.files.map(item => item.url)" :current="current" @close="isOpen = false" v-if="isOpen" />
<!-- 閫夋嫨璁惧 -->
<ytyDataPicker :show="show" :dataList="columns" @select="handleSelect" @search="handleSearch" @close="show = false" />
<!-- 閫夋嫨鏃堕棿 -->
@@ -86,16 +86,11 @@
import { setTime, judgmentType } from '@/util/utils.js'
import { mapState } from 'vuex'
import ytyDataPicker from '@/components/yty-data-picker/yty-data-picker.vue'
- import Preview from '@/components/Preview/Preview.vue'
+ import Preview from '@/components/Preview.vue'
export default {
data() {
return {
- list1: [
- 'https://cloudfactory.oss-cn-hangzhou.aliyuncs.com/deviceCheck/20230911/e228a809-0a6b-443c-9a2c-78d5c1b1b633.mp4',
- 'https://cdn.uviewui.com/uview/swiper/swiper2.png',
- 'https://cdn.uviewui.com/uview/swiper/swiper3.png',
- ],
status: [{
name: '姝ｅ父',
active: true,
@@ -108,6 +103,7 @@
}
],
columns: [],
+ isOpen: false,
path: '',
show: false,
showTime: false,
@@ -136,6 +132,11 @@
...mapState(['session'])
},
methods: {
+ // 鏌ョ湅澶у浘/瑙嗛
+ seeBigFile(i) {
+ this.current = i
+ this.isOpen = true
+ },
// 鍒犻櫎鎸囧畾鏂囦欢
dele(i) {
this.form.files.splice(i, 1)
diff --git a/web_standard/.env.development b/web_standard/.env.development
index 9b93c1d..6ae272a 100644
--- a/web_standard/.env.development
+++ b/web_standard/.env.development
@@ -18,11 +18,11 @@
# VUE_APP_BASE_URL = 'http://192.168.0.134:10021/'
# 浠诲悍鏈湴
-VUE_APP_BASE_URL = 'http://192.168.0.15:10021/'
+# VUE_APP_BASE_URL = 'http://192.168.0.15:10021/'
# 姹熻悕
# VUE_APP_BASE_URL = 'http://192.168.0.35:10021/'
# 娴嬭瘯鏈嶅姟鍣�
-# VUE_APP_BASE_URL = 'https://dmtest.ahapp.net/doumeeplant_api/'
+VUE_APP_BASE_URL = 'https://dmtest.ahapp.net/doumeeplant_api/'
--
Gitblit v1.9.3