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: {

package.json

@@ -87,6 +87,7 @@
     "style-loader": "^0.22.0",
     "uglifyjs-webpack-plugin": "^1.1.1",
     "url-loader": "^0.5.8",
+    "vue-clipboard2": "^0.2.1",
     "vue-fullcalendar": "^1.0.9",
     "vue-jest": "^1.0.2",
     "vue-loader": "^13.3.0",

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

@@ -2,29 +2,7 @@
   <div class="subPage">
     <div class="system-table-search">
       <div class="flex-h">
-        <div class="flex-item flex-h">
-          <!-- <el-button size="mini" type="success" @click="addGoodsType">新增商品类型</el-button> -->
-        </div>
-        <!-- <ul>
-          <li>
-            <el-select v-model="CaseId" placeholder="请选择">
-              <el-option
-                key=""
-                label="所有案场"
-                value="">
-              </el-option>
-              <el-option
-                v-for="item in cases"
-                :key="item.CaseId"
-                :label="item.CaseName"
-                :value="item.CaseId">
-              </el-option>
-            </el-select>
-          </li>
-        </ul>
-        <el-button
-          size="mini"
-          type="primary" @click="search">搜索</el-button> -->
+        <div class="flex-item flex-h"></div>
       </div>
       <div class="moreFilter"></div>
     </div>
@@ -34,40 +12,46 @@
         stripe
         style="width: 100%">
         <el-table-column
-          prop="TypeName"
+          prop="CaseName"
           label="案场">
         </el-table-column>
         <el-table-column
-          prop="TypeName"
+          prop="ActivitName"
           label="活动名称">
         </el-table-column>
         <el-table-column
-          prop="TypeName"
+          prop="Name"
           label="姓名">
         </el-table-column>
         <el-table-column
-          prop="TypeName"
+          prop="CustomerName"
           label="微信昵称">
         </el-table-column>
         <el-table-column
-          prop="TypeName"
+          prop="Phone"
           label="手机号">
         </el-table-column>
         <el-table-column
-          prop="TypeName"
+          prop="PrizeName"
           label="获取奖品">
         </el-table-column>
         <el-table-column
-          prop="TypeName"
           label="获取时间">
+          <template slot-scope="scope">
+            <label>{{toolClass.dateFormat(scope.row.CreateDate)}}</label>
+          </template>
         </el-table-column>
         <el-table-column
-          prop="TypeName"
           label="核销时间">
+          <template slot-scope="scope">
+            <label>{{toolClass.dateFormat(scope.row.WriteoffDate)}}</label>
+          </template>
         </el-table-column>
         <el-table-column
-          prop="TypeName"
           label="状态">
+          <template slot-scope="scope">
+            <label>{{scope.row.Status === 0 ? '未核销' : '已核销'}}</label>
+          </template>
         </el-table-column>
       </el-table>
     </div>
@@ -82,7 +66,7 @@
 </template>
 
 <script>
-import { mapState, createNamespacedHelpers } from 'vuex'
+import { createNamespacedHelpers } from 'vuex'
 const { mapState: mapLuckState, mapActions: mapLuckActions } = createNamespacedHelpers('luckDraw')
 
 export default {
@@ -91,7 +75,6 @@ export default {
     return {
       total: 0,
       postData: { // 表格搜索条件
-        caseid: '',
         page: 1, // 当前页码
         pagesize: 10, // 请求数据量
       },
@@ -104,21 +87,9 @@ export default {
     })
   },
   computed: {
-    ...mapState({
-      cases: x => x.app.cases.list,
-      defaultCaseId: x => x.app.cases.default
-    }),
     ...mapLuckState({
       list: x => x.luckDrawList
     }),
-    CaseId: {
-      get () {
-        return this.postData.caseid || this.defaultCaseId
-      },
-      set (val) {
-        this.postData.caseid = val
-      }
-    }
   },
   methods: {
     ...mapLuckActions(['getLuckDrawList']),
@@ -131,7 +102,7 @@ export default {
       return (this.cases.filter(x => x.CaseId === caseid)[0] || {}).CaseName
     },
     getList () { // 获取列表
-      this.getLuckDrawList({ ...this.postData, caseid: this.CaseId }).then((res) => {
+      this.getLuckDrawList({ ...this.postData }).then((res) => {
         this.currentList = this.list.list
         this.postData.page = this.list.page
         this.total = this.list.pagenum

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

@@ -2,30 +2,7 @@
   <div class="subPage">
     <div class="system-table-search">
       <div class="flex-h">
-        <div class="flex-item flex-h">
-          <!-- <el-button size="mini" type="success" @click="addGoodsType">新增商品类型</el-button> -->
-        </div>
-        <ul>
-          <li>
-            <!-- <span>选择案场：</span> -->
-            <el-select v-model="CaseId" placeholder="请选择">
-              <el-option
-                key=""
-                label="所有案场"
-                value="">
-              </el-option>
-              <el-option
-                v-for="item in cases"
-                :key="item.CaseId"
-                :label="item.CaseName"
-                :value="item.CaseId">
-              </el-option>
-            </el-select>
-          </li>
-        </ul>
-        <el-button
-          size="mini"
-          type="primary" @click="search">搜索</el-button>
+        <div class="flex-item flex-h"></div>
       </div>
       <div class="moreFilter"></div>
     </div>
@@ -35,24 +12,46 @@
         stripe
         style="width: 100%">
         <el-table-column
-          prop="TypeName"
+          prop="CaseName"
           label="案场">
         </el-table-column>
         <el-table-column
-          prop="TypeName"
-          label="用户名">
+          prop="ActivitName"
+          label="活动名称">
         </el-table-column>
         <el-table-column
-          prop="TypeName"
+          prop="Name"
+          label="姓名">
+        </el-table-column>
+        <el-table-column
+          prop="CustomerName"
+          label="微信昵称">
+        </el-table-column>
+        <el-table-column
+          prop="Phone"
           label="手机号">
         </el-table-column>
         <el-table-column
-          prop="TypeName"
-          label="性别">
+          prop="PrizeName"
+          label="获取奖品">
+        </el-table-column>
+        <el-table-column
+          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
-          prop="TypeName"
-          label="检测时间">
+          label="状态">
+          <template slot-scope="scope">
+            <label>{{scope.row.Status === 0 ? '未核销' : '已核销'}}</label>
+          </template>
         </el-table-column>
       </el-table>
     </div>
@@ -67,7 +66,8 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { createNamespacedHelpers } from 'vuex'
+const { mapState: mapLuckState, mapActions: mapLuckActions } = createNamespacedHelpers('luckDraw')
 
 export default {
   name: '',
@@ -75,7 +75,6 @@ export default {
     return {
       total: 0,
       postData: { // 表格搜索条件
-        caseid: '', // 案场id
         page: 1, // 当前页码
         pagesize: 10, // 请求数据量
       },
@@ -88,20 +87,12 @@ export default {
     })
   },
   computed: {
-    ...mapState({
-      cases: x => x.app.cases.list,
-      defaultCaseId: x => x.app.cases.default
+    ...mapLuckState({
+      list: x => x.luckDrawList
     }),
-    CaseId: {
-      get () {
-        return this.postData.caseid || this.defaultCaseId
-      },
-      set (val) {
-        this.postData.caseid = val
-      }
-    }
   },
   methods: {
+    ...mapLuckActions(['getLuckDrawList']),
     search () { // 搜索
       this.postData.page = 1
       this.currentList = []
@@ -111,50 +102,14 @@ export default {
       return (this.cases.filter(x => x.CaseId === caseid)[0] || {}).CaseName
     },
     getList () { // 获取列表
-      this.$ajax(this.$api.goodsManager.getGoodsTypeList.url, {
-        method: this.$api.goodsManager.getGoodsTypeList.method,
-        queryData: { ...this.postData, caseid: this.CaseId }
-      }).then(res => {
-        // for (var n = 0; n < res.list.length; n++) {
-        //   res.list[n].CaseName = this.cases.filter(x => x.CaseId === res.list[n].CaseId)[0].CaseName
-        // }
-        this.currentList = res.list
-        this.postData.page = res.page
-        this.total = res.pagenum
+      this.getLuckDrawList({ ...this.postData }).then((res) => {
+        this.currentList = this.list.list
+        this.postData.page = this.list.page
+        this.total = this.list.pagenum
       })
     },
     handleCurrentChange (val) { // 跳转到分页
       this.getList()
-    },
-    handleEdit (index, row) { // 编辑
-      this.$router.push({ name: 'editGoodsType', query: { id: row.TypeId } })
-    },
-    handleDelete (index, row) { // 删除
-      let name = '确认删除类型“' + row.TypeName + '”?'
-      this.$confirm(name, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.$ajax(this.$api.goodsManager.deleteGoodsType.url, {
-          method: this.$api.goodsManager.deleteGoodsType.method,
-          urlData: { id: row.TypeId }
-        }).then(res => {
-          this.$message({
-            type: 'success',
-            message: '删除成功!'
-          })
-          this.search()
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    addGoodsType () {
-      this.$router.push({ name: 'addGoodsType' })
     }
   }
 }

src/store/luckDraw/luckDraw.js

@@ -19,7 +19,7 @@ export default {
     getLuckDrawList ({ commit }, payload) { // 获取抽奖列表
       return new Promise((resolve, reject) => {
         ajax({
-          ...api.health.healthList,
+          ...api.luckDraw.luckDrawList,
           queryData: {
             ...payload,
           }
@@ -32,7 +32,7 @@ export default {
     getLuckDrawShareList ({ commit }, payload) { // 获取抽奖分享列表
       return new Promise((resolve, reject) => {
         ajax({
-          ...api.health.healthList,
+          ...api.luckDraw.luckDrawShareList,
           queryData: {
             ...payload,
           }

src/util/api.js

@@ -757,6 +757,16 @@ const $api = {
       method: 'get',
       url: `${baseUrl}${common}/bodychecklist`
     }
+  },
+  luckDraw: {
+    luckDrawList: {
+      method: 'get',
+      url: `${baseUrl}${common}/luckdrawlist`
+    },
+    luckDrawShareList: {
+      method: 'get',
+      url: `${baseUrl}${common}/luckdrawlist/:toPhone/:fromPhone`
+    }
   }
 }
 export default $api