Merge branch 'dev'

# Conflicts:
#	src/views/pointsManagement/pointsSetting/index.vue

src/views/pointsManagement/pointsSetting/index.vue

@@ -13,9 +13,15 @@
         <el-form-item label="邀请好友注册获得积分">
           <el-input-number controls-position="right" v-model="form.INTEGRAL_INVITE_TO_SIGN_UP" style="width: 100%;" :min="0"></el-input-number>
         </el-form-item>
+        <el-form-item label="分享获得积分每天限额次数">
+          <el-input-number controls-position="right" v-model="form.INTEGRAL_SHARE_TIME_BY_DAY" style="width: 100%;" :min="0"></el-input-number>
+        </el-form-item>
         <el-form-item label="分享资讯获得积分">
           <el-input-number controls-position="right" v-model="form.INTEGRAL_SHARE_POINTS" style="width: 100%;" :min="0"></el-input-number>
         </el-form-item>
+        <el-form-item label="点赞照片获得积分每天限额次数">
+          <el-input-number controls-position="right" v-model="form.INTEGRAL_LIKE_TO_POINTS_TIME_BY_DAY" style="width: 100%;" :min="0"></el-input-number>
+        </el-form-item>
         <el-form-item label="点赞照片获得积分">
           <el-input-number controls-position="right" v-model="form.INTEGRAL_LIKE_TO_POINTS" style="width: 100%;" :min="0"></el-input-number>
         </el-form-item>
@@ -50,7 +56,6 @@
         <el-form-item label="购买随手拍原图统一价格">
           <el-input-number controls-position="right" v-model="form.CASH_TASK_ORIGIN_PHOTO_PRICE" style="width: 100%;" :precision="2" :step="0.1" :min="0"></el-input-number>
         </el-form-item>
-
         <el-form-item label="购买高清图统一原价格">
           <el-input-number controls-position="right" v-model="form.CASH_HD_LOGO_PHOTO_ORIGIN_PRICE" style="width: 100%;" :precision="2" :step="0.1" :min="0"></el-input-number>
         </el-form-item>
@@ -99,7 +104,9 @@ export default {
         INTEGRAL_CASH_OUT: 0,
         INTEGRAL_TO_SIGN_UP: 0,
         INTEGRAL_INVITE_TO_SIGN_UP: 0,
+        INTEGRAL_SHARE_TIME_BY_DAY: 0,
         INTEGRAL_SHARE_POINTS: 0,
+        INTEGRAL_LIKE_TO_POINTS_TIME_BY_DAY: 0,
         INTEGRAL_LIKE_TO_POINTS: 0,
         INTEGRAL_POINTS_BY_LIKE: 0,
         INTEGRAL_SIGN_IN_BY_DAY: 0,
@@ -121,9 +128,11 @@ export default {
       },
       rules: {
         INTEGRAL_CASH_OUT: [{ required: true, message: '请输入', trigger: 'blur' }],
-        INTEGRAL_TO_SIGN_UP: [ { required: true, message: '请输入', trigger: 'blur' }],
+        INTEGRAL_TO_SIGN_UP: [{ required: true, message: '请输入', trigger: 'blur' }],
         INTEGRAL_INVITE_TO_SIGN_UP: [ { required: true, message: '请输入', trigger: 'blur' }],
+        INTEGRAL_SHARE_TIME_BY_DAY: [ { required: true, message: '请输入', trigger: 'blur' }],
         INTEGRAL_SHARE_POINTS: [{ required: true, message: '请输入', trigger: 'blur' }],
+        INTEGRAL_LIKE_TO_POINTS_TIME_BY_DAY: [{ required: true, message: '请输入', trigger: 'blur' }],
         INTEGRAL_LIKE_TO_POINTS: [{ required: true, message: '请输入', trigger: 'blur' }],
         INTEGRAL_POINTS_BY_LIKE: [{ required: true, message: '请输入', trigger: 'blur' }],
         INTEGRAL_SIGN_IN_BY_DAY: [{ required: true, message: '请输入', trigger: 'blur' }],