diff --git a/src/views/product/addProduct/index.vue b/src/views/product/addProduct/index.vue
index 02b7a95..60c6607 100644
--- a/src/views/product/addProduct/index.vue
+++ b/src/views/product/addProduct/index.vue
@@ -945,26 +945,6 @@
               </el-checkbox-group>
             </el-form-item>
           </el-col>
-          <el-col :span="24">
-            <el-form-item v-if="deductionStatus > 0" label="积分抵扣比例：">
-              <el-radio-group
-                v-model="deduction_set"
-                @change="changeIntergral(deduction_set)"
-              >
-                <el-radio :label="1" class="radio">单独设置</el-radio>
-                <el-radio :label="-1">默认设置</el-radio>
-              </el-radio-group>
-              <div v-if="deduction_set == 1">
-                <el-input-number
-                  v-model="formValidate.integral_rate"
-                  :min="0"
-                  controls-position="right"
-                  placeholder="请输入抵扣比例"
-                />
-                %
-              </div>
-            </el-form-item>
-          </el-col>
           <el-col :span="24">
             <el-form-item label="是否开启礼包：">
               <el-radio-group
@@ -990,8 +970,66 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- 其它设置 -->
+        <!--积分设置-->
         <el-row v-if="currentTab == '5'">
+          <!--赠送积分-->
+          <el-col :span="24">
+            <el-form-item label="是否开启赠送积分：">
+              <el-radio-group v-model="formValidate.integral_give_switch">
+                <el-radio :label="0" class="radio">关闭</el-radio>
+                <el-radio :label="1">开启</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <template v-if="formValidate.integral_give_switch == 1">
+            <el-col :span="24">
+              <el-form-item label="积分赠送设置：">
+                <el-radio-group v-model="formValidate.integral_give_set">
+                  <el-radio :label="0" class="radio">统一设置</el-radio>
+                  <el-radio :label="1">独立设置</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" v-if="formValidate.integral_give_set == 1">
+              <el-form-item label="积分赠送类型：">
+                <el-radio-group v-model="formValidate.integral_give_type">
+                  <el-radio :label="0" class="radio">百分比</el-radio>
+                  <el-radio :label="1">固定数量</el-radio>
+                </el-radio-group>
+                <div v-if="formValidate.integral_give_type == 1">
+                  赠送<el-input-number v-model="formValidate.integral_give_money" :min="1" :step="1" controls-position="right" placeholder="请输入数量" />积分
+                </div>
+                <div v-else>
+                  <el-input-number v-model="formValidate.integral_give_rate" :min="0.01" :max="100" :step="0.01" controls-position="right" placeholder="请输入比例" />%
+                </div>
+                <div class="tips">百分比：当前订单该商品实际支付总金额 * 设置的比例 = 赠送的积分；固定数量：指定数量 * 购买的商品数量 = 赠送的积分</div>
+              </el-form-item>
+            </el-col>
+          </template>
+          <!--积分抵扣-->
+          <el-col :span="24">
+            <el-form-item v-if="deductionStatus > 0" label="积分抵扣比例：">
+              <el-radio-group
+                v-model="deduction_set"
+                @change="changeIntergral(deduction_set)"
+              >
+                <el-radio :label="1" class="radio">单独设置</el-radio>
+                <el-radio :label="-1">默认设置</el-radio>
+              </el-radio-group>
+              <div v-if="deduction_set == 1">
+                <el-input-number
+                  v-model="formValidate.integral_rate"
+                  :min="0"
+                  controls-position="right"
+                  placeholder="请输入抵扣比例"
+                />
+                %
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- 其它设置 -->
+        <el-row v-if="currentTab == '6'">
           <el-col>
             <el-form-item label="支持退款：">
               <el-switch
@@ -1415,7 +1453,13 @@ const defaultObj = {
   couponData: [],
   extend: [], // 自定义留言
   type: 0,
-  product_type: 0
+  product_type: 0,
+  // 赠送积分
+  integral_give_switch: 0,
+  integral_give_set: 0,
+  integral_give_type: 0,
+  integral_give_rate: 0,
+  integral_give_money: 0
 }
 const objTitle = {
   price: {
@@ -1639,7 +1683,8 @@ export default {
         { title: '规格设置', name: '2' },
         { title: '商品详情', name: '3' },
         { title: '营销设置', name: '4' },
-        { title: '其他设置', name: '5' }
+        { title: '积分设置', name: '5' },
+        { title: '其他设置', name: '6' }
       ],
       type: 0,
       modals: false,
@@ -2607,9 +2652,7 @@ export default {
         once_min_count: info.once_min_count || 0,
         is_good: info.is_good,
         temp_id: info.temp_id,
-        guarantee_template_id: info.guarantee_template_id
-          ? info.guarantee_template_id
-          : "",
+        guarantee_template_id: info.guarantee_template_id ? info.guarantee_template_id : "",
         attr: info.attr,
         pay_limit: info.pay_limit || 0,
         refund_switch: info.refund_switch,
@@ -2621,20 +2664,20 @@ export default {
         couponData: info.coupon,
         video_link: info.video_link ? info.video_link : "",
         integral_rate: info.integral_rate,
-        delivery_way:
-          info.delivery_way && info.delivery_way.length
-            ? info.delivery_way.map(String)
-            : this.deliveryType,
+        delivery_way: info.delivery_way && info.delivery_way.length ? info.delivery_way.map(String) : this.deliveryType,
         delivery_free: info.delivery_free ? info.delivery_free : 0,
-        mer_labels:
-          info.mer_labels && info.mer_labels.length
-            ? info.mer_labels.map(Number)
-            : [],
+        mer_labels: info.mer_labels && info.mer_labels.length ? info.mer_labels.map(Number) : [],
         type: info.type || 0,
         extend: info.extend || [],
-        svip_price_type: info.svip_price_type || 0
+        svip_price_type: info.svip_price_type || 0,
+        // 赠送积分
+        integral_give_switch: info.integral_give_switch || 0,
+        integral_give_set: info.integral_give_set || 0,
+        integral_give_type: info.integral_give_type || 0,
+        integral_give_rate: info.integral_give_rate || 0,
+        integral_give_money: info.integral_give_money || 0
       };
-      if (info.svip_price_type != 0 && info.mer_svip_status)
+      if (info.svip_price_type != 0 && info.mer_svip_status){
         this.attrVal = {
           price: null,
           cost: null,
@@ -2646,6 +2689,7 @@ export default {
           weight: null,
           volume: null
         };
+      }
       if (this.formValidate.extend.length != 0) {
         this.customBtn = 1;
       }
@@ -3130,4 +3174,11 @@ export default {
     width: auto !important;
   }
 }
+.tips{
+  height: 50px;
+  line-height: 50px;
+  color: #999;
+  font-size: 12px;
+  border-bottom: 1px solid rgba(0,0,0,0.05);
+}
 </style>