huangmp 10 месяцев назад
Родитель
Сommit
8f9e5a3b88

+ 7 - 0
src/views/modules/platform/feature/create/edit/components/image_ad/index.vue

@@ -352,6 +352,9 @@ export default {
         case 5:
           str = that.$i18n.t('shopFeature.tabNav.microPage')
           break
+        case 6:
+          str = 'H5页面'
+          break
       }
       return str
     }
@@ -499,6 +502,10 @@ export default {
       if (eve.linkItem.type === 5) {
         this.choosePage()
       }
+      if (eve.linkItem.type === 6) {
+        this.showPathInputDialog = true
+        return
+      }
       this.setLinkInfo({
         title: this.commandInfo.title,
         link: this.commandInfo.link

+ 29 - 30
src/views/modules/sys/pset/home-page-popup-config.vue

@@ -10,7 +10,6 @@
           class="set-form"
           label-position="left"
           @keyup.enter.native="dataFormSubmit()"
-          :rules="dataRule"
           :model="dataForm"
         >
           <el-form-item label="关联店铺" style="width:640px" prop="shopId">
@@ -34,6 +33,9 @@
           <el-form-item label="客服详情图片" style="width:640px" prop="popupPic">
             <el-input v-model="dataForm.popupCustomerServicePic" placeholder="客服详情图片`" controls-position="right"></el-input>
           </el-form-item>
+          <el-form-item label="积分规则图" style="width:640px" prop="popupPic">
+            <el-input v-model="dataForm.popupPointRuleInfoPic" placeholder="积分规则图`" controls-position="right"></el-input>
+          </el-form-item>
           <el-form-item :label="$t('sysManagement.isActive')" style="width:640px" prop="isOpen">
             <el-switch v-model="dataForm.isOpen" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
           </el-form-item>
@@ -54,7 +56,6 @@
           size="mini"
           class="set-form"
           label-position="left"
-          :rules="dataRule"
           :model="dataForm2"
         >
           <el-form-item label="关联店铺" style="width:640px" prop="shopId">
@@ -123,6 +124,7 @@ export default {
         popupPicToPage: null,
         isOpen: true,
         popupCustomerServicePic: null,
+        popupPointRuleInfoPic: null
         // paramValue: null
       },
       dataForm2: {
@@ -196,6 +198,7 @@ export default {
           this.dataForm.popupPic = null
           this.dataForm.popupPicToPage = null
           this.dataForm.popupCustomerServicePic = null
+          this.dataForm.popupPointRuleInfoPic = null
           this.isOpen = true
         }
       })
@@ -247,35 +250,31 @@ export default {
     },
     // 表单提交
     dataFormSubmit2 () {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.getCouponPagePopupParam()
-          this.$http({
-            url: this.$http.adornUrl(this.saveUrl),
-            method: 'post',
-            data: this.$http.adornData({
-              'paramKey': 'COUPON_POPUP_' + this.dataForm2.shopId,
-              'paramValue': JSON.stringify(this.dataForm2),
-              'remark': '小程序新人券弹窗'
-            })
-          }).then(({ data }) => {
-            if (data) {
-              this.init()
-            }
-            this.$message({
-              message: this.$i18n.t('publics.operation'),
-              type: 'success',
-              duration: 500,
-              onClose: () => {
-                this.visible = false
-                if (this.dataForm.isOpen) {
-                  this.activationEventOriginate = true
-                  this.$emit('activationConfig')
-                }
-              }
-            })
-          })
+      this.getCouponPagePopupParam()
+      this.$http({
+        url: this.$http.adornUrl(this.saveUrl),
+        method: 'post',
+        data: this.$http.adornData({
+          'paramKey': 'COUPON_POPUP_' + this.dataForm2.shopId,
+          'paramValue': JSON.stringify(this.dataForm2),
+          'remark': '小程序新人券弹窗'
+        })
+      }).then(({ data }) => {
+        if (data) {
+          this.init()
         }
+        this.$message({
+          message: this.$i18n.t('publics.operation'),
+          type: 'success',
+          duration: 500,
+          onClose: () => {
+            this.visible = false
+            if (this.dataForm.isOpen) {
+              this.activationEventOriginate = true
+              this.$emit('activationConfig')
+            }
+          }
+        })
       })
     },
     /**