Merge branch 'master' into feature/#base_management

src/views/photoManagement/imageGoodsManagement/modal/ItemModal.vue

@@ -101,13 +101,21 @@ export default {
       form: {
         isShow: false,
         isBeautiful: false,
-        originPhotoPrice: 0,
-        hdLogoPhotoPrice: 0
+        hdLogoPhotoOriginPrice: 0,
+        hdLogoPhotoPrice: 0,
+        originPhotoOriginPrice: 0,
+        originPhotoPrice: 0
       },
       rules: {
+        originPhotoOriginPrice: [
+          { required: true, message: '请输入正确的价格', trigger: 'blur' }
+        ],
         originPhotoPrice: [
           { required: true, message: '请输入正确的价格', trigger: 'blur' }
         ],
+        hdLogoPhotoOriginPrice: [
+          { required: true, message: '请输入正确的价格', trigger: 'blur' }
+        ],
         hdLogoPhotoPrice: [
           { required: true, message: '请输入正确的价格', trigger: 'blur' }
         ]

src/views/pointsManagement/pointsSetting/index.vue

@@ -7,31 +7,24 @@
         <el-form-item label="积分抵现（设置多少积分抵一元人民币）">
           <el-input-number controls-position="right" v-model="form.INTEGRAL_CASH_OUT" 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_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_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" 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_POINTS_BY_LIKE" 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_SIGN_IN_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_SIGN_IN_BY_EVERY_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_SIGN_IN_BY_EVERY_DAY_POINTS" style="width: 100%;" :min="0"></el-input-number>
         </el-form-item>
@@ -42,9 +35,28 @@
         <el-form-item label="照片购买摄影师分成（%）">
           <el-input-number controls-position="right" v-model="form.CASH_PHOTOER_INCOME" 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_TASK_HD_LOGO_PHOTO_ORIGIN_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_TASK_HD_LOGO_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_TASK_ORIGIN_PHOTO_ORIGIN_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_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>
         <el-form-item label="购买高清图统一价格">
           <el-input-number controls-position="right" v-model="form.CASH_HD_LOGO_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_ORIGIN_PHOTO_ORIGIN_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_ORIGIN_PHOTO_PRICE" style="width: 100%;" :precision="2" :step="0.1" :min="0"></el-input-number>
         </el-form-item>
@@ -59,6 +71,9 @@
           <el-input v-model="form.BUSINESS_TAKE_COUNT" placeholder="请输入"></el-input>
         </el-form-item>
 
+
+
+        <el-divider content-position="left"></el-divider>
         <el-form-item class="f-fe-c">
           <el-button type="primary" @click="onSubmit">保存</el-button>
         </el-form-item>
@@ -88,7 +103,13 @@ export default {
         INTEGRAL_SIGN_IN_BY_EVERY_DAY_POINTS: 0,
 
         CASH_PHOTOER_INCOME: 0,
-        CASH_HD_LOGO_PHOTO_PRICE: 0,
+        CASH_TASK_HD_LOGO_PHOTO_ORIGIN_PRICE: 0,
+        CASH_TASK_ORIGIN_PHOTO_PRICE: 0,
+        CASH_TASK_HD_LOGO_PHOTO_ORIGIN_PRICE: 0,
+        CASH_TASK_ORIGIN_PHOTO_PRICE: 0,
+        CASH_HD_LOGO_PHOTO_ORIGIN_PRICE: 0,
+        CASH_ORIGIN_PHOTO_PRICE: 0,
+        CASH_HD_LOGO_PHOTO_ORIGIN_PRICE: 0,
         CASH_ORIGIN_PHOTO_PRICE: 0,
 
         BUSINESS_H5_WEB_DOMAIN: '',
@@ -105,7 +126,13 @@ export default {
         INTEGRAL_SIGN_IN_BY_EVERY_DAY_POINTS: [{ required: true, message: '请输入', trigger: 'blur' }],
 
         CASH_PHOTOER_INCOME: [{ required: true, message: '请输入', trigger: 'blur' }],
+        CASH_TASK_HD_LOGO_PHOTO_ORIGIN_PRICE: [{ required: true, message: '请输入', trigger: 'blur' }],
+        CASH_TASK_HD_LOGO_PHOTO_PRICE: [{ required: true, message: '请输入', trigger: 'blur' }],
+        CASH_TASK_ORIGIN_PHOTO_ORIGIN_PRICE: [{ required: true, message: '请输入', trigger: 'blur' }],
+        CASH_TASK_ORIGIN_PHOTO_PRICE: [{ required: true, message: '请输入', trigger: 'blur' }],
+        CASH_HD_LOGO_PHOTO_ORIGIN_PRICE: [{ required: true, message: '请输入', trigger: 'blur' }],
         CASH_HD_LOGO_PHOTO_PRICE: [{ required: true, message: '请输入', trigger: 'blur' }],
+        CASH_ORIGIN_PHOTO_ORIGIN_PRICE: [{ required: true, message: '请输入', trigger: 'blur' }],
         CASH_ORIGIN_PHOTO_PRICE: [{ required: true, message: '请输入', trigger: 'blur' }],
 
         BUSINESS_H5_WEB_DOMAIN: [{ required: true, message: '请输入', trigger: 'blur' }],