edit

src/components/templatesFrom/index.vue

@@ -6,6 +6,9 @@
       </el-form-item>
       <el-form-item label="运费说明：" prop="info">
         <el-input v-model="ruleForm.info" type="textarea" placeholder="请输入运费说明" />
+        <span class="" style="color: #ff4949;">
+          运费说明会显示在商品名称下方，请仔细填写
+        </span>
       </el-form-item>
       <el-form-item label="计费方式：" prop="type">
         <el-radio-group v-model="ruleForm.type" @change="changeRadio(ruleForm.type)">

src/filters/commFilter.js

@@ -96,7 +96,7 @@ export function cancelOrderStatusFilter(status) {
 
 export function orderPayType(type) {
   const typeMap = {
-    '0': '抵扣券支付',
+    '0': '银联支付',
     '1': '微信支付',
     '2': '小程序',
     '3': '微信支付',

src/views/order/index.vue

@@ -79,10 +79,10 @@
             class="selWidth"
             @change="getList(1),getCardList()"
           >
-            <el-option label="抵扣券" value="0" />
-            <el-option label="微信" value="1" />
+            <el-option label="银联支付" value="0" />
+            <!-- <el-option label="微信" value="1" /> -->
             <el-option label="支付宝" value="2" />
-            <el-option label="铸源星" value="7" />
+            <!-- <el-option label="铸源星" value="7" /> -->
           </el-select>
         </el-form-item>
         <el-form-item label="关键字：" prop="keywords">

src/views/order/orderDetails.vue

@@ -32,13 +32,13 @@
                 @click="send"
                 >发送货</el-button
               >
-              <el-button
+              <!-- <el-button
                 v-if="orderDetailList.paid == 1"
                 type="success"
                 size="small"
                 @click="printOrder"
                 >小票打印</el-button
-              >
+              > -->
               <el-dropdown @command="handleCommand" class="ml10">
                 <el-button icon="el-icon-more" size="small"></el-button>
                 <el-dropdown-menu slot="dropdown">
@@ -139,22 +139,22 @@
                     <span v-if="orderDetailList.finalOrder&&orderDetailList.finalOrder.pay_price&&orderDetailList.finalOrder.paid==1">尾款¥{{orderDetailList.finalOrder.pay_price}}</span>
                   </div>
                 </li>
-                 <li class="item">
+                 <!-- <li class="item">
                   <div>优惠券金额：</div>
                   <div class="value">{{ orderDetailList.coupon_price ? orderDetailList.coupon_price : '-' }}</div>
-                </li>
+                </li> -->
                  <li v-if="orderDetailList.integral" class="item">
-                  <div>积分抵扣：</div>
+                  <div>铸源星抵扣：</div>
                   <div v-if="orderDetailList.integral && orderDetailList.integral != 0" class="value">使用了{{ orderDetailList.integral }}个积分，抵扣了{{ orderDetailList.integral_price }}元</div>
                 </li>
                 <li class="item">
                   <div>商品总价：</div>
                   <div class="value">{{ orderDetailList.total_price ? orderDetailList.total_price : '-' }}</div>
                 </li>
-                <li class="item" v-if="orderDetailList.svip_discount">
+                <!-- <li class="item" v-if="orderDetailList.svip_discount">
                   <div>会员商品优惠：</div>
                   <div class="value">{{ orderDetailList.svip_discount }}</div>
-                </li>
+                </li> -->
                 <li class="item">
                   <div>支付运费：</div>
                   <div class="value">{{ orderDetailList.pay_postage }}</div>

src/views/order/orderRefund/index.vue

@@ -113,10 +113,10 @@
                 class="selWidth"
                 @change="getList(1)"
               >
-                <el-option label="抵扣卷" value="0" />
-                <el-option label="微信" value="1" />
+                <el-option label="银联支付" value="0" />
+                <!-- <el-option label="微信" value="1" /> -->
                 <el-option label="支付宝" value="2" />
-                <el-option label="铸源星" value="7" />
+                <!-- <el-option label="铸源星" value="7" /> -->
               </el-select>
             </el-form-item>
             <el-form-item>

src/views/product/addProduct/index.vue

@@ -2169,7 +2169,7 @@ const objTitle = {
     title: '占比'
   },
   coupon:{
-    title:'抵扣'
+    title:'抵扣券'
   },
   stock: {
     title: '库存'

src/views/systemForm/setSystem/modifyStoreInfo.vue

@@ -44,9 +44,9 @@
         <div class="basic-information">
           <div>
             <span class="basic-label">是否开启商户：</span>
-            <el-tooltip v-if="(marginNumber>0 || serviceNumber>0 || goodsNumber>0) && merData.mer_state == 0" class="item" effect="dark" content="请先支付店铺保证金！" placement="top-start">
-              <el-switch v-model="merData.mer_state" disabled :width="55" active-text="开启" inactive-text="关闭" :active-value="1" :inactive-value="0" />
-            </el-tooltip>
+            <!-- <el-tooltip v-if="(marginNumber>0 || serviceNumber>0 || goodsNumber>0) && merData.mer_state == 0" class="item" effect="dark" content="请先支付店铺保证金！" placement="top-start"> -->
+              <el-switch v-if="(marginNumber>0 || serviceNumber>0 || goodsNumber>0) && merData.mer_state == 0" v-model="merData.mer_state" disabled :width="55" active-text="开启" inactive-text="关闭" :active-value="1" :inactive-value="0" />
+            <!-- </el-tooltip> -->
             <el-switch v-else v-model="merData.mer_state" active-text="开启" inactive-text="关闭" :active-value="1" :inactive-value="0" :width="55" />
             <span class="trip">请先支付店铺费用!</span>
           </div>