lilei 1 year ago
parent
commit
d193fe5cc0

+ 2 - 2
src/views/promotionRulesManagement/dealerPromotions/detailModal.vue

@@ -171,8 +171,8 @@ export default {
       isShow: this.openModal, //  是否打开弹框
       spinning: false,
       formItemLayout: {
-        labelCol: { span: 5 },
-        wrapperCol: { span: 16 }
+        labelCol: { span: 4 },
+        wrapperCol: { span: 20 }
       },
       form: {
         promotionRuleType: undefined,

+ 3 - 3
src/views/salesManagement/salesQueryNew/comps/detailProductList.vue

@@ -25,7 +25,7 @@
   
   <script>
     import { commonMixin } from '@/utils/mixin'
-    import detailModal from '@/views/promotionRulesManagement/dealerPromotions/detail.vue'
+    import detailModal from '@/views/promotionRulesManagement/dealerPromotions/detailModal.vue'
     import { salesPromoQueryList } from '@/api/salesNew'
     import { salesDetailAllList, salesPromoDetailCount, salesDetaiCount } from '@/api/salesDetailNew'
     export default {
@@ -143,7 +143,7 @@
                     {record.promo?(
                       <div>
                         <strong style="margin-right:10px;font-size:14px;">{record.promo.promotion.title} ({record.promo.promotionRule.description})</strong>
-                        <span style="margin-left:10px;color:#00aaff;cursor: pointer;" onClick={()=>_this.showDesc(record)}>
+                        <span style="margin-left:10px;color:#00aaff;cursor: pointer;" onClick={()=>_this.showDesc(record.promo)}>
                           <a-icon title="查看活动详情" type="eye"/> 活动详情
                         </span>
                       </div>
@@ -256,7 +256,7 @@
         },
          // 查看活动详情
         showDesc(row){
-          this.detailSn = row.promotionRuleSn
+          this.detailSn = row.promoRuleSn
           this.openDetailModal = true
         },
         // 获取销售单参与的活动列表

+ 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: {