Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/admin into dev

config/index.js

@@ -12,9 +12,9 @@ module.exports = {
     proxyTable: {
       '/api': {
         // target: 'https://dp.huiju360.com.cn/hj_operations',
-        // target: 'http://192.168.0.62:8080', //wf
+        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://192.168.0.125:8080', //hyq
         // target: 'http://dev.ycjcjy.com/', //frp
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
         // pathRewrite: {

src/pages/system/caseManager/deviceManager/add.vue

@@ -3,7 +3,7 @@
     <form class="mainForm">
       <ul>
          <li class="flex-h">
-          <!-- <span>选择案场：</span> -->
+          <span>选择案场：</span>
           <div class="flex-item">
             <div style="width:50%">
               <el-select v-model="Case" placeholder="请选择">

src/pages/system/luckyDrawManager/luckyDrawShareList/index.vue

@@ -3,6 +3,28 @@
     <div class="system-table-search">
       <div class="flex-h">
         <div class="flex-item flex-h"></div>
+        <ul>
+          <li>
+            <el-input
+              placeholder="请输入用户手机号"
+              v-model="toPhone"
+            >
+            </el-input>
+          </li>
+          <li>
+            <el-input
+              placeholder="请输入被分享用户手机号"
+              v-model="fromPhone"
+            >
+            </el-input>
+          </li>
+        </ul>
+        <el-button
+          size="mini"
+          type="primary" @click="search">搜索</el-button>
+          <!-- <el-button
+          size="mini"
+          type="danger" @click="excel">导出Excel</el-button> -->
       </div>
       <div class="moreFilter"></div>
     </div>
@@ -12,47 +34,35 @@
         stripe
         style="width: 100%">
         <el-table-column
-          prop="CaseName"
-          label="案场">
+          prop="ToCustomerWxname"
+          label="用户昵称">
         </el-table-column>
         <el-table-column
-          prop="ActivitName"
-          label="活动名称">
+          prop="ToCustomerName"
+          label="用户姓名">
         </el-table-column>
         <el-table-column
-          prop="Name"
-          label="姓名">
+          prop="ToCustomerTel"
+          label="用户手机号">
         </el-table-column>
         <el-table-column
-          prop="CustomerName"
-          label="微信昵称">
+          prop="FromCustomerWxname"
+          label="被分享用户昵称">
         </el-table-column>
         <el-table-column
-          prop="Phone"
-          label="手机号">
+          prop="FromCustomerName"
+          label="被分享用户姓名">
         </el-table-column>
         <el-table-column
-          prop="PrizeName"
-          label="获取奖品">
+          prop="FromCustomerTel"
+          label="被分享用户手机号">
         </el-table-column>
         <el-table-column
-          label="获取时间">
+          label="分享时间">
           <template slot-scope="scope">
             <label>{{toolClass.dateFormat(scope.row.CreateDate)}}</label>
           </template>
         </el-table-column>
-        <el-table-column
-          label="核销时间">
-          <template slot-scope="scope">
-            <label>{{toolClass.dateFormat(scope.row.WriteoffDate)}}</label>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="状态">
-          <template slot-scope="scope">
-            <label>{{scope.row.Status === 0 ? '未核销' : '已核销'}}</label>
-          </template>
-        </el-table-column>
       </el-table>
     </div>
     <el-pagination
@@ -74,6 +84,8 @@ export default {
   data () {
     return {
       total: 0,
+      toPhone: '',
+      fromPhone: '',
       postData: { // 表格搜索条件
         page: 1, // 当前页码
         pagesize: 10, // 请求数据量
@@ -88,21 +100,18 @@ export default {
   },
   computed: {
     ...mapLuckState({
-      list: x => x.luckDrawList
+      list: x => x.luckDrawShareList
     }),
   },
   methods: {
-    ...mapLuckActions(['getLuckDrawList']),
+    ...mapLuckActions(['getLuckDrawShareList']),
     search () { // 搜索
       this.postData.page = 1
       this.currentList = []
       this.getList()
     },
-    getCaseName (caseid) {
-      return (this.cases.filter(x => x.CaseId === caseid)[0] || {}).CaseName
-    },
     getList () { // 获取列表
-      this.getLuckDrawList({ ...this.postData }).then((res) => {
+      this.getLuckDrawShareList({ ...this.postData, toPhone: this.toPhone, fromPhone: this.fromPhone }).then((res) => {
         this.currentList = this.list.list
         this.postData.page = this.list.page
         this.total = this.list.pagenum

src/store/luckDraw/luckDraw.js

@@ -11,7 +11,7 @@ export default {
     updateLuckDrawList (state, payload) {
       state.luckDrawList = payload || {}
     },
-    updateLuckShareDrawList (state, payload) {
+    updateLuckDrawShareList (state, payload) {
       state.luckDrawShareList = payload || {}
     },
   },
@@ -34,7 +34,7 @@ export default {
         ajax({
           ...api.luckDraw.luckDrawShareList,
           queryData: {
-            ...payload,
+            ...payload
           }
         }).then(res => {
           commit('updateLuckDrawShareList', res)

src/util/api.js

@@ -773,7 +773,7 @@ const $api = {
     },
     luckDrawShareList: {
       method: 'get',
-      url: `${baseUrl}${common}/luckdrawlist/:toPhone/:fromPhone`
+      url: `${baseUrl}${common}/luckdrawlist/share`
     }
   }
 }