Merge remote-tracking branch 'origin/branch' into branch

chenbiao
2 parents 48ab2c65 9abdc179
Showing 2 changed files with 66 additions and 98 deletions
pages/businessCard/buyCard.vue
uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue
 <template>
     <view>
-
         <uni-section title="2小时(时长券)" type="line" >
             <uni-card padding="0" spacing="0">
                 <!--<template v-slot:cover>-->
@@ -55,45 +54,67 @@
                                   @close="dialogClose"></uni-popup-dialog>
             </uni-popup>
         </view>
-        <view class="example">
+        <view class="formWrap">
             <uni-forms ref="baseForm" :modelValue="baseFormData" >
                 <uni-forms-item label="车牌号码" required>
                     <uni-easyinput v-model="baseFormData.name" placeholder="请输入车牌号码" />
                 </uni-forms-item>
-                <uni-section :title="'日期时间用法：' + datetimesingle" type="line"></uni-section>
-                <view class="example-body">
-                    <uni-datetime-picker type="datetime" v-model="datetimesingle" @change="changeLog" />
-                </view>
+
+                <uni-forms-item label="生效时间">
+                    <uni-datetime-picker :clear-icon="false" type="datetime" return-type="timestamp" v-model="baseFormData.datetimesingle"/>
+                </uni-forms-item>
+                <uni-forms-item label="失效时间">
+                    <uni-datetime-picker :clear-icon="false" type="datetime" return-type="timestamp" v-model="baseFormData.datetimesingle"/>
+                </uni-forms-item>
             </uni-forms>
         </view>
+        <uni-section title="24小时(包天券)" type="line" >
+            <uni-card padding="0" spacing="0">
+                <!--<template v-slot:cover>-->
+                <!--<view class="custom-cover">-->
+                <!--<image class="cover-image" mode="aspectFill" :src="cover">-->
+                <!--</image>-->
+                <!--<view class="cover-content">-->
+                <!--<text class="uni-subtitle uni-white">今日新闻热点</text>-->
+                <!--</view>-->
+                <!--</view>-->
+                <!--</template>-->
+                <uni-list>
+                    <uni-list-item title="适应车场"   rightText="万达商业广场"  >
+                        <text></text>
+                    </uni-list-item>
+                    <uni-list-item title="价格：¥5/张" rightText="商户库存：0张"></uni-list-item>
+                </uni-list>
+            </uni-card>
+        </uni-section>
-        <!--<view class="uni-list">-->
-            <!--<view class="uni-list-cell">-->
-                <!--<view class="uni-list-cell-left">-->
-                    <!--生效时间-->
-                <!--</view>-->
-                <!--<view class="uni-list-cell-db">-->
-                    <!--<picker mode="date" :value="date" :start="startDate" :end="endDate" @change="bindStartDateChange">-->
-                        <!--<view class="uni-input">{{benginDate}}</view>-->
-                    <!--</picker>-->
-                <!--</view>-->
-            <!--</view>-->
-        <!--</view>-->
-        <!--<view class="uni-list">-->
-            <!--<view class="uni-list-cell">-->
-                <!--<view class="uni-list-cell-left">-->
-                    <!--失效时间-->
-                <!--</view>-->
-                <!--<view class="uni-list-cell-db">-->
-                    <!--<picker mode="date" :value="date" :start="startDate" :end="endDate" @change="bindEndDateChange">-->
-                        <!--<view class="uni-input">{{overDate}}</view>-->
-                    <!--</picker>-->
-                <!--</view>-->
-            <!--</view>-->
-        <!--</view>-->
+        <uni-list >
+            <uni-list-item  title="购买数量" >
+                <template v-slot:footer>
+                    <uni-number-box v-model="vModelValue" @blur="blur" @focus="focus" @change="changeValue" />
+                </template>
+            </uni-list-item>
+            <uni-list-item  title="应付金额"  >
+                <template v-slot:footer>
+                    <text style="color: red">¥25.00元</text>
+                </template>
+            </uni-list-item>
+            <uni-list-item  title="支付方式" rightText="商户余额" />
+            <uni-list-item  note="请认真核对购买信息,卡券一经购买概不支持退款" >
+                <template v-slot:header>
+                    <text style="color: red">温馨提示</text>
+                </template>
+            </uni-list-item>
+        </uni-list>
+
+        <view class="uni-padding-wrap uni-common-mt">
+            <button type="primary" @click="dialogToggle('warn')">立即购买</button>
+        </view>
+
+
     </view>
 </template>
@@ -154,6 +175,12 @@ export default {
     //   .discValue);
     // GetbillQueryInfo(carnum, orderId, parkCode, cardNo, couponType, disValue) {
   },
+  mounted() {
+    setTimeout(() => {
+      this.baseFormData.datetimesingle = Date.now() - 2*24*3600*1000
+      this.datetimesingle = Date.now() - 2*24*3600*1000
+    },500)
+  },
   computed: {
     startDate() {
       return this.getDate('start');
@@ -226,7 +253,7 @@ export default {
 </script>
 <style lang="scss" scoped>
-    .example {
+    .formWrap {
         padding: 15px;
         background-color: #fff;
     }
@@ -234,71 +261,8 @@ export default {
     /deep/ .uni-section{
         padding-bottom: 10px;
     }
-    .rechargeWrap{
-        position: relative;
-        .rechargeArrow{
-            position: absolute;
-            right: 10px;
-            top: 30px;
-            font-size: 20px;
-            color: #999;
-        }
-    }
-    .recordCon {
-        padding-right: 35px;
-        color: #999;
-        display: flex;
-        justify-content: space-between;
-    }
-
-    .container {
-        overflow: hidden;
-    }
-
-    .custom-cover {
-        flex: 1;
-        flex-direction: row;
-        position: relative;
-    }
-
-    .cover-content {
-        position: absolute;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        height: 40px;
-        background-color: rgba($color: #000000, $alpha: 0.4);
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        padding-left: 15px;
-        font-size: 14px;
-        color: #fff;
-    }
+    /*/deep/ .uni-datetime-picker-btn-text{*/
+        /*display: none;*/
+    /*}*/
-    .card-actions {
-        display: flex;
-        flex-direction: row;
-        justify-content: space-around;
-        align-items: center;
-        height: 45px;
-        border-top: 1px #eee solid;
-    }
-    .card-actions-item {
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-    }
-    .card-actions-item-text {
-        font-size: 12px;
-        color: #666;
-        margin-left: 5px;
-    }
-    .cover-image {
-        flex: 1;
-        height: 150px;
-    }
-    .no-border {
-        border-width: 0;
-    }
 </style>
@@ -64,8 +64,12 @@
 				<text v-if="!hideSecond" class="uni-datetime-picker-sign sign-right">:</text>
 			</view>
 			<view class="uni-datetime-picker-btn">
+				<!--<view @click="clearTime">-->
+					<!--<text class="uni-datetime-picker-btn-text">{{clearText}}</text>-->
+				<!--</view>-->
+
 				<view @click="clearTime">
-					<text class="uni-datetime-picker-btn-text">{{clearText}}</text>
+					<text class="uni-datetime-picker-btn-text"></text>
 				</view>
 				<view class="uni-datetime-picker-btn-group">
 					<view class="uni-datetime-picker-cancel" @click="tiggerTimePicker">