Merge remote-tracking branch 'origin/master'

.env.development

@@ -3,7 +3,7 @@ ENV = 'development'
 
 # base api
 # VUE_APP_BASE_API = 'http://127.0.0.1:18080'
-VUE_APP_BASE_API = 'https://430jy.uutime.cn/yxl-back-end/'
+VUE_APP_BASE_API = 'https://430jy.uutime.cn/'
 VUE_APP_API_TIMEOUT = 30000
 
 

src/api/scene/index.js

@@ -17,3 +17,6 @@ export const delItem = ({ id, ...params }) =>
 	api.del(`/yxl-back-end/admin/kindergarten/${id}`, params);
 export const auditItem = ({ id, ...params }) =>
 	api.put(`/yxl-back-end/admin/kindergarten/${id}/audit`, params);
+
+export const sendCode = ({ id, ...params }) =>
+	api.put(`/yxl-back-end/admin/kindergarten/${id}/send-qrcode`, params);

src/components/DataSelect.vue

@@ -2,9 +2,9 @@
   <el-select v-model="newValue" placeholder="请选择">
     <el-option
       v-for="item in options"
-      :key="item.value"
+      :key="item[valueKay]"
       :label="item.label"
-      :value="item.value"
+      :value="item[valueKay]"
     >
     </el-option>
   </el-select>
@@ -23,6 +23,10 @@ export default {
     params: {
       type: String,
       default: ''
+    },
+    valueKay: {
+      type: String,
+      default: 'value'
     }
   },
 

src/const/dictType.js

@@ -1 +1,4 @@
-export default { BANNER_TYPE: 'BANNER_TYPE' };
+export default {
+  BANNER_TYPE: 'BANNER_TYPE',
+  INTEGRAL_CASH_TYPE: 'INTEGRAL_CASH_TYPE'
+};

src/containers/ToolbarContainer.vue

@@ -87,6 +87,7 @@
               v-model="form[field.name]"
               :params="field.params"
               :props="field.props"
+              :valueKay="field.valueKay"
               :clearable="true"
             ></DataSelect>
             <ActivitySelect

src/views/financialManagement/cashDetail/index.vue

@@ -34,7 +34,7 @@ export default {
         {
           key: 'accountId',
           name: '用户ID',
-          width: this.$col.m
+          width: this.$col.b
         },
         {
           key: 'scene',
@@ -43,7 +43,7 @@ export default {
         },
         {
           key: 'displayText',
-          name: '用途',
+          name: '展示文案',
           minWidth: this.$col.b
         },
         {

src/views/financialManagement/cashDetail/toolbar.vue

@@ -3,6 +3,8 @@
 </template>
 
 <script>
+import TYPE from '@/const/type';
+
 export default {
   name: 'CashDetailToolbar',
 
@@ -10,9 +12,11 @@ export default {
     return {
       fields: [
         {
-          type: 'select',
+          type: 'DataSelect',
           name: 'displayText',
-          label: '用途'
+          label: '展示文案',
+          params: this.$dict.INTEGRAL_CASH_TYPE,
+          valueKay: 'label'
         }
       ]
     };

src/views/photoManagement/imageGoodsManagement/index.vue

@@ -39,12 +39,17 @@ export default {
           name: '上传位置',
           minWidth: this.$col.b,
           render: (h, { row }) =>
-            h('span', `${row.kindergartenName}/${row.activityName}`)
+            h(
+              'span',
+              `${row.kindergartenName}${
+                row.activityName ? '/' + row.activityName : ''
+              }`
+            )
         },
         {
           key: 'listPreview',
           name: '图片',
-          width: this.$col.b,
+          minWidth: this.$col.b,
           render: (h, { row }) => {
             if (!row.listPreview) {
               return h('span', '图片正在处理中请稍等...');

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

@@ -10,8 +10,8 @@
       }
     "
   >
-    <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-      <el-form-item label="图片"
+    <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+      <el-form-item label="列表预览图图片"
         ><img
           :src="form.listPreview"
           class="pre-img"
@@ -23,6 +23,42 @@
           "
         />
       </el-form-item>
+      <el-form-item label="详情页面预览图图片"
+        ><img
+          :src="form.detailPreview"
+          class="pre-img"
+          @click="
+            () =>
+              this.$AdvanceViewImageModal({
+                items: [{ src: form.detailPreview }]
+              })
+          "
+        />
+      </el-form-item>
+      <el-form-item label="原图"
+        ><img
+          :src="form.originPhoto"
+          class="pre-img"
+          @click="
+            () =>
+              this.$AdvanceViewImageModal({
+                items: [{ src: form.originPhoto }]
+              })
+          "
+        />
+      </el-form-item>
+      <el-form-item label="高清图"
+        ><img
+          :src="form.hdLogoPhoto"
+          class="pre-img"
+          @click="
+            () =>
+              this.$AdvanceViewImageModal({
+                items: [{ src: form.hdLogoPhoto }]
+              })
+          "
+        />
+      </el-form-item>
 
       <el-form-item label="高清价格图">
         <el-input-number
@@ -156,4 +192,8 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.pre-img {
+  height: 80px;
+}
+</style>

src/views/photoManagement/photoVerifyManagement/index.vue

@@ -36,12 +36,17 @@ export default {
           name: '上传位置',
           minWidth: this.$col.b,
           render: (h, { row }) =>
-            h('span', `${row.kindergartenName}/${row.activityName}`)
+            h(
+              'span',
+              `${row.kindergartenName}${
+                row.activityName ? '/' + row.activityName : ''
+              }`
+            )
         },
         {
           key: 'listPreview',
           name: '图片',
-          width: this.$col.b,
+          minWidth: this.$col.b,
           render: (h, { row }) => {
             if (!row.listPreview) {
               return h('span', '图片正在处理中请稍等...');

src/views/photographerManagement/photoVerify/index.vue

@@ -40,12 +40,17 @@ export default {
           name: '上传位置',
           minWidth: this.$col.b,
           render: (h, { row }) =>
-            h('span', `${row.kindergartenName}/${row.activityName}`)
+            h(
+              'span',
+              `${row.kindergartenName}${
+                row.activityName ? '/' + row.activityName : ''
+              }`
+            )
         },
         {
           key: 'listPreview',
           name: '图片',
-          width: this.$col.b,
+          minWidth: this.$col.b,
           render: (h, { row }) => {
             if (!row.listPreview) {
               return h('span', '图片正在处理中请稍等...');

src/views/photographerManagement/photographerVerify/index.vue

@@ -123,7 +123,7 @@ export default {
                       })
                   }
                 },
-                '编辑'
+                '审核'
               )
             );
 

src/views/pointsManagement/pointsDetail/index.vue

@@ -34,7 +34,7 @@ export default {
         {
           key: 'accountId',
           name: '用户ID',
-          width: this.$col.m
+          width: this.$col.b
         },
         // {
         //   key: 'region',
@@ -53,7 +53,7 @@ export default {
         },
         {
           key: 'displayText',
-          name: '用途',
+          name: '展示文案',
           minWidth: this.$col.b
         },
         {

src/views/pointsManagement/pointsDetail/toolbar.vue

@@ -3,6 +3,8 @@
 </template>
 
 <script>
+import TYPE from '@/const/type';
+
 export default {
   name: 'PointsDetailToolbar',
 
@@ -21,9 +23,11 @@ export default {
         //   labelWidth: '100px'
         // },
         {
-          type: 'select',
+          type: 'DataSelect',
           name: 'displayText',
-          label: '用途'
+          label: '展示文案',
+          params: this.$dict.INTEGRAL_CASH_TYPE,
+          valueKay: 'label'
         }
       ]
     };

src/views/sceneManagement/sceneList/index.vue

@@ -19,7 +19,7 @@
 <script>
 import toolbar from './toolbar';
 import mxFilterList from '@/mixins/filterList';
-import { getPage, delItem } from '@/api/scene';
+import { getPage, delItem, sendCode } from '@/api/scene';
 
 export default {
   name: 'SceneList',
@@ -67,6 +67,28 @@ export default {
             })
         },
         {
+          key: 'previewLogo',
+          name: '预览Logo',
+          width: this.$col.b,
+          render: (h, { row }) =>
+            h('img', {
+              style: {
+                width: '120px',
+                height: '90px'
+              },
+              class: 'pre-img',
+              attrs: {
+                src: row.previewLogo
+              },
+              on: {
+                click: () =>
+                  this.$AdvanceViewImageModal({
+                    items: [{ src: row.previewLogo }]
+                  })
+              }
+            })
+        },
+        {
           key: 'region',
           name: '所在地区',
           minWidth: this.$col.auto(200),
@@ -121,6 +143,23 @@ export default {
             );
             action.push(
               h(
+                'el-button',
+                {
+                  props: {
+                    type: 'text'
+                  },
+                  on: {
+                    click: () =>
+                      this.handleSend({
+                        id: row.id
+                      })
+                  }
+                },
+                '发送邮件'
+              )
+            );
+            action.push(
+              h(
                 'BaseBtn',
                 {
                   props: {
@@ -156,6 +195,14 @@ export default {
     handleAdd() {
       this.$SceneItemModal();
     },
+    async handleSend(id) {
+      const { success, msg } = await sendCode({
+        id
+      });
+      if (success) {
+        this.$success('发送成功！');
+      }
+    },
     async handleDelItem(item) {
       const { success, msg } = await delItem({
         id: item.id

src/views/sceneManagement/sceneList/modal/ItemModal.vue

@@ -35,6 +35,9 @@
       <el-form-item label="机构logo">
         <upload v-model="form.logo" params="prefix=/kindergarten" />
       </el-form-item>
+      <el-form-item label="机构预览logo">
+        <upload v-model="form.previewLogo" params="prefix=/kindergarten" />
+      </el-form-item>
       <el-form-item label="门店图片">
         <upload v-model="form.frontDoor" params="prefix=/kindergarten" />
       </el-form-item>
@@ -128,6 +131,7 @@ export default {
         city: '中山',
         area: '大涌',
         logo: [],
+        previewLogo: [],
         frontDoor: [],
         businessLicense: [],
         bodyPhoto: [],
@@ -169,6 +173,14 @@ export default {
             trigger: 'change'
           }
         ],
+        previewLogo: [
+          {
+            type: 'array',
+            required: true,
+            message: '请上传图片',
+            trigger: 'change'
+          }
+        ],
         frontDoor: [
           {
             type: 'array',
@@ -244,6 +256,12 @@ export default {
             url: data.logo
           }
         ];
+        result.previewLogo = [
+          {
+            url: data.previewLogo
+          }
+        ];
+
         result.frontDoor = [
           {
             url: data.frontDoor
@@ -279,6 +297,7 @@ export default {
         if (valid) {
           let params = Object.assign({}, this.form);
           params.logo = this.form.logo[0].url;
+          params.previewLogo = this.form.previewLogo[0].url;
           params.frontDoor = this.form.frontDoor[0].url;
           params.businessLicense = this.form.businessLicense[0].url;
           params.bodyPhoto = this.form.bodyPhoto[0].url;

src/views/sceneManagement/sceneVerify/index.vue

@@ -59,6 +59,28 @@ export default {
             })
         },
         {
+          key: 'previewLogo',
+          name: '预览Logo',
+          width: this.$col.b,
+          render: (h, { row }) =>
+            h('img', {
+              style: {
+                width: '120px',
+                height: '90px'
+              },
+              class: 'pre-img',
+              attrs: {
+                src: row.previewLogo
+              },
+              on: {
+                click: () =>
+                  this.$AdvanceViewImageModal({
+                    items: [{ src: row.previewLogo }]
+                  })
+              }
+            })
+        },
+        {
           key: 'region',
           name: '所在地区',
           minWidth: this.$col.auto(200),

src/views/statistics/withdrawalRecord/index.vue

@@ -114,7 +114,7 @@ export default {
                         })
                     }
                   },
-                  '编辑'
+                  '审核'
                 )
               );
             return h('div', action);