修改一下活动领取

wx_application/src/views/active/activeDetail.vue

@@ -135,7 +135,7 @@ export default {
       timer: null,
       timeLine: "",
       isAward: false,
-      showAward: true,
+      showAward: false,
       userBaseInfo: {},
       isMember: false,
       openid: "",
@@ -277,8 +277,9 @@ export default {
     },
     // 领取(
     handleGet() {
+      console.log("env", this.env);
       if (
-        this.env.match(/MicroMessenger/i) !== "micromessenger" ||
+        this.env.match(/MicroMessenger/i) === "micromessenger" &&
         this.env.match(/wxwork/i) == "wxwork"
       ) {
         this.$toast("请在微信端领取！");
@@ -303,7 +304,7 @@ export default {
       }
       // 会员领取
       let params = {
-        couponId: this.awardGood.activityPrize
+        couponId: this.awardGood.coupon
           ? this.awardGood.coupon.id
           : this.couponDetail.id,
         unionId: this.userBaseInfo.unionid,

ybf_admin/src/pages/in/contact/components/addGroup.vue

@@ -7,20 +7,30 @@
       :show-close="false"
       :close-on-click-modal="false"
     >
-      <el-form :model="addForm" label-width="auto" ref="addStore" :rules="rules" v-loading="formLoading" :element-loading-text="loadText">
+      <el-form
+        :model="addForm"
+        label-width="auto"
+        ref="addStore"
+        :rules="rules"
+        v-loading="formLoading"
+        :element-loading-text="loadText"
+      >
         <el-form-item label="部门名称:" prop="label">
-          <el-input
-            size="small"
-            v-model="addForm.label"
-            placeholder="请输入部门名称"
-            style="width: 50%;"
-          />
+          <el-input size="small" v-model="addForm.label" placeholder="请输入部门名称" style="width: 50%;" />
         </el-form-item>
         <el-form-item label="上级部门:" prop="parentId">
-          <el-cascader v-model="addForm.parentId" :options="orgTree" :props="deptOption" :show-all-levels="false"  clearable style="width: 50%;" @change="handleDpetChange"></el-cascader>
+          <el-cascader
+            v-model="addForm.parentId"
+            :options="orgTree"
+            :props="deptOption"
+            :show-all-levels="false"
+            clearable
+            style="width: 50%;"
+            @change="handleDpetChange"
+          ></el-cascader>
         </el-form-item>
         <el-form-item label="门店名称:" prop="oyStallName">
-           <el-input
+          <el-input
             size="small"
             v-model="addForm.oyStallName"
             placeholder="请输入门店名称"
@@ -28,14 +38,14 @@
           />
         </el-form-item>
         <el-form-item label="门店Id:" prop="oyStallCode">
-           <el-input
+          <el-input
             size="small"
             v-model="addForm.oyStallCode"
             placeholder="请输入门店Id"
             style="width: 50%;"
           />
         </el-form-item>
-        <el-form-item label="门店会员id:" prop="oyStallMemberId" >
+        <el-form-item label="门店会员id:" prop="oyStallMemberId">
           <el-input
             size="small"
             v-model="addForm.oyStallMemberId"
@@ -43,30 +53,56 @@
             style="width: 50%;"
           />
         </el-form-item>
-        <el-form-item label="设置主管:" prop="clerkIds"  >
-          <el-cascader :props="props" ref="direcRef" v-model="deptId" :disabled="ifDisabled" :options="parentDeptList" :show-all-levels="false"  filterable style="width: 30%;margin-right:15px;" @change="handleParentChange" ></el-cascader>
-          <el-select v-model="addForm.clerkIds" filterable multiple placeholder="请选择" style="width: 30%;" clearble  @change="handleMemberChange" :loading="optionLoading" loading-text="数据加载中">
+        <el-form-item label="设置主管:" prop="clerkIds">
+          <el-cascader
+            :props="props"
+            ref="direcRef"
+            v-model="deptId"
+            :disabled="ifDisabled"
+            :options="parentDeptList"
+            :show-all-levels="false"
+            filterable
+            style="width: 30%;margin-right:15px;"
+            @change="handleParentChange"
+          ></el-cascader>
+          <el-select
+            v-model="addForm.clerkIds"
+            filterable
+            multiple
+            placeholder="请选择"
+            style="width: 30%;"
+            clearble
+            @change="handleMemberChange"
+            :loading="optionLoading"
+            loading-text="数据加载中"
+          >
             <el-option
               v-for="item in peopleList"
               :key="item.id"
               :label="item.userName"
               :value="item.id"
-             >
-            </el-option>
+            ></el-option>
           </el-select>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="handleAddCancel" size="small">取 消</el-button>
         <el-button type="primary" @click="handleAddFinish('addStore')" size="small">确 定</el-button>
-      </span> 
+      </span>
     </el-dialog>
     <div></div>
   </div>
 </template>
 
 <script>
-import { addGroup, getWxAllDeptList, getAllMemberList,getGroupById,getAllPeopleList,getOrgTree } from "@/api/in/mail";
+import {
+  addGroup,
+  getWxAllDeptList,
+  getAllMemberList,
+  getGroupById,
+  getAllPeopleList,
+  getOrgTree
+} from "@/api/in/mail";
 import { log } from "util";
 
 export default {
@@ -77,37 +113,38 @@ export default {
     }
   },
   data() {
-     // 检查名称
+    // 检查名称
     const checkLabel = (rule, value, callback) => {
-		  let labelReg = /^[\u4e00-\u9fa5A-Za-z0-9\-\_]*$/;
-		  if (value == "") {
-		    callback(new Error("请输入部门名称"));
-		  } else if (!labelReg.test(value)) {//引入methods中封装的检查手机格式的方法
-		    callback(new Error("只可以输入中文、字母、数字和减号!"));
-		  } else {
-		    callback();
-		  }
-    }
-    // 限制id 
-      const idNumber = (rule, value, callback) => {
-		  let idReg = /^\+?(0|[1-9][0-9]*)$/
-		  if (!idReg.test(value)) {
-		    callback(new Error("只可以输入正整数"))
-		  } else {
-		    callback();
-		  }
-    }
+      let labelReg = /^[\u4e00-\u9fa5A-Za-z0-9\-\_]*$/;
+      if (value == "") {
+        callback(new Error("请输入部门名称"));
+      } else if (!labelReg.test(value)) {
+        //引入methods中封装的检查手机格式的方法
+        callback(new Error("只可以输入中文、字母、数字和减号!"));
+      } else {
+        callback();
+      }
+    };
+    // 限制id
+    const idNumber = (rule, value, callback) => {
+      let idReg = /^\+?(0|[1-9][0-9]*)$/;
+      if (!idReg.test(value)) {
+        callback(new Error("只可以输入正整数"));
+      } else {
+        callback();
+      }
+    };
     const memberNumber = (rule, value, callback) => {
-		  let idReg = /^\+?(0|[1-9][0-9]*)$/
-		  if (!idReg.test(value) && value != '') {
-		    callback(new Error("只可以输入正整数"))
-		  } else {
-		    callback();
-		  }
-    }
+      let idReg = /^\+?(0|[1-9][0-9]*)$/;
+      if (!idReg.test(value) && value != "") {
+        callback(new Error("只可以输入正整数"));
+      } else {
+        callback();
+      }
+    };
     return {
       clerkIds: [],
-      loadText: '加载中',
+      loadText: "加载中",
       treeData: [],
       group_name: "",
       shop_code: "",
@@ -121,17 +158,17 @@ export default {
       checked: false,
       ////
       addForm: {
-        label: '',
-        parentId: '',
-        oyStallName: '',
-        oyStallMemberId: '',
-        oyStallCode: '',
+        label: "",
+        parentId: "",
+        oyStallName: "",
+        oyStallMemberId: "",
+        oyStallCode: "",
         clerkIds: [],
-        oydeptId: ''
+        oydeptId: ""
       },
       detail: 2,
       ifDisabled: false,
-      deptId: '',
+      deptId: "",
       // 上级部门
       parentDeptList: [],
       peopleList: [],
@@ -142,129 +179,132 @@ export default {
           { required: true, message: "请输入部门名称", trigger: "blur" },
           { max: 50, message: "长度在50个字符以内", trigger: "blur" }
         ],
-        parentId: [{ required: true, message: "请选择上级部门", trigger: "change" }],
-        oyStallCode: [{  required: true, validator: idNumber, trigger: "blur" }],
-        oyStallMemberId: [{  required: false, validator: memberNumber, trigger: "blur" }],
-        clerkIds: [{  required: true, message: "主管不能为空", trigger: "change" }]
+        parentId: [
+          { required: true, message: "请选择上级部门", trigger: "change" }
+        ],
+        oyStallCode: [{ required: true, validator: idNumber, trigger: "blur" }],
+        oyStallMemberId: [
+          { required: false, validator: memberNumber, trigger: "blur" }
+        ],
+        clerkIds: [
+          { required: true, message: "主管不能为空", trigger: "change" }
+        ]
       },
       deptOption: {
-          value: 'id',
-          children: 'children',
-          lazy: true,
-          emitPath: false,
-          checkStrictly: true,
-          lazyLoad (node, resolve) {
-            const { level } = node;
-            setTimeout(() => {
-              const nodes = Array.from(level)
-                .map(item => ({
-                  value: level.id,
-                  label: level.label,
-                  leaf: level >= 2
-                }))
-              // 通过调用resolve将子节点数据返回，通知组件数据加载完成
-              resolve(nodes);
-            }, 1000);
-          }
+        value: "id",
+        children: "children",
+        lazy: true,
+        emitPath: false,
+        checkStrictly: true,
+        lazyLoad(node, resolve) {
+          const { level } = node;
+          setTimeout(() => {
+            const nodes = Array.from(level).map(item => ({
+              value: level.id,
+              label: level.label,
+              leaf: level >= 2
+            }));
+            // 通过调用resolve将子节点数据返回，通知组件数据加载完成
+            resolve(nodes);
+          }, 1000);
+        }
       },
       props: {
-        value: 'id',
-        children: 'children',
+        value: "id",
+        children: "children",
         lazy: true,
         emitPath: false,
         checkStrictly: true,
-        lazyLoad (node, resolve) {
+        lazyLoad(node, resolve) {
           const { level } = node;
           setTimeout(() => {
-            const nodes = Array.from(level)
-              .map(item => ({
-                value: level.id,
-                label: level.label,
-                leaf: level >= 2
-              }))
+            const nodes = Array.from(level).map(item => ({
+              value: level.id,
+              label: level.label,
+              leaf: level >= 2
+            }));
             // 通过调用resolve将子节点数据返回，通知组件数据加载完成
             resolve(nodes);
           }, 1000);
-        }     
+        }
       }
-    }
+    };
   },
   created() {
-    this.formLoading = true
-    this.getOrgTree()
-    this.getDeptList()
+    this.formLoading = true;
+    this.getOrgTree();
+    this.getDeptList();
   },
   methods: {
     handleDpetChange(val) {
-      console.log(val,'val')   
+      console.log(val, "val");
     },
     getOrgTree() {
       getOrgTree().then(res => {
-        this.orgTree = [res.data.organizations]
-        this.formLoading = false
+        this.orgTree = [res.data.organizations];
+        this.formLoading = false;
       });
     },
-    handleParentChange(val) { 
-      this.addForm.oydeptId = val
-      this.optionLoading = true     
-      this.clerkIds = []
-      this.addForm.clerkIds = []
-      this.getGroupMember(val)         
+    handleParentChange(val) {
+      this.addForm.oydeptId = val;
+      this.optionLoading = true;
+      this.clerkIds = [];
+      this.addForm.clerkIds = [];
+      this.getGroupMember(val);
     },
     getDeptList() {
       getWxAllDeptList()
         .then(res => {
-          console.log(res,'全部部门')
-          this.parentDeptList = res.data
+          console.log(res, "全部部门");
+          this.parentDeptList = res.data;
         })
         .catch(err => {
-          console.log(err)
+          console.log(err);
         });
     },
     handleAddCancel() {
-      this.$emit("handleAddCancel")
+      this.$emit("handleAddCancel");
     },
-    handleAddFinish(formName) {   
-      this.$refs[formName].validate((valid) => {
+    handleAddFinish(formName) {
+      this.$refs[formName].validate(valid => {
         if (valid) {
-          this.formLoading = true
-          this.loadText = "处理中"
-          this.addForm.clerkIds = this.addForm.clerkIds + ""
+          this.formLoading = true;
+          this.loadText = "处理中";
+          this.addForm.clerkIds = this.addForm.clerkIds + "";
           // let data = Object.assign(this.addForm,{ clerkIdss })
           // delete data.clerkIds
           addGroup(this.addForm).then(res => {
-            if(res.result == "success") {
-              if(res.data.isSuccessful == 0) {    
-                this.addForm.clerkIds = this.clerkIds 
-                this.$message.error("门店id不能重复")
-                this.formLoading = false
-              }else{
-                this.$emit("handleAddFinish")
-                this.formLoading = false
+            if (res.result == "success") {
+              if (res.data.isSuccessful == 0) {
+                this.addForm.clerkIds = this.clerkIds;
+                this.$message.error("门店id不能重复");
+                this.formLoading = false;
+              } else {
+                this.$emit("handleAddFinish");
+                this.formLoading = false;
               }
-            }else {
-              this.addForm.clerkIds = this.clerkIds 
-              this.$message.error(res.errorMsg)
-              this.formLoading = false
+            } else {
+              this.addForm.clerkIds = this.clerkIds;
+              this.$message.error(res.errorMsg);
+              this.formLoading = false;
             }
-            
-          })
+          });
         } else {
           return false;
         }
-        })    
+      });
     },
     // 获取所有人员
     getGroupMember(id) {
-      this.ifDisabled = true
-      getAllPeopleList({ id }).then(res => {   
-        this.peopleList = res.data       
-        this.optionLoading = false
-        this.ifDisabled = false
-      })
+      this.ifDisabled = true;
+      getAllPeopleList({ id }).then(res => {
+        this.peopleList = res.data;
+        this.optionLoading = false;
+        this.ifDisabled = false;
+      });
     },
-    handleMemberChange(val) {    
-      this.clerkIds = val 
+    handleMemberChange(val) {
+      this.clerkIds = val;
       // if(val.length == 0) {
       //   this.addForm.clerkIds = ''
       // }else {