完成 赠送记录 对接

config/index.js

@@ -13,8 +13,8 @@ module.exports = {
       '/api': {
         // target: 'https://dp.huiju360.com.cn/hj_operations',
         // target: 'http://192.168.0.62:8080', //wf
-        //target: 'http://127.0.0.1:8080', 
-        target: 'http://192.168.0.62:8080', //wf
+        target: 'http://127.0.0.1:8080', 
+        //target: 'http://192.168.0.62:8080', //wf
         // target: 'http://192.168.0.11', //ys
         // target: 'http://192.168.0.125:8080', //hyq
         // target: 'http://dev.ycjcjy.com/', //frp

src/pages/system/cardAndCouponManager/givingRecords.vue

@@ -15,12 +15,14 @@
             <el-date-picker
               v-model="postData.startDate"
               type="date"
+              value-format="yyyy-MM-dd"
               placeholder="选择起始日期">
             </el-date-picker>
             <span>至</span>
             <el-date-picker
               v-model="postData.endDate"
               type="date"
+              value-format="yyyy-MM-dd"
               placeholder="选择截止日期">
             </el-date-picker>
           </li>
@@ -37,31 +39,34 @@
         stripe
         style="width: 100%">
         <el-table-column
-          prop="xxx"
+          prop="GiftName"
           label="卡券名称">
         </el-table-column>
         <el-table-column
-          prop="xxx"
+          prop="ToName"
           label="姓名">
         </el-table-column>
         <el-table-column
-          prop="xxx"
+          prop="CustomerName"
           label="微信昵称">
         </el-table-column>
         <el-table-column
-          prop="xxx"
+          prop="Phone"
           label="手机号">
         </el-table-column>
         <el-table-column
-          prop="xxx"
+          prop="RecommendName"
           label="推荐人">
         </el-table-column>
         <el-table-column
-          prop="xxx"
+          prop="CreateDate"
           label="赠送时间">
+          <template slot-scope="scope">
+            <span>{{FormatDate(scope.row.CreateDate)}}</span>
+          </template>
         </el-table-column>
         <el-table-column
-          prop="xxx"
+          prop="FromName"
           label="操作人">
         </el-table-column>
       </el-table>
@@ -87,9 +92,11 @@ export default {
       centerDialogVisible: false,
       total: 0,
       postData: { // 表格搜索条件
-        caseid: '', // 案场id
         page: 1, // 当前页码
         pagesize: 10, // 请求数据量
+        startDate: '',
+        endDate: '',
+        referrer: '', // 搜索框
       },
       currentList: [{
         xxx: 'xxx'
@@ -98,7 +105,7 @@ export default {
   },
   mounted () {
     this.$nextTick(function () {
-      // this.getList()
+      this.getList()
     })
   },
   computed: {
@@ -122,18 +129,21 @@ export default {
       this.getList()
     },
     getList () { // 获取列表
-      // this.$ajax(this.$api.channelManager.getChannelList.url, {
-      //   method: this.$api.channelManager.getChannelList.method,
-      //   queryData: { ...this.postData, caseid: this.CaseId }
-      // }).then(res => {
-      //   this.currentList = res.list
-      //   this.postData.page = res.page
-      //   this.total = res.pagenum
-      // })
+      this.$ajax(this.$api.record.getRecordList.url, {
+        method: this.$api.record.getRecordList.method,
+        queryData: { ...this.postData }
+      }).then(res => {
+        this.currentList = res.list
+        this.postData.page = res.page
+        this.total = res.pagenum
+      })
     },
     handleCurrentChange (val) { // 跳转到分页
       this.getList()
     },
+    FormatDate (date) {
+      return this.toolClass.dateFormat(date, 'yyyy-MM-dd hh:mm:ss')
+    },
   }
 }
 </script>

src/util/api.js

@@ -783,6 +783,12 @@ const $api = {
       method: 'get',
       url: `${baseUrl}${common}/luckdrawlist/share`
     }
+  },
+  record: {
+    getRecordList: {
+      method: 'get',
+      url: `${baseUrl}${common}/card/record`
+    }
   }
 }
 export default $api