Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui

2025-12-17 08:25:52 +08:00 · 2021-05-17 17:42:56 +08:00
parent a3953b9ab5 da5cc8335f
commit 3d1391e305
58 changed files with 161 additions and 133 deletions
--- a/manager/src/libs/axios.js
+++ b/manager/src/libs/axios.js
@@ -125,7 +125,7 @@ function getTokenDebounce() {
      lock = true
      let oldRefreshToken = getStore("refreshToken");
      handleRefreshToken(oldRefreshToken).then(res => {
-        if (res.code === 200) {
+        if (res.success) {
          let {
            accessToken,
            refreshToken
--- a/manager/src/styles/common.scss
+++ b/manager/src/styles/common.scss
@@ -14,7 +14,9 @@ $theme_color: #804ed1;
  border-radius: 1em;
  background-color: rgba(50,50,50,.1);
 }
-
+.ivu-table table{ 
+  width: 100%!important;
+}

 .flex{
  display: flex !important;
--- a/manager/src/views/lili-floor-renovation/floorList
+++ b/manager/src/views/lili-floor-renovation/floorList
@@ -133,7 +133,7 @@ export default {
        pageClientType: "PC",
      };
      API_floor.getHomeList(params).then((res) => {
-        if (res.code == 200) {
+        if (res.success) {
          this.templateList = res.result.records;
        }
      });
@@ -142,7 +142,7 @@ export default {
    releaseTemplate(id) {
      //发布模板
      API_floor.releasePageHome(id).then((res) => {
-        if (res.code === 200) {
+        if (res.success) {
          this.$Message.success("发布模板成功");
          this.getTemplateList();
        }
@@ -155,7 +155,7 @@ export default {
        content: "<p>确定删除该模板吗？</p>",
        onOk: () => {
          API_floor.removePageHome(id).then((res) => {
-            if (res.code === 200) {
+            if (res.success) {
              this.$Message.success("删除模板成功");
              this.getTemplateList();
            }
--- a/manager/src/views/lili-floor-renovation/floorList.vue
+++ b/manager/src/views/lili-floor-renovation/floorList.vue
@@ -153,7 +153,7 @@ export default {
        pageClientType: "PC",
      };
      API_floor.getHomeList(params).then((res) => {
-        if (res.code == 200) {
+        if (res.success) {
          this.list = res.result.records;
          this.list.forEach(e => {
            if (e.pageShow === 'OPEN') {
@@ -169,7 +169,7 @@ export default {
    releaseTemplate(id) {
      //发布模板
      API_floor.releasePageHome(id).then((res) => {
-        if (res.code === 200) {
+        if (res.success) {
          this.$Message.success("发布模板成功");
          this.getTemplateList();
        }
@@ -178,7 +178,7 @@ export default {

    delTemplate(id) {
      API_floor.removePageHome(id).then((res) => {
-        if (res.code === 200) {
+        if (res.success) {
          this.$Message.success("删除模板成功");
          this.getTemplateList();
        }
--- a/manager/src/views/lili-floor-renovation/renovation.vue
+++ b/manager/src/views/lili-floor-renovation/renovation.vue
@@ -51,7 +51,7 @@ export default {
                pageData:modelForm,
            }
            API_floor.updateHome(this.$route.query.id, data).then(res=> {
-                if(res.code === 200) {
+                if(res.success) {
                    this.$Message.success('保存模板成功');
                } else {
                    this.$Message.error(res.message)
@@ -63,7 +63,7 @@ export default {
        },
        getTemplateItem(id){ // 获取模板数据
            API_floor.getHomeData(id).then(res => {
-                if (res.code === 200) {
+                if (res.success) {
                    let pageData = res.result.pageData;
                    if(pageData) {
                        pageData = JSON.parse(pageData);
--- a/manager/src/views/lili-floor-renovation/wap/navbar.vue
+++ b/manager/src/views/lili-floor-renovation/wap/navbar.vue
@@ -136,7 +136,7 @@ export default {
      })
        .then((res) => {
          this.num = 50;
-          if (res.code == 200) {
+          if (res.success) {
            this.num = 80;
            /**制作保存成功动画¸ */
            setTimeout(() => {
@@ -166,7 +166,7 @@ export default {
      API_Other.setHomeSetup(submitWay)
        .then((res) => {
          this.num = 50;
-          if (res.code == 200) {
+          if (res.success) {
            this.num = 80;
            /**制作保存成功动画¸ */
            setTimeout(() => {
--- a/manager/src/views/main-components/tags-page-opened.vue
+++ b/manager/src/views/main-components/tags-page-opened.vue
@@ -8,20 +8,8 @@
    @mousewheel="handlescroll"
    class="tags-outer-scroll-con"
  >
-    <!-- <div class="close-all-tag-con">
-      <Dropdown transfer @on-click="handleTagsOption">
-        <Button size="small" type="primary">
-          <Icon type="md-arrow-dropdown"></Icon>
-        </Button>
-        <DropdownMenu slot="list">
-          <DropdownItem name="clearAll">{{ $t('closeAll') }}</DropdownItem>
-          <DropdownItem name="clearOthers">{{ $t('closeOthers') }}</DropdownItem>
-        </DropdownMenu>
-      </Dropdown>
-    </div> -->
-
    <ul v-show="visible" :style="{left: contextMenuLeft + 'px', top: contextMenuTop + 'px'}" class="contextmenu">
-      <li v-for="(item, key) of menuList" @click="handleTagsOption(key)" :key="key">{{item}}</li>
+      <li v-for="(item, key) of actionList" @click="handleTagsOption(key)" :key="key">{{item}}</li>
    </ul>
    <div ref="scrollBody" class="tags-inner-scroll-body" :style="{left: tagBodyLeft + 'px'}">
      <transition-group name="taglist-moving-animation">
--- a/manager/src/views/member/list/index.vue
+++ b/manager/src/views/member/list/index.vue
@@ -430,7 +430,7 @@ export default {
        content: "<p>确认禁用此会员？</p>",
        onOk: () => {
          API_Member.updateMemberStatus(params).then((res) => {
-            if (res.code === 200) {
+            if (res.success) {
              this.$Message.success("禁用成功");
              this.getData();
            } else {
--- a/manager/src/views/member/list/memberRecycle.vue
+++ b/manager/src/views/member/list/memberRecycle.vue
@@ -421,7 +421,7 @@
          content: '<p>确认禁用此会员？</p>',
          onOk: () => {
            API_Member.updateMemberStatus(params).then(res => {
-              if (res.code === 200) {
+              if (res.success) {
                this.$Message.success('禁用成功');
                this.getData()
              } else {
@@ -446,7 +446,7 @@
          content: '<p>启用用此会员？</p>',
          onOk: () => {
            API_Member.updateMemberStatus(params).then(res => {
-              if (res.code === 200) {
+              if (res.success) {
                this.$Message.success('禁用成功');
                this.getData()
              } else {
--- a/manager/src/views/my-components/map/index.vue
+++ b/manager/src/views/my-components/map/index.vue
@@ -58,7 +58,7 @@ methods: {
             townName: this.addrContent.regeocode.addressComponent.township
         }
      getRegion(params).then(res=>{
-             if(res.code == 200) {
+             if(res.success) {
                  this.addrContent.addr = res.result.name.replace(/,/g," ")
                  this.addrContent.addrId = res.result.id
                  this.loading = false
--- a/manager/src/views/order/order/orderList.vue
+++ b/manager/src/views/order/order/orderList.vue
@@ -254,7 +254,7 @@ export default {
        content: "<p>您确定要收款吗？线下收款涉及库存变更，需异步进行，等待约一分钟刷新列表查看</p>",
        onOk: () => {
          API_Order.orderPay(v.sn).then((res) => {
-            if (res.code === 200) {
+            if (res.success) {
              this.$Message.success("收款成功");
              this.getDataList();
            } else {
--- a/manager/src/views/seller/bill/bill-detail.vue
+++ b/manager/src/views/seller/bill/bill-detail.vue
@@ -389,7 +389,7 @@ export default {

    pass() {
      API_Shop.pay(this.id).then((res) => {
-        if (res.code == 200) {
+        if (res.success) {
          this.$Message.success(res.message);
          this.init();
        }
--- a/manager/src/views/sys/message/sms.vue
+++ b/manager/src/views/sys/message/sms.vue
@@ -761,7 +761,7 @@ export default {
            API_Setting.addSmsTemplatePage(this.templateForm)
              .then((res) => {
                this.loading = false;
-                if (res.code === 200) {
+                if (res.success) {
                  this.$Message.success("添加成功");
                  this.loading = false;
                  this.templateModalVisible = false;
@@ -775,7 +775,7 @@ export default {
            API_Setting.editSmsTemplatePage(this.templateForm)
              .then((res) => {
                this.loading = false;
-                if (res.code === 200) {
+                if (res.success) {
                  this.$Message.success("修改成功");
                  this.loading = false;
                  this.templateModalVisible = false;
--- a/manager/src/views/sys/message/smsSign.vue
+++ b/manager/src/views/sys/message/smsSign.vue
@@ -124,7 +124,7 @@
            if (this.id == undefined) {
              API_Setting.addSmsSign(this.form).then(res => {
                this.loading = false;
-                if (res.code === 200) {
+                if (res.success) {
                  this.$Message.success('添加成功');
                  this.$router.back()
                }
@@ -134,7 +134,7 @@
            } else {
              API_Setting.editSmsSign(this.form).then(res => {
                this.loading = false;
-                if (res.code === 200) {
+                if (res.success) {
                  this.$Message.success('修改成功');
                  this.$router.back()
                }
@@ -150,7 +150,7 @@
      getSmsSignDetail() {
        API_Setting.smsSignDetail(this.id).then(res => {
          this.loading = false;
-          if (res.code === 200) {
+          if (res.success) {
            this.form = res.result
          }
        })
--- a/manager/src/views/sys/setting-manage/authLogin/QQ_CONNECT.vue
+++ b/manager/src/views/sys/setting-manage/authLogin/QQ_CONNECT.vue
@@ -84,7 +84,7 @@ export default {
        setSetting(this.type, {
          qqConnectSettingItemList: this.formValidate,
        }).then((res) => {
-          if (res.code == 200) {
+          if (res.success) {
            this.$Message.success("保存成功!");
            this.$Modal.remove();
          } else {
--- a/manager/src/views/sys/setting-manage/authLogin/WECHAT_CONNECT.vue
+++ b/manager/src/views/sys/setting-manage/authLogin/WECHAT_CONNECT.vue
@@ -82,7 +82,7 @@ export default {
        setSetting(this.type, {
          wechatConnectSettingItems: this.formValidate,
        }).then((res) => {
-          if (res.code == 200) {
+          if (res.success) {
            this.$Message.success("保存成功!");
            this.$Modal.remove();
          } else {
--- a/manager/src/views/sys/setting-manage/pay/ALIPAY_PAYMENT.vue
+++ b/manager/src/views/sys/setting-manage/pay/ALIPAY_PAYMENT.vue
@@ -54,7 +54,7 @@ export default {

    setupSetting() {
      setSetting(this.type, this.formValidate).then((res) => {
-        if (res.code == 200) {
+        if (res.success) {
          this.$Message.success("保存成功!");
        } else {
          this.$Message.error("保存失败!");
--- a/manager/src/views/sys/setting-manage/pay/PAYMENT_SUPPORT.vue
+++ b/manager/src/views/sys/setting-manage/pay/PAYMENT_SUPPORT.vue
@@ -104,7 +104,7 @@ export default {
    setupSetting() {
      setSetting(this.type, { paymentSupportItems: this.formValidate }).then(
        (res) => {
-          if (res.code == 200) {
+          if (res.success) {
            this.$Message.success("保存成功!");
            this.$Modal.remove();
          } else {
--- a/manager/src/views/sys/setting-manage/pay/WECHAT_PAYMENT.vue
+++ b/manager/src/views/sys/setting-manage/pay/WECHAT_PAYMENT.vue
@@ -60,7 +60,7 @@ export default {

    setupSetting() {
      setSetting(this.type, this.formValidate).then((res) => {
-        if (res.code == 200) {
+        if (res.success) {
          this.$Message.success("保存成功!");
        } else {
          this.$Message.error("保存失败!");
--- a/manager/src/views/sys/setting-manage/setting/BASE_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/BASE_SETTING.vue
@@ -103,7 +103,7 @@ export default {

    setupSetting() {
      setSetting(this.type, this.formValidate).then((res) => {
-        if (res.code == 200) {
+        if (res.success) {
          this.$Message.success("保存成功!");
        } else {
          this.$Message.error("保存失败!");
--- a/manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue
@@ -99,7 +99,7 @@ export default {

    setupSetting() {
      setSetting(this.type, this.formValidate).then((res) => {
-        if (res.code == 200) {
+        if (res.success) {
          this.$Message.success("保存成功!");
        } else {
          this.$Message.error("保存失败!");
--- a/manager/src/views/sys/setting-manage/setting/KUAIDI_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/KUAIDI_SETTING.vue
@@ -47,7 +47,7 @@ export default {

    setupSetting() {
      setSetting(this.type, this.formValidate).then((res) => {
-        if (res.code == 200) {
+        if (res.success) {
          this.$Message.success("保存成功!");
        } else {
          this.$Message.error("保存失败!");
--- a/manager/src/views/sys/setting-manage/setting/ORDER_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/ORDER_SETTING.vue
@@ -71,7 +71,7 @@ export default {

    setupSetting() {
      setSetting(this.type, this.formValidate).then((res) => {
-        if (res.code == 200) {
+        if (res.success) {
          this.$Message.success("保存成功!");
        } else {
          this.$Message.error("保存失败!");
--- a/manager/src/views/sys/setting-manage/setting/OSS_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/OSS_SETTING.vue
@@ -53,7 +53,7 @@ export default {

    setupSetting() {
      setSetting(this.type, this.formValidate).then((res) => {
-        if (res.code == 200) {
+        if (res.success) {
          this.$Message.success("保存成功!");
        } else {
          this.$Message.error("保存失败!");
--- a/manager/src/views/sys/setting-manage/setting/POINT_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/POINT_SETTING.vue
@@ -80,7 +80,7 @@ export default {

    setupSetting() {
      setSetting(this.type, this.formValidate).then((res) => {
-        if (res.code == 200) {
+        if (res.success) {
          this.$Message.success("保存成功!");
        } else {
          this.$Message.error("保存失败!");
--- a/manager/src/views/sys/setting-manage/setting/SMS_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/SMS_SETTING.vue
@@ -50,7 +50,7 @@ export default {

    setupSetting() {
      setSetting(this.type, this.formValidate).then((res) => {
-        if (res.code == 200) {
+        if (res.success) {
          this.$Message.success("保存成功!");
        } else {
          this.$Message.error("保存失败!");
--- a/manager/src/views/sys/setting-manage/setting/WITHDRAWAL_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/WITHDRAWAL_SETTING.vue
@@ -42,7 +42,7 @@ export default {

    setupSetting() {
      setSetting(this.type, this.formValidate).then((res) => {
-        if (res.code == 200) {
+        if (res.success) {
          this.$Message.success("保存成功!");
        } else {
          this.$Message.error("保存失败!");
--- a/manager/src/views/sys/setting-manage/smsSettingManage.vue
+++ b/manager/src/views/sys/setting-manage/smsSettingManage.vue
@@ -72,7 +72,7 @@
      },
      saveSetting() {
        setSetting("SMS_SETTING", this.form).then((res) => {
-          if (res.code == 200) {
+          if (res.success) {
            this.$Message.success("保存成功!");
          } else {
            this.$Message.error("保存失败!");