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/productDetail/project.vue | 70 ++++++++++++++++++++++-------------
1 files changed, 44 insertions(+), 26 deletions(-)
diff --git a/hive-app/pages/workbench/productDetail/project.vue b/hive-app/pages/workbench/productDetail/project.vue
index f2dafac..3ee33b3 100644
--- a/hive-app/pages/workbench/productDetail/project.vue
+++ b/hive-app/pages/workbench/productDetail/project.vue
@@ -1,43 +1,61 @@
<template>
- <!-- 商品（项目）-->
- <view class="content">
- <view class="content-title">
- <text>配料表</text>
+ <!-- 项目-->
+ <view>
+ <view class="list">
+ <view class="list-item">
+ <text>商品编码</text>
+ <text>{{productInfo.goodsNo}}</text>
+ </view>
+ <view class="list-item">
+ <text>商品分类</text>
+ <text>{{productInfo.goodsType}}</text>
+ </view>
+ <view class="list-item">
+ <text>每人限购次数</text>
+ <text>{{productInfo.limitBuyCnt || '-'}}</text>
+ </view>
+ <view class="list-item">
+ <text>最大销售数量</text>
+ <text>{{productInfo.maxSaleCnt || '-'}}</text>
+ </view>
</view>
- <view class="content-row flex justify-between">
- <text>小气泡1号溶液</text>
- <text>23ml</text>
- </view>
- <view class="content-row flex justify-between">
- <text>皮肤肌底修护液 (10%)</text>
- <text>23ml</text>
- </view>
- <view class="content-row flex justify-between">
- <text>皮肤肌底修护液 (10%)</text>
- <text>23ml</text>
+ <view class="list">
+ <view class="title">
+ <text>配料表</text>
+ </view>
+ <view class="list-item" v-for="item in productInfo.assembleProj">
+ <text>{{item.goodsName}}</text>
+ <text>{{item.volume}}{{item.measure}}</text>
+ </view>
</view>
</view>
</template>
<script>
+ export default{
+ props:{
+ productInfo: {
+ default: {}
+ }
+ }
+ }
</script>
<style>
- .content{
- text-align: center;
+ .list{
background: #FFFFFF;
padding: 0 10px;
- border-radius: 4px;
- box-shadow:0 -6px 6px rgba(237,234,244,0.5);
+ font-size: 14px;
}
- .content-title{
- padding: 10px 0;
+ .list .title{
+ text-align: center;
+ padding: 20px 0 8px;
+ font-size: 16px;
}
- .content-row{
+ .list-item{
+ display: flex;
+ justify-content: space-between;
border-bottom: 1px solid #EDEAF4;
- padding: 10px 0;
- }
- .content-row:nth-last-child(1){
- border: 0;
+ padding: 12px 0;
}
</style>
--
Gitblit v1.9.1