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

li-guang

2020-12-25 58f944e74c0fc663ee78f962eff53395a09220da

 hive-app/pages/workbench/confirmOrder.vue

@@ -1,7 +1,7 @@
<template>
   <!-- 确认订单 -->
   <view class="container">
      <view class="header flex align-center mt-10">
      <view class="header flex align-center">
         <image class="header-img" src="../../static/images/head-img.jpg"></image>
         <view class="ml-10">
            <view class="font-16">
@@ -12,16 +12,16 @@
         </view>
      </view>
      <view class="content flex flex-v mt-10">
         <view class="content-row flex justify-between align-center flex-1" v-for="item in 4">
         <view class="content-row flex justify-between align-center flex-1" v-for="item in list">
            <view class="flex align-center">
               <image class="centent-img" mode="aspectFill" src="../../static/images/product.jpg"></image>
               <view class="flex flex-v font-12 ml-10">
                  <text>[项目] 肽妍氨基酸平衡基础洁面乳</text>
                  <text class="gray">×1</text>
                  <text>{{item.name}}</text>
                  <text class="gray">×{{item.num}}</text>
               </view>
            </view>
            <view>
               <text>￥400.00</text>
               <text>￥{{item.price}}</text>
            </view>
         </view>
         <view class="content-row flex justify-between">
@@ -41,7 +41,12 @@
<script>
   export default{
      data(){
         return{}
         return{
            list: []
         }
      },
      onLoad(options) {
         this.list = JSON.parse(decodeURIComponent(options.list))
      },
      methods:{
      }
@@ -49,8 +54,17 @@
</script>

<style>
   page{
      background: #F6F6F8;
   }
   .container{
      padding: 10px;
      /* padding: 10px; */
   }
   .header{
      border: 1px solid #EDEAF4;
      box-shadow:0 6px 6px rgba(237,234,244,0.5);
      padding: 10px 10px;
      background: #FFFFFF;
   }
   .header-img{
      width: 48px;
@@ -62,21 +76,17 @@
      height: 36px;
      border-radius: 4px;
   }
   .header{
      border: 1px solid #EDEAF4;
      box-shadow:0 6px 6px rgba(237,234,244,0.5);
      border-radius: 4px;
      padding: 10px 10px;
   }
   .content{
      background: #FFFFFF;
      border: 1px solid #EDEAF4;
      box-shadow:0 6px 6px rgba(237,234,244,0.5);
      border-radius: 4px;
      padding: 10px;
      margin: 10px 10px;
      padding: 0 10px 0;
   }
   .content-row{
      border-bottom: 1px solid #EDEAF4;
      padding: 10px 5px;
      padding: 14px 5px;
   }
   .content-row:nth-last-child(1){
      border: 0;