Merge branch 'master' of https://gitee.com/jyyforjava/hive-app into master

queenwuli

2021-01-06 5579e668ef0d3d923fb76d07b4c93d9c01f29d4a

Merge branch 'master' of https://gitee.com/jyyforjava/hive-app into master

 hive-app/common/styles/index.css

@@ -138,6 +138,9 @@
.font-dark{
    color: #111111;
}
.font-darkGray{
    color: #666666;
}
.font-bold{
    font-weight: 700;
}

 hive-app/pages.json

@@ -597,6 +597,50 @@
                    "scrollIndicator": "none"
                }
            }
        },
        {
            "path": "pages/mine/myInfo",
            "style": {
                "navigationBarTitleText": "我的信息",
                "navigationBarBackgroundColor":"#FFFFFF",
                "navigationBarTextStyle":"black",
                "app-plus":{ 
                    "scrollIndicator": "none"
                }
            }
        },
        {
            "path": "pages/workbench/check/index",
            "style": {
                "navigationBarTitleText": "盘点",
                "navigationBarBackgroundColor":"#FFFFFF",
                "navigationBarTextStyle":"black",
                "app-plus":{ 
                    "scrollIndicator": "none"
                }
            }
        },
        {
            "path": "pages/workbench/check/checkEntry",
            "style": {
                "navigationBarTitleText": "盘点录入明细",
                "navigationBarBackgroundColor":"#FFFFFF",
                "navigationBarTextStyle":"black",
                "app-plus":{ 
                    "scrollIndicator": "none"
                }
            }
        },
        {
            "path": "pages/workbench/check/checkDetail",
            "style": {
                "navigationBarTitleText": "盘点明细查看",
                "navigationBarBackgroundColor":"#FFFFFF",
                "navigationBarTextStyle":"black",
                "app-plus":{ 
                    "scrollIndicator": "none"
                }
            }
        }
    ],
    "globalStyle": {

 hive-app/pages/mine/index.vue

@@ -11,10 +11,10 @@
            <view class="flex align-center">
                <image class="header-img ml-10" :src="userInfo.photo?userInfo.photo:'../../static/images/default-avatar.png'"></image>
                <view class="flex flex-v ml-15">
                    <view>
                    <navigator url="./myInfo" hover-class="none">
                        <text class="font-18 white mr-5">{{userInfo.name}}</text>
                        <text class="white icon iconfont iconxiugai"></text>
                    </view>
                    </navigator>
                    <view class="flex mt-10">
                        <view class="mr-20 ellipsis ellipsis-rolename">
                            <text class="white mr-5 font-14">职位:</text>

 hive-app/pages/mine/myInfo.vue

New file
@@ -0,0 +1,82 @@
<template>
    <!-- 我的信息 -->
    <view class="font-14">
        <view class="right mr-10">
            <text class="gray">NO.354</text>
        </view>
        <view class="center">
            <image class="header-img" src="../../static/images/default-avatar.png"></image>
        </view>
        <view class="mt-20 content">
            <view class="input-group-row">
                <text class="label">姓名<text class="require">*</text></text>
                <input type="text" maxlength="20"  placeholder="阿狸" placeholder-class='placeholder'/>
            </view>
            <view class="input-group-row">
                <text class="label">英文名</text>
                <input type="text" maxlength="20"  placeholder="Lisa" placeholder-class='placeholder'/>
            </view>
            <view class="input-group-row">
                <text class="label">手机号码<text class="require">*</text></text>
                <input type="text" maxlength="20"  placeholder="13170303460" placeholder-class='placeholder'/>
            </view>
            <view class="input-group-row">
                <text class="label">性别<text class="require">*</text></text>
                <view class="right-text">
                    <radio-group name="sex">
                        <label><radio value="男" color="#518EFF"  class="radio" :checked="formData.sex==='男'"/>男</label>
                        <label><radio value="女" color="#518EFF" class="radio" :checked="formData.sex==='女'"/>女</label>
                    </radio-group>
                </view>
            </view>
            <view class="input-group-row">
                <text class="label">生日</text>
                <view class="right-text">
                    <picker mode="date" @change="dateChange" :end="endDate">
                        <text :class="formData.birthday?'':'gray'">{{formData.birthday?formData.birthday:'请选择生日'}}</text>
                    </picker>
                </view>
            </view>
            <view class="input-group-row">
                <text class="label">Eamil</text>
                <input type="text" maxlength="20"  placeholder="请输入Eamil" placeholder-class='placeholder'/>
            </view>
            <view class="input-group-row">
                <text class="label">服务签名</text>
                <input type="text" maxlength="20"  placeholder="请输入服务签名" placeholder-class='placeholder'/>
            </view>
            <view class="input-group-row">
                <text class="label">住址</text>
                <input type="text" maxlength="20"  placeholder="请输入住址" placeholder-class='placeholder'/>
            </view>
        </view>
        <button class="blue-btn sticky-footer">保存</button>
    </view>
</template>

<script>
    export default{
        data(){
            return{
                formData: {
                    sex: '女',
                }
            }
        }
    }
</script>

<style>
    .header-img{
        width: 60px;
        height: 60px;
        border-radius: 50%;
    }
    .content{
        padding: 0 10px;
    }
    .content-row{
        border-bottom: 1px solid #EDEAF4;
        padding-bottom: 5px;
    }
</style>

 hive-app/pages/workbench/board.vue

@@ -144,7 +144,7 @@
        border-color: #EDEAF4;
        border-style: solid;
        border-width: 0;
        border-top-width: 1px;
        /* border-top-width: 1px; */
        border-left-width: 1px;
        /* border-bottom-width: 1px; */
        color: #111111;
@@ -160,7 +160,9 @@
        border-color: #EDEAF4;
        border-style: solid;
        border-width: 0;
        border-top-width: 1px;
        border-right-width: 1px;
        /* border-bottom-width: 1px; */
        display: flex;
        justify-content: center;
        align-items: center;

 hive-app/pages/workbench/check/checkDetail.vue

New file
@@ -0,0 +1,61 @@
<template>
    <!-- 盘点明细查看 -->
    <view>
        <search-bar placeholder="商品名称/编号/拼音" class="ml-10 mr-10"></search-bar>
        <view class="content">
            <view class="content-box">
                <view class="content-box-header">
                    <text>柔肤平衡水（电解水）</text>
                    <text>029293</text>
                </view>
                <view class="content-box-main">
                    <view class="flex flex-v">
                        <text>在库数量</text>
                        <text class="mt-10">实盘数量</text>
                    </view>
                    <view class="flex flex-v center">
                        <text>8</text>
                        <text class="mt-10">8</text>
                    </view>
                </view>
                <view class="content-box-footer">
                    <input placeholder="备注: 阿萨德哈猴神大叔"/>
                </view>
            </view>
        </view>
    </view>
</template>

<script>
    import searchBar from '../../../components/searchBar/index.vue';
    export default {
        components:{
            searchBar
        },
    }
</script>

<style>
    .content{
        padding: 0 10px;
    }
    .content-box{
        border: 1px solid #EDEAF4;
        border-radius: 4px;
        box-shadow:0 6px 6px rgba(237,234,244,0.5);
        margin-top: 10px;
        padding:10px;
    }
    .content-box-header{
        display: flex;
        justify-content: space-between;
        border-bottom: 1px solid #EDEAF4;
        padding-bottom: 10px;
    }
    .content-box-main{
        display: flex;
        align-items: center;
        justify-content: space-between;
        padding: 10px 0;
    }
</style>

 hive-app/pages/workbench/check/checkEntry.vue

New file
@@ -0,0 +1,69 @@
<template>
    <!-- 盘点录入明细 -->
    <view>
        <search-bar placeholder="商品名称/编号/拼音" class="ml-10 mr-10"></search-bar>
        <view class="content">
            <view class="content-box">
                <view class="content-box-header">
                    <text>柔肤平衡水（电解水）</text>
                    <text>029293</text>
                </view>
                <view class="content-box-main">
                    <view class="flex flex-v">
                        <text>在库数量</text>
                        <text class="mt-10">实盘数量</text>
                    </view>
                    <view class="flex flex-v center">
                        <text>8</text>
                        <view class="flex align-center mt-10">
                            <text class="iconfont iconjian blue-btn-circle mr-5"></text>
                            <input placeholder="1" class="content-box-input center"/>
                            <text class="iconfont iconjia blue-btn-circle ml-5"></text>
                        </view>
                    </view>
                </view>
                <view class="content-box-footer">
                    <input placeholder="备注: 阿萨德哈猴神大叔"/>
                </view>
            </view>
        </view>
        <button class="blue-btn sticky-footer">保存</button>
    </view>
</template>

<script>
    import searchBar from '../../../components/searchBar/index.vue';
    export default {
        components:{
            searchBar
        },
    }
</script>

<style>
    .content{
        padding: 0 10px;
    }
    .content-box{
        border: 1px solid #EDEAF4;
        border-radius: 4px;
        box-shadow:0 6px 6px rgba(237,234,244,0.5);
        margin-top: 10px;
        padding:10px;
    }
    .content-box-header{
        display: flex;
        justify-content: space-between;
        border-bottom: 1px solid #EDEAF4;
        padding-bottom: 10px;
    }
    .content-box-main{
        display: flex;
        align-items: center;
        justify-content: space-between;
        padding: 10px 0;
    }
    .content-box-input{
        width: 30px;
    }
</style>

 hive-app/pages/workbench/check/index.vue

New file
@@ -0,0 +1,50 @@
<template>
    <!-- 盘点 -->
    <view>
        <search-bar placeholder="盘点编号" class="ml-10 mr-10"></search-bar>
        <view class="content">
            <navigator url="./checkEntry" hover-class="none" class="content-row">
                <view class="font-14 flex flex-v">
                    <text class="font-dark">娟姐创建的盘点</text>
                    <text class="font-darkGray mt-10">PD20210105114712</text>
                </view>
                <view class="font-16 flex align-center">
                    <text class="blue">盘点中</text>
                    <text class="iconfont iconarrow-backimg gray"></text>
                </view>
            </navigator>
            <navigator url="./checkDetail" hover-class="none" class="content-row">
                <view class="font-14 flex flex-v">
                    <text class="font-dark">娟姐创建的盘点</text>
                    <text class="font-darkGray mt-10">PD20210105114712</text>
                </view>
                <view class="font-16 flex align-center">
                    <text class="gray">已完成</text>
                    <text class="iconfont iconarrow-backimg gray"></text>
                </view>
            </navigator>
        </view>
    </view>
</template>

<script>
    import searchBar from '../../../components/searchBar/index.vue';
    export default {
        components:{
            searchBar
        },
    }
</script>

<style>
    .content{
        padding: 0 10px;
    }
    .content-row{
        display: flex;
        align-items: center;
        justify-content: space-between;
        border-bottom: 1px solid #EDEAF4;
        padding: 10px 0;
    }
</style>

 hive-app/pages/workbench/followRecords.vue

@@ -27,9 +27,8 @@
            <view class="mt-10">
                <text>截图服务了杨姐,她的面部比较干燥暗沉色斑较多,约下次来做一个面部护理</text>
            </view>
            <view class="mt-10">
                <image class="content-img mr-10" src="../../static/images/banner.jpg"></image>
                <image class="content-img" src="../../static/images/banner.jpg"></image>
            <view class="mt-10 flex">
                <image v-for="(item,index) in imgList" @click="previewImg(item.imgurl)" class="content-img mr-10" :src="item.imgurl"></image>
            </view>
            <view class="flex align-center justify-between mt-5">
                <text>客户:杨依依</text>
@@ -77,8 +76,23 @@
                    state: 3,
                    name: '我的团队'
                }
            ],
            imgList:[
                {'imgurl':'../../static/images/banner.jpg'},
                {'imgurl':'../../static/images/product.jpg'}
            ]
          }  
        },
        methods:{
            // 预览图片
            previewImg(image) {
                let imgArr=[]
                imgArr[0]=image
                //预览图片
                uni.previewImage({
                    urls: imgArr
                })
            },
        }
    }
</script>

 hive-app/pages/workbench/index.vue

@@ -143,7 +143,7 @@
                    </navigator>
                </view>
                <view class="list-item">
                    <navigator url="./"  hover-class="none">
                    <navigator url="./check/index"  hover-class="none">
                        <image class="icon" src="../../static/images/warehouse2.png"></image>
                        <text>盘点</text>
                    </navigator>