Merge branch 'dev' of maopiao/mp-ui-pc into test

src/views/business/exchange/addCode.vue

@@ -197,6 +197,14 @@ export default {
             return;
           }
 
+          let goodsTotal = 0;
+          this.goodsList.forEach((item) => {
+            goodsTotal += item.quantity;
+          });
+          if (this.addData.quantity != goodsTotal) {
+            this.$message.error("兑换码数量不一致！");
+            return;
+          }
           this.goodsList = this.goodsList.map((item) => {
             return {
               ...item,

src/views/business/exchange/components/GoodsAdd.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-dialog
-      title="添加实物奖品"
+      title="添加实物商品"
       width="1000px"
       :visible.sync="dialogVisible"
       :before-close="close"
@@ -13,16 +13,21 @@
           placeholder="请输入商品名称"
           clearable
           size="small"
-          style="width: 220px" @clear="queryParams.pageNum = 1;getGoodsList()"
-          @keyup.enter.native="queryParams.pageNum = 1;getGoodsList()"
+          style="width: 220px" @clear="pageParams.pageNum = 1;getGoodsList()"
+          @keyup.enter.native="pageParams.pageNum = 1;getGoodsList()"
         />
         <div style="margin-left: 20px">商品价格：</div>
-<!--        <el-input v-model="minValue" placeholder="最低价格" clearable @keyup.enter.native="pageParams.pageNum = 1;getList()" />-->
-        <el-input style="width: 220px" v-model="queryParams.minValue"  @clear="queryParams.pageNum = 1;getGoodsList()" placeholder="最低价格" clearable @keyup.enter.native="queryParams.pageNum = 1;getGoodsList()"/>
+        <el-input style="width: 220px" v-model="queryParams.minValue"  @clear="pageParams.pageNum = 1;getGoodsList()" placeholder="最低价格" clearable @keyup.enter.native="pageParams.pageNum = 1;getGoodsList()"/>
         <div style="width: 20px;text-align: center">-</div>
-<!--        <el-input v-model="maxValue" placeholder="最高价格" clearable @keyup.enter.native="pageParams.pageNum = 1;getList()" />-->
-        <el-input style="width: 220px" v-model="queryParams.maxValue"  @clear="queryParams.pageNum = 1;getGoodsList()" placeholder="最高价格" clearable @keyup.enter.native="queryParams.pageNum = 1;getGoodsList()"/>
-
+        <el-input style="width: 220px" v-model="queryParams.maxValue"  @clear="pageParams.pageNum = 1;getGoodsList()" placeholder="最高价格" clearable @keyup.enter.native="pageParams.pageNum = 1;getGoodsList()"/>
+      </div>
+      <div class="dialog-search">
+        <div>商品类型：</div>
+        <el-select v-model="queryParams.type" placeholder="请选择商品类型" clearable @change="pageParams.pageNum = 1;getGoodsList()">
+          <el-option label="全部" value=""/>
+          <el-option label="实物商品" value="1"/>
+          <el-option label="卡密商品" value="2"/>
+        </el-select>
         <div class="ge"></div>
         <el-button
           type="primary"
@@ -61,7 +66,11 @@
           </template>
         </el-table-column>
         <el-table-column label="商品名称" prop="title" min-width="85" />
-
+        <el-table-column label="商品类型" min-width="85">
+          <template slot-scope="scope">
+            <div>{{ scope.row.type == 1 ? '实物商品':'卡密商品' }}</div>
+          </template>
+        </el-table-column>
         <el-table-column label="商品价格" min-width="85">
           <template slot-scope="scope">
             <div>￥{{ $numberFormat(scope.row.value) }}</div>
@@ -126,7 +135,7 @@ export default {
           "&pageSize=" +
           this.pageParams.pageSize +
           "&",
-        { title: this.goodsTitle,  status: "on", minValue: this.queryParams.minValue?accMul(this.queryParams.minValue, 100):this.queryParams.minValue, maxValue: this.queryParams.maxValue?accMul(this.queryParams.maxValue, 100):this.queryParams.maxValue,}
+        { title: this.goodsTitle, type: this.queryParams.type, status: "on", minValue: this.queryParams.minValue?accMul(this.queryParams.minValue, 100):this.queryParams.minValue, maxValue: this.queryParams.maxValue?accMul(this.queryParams.maxValue, 100):this.queryParams.maxValue,}
       ).then((res) => {
         this.goodsList = res.rows.map((item) => {
           return {

src/views/business/exchange/index.vue

@@ -12,10 +12,10 @@
       </el-form-item>
       <br>
       <el-form-item label="兑换码数量" prop="minValue">
-        <el-input v-model="queryParams.minCdKeyNum" placeholder="最小值" clearable @keyup.enter.native="queryParams.pageNum = 1;getList()" />
+        <el-input v-model="queryParams.minCdKeyNum" placeholder="最小值" @change="pageParams.pageNum = 1;handleQuery()" clearable @keyup.enter.native="pageParams.pageNum = 1;handleQuery()" />
       </el-form-item>
       <el-form-item label="-" prop="maxValue">
-        <el-input v-model="queryParams.maxCdKeyNum" placeholder="最大值" clearable @keyup.enter.native="queryParams.pageNum = 1;getList()" />
+        <el-input v-model="queryParams.maxCdKeyNum" placeholder="最大值" @change="pageParams.pageNum = 1;handleQuery()" clearable @keyup.enter.native="pageParams.pageNum = 1;handleQuery()" />
       </el-form-item>
 
       <el-form-item label="门店" prop="channelId">
@@ -30,14 +30,14 @@
       </el-form-item>
 
       <el-form-item label="状态">
-        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable @change="queryParams.pageNum = 1;getList()">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable @change="pageParams.pageNum = 1;handleQuery()">
           <el-option :label="item.dictLabel" :value="item.dictValue" v-for="(item, index) in statusList" :key="index" />
         </el-select>
       </el-form-item>
 
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="getList(true)">重置</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
     <el-row :gutter="10" class="mb8">
@@ -69,9 +69,9 @@
           <span>{{ parseTime(scope.row.createdTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="激活日期" prop="activeTime">
+      <el-table-column label="激活日期" prop="activationTime">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.activeTime) }}</span>
+          <span>{{ parseTime(scope.row.activationTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="状态" prop="status" align="center">
@@ -174,7 +174,6 @@ export default {
           if (res.code == 0) {
             this.total = res.total;
             this.list = res.rows;
-            console.log('list',list)
           }
         })
         .catch(() => {
@@ -185,14 +184,16 @@ export default {
     //搜索
     handleQuery() {
       this.siteList = this.siteCopyList;
-      this.queryParams.pageNum = 1;
+      this.pageParams.pageNum = 1;
       this.getList();
     },
 
     // 重置
     resetQuery() {
       this.pageParams.pageNum = 1
+      this.queryParams = {}
       this.addTimeArr = [];
+      this.activationTimeArr = []
       this.getList();
     },
 

src/views/business/goods/index.vue

@@ -20,7 +20,7 @@
         />
       </el-form-item>
       <el-form-item label="商品类型" prop="type">
-        <el-select v-model="queryParams.type" placeholder="请选择是否支持兑换" clearable
+        <el-select v-model="queryParams.type" placeholder="请选择商品类型" clearable
                    @change="queryParams.pageNum = 1;getList()">
           <el-option label="全部" value=""/>
           <el-option label="实物商品" value="1"/>

src/views/finance/withdraw/index.vue

@@ -253,7 +253,6 @@ export default {
     // 订单详情
     getDetailInfo() {
       withdrawDetail({ id: this.id }).then(res=>{
-        console.log('res', res)
         if(res.code == 0){
           this.detailInfo = res.data
           this.detailShow = true;