Bladeren bron

修改商户端所有单位替换 元、rmb、¥

13147038669 5 maanden geleden
bovenliggende
commit
1a9d145a78
18 gewijzigde bestanden met toevoegingen van 85 en 70 verwijderingen
  1. 1 1
      crmeb_src/mer_mer_admin/src/layout/navBars/breadcrumb/userNews.vue
  2. 16 1
      crmeb_src/mer_mer_admin/src/main.js
  3. 2 2
      crmeb_src/mer_mer_admin/src/views/dashboard/components/baseInfo.vue
  4. 7 7
      crmeb_src/mer_mer_admin/src/views/finance/closingRecord/index.vue
  5. 2 2
      crmeb_src/mer_mer_admin/src/views/marketing/group/groupActivity/createActivity.vue
  6. 2 2
      crmeb_src/mer_mer_admin/src/views/marketing/group/groupActivity/detail.vue
  7. 2 2
      crmeb_src/mer_mer_admin/src/views/order/components/directRefund.vue
  8. 1 1
      crmeb_src/mer_mer_admin/src/views/order/components/orderDetail.vue
  9. 1 1
      crmeb_src/mer_mer_admin/src/views/order/components/refundOrderDetail.vue
  10. 4 4
      crmeb_src/mer_mer_admin/src/views/pagediy/components/mobilePage/home_coupon.vue
  11. 12 12
      crmeb_src/mer_mer_admin/src/views/pagediy/components/mobilePage/home_goods_list.vue
  12. 1 1
      crmeb_src/mer_mer_admin/src/views/pagediy/components/mobilePage/home_seckill.vue
  13. 12 12
      crmeb_src/mer_mer_admin/src/views/pagediy/components/mobilePage/home_tab.vue
  14. 3 3
      crmeb_src/mer_mer_admin/src/views/product/comment/creatComment.vue
  15. 5 5
      crmeb_src/mer_mer_admin/src/views/product/components/storeEdit.vue
  16. 7 7
      crmeb_src/mer_mer_admin/src/views/product/creatProduct/default.js
  17. 3 3
      crmeb_src/mer_mer_admin/src/views/systemSetting/deliverGoods/freightSet/creatTemplates.vue
  18. 4 4
      crmeb_src/mer_mer_admin/src/views/systemSetting/printing/printReceipt/creatPrintreceipt.vue

+ 1 - 1
crmeb_src/mer_mer_admin/src/layout/navBars/breadcrumb/userNews.vue

@@ -116,7 +116,7 @@ export default {
     //   ws.$on('PAY_SMS_SUCCESS', function (data) {
     //     that.$notify.info({
     //       title: '短信充值成功',
-    //       message: '恭喜您充值' + data.price + ',获得' + data.number + '条短信',
+    //       message: '恭喜您充值' + data.price + ',获得' + data.number + '条短信',
     //     });
     //     that.messageList.push({
     //       title: '短信充值成功',

+ 16 - 1
crmeb_src/mer_mer_admin/src/main.js

@@ -9,6 +9,21 @@
 // +----------------------------------------------------------------------
 
 import Vue from 'vue';
+import globalVars from '@/utils/global_vars'; // 引入全局变量
+
+// 挂载到 Vue 原型,Vue 组件中通过 this.$GLOBAL 访问
+Vue.prototype.$GLOBAL = globalVars;
+Vue.prototype.$globalVars = globalVars; // 支持用户直觉使用的变量名
+
+// 挂载到 window 对象,JS 文件中通过 window.GLOBAL 或 GLOBAL 访问
+window.GLOBAL = globalVars;
+window.globalVars = globalVars;
+
+// 验证日志 (Antigravity 验证):
+console.log('Antigravity Verification - Vue Prototype:', Vue.prototype.$GLOBAL);
+console.log('Antigravity Verification - Window Object:', window.GLOBAL);
+
+
 import '@babel/polyfill';
 import '@/theme/index.scss';
 import '@/styles/index.scss'; // global css
@@ -147,7 +162,7 @@ Vue.directive('throttle', throttle);
  * delayTime:延迟的时间,只执行最后一次
  */
 Vue.directive('debounceClick', {
-  bind(el, binding, vnode, oldvnode) {},
+  bind(el, binding, vnode, oldvnode) { },
   inserted: function (el, binding) {
     let delayTime = el.getAttribute('delay-time') || 1000;
     el.onclick = Debounce(function () {

+ 2 - 2
crmeb_src/mer_mer_admin/src/views/dashboard/components/baseInfo.vue

@@ -10,11 +10,11 @@
             <el-tag type="primary">今日</el-tag>
           </div>
           <div class="content" v-if="viewData">
-            <span class="content-number spBlock my15">{{ viewData.sales }}</span>
+            <span class="content-number spBlock my15">{{ viewData.sales }} {{ $globalVars.priceUnit }}</span>
             <el-divider></el-divider>
             <div class="acea-row row-between-wrapper">
               <span class="content-time">昨日数据</span>
-              <span class="content-time">{{ viewData.yesterdaySales }} </span>
+              <span class="content-time">{{ viewData.yesterdaySales }} {{ $globalVars.priceUnit }}</span>
             </div>
           </div>
         </el-card>

+ 7 - 7
crmeb_src/mer_mer_admin/src/views/finance/closingRecord/index.vue

@@ -95,7 +95,7 @@
         class="table mt20"
       >
         <el-table-column prop="id" label="ID" min-width="60" />
-        <el-table-column prop="amount" label="转账金额(元)" min-width="120" />
+        <el-table-column prop="amount" label="转账金额" min-width="120" />
         <el-table-column label="审核员姓名" min-width="120" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span>{{ scope.row.auditName | filterEmpty }}</span>
@@ -220,19 +220,19 @@
         <div class="acea-row">
           <div class="list el-form-item el-form-item--mini sp100">
             <label class="el-form-item__label wid112">商户余额:</label>
-            <div class="el-form-item__content ml100">{{ transferBaseInfo.balance || '-' }}</div>
+            <div class="el-form-item__content ml100">{{ transferBaseInfo.balance || '-' }}{{ $globalVars.priceUnit }}</div>
           </div>
           <div class="list el-form-item el-form-item--mini sp100">
             <label class="el-form-item__label wid112">可提现金额:</label>
-            <div class="el-form-item__content ml100">{{ transferBaseInfo.transferBalance || '-' }}</div>
+            <div class="el-form-item__content ml100">{{ transferBaseInfo.transferBalance || '-' }}{{ $globalVars.priceUnit }}</div>
           </div>
           <div class="list el-form-item el-form-item--mini sp100">
             <label class="el-form-item__label wid112">冻结金额:</label>
-            <div class="el-form-item__content ml100">{{ transferBaseInfo.freezeAmount || '-' }}</div>
+            <div class="el-form-item__content ml100">{{ transferBaseInfo.freezeAmount || '-' }}{{ $globalVars.priceUnit }}</div>
           </div>
           <div class="list el-form-item el-form-item--mini sp100">
             <label class="el-form-item__label wid112">保证金额:</label>
-            <div class="el-form-item__content ml100">{{ transferBaseInfo.guaranteedAmount || '-' }}</div>
+            <div class="el-form-item__content ml100">{{ transferBaseInfo.guaranteedAmount || '-' }}{{ $globalVars.priceUnit }}</div>
           </div>
           <div class="list el-form-item el-form-item--mini sp100">
             <label class="el-form-item__label wid112">结算类型:</label>
@@ -335,9 +335,9 @@
                   :closable="false"
                   :title="
                     transferBaseInfo.transferMinAmount || transferBaseInfo.transferMaxAmount
-                      ? `最低可提现额度${transferBaseInfo.transferMinAmount || 0};最高可提现额度${
+                      ? `最低可提现额度${transferBaseInfo.transferMinAmount || 0};最高可提现额度${
                           transferBaseInfo.transferMaxAmount || 0
-                        }`
+                        }${ $globalVars.priceUnit}`
                       : '最高/最低提现额度未限制'
                   "
                   type="warning"

+ 2 - 2
crmeb_src/mer_mer_admin/src/views/marketing/group/groupActivity/createActivity.vue

@@ -230,9 +230,9 @@
                   </el-table-column>
                   <el-table-column label="规格" prop="sku"></el-table-column>
                   <el-table-column label="商品编码" prop="barCode"></el-table-column>
-                  <el-table-column label="售价(元)" prop="price"></el-table-column>
+                  <el-table-column label="售价" prop="price"></el-table-column>
                   <el-table-column label="剩余库存" prop="stock"></el-table-column>
-                  <el-table-column label="拼团价(元)">
+                  <el-table-column label="拼团价">
                     <template slot-scope="scope" v-if="scope.row.sku">
                       <el-input-number
                         type="number"

+ 2 - 2
crmeb_src/mer_mer_admin/src/views/marketing/group/groupActivity/detail.vue

@@ -131,7 +131,7 @@
                         <span>{{ scope.row['attrValue'][0].barCode || '-' }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="售价(元)" prop="price">
+                    <el-table-column label="售价" prop="price">
                       <template slot-scope="scope">
                         <span>{{ scope.row['attrValue'][0].price }}</span>
                       </template>
@@ -141,7 +141,7 @@
                         <span>{{ scope.row['attrValue'][0].stock }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="拼团价(元)" prop="activePrice"></el-table-column>
+                    <el-table-column label="拼团价" prop="activePrice"></el-table-column>
                     <el-table-column label="拼团限量" prop="quota"></el-table-column>
                   </el-table>
                 </div>

+ 2 - 2
crmeb_src/mer_mer_admin/src/views/order/components/directRefund.vue

@@ -66,7 +66,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="可退总额(元)" min-width="60">
+        <el-table-column label="可退总额" min-width="60">
           <template slot-scope="scope">
             <span class="priceBox">{{ scope.row.payPrice - scope.row.refundPrice }}</span>
           </template>
@@ -116,7 +116,7 @@
         </el-table-column>
       </el-table>
       <el-form-item label="预计退款金额:" prop="resource">
-        <div>{{ refundPrice.toFixed(2) }} </div>
+        <div>{{ refundPrice.toFixed(2) }} {{ $globalVars.priceUnit }}</div>
         <div class="from-tips">具体退款金额以实际为准</div>
       </el-form-item>
     </el-form>

+ 1 - 1
crmeb_src/mer_mer_admin/src/views/order/components/orderDetail.vue

@@ -30,7 +30,7 @@
             </li>
             <li class="item">
               <div class="title">实际支付</div>
-              <div>¥ {{ orderDatalist.payPrice || '0.0' }}</div>
+              <div>{{ $globalVars.priceUnit }} {{ orderDatalist.payPrice || '0.0' }}</div>
             </li>
             <li class="item">
               <div class="title">支付方式</div>

+ 1 - 1
crmeb_src/mer_mer_admin/src/views/order/components/refundOrderDetail.vue

@@ -67,7 +67,7 @@
             </li>
             <li class="item">
               <div class="title">退款金额</div>
-              <div>¥ {{ refundInfo.refundPrice || '0.0' }}</div>
+              <div>{{ $globalVars.priceUnit }} {{ refundInfo.refundPrice || '0.0' }}</div>
             </li>
             <li class="item">
               <div class="title">实付金额</div>

+ 4 - 4
crmeb_src/mer_mer_admin/src/views/pagediy/components/mobilePage/home_coupon.vue

@@ -11,7 +11,7 @@
           >
             <div class="left">
               <div :style="priceColorStyle"><span class="price-icon">¥</span><span class="price">80</span></div>
-              <div class="title">满500可用</div>
+              <div class="title">满500{{ $globalVars.priceUnit }}可用</div>
             </div>
             <div class="right">领取</div>
           </div>
@@ -23,7 +23,7 @@
             <div class="list acea-row row-middle">
               <div class="item" v-for="(item, index) in numShow" :key="index" :style="contentConfig">
                 <div class="money" :style="priceColorStyle">
-                  <div><span class="lable">¥</span>70</div>
+                  <div><span class="lable">{{ $globalVars.priceUnit }}</span>70</div>
                   <div class="tips">满500可用</div>
                 </div>
                 <div class="sill" :style="btnColorStyle">去领取</div>
@@ -43,7 +43,7 @@
           >
             <div class="left">
               <div :style="priceColorStyle"><span class="price-icon">¥</span><span class="price">80</span></div>
-              <div class="title">满500可用</div>
+              <div class="title">满500{{ $globalVars.priceUnit }}可用</div>
             </div>
             <div class="right">立<br />即<br />领<br />取</div>
           </div>
@@ -60,7 +60,7 @@
                 :style="contentConfig"
               >
                 <div class="left">
-                  <div :style="priceColorStyle" class="money"><span class="label">¥</span>50</div>
+                  <div :style="priceColorStyle" class="money"><span class="label">{{ $globalVars.priceUnit }}</span>50</div>
                   <div class="tips">满5000可用</div>
                 </div>
                 <div class="right acea-row row-center">

+ 12 - 12
crmeb_src/mer_mer_admin/src/views/pagediy/components/mobilePage/home_goods_list.vue

@@ -48,7 +48,7 @@
                   </div>
                 </div>
                 <div class="price" :style="priceColor">
-                  <div class="num semiBold" v-if="priceShow">¥<span>199</span></div>
+                  <div class="num semiBold" v-if="priceShow">{{ $globalVars.priceUnit }}<span>199</span></div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">已售 999 件</div>
               </div>
@@ -66,7 +66,7 @@
                   </div>
                 </div>
                 <div class="price semiBold" :style="priceColor">
-                  <div class="num" v-if="priceShow">¥<span>199</span></div>
+                  <div class="num" v-if="priceShow">{{ $globalVars.priceUnit }}<span>199</span></div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">已售 999 件</div>
               </div>
@@ -87,7 +87,7 @@
                 </div>
                 <div class="price semiBold" :style="priceColor">
                   <div class="num" v-if="priceShow">
-                    ¥<span>{{ item.price }}</span>
+                    {{ $globalVars.priceUnit }}<span>{{ item.price }}</span>
                   </div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">
@@ -106,7 +106,7 @@
                   <span class="title line2" v-if="titleShow" :style="titleColor">商品名称</span>
                 </div>
                 <div class="price semiBold" :style="priceColor">
-                  <div class="num" v-if="priceShow">¥<span>66.66</span></div>
+                  <div class="num" v-if="priceShow">{{ $globalVars.priceUnit }}<span>66.66</span></div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">已售 999 件</div>
               </div>
@@ -120,7 +120,7 @@
                   <span class="title line2" v-if="titleShow" :style="titleColor">商品名称</span>
                 </div>
                 <div class="price semiBold" :style="priceColor">
-                  <div class="num" v-if="priceShow">¥<span>66.66</span></div>
+                  <div class="num" v-if="priceShow">{{ $globalVars.priceUnit }}<span>66.66</span></div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">已售 999 件</div>
               </div>
@@ -141,7 +141,7 @@
                 </div>
                 <div class="price semiBold" :style="priceColor">
                   <div class="num" v-if="priceShow">
-                    ¥<span>{{ item.price }}</span>
+                    {{ $globalVars.priceUnit }}<span>{{ item.price }}</span>
                   </div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">
@@ -160,7 +160,7 @@
                   <span class="title line2" v-if="titleShow" :style="titleColor">商品名称</span>
                 </div>
                 <div class="price" :style="priceColor">
-                  <div class="num semiBold" v-if="priceShow">¥<span>66.66</span></div>
+                  <div class="num semiBold" v-if="priceShow">{{ $globalVars.priceUnit }}<span>66.66</span></div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">已售 999 件</div>
               </div>
@@ -174,7 +174,7 @@
                   <span class="title line2" v-if="titleShow" :style="titleColor">商品名称</span>
                 </div>
                 <div class="price" :style="priceColor">
-                  <div class="num semiBold" v-if="priceShow">¥<span>66.66</span></div>
+                  <div class="num semiBold" v-if="priceShow">{{ $globalVars.priceUnit }}<span>66.66</span></div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">已售 999 件</div>
               </div>
@@ -188,7 +188,7 @@
                   <span class="title line2" v-if="titleShow" :style="titleColor">商品名称</span>
                 </div>
                 <div class="price" :style="priceColor">
-                  <div class="num semiBold" v-if="priceShow">¥<span>66.66</span></div>
+                  <div class="num semiBold" v-if="priceShow">{{ $globalVars.priceUnit }}<span>66.66</span></div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">已售 999 件</div>
               </div>
@@ -214,7 +214,7 @@
                 </div>
                 <div class="price semiBold" :style="priceColor">
                   <div class="num" v-if="priceShow">
-                    ¥<span>{{ item.price }}</span>
+                    {{ $globalVars.priceUnit }}<span>{{ item.price }}</span>
                   </div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">
@@ -233,7 +233,7 @@
                   <span class="title line2" v-if="titleShow" :style="titleColor">商品名称</span>
                 </div>
                 <div class="price semiBold" :style="priceColor">
-                  <div class="num" v-if="priceShow">¥<span>66.66</span></div>
+                  <div class="num" v-if="priceShow">{{ $globalVars.priceUnit }}<span>66.66</span></div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">已售 999 件</div>
               </div>
@@ -247,7 +247,7 @@
                   <span class="title line2" v-if="titleShow" :style="titleColor">商品名称</span>
                 </div>
                 <div class="price semiBold" :style="priceColor">
-                  <div class="num" v-if="priceShow">¥<span>66.66</span></div>
+                  <div class="num" v-if="priceShow">{{ $globalVars.priceUnit }}<span>66.66</span></div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">已售 999 件</div>
               </div>

+ 1 - 1
crmeb_src/mer_mer_admin/src/views/pagediy/components/mobilePage/home_seckill.vue

@@ -22,7 +22,7 @@
               </div>
               <div v-show="nameShow" class="name line1 skeleton-rect" :style="nameColor">{{ item.name }}</div>
               <div v-show="priceShow" class="x_money line1 skeleton-rect semiBold" :style="priceColor">
-                ¥<span class="num">{{ item.price }}</span>
+                {{ $globalVars.priceUnit }}<span class="num">{{ item.price }}</span>
               </div>
             </div>
           </div>

+ 12 - 12
crmeb_src/mer_mer_admin/src/views/pagediy/components/mobilePage/home_tab.vue

@@ -61,7 +61,7 @@
                   </div>
                 </div>
                 <div class="price" :style="priceColor">
-                  <div class="num semiBold" v-if="priceShow">¥<span>199</span></div>
+                  <div class="num semiBold" v-if="priceShow">{{ $globalVars.priceUnit }}<span>199</span></div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">已售 999 件</div>
               </div>
@@ -79,7 +79,7 @@
                   </div>
                 </div>
                 <div class="price" :style="priceColor">
-                  <div class="num semiBold" v-if="priceShow">¥<span>199</span></div>
+                  <div class="num semiBold" v-if="priceShow">{{ $globalVars.priceUnit }}<span>199</span></div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">已售 999 件</div>
               </div>
@@ -104,7 +104,7 @@
                 </div>
                 <div class="price" :style="priceColor">
                   <div class="num semiBold" v-if="priceShow">
-                    ¥<span>{{ item.price }}</span>
+                    {{ $globalVars.priceUnit }}<span>{{ item.price }}</span>
                   </div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">
@@ -123,7 +123,7 @@
                   <span class="title line2" v-if="titleShow" :style="titleColor">商品名称</span>
                 </div>
                 <div class="price" :style="priceColor">
-                  <div class="num semiBold" v-if="priceShow">¥<span>66.66</span></div>
+                  <div class="num semiBold" v-if="priceShow">{{ $globalVars.priceUnit }}<span>66.66</span></div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">已售 999 件</div>
               </div>
@@ -137,7 +137,7 @@
                   <span class="title line2" v-if="titleShow" :style="titleColor">商品名称</span>
                 </div>
                 <div class="price" :style="priceColor">
-                  <div class="num semiBold" v-if="priceShow">¥<span>66.66</span></div>
+                  <div class="num semiBold" v-if="priceShow">{{ $globalVars.priceUnit }}<span>66.66</span></div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">已售 999 件</div>
               </div>
@@ -162,7 +162,7 @@
                 </div>
                 <div class="price semiBold" :style="priceColor">
                   <div class="num" v-if="priceShow">
-                    ¥<span>{{ item.price }}</span>
+                    {{ $globalVars.priceUnit }}<span>{{ item.price }}</span>
                   </div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">
@@ -181,7 +181,7 @@
                   <span class="title line2" v-if="titleShow" :style="titleColor">商品名称</span>
                 </div>
                 <div class="price" :style="priceColor">
-                  <div class="num semiBold" v-if="priceShow">¥<span>66.66</span></div>
+                  <div class="num semiBold" v-if="priceShow">{{ $globalVars.priceUnit }}<span>66.66</span></div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">已售 999 件</div>
               </div>
@@ -195,7 +195,7 @@
                   <span class="title line2" v-if="titleShow" :style="titleColor">商品名称</span>
                 </div>
                 <div class="price" :style="priceColor">
-                  <div class="num semiBold" v-if="priceShow">¥<span>66.66</span></div>
+                  <div class="num semiBold" v-if="priceShow">{{ $globalVars.priceUnit }}<span>66.66</span></div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">已售 999 件</div>
               </div>
@@ -209,7 +209,7 @@
                   <span class="title line2" v-if="titleShow" :style="titleColor">商品名称</span>
                 </div>
                 <div class="price" :style="priceColor">
-                  <div class="num semiBold" v-if="priceShow">¥<span>66.66</span></div>
+                  <div class="num semiBold" v-if="priceShow">{{ $globalVars.priceUnit }}<span>66.66</span></div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">已售 999 件</div>
               </div>
@@ -235,7 +235,7 @@
                 </div>
                 <div class="price" :style="priceColor">
                   <div class="num semiBold" v-if="priceShow">
-                    ¥<span>{{ item.price }}</span>
+                    {{ $globalVars.priceUnit }}<span>{{ item.price }}</span>
                   </div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">
@@ -254,7 +254,7 @@
                   <span class="title line2" v-if="titleShow" :style="titleColor">商品名称</span>
                 </div>
                 <div class="price" :style="priceColor">
-                  <div class="num semiBold" v-if="priceShow">¥<span>66.66</span></div>
+                  <div class="num semiBold" v-if="priceShow">{{ $globalVars.priceUnit }}<span>66.66</span></div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">已售 999 件</div>
               </div>
@@ -268,7 +268,7 @@
                   <span v-if="titleShow" class="title line2" :style="titleColor">商品名称</span>
                 </div>
                 <div class="price" :style="priceColor">
-                  <div class="num semiBold" v-if="priceShow">¥<span>66.66</span></div>
+                  <div class="num semiBold" v-if="priceShow">{{ $globalVars.priceUnit }}<span>66.66</span></div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">已售 999 件</div>
               </div>

+ 3 - 3
crmeb_src/mer_mer_admin/src/views/product/comment/creatComment.vue

@@ -148,13 +148,13 @@ let attrValue = [
 ];
 const objTitle = {
   price: {
-    title: '售价(元)',
+    title: '售价',
   },
   cost: {
-    title: '成本价(元)',
+    title: '成本价',
   },
   otPrice: {
-    title: '划线价(元)',
+    title: '划线价',
   },
   stock: {
     title: '库存',

+ 5 - 5
crmeb_src/mer_mer_admin/src/views/product/components/storeEdit.vue

@@ -38,7 +38,7 @@
             <template slot-scope="scope">
               <el-input
                 v-if="
-                  (formThead[iii].title === '售价(元)' || (formThead[iii].title === '库存' && productType < 5)) &&
+                  (formThead[iii].title === '售价' || (formThead[iii].title === '库存' && productType < 5)) &&
                   !stockEdit
                 "
                 v-model.trim="scope.row[iii]"
@@ -161,16 +161,16 @@ const defaultObj = {
 };
 const objTitle = {
   price: {
-    title: '售价(元)',
+    title: '售价',
   },
   cost: {
-    title: '成本价(元)',
+    title: '成本价',
   },
   otPrice: {
-    title: '划线价(元)',
+    title: '划线价',
   },
   vipPrice: {
-    title: '会员价(元)',
+    title: '会员价',
   },
   stock: {
     title: '库存',

+ 7 - 7
crmeb_src/mer_mer_admin/src/views/product/creatProduct/default.js

@@ -67,7 +67,7 @@ export const defaultObj = {
     reservationDateStartDate: '',
     reservationDateType: 1, // 可约日期类型:1-每天,2-自定义
     reservationDateWeekRange: '',
-    reservationDateWeekRangeList: [1,2,3,4,5,6,7],
+    reservationDateWeekRangeList: [1, 2, 3, 4, 5, 6, 7],
     timeSlotClassifyType: 1, //时段划分类型:1-自动,2-自定义
     timeSlotSpan: 60, //时段时间跨度,分钟,时段自动划分有值
     timeSlotStartEndTime: '', //时段起止时间,时段自动划分有值
@@ -79,22 +79,22 @@ export const defaultObj = {
     reservationTime: ['', ''], // 自动划分起止时间
   },
   //这俩不是后端要的数据
-  timeSlotAutomatic: [] , //自动时间段,
-  timeSlotCustomize: [] , // 自定义时间段,
+  timeSlotAutomatic: [], //自动时间段,
+  timeSlotCustomize: [], // 自定义时间段,
   ///////////
 };
 export const objTitle = {
   price: {
-    title: '售价(元)',
+    title: '售价',
   },
   vipPrice: {
-    title: '会员价(元)',
+    title: '会员价',
   },
   cost: {
-    title: '成本价(元)',
+    title: '成本价',
   },
   otPrice: {
-    title: '划线价(元)',
+    title: '划线价',
   },
   stock: {
     title: '库存',

+ 3 - 3
crmeb_src/mer_mer_admin/src/views/systemSetting/deliverGoods/freightSet/creatTemplates.vue

@@ -69,7 +69,7 @@
                   </el-form-item>
                 </template>
               </el-table-column>
-              <el-table-column min-width="120px" label="运费(元)" prop="firstPrice">
+              <el-table-column min-width="120px" label="运费" prop="firstPrice">
                 <template slot-scope="scope">
                   <el-form-item :rules="rules.firstPrice" :prop="'region.' + scope.$index + '.firstPrice'">
                     <el-input-number v-model.trim="scope.row.firstPrice" controls-position="right" :min="0" />
@@ -88,7 +88,7 @@
                   </el-form-item>
                 </template>
               </el-table-column>
-              <el-table-column class-name="status-col" label="续费(元)" min-width="120" prop="renewalPrice">
+              <el-table-column class-name="status-col" label="续费" min-width="120" prop="renewalPrice">
                 <template slot-scope="scope">
                   <el-form-item :rules="rules.renewalPrice" :prop="'region.' + scope.$index + '.renewalPrice'">
                     <el-input-number v-model.trim="scope.row.renewalPrice" controls-position="right" :min="0" />
@@ -145,7 +145,7 @@
                   />
                 </template>
               </el-table-column>
-              <el-table-column min-width="120px" label="包邮金额(元)">
+              <el-table-column min-width="120px" label="包邮金额">
                 <template slot-scope="{ row }">
                   <el-input-number v-model.trim="row.price" controls-position="right" />
                 </template>

+ 4 - 4
crmeb_src/mer_mer_admin/src/views/systemSetting/printing/printReceipt/creatPrintreceipt.vue

@@ -131,16 +131,16 @@
               <div class="star-line">********</div>
             </div>
             <div class="pay flex flex-col align-end btn-line">
-              <div v-show="formItem.freightInfo == 1">运费:10.00</div>
+              <div v-show="formItem.freightInfo == 1">运费:10.00{{ $globalVars.priceUnit }}</div>
               <div v-show="formItem.discountInfo == 1">
-                <div>优惠:-80.00</div>
-                <div>抵扣:-20.00</div>
+                <div>优惠:-80.00{{ $globalVars.priceUnit }}</div>
+                <div>抵扣:-20.00{{ $globalVars.priceUnit }}</div>
               </div>
             </div>
             <!-- 支付信息 -->
             <div v-show="formItem.payInfo.length > 0" class="pay flex flex-col align-end btn-line">
               <div v-show="formItem.payInfo.includes(1)">支付方式:微信支付</div>
-              <div v-show="formItem.payInfo.includes(2)" class="fw-500">实际支付:310.00</div>
+              <div v-show="formItem.payInfo.includes(2)" class="fw-500">实际支付:310.00{{ $globalVars.priceUnit }}</div>
             </div>
             <!-- 订单信息 -->
             <div v-show="formItem.orderInfo.length > 0" class="order pt-10 btn-line">