| hive-app/App.vue | ●●●●● patch | view | raw | blame | history | |
| hive-app/common/styles/index.css | ●●●●● patch | view | raw | blame | history | |
| hive-app/pages.json | ●●●●● patch | view | raw | blame | history | |
| hive-app/pages/member/detail.vue | ●●●●● patch | view | raw | blame | history | |
| hive-app/pages/member/index.vue | ●●●●● patch | view | raw | blame | history | |
| hive-app/pages/member/membershipCard.vue | ●●●●● patch | view | raw | blame | history | |
| hive-app/pages/member/skinDetection.vue | ●●●●● patch | view | raw | blame | history | |
| hive-app/pages/member/skinDetectionDetail.vue | ●●●●● patch | view | raw | blame | history | |
| hive-app/pages/workbench/index.vue | ●●●●● patch | view | raw | blame | history | |
| hive-app/pages/workbench/orderList.vue | ●●●●● patch | view | raw | blame | history | |
| hive-app/pages/workbench/selectProduct.vue | ●●●●● patch | view | raw | blame | history | |
| hive-app/pages/workbench/submitSucceed.vue | ●●●●● patch | view | raw | blame | history |
hive-app/App.vue
@@ -16,5 +16,5 @@ /*每个页面公共css */ @import url("./common/styles/index"); @import url("./static/iconfont/iconfont.css"); @import url("//at.alicdn.com/t/font_2263696_ummufxkzv9r.css"); @import url("//at.alicdn.com/t/font_2263696_7v5ezq1ygk8.css"); </style> hive-app/common/styles/index.css
@@ -92,7 +92,7 @@ color: #FFFFFF; } .gray{ color: #8c9fad; color: #a5abaf; } .light-gray{ color: #a7a7a7; @@ -190,15 +190,26 @@ } /* 蓝色圆形加减按钮 */ .blue-btn-circle{ width: 20px; height: 20px; display: flex; align-items: center; justify-content: center; height: 24px; width: 24px; line-height: 24px; box-sizing: border-box; font-size: 14px!important; border-radius: 50%!important; background: #518EFF; border-radius: 4px; color: #FFFFFF; } .blue-outline-btn-circle{ height: 24px; width: 24px; line-height: 22px; box-sizing: border-box; font-size: 12px!important; border-radius: 50%; border: 2px solid #518EFF; color: #518EFF; } /* 固定底部 */ .sticky-footer{ hive-app/pages.json
@@ -51,6 +51,28 @@ } }, { "path": "pages/member/skinDetection", "style": { "navigationBarTitleText": "皮肤检测", "navigationBarBackgroundColor":"#518EFF", "navigationBarTextStyle":"white", "app-plus":{ "scrollIndicator": "none" } } }, { "path": "pages/member/skinDetectionDetail", "style": { "navigationBarTitleText": "皮肤检测详情", "navigationBarBackgroundColor":"#FFFFFF", "navigationBarTextStyle":"black", "app-plus":{ "scrollIndicator": "none" } } }, { "path": "pages/mine/index", "style": { "transparentTitle": "always", hive-app/pages/member/detail.vue
@@ -54,8 +54,10 @@ </navigator> </view> <view class="detail-item"> <image class="detail-icon" mode="aspectFit" src="../../static/images/member-detail4.png"></image> <text class="font-14 mt-5">皮肤监测</text> <navigator url="./skinDetection" hover-class="none" > <image class="detail-icon" mode="aspectFit" src="../../static/images/member-detail4.png"></image> <text class="font-14 mt-5">皮肤检测</text> </navigator> </view> <view class="detail-item"> <image class="detail-icon" mode="aspectFit" src="../../static/images/member-detail5.png"></image> @@ -69,6 +71,12 @@ <image class="detail-icon" mode="aspectFit" src="../../static/images/member-detail7.png"></image> <text class="font-14 mt-5">跟进记录</text> </view> <view class="detail-item"> <navigator url="./membershipCard" hover-class="none" > <image class="detail-icon" mode="aspectFit" src="../../static/images/member-detail3.png"></image> <text class="font-14 mt-5">会员档案</text> </navigator> </view> </view> </view> <view class="sticky-footer flex justify-between"> hive-app/pages/member/index.vue
@@ -32,7 +32,7 @@ </view> <view class="quick-entry"> <navigator url="./editMember" hover-class="navigator-hover"> <text class="iconfont iconjiahao"></text> <text class="iconfont iconjia"></text> </navigator> </view> </view> hive-app/pages/member/membershipCard.vue
@@ -1,16 +1,31 @@ <template> <view class="container"> <view class="card-item"> <view class="card-header"> <view class="list-item"> <view class="list-header"> <text class="name">会员卡</text> <text>NO 23564</text> </view> <view class="card-content"> <view class="list-content"> <text> ¥ 5656789 ¥<text class="ml-10">565,6789</text> </text> </view> <view class="card-footer"> <view class="list-footer"> <text>赠送金额 ¥ 5656</text> <text>有效期：2025-10-20</text> </view> </view> <view class="list-item"> <view class="list-header"> <text class="name">会员卡</text> <text>NO 23564</text> </view> <view class="list-content"> <text> ¥<text class="ml-10">565,6789</text> </text> </view> <view class="list-footer"> <text>赠送金额 ¥ 5656</text> <text>有效期：2025-10-20</text> </view> @@ -38,26 +53,30 @@ .container{ padding: 10px 10px; } .card-item{ .list-item{ background: #F0AD4E; color: #FFFFFF; font-size: 14px; padding: 12px 15px; border-radius: 4px; margin-bottom: 10px; } .card-header{ .list-header{ display: flex; justify-content: space-between; align-items: center; } .card-header .name{ font-size: 22px; .list-header .name{ font-size: 18px; font-weight: bold; } .card-content{ .list-content{ padding: 20px 0; font-size: 30px; } .card-footer{ .list-footer{ display: flex; justify-content: space-between; align-items: center; } </style> hive-app/pages/member/skinDetection.vue
New file @@ -0,0 +1,86 @@ <template> <view class="container"> <view class="list-item"> <navigator url="./skinDetectionDetail?title=皮肤色斑检测分析" hover-class=""> <view class="list-header"> <text class="name">皮肤色斑检测分析</text> <text class="gray">2020-12-08 10:12:48</text> </view> <view class="list-content"> <view class="flex justify-between"> <text>检测师</text> <text class="gray">李广</text> </view> <view class="flex justify-between"> <text>检测门店</text> <text class="gray">梅溪湖店</text> </view> </view> </navigator> </view> <view class="list-item"> <navigator url="./skinDetectionDetail?title=皮肤色斑检测分析" hover-class=""> <view class="list-header"> <text class="name">皮肤色斑检测分析</text> <text class="gray">2020-12-08 10:12:48</text> </view> <view class="list-content"> <view class="flex justify-between"> <text>检测师</text> <text class="gray">李广</text> </view> <view class="flex justify-between"> <text>检测门店</text> <text class="gray">梅溪湖店</text> </view> </view> </navigator> </view> </view> </template> <script> export default{ components:{ }, data(){ return { } }, methods:{ } } </script> <style> page{ background: #F2f2f2; } .container{ padding: 15px 10px; } .list-item{ background: #FFFFFF; color: #3a3f3f; font-size: 14px; padding: 12px 15px; border-radius: 4px; margin-bottom: 10px; } .list-header{ display: flex; justify-content: space-between; align-items: center; } .list-header .name{ font-size: 15px; font-weight: bold; } .list-content{ padding-top: 10px; line-height: 26px; } </style> hive-app/pages/member/skinDetectionDetail.vue
New file @@ -0,0 +1,15 @@ <template> </template> <script> export default{ onLoad(options) { uni.setNavigationBarTitle({ title: options.title }); } } </script> <style> </style> hive-app/pages/workbench/index.vue
@@ -8,12 +8,12 @@ <text class="font-18 dark-gray">HIVE</text> <view> <text class="icon gray iconfont iconsousuo mr-15"></text> <text class="icon gray iconfont iconjiahao" @click.stop="isShow=!isShow"></text> <text class="icon gray iconfont iconjia" @click.stop="isShow=!isShow"></text> </view> </view> <popover class="popup-content" v-show="isShow"> <view class="popup-item flex align-center"> <text class="icon white iconfont iconjiahao mr-5"></text> <text class="icon white iconfont iconjia mr-5"></text> <text class="white font-14 popup-content-text">新增会员</text> </view> <view class="popup-item flex align-center"> hive-app/pages/workbench/orderList.vue
@@ -13,9 +13,8 @@ color: '#abb1cc', activeColor: '#518EFF', underLineColor: '#518EFF', underLineHeight: 8, underLineHeight: 4, fontSize: '30', itemWidth: 100, underLineWidth: 60, }" /> hive-app/pages/workbench/selectProduct.vue
@@ -20,9 +20,9 @@ <view class="flex justify-between align-center mt-15"> <text class="flex justify-start font-12 red mt-10">￥400.00</text> <view class="flex align-center justify-end mt-10"> <text class="blue-btn-circle mr-10">-</text> <text class="font-12">1</text> <text class="blue-btn-circle ml-10 mr-0">+</text> <text class="iconfont iconjian blue-outline-btn-circle mr-10"></text> <text>1</text> <text class="iconfont iconjia blue-btn-circle ml-10"></text> </view> </view> </view> @@ -35,9 +35,9 @@ <view class="flex justify-between align-center mt-15"> <text class="flex justify-start font-12 red mt-10">￥400.00</text> <view class="flex align-center justify-end mt-10"> <text class="blue-btn-circle mr-10">-</text> <text class="font-12">1</text> <text class="blue-btn-circle ml-10 mr-0">+</text> <text class="iconfont iconjian blue-outline-btn-circle mr-10"></text> <text>1</text> <text class="iconfont iconjia blue-btn-circle ml-10"></text> </view> </view> </view> @@ -46,7 +46,7 @@ </view> <view class="shopping flex align-center justify-between"> <view class="flex align-center"> <view class="shopping-icon iconfont icongouwuche gray" @click="openShoppingCart"> <view class="shopping-icon iconfont iconicongouwuche gray" @click="openShoppingCart"> <view class="shopping-icon-num flex align-center justify-center"> <text class="font-10">19</text> </view> @@ -60,13 +60,34 @@ <view class="popup-header flex justify-between"> <text class="font-16 blue">已选商品</text> <view class="flex align-center"> <text class="icon iconfont iconlajixiang_huaban1 gray"></text> <view class="popup-header-icon iconfont iconlajixiang_huaban1 gray"></view> <text class="font-16 gray">清空</text> </view> <view> <image src="../../static/images/product.jpg"></image> <view></view> </view> <view class="popup-row flex align-center"> <image class="popup-row-img" mode="aspectFill" src="../../static/images/product.jpg"></image> <view class="popup-row-right"> <text class="flex justify-start font-12">肽妍氨基酸平衡基础洁面乳</text> <view class="flex justify-between align-center"> <text class="flex justify-start font-12 red">￥400.00</text> <view class="flex align-center justify-end"> <text class="iconfont iconjian blue-outline-btn-circle mr-10 center"></text> <text>1</text> <text class="iconfont iconjia blue-btn-circle ml-10 center"></text> </view> </view> </view> </view> <view class="popup-end flex align-center justify-between"> <view class="flex align-center"> <view class="shopping-icon iconfont iconicongouwuche gray" @click="openShoppingCart"> <view class="shopping-icon-num flex align-center justify-center"> <text class="font-10">19</text> </view> </view> <text class="font-14 blue ml-10">¥110.00</text> </view> <button class="blue-btn btn mr-0" @click="linkTo('./confirmOrder')">提交订单</button> </view> </view> </uni-popup> @@ -152,7 +173,7 @@ height: 81px; } .shopping{ padding: 20px 10px; padding: 10px 10px; box-shadow:0 6px 100px rgba(237,234,244,1); } .shopping-icon{ @@ -171,7 +192,8 @@ } .btn{ border-radius: 20px; line-height: 30px; line-height: 34px; padding: 0 24px; font-size: 14px; } .popup-content{ @@ -180,11 +202,26 @@ border-top-right-radius: 8px; padding: 10px; } .icon{ font-size: 20px; } .popup-header{ padding: 0 5px 10px; border-bottom: 1px solid #EDEAF4; } .popup-header-icon{ width: 20px; height: 20px; } .popup-row{ border-bottom: 1px solid #EDEAF4; padding: 10px 5px; } .popup-row-img{ width: 40px; height: 40px; } .popup-row-right{ width: 100%; } .popup-end{ padding: 10px 0; } </style> hive-app/pages/workbench/submitSucceed.vue
@@ -4,8 +4,8 @@ <image class="img" mode="aspectFit" src="../../static/images/succeed.png"></image> <text class="font-16">提交成功请到前台付款</text> <view class="sticky-footer"> <button class="blue-btn btn mt-20">查看详情</button> <button class="white-btn btn mt-20">返回首页</button> <button class="blue-btn btn">查看详情</button> <button class="white-btn btn mt-15">返回首页</button> </view> </view> </template>
