lilei 1 年之前
父节点
当前提交
8de58fe6df
共有 2 个文件被更改,包括 8 次插入4 次删除
  1. 6 2
      src/views/salesManagement/salesQueryNew/comps/productList.vue
  2. 2 2
      vue.config.js

+ 6 - 2
src/views/salesManagement/salesQueryNew/comps/productList.vue

@@ -186,8 +186,12 @@
       </template>
       <!-- 折扣 -->
       <template slot="discountPrice" slot-scope="text, record">
-        <span v-if="record.promotionFlag=='DISCOUNT'">{{ record.discountRate }}%</span>
-        <span v-else>--</span>
+        <div v-if="record.promotionFlag=='DISCOUNT'&&detailData">
+          <span v-if="detailData.buyerLevel=='PROVINCE'">{{ record.provinceDiscount }}%</span>
+          <span v-if="detailData.buyerLevel=='CITY'">{{ record.cityDiscount }}%</span>
+          <span v-if="detailData.buyerLevel=='SPECIAL'">{{ record.specialDiscount }}%</span>
+        </div>
+        <div v-else>--</div>
       </template>
       <!-- 销售数量 -->
       <template slot="salesNums" slot-scope="text, record">

+ 2 - 2
vue.config.js

@@ -108,9 +108,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.2.113:8660/ocs-admin',
+        // target: 'http://192.168.2.113:8660/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
-        // target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
+        target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {