Procházet zdrojové kódy

Merge branch 'develop_yh48' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh48

chenrui před 8 měsíci
rodič
revize
c167211796

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.2.45",
+    "version": "2.2.48",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 1 - 1
src/views/easyPassManagement/promotionalActivities/list.vue

@@ -52,7 +52,7 @@
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 操作按钮 -->
         <div class="table-operator" v-if="$hasPermissions('B_promoActivitiesAdd')">
-          <a-button type="primary" class="button-info" id="promotion-add1-btn" @click="handleEdit('BUY_PROD_GIVE_PROD')">买产品送产品</a-button>
+          <!-- <a-button type="primary" class="button-info" id="promotion-add1-btn" @click="handleEdit('BUY_PROD_GIVE_PROD')">买产品送产品</a-button> -->
           <a-button type="primary" class="button-info" id="promotion-add2-btn" @click="handleEdit('PROMO_PROD')">特价产品</a-button>
           <a-button type="primary" class="button-info" id="promotion-add3-btn" @click="handleEdit('BUY_PROD_GIVE_VALID')">买产品返代金券</a-button>
         </div>