liujq 3 年之前
父節點
當前提交
2171c64868

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-0da6032e.fcb2974a.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-23dfcefb.f751e53e.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-5dc9e51c.5c7b5943.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.80d65ec5.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-0da6032e.ce3880a5.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-23dfcefb.1269f6e0.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-5dc9e51c.c9db266e.js


+ 1 - 0
src/views/house/components/popup/OldEdit.vue

@@ -189,6 +189,7 @@ export default {
               { keyRO: params.sale_name, valRO: params.sale_id }
             ]
           },
+          { label: '(对外展示)房源简介', key: 'introduce', type: 'textarea' },
           { label: '备注', key: 'remarked', type: 'textarea' },
         ]
       } else {

+ 35 - 9
src/views/user/components/popup/IREdit.vue

@@ -7,11 +7,11 @@
       :visible.sync="isShow"
       :title="this.curObj && this.curObj.id ? '编辑规则' : '添加规则'"
       :fullscreen="false"
-      width="470px"
+      width="800px"
       custom-class="xl-dialog"
       center
     >
-      <base-form ref="ruleForm" :data="formData" :is-inline="false" label-width="110px">
+      <base-form ref="ruleForm" class="lib-edit" :data="formData" :is-inline="false" label-width="110px">
         <div slot="footer">
           <el-button class="xl-form-btn t2" @click="close">关 闭</el-button>
           <el-button class="xl-form-btn t1" @click="close('confirm')">确定</el-button>
@@ -47,13 +47,28 @@ export default {
   methods: {
     getDef() {
       const params = { ...this.curObj }
-      this.formData = [
-        { label: '标题', key: 'title', rules: 1 },
-        { label: '分类', key: 'type', rules: 1 },
-        { label: '奖励积分', key: 'reward_point', class: 'c-2', rules: 1 },
-        { label: '奖励次数', key: 'reward_num', class: 'c-2', rules: 1 },
-        { label: '奖励周期(天)', key: 'cycle', rules: 1},
-      ]
+      if (params.id) {
+        this.formData = [
+          { label: '标题', key: 'title', rules: 1 },
+          { label: '排序', key: 'sort', class: 'c-2', rules: 1 },
+          { label: '奖励积分', key: 'reward_point', class: 'c-2', rules: 1 },
+          { label: '奖励次数', key: 'reward_num', class: 'c-2', rules: 1 },
+          { label: '奖励周期(天)', key: 'cycle', class: 'c-2', rules: 1},
+          { label: '小程序图标', key: 'icon', class: 'c-2', type: 'uploads'},
+          { label: '小程序描述', key: 'remark', class: 'c-2', type: 'textarea'},
+        ]
+      } else {
+        this.formData = [
+          { label: '标题', key: 'title', class: 'c-2', rules: 1 },
+          { label: '排序', key: 'sort', class: 'c-2', rules: 1 },
+          { label: '分类', key: 'type', class: 'c-2', rules: 1 },
+          { label: '奖励积分', key: 'reward_point', class: 'c-2', rules: 1 },
+          { label: '奖励次数', key: 'reward_num', class: 'c-2', rules: 1 },
+          { label: '奖励周期(天)', key: 'cycle', class: 'c-2', rules: 1},
+          { label: '小程序图标', key: 'icon', class: 'c-2', type: 'uploads'},
+          { label: '小程序描述', key: 'remark', class: 'c-2', type: 'textarea'},
+        ]
+      }
       this.setDefaultValue(params)
     },
     close(str) {
@@ -82,4 +97,15 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+@import "../../../../styles/libEdit.scss";
+.lib-edit {
+  padding-top: 0;
+  width:100%;
+  ::v-deep .el-form-item {
+    margin-bottom: 10px;
+  }
+  ::v-deep .el-date-editor.el-input {
+    width: 100%;
+  }
+}
 </style>

+ 3 - 2
src/views/user/integralRule.vue

@@ -61,13 +61,14 @@ export default {
   mounted() {
     this.listConfig = {
       rows: [
+        { label: '排序', prop: 'sort' },
         { label: '标题', prop: 'title' },
+        { label: '描述', prop: 'remark' },
+        { label: '图标', prop: 'icon', type: 'img' },
         { label: '分类', prop: 'type' },
         { label: '奖励积分', prop: 'reward_point' },
         { label: '奖励周期(天)', prop: 'cycle'},
         { label: '奖励次数', prop: 'reward_num' },
-        { label: '更新人', prop: 'update_by' },
-        { label: '更新时间', prop: 'update_at' },
         { label: '操作', width: 200, type: 'handle2', operations:
           [
             { label: '编辑', func: this.openPopup, btnType: 'primary' },

Some files were not shown because too many files changed in this diff