Merge branch 'dev-td' into 'master-td'

Dev td

See merge request !4

src/views/userManagement/memberManagement/index.vue

@@ -71,6 +71,32 @@
           <span>{{ scope.row.extract }}</span>
         </template>
       </el-table-column>
+      <el-table-column align="center" label="分红金额">
+        <template slot-scope="scope">
+          <span>{{ scope.row.shareAmount }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" label="是否分红">
+        <template slot-scope="scope">
+          <el-switch
+            v-model="scope.row.isShare"
+            @change="changeIsInAppShare(scope.row)"
+            active-color="#13ce66"
+          >
+          </el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="是否在APP显示">
+        <template slot-scope="scope">
+          <el-switch
+            v-model="scope.row.isShow"
+            @change="changeIsInAppShow(scope.row)"
+            active-color="#13ce66"
+          >
+          </el-switch>
+        </template>
+      </el-table-column>
       <el-table-column align="center" label="有效期">
         <template slot-scope="scope">
           <span>{{ scope.row.endDate }}</span>
@@ -197,17 +223,32 @@
           </el-row>
           <el-row>
             <el-col :span="16">
-              <el-form-item label="价格" prop="price">
+              <el-form-item label="分红金额">
                 <el-input
                   type="number"
                   min="0"
-                  v-model="add.price"
-                  placeholder="请填价格"
-                  :disabled="forbid"
+                  v-model="add.shareAmount"
+                  placeholder="分红金额"
                 ></el-input>
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="16">
+              <el-form-item label="是否分红">
+                <el-switch v-model="add.isShare" active-color="#13ce66">
+                </el-switch>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="16">
+              <el-form-item label="是否在APP显示" label-width="100">
+                <el-switch v-model="add.isShow" active-color="#13ce66">
+                </el-switch>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-form-item label="图标" :style="{ display: 'block' }">
               <el-upload
@@ -325,6 +366,7 @@ import {
 } from "src/api/admin/member/index";
 import { mapGetters } from "vuex";
 import { getToken } from "src/utils/auth";
+import { itemPage } from "../../../api/vehicle/upkeep";
 
 export default {
   name: "membershipGrade",
@@ -420,6 +462,34 @@ export default {
       this.cancelSetMemberArea("membershipGrade");
     },
     //编辑
+    changeIsInAppShare(row) {
+      this.changeRowStatus(row);
+    },
+    changeIsInAppShow(row) {
+      this.changeRowStatus(row);
+    },
+    changeRowStatus(row) {
+      this.activeId = row.id;
+      let membership = JSON.parse(JSON.stringify(row));
+      membership.endDate = membership.endDate - 1;
+      membership.id = this.activeId;
+      membership.isShow = Number(membership.isShow);
+      membership.isShare = Number(membership.isShare);
+      update(membership).then((data) => {
+        if (data.status == 200) {
+          this.$notify.success({
+            title: "操作成功",
+            message: `success`,
+          });
+        } else {
+          this.$notify.warning({
+            title: "操作失败",
+            message: `failed`,
+          });
+        }
+        this.getList();
+      });
+    },
     compileShip(row) {
       console.log(row);
       this.vipTitle = "编辑会员等级";
@@ -436,6 +506,9 @@ export default {
         icon: row.icon,
         bigIcon: row.bigIcon,
         itemImg: row.itemImg,
+        shareAmount: row.shareAmount,
+        isShow: Boolean(row.isShow),
+        isShare: Boolean(row.isShare),
       };
       this.activeId = row.id;
     },
@@ -450,6 +523,10 @@ export default {
           }
         }
         this.list = res.data;
+        this.list.map((item) => {
+          item.isShow = Boolean(item.isShow);
+          item.isShare = Boolean(item.isShare);
+        });
         this.listLoading = false;
       });
     },
@@ -494,6 +571,8 @@ export default {
       let membership = JSON.parse(JSON.stringify(this.add));
       membership.endDate = membership.endDate - 1;
       membership.id = this.activeId;
+      membership.isShow = Number(membership.isShow);
+      membership.isShare = Number(membership.isShare);
       if (this.vipTitle == "增加会员等级") {
         addMembershipGrade(membership).then((res) => {
           if (!res.rel) {