leisure-core 0.4.35 → 0.4.37

package/le-commission-cp/src/main.vue

@@ -40,7 +40,7 @@
         <template slot-scope="scope">
           <span v-if="scope.row.cstatus == 0">正常</span>
           <span v-if="scope.row.cstatus == 1">已经核销</span>
-          <span v-if="scope.row.cstatus == 0">无效-已经退票</span>
+          <span v-if="scope.row.cstatus == 2">无效-已经退</span>
         </template>
       </vxe-column>
       <vxe-column align="center" title="来源">
@@ -65,6 +65,17 @@
             详情
           </el-button>
         </template> -->
+        <template slot-scope="scope">
+          <el-button
+            type="primary"
+            size="small"
+            @click="hexiao(scope.row)"
+            style="margin-right: 2px"
+            v-if="scope.row.cstatus == 0"
+          >
+            核销
+          </el-button>
+        </template>
       </vxe-column>
     </vxe-table>
     <div style="text-align: center; margin-top: 30px; width: 100%">
@@ -93,7 +104,7 @@
   </div>
 </template>
 <script>
-import { list } from "@/api/commission_cp";
+import { list, hexiao } from "@/api/commission_cp";
 // import LeCommissionSub from "./sub.vue";
 
 export default {
@@ -125,6 +136,16 @@ export default {
       this.list();
     },
 
+    hexiao(row) {
+      this.$confirm("确定核销吗？", "提示").then(() => {
+        let params = { cid: row.id };
+        hexiao(params).then((res) => {
+          this.$message.success("核销成功");
+          this.list();
+        });
+      });
+    },
+
     list() {
       let params = this.searchData;
       list(params).then((res) => {

package/le-distribution-category/src/main.vue

@@ -10,7 +10,7 @@
       </el-table-column>
       <el-table-column prop="ccode" label="分销代码" width="80">
       </el-table-column>
-      <el-table-column prop="crate1" label="佣金比例"> </el-table-column>
+      <el-table-column prop="crate1" label="佣金比例(%)"> </el-table-column>
       <!-- <el-table-column prop="crate2" label="二级佣金比例"> </el-table-column> -->
       <el-table-column prop="note" label="备注"> </el-table-column>
       <el-table-column

package/le-home/src/main.vue

@@ -113,6 +113,12 @@
           ></el-input>
         </el-form-item>
       </el-form>
+      <div
+        ref="pwdref"
+        style="display: flex; justify-content: center; color: red"
+      >
+        {{ pwdinfo }}
+      </div>
       <div slot="footer">
         <el-button type="info" @click="cancelChangePwd('ruleForm')"
           >取 消</el-button
@@ -164,8 +170,8 @@ export default {
       if (value === "") {
         callback(new Error("请输入密码"));
       } else {
-        if (value.length < 6) {
-          callback(new Error("密码至少6位"));
+        if (value.length < 8) {
+          callback(new Error("密码至少8位"));
         } else {
           if (this.ruleForm.confirmPwd !== "") {
             this.$refs.ruleForm.validateField("confirmPwd	");
@@ -210,6 +216,7 @@ export default {
       contextMenuVisible: false,
       menuLeft: 0,
       menuTop: 0,
+      pwdinfo: "",
     };
   },
   mounted() {
@@ -318,13 +325,13 @@ export default {
       });
     },
     changePwdAfter(res) {
-      if (res.data.code == "10000") {
+      if (res && res.data && res.data.code == "10000") {
         this.$message.success("修改密码成功");
         localStorage.clear();
         this.$store.commit("setUserInfo", null);
         this.$router.replace({ path: "/" });
       } else {
-        this.$message.error(res.data.info);
+        this.pwdinfo = res;
       }
     },
     signout() {

package/package.json

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