From 4603a28c5f1965c6d1496d22395a05a463a72fde Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Mon, 22 Feb 2021 17:53:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=AD=9B=E9=80=89=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/good/index.vue  | 2 +-
 src/views/components/goods/index.vue | 2 +-
 src/views/shop/goods/index.vue       | 6 ++++++
 src/views/shop/order/detail.vue      | 8 ++++++--
 src/views/shop/order/index.vue       | 5 ++++-
 5 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/views/components/good/index.vue b/src/views/components/good/index.vue
index d6f5cbe..2043198 100644
--- a/src/views/components/good/index.vue
+++ b/src/views/components/good/index.vue
@@ -99,7 +99,7 @@ export default {
     beforeInit() {
       this.url = 'api/yxStoreProduct'
       const sort = 'id,desc'
-      this.params = { page: this.page, size: this.size, sort: sort, isShow: 1, isDel: 0 }
+      this.params = { page: this.page, size: this.size, sort: sort, isShow: 1, isDel: 0 ,isIntegral:0}
       const query = this.query
       const type = query.type
       const value = query.value
diff --git a/src/views/components/goods/index.vue b/src/views/components/goods/index.vue
index c67c726..3385ca2 100644
--- a/src/views/components/goods/index.vue
+++ b/src/views/components/goods/index.vue
@@ -181,7 +181,7 @@ export default {
     beforeInit() {
       this.url = 'api/yxStoreProduct'
       const sort = 'id,desc'
-      this.params = {page: this.page, size: this.size, sort: sort, isShow: 1, isDel: 0}
+      this.params = {page: this.page, size: this.size, sort: sort, isShow: 1, isDel: 0,isIntegral:0}
       const query = this.query
       const type = query.type
       const value = query.value
diff --git a/src/views/shop/goods/index.vue b/src/views/shop/goods/index.vue
index 794636f..e13b8e8 100644
--- a/src/views/shop/goods/index.vue
+++ b/src/views/shop/goods/index.vue
@@ -48,6 +48,12 @@
       <el-table-column prop="price" label="商品价格" />
       <el-table-column prop="sales" label="销量" />
       <el-table-column prop="stock" label="库存" />
+      <el-table-column label="商品类型" align="center">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.isIntegral === 1" style="cursor: pointer" :type="'warning'">积分商品</el-tag>
+          <el-tag v-else style="cursor: pointer" :type=" 'info' ">普通商品</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="状态" align="center">
         <template slot-scope="scope">
           <div @click="onSale(scope.row.id,scope.row.isShow)">
diff --git a/src/views/shop/order/detail.vue b/src/views/shop/order/detail.vue
index 0d3c7ed..018db86 100644
--- a/src/views/shop/order/detail.vue
+++ b/src/views/shop/order/detail.vue
@@ -66,7 +66,7 @@
           <el-col :span="4" class="table-cell-title">物流单号</el-col>
           <el-col :span="4" class="table-cell-title">自动确认收货时间</el-col>
           <el-col :span="4" class="table-cell-title">订单可得积分</el-col>
-          <el-col :span="4" class="table-cell-title">填空待补充。。</el-col>
+          <el-col :span="4" class="table-cell-title">消费积分。</el-col>
           <el-col :span="4" class="table-cell-title">活动信息</el-col>
         </el-row>
         <el-row>
@@ -74,7 +74,7 @@
           <el-col :span="4" class="table-cell">{{order.deliverySn | formatNull}}</el-col>
           <el-col :span="4" class="table-cell">7天</el-col>
           <el-col :span="4" class="table-cell">{{order.gainIntegral}}</el-col>
-          <el-col :span="4" class="table-cell">{{order.growth}}</el-col>
+          <el-col :span="4" class="table-cell">{{order.payIntegral}}</el-col>
           <el-col :span="4" class="table-cell">
             <el-popover
               placement="top-start"
@@ -574,6 +574,7 @@ import eRemark from './remark'
           shippingType: data.shippingType,
           isChannel: data.isChannel,
           isRemind: data.isRemind,
+          payIntegral: data.payIntegral,
           isSystemDel: data.isSystemDel
         }
         _this.dialog = true
@@ -633,6 +634,7 @@ import eRemark from './remark'
           shippingType: data.shippingType,
           isChannel: data.isChannel,
           isRemind: data.isRemind,
+          payIntegral: data.payIntegral,
           isSystemDel: data.isSystemDel
         }
         _this.dialog = true
@@ -691,6 +693,7 @@ import eRemark from './remark'
           shippingType: data.shippingType,
           isChannel: data.isChannel,
           isRemind: data.isRemind,
+          payIntegral: data.payIntegral,
           isSystemDel: data.isSystemDel
         }
         _this.dialog = true
@@ -749,6 +752,7 @@ import eRemark from './remark'
           shippingType: data.shippingType,
           isChannel: data.isChannel,
           isRemind: data.isRemind,
+          payIntegral: data.payIntegral,
           isSystemDel: data.isSystemDel
         }
         _this.dialog = true
diff --git a/src/views/shop/order/index.vue b/src/views/shop/order/index.vue
index d54ee40..fd0cfcf 100644
--- a/src/views/shop/order/index.vue
+++ b/src/views/shop/order/index.vue
@@ -118,6 +118,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="payPrice" label="实际支付" />
+        <el-table-column prop="payIntegral" label="消费积分" />
         <el-table-column prop="payTypeName" label="支付状态" />
         <el-table-column prop="statusName" label="订单状态">
           <template slot-scope="scope">
@@ -283,7 +284,9 @@
           { value: '1', label: '普通订单' },
           { value: '2', label: '拼团订单' },
           { value: '3', label: '秒杀订单' },
-          { value: '4', label: '砍价订单' }
+          { value: '4', label: '砍价订单' },
+          { value: '5', label: '核销订单' },
+          { value: '6', label: '积分订单' }
         ],
         handleOptions: [
           {value: '', label: '批量操作'},