loki hace 3 años
padre
commit
d02b6bf294

+ 1 - 1
README.md

@@ -94,7 +94,7 @@ Copyright (c) 2017-present PanJiaChen
 - 暂时停止批量编辑 [x]
 - 暂时停止批量编辑 [x]
 - 上传位置 幼儿园活动组件 [x]
 - 上传位置 幼儿园活动组件 [x]
 - 活动管理需要场景组件 [x]
 - 活动管理需要场景组件 [x]
-- 上传照片管理
+- 上传照片管理 [x]
 - 图片上传地址
 - 图片上传地址
 - 后台前端富文本需要 px 转换 rem
 - 后台前端富文本需要 px 转换 rem
 - 是否裂变[后端判断照片商品管理] 上传照片管理追加字段
 - 是否裂变[后端判断照片商品管理] 上传照片管理追加字段

+ 7 - 0
src/api/config/index.js

@@ -0,0 +1,7 @@
+import api from '@/utils/request';
+
+export const getList = params =>
+	api.post(`/yxl-back-end/admin/business-config/list`, params);
+export const saveItem = params => {
+	return api.post(`/yxl-back-end/admin/business-config`, params);
+};

+ 10 - 7
src/utils/request.js

@@ -307,16 +307,19 @@ const post = (url, data = {}, config) => {
     },
     },
     config
     config
   );
   );
+  console.error(data);
   return formatResponse(
   return formatResponse(
     axios.post(
     axios.post(
       url,
       url,
-      {
-        data,
-        seq: config.seq,
-        token: config.token,
-        limit: data.size,
-        start: data.page
-      },
+      Array.isArray(data)
+        ? data
+        : {
+            data,
+            seq: config.seq,
+            token: config.token,
+            limit: data.size,
+            start: data.page
+          },
       config
       config
     )
     )
   );
   );

+ 10 - 3
src/views/photographerManagement/photoVerify/modal/ItemModal.vue

@@ -78,9 +78,16 @@ export default {
     handleConfirm() {
     handleConfirm() {
       this.$refs.form.validate(async valid => {
       this.$refs.form.validate(async valid => {
         if (valid) {
         if (valid) {
-          let params = this.form.urls.map(x => ({
-            activityId: this.form.activityId,
-            kindergartenId: this.form.kindergartenId,
+          // let params = this.form.urls.map(x => ({
+          //   activityId: this.form.activityId,
+          //   kindergartenId: this.form.kindergartenId,
+          //   originPhoto: x.url,
+          //   size: x.size,
+          //   originFilename: x.name
+          // }));
+          // console.log(params);
+          let params = this.form;
+          params.urls = this.form.urls.map(x => ({
             originPhoto: x.url,
             originPhoto: x.url,
             size: x.size,
             size: x.size,
             originFilename: x.name
             originFilename: x.name

+ 31 - 13
src/views/pointsManagement/pointsSetting/index.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
   <div class="m-10 bg-w p-20 br-10">
   <div class="m-10 bg-w p-20 br-10">
     <h1>积分设置</h1>
     <h1>积分设置</h1>
-    <el-form
+    <!--     <el-form
       ref="form"
       ref="form"
       :model="form"
       :model="form"
       label-width="280px"
       label-width="280px"
@@ -9,7 +9,12 @@
       class="mrow-60"
       class="mrow-60"
     >
     >
       <el-form-item label="积分抵现(设置多少积分抵一元人民币)">
       <el-form-item label="积分抵现(设置多少积分抵一元人民币)">
-        <el-input v-model="form.name"></el-input>
+        <el-input-number
+          v-model="num"
+          :precision="2"
+          :step="0.1"
+          :max="10"
+        ></el-input-number>
       </el-form-item>
       </el-form-item>
       <el-form-item label="活动区域">
       <el-form-item label="活动区域">
         <el-select v-model="form.region" placeholder="请选择活动区域">
         <el-select v-model="form.region" placeholder="请选择活动区域">
@@ -58,11 +63,13 @@
       <el-form-item class="f-fe-c">
       <el-form-item class="f-fe-c">
         <el-button type="primary" @click="onSubmit">立即创建</el-button>
         <el-button type="primary" @click="onSubmit">立即创建</el-button>
       </el-form-item>
       </el-form-item>
-    </el-form>
+    </el-form> -->
   </div>
   </div>
 </template>
 </template>
 
 
 <script>
 <script>
+import { getList } from '@/api/config';
+
 export default {
 export default {
   name: 'PointsSetting',
   name: 'PointsSetting',
 
 
@@ -70,17 +77,28 @@ export default {
 
 
   data() {
   data() {
     return {
     return {
-      form: {
-        name: '',
-        region: '',
-        date1: '',
-        date2: '',
-        delivery: false,
-        type: [],
-        resource: '',
-        desc: ''
-      }
+      // form: {
+      //   name: '',
+      //   region: '',
+      //   date1: '',
+      //   date2: '',
+      //   delivery: false,
+      //   type: [],
+      //   resource: '',
+      //   desc: ''
+      // }
     };
     };
+  },
+
+  created() {
+    this.loadData();
+  },
+
+  methods: {
+    async loadData() {
+      const { data } = await getList();
+      this.form = data;
+    }
   }
   }
 };
 };
 </script>
 </script>