lilei 3 weeks ago
parent
commit
e0fea5b244

+ 3 - 2
src/views/salesManagement/salesQueryNew/comps/activeStatisticsList.vue

@@ -192,10 +192,11 @@ export default {
           renderBodyCell: ({ row, column, rowIndex }, h) => {
           renderBodyCell: ({ row, column, rowIndex }, h) => {
             const isTejia = row && row.promotionRule && row.promotionRule.promotionRuleType == 'PROMO_PROD' && _this.type == 'edit' // 是否特价
             const isTejia = row && row.promotionRule && row.promotionRule.promotionRuleType == 'PROMO_PROD' && _this.type == 'edit' // 是否特价
             const tejiaLen = _this.tableData.filter(item => item.promotionRule && item.promotionRule.promotionRuleType == 'PROMO_PROD').length // 特价活动数量
             const tejiaLen = _this.tableData.filter(item => item.promotionRule && item.promotionRule.promotionRuleType == 'PROMO_PROD').length // 特价活动数量
+            const tjStart = _this.tableData.findIndex(item => item.promotionRule && item.promotionRule.promotionRuleType == 'PROMO_PROD') // 特价活动开始索引
             // 特价活动上移下移排序
             // 特价活动上移下移排序
             const equalWord = <div class="table-arrow-box">
             const equalWord = <div class="table-arrow-box">
-              {rowIndex != 0 ? <span class="up" onClick={() => _this.moveTjRow(row, rowIndex, 1)} title="上移">⇡</span> : ''}
-              {rowIndex != tejiaLen - 1 ? <span class="down" onClick={() => _this.moveTjRow(row, rowIndex, 0)} title="下移">⇣</span> : ''}
+              {rowIndex > tjStart ? <span class="up" onClick={() => _this.moveTjRow(row, rowIndex, 1)} title="上移">⇡</span> : ''}
+              {rowIndex < tjStart + tejiaLen - 1 ? <span class="down" onClick={() => _this.moveTjRow(row, rowIndex, 0)} title="下移">⇣</span> : <span></span>}
             </div>
             </div>
             // 买产品送产品  同款产品 是累计产品才弹详情窗
             // 买产品送产品  同款产品 是累计产品才弹详情窗
             if (row.promotionRule.promotionRuleType === 'BUY_PROD_GIVE_PROD' && row.promotion.borrowFlag == '1' && row.promotionRule.regularSameFlag == '1') {
             if (row.promotionRule.promotionRuleType === 'BUY_PROD_GIVE_PROD' && row.promotion.borrowFlag == '1' && row.promotionRule.regularSameFlag == '1') {

+ 2 - 2
vue.config.js

@@ -106,9 +106,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
     proxy: {
       '/api': {
       '/api': {
-        target: 'http://192.168.2.10:8602/ocs-admin',
+        // target: 'http://192.168.2.103:8602/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/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,
         ws: false,
         changeOrigin: true,
         changeOrigin: true,
         pathRewrite: {
         pathRewrite: {