leisure-core 0.4.8 → 0.4.9

package/le-promotions-activities/src/sub.vue

@@ -3,8 +3,8 @@
     <el-form-item label="活动标题" prop="title">
       <el-input v-model="form.title"></el-input>
     </el-form-item>
-    <el-form-item label="活动类型" prop="ptype">
-      <el-select v-model="form.ptype" placeholder="请选择活动类型">
+    <el-form-item label="适用公式" prop="ptype">
+      <el-select v-model="form.ptype" placeholder="请选择公式">
         <el-option
           v-for="item in pTypeOptions"
           :label="item.name"
@@ -39,6 +39,12 @@
       >
       </el-date-picker>
     </el-form-item>
+    <el-form-item label="活动类别">
+      <el-select v-model="form.category">
+        <el-option label="正常促销" :value="0" :key="0"></el-option>
+        <el-option label="秒杀" :value="1" :key="1"></el-option>
+      </el-select>
+    </el-form-item>
     <el-form-item label="是否启用">
       <el-select v-model="form.released">
         <el-option label="是" value="1" key="1"></el-option>
@@ -82,6 +88,7 @@ export default {
         id: "",
         title: "",
         ptype: "",
+        category: 0,
         pname: "",
         date_start: "",
         date_end: "",
@@ -127,6 +134,7 @@ export default {
       this.form.date_end = new Date(this.rowData.date_end * 1000);
       this.form.is_used_coupon = "1";
       this.form.is_used_integral = "1";
+      this.form.category = 1;
       this.form.released = this.form.released.toString();
       if (this.form.grang == 2) {
         let products = this.form.grang_product;

package/le-user/src/add.vue

@@ -20,6 +20,26 @@
         ></el-option>
       </el-select>
     </el-form-item> -->
+      <el-form-item label="所属商家" v-if="this.$stype == 'multiple'">
+        <el-select
+          v-model="form.bid"
+          placeholder="请选择商家"
+          clearable
+          filterable
+          remote
+          reserve-keyword
+          :remote-method="getMallBusiness"
+          style="display: block; width: 100%"
+        >
+          <el-option
+            v-for="item in boptions"
+            :label="item.bname"
+            :value="item.id"
+            :key="item.id"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="备注" prop="note">
         <el-input v-model="form.note"></el-input>
       </el-form-item>
@@ -31,9 +51,16 @@
   </div>
 </template>
 <script>
-import { add as userAdd } from "@/api/user";
+import { add as userAdd, edit as userEdit } from "@/api/user";
+import { list as blist } from "@/api/mall_business";
 export default {
   name: "le-user-add",
+  props: {
+    currentUser: {
+      type: Object,
+      default: () => {},
+    },
+  },
   data() {
     return {
       companys: [],
@@ -50,7 +77,9 @@ export default {
         invite_code: "",
         note: "",
         password: "",
+        bid: "",
       },
+      boptions: [],
       rules: {
         account: [
           { required: true, message: "请输入账号", trigger: "blur" },
@@ -80,31 +109,48 @@ export default {
       },
     };
   },
+  watch: {
+    currentUser: {
+      handler(newValue) {
+        if (newValue && newValue.id && newValue.id.length > 0) {
+          this.form = newValue;
+          if (this.form.bid && this.form.bid.length > 0) {
+            if (!this.boptions || this.boptions.length <= 0) {
+              this.getMallBusiness();
+            }
+          }
+        }
+      },
+      immediate: true,
+    },
+  },
   mounted() {},
   methods: {
     onSubmit() {
       this.$refs["formUserAdd"].validate((valid) => {
         if (valid) {
-          let param = {
-            id: this.form.id,
-            account: this.form.account,
-            nick: this.form.nick,
-            cid: this.form.cid,
-            logo_url: this.form.logo_url,
-            cardNo: this.form.cardNo,
-            type: this.form.type,
-            note: this.form.note,
-            password: this.form.password,
-            typeCode: this.userTypeDict[1].code,
-            typeName: this.userTypeDict[1].name,
-            openid: "openid",
-          };
-          userAdd(param)
-            .then((response) => {
-              this.$message.success(response.data.info);
-              this.close();
-            })
-            .catch((err) => {});
+          let param = {};
+          param = JSON.parse(JSON.stringify(this.form));
+          param.typeCode = this.userTypeDict[1].code;
+          param.typeName = this.userTypeDict[1].name;
+          param.forbid_login = Number(param.forbid_login);
+          param.is_place_order = Number(param.is_place_order);
+          if (param.id && param.id.length > 0) {
+            userEdit(param)
+              .then((response) => {
+                this.$message.success(response.data.info);
+                this.close();
+              })
+              .catch((err) => {});
+          } else {
+            param.openid = "openid";
+            userAdd(param)
+              .then((response) => {
+                this.$message.success(response.data.info);
+                this.close();
+              })
+              .catch((err) => {});
+          }
         } else {
           return false;
         }
@@ -113,6 +159,24 @@ export default {
     close() {
       this.$emit("close");
     },
+    getMallBusiness(query) {
+      let param = {};
+      param.pageNo = 1;
+      if (query) {
+        param.bname = query;
+      }
+      if (this.form.bid && this.form.bid.length > 0) {
+        param.id = this.form.bid;
+      }
+
+      blist(param).then((res) => {
+        if (res.data.data) {
+          this.boptions = res.data.data.list;
+        } else {
+          this.boptions = [];
+        }
+      });
+    },
   },
 };
 </script>

package/le-user/src/main.vue

@@ -168,7 +168,11 @@
       :showDialog="showUserAdd"
       @close="closeUserAdd"
     >
-      <le-user-add v-if="showUserAdd" @close="closeUserAdd"></le-user-add>
+      <le-user-add
+        :currentUser="currentUser"
+        v-if="showUserAdd"
+        @close="closeUserAdd"
+      ></le-user-add>
     </le-dialog-container>
   </div>
 </template>
@@ -180,7 +184,7 @@ import {
   close,
   userChangePwd,
 } from "@/api/user";
-import leMixins from "leisure-core/le-libs/mixins/main";//
+import leMixins from "leisure-core/le-libs/mixins/main"; //
 import guid from "leisure-js/common/util";
 import moment from "moment";
 import LeUserSub from "./sub.vue";
@@ -234,7 +238,12 @@ export default {
       this.currentUser = item;
       this.currentUser.forbid_login = Boolean(item.forbid_login ?? 0);
       this.currentUser.is_place_order = Boolean(item.is_place_order ?? 0);
-      this.showEditUser = true;
+
+      if (item.managered && item.managered == 1) {
+        this.showUserAdd = true;
+      } else {
+        this.showEditUser = true;
+      }
     },
     resetPwd(row) {
       //重置密码
@@ -267,9 +276,11 @@ export default {
       this.currentUser = {};
     },
     addUser() {
+      this.currentUser = {};
       this.showUserAdd = true;
     },
     closeUserAdd() {
+      this.currentUser = {};
       this.showUserAdd = false;
     },
     // bindTypeText(item) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "leisure-core",
-  "version": "0.4.8",
+  "version": "0.4.9",
   "description": "leisure-core是leisure-ui-core的简称,是京心数据基于vue2.0开发的一套后台系统框架与js库,包含登录,首页框架等",
   "private": false,
   "author": "北方乐逍遥(zcx7878)",