Merge pull request 'chenlianjie' (#17) from chenlianjie into master

Reviewed-on: #17

src/api/order/orderInfo.js

@@ -79,7 +79,7 @@ export default {
   exportExcel(page) {
     // 导出
     return request({
-      url: `/${service_name}/${group_name}/exportWeb`,
+      url: `/${service_name}/${group_name}/getByPageExport`,
       method: 'post',
       data: page,
       responseType: 'blob'

src/views/dashboard/admin/index.scss

@@ -84,7 +84,10 @@
     font-size: 20px;
     font-weight: 600;
 }
-.page{
-    height:calc(100vh - 144px);
-    box-sizing: border-box;
-}
+.mt{
+    margin-top: 30px;
+}
+// .page{
+//     height:calc(100vh - 144px);
+//     box-sizing: border-box;
+// }

src/views/dashboard/admin/index.vue

@@ -104,14 +104,14 @@
             <span class="card-title">订单统计</span>
           </div>
           <div class="orderStatistics-card flex">
-            <div class="orderStatistics-card-left flex column js">
+            <div class="orderStatistics-card-left flex column jc">
               <div class="orderStatistics-card-left-item">
                 <div class="orderStatistics-card-left-item-title">本月订单总数</div>
                 <div class="orderStatistics-card-left-item-number">10000</div>
                 <div class="orderStatistics-card-left-item-title">10% 同比上周</div>
               </div>
-              <div class="orderStatistics-card-left-item">
-                <div class="orderStatistics-card-left-item-title">本月订单总数</div>
+              <div class="orderStatistics-card-left-item mt">
+                <div class="orderStatistics-card-left-item-title">本周订单数量</div>
                 <div class="orderStatistics-card-left-item-number">10000</div>
                 <div class="orderStatistics-card-left-item-title">10% 同比上周</div>
               </div>

src/views/order/orderList.vue

@@ -60,7 +60,7 @@
         </el-table-column>
         <el-table-column label="用户账号" min-width="120" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.acctId }}</span>
+            <span>{{ scope.row.customerPhone }}</span>
           </template>
         </el-table-column>
         <el-table-column label="订单金额" min-width="60" align="center">
@@ -283,7 +283,7 @@ export default {
       const searchParam = { ...this.page }
       searchParam.pageSize = endIndex
       searchParam.currentPage = this.output.startPage
-      orderInfoApi.getByPage(searchParam).then(res => {
+      orderInfoApi.exportExcel(searchParam).then(res => {
         const link = document.createElement('a')
         // 创建Blob对象，设置文件类型
         const blob = new Blob([res], { type: 'application/vnd.ns-excel' }) // MIME类型

src/views/order/orderListDetail.vue

@@ -6,7 +6,7 @@
       </div>
       <el-descriptions title="基本信息" class="text" direction="vertical" :column="6" border>
         <el-descriptions-item label="订单编号">{{ detailData.orderCode }}</el-descriptions-item>
-        <el-descriptions-item label="用户账号">{{ detailData.acctId }}</el-descriptions-item>
+        <el-descriptions-item label="用户账号">{{ detailData.customerPhone }}</el-descriptions-item>
         <el-descriptions-item label="支付积分">{{ detailData.integral }}</el-descriptions-item>
         <el-descriptions-item label="下单时间">{{ detailData.createTime }}</el-descriptions-item>
         <el-descriptions-item label="自提油站">{{ detailData.takeSiteName }}</el-descriptions-item>
@@ -112,7 +112,7 @@ export default {
         case '0':
           return '待支付'
         case '1':
-          return '已经发'
+          return '已支付'
         case '2':
           return '退款申请'
         case '3':

src/views/product/productList/index.vue

@@ -41,8 +41,8 @@
         </el-form>
       </div>
       <div class="Button">
-<!--        <el-button type="primary" class="mr14">添加商品</el-button>-->
-<!--        <el-button type="success" class="mr14" @click="onCopy">商品采集</el-button>-->
+        <!--        <el-button type="primary" class="mr14">添加商品</el-button>-->
+        <!--        <el-button type="success" class="mr14" @click="onCopy">商品采集</el-button>-->
         <!-- <el-dropdown class="bnt mr14" @command="batchSelect">
           <el-button>批量修改<i class="el-icon-arrow-down el-icon--right"></i></el-button>
           <el-dropdown-menu slot="dropdown">
@@ -54,9 +54,9 @@
             <el-dropdown-item :command="6">活动推荐</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown> -->
-<!--        <el-button @click="onDismount" v-show="artFrom.type === '1'">批量下架</el-button>-->
-<!--        <el-button @click="onShelves" v-show="artFrom.type === '2'">批量上架</el-button>-->
-<!--        <el-button class="export" @click="exports">导出</el-button>-->
+        <!--        <el-button @click="onDismount" v-show="artFrom.type === '1'">批量下架</el-button>-->
+        <!--        <el-button @click="onShelves" v-show="artFrom.type === '2'">批量上架</el-button>-->
+        <!--        <el-button class="export" @click="exports">导出</el-button>-->
         <el-button @click="batchShelves('1')">批量上架</el-button>
         <el-button @click="batchShelves('2')">批量下架</el-button>
       </div>
@@ -128,7 +128,7 @@
         <el-table-column label="油站" min-width="150" align="center">
           <template slot-scope="scope">
             <span>
-              {{ scope.row.siteName }}
+              {{ scope.row.siteName || '暂无' }}
             </span>
           </template>
         </el-table-column>
@@ -591,18 +591,20 @@ export default {
     // 批量上下架
     batchShelves(productStatus) {
       let selected = this.$refs.table.selection
-      if (selected&&selected.length>0){
-        let selectedIds = selected.map(item=>item.id)
-        productApi.batchShelves({
-          list:selectedIds,
-          productStatus:productStatus
-        }).then(res=>{
-          if (res.code===20000){
-            this.$message.success(res.msg)
-            this.getDataList()
-          }
-        })
-      }else {
+      if (selected && selected.length > 0) {
+        let selectedIds = selected.map(item => item.id)
+        productApi
+          .batchShelves({
+            list: selectedIds,
+            productStatus: productStatus
+          })
+          .then(res => {
+            if (res.code === 20000) {
+              this.$message.success(res.msg)
+              this.getDataList()
+            }
+          })
+      } else {
         this.$message.error('请选择需要操作的数据')
       }
     },

src/views/statistics/productStatisticsList.vue

@@ -45,7 +45,7 @@
         </el-table-column>
         <el-table-column label="数量比例" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.sellScale }}</span>
+            <span>{{ scope.row.sellScale }}%</span>
           </template>
         </el-table-column>
 
@@ -56,7 +56,7 @@
         </el-table-column>
         <el-table-column label="金额比例" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.sellMoneyScale }}</span>
+            <span>{{ scope.row.sellMoneyScale }}%</span>
           </template>
         </el-table-column>
       </el-table>
@@ -391,12 +391,22 @@ export default {
       })
       console.log('tableList', this.tableList)
     },
+
     // 表格搜索
     productSearchs() {
-      console.log(this.Time)
+      console.log('time', this.Time)
 
       if (this.Time !== null && this.Time.length !== 0) {
-        this.createTime = this.Time[0] + '/' + this.Time[1]
+        if (this.isDate(this.Time[0])) {
+          this.createTime = this.Time[0] + '/' + this.Time[1]
+          console.log('-----')
+        } else {
+          var time1 = this.getSimpleDate(this.Time[0])
+          var time2 = this.getSimpleDate(this.Time[1])
+          this.createTime = time1 + '/' + time2
+        }
+        console.log('createTime------', this.createTime)
+
         this.getChartList()
       } else {
         this.$message.error('请选择要查询的时间段！')
@@ -404,15 +414,43 @@ export default {
     },
     // 表格搜索
     userSearchs() {
+      console.log('createTime2', this.createTime2)
       this.page.currentPage = 1
+
       if (this.createTime2 !== null && this.createTime2.length !== 0) {
-        this.page.params.startTime = this.createTime2[0]
-        this.page.params.endTime = this.createTime2[1]
+        if (this.isDate(this.createTime2[0])) {
+          this.page.params.startTime = this.createTime2[0]
+          this.page.params.endTime = this.createTime2[1]
+        } else {
+          var time1 = this.getSimpleDate(this.createTime2[0])
+          var time2 = this.getSimpleDate(this.createTime2[1])
+          this.page.params.startTime = time1
+          this.page.params.endTime = time2
+        }
+
         this.getList()
       } else {
         this.$message.error('请选择要查询的时间段！')
       }
     },
+
+    isDate(dateStr) {
+      var pattern = /^\d{4}-\d{2}-\d{2}$/
+      return pattern.test(dateStr)
+    },
+    getSimpleDate(date) {
+      var y = date.getFullYear()
+      var m = date.getMonth() + 1
+      m = m < 10 ? '0' + m : m
+      var d = date.getDate()
+      d = d < 10 ? '0' + d : d
+      // var h = date.getHours()
+      // var minute = date.getMinutes()
+      // minute = minute < 10 ? '0' + minute : minute
+      // var s = date.getSeconds()
+      // s = s < 10 ? '0' + s : s
+      return y + '-' + m + '-' + d
+    },
     // 数据导出；
     exportData: function() {},