vue版本升级为2.6 优化cdn加载，优化部分样式，删除某部分图片，修改店铺bug

2025-12-21 02:15:54 +08:00 · 2021-09-06 17:01:38 +08:00
parent 43349a51d1
commit b0021a759f
56 changed files with 5319 additions and 29769 deletions
--- a/buyer/src/pages/Merchant.vue
+++ b/buyer/src/pages/Merchant.vue
@@ -41,23 +41,23 @@
        class="goods-show-info"
        v-for="(item, index) in goodsList"
        :key="index"
-        @click="goGoodsDetail(item.id, item.goodsId)"
+        @click="goGoodsDetail(item.content.id, item.content.goodsId)"
      >
        <div class="goods-show-img">
-          <img width="220" height="220" :src="item.thumbnail" />
+          <img width="220" height="220" :src="item.content.thumbnail" />
        </div>
        <div class="goods-show-price">
          <span>
            <span class="seckill-price text-danger">{{
-              item.price | unitPrice("￥")
+              item.content.price | unitPrice("￥")
            }}</span>
          </span>
        </div>
        <div class="goods-show-detail">
-          <span>{{ item.goodsName }}</span>
+          <span>{{ item.content.goodsName }}</span>
        </div>
        <div class="goods-show-num">
-          已有<span>{{ item.commentNum || 0 }}</span>人评价
+          已有<span>{{ item.content.commentNum || 0 }}</span>人评价
        </div>
      </div>
    </div>
@@ -237,6 +237,6 @@ export default {
  }
 }
 .promotion-decorate::before,.promotion-decorate::after{
-  background-image: url('../../static/sprite@2x.png');
+  background-image: url('/src/assets/images/sprite@2x.png');
 }
 </style>
--- a/buyer/src/pages/home/memberCenter/Distribution.vue
+++ b/buyer/src/pages/home/memberCenter/Distribution.vue
@@ -342,7 +342,7 @@ export default {
  font-weight: bold;
 }
 .subTips {
-  @include sub_color($light_sub_color);
+ 
 }
 .fontsize_48 {
  font-size: 48px;
--- a/buyer/src/pages/home/orderCenter/MyAddress.vue
+++ b/buyer/src/pages/home/orderCenter/MyAddress.vue
@@ -110,7 +110,7 @@ export default {
 }

 .address-content-title {
-  @include sub_color($light_sub_color);
+ 
 }

 .address-action span {
--- a/buyer/src/pages/home/userCenter/MoneyManagement.vue
+++ b/buyer/src/pages/home/userCenter/MoneyManagement.vue
@@ -496,7 +496,7 @@ export default {
  font-weight: bold;
 }
 .subTips {
-  @include sub_color($light_sub_color);
+ 
 }
 .account-btns {
  margin: 10px 0;
--- a/buyer/src/pages/payment/PayDone.vue
+++ b/buyer/src/pages/payment/PayDone.vue
@@ -21,7 +21,7 @@ export default {
 };
 </script>

-<style scoped>
+<style scoped lang='scss'>
 .pay-done-box {
  margin: 100px;
  display: flex;
@@ -31,5 +31,8 @@ export default {
 .pay-btn{
  width: 300px;
  margin: 0 auto;
+  >*{
+    margin:0 4px;
+  }
 }
 </style>
--- a/buyer/src/pages/promotion/PointGoodsDetail.vue
+++ b/buyer/src/pages/promotion/PointGoodsDetail.vue
@@ -285,6 +285,9 @@ export default {

 .add-buy-car {
  margin-top: 15px;
+  >*{
+    margin: 0 4px;
+  }
 }
 .item-select {
  display: flex;
--- a/buyer/src/pages/promotion/PointMall.vue
+++ b/buyer/src/pages/promotion/PointMall.vue
@@ -150,7 +150,7 @@ export default {
  justify-content: flex-end;
 }
 .promotion-decorate::before,.promotion-decorate::after{
-  background-image: url('../../../static/sprite@2x.png');
+  background-image: url('/src/assets/images/sprite@2x.png');
 }
 .cate-select-con{
  display: block;
--- a/buyer/src/pages/promotion/seckill.vue
+++ b/buyer/src/pages/promotion/seckill.vue
@@ -164,7 +164,7 @@ export default {
  background-color: #666;
 }
 .promotion-decorate::before,.promotion-decorate::after{
-  background-image: url('../../../static/sprite@2x.png');
+  background-image: url('/src/assets/images/sprite@2x.png');
 }
 .time-line{
  width: 1200px;
--- a/buyer/src/pages/shopEntry/ShopEntry.vue
+++ b/buyer/src/pages/shopEntry/ShopEntry.vue
@@ -2,7 +2,7 @@
  <div class="shop-entry">
    <div style="height: 20px"></div>
    <div class="content">
-      <h3>店铺入驻</h3>
+      <h1>店铺入驻</h1>
      <Steps :current="currentIndex" class="margin">
        <Step title="企业资质信息"></Step>
        <Step title="财务资质信息"></Step>
@@ -22,7 +22,8 @@
        <span v-if="storeDisable == 'REFUSED'">审核未通过,请修改资质信息，如有疑问请联系管理员</span>
      </div>
      <Button v-if="currentIndex === 3" @click="$router.push('/')">返回</Button>
-      <Button type="primary" @click='currentIndex = 0' v-if="storeDisable === 'REFUSED' && currentIndex === 3">重新申请</Button>
+      <Button type="primary" @click='currentIndex = 0'
+        v-if="storeDisable === 'REFUSED' && currentIndex === 3">重新申请</Button>
    </div>

    <Modal title="店铺入驻协议" v-model="showAgreement" width="1200" :closable="false" :mask-closable="false">
@@ -38,37 +39,38 @@
  </div>
 </template>
 <script>
-import { agreement, applyStatus } from '@/api/shopentry';
-import firstApply from './FirstApply';
-import secondApply from './SecondApply';
-import thirdApply from './ThirdApply';
+import { agreement, applyStatus } from "@/api/shopentry";
+import firstApply from "./FirstApply";
+import secondApply from "./SecondApply";
+import thirdApply from "./ThirdApply";
 export default {
  components: {
    firstApply,
    secondApply,
-    thirdApply
+    thirdApply,
  },
-  data () {
+  data() {
    return {
      currentIndex: 0, // 当前步骤
      showAgreement: false, // 协议显示
-      agreementCon: '', // 协议内容
+      agreementCon: "", // 协议内容
      checked: false, // 选中协议
      firstData: {}, // 第一步数据
      secondData: {}, // 第二步数据
      thirdData: {}, // 第三步数据
-      storeDisable: '', // APPLY OPEN 开店中 CLOSED 关闭 REFUSED 拒绝 APPLYING 申请中，审核
-      dataReview: true // 根据接口返回判断是否可展示数据
+      storeDisable: "", // APPLY OPEN 开店中 CLOSED 关闭 REFUSED 拒绝 APPLYING 申请中，审核
+      dataReview: true, // 根据接口返回判断是否可展示数据
    };
  },
  methods: {
-    getArticle () {
+    getArticle() {
      // 入驻协议
      agreement().then((res) => {
        this.agreementCon = res.result.content;
      });
    },
-    getData (status) { // 获取已填写店铺信息
+    getData(status) {
+      // 获取已填写店铺信息
      applyStatus().then((res) => {
        if (res.success) {
          if (!res.result) {
@@ -77,38 +79,38 @@ export default {
            this.dataReview = false;
            let data = res.result;
            let first = [
-              'companyAddressPath',
-              'companyAddress',
-              'companyAddressIdPath',
-              'companyEmail',
-              'companyName',
-              'employeeNum',
-              'companyPhone',
-              'legalId',
-              'legalName',
-              'licencePhoto',
-              'legalPhoto',
-              'licenseNum',
-              'linkName',
-              'linkPhone',
-              'registeredCapital',
-              'scope'
+              "companyAddressPath",
+              "companyAddress",
+              "companyAddressIdPath",
+              "companyEmail",
+              "companyName",
+              "employeeNum",
+              "companyPhone",
+              "legalId",
+              "legalName",
+              "licencePhoto",
+              "legalPhoto",
+              "licenseNum",
+              "linkName",
+              "linkPhone",
+              "registeredCapital",
+              "scope",
            ];
            let second = [
-              'settlementBankAccountName',
-              'settlementBankAccountNum',
-              'settlementBankBranchName',
-              'settlementBankJointName'
+              "settlementBankAccountName",
+              "settlementBankAccountNum",
+              "settlementBankBranchName",
+              "settlementBankJointName",
            ];
            let third = [
-              'goodsManagementCategory',
-              'storeCenter',
-              'storeDesc',
-              'storeLogo',
-              'storeName',
-              'storeAddressIdPath',
-              'storeAddressPath',
-              'storeAddressDetail'
+              "goodsManagementCategory",
+              "storeCenter",
+              "storeDesc",
+              "storeLogo",
+              "storeName",
+              "storeAddressIdPath",
+              "storeAddressPath",
+              "storeAddressDetail",
            ];

            this.storeDisable = data.storeDisable;
@@ -122,8 +124,8 @@ export default {
            third.forEach((e) => {
              this.thirdData[e] = data[e];
            });
-            if (status === 'init') {
-              if (this.storeDisable === 'APPLY') {
+            if (status === "init") {
+              if (this.storeDisable === "APPLY") {
                this.currentIndex = 0;
              } else {
                this.currentIndex = 3;
@@ -132,37 +134,36 @@ export default {
            this.$nextTick(() => {
              this.dataReview = true;
              this.$forceUpdate();
-            })
+            });
          }
        }
      });
    },
    // 下一步
-    nextPage (step) {
+    nextPage(step) {
      this.currentIndex = step;
-      this.getData('next')
-    }
+      this.getData("next");
+    },
  },
-  mounted () {
-    this.getData('init');
+  mounted() {
+    this.getData("init");
    this.getArticle();
-  }
+  },
 };
 </script>
 <style lang="scss" scoped>
 .content {
  width: 1200px;
  margin: 0 auto;
-  border: 1px solid #eee;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
  min-height: 500px;
-  border-radius: 5px;
-  box-shadow: 3px 3px 10px #999;
+  border-radius: 20px;
  background: #fff;
  padding: 10px 20px;

-  h3 {
-    text-align: center;
-    margin-bottom: 10px;
+  h1 {
+    
+    margin-top: 20px;
  }
 }

@@ -179,4 +180,8 @@ export default {
  text-align: center;
  font-size: 20px;
 }
+.shop-entry {
+  min-height: 100vh;
+  padding: 32px 0;
+}
 </style>