Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev

src/views/application/components/invite_friend/share.vue

@@ -313,6 +313,7 @@ export default {
             width: 100%;
             height: 100%;
             display: block;
+            object-fit: cover;
         }
 
         .icon {
@@ -376,6 +377,8 @@ export default {
 
                 .title {
                     font-size: 12px;
+                    line-height: 16px;
+                    padding: 6px 0;
                 }
 
                 .btm {

src/views/application/components/member_points/setting.vue

@@ -11,7 +11,7 @@
                         <el-radio label="vip">仅会员</el-radio>
                     </el-radio-group>
                 </el-form-item>
-                <el-form-item label="费赠送积分" prop="consumeAmount">
+                <el-form-item label="消费赠送积分" prop="consumeAmount">
                     <el-input v-model="form.consumeAmount" style="width: 250px;"
                         @input="inputFilterInt($event, 'consumeAmount')">
                         <template slot="prepend">每消费</template>