From 4300b5c714bb7e09f53f7d722c953dec9c809d8e Mon Sep 17 00:00:00 2001
From: queenwuli <942534046@qq.com>
Date: Mon, 04 Jan 2021 17:08:59 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/jyyforjava/hive-app into master
---
hive-app/pages/workbench/confirmReceive.vue | 95 +++++++++++++++
hive-app/App.vue | 2
hive-app/pages.json | 33 +++++
hive-app/pages/workbench/index.vue | 2
hive-app/pages/workbench/receive.vue | 134 ++++++++++++++++++++++
hive-app/pages/login/forgetPassword.vue | 19 ++-
hive-app/pages/login/newPassword.vue | 5
hive-app/pages/workbench/receiveRecord.vue | 67 +++++++++++
8 files changed, 344 insertions(+), 13 deletions(-)
diff --git a/hive-app/App.vue b/hive-app/App.vue
index ea625a7..1742010 100644
--- a/hive-app/App.vue
+++ b/hive-app/App.vue
@@ -20,5 +20,5 @@
/*每个页面公共css */
@import url("./common/styles/index");
@import url("./static/iconfont/iconfont.css");
-@import url("//at.alicdn.com/t/font_2263696_bah4ajyfqa6.css");
+@import url("//at.alicdn.com/t/font_2263696_nckijvt876.css");
</style>
diff --git a/hive-app/pages.json b/hive-app/pages.json
index e8025af..5037f71 100644
--- a/hive-app/pages.json
+++ b/hive-app/pages.json
@@ -542,6 +542,39 @@
"scrollIndicator": "none"
}
}
+ },
+ {
+ "path": "pages/workbench/receive",
+ "style": {
+ "navigationBarTitleText": "领用",
+ "navigationBarBackgroundColor":"#FFFFFF",
+ "navigationBarTextStyle":"black",
+ "app-plus":{
+ "scrollIndicator": "none"
+ }
+ }
+ },
+ {
+ "path": "pages/workbench/receiveRecord",
+ "style": {
+ "navigationBarTitleText": "产品领用记录",
+ "navigationBarBackgroundColor":"#FFFFFF",
+ "navigationBarTextStyle":"black",
+ "app-plus":{
+ "scrollIndicator": "none"
+ }
+ }
+ },
+ {
+ "path": "pages/workbench/confirmReceive",
+ "style": {
+ "navigationBarTitleText": "确认领取",
+ "navigationBarBackgroundColor":"#FFFFFF",
+ "navigationBarTextStyle":"black",
+ "app-plus":{
+ "scrollIndicator": "none"
+ }
+ }
}
],
"globalStyle": {
diff --git a/hive-app/pages/login/forgetPassword.vue b/hive-app/pages/login/forgetPassword.vue
index d2b99f7..97be2bf 100644
--- a/hive-app/pages/login/forgetPassword.vue
+++ b/hive-app/pages/login/forgetPassword.vue
@@ -3,12 +3,14 @@
<view>
<view class="input-box">
<input placeholder="请输入手机号码" placeholder-class="placeholder" class="input-group-row"/>
- <view class="flex mt-10">
- <input placeholder="请输入验证码" placeholder-class="placeholder" class="input-group-row flex-1"/>
- <button class="btn blue-btn">获取验证码</button>
+ <view class="flex mt-10 ">
+ <input placeholder="请输入验证码" placeholder-class="placeholder" class="input-group-row flex-1 mr-10"/>
+ <navigator url="" hover-class="none" class="btn-box">
+ <button class="btn blue-btn">获取验证码</button>
+ </navigator>
</view>
</view>
- <navigator url="./newPassword" hover-class="none" class="next">
+ <navigator url="./newPassword" hover-class="none" class="sticky-footer">
<button class="blue-btn">下一步</button>
</navigator>
</view>
@@ -21,10 +23,13 @@
.input-box{
margin: 40px 20px;
}
+ .btn-box{
+ display: flex;
+ align-items: flex-end;
+ }
.btn{
margin: 0;
- }
- .next{
- margin: 60px 20px;
+ font-size: 12px;
+ line-height: 36px;
}
</style>
diff --git a/hive-app/pages/login/newPassword.vue b/hive-app/pages/login/newPassword.vue
index 1a61713..887df2a 100644
--- a/hive-app/pages/login/newPassword.vue
+++ b/hive-app/pages/login/newPassword.vue
@@ -5,7 +5,7 @@
<input placeholder="请输入新密码" placeholder-class="placeholder" class="input-group-row"/>
<input placeholder="请确认密码" placeholder-class="placeholder" class="input-group-row"/>
</view>
- <navigator url="./" hover-class="none" class="next">
+ <navigator url="./" hover-class="none" class="sticky-footer">
<button class="blue-btn">提交</button>
</navigator>
</view>
@@ -17,8 +17,5 @@
<style>
.input-box{
margin: 40px 20px;
- }
- .next{
- margin: 60px 20px;
}
</style>
diff --git a/hive-app/pages/workbench/confirmReceive.vue b/hive-app/pages/workbench/confirmReceive.vue
new file mode 100644
index 0000000..64cb9bb
--- /dev/null
+++ b/hive-app/pages/workbench/confirmReceive.vue
@@ -0,0 +1,95 @@
+<template>
+ <!-- 确认领取 -->
+ <view>
+ <navigator class="list-item">
+ <view class="list-header">
+ <view class="flex align-center">
+ <image class="icon" src="../../static/images/order-icon1.png"></image>
+ <text>六女士</text>
+ </view>
+ <text class="gray">2020-12-12 19:06:08</text>
+ </view>
+ <view class="list-content">
+ <image class="icon" src="../../static/images/order-icon2.png"></image>
+ <view class="flex-1">
+ <view class="flex align-center justify-between">
+ <view>
+ <text>肽妍氨基酸平衡基础洁面乳</text>
+ <text class="ml-5">x6</text>
+ </view>
+ <view>
+ <text class="font-10 gray mr-5">已领 1</text>
+ <text class="iconfont iconjian blue-btn-circle mr-5"></text>
+ <text>1</text>
+ <text class="iconfont iconjia blue-btn-circle ml-5"></text>
+ </view>
+ </view>
+ <view class="flex justify-between mt-10">
+ <view>
+ <text>水光面膜</text>
+ <text class="ml-15">x6</text>
+ </view>
+ <view>
+ <text class="font-10 gray mr-5">已领 2</text>
+ <text class="iconfont iconjian blue-btn-circle mr-5"></text>
+ <text>1</text>
+ <text class="iconfont iconjia blue-btn-circle ml-5"></text>
+ </view>
+ </view>
+ </view>
+ </view>
+ <view class="flex align-center">
+ <text class="iconfont iconbeizhu icon gray"></text>
+ <text class="font-12">备注</text>
+ </view>
+ <textarea placeholder="请输入" placeholder-class="placeholder" class="textarea"/>
+ </navigator>
+ </view>
+</template>
+
+<script>
+</script>
+
+<style>
+ .list-item{
+ background: #FFFFFF;
+ border-radius: 4px;
+ margin: 10px;
+ color: #3a3f3f;
+ padding: 0 10px;
+ }
+ .list-header{
+ display: flex;
+ justify-content: space-between;
+ padding: 12px 0;
+ font-size: 13px;
+ border-bottom: 1px solid #EDEAF4;
+ }
+ .list-content{
+ display: flex;
+ justify-content: space-between;
+ align-items: flex-start;
+ padding: 12px 0;
+ font-size: 12px;
+ }
+ .icon{
+ width: 16px;
+ height: 16px;
+ vertical-align: sub;
+ margin-right: 10px;
+ }
+ .list-content .icon{
+ margin-top: 4px;
+ }
+ .textarea{
+ width: 100%;
+ height: auto;
+ word-wrap : break-word;
+ border: 1px solid #EDEAF4;
+ border-radius: 4px;
+ margin-top: 10px;
+ padding: 15px;
+ height: 110px;
+ box-sizing: border-box;
+ }
+</style>
diff --git a/hive-app/pages/workbench/index.vue b/hive-app/pages/workbench/index.vue
index 22f400c..da50250 100644
--- a/hive-app/pages/workbench/index.vue
+++ b/hive-app/pages/workbench/index.vue
@@ -68,7 +68,7 @@
</navigator>
</view>
<view class="list-item">
- <navigator url="./" hover-class="none">
+ <navigator url="./receive" hover-class="none">
<image class="icon" src="../../static/images/order4.png"></image>
<text>领用</text>
</navigator>
diff --git a/hive-app/pages/workbench/receive.vue b/hive-app/pages/workbench/receive.vue
new file mode 100644
index 0000000..9855f0e
--- /dev/null
+++ b/hive-app/pages/workbench/receive.vue
@@ -0,0 +1,134 @@
+<template>
+ <!-- 领用 -->
+ <view>
+ <h-tabs
+ class="tab"
+ :activeIndex="orderStatus"
+ :tabData="tabs"
+ :config="{
+ color: '#abb1cc',
+ activeColor: '#518EFF',
+ underLineColor: '#518EFF',
+ underLineHeight: 6,
+ fontSize: '28',
+ underLineWidth: 60,
+ }"
+ />
+ <view>
+ <navigator class="list-item">
+ <view class="list-header">
+ <view class="flex align-center">
+ <image class="icon" src="../../static/images/order-icon1.png"></image>
+ <text>六女士</text>
+ </view>
+ <text class="gray">2020-12-12 19:06:08</text>
+ </view>
+ <view class="list-content">
+ <image class="icon" src="../../static/images/order-icon2.png"></image>
+ <view class="flex-1">
+ <view class="flex justify-between">
+ <view>
+ <text>肽妍氨基酸平衡基础洁面乳</text>
+ <text class="ml-15">x6</text>
+ </view>
+ <text>已领 1/3</text>
+ </view>
+ <view class="flex justify-between mt-10">
+ <view>
+ <text>水光面膜</text>
+ <text class="ml-15">x6</text>
+ </view>
+ <text>已领 2/6</text>
+ </view>
+ <view class="flex justify-between mt-10">
+ <text class="gray">共计9件，已领3件</text>
+ <text class="blue">待领取</text>
+ </view>
+ </view>
+ </view>
+ <view class="list-footer">
+ <navigator class="blue-btn small-btn mr-10" url="./" hover-class="none">
+ <text>查看订单</text>
+ </navigator>
+ <navigator class="blue-btn small-btn mr-10" url="./receiveRecord" hover-class="none">
+ <text>领取记录</text>
+ </navigator>
+ <navigator class="blue-btn small-btn" url="./confirmReceive" hover-class="none">
+ <text>领取</text>
+ </navigator>
+ </view>
+ </navigator>
+ </view>
+ </view>
+</template>
+
+<script>
+ import HTabs from "@/components/liuyuno-tabs/liuyuno-tabs.vue";
+ export default {
+ components: {
+ HTabs
+ },
+ data() {
+ return {
+ tabs:[
+ {
+ state: 0,
+ name: '全部'
+ },
+ {
+ state: 1,
+ name: '待领取'
+ },
+ {
+ state: 2,
+ name: '已领取'
+ }
+ ],
+ list: []
+ }
+ }
+ }
+</script>
+
+<style>
+ page{
+ background: #F6F6F8;
+ }
+ .tab{
+ background: #FFFFFF;
+ border-bottom: 1px solid #EDEAF4;
+ }
+ .list-item{
+ background: #FFFFFF;
+ border-radius: 4px;
+ margin: 10px;
+ color: #3a3f3f;
+ padding: 0 10px;
+ }
+ .list-header{
+ display: flex;
+ justify-content: space-between;
+ padding: 12px 0;
+ font-size: 15px;
+ border-bottom: 1px solid #EDEAF4;
+ }
+ .list-content{
+ display: flex;
+ justify-content: space-between;
+ align-items: flex-start;
+ padding: 12px 0;
+ font-size: 14px;
+ }
+ .icon{
+ width: 16px;
+ height: 16px;
+ vertical-align: sub;
+ margin-right: 10px;
+ }
+ .list-footer{
+ display: flex;
+ justify-content: flex-end;
+ padding: 10px 0;
+ border-top: 1px solid #EDEAF4;
+ }
+</style>
diff --git a/hive-app/pages/workbench/receiveRecord.vue b/hive-app/pages/workbench/receiveRecord.vue
new file mode 100644
index 0000000..225768b
--- /dev/null
+++ b/hive-app/pages/workbench/receiveRecord.vue
@@ -0,0 +1,67 @@
+<template>
+ <!-- 领用记录 -->
+ <view>
+ <navigator class="list-item" v-for="item in 3">
+ <view class="list-header">
+ <text>操作员: 张三</text>
+ <text class="gray">2020-12-12 19:06:08</text>
+ </view>
+ <view class="list-content">
+ <view class="flex justify-between">
+ <text>肽妍氨基酸平衡基础洁面乳</text>
+ <text>x6</text>
+ </view>
+ <view class="flex justify-between mt-10">
+ <text>水光面膜</text>
+ <text class="ml-15">x6</text>
+ </view>
+ <text class="gray mt-10">备注: 阿萨德哈猴神大叔</text>
+ </view>
+ </navigator>
+ </view>
+</template>
+
+<script>
+</script>
+
+<style>
+ page{
+ background: #F6F6F8;
+ }
+ .tab{
+ background: #FFFFFF;
+ border-bottom: 1px solid #EDEAF4;
+ }
+ .list-item{
+ background: #FFFFFF;
+ border-radius: 4px;
+ margin: 10px;
+ color: #3a3f3f;
+ padding: 0 10px;
+ }
+ .list-header{
+ display: flex;
+ justify-content: space-between;
+ padding: 12px 0;
+ font-size: 15px;
+ border-bottom: 1px solid #EDEAF4;
+ }
+ .list-content{
+ display: flex;
+ flex-direction: column;
+ padding: 12px 0;
+ font-size: 14px;
+ }
+ .icon{
+ width: 16px;
+ height: 16px;
+ vertical-align: sub;
+ margin-right: 10px;
+ }
+ .list-footer{
+ display: flex;
+ justify-content: flex-end;
+ padding: 10px 0;
+ border-top: 1px solid #EDEAF4;
+ }
+</style>
--
Gitblit v1.9.1