yshop3.0-alpha版本

src/views/activity/bargain/form.vue

@@ -14,7 +14,7 @@
       <el-form-item label="活动开始时间">
         <template>
           <el-date-picker
-            v-model="form.startTimeDate"
+            v-model="form.startTime"
             type="datetime"
             placeholder="选择日期时间"
           />
@@ -23,7 +23,7 @@
       <el-form-item label="活动结束时间">
         <template>
           <el-date-picker
-            v-model="form.endTimeDate"
+            v-model="form.stopTime"
             type="datetime"
             placeholder="选择日期时间"
           />

src/views/activity/combination/form.vue

@@ -13,7 +13,7 @@
       <el-form-item label="拼团开始时间">
         <template>
           <el-date-picker
-            v-model="form.startTimeDate"
+            v-model="form.startTime"
             type="datetime"
             placeholder="选择日期时间"
           />
@@ -22,7 +22,7 @@
       <el-form-item label="拼团结束时间">
         <template>
           <el-date-picker
-            v-model="form.endTimeDate"
+            v-model="form.stopTime"
             type="datetime"
             placeholder="选择日期时间"
           />

src/views/activity/coupon/form.vue

@@ -5,16 +5,16 @@
         <el-input v-model="form.title" style="width: 300px;" />
       </el-form-item>
       <el-form-item label="优惠券面值">
-        <el-input v-model="form.couponPrice" style="width: 300px;" />
+        <el-input-number v-model="form.couponPrice" style="width: 300px;" />
       </el-form-item>
       <el-form-item label="优惠券最低消费">
-        <el-input v-model="form.useMinPrice" style="width: 300px;" />
+        <el-input-number v-model="form.useMinPrice" style="width: 300px;" />
       </el-form-item>
       <el-form-item label="优惠券有效期限(天)">
-        <el-input v-model="form.couponTime" style="width: 300px;" />
+        <el-input-number v-model="form.couponTime" style="width: 300px;" />
       </el-form-item>
       <el-form-item label="排序">
-        <el-input v-model="form.sort" style="width: 300px;" />
+        <el-input-number v-model="form.sort" style="width: 300px;" />
       </el-form-item>
       <el-form-item label="状态">
         <el-radio v-model="form.status" :label="1">开启</el-radio>

src/views/activity/coupon/index.vue

@@ -39,7 +39,7 @@
       </el-table-column>
       <el-table-column prop="addTime" label="创建时间">
         <template slot-scope="scope">
-          <span>{{ formatTime(scope.row.addTime) }}</span>
+          <span>{{ scope.row.createTime }}</span>
         </template>
       </el-table-column>
       <el-table-column v-if="checkPermission(['admin','YXSTORECOUPON_ALL','YXSTORECOUPON_EDIT','YXSTORECOUPON_DELETE'])" width="200" label="操作" align="center">

src/views/activity/couponissue/form.vue

@@ -10,7 +10,7 @@
       <el-form-item label="领取开启时间">
         <template>
           <el-date-picker
-            v-model="form.startTimeDate"
+            v-model="form.startTime"
             type="datetime"
             placeholder="选择日期时间"
           />
@@ -19,7 +19,7 @@
       <el-form-item label="券领结束时间">
         <template>
           <el-date-picker
-            v-model="form.endTimeDate"
+            v-model="form.endTime"
             type="datetime"
             placeholder="选择日期时间"
           />

src/views/activity/extract/form.vue

@@ -5,7 +5,7 @@
         <el-input v-model="form.realName" style="width: 370px;" />
       </el-form-item>
       <el-form-item label="提现金额">
-        <el-input v-model="form.extractPrice" style="width: 370px;" />
+        <el-input-number v-model="form.extractPrice" style="width: 370px;" />
       </el-form-item>
       <el-form-item label="审核状态">
         <el-radio v-model="form.status" :label="-1">无效</el-radio>

src/views/activity/extract/index.vue

@@ -37,7 +37,7 @@
       </el-table-column>
       <el-table-column prop="addTime" label="添加时间">
         <template slot-scope="scope">
-          <span>{{ formatTimeTwo(scope.row.addTime) }}</span>
+          <span>{{ formatTimeTwo(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column prop="status" label="审核状态">

src/views/activity/seckill/form.vue

@@ -13,7 +13,7 @@
       <el-form-item label="秒杀开始时间">
         <template>
           <el-date-picker
-            v-model="form.startTimeDate"
+            v-model="form.startTime"
             type="date"
             placeholder="选择日期时间"
           />
@@ -22,7 +22,7 @@
       <el-form-item label="秒杀结束时间">
         <template>
           <el-date-picker
-            v-model="form.endTimeDate"
+            v-model="form.stopTime"
             type="date"
             placeholder="选择日期时间"
           />

src/views/activity/seckill/index.vue

@@ -155,8 +155,8 @@ export default {
         unitName: data.unitName,
         postage: data.postage,
         description: data.description,
-        startTimeDate: new Date(data.startTimeDate),
-        endTimeDate: new Date(data.endTimeDate),
+        startTime: data.startTime,
+        stopTime: data.stopTime,
         addTime: data.addTime,
         status: data.status,
         isPostage: data.isPostage,