优化cdn动态加载管理端，修复砍价金额bug，删除部分不规范代码

manager/src/views/member/list/index.vue

@@ -23,8 +23,9 @@
 
       <Table :loading="loading" border :columns="columns" class="mt_10" :data="data" ref="table"></Table>
       <Row type="flex" justify="end" class="mt_10">
-        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
-          show-total show-elevator show-sizer></Page>
+        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage"
+          @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small" show-total show-elevator
+          show-sizer></Page>
       </Row>
     </Card>
 
@@ -44,7 +45,7 @@
       </Form>
       <div slot="footer">
         <Button @click="addFlag = false">取消</Button>
-        <Button type="primary" :loading="handleAddLoading" @click="addMemberSubmit">确定</Button>
+        <Button type="primary" @click="addMemberSubmit">确定</Button>
       </div>
     </Modal>
     <!-- 修改模态框 -->
@@ -108,11 +109,11 @@ import * as RegExp from "@/libs/RegExp.js";
 export default {
   name: "member",
   components: {
-    region, ossManage
+    region,
+    ossManage,
   },
   data() {
     return {
-      selectedMember: false, //是否是其他组件调用
       descTitle: "", // modal标题
       descFlag: false, //编辑查看框
       loading: true, // 表单加载状态
@@ -210,7 +211,7 @@ export default {
                   {
                     props: {
                       size: "small",
-                      type: params.row.___selected ? "primary" : "",
+                      type: params.row.___selected ? "primary" : "default",
                     },
                     style: {
                       marginRight: "5px",
@@ -302,7 +303,9 @@ export default {
     // 已选择用户数据
     selectedList: {
       type: null,
-      default: [],
+      default: () => {
+        return [];
+      },
     },
   },
   watch: {
@@ -311,7 +314,6 @@ export default {
         this.$set(this, "selectMember", JSON.parse(JSON.stringify(val)));
         this.init(this.data);
         // 将父级数据与当前组件数据进行匹配
-
       },
       deep: true,
       immediate: true,
@@ -381,7 +383,7 @@ export default {
     },
     addMember() {
       this.addFlag = true;
-      this.$refs.addMemberForm.resetFields()
+      this.$refs.addMemberForm.resetFields();
     },
     /**
      * 查询查看会员详情
@@ -416,7 +418,7 @@ export default {
         if (valid) {
           API_Member.addMember(this.addMemberForm).then((res) => {
             if (res.result) {
-              this.$refs.addMemberForm.resetFields()
+              this.$refs.addMemberForm.resetFields();
               this.getData();
               this.$Message.success("添加成功！");
               this.addFlag = false;

manager/src/views/member/list/memberDetail.vue

@@ -65,7 +65,7 @@
     </Card>
 
     <Card class="mt_10">
-      <Tabs type="point" @on-click="memberInfoChange">
+      <Tabs value="point" @on-click="memberInfoChange">
         <TabPane label="TA的积分" name="point">
           <div class="pointsTitle" style="justify-content: flex-start; text-align: left;">
             <div style="width: 120px;">
@@ -203,7 +203,6 @@
             ref="table"
             class="mt_10"
             sortable="custom"
-            @on-sort-change="addressChangeSort"
           >
           </Table>
 
@@ -339,8 +338,8 @@
         </FormItem>
         <FormItem label="默认" prop="isDefault">
           <RadioGroup type="button" button-style="solid" v-model="addressForm.isDefault">
-            <Radio :label=true>是</Radio>
-            <Radio :label=false>否</Radio>
+            <Radio label="1">是</Radio>
+            <Radio label="0">否</Radio>
           </RadioGroup>
         </FormItem>
       </Form>
@@ -378,7 +377,7 @@
         addressModalVisible: false, //会员地址操作弹出框
         addressForm: {
           id: "",
-          isDefault: false
+          isDefault: "0"
 
         },//会员地址操作form
         selectDate: null, // 选择时间段
@@ -665,7 +664,7 @@
             key: "isDefault",
             width: 80,
             render: (h, params) => {
-              if (params.row.isDefault) {
+              if (params.row.isDefault == "1") {
                 return h('div', [
                   h('span', {}, "是"),
                 ]);
@@ -981,7 +980,7 @@
         this.addressModalVisible = true
         this.addressForm = {
           id: "",
-          isDefault: false,
+          isDefault: "0",
         }
 
       },
@@ -998,9 +997,11 @@
         this.$refs.addressForm.validate((valid) => {
           if (valid) {
             this.submitLoading = true;
-            if (this.addressForm.id != "") {
+            let submit = JSON.parse(JSON.stringify(this.addressForm))
+            submit.isDefault == "1" ? submit.isDefault  = true :  submit.isDefault = false
+            if (submit.id != "") {
               //修改地址
-              API_Member.editMemberAddress(this.addressForm).then((res) => {
+              API_Member.editMemberAddress(submit).then((res) => {
                 this.submitLoading = false;
                 if (res && res.success) {
                   this.$Message.success("修改成功");
@@ -1010,7 +1011,7 @@
               });
             } else {
               //添加地址
-              API_Member.addMemberAddress(this.addressForm).then((res) => {
+              API_Member.addMemberAddress(submit).then((res) => {
                 this.submitLoading = false;
                 if (res && res.success) {
                   this.$Message.success("添加成功");

manager/src/views/member/list/memberRecycle.vue

@@ -3,100 +3,46 @@
     <Row>
       <Card>
         <Row @keydown.enter.native="handleSearch">
-          <Form
-            ref="searchForm"
-            :model="searchForm"
-            inline
-            :label-width="70"
-            class="search-form"
-          >
+          <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
             <Form-item label="会员名称" prop="username">
-              <Input
-                type="text"
-                v-model="searchForm.username"
-                placeholder="请输入会员名称"
-                clearable
-                style="width: 200px"
-              />
+              <Input type="text" v-model="searchForm.username" placeholder="请输入会员名称" clearable style="width: 200px" />
             </Form-item>
 
             <Form-item label="联系方式" prop="mobile">
-              <Input
-                type="text"
-                v-model="searchForm.mobile"
-                placeholder="请输入会员联系方式"
-                clearable
-                style="width: 200px"
-              />
+              <Input type="text" v-model="searchForm.mobile" placeholder="请输入会员联系方式" clearable style="width: 200px" />
             </Form-item>
-            <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search">搜索</Button >
+            <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search">搜索</Button>
           </Form>
         </Row>
-        <Table
-          :loading="loading"
-          border
-          :columns="columns"
-          :data="data"
-          ref="table"
-          class="mt_10"
-          sortable="custom"
-          @on-selection-change="changeSelect"
-        >
+        <Table :loading="loading" border :columns="columns" :data="data" ref="table" class="mt_10" sortable="custom">
         </Table>
         <Row type="flex" justify="end" class="mt_10">
-          <Page
-            :current="searchForm.pageNumber"
-            :total="total"
-            :page-size="searchForm.pageSize"
-            @on-change="changePage"
-            @on-page-size-change="changePageSize"
-            :page-size-opts="[10, 20, 50]"
-            size="small"
-            show-total
-            show-elevator
-            show-sizer
-          ></Page>
+          <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage"
+            @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small" show-total show-elevator
+            show-sizer></Page>
         </Row>
       </Card>
     </Row>
 
     <!-- 修改模态框 -->
     <Modal v-model="descFlag" :title="descTitle" @on-ok="handleSubmitModal" width="500">
-      <Form
-        ref="formValidate"
-        :model="formValidate"
-        :rules="ruleValidate"
-        :label-width="80"
-      >
+      <Form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="80">
         <FormItem label="头像">
-          <img :src="formValidate.face" class="face"/>
-          <Button
-            type="text"
-            class="upload"
-            @click="
+          <img :src="formValidate.face" class="face" />
+          <Button type="text" class="upload" @click="
               () => {
                 this.picModelFlag = true;
                 this.$refs.ossManage.selectImage = true;
               }
-            "
-          >修改
-          </Button
-          >
-          <input
-            type="file"
-            style="display: none"
-            id="file"
-          />
+            ">修改
+          </Button>
+          <input type="file" style="display: none" id="file" />
         </FormItem>
         <FormItem label="会员名称" prop="name">
-          <Input
-            v-model="formValidate.username"
-            style="width: 200px"
-            disabled
-          />
+          <Input v-model="formValidate.username" style="width: 200px" disabled />
         </FormItem>
         <FormItem label="用户昵称" prop="name">
-          <Input v-model="formValidate.nickName" style="width: 200px"/>
+          <Input v-model="formValidate.nickName" style="width: 200px" />
         </FormItem>
         <FormItem label="性别" prop="sex">
           <RadioGroup type="button" button-style="solid" v-model="formValidate.sex">
@@ -109,137 +55,123 @@
           </RadioGroup>
         </FormItem>
         <FormItem label="修改密码" prop="password">
-          <Input
-            type="password"
-            style="width: 220px"
-            password
-            v-model="formValidate.newPassword"
-          />
+          <Input type="password" style="width: 220px" password v-model="formValidate.newPassword" />
         </FormItem>
         <FormItem label="生日" prop="birthday">
-          <DatePicker
-            type="date"
-            format="yyyy-MM-dd"
-            v-model="formValidate.birthday"
-            style="width: 220px"
-          ></DatePicker>
+          <DatePicker type="date" format="yyyy-MM-dd" v-model="formValidate.birthday" style="width: 220px"></DatePicker>
         </FormItem>
         <FormItem label="所在地" prop="mail">
           <div class="form-item" v-if="!updateRegion">
-            <Input disabled style="width: 250px" :value="formValidate.region"/>
-            <Button
-              type="text"
-              @click="
+            <Input disabled style="width: 250px" :value="formValidate.region" />
+            <Button type="text" @click="
                 () => {
                   this.updateRegion = !this.updateRegion;
                 }
-              "
-            >修改
-            </Button
-            >
+              ">修改
+            </Button>
           </div>
           <div class="form-item" v-else>
-            <region style="width: 250px" @selected="selectedRegion"/>
+            <region style="width: 250px" @selected="selectedRegion" />
           </div>
         </FormItem>
       </Form>
     </Modal>
     <Modal width="1200px" v-model="picModelFlag">
-      <ossManage @callback="callbackSelected" ref="ossManage"/>
+      <ossManage @callback="callbackSelected" ref="ossManage" />
     </Modal>
   </div>
 </template>
 
 <script>
-  import region from "@/views/lili-components/region";
-  import * as API_Member from "@/api/member.js";
-  import ossManage from "@/views/sys/oss-manage/ossManage";
+import region from "@/views/lili-components/region";
+import * as API_Member from "@/api/member.js";
+import ossManage from "@/views/sys/oss-manage/ossManage";
 
-
-  export default {
-    name: "memberRecycle",
-    components: {
-      region,
-      ossManage,
-    },
-    data() {
-      return {
-        selectedMember: false, //是否是其他组件调用
-        descTitle: "", // modal标题
-        descFlag: false, //编辑查看框
-        openSearch: true, // 显示搜索
-        loading: true, // 表单加载状态
-        updateRegion: false, // 显示所在地
-        searchForm: { // 请求参数
-          pageNumber: 1,
-          pageSize: 10,
-          order: "desc",
-          username: "",
-          mobile: "",
-          disabled: "CLOSE"
+export default {
+  name: "memberRecycle",
+  components: {
+    region,
+    ossManage,
+  },
+  data() {
+    return {
+      selectedMember: false, //是否是其他组件调用
+      descTitle: "", // modal标题
+      descFlag: false, //编辑查看框
+      openSearch: true, // 显示搜索
+      loading: true, // 表单加载状态
+      updateRegion: false, // 显示所在地
+      searchForm: {
+        // 请求参数
+        pageNumber: 1,
+        pageSize: 10,
+        order: "desc",
+        username: "",
+        mobile: "",
+        disabled: "CLOSE",
+      },
+      picModelFlag: false, // 选择图片
+      formValidate: {}, // 表单数据
+      ruleValidate: {}, //修改验证
+      columns: [
+        {
+          title: "会员名称",
+          align: "left",
+          key: "username",
+          tooltip: true,
         },
-        picModelFlag: false, // 选择图片
-        formValidate: {}, // 表单数据
-        ruleValidate: {}, //修改验证
-        columns: [
-          {
-            title: "会员名称",
-            align: "left",
-            key: "username",
-            tooltip: true
-
-          },
-          {
-
-            title: "昵称",
-            align: "left",
-            key: "nickName",
-            tooltip: true
-          },
-          {
-            title: "联系方式",
-            width: 130,
-            key: "mobile",
-            render: (h, params) => {
-              if (params.row.mobile == null) {
-                return h('div', [h('span', {}, "")]);
-              } else {
-                return h('div', [h('span', {}, params.row.mobile)]);
-              }
-
+        {
+          title: "昵称",
+          align: "left",
+          key: "nickName",
+          tooltip: true,
+        },
+        {
+          title: "联系方式",
+          width: 130,
+          key: "mobile",
+          render: (h, params) => {
+            if (params.row.mobile == null) {
+              return h("div", [h("span", {}, "")]);
+            } else {
+              return h("div", [h("span", {}, params.row.mobile)]);
             }
           },
-          {
-            title: "注册时间",
-            key: "createTime",
-            width: 180
-          },
+        },
+        {
+          title: "注册时间",
+          key: "createTime",
+          width: 180,
+        },
 
-          {
-            title: "积分数量",
-            align: "left",
-            width: 120,
-            render: (h, params) => {
-              return h(
-                "div",
-                {},
-                params.row.point == void 0 ? "0" : params.row.point
-              );
-            },
+        {
+          title: "积分数量",
+          align: "left",
+          width: 120,
+          render: (h, params) => {
+            return h(
+              "div",
+              {},
+              params.row.point == void 0 ? "0" : params.row.point
+            );
           },
-          {
-            title: "操作",
-            key: "action",
-            align: "center",
-            width: 200,
-            fixed: "right",
-            render: (h, params) => {
-              return h("div", {
+        },
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          width: 200,
+          fixed: "right",
+          render: (h, params) => {
+            return h(
+              "div",
+              {
                 style: {
                   display: "flex",
-                  justifyContent: "center"
-                }
-              }, [
+                  justifyContent: "center",
+                },
+              },
+              [
                 h(
                   "Button",
                   {
@@ -282,7 +214,7 @@
                   {
                     props: {
                       size: "small",
-                      type: "success"
+                      type: "success",
                     },
                     style: {
                       marginRight: "5px",
@@ -303,7 +235,7 @@
                     props: {
                       type: "info",
                       size: "small",
-                      ghost:true
+                      ghost: true,
                     },
                     style: {
                       marginRight: "5px",
@@ -316,140 +248,141 @@
                   },
                   "编辑"
                 ),
-              ]);
-            },
+              ]
+            );
           },
-        ],
-        data: [], // 表单数据
-        total: 0, // 表单数据总数
-      };
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  methods: {
+    // 回调给父级
+    callback(val) {
+      this.$emit("callback", val);
+    },
+    // 初始化数据
+    init() {
+      this.getData();
+    },
+    // 分页 修改页码
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getData();
+    },
+    // 分页 修改页数
+    changePageSize(v) {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = v;
+      this.getData();
+    },
+    // 搜索
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getData();
+    },
+    //查看详情修改
+    editPerm(val) {
+      this.descTitle = `查看用户 ${val.username}`;
+      this.descFlag = true;
+      this.updateRegion = false;
+      this.getMemberInfo(val.id);
+    },
+    /**
+     * 查询查看会员详情
+     */
+    getMemberInfo(id) {
+      API_Member.getMemberInfoData(id).then((res) => {
+        if (res.result) {
+          this.$set(this, "formValidate", res.result);
+        }
+      });
+    },
+    //查询会员列表
+    getData() {
+      API_Member.getMemberListData(this.searchForm).then((res) => {
+        if (res.success) {
+          this.loading = false;
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+    },
+    // 选中的图片
+    callbackSelected(val) {
+      this.picModelFlag = false;
+      this.formValidate.face = val.url;
     },
-    methods: {
-      // 回调给父级
-      callback(val) {
-        this.$emit("callback", val);
-      },
-      // 初始化数据
-      init() {
-        this.getData();
-      },
-      // 分页 修改页码
-      changePage(v) {
-        this.searchForm.pageNumber = v;
-        this.getData();
-      },
-      // 分页 修改页数
-      changePageSize(v) {
-        this.searchForm.pageNumber = 1;
-        this.searchForm.pageSize = v;
-        this.getData();
-      },
-      // 搜索
-      handleSearch() {
-        this.searchForm.pageNumber = 1;
-        this.searchForm.pageSize = 10;
-        this.getData();
-      },
-      //查看详情修改
-      editPerm(val) {
-        this.descTitle = `查看用户 ${val.username}`;
-        this.descFlag = true;
-        this.updateRegion = false
-        this.getMemberInfo(val.id);
-      },
-      /**
-       * 查询查看会员详情
-       */
-      getMemberInfo(id) {
-        API_Member.getMemberInfoData(id).then((res) => {
-          if (res.result) {
-            this.$set(this, "formValidate", res.result);
-          }
-        });
-      },
-      //查询会员列表
-      getData() {
-        API_Member.getMemberListData(this.searchForm).then((res) => {
-          if (res.result.records) {
-            this.loading = false
-            this.data = res.result.records;
-            this.total = res.result.total;
-          }
-        });
-      },
-      // 选中的图片
-      callbackSelected(val) {
-        this.picModelFlag = false;
-        this.formValidate.face = val.url;
-      },
 
-      // 选中的地址
-      selectedRegion(val) {
-        this.region = val[1];
-        this.regionId = val[0];
-      },
+    // 选中的地址
+    selectedRegion(val) {
+      this.region = val[1];
+      this.regionId = val[0];
+    },
 
-      //详细
-      detail(row){
-        this.$router.push({ name: "member-detail", query: { id: row.id } });
-      },
+    //详细
+    detail(row) {
+      this.$router.push({ name: "member-detail", query: { id: row.id } });
+    },
     //启用会员
-      enable(v) {
-        let params = {
-          memberIds: [v.id],
-          disabled: true
-        }
-        this.$Modal.confirm({
-          title: '提示',
-          content: '<p>启用用此会员？</p>',
-          onOk: () => {
-            API_Member.updateMemberStatus(params).then(res => {
-              if (res.success) {
-                this.$Message.success('禁用成功');
-                this.getData()
-              } else {
-                // this.$Message.error(res.message);
-              }
-            });
-          }
-        });
-      },
+    enable(v) {
+      let params = {
+        memberIds: [v.id],
+        disabled: true,
+      };
+      this.$Modal.confirm({
+        title: "提示",
+        content: "<p>启用用此会员？</p>",
+        onOk: () => {
+          API_Member.updateMemberStatus(params).then((res) => {
+            if (res.success) {
+              this.$Message.success("禁用成功");
+              this.getData();
+            } else {
+              // this.$Message.error(res.message);
+            }
+          });
+        },
+      });
+    },
 
-      // 提交修改数据
-      handleSubmitModal() {
-        const {nickName, sex, username, face, newPassword} = this.formValidate;
-        let time = new Date(this.formValidate.birthday);
-        let birthday =
-          time.getFullYear() + "-" + (time.getMonth() + 1) + "-" + time.getDate();
-        let submit = {
-          regionId: this.regionId,
-          region: this.region,
-          nickName,
-          username,
-          sex,
-          birthday,
-          face,
-        };
-        if (newPassword) {
-          submit.password = this.md5(newPassword);
+    // 提交修改数据
+    handleSubmitModal() {
+      const { nickName, sex, username, face, newPassword } = this.formValidate;
+      let time = new Date(this.formValidate.birthday);
+      let birthday =
+        time.getFullYear() + "-" + (time.getMonth() + 1) + "-" + time.getDate();
+      let submit = {
+        regionId: this.regionId,
+        region: this.region,
+        nickName,
+        username,
+        sex,
+        birthday,
+        face,
+      };
+      if (newPassword) {
+        submit.password = this.md5(newPassword);
+      }
+      API_Member.updateMember(submit).then((res) => {
+        if (res.result) {
+          this.$Message.success("修改成功！");
+          this.init();
         }
-        API_Member.updateMember(submit).then((res) => {
-          if (res.result) {
-            this.$Message.success("修改成功！");
-            this.init();
-          }
-        });
-      },
+      });
     },
-    mounted() {
-      this.init();
-    },
-  };
+  },
+  mounted() {
+    this.init();
+  },
+};
 </script>
 <style lang="scss" scoped>
-  .face {
-    width: 60px;
-    height: 60px;
-    border-radius: 50%;
-  }
+.face {
+  width: 60px;
+  height: 60px;
+  border-radius: 50%;
+}
 </style>