h5

Mr.Shi

2023-08-25 50b0f1787720062df58bf9be64b0aa8403955765

h5

 h5_standard/.env

@@ -1,5 +1,5 @@
# æŽ¥å£å‰ç¼€  _api
VUE_APP_API_PREFIX = '/doumeeplant_api'
VUE_APP_API_PREFIX = '/doumeeplant'

# ä¸Šä¸‹æ–‡è·¯å¾„ --> é»˜è®¤./（可以部署在服务器任意路径）
VUE_APP_CONTEXT = './'

 h5_standard/.env.production

@@ -18,7 +18,7 @@
# VUE_APP_API = 'https://hsky.doumee.com/doumeeplant_api/'

# æµ‹è¯•
VUE_APP_API = 'https://dmtest.ahapp.net/doumeeplant_api/'
# VUE_APP_API = 'https://dmtest.ahapp.net/doumeeplant_api/'

# æ¼”示
# VUE_APP_API = 'https://www.mes.red/doumeeplant/'
VUE_APP_API = 'https://www.mes.red/doumeeplant/'

 h5_standard/public/redirect.html

@@ -10,10 +10,12 @@
  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`
    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}`
    window.location.replace(href1)
  }
</script>

 h5_standard/src/apis/index.ts

@@ -20,7 +20,16 @@
    })
}

// å¾®ä¿¡ç«¯ç™»å½•
// å¾®ä¿¡å°ç¨‹åºç™»å½•
export function wxProgramLogin(params: any): Promise<any> {
    return httpRequest({
        url: '/system/wxProgramLogin',
        method: 'get',
        params
    })
}

// å¾®ä¿¡å…¬ä¼—号登录
export function wxAccountLogin(data: any): Promise<any> {
    return httpRequest({
        url: '/system/wxAccountLogin',
@@ -29,6 +38,15 @@
    })
}

// å¾®ä¿¡é€€å‡ºç™»å½•
export function wxLoginOut(data: any): Promise<any> {
    return httpRequest({
        url: '/system/wxLoginOut',
        method: 'post',
        data
    })
}

// èŽ·å–企业id
export function getDingdingCorpId(companyId: any): Promise<any> {
    return httpRequest({

 h5_standard/src/router/module/index.ts

@@ -104,6 +104,15 @@
            keepAlive: false
        },
        component: () => import('@/views/wxLogin.vue')
    },
    {
        path: '/appletLogin',
        name: 'appletLogin',
        meta: {
            title: 'DM云工厂',
            keepAlive: false
        },
        component: () => import('@/views/appletLogin.vue')
    }
]


 h5_standard/src/store/index.ts

@@ -10,7 +10,7 @@

export default createStore({
  state: {
    // é¡¹ç›®å…¥å£çŽ¯å¢ƒ DD / H5
    // é¡¹ç›®å…¥å£çŽ¯å¢ƒ DD / H5 / WX / XCX
    env: env ? env : null,

    // æ˜¯å¦éœ€è¦é€‚配苹果底部安全距离

 h5_standard/src/utils/request.ts

@@ -29,10 +29,9 @@
// æ·»åŠ å“åº”拦截器
service.interceptors.response.use(
    (response) => {

        if (response.config.url?.indexOf('/lingyang/login') == -1 && response.config.url?.indexOf('/edgp/loginDemo') == -1 && response.config.url?.indexOf('/lingyang/loginDemo') == -1 && response.config.url?.indexOf('/edgp/login') == -1) {
        // if (response.config.url?.indexOf('/lingyang/login') == -1 && response.config.url?.indexOf('/edgp/loginDemo') == -1 && response.config.url?.indexOf('/lingyang/loginDemo') == -1 && response.config.url?.indexOf('/edgp/login') == -1) {
            loading.clear();
        }
        // }
        if (response.data.code === 401) {     // å¤„理登录过期
            Toast.fail({ message: '登录过期，准备自动重新登录', duration: 2000, forbidClick: true })
            setTimeout(() => {

 h5_standard/src/utils/utils.ts

@@ -199,7 +199,7 @@
function judgmentPlatform (): boolean {
    // alert(store.state.env)
    // alert(store.state.env !== 'DD')
    return store.state.env === 'DD'
    return store.state.env === 'DD' || store.state.env === 'WX';
    // return dd.env.platform !== 'notInDingTalk';
}


 h5_standard/src/views/LogInAgain.vue

@@ -94,7 +94,7 @@
      let res = await testLogin({ // æ–‡æ­¦
        username: '18656077929',
        password: '123456',
        companyId: '8',
        companyId: '111',
        uuid: '0000',
        code: '0000'
      })

 h5_standard/src/views/appletLogin.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,191 @@
<template>
    <div class="wx">
        <img class="wx_bg" src="@/assets/background/login_bg@2x.png" alt="" />
        <div class="wx_login">
            <img class="wx_login_icon" src="@/assets/icon/logo@2x.png" alt="" />
            <span>DM云工厂</span>
            <div class="wx_login_list">
                <div class="wx_login_list_item">
                    <img src="@/assets/icon/login_ic_code@2x.png" alt="" />
                    <input type="text" v-model="from.companyId" placeholder="企业代码" />
                </div>
                <div class="wx_login_list_item">
                    <img src="@/assets/icon/login_ic_phone@2x.png" alt="" />
                    <input type="text" maxlength="11" v-model="from.username" placeholder="手机号" />
                </div>
                <div class="wx_login_list_item">
                    <img src="@/assets/icon/login_ic_password@2x.png" alt="" />
                    <input type="password" v-model="from.password" placeholder="密码" />
                </div>
            </div>
            <div class="wx_login_footer">
                <div class="wx_login_footer_btn" @click="login">立即登录</div>
            </div>
        </div>
    </div>
</template>

<script setup lang="ts">
import { onMounted, reactive } from 'vue';
import { useRoute, useRouter } from 'vue-router';
import { useStore } from 'vuex';
import { wxAccountLogin, getUserInfo, wxProgramLogin } from '@/apis/index';
import { Toast } from 'vant';

const route = useRoute()
const router = useRouter()
const store = useStore()

let from: any = reactive({
    openid: '',
    unionid: '',
    companyId: '',
    username: '',
    password: ''
})

const login = async () => {
    // if (!from.openid) return Toast('openid不能为空')
    // if (!from.unionid) return Toast('unionid不能为空')
    if (!from.companyId) return Toast('企业代码不能为空')
    if (!from.username) return Toast('手机号不能为空')
    if (!from.password) return Toast('密码不能为空')
    Toast.loading({
        message: '登录中...',
        forbidClick: true
    });
    let res = await wxAccountLogin(from)
    if (res.code === 200) {
        let info = await getUserInfo()
        if (info.code === 200) {
            await store.commit('setEntrance', 'XCX')
            await store.commit('setUserInfo', info.data)
            await store.dispatch('getMenuList', 2)
            await router.replace('/workbench')
        }
    }
    Toast.clear();
}

onMounted(() => {
    wxProgramLogin({ code: route.query.code })
        .then(async (res) => {
            if (res.code === 200) {
                // å…ç™»å½•ï¼Œç›´æŽ¥è·³é¦–页
                if (res.data.loginStatus == 0) {
                    let info = await getUserInfo()
                    if (info.code === 200) {
                        await store.commit('setEntrance', 'XCX')
                        await store.commit('setUserInfo', info.data)
                        await store.dispatch('getMenuList', 2)
                        await router.replace('/workbench')
                    }
                } else {
                    from.openid = res.data.openid
                    from.unionid = res.data.unionid
                }
            }
        })
})
</script>

<style lang="scss" scoped>
    .wx {
        width: 100vw;
        height: 100vh;
        display: flex;
        align-items: center;
        justify-content: center;
        background: #FFFFFF linear-gradient(180deg, rgba(66,117,252,0.2) 0%, rgba(66,117,252,0) 100%);
        .wx_bg {
            width: 100vw;
            height: 812px;
            position: fixed;
            top: 0;
            left: 0;
        }
        .wx_login {
            width: 100vw;
            height: auto;
            display: flex;
            align-items: center;
            justify-content: center;
            flex-direction: column;
            .wx_login_icon {
                width: 180px;
                height: 180px;
            }
            span {
                font-size: 44px;
                font-family: PingFangSC-Semibold, PingFang SC;
                font-weight: 600;
                color: #333333;
                margin-top: 40px;
            }
            .wx_login_list {
                width: 100vw;
                padding: 0 60px;
                box-sizing: border-box;
                margin-top: 80px;
                position: relative;
                z-index: 9;
                .wx_login_list_item {
                    width: 100%;
                    height: 98px;
                    background: #FFFFFF;
                    border-radius: 8px;
                    padding: 0 40px;
                    box-sizing: border-box;
                    display: flex;
                    align-items: center;
                    margin-bottom: 40px;
                    &:last-child {
                        margin-bottom: 0 !important;
                    }
                    img {
                        width: 40px;
                        height: 40px;
                        flex-shrink: 0;
                        margin-right: 24px;
                    }
                    input::-webkit-input-placeholder {
                        font-size: 30px;
                        font-family: PingFangSC-Regular, PingFang SC;
                        font-weight: 400;
                        color: #B7BBC5;
                    }
                    input {
                        flex: 1;
                        height: 100%;
                        padding: 0 !important;
                        font-size: 30px;
                        font-family: PingFangSC-Regular, PingFang SC;
                        font-weight: 400;
                        color: #222222;
                        border: none;
                        outline: none;
                    }
                }
            }
            .wx_login_footer {
                width: 100vw;
                padding: 0 60px;
                box-sizing: border-box;
                margin-top: 80px;
                .wx_login_footer_btn {
                    width: 100%;
                    height: 98px;
                    line-height: 98px;
                    text-align: center;
                    background: #4275FC;
                    box-shadow: 0px 12px 24px 0px rgba(66,117,252,0.2);
                    border-radius: 8px;
                    font-size: 32px;
                    font-family: PingFangSC-Medium, PingFang SC;
                    font-weight: 500;
                    color: #FFFFFF;
                }
            }
        }
    }
</style>

 h5_standard/src/views/children.vue

@@ -1,7 +1,7 @@
<template>
    <div class="box">
        <!--    å¤´éƒ¨å¯¼èˆª    -->
        <template v-if="env == 'H5'">
        <template v-if="env == 'H5' || env == 'XCX'">
            <v-Header :pathList="pathLists">
                <template v-slot:title>{{title}}</template>
            </v-Header>

 h5_standard/src/views/index.vue

@@ -1,7 +1,7 @@
<template>
    <div class="index">
        <!--    å¤´éƒ¨å¯¼èˆª    -->
        <template v-if="env == 'H5'">
        <template v-if="env == 'H5' || env == 'XCX'">
            <v-Header :pathList="pathLists">
                <template v-slot:title>{{ title }}</template>
            </v-Header>

 h5_standard/src/views/plannedProgress/details.vue

@@ -53,7 +53,7 @@
                    </div>
                    <div class="content_list_item_content_item">
                        <div class="content_list_item_content_item_label">分配数量：</div>
                        <div class="content_list_item_content_item_nr">{{info.createTime}}</div>
                        <div class="content_list_item_content_item_nr" v-if="info.umodel">{{info.distributNum}}{{info.umodel.name}}</div>
                    </div>
                    <div class="content_list_item_content_item">
                        <div class="content_list_item_content_item_label">完工数量：</div>
@@ -64,20 +64,22 @@
        </div>
        <NotFound info="暂未分配工单" v-if="info.workorderList && info.workorderList.length === 0" />
        <template v-else>
            <div class="details_list">
                <div class="details_list_item" v-for="(item, i) in info.workorderList" :key="i" @click="jump(item.id)">
            <!-- <div class="details_list">
                <div class="details_list_item" v-for="(item, i) in info.workorderList" :key="i" @click="jump(item)">
                    <div class="details_list_item_top">
                        <span>{{ item.createUserName }}</span><span>{{ item.code }}</span>
                        <span>{{ item.createUserName }}</span>
                        <span>{{ item.code }}</span>
                    </div>
                    <div class="details_list_item_center">
                        <span>良品数：{{ item.qualifiedNum }}</span><span>不良数：<span class="red">{{ item.unqualifiedNum }}</span></span>
                        <span>良品数：{{ item.qualifiedNum }}</span>
                        <span>不良数：<span class="red">{{ item.unqualifiedNum }}</span></span>
                    </div>
                    <div class="details_list_item_bottom">
                        <span>{{ item.createTime }}</span>
                    </div>
                </div>
            </div>
            <!-- <div class="details_timeline" v-for="(item, i) in info.workorderList" :key="i">
            </div> -->
            <div class="details_timeline" v-for="(item, i) in info.workorderList" :key="i">
                <div class="details_timeline_header">
                    <div class="details_timeline_header_code">
                        <span>工单编号：{{item.code}}</span>
@@ -89,10 +91,10 @@
                    <span v-if="item.status === 3" class="purple">已检验</span>
                    <span v-if="item.status === 4">已报工</span>
                    <span v-if="item.status === 5">已入库</span>
                    <span v-if="item.status === 6">已取消</span> -->
                    <span v-if="item.status === 6">已取消</span>
                    <!--                <span v-if="item.status === 7">已取消</span>-->
                    <!--                <span v-if="item.status === 8">已关闭</span>-->
                <!-- </div>
                </div>
                <div class="details_timeline_item" v-if="item.produceDate">
                    <div class="activedian"></div>
                    <div class="dian active"></div>
@@ -153,8 +155,10 @@
                        </div>
                    </div>
                </div>
            </div> -->
            </div>
        </template>
        <!-- <div class="details_zw"></div> -->
        <!-- <div class="details_btn" @click="toJump">去报工</div> -->
    </div>
</template>

@@ -182,8 +186,17 @@
            })
    }

    const jump = (id: any) => {
        router.push({ name: 'workOrderReporting', query: { id } })
    const toJump = () => {
        router.push({ name: 'reportingForWork' })
    }

    const jump = (item: any) => {
        if (item.status === 4 || item.status === 6 || item.paused === 1) {
            router.push({ name: 'afterWorkReport', query: { id: item.id } })
        } else {
            router.push({ name: 'workOrderReporting', query: { id: item.id } })
        }
        // router.push({ name: 'workOrderReporting', query: { id } })
    }

    const proUserStr = (item: any) => {
@@ -210,6 +223,26 @@
    height: 100%;
    position: absolute;
    background: #F7F7F7;
    .details_zw {
        width: 100%;
        height: 148px;
    }
    .details_btn {
        position: fixed;
        bottom: 60px;
        left: 30px;
        width: calc(100% - 60px);
        height: 88px;
        line-height: 88px;
        text-align: center;
        background: #305ED5;
        box-shadow: 0px 0px 12px 0px rgba(0,0,0,0.08);
        border-radius: 8px;
        font-size: 30px;
        font-family: PingFangSC-Medium, PingFang SC;
        font-weight: 500;
        color: #FFFFFF;
    }
    .van-skeleton {
        padding: 0 !important;
    }

 h5_standard/src/views/tabPage/my.vue

@@ -21,7 +21,7 @@
                </div>
            </div>
        </div>
<!--        <div class="box_out"><span>退出登录</span></div>-->
        <div class="box_out" v-if="store.state.env && (store.state.env == 'WX' || store.state.env == 'XCX')" @click="loginOut"><span>退出登录</span></div>
    </div>
    <van-popup v-model:show="show" position="bottom" round :style="{ height: '50%' }">
        <van-picker
@@ -40,6 +40,7 @@
    import { Dialog, Toast } from 'vant'
    const VanDialog = Dialog.Component;
    import { changeCom, getDepartmentListByConditon } from '@/apis/PersonalAPI'
    import { wxLoginOut } from '@/apis'

    const router = useRouter()

@@ -69,6 +70,19 @@
        })
    };

    // é€€å‡ºç™»å½•
    const loginOut = () => {
        wxLoginOut({
            companyUserId: store.state.userInfo.companyUser.id
        }).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'
                window.open(href)
            }
        })
    }

    // å…³é—­ç»„织弹框
    const onCancel = (): void => {
        show.value = false

 h5_standard/src/views/workOrder/reportingForWork.vue

@@ -392,6 +392,12 @@
        if (!from.qualified && !from.undesirable) {
            return Toast('良品数与不良数不能同时为空')
        }
        if (from.qualified && from.qualified <= 0) {
            return Toast('良品数必须大于0')
        }
        if (from.undesirable && from.undesirable <= 0) {
            return Toast('不良品数必须大于0')
        }
        // if (!from.qualified) return Toast('良品数不能为空')
        // æœ‰ä¸è‰¯æ•°
        if (from.undesirable > 0) {

 h5_standard/src/views/workOrder/workOrderReporting.vue

@@ -962,7 +962,7 @@
        if (info.value.bomType === 1) {  // æ‹‰å¼
            console.log('拉式')
            statisticsData.value = []
            if (produceFrom.qualified <= 0) {
            if (produceFrom.qualified <= 0 && produceFrom.undesirable <= 0) {
                Toast.fail({ message: '产出明细不能为空' })
                return
            }
@@ -1121,7 +1121,7 @@
                Toast.fail({ message: '投料明细不能为空' })
                return
            }
            if (produceFrom.qualified <= 0) {
            if (produceFrom.qualified <= 0 && produceFrom.undesirable <= 0) {
                Toast.fail({ message: '产出明细不能为空' })
                return
            }

 minipro_standard/App.vue

@@ -1,5 +1,4 @@
<script>
    console.log('app------');
    // import { pageCount } from '@/util/api/index.js'

    export default {

        onLaunch: function() {

 minipro_standard/main.js

@@ -10,7 +10,7 @@
store.dispatch('getHeight')
Vue.config.productionTip = false
App.mpType = 'app'
console.log(uni.$u);
// console.log(uni.$u);
// #ifdef MP

// å¼•å…¥uView对小程序分享的mixin封装

const mpShare = require('@/uni_modules/uview-ui/libs/mixin/mpShare.js')
@@ -24,6 +24,6 @@
})

require('./util/request/index')(app)

// èŽ·å–待办数量
store.dispatch('getUpcomingNum')

// store.dispatch('getUpcomingNum')



app.$mount()

 minipro_standard/manifest.json

@@ -50,7 +50,7 @@
    "quickapp" : {},
    /* å°ç¨‹åºç‰¹æœ‰ç›¸å…³ */
    "mp-weixin" : {
        "appid" : "wxcd2b89fd2ff065f8",
        "appid" : "wx1605a61f7a48cea6",
        "setting" : {
            "urlCheck" : false,
            "es6" : true,

 minipro_standard/pages.json

@@ -1,65 +1,104 @@
{

    "pages": [

        {
            "path": "pages/workbench/workbench",
            "style": {
                "navigationBarTitleText": "工作台",
                "enablePullDownRefresh": false
            }
        },
        // {
        //     "path": "pages/workbench/workbench",
        //     "style": {
        //         "navigationBarTitleText": "工作台",
        //         "enablePullDownRefresh": false
        //     }
        // },
        {

            "path": "pages/index/index",

            "style": {

                "navigationBarTitleText": "待办"

            }

        },  {

            "path": "pages/mine/mine",

            "style": {

                "navigationBarTitleText": "我的",

                "enablePullDownRefresh": false

                "navigationBarTitleText": "",

                "navigationStyle": "custom"

            }

        }

        ,{

            "path" : "pages/login/login",
            "style" :                                                                                    
            {
                "navigationBarTitleText": "登录",
                "enablePullDownRefresh": false,
                "navigationStyle": "custom"
            }

        }

        // ,  {

        //     "path": "pages/mine/mine",

        //     "style": {

        //         "navigationBarTitleText": "我的",

        //         "enablePullDownRefresh": false

        //     }

        // }

     //    ,{

  //           "path" : "pages/login/login",
  //           "style" :                                                                                    
  //           {
  //               "navigationBarTitleText": "登录",
  //               "enablePullDownRefresh": false,
        //         "navigationStyle": "custom"
  //           }

  //       }

  //       ,{

  //           "path" : "pages/personal/personal",

  //           "style" :                                                                                    
  //           {

  //               "navigationBarTitleText": "个人信息",

  //               "enablePullDownRefresh": false

  //           }

            
  //       }

  //       ,{

  //           "path" : "pages/changePassword/changePassword",

  //           "style" :                                                                                    
  //           {

  //               "navigationBarTitleText": "修改密码",

  //               "enablePullDownRefresh": false

  //           }

            
  //       }

  //       ,{

  //           "path" : "pages/updatePhone/updatePhone",

  //           "style" :                                                                                    
  //           {

  //               "navigationBarTitleText": "更新手机号",

  //               "enablePullDownRefresh": false

  //           }

            
  //       }

  //       ,{

  //           "path" : "pages/updateMailbox/updateMailbox",

  //           "style" :                                                                                    
  //           {

  //               "navigationBarTitleText": "更新邮箱号",

  //               "enablePullDownRefresh": false

  //           }

            
  //       }

    ],

    "globalStyle": {

        "navigationBarTextStyle": "black",

        "navigationBarTitleText": "uni-app",
        "navigationBarBackgroundColor": "#ffffff",

        "backgroundColor": "#ffffff"

        "backgroundColor": "#ffffff",

        "navigationStyle": "custom"

    },
    "tabBar": {
        "color": "#666666",
        "selectedColor": "#222222",
        "borderStyle": "black",
        "backgroundColor": "#fff",
        "list": [
            {
                "pagePath": "pages/index/index",
                "iconPath": "static/nav_daiban@2x.png",
                "selectedIconPath": "static/nav_daiban_sel@2x.png",
                "text": "待办"
            },
            {
                "pagePath": "pages/workbench/workbench",
                "iconPath": "static/nav_gongzuotai@2x.png",
                "selectedIconPath": "static/nav_gongzuotai_sel@2x.png",
                "text": "工作台"
            },
            {
                "pagePath": "pages/mine/mine",
                "iconPath": "static/nav_wode@2x.png",
                "selectedIconPath": "static/nav_wode_sel@2x.png",
                "text": "我的"
            }
        ]
    },

    // "tabBar": {
    //     "color": "#666666",
    //     "selectedColor": "#222222",
    //     "borderStyle": "black",
    //     "backgroundColor": "#fff",
    //     "list": [
    //         {
    //             "pagePath": "pages/index/index",
    //             "iconPath": "static/nav_daiban@2x.png",
    //             "selectedIconPath": "static/nav_daiban_sel@2x.png",
    //             "text": "待办"
    //         },
    //         {
    //             "pagePath": "pages/workbench/workbench",
    //             "iconPath": "static/nav_gongzuotai@2x.png",
    //             "selectedIconPath": "static/nav_gongzuotai_sel@2x.png",
    //             "text": "工作台"
    //         },
    //         {
    //             "pagePath": "pages/mine/mine",
    //             "iconPath": "static/nav_wode@2x.png",
    //             "selectedIconPath": "static/nav_wode_sel@2x.png",
    //             "text": "我的"
    //         }
    //     ]
    // },

    "uniIdRouter": {}

}

 minipro_standard/pages/changePassword/changePassword.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,128 @@
<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="password" v-model="form.originalPassword" maxlength="20" placeholder="请输入原密码">
                </view>
            </view>
            <view class="password_list_item">
                <text>新密码</text>
                <view class="password_list_item_box">
                    <input type="password" v-model="form.newPassword" maxlength="20" placeholder="请输入新密码">
                </view>
            </view>
            <view class="password_list_item">
                <text>确认密码</text>
                <view class="password_list_item_box">
                    <input type="password" v-model="form.confirmPassword" maxlength="20" placeholder="再次输入新密码">
                </view>
            </view>
        </view>
        <view class="password_footer">
            <button v-preventReClick class="password_footer_submit">
                <text>完成</text>
            </button>
        </view>
    </view>
</template>

<script>
    export default {
        data() {
            return {
                form: {
                    originalPassword: '',
                    newPassword: '',
                    confirmPassword: ''
                }
            };
        }
    }
</script>

<style lang="scss" scoped>
    .password {
        position: absolute;
        width: 100%;
        height: 100%;
        background: white;
        .password_tip {
            height: 72rpx;
            display: flex;
            align-items: center;
            background: #F7F7F7;
            padding: 0 30rpx;
            image {
                width: 24rpx;
                height: 24rpx;
                margin-right: 10rpx;
            }
            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>

 minipro_standard/pages/index/index.vue

@@ -1,73 +1,44 @@
<template>

    <view>

        <myTabbar :index="0" />

    <view class="index">

        <web-view v-if="show" @onPostMessage="onMessage" :src="'https://dmtest.ahapp.net/doumeeplant_h5/#/appletLogin?code=' + code"></web-view>

        <!-- <myTabbar :index="0" /> -->

    </view>

</template>



<script>

    import myTabbar from "@/components/myTabber.vue"

    // import myTabbar from "@/components/myTabber.vue"	
    export default {

        components: {

            myTabbar

        },

        // components: {

        //     myTabbar

        // },

        data() {

            return {

                form: {

                    account: '',

                    password: '',

                },

                logining: false,

                openId: ''

                code: '',

                show: false

            }

        },

        onLoad() {

            // uni.login({

            //     success: data => {

            //         this.wxLogin(data.code)

            //     },

            //     fail: err => {

            //         uni.$u.toast(err)

            //     }

            // })

            var that = this

            uni.login({

                provider: 'weixin',

                success: function (loginRes) {

                    // console.log(loginRes);

                    that.code = loginRes.code

                    that.show = true

                }

            });

        },

        methods: {

            // loginAction() {

            //     if (!this.form.account || !this.form.password) {

            //         uni.$u.toast('账号或者密码不能为空')

            //     }

            //     this.logining = true

            //     coustomLogin({...this.form, openid: this.openId})

            //         .then(res => {

            //             this.$store.commit('SETTOKEN', res.token)

            //             this.$store.commit('SETUSERINFO', res)

            //             uni.navigateTo({

            //                 url:'/pages/projectList/projectList'

            //             })

            //         })

            //         .finally(() => {

            //             this.logining = false

            //         })

            // },

            // wxLogin(code) {

            //     wxEmpower({code})

            //         .then(res => {

            //             this.openId = res.openid

            //             if (res.userInfo) {

            //                 this.$store.commit('SETTOKEN', res.userInfo.token)

            //                 this.$store.commit('SETUSERINFO', res.userInfo)

            //                 uni.navigateTo({

            //                     url:'/pages/projectList/projectList'

            //                 })

            //             } 
            //         })

            //         .catch(err => {

            //             uni.$u.toast(err)

            //         })

            // }

            onMessage(e) {

                console.log('12345654321')

            }

        }

    }

</script>



<style lang="scss" scoped>

	
    .index {

        width: 100vw;

        height: 100vh;

    }

</style>

 minipro_standard/pages/mine/mine.vue

@@ -5,14 +5,14 @@
            <image src="@/static/2@2x.png" mode="widthFix" />

            <div class="box_info_box">

                <text>张三</text>

                <div class="box_info_box_x">

                <div class="box_info_box_x" @click="show = true">

                    <text>豆米科技</text>

                    <image src="@/static/mine_ic_change@2x.png" alt="" />

                </div>

            </div>

        </div>

        <div class="box_function">

            <div class="box_function_item" v-for="(item, index) in MENU" :key="index">

            <div class="box_function_item" v-for="(item, index) in MENU" :key="index" @click="jump(item.url)">

                <div class="box_function_item_left">

                    <image :src="item.icon" alt="" />

                    <text>{{item.name}}</text>

@@ -24,6 +24,8 @@
        </div>

        <div class="box_out"><text>退出登录</text></div>

    </div>

    <!-- éƒ¨é—¨é€‰æ‹©å™¨ -->

    <u-picker :show="show" :columns="columns" @confirm="confirm"></u-picker>

    <myTabbar :index="2" />

</view>

</template>

@@ -37,28 +39,31 @@
        data() {

            return {

                MENU: [
                    { name: '个人信息', url: '/personal/personalInformation', icon: require('@/static/mine_ic_gerenxinxi@2x.png') },
                    { name: '个人信息', url: '/pages/personal/personal', icon: require('@/static/mine_ic_gerenxinxi@2x.png') },
                    // { name: '系统通知', url: '', icon: require('@/assets/icon/mine_ic_xitonggonggao@2x.png') },
                    { name: '更新手机号', url: '/personal/updatePhone', icon: require('@/static/mine_ic_shoujihao@2x.png') },
                    { name: '更新邮箱号', url: '/personal/updateMailbox', icon: require('@/static/mine_ic_youxianghao@2x.png') },
                    { name: '更新手机号', url: '/pages/updatePhone/updatePhone', icon: require('@/static/mine_ic_shoujihao@2x.png') },
                    { name: '更新邮箱号', url: '/pages/updateMailbox/updateMailbox', icon: require('@/static/mine_ic_youxianghao@2x.png') },
                    { name: '扫码绑定账号', url: '', icon: require('@/static/mine_ic_bangding@2x.png') },
                    { name: '修改密码', url: '/personal/changePassword', icon: require('@/static/mine_ic_xiugaimima@2x.png') },
                    { name: '修改密码', url: '/pages/changePassword/changePassword', icon: require('@/static/mine_ic_xiugaimima@2x.png') },
                ],

                img: require('@/static/mine_bg@2x.png')

                img: require('@/static/mine_bg@2x.png'),

                show: false,

                columns: [

                    ['中国', '美国', '日本']

                ]

            }

        },

        onLoad() {

            uni.hideTabBar()

            // uni.login({

            //     success: data => {

            //         this.wxLogin(data.code)

            //     },

            //     fail: err => {

            //         uni.$u.toast(err)

            //     }

            // })

        },

        methods: {

            jump(url) {

                uni.navigateTo({ url })

            },

            confirm(val) {

                console.log(val)

                this.show = false

            }

        }

    }

</script>


 minipro_standard/pages/personal/personal.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,89 @@
<template>
    <view class="info">
        <view class="info_portrait">
            <image src="@/static/2@2x.png" mode="widthFix" />
            <text>用户名</text>
        </view>
        <view class="info_list">
            <view class="info_list_item">
                <text>昵称</text>
                <text>暂无昵称</text>
            </view>
            <view class="info_list_item">
                <text>手机号</text>
                <text>暂无手机号</text>
            </view>
            <view class="info_list_item">
                <text>所属部门</text>
                <text>暂无所属部门</text>
            </view>
            <view class="info_list_item">
                <text>岗位</text>
                <text>暂无岗位</text>
            </view>
            <view class="info_list_item">
                <text>当前组织</text>
                <text>暂无组织</text>
            </view>
        </view>
    </view>
</template>

<script>
    export default {
        data() {
            return {
				
            };
        }
    }
</script>

<style lang="scss" scoped>
.info {
    padding: 30rpx;
    position: absolute;
    width: 100%;
    height: 100%;
    box-sizing: border-box;
    background: white;
    .info_portrait {
        display: flex;
        align-items: center;
        flex-direction: column;
        margin-top: 60rpx;
        image {
            width: 140rpx;
            height: 140rpx;
            margin-bottom: 30rpx;
        }
        text {
            font-size: 30rpx;
            font-weight: 400;
            color: #222222;
        }
    }
    .info_list {
        margin-top: 30rpx;
        .info_list_item {
            height: 98rpx;
            display: flex;
            align-items: center;
            justify-content: space-between;
            border-bottom: 1rpx solid #E5E5E5;
            text {
                &:first-child {
                    font-size: 30rpx;
                    font-weight: 400;
                    color: #777777;
                }
                &:last-child {
                    font-size: 28rpx;
                    font-weight: 400;
                    color: #222222;
                }
            }
        }
    }
}
</style>

 minipro_standard/pages/updateMailbox/updateMailbox.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,130 @@
<template>
    <view class="password">
        <view class="password_tip">
            <image src="@/static/password_ic_tip@2x.png" mode="widthFix" />
            <text>绑定邮箱号可以更好地保护您的账户安全，保护个人信息不被侵害。</text>
        </view>
        <view class="password_list">
            <view class="password_list_item">
                <text>当前绑定</text>
                <view class="password_list_item_box">
                    <input type="text" disabled v-model="form.currentMailbox" />
                </view>
            </view>
            <view class="password_list_item">
                <text>新邮箱号</text>
                <view class="password_list_item_box">
                    <input type="text" v-model="form.newMailbox" placeholder="请输入新的邮箱" />
                </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 @click="getVerificationCode" v-else>{{code.num}}</p>
                </view>
            </view>
        </view>
        <view class="password_footer">
            <button v-preventReClick class="password_footer_submit">
                <text>完成</text>
            </button>
        </view>
    </view>
</template>

<script>
    export default {
        data() {
            return {
                form: {
                    currentMailbox: '',
                    newMailbox: '',
                    verificationCode: ''
                }
            };
        }
    }
</script>

<style lang="scss" scoped>
    .password {
        position: absolute;
        width: 100%;
        height: 100%;
        background: white;
        .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>

 minipro_standard/pages/updatePhone/updatePhone.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,127 @@
<template>
    <view class="password">
        <view class="password_tip">
            <image src="@/static/password_ic_tip@2x.png" alt="" />
            <text>绑定手机号可以更好地保护您的账户安全，保护个人信息不被侵害。</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="form.currentPhone" maxlength="11">
                </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.verificationCode" maxlength="4" placeholder="请输入手机验证码">
                    <p @click="getVerificationCode" v-if="!code.isOpen">获取验证码</p>
                    <p @click="getVerificationCode" v-else>{{code.num}}</p>
                </view>
            </view>
        </view>
        <view class="password_footer">
            <button v-preventReClick class="password_footer_submit" @click="submit">
                <text>完成</text>
            </button>
        </view>
    </view>
</template>

<script>
    export default {
        data() {
            return {
                form: {
                    currentPhone: '',
                    newPhone: '',
                    verificationCode: ''
                }
            };
        }
    }
</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>