浏览代码

debug积分规则

Joe 3 年之前
父节点
当前提交
101c046028
共有 4 个文件被更改,包括 49 次插入15 次删除
  1. 25 12
      src/components/PermissionContainer/index.vue
  2. 11 0
      src/main.js
  3. 1 1
      src/views/coupon/Coupon_Grant.vue
  4. 12 2
      src/views/point/Point_Rule.vue

+ 25 - 12
src/components/PermissionContainer/index.vue

@@ -1,20 +1,20 @@
 <template>
   <div>
-      <div v-if="pageStatus == 0">配置加载中...</div>
-      <div v-else-if="pageStatus == 1">此页面不对此账号开放</div>
-      <div v-else-if="pageStatus == 2">没有此页内容的配置权限,请检查集团上的配置</div>
-      <div v-else-if="pageStatus == 3">加载发生错误</div>
-      <div v-else-if="pageStatus == 4" class="app-container">
-          {{ pageStatus }}
+      <template v-if="pageStatus == 4">
         <slot></slot>
+      </template>
+      <div v-else style="text-align: center;margin-top:60px">
+        {{
+          (pageStatus == 0 ? "配置加载中..." : "") 
+          + (pageStatus == 1 ? "此页面不对此账号开放" : "")
+          + (pageStatus == 2 ? "没有此页内容的配置权限,请检查集团上的配置":"")
+          + (pageStatus == 3 ? "加载发生错误" : "")
+        }}
       </div>
   </div>
 </template>
 
 <script>
-import { scrollTo } from "@/utils/scroll-to";
-import vueQr from "vue-qr";
-import html2canvas from "html2canvas";
 
 export default {
   name: "PermissionContainer",
@@ -23,7 +23,23 @@ export default {
       pageStatus:4,
     };
   },
+  async created() {
+    try {
+      this.pageStatus = await this.queryPageStatus(this.jiBieArr,this.type)
+    } catch (error) {
+      this.pageStatus = 3  
+    } 
+  },
   props: {
+    jiBieArr: {
+      type: Array,
+      default() {
+        return [0, 1, 2];
+      },
+    },
+    type: {
+      type: Number
+    },
     // page: {
     //   type: Number,
     //   default: 1,
@@ -67,9 +83,6 @@ export default {
     //   required: true,
     // }
   },
-  components: {
-    vueQr,
-  },
   computed: {
     // currentPage: {
     //   get() {

+ 11 - 0
src/main.js

@@ -50,6 +50,17 @@ Vue.prototype.msgError = function (msg) {
 Vue.prototype.msgInfo = function (msg) {
   this.$message.info(msg);
 }
+Vue.prototype.unit = {
+  '92#':'L',
+  '95#':'L',
+  '98#':'L',
+  '0#':'L',
+  '-10#':'L',
+  '-20#':'L',
+  'LNG':'Kg',
+  'CNG':'L',
+  '非油品':'',
+}
 
 Vue.prototype.queryPageStatus = queryPageStatus
 

+ 1 - 1
src/views/coupon/Coupon_Grant.vue

@@ -1,6 +1,6 @@
 <template>
 <div>
-    <al></al>
+    <al>1231</al>
 </div>
 </template>
 

+ 12 - 2
src/views/point/Point_Rule.vue

@@ -252,7 +252,13 @@
 
           <el-col :span="8"> </el-col>
         </el-row>
-        <el-form-item label="积分轮播图" prop="imgFileList">
+        <el-form-item label="积分轮播图" prop="imgFileList" 
+        :rules="{
+            required: form.integralFlag == 1 ,
+            message: '标签不能为空,不需要请删除此项',
+            trigger: 'blur',
+          }"
+        >
           <el-upload
             class="avatar-uploader"
             :action="addressUrl"
@@ -301,6 +307,10 @@ export default {
   name: "Point_Rule",
   data() {
     let validateItemsDetail = (rule, value, callback) => {
+      if(this.form.integralFlag == 0){
+        callback();
+        return;
+      }
       if (this.form.itemsDetail.length <= 0) {
         callback(new Error("请先配置设置规则"));
         return;
@@ -392,7 +402,7 @@ export default {
         ],
         // termDateManage:[{ required: true, message: "请选择是否开启积分", trigger: "change" }],
         // integralActivity:[{ required: true, message: "请选择是否开启积分", trigger: "change" }],
-        imgFileList: [{ required: true, message: "", trigger: "change" }],
+        // imgFileList: [{ required: true, message: "", trigger: "change" }],
         itemsDetail: [{ validator: validateItemsDetail, trigger: "change" }],
         termDateManage: [
           { validator: validateTermDateManage, trigger: "change" },