diff --git a/src/views/merchant/list/handle/merEditForm.vue b/src/views/merchant/list/handle/merEditForm.vue
index 1990c65..79f65bf 100644
--- a/src/views/merchant/list/handle/merEditForm.vue
+++ b/src/views/merchant/list/handle/merEditForm.vue
@@ -168,7 +168,7 @@
                 />%
               </el-form-item>
             </el-col>
-           
+
           </el-row>
         </div>
         <div class="section">
@@ -234,7 +234,7 @@
               </el-form-item>
             </el-col>
            </el-row>
-          </div> 
+          </div>
         </div>
       </el-tab-pane>
       <el-tab-pane label="账号信息" name="account">
@@ -300,9 +300,28 @@
            </el-row>
         </div>
       </el-tab-pane>
-  </el-tabs>   
+      <el-tab-pane label="积分设置" name="integral">
+        <div class="section">
+          <div class="title">基础信息</div>
+          <el-row :gutter="24" class="mt20">
+            <el-col :span="24">
+              <el-form-item label="商户积分兑换平台积分比例：" prop="mer_integral_platform_rate" label-width="200">
+                <el-input-number v-model="merData.mer_integral_platform_rate" controls-position="right" placeholder="请输入比例" />
+                <div class="input-tips">例：设置为1.5，则1个本商户积分=1.5个平台积分</div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="平台积分转换商户积分比例：" prop="mer_integral_merchant_rate" label-width="200">
+                <el-input-number v-model="merData.mer_integral_merchant_rate" controls-position="right" placeholder="请输入比例" />
+                <div class="input-tips">例：设置为0.8，则1个平台积分=0.8个本商户积分</div>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-tab-pane>
+  </el-tabs>
 </el-form>
-  
+
 </template>
 <script>
 // +----------------------------------------------------------------------
@@ -326,7 +345,7 @@ export default {
       type: Boolean,
       default: false,
     }
-  }, 
+  },
   data() {
     const validatePhone = (rule, value, callback) => {
       if (!value) {
@@ -363,7 +382,7 @@ export default {
   },
   filters: {
   },
-  mounted() {  
+  mounted() {
     this.getCategorySelect();
     this.getStoreType()
   },
@@ -407,7 +426,7 @@ export default {
             this.loading = false;
             this.$message.error(res.message);
           });
-        } 
+        }
       });
     },
     /**创建商户 */
@@ -510,6 +529,10 @@ export default {
 .gary {
   color: #aaa;
 }
-
+.input-tips{
+  font-size: 12px;
+  margin-left: 180px;
+  line-height: 20px;
+  color: #9d9d9d;
+}
 </style>
- 
\ No newline at end of file
diff --git a/src/views/merchant/list/handle/merInfo.vue b/src/views/merchant/list/handle/merInfo.vue
index dc1ec20..08cfbac 100644
--- a/src/views/merchant/list/handle/merInfo.vue
+++ b/src/views/merchant/list/handle/merInfo.vue
@@ -58,7 +58,7 @@
               <div class="value">
                 {{merData.commission_switch ? "开启" : "关闭"}}
               </div>
-            </li>  
+            </li>
             <li v-if="merData.commission_switch" class="item item100">
               <div>商户手续费：</div>
               <div class="value">
@@ -81,7 +81,7 @@
             <li v-if="merData.is_margin != 0" class="item">
               <div>保证金余额：</div>
               <div class="value">{{merData.margin}}</div>
-            </li> 
+            </li>
           </ul>
         </div>
         <div class="section">
@@ -116,9 +116,9 @@
               <div>商户资质：</div>
               <div class="value">
                 <el-image
-                  v-for="(item, index) in merData.mer_certificate" 
-                  :key="index" 
-                  :src="item" 
+                  v-for="(item, index) in merData.mer_certificate"
+                  :key="index"
+                  :src="item"
                   @click="lookImg(item)"
                   style="width: 36px;height: 36px;margin-right: 5px;"
                   />
@@ -140,7 +140,7 @@
             <li class="item">
               <div>登录密码：</div>
               <div class="value">{{merData.mer_password}}</div>
-              
+
             </li>
             <li class="item">
               <div>联系人：</div>
@@ -149,7 +149,7 @@
             <li class="item">
               <div>联系电话：</div>
               <div class="value">{{merData.mer_phone}}</div>
-            </li> 
+            </li>
             <!-- <li class="item">
               <div>绑定手机号：</div>
               <div class="value">{{merData.real_name}}</div>
@@ -157,7 +157,7 @@
             <li class="item">
               <div>绑定微信用户昵称/ID：</div>
               <div class="value">{{merData.real_name}}</div>
-            </li>  --> 
+            </li>  -->
           </ul>
         </div>
         <div v-if="merData.sub_mchid" class="section">
@@ -170,11 +170,28 @@
           </ul>
         </div>
       </el-tab-pane>
+      <el-tab-pane label="积分设置" name="integral">
+        <div class="section">
+          <div class="title">登录账号</div>
+          <ul class="list">
+            <li class="item">
+              <div>商户积分兑换平台积分比例：</div>
+              <div class="value">
+                1 : {{merData.mer_integral_platform_rate}}
+              </div>
+            </li>
+            <li class="item">
+              <div>平台积分转换商户积分比例：</div>
+              <div class="value">{{merData.mer_integral_merchant_rate}} : 1</div>
+            </li>
+          </ul>
+        </div>
+      </el-tab-pane>
     </el-tabs>
      <div class="images" v-show="false" v-viewer="{ movable: false }">
       <img v-for="(src,index) in merData.mer_certificate" :src="src" :key="index" />
-    </div> 
-  </div>   
+    </div>
+  </div>
 </template>
 <script>
 // +----------------------------------------------------------------------