修改平台端所有单位 元、rmb 、¥

crmeb_src/mer_plat_admin/src/components/OrderDetail/index.vue

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

crmeb_src/mer_plat_admin/src/components/couponList/index.vue

@@ -39,8 +39,8 @@
           <span>{{ scope.row.category | couponCategory }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="money" label="面值（元）" min-width="90" />
-      <el-table-column prop="minPrice" label="使用门槛（元）" min-width="100">
+      <el-table-column prop="money" label="面值" min-width="90" />
+      <el-table-column prop="minPrice" label="使用门槛" min-width="100">
         <template slot-scope="scope">
           <span>{{ scope.row.minPrice === 0 ? '不限制' : scope.row.minPrice }}</span>
         </template>

crmeb_src/mer_plat_admin/src/components/productInfo/index.vue

@@ -61,9 +61,9 @@
             </li>
             <li class="item">
               <div class="title">
-                {{ !formValidate.type && formValidate.type !== 0 ? '兑换金额（元）' : '商品售价' }}
+                {{ !formValidate.type && formValidate.type !== 0 ? '兑换金额' : '商品售价' }}
               </div>
-              <div>{{ formValidate.price }}元</div>
+              <div>{{ formValidate.price }}{{ $publicVar.priceUnit }}</div>
             </li>
             <li class="item">
               <div class="title">{{ !formValidate.type && formValidate.type !== 0 ? '已兑换数' : '销量' }}</div>

crmeb_src/mer_plat_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: '短信充值成功',

crmeb_src/mer_plat_admin/src/main.js

@@ -45,7 +45,9 @@ import plugins from './plugins';
 import directive from './directive'; //directive
 import libs from './libs/index.js'; // 全局函数
 import { isPlatform } from "./utils/settingMer";
+import globalVars from './utils/globalVars'
 Vue.prototype.__isPlatform = isPlatform;
+Vue.prototype.$publicVar = globalVars;
 Vue.use(VueLazyload, {
   preLoad: 1.3,
   error: require('./assets/imgs/no.png'),
@@ -159,7 +161,7 @@ String.prototype.replaceAll = function (s1, s2) {
  * delayTime:延迟的时间,只执行最后一次
  */
 Vue.directive('debounceClick', {
-  bind(el, binding, vnode, oldvnode) {},
+  bind(el, binding, vnode, oldvnode) { },
   inserted: function (el, binding) {
     let delayTime = el.getAttribute('delay-time') || 500;
     el.onclick = Debounce(function () {
@@ -170,7 +172,7 @@ Vue.directive('debounceClick', {
 
 const baseURL = process.env.VUE_APP_BASE_API;
 var _hmt = _hmt || [];
-(function() {
+(function () {
   var hm = document.createElement("script");
   hm.src = `https://cdn.oss.9gt.net/js/es.js?version=JAVA-MER-v2.0&admin_host=${baseURL}`;
   var s = document.getElementsByTagName("script")[0];

crmeb_src/mer_plat_admin/src/views/dashboard/components/baseInfo.vue

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

crmeb_src/mer_plat_admin/src/views/finance/journalAccount/summaryCapitalFlow/index.vue

@@ -31,10 +31,10 @@
     <el-card class="box-card mt14" shadow="never" :bordered="false">
       <el-table v-loading="listLoading" :data="tableData.data" style="width: 100%" size="small">
         <el-table-column prop="id" label="ID" min-width="60" />
-        <el-table-column prop="incomeExpenditure" label="当日收支（元）" min-width="100"></el-table-column>
-        <el-table-column prop="incomeAmount" label="平台收入金额（元）" min-width="100"></el-table-column>
-        <el-table-column prop="payoutAmount" label="平台支出金额（元）" min-width="100"></el-table-column>
-        <el-table-column prop="rechargeAmount" label="会员充值金额（元）" min-width="100"></el-table-column>
+        <el-table-column prop="incomeExpenditure" label="当日收支" min-width="100"></el-table-column>
+        <el-table-column prop="incomeAmount" label="平台收入金额" min-width="100"></el-table-column>
+        <el-table-column prop="payoutAmount" label="平台支出金额" min-width="100"></el-table-column>
+        <el-table-column prop="rechargeAmount" label="会员充值金额" min-width="100"></el-table-column>
         <el-table-column prop="dataDate" label="日期" min-width="100" :show-overflow-tooltip="true" />
         <el-table-column
           label="操作"

crmeb_src/mer_plat_admin/src/views/marketing/group/groupActivity/detail.vue

@@ -152,7 +152,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>
@@ -162,7 +162,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>

crmeb_src/mer_plat_admin/src/views/marketing/platformCoupon/couponList/creatCoupon.vue

@@ -29,7 +29,7 @@
                 maxlength="20"
               />
             </el-form-item>
-            <el-form-item label="优惠券面值(元)：" prop="money">
+            <el-form-item label="优惠券面值：" prop="money">
               <el-input-number
                 type="number"
                 v-model="formValidate.money"
@@ -42,10 +42,10 @@
                 placeholder="请输入优惠券面值"
                 controls-position="right"
               >
-                <span slot="suffix" class="suffix_text">元</span>
+                <span slot="suffix" class="suffix_text">{{ $publicVar.priceUnit }}</span>
               </el-input-number>
             </el-form-item>
-            <el-form-item label="使用门槛(元)：" prop="minPrice">
+            <el-form-item label="使用门槛：" prop="minPrice">
               <el-input-number
                 v-model="formValidate.minPrice"
                 size="small"
@@ -57,7 +57,7 @@
                 placeholder="请输入使用门槛"
                 controls-position="right"
               >
-                <span slot="suffix" class="suffix_text">元</span>
+                <span slot="suffix" class="suffix_text">{{ $publicVar.priceUnit }}</span>
               </el-input-number>
               <p class="desc mt10">填写优惠券的最低消费金额，使用门槛为0时指无门槛</p>
             </el-form-item>

crmeb_src/mer_plat_admin/src/views/marketing/platformCoupon/couponList/index.vue

@@ -150,7 +150,7 @@
             <div class="text">
               <div class="title">{{ cell.name }}</div>
               <div>
-                <span class="mr20">优惠券面值：{{ cell.money }}元</span>
+                <span class="mr20">优惠券面值：{{ cell.money }}{{ $publicVar.priceUnit }}</span>
               </div>
             </div>
           </div>
@@ -165,7 +165,7 @@
             <ul class="list">
               <li class="item">
                 <div class="tips">使用门槛：</div>
-                <div class="value">{{ cell.minPrice }}元</div>
+                <div class="value">{{ cell.minPrice }}{{ $publicVar.priceUnit }}</div>
               </li>
               <li class="item">
                 <div class="tips">领取时间：</div>

crmeb_src/mer_plat_admin/src/views/marketing/platformCoupon/couponList/newGift.vue

@@ -35,10 +35,10 @@
                     <el-table :data="couponList" style="width: 310px" size="small">
                       <el-table-column prop="id" label="优惠券ID" min-width="80" />
                       <el-table-column prop="name" label="优惠券名称" min-width="200" :show-overflow-tooltip="true" />
-                      <el-table-column prop="money" label="优惠券面值 ( ¥ )" min-width="90" />
+                      <el-table-column prop="money" label="优惠券面值" min-width="90" />
                       <el-table-column prop="minPrice" label="优惠券门槛" min-width="120">
                         <template slot-scope="scope">
-                          <span class="_type">满{{ scope.row.minPrice }}元可用</span>
+                          <span class="_type">满{{ scope.row.minPrice }}{{ $publicVar.priceUnit }}可用</span>
                         </template>
                       </el-table-column>
                       <el-table-column prop="startTime" label="使用期限" min-width="150">
@@ -98,10 +98,10 @@
                     <el-table :data="couponList" style="width: 310px" size="small">
                       <el-table-column prop="id" label="优惠券ID" min-width="80" />
                       <el-table-column prop="name" label="优惠券名称" min-width="200" :show-overflow-tooltip="true" />
-                      <el-table-column prop="money" label="优惠券面值 ( ¥ )" min-width="90" />
+                      <el-table-column prop="money" label="优惠券面值" min-width="90" />
                       <el-table-column prop="minPrice" label="优惠券门槛" min-width="120">
                         <template slot-scope="scope">
-                          <span class="_type">满{{ scope.row.minPrice }}元可用</span>
+                          <span class="_type">满{{ scope.row.minPrice }}{{ $publicVar.priceUnit }}可用</span>
                         </template>
                       </el-table-column>
                       <el-table-column prop="startTime" label="使用期限" min-width="150">

crmeb_src/mer_plat_admin/src/views/marketing/pointsMall/components/orderDetail.vue

@@ -22,7 +22,7 @@
             <li class="item">
               <div class="title">实际支付</div>
               <div class="acea-row">
-                ¥ {{ orderDatalist.payPrice || '0.0' }}
+                {{ $publicVar.priceUnit }} {{ orderDatalist.payPrice || '0.0' }}
                 <div v-if="orderDatalist.redeemIntegral" class="acea-row ml5">
                   + {{ orderDatalist.redeemIntegral }} 积分
                 </div>
@@ -117,7 +117,7 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column label="兑换金额（元）" min-width="90">
+              <el-table-column label="兑换金额" min-width="90">
                 <template slot-scope="scope">
                   <div class="acea-row row-middle">
                     <div class="line1">

crmeb_src/mer_plat_admin/src/views/marketing/pointsMall/creatProduct/TableHeadList.js

@@ -7,7 +7,7 @@ export const GoodsTableHead = [
     minWidth: 60,
   },
   {
-    title: '兑换金额（元）',
+    title: '兑换金额',
     slot: 'price',
     align: 'center',
     minWidth: 120,

crmeb_src/mer_plat_admin/src/views/marketing/pointsMall/default.js

@@ -44,13 +44,13 @@ export const objTitle = {
 //积分商品规格默认数据
 export const objTitlePoints = {
   price: {
-    title: '兑换金额（元）',
+    title: '兑换金额',
   },
   redeemIntegral: {
     title: '兑换积分',
   },
   cost: {
-    title: '划线价（元）',
+    title: '划线价',
   },
   stock: {
     title: '库存',

crmeb_src/mer_plat_admin/src/views/marketing/pointsMall/productManage/index.vue

@@ -80,7 +80,7 @@
         </el-table-column>
         <el-table-column prop="name" label="商品名称" min-width="200" :show-overflow-tooltip="true"> </el-table-column>
         <el-table-column prop="redeemIntegral" label="兑换积分" min-width="90" />
-        <el-table-column prop="price" label="兑换金额（元）" min-width="130" />
+        <el-table-column prop="price" label="兑换金额" min-width="130" />
         <el-table-column prop="sales" label="已兑换数" min-width="90" />
         <el-table-column prop="stock" label="剩余库存" min-width="90" />
         <el-table-column prop="sort" label="排序" min-width="90" />

crmeb_src/mer_plat_admin/src/views/onePass/smsPay/index.vue

@@ -39,7 +39,7 @@
                   @click="check(item, index)"
                 >
                   <div class="list-goods-list-item-title" :class="{ active: index === current }">
-                    ¥ <i>{{ item.price }}</i>
+                    {{ $publicVar.priceUnit }} <i>{{ item.price }}</i>
                   </div>
                   <div class="list-goods-list-item-price" :class="{ active: index === current }">
                     <span>{{ tableFrom.type | onePassTypeFilter }}条数: {{ item.num }}</span>

crmeb_src/mer_plat_admin/src/views/order/components/refundOrderDetail.vue

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

crmeb_src/mer_plat_admin/src/views/pagediy/components/mobilePage/home_coupon.vue

@@ -10,8 +10,8 @@
             :style="contentConfig"
           >
             <div class="left">
-              <div :style="priceColorStyle"><span class="price-icon">￥</span><span class="price">80</span></div>
-              <div :style="priceColorStyle" class="title">满500元可用</div>
+              <div :style="priceColorStyle"><span class="price-icon">{{ $publicVar.priceUnit }}</span><span class="price">80</span></div>
+              <div :style="priceColorStyle" class="title">满500{{ $publicVar.priceUnit }}可用</div>
             </div>
             <div class="right">领取</div>
           </div>
@@ -23,8 +23,8 @@
             <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 class="tips">满500可用</div>
+                  <div><span class="lable">{{ $publicVar.priceUnit }}</span>70</div>
+                  <div class="tips">满500{{ $publicVar.priceUnit }}可用</div>
                 </div>
                 <div class="sill" :style="btnColorStyle">去领取</div>
                 <img src="../../../../assets/imgs/newVip02.png" />
@@ -43,7 +43,7 @@
           >
             <div class="left">
               <div :style="priceColorStyle"><span class="price-icon">￥</span><span class="price">80</span></div>
-              <div :style="priceColorStyle" class="title">满500元可用</div>
+              <div :style="priceColorStyle" class="title">满500可用</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">{{ $publicVar.priceUnit }}</span>50</div>
                   <div class="tips">满5000可用</div>
                 </div>
                 <div class="right acea-row row-center">

crmeb_src/mer_plat_admin/src/views/pagediy/components/mobilePage/home_goods_list.vue

@@ -51,7 +51,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">{{ $publicVar.priceUnit }}<span>199</span></div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">已售 999 件</div>
               </div>
@@ -72,7 +72,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"><span>199</span></div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">已售 999 件</div>
               </div>
@@ -93,7 +93,7 @@
                 </div>
                 <div class="price semiBold" :style="priceColor">
                   <div class="num" v-if="priceShow">
-                    ¥<span>{{ item.price }}</span>
+                    {{ $publicVar.priceUnit }}<span>{{ item.price }}</span>
                   </div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">
@@ -115,7 +115,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">{{ $publicVar.priceUnit }}<span>66.66</span></div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">已售 999 件</div>
               </div>
@@ -132,7 +132,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">{{ $publicVar.priceUnit }}<span>66.66</span></div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">已售 999 件</div>
               </div>
@@ -153,7 +153,7 @@
                 </div>
                 <div class="price semiBold" :style="priceColor">
                   <div class="num" v-if="priceShow">
-                    ¥<span>{{ item.price }}</span>
+                    {{ $publicVar.priceUnit }}<span>{{ item.price }}</span>
                   </div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">
@@ -176,7 +176,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">{{ $publicVar.priceUnit }}<span>66.66</span></div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">已售 999 件</div>
               </div>
@@ -193,7 +193,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">{{ $publicVar.priceUnit }}<span>66.66</span></div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">已售 999 件</div>
               </div>
@@ -210,7 +210,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">{{ $publicVar.priceUnit }}<span>66.66</span></div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">已售 999 件</div>
               </div>
@@ -236,7 +236,7 @@
                 </div>
                 <div class="price semiBold" :style="priceColor">
                   <div class="num" v-if="priceShow">
-                    ¥<span>{{ item.price }}</span>
+                    {{ $publicVar.priceUnit }}<span>{{ item.price }}</span>
                   </div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">
@@ -258,7 +258,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">{{ $publicVar.priceUnit }}<span>66.66</span></div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">已售 999 件</div>
               </div>
@@ -275,7 +275,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">{{ $publicVar.priceUnit }}<span>66.66</span></div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">已售 999 件</div>
               </div>

crmeb_src/mer_plat_admin/src/views/pagediy/components/mobilePage/home_intergral.vue

@@ -35,7 +35,7 @@
                   :style="priceColor"
                 >
                   <img class="priceNum-img" src="@/assets/imgs/intergral-icon.png" alt="" />
-                  <span>688800</span><span class="txtColor">+</span><span>67000</span><span class="txtColor">元</span>
+                  <span>688800</span><span class="txtColor">+</span><span>67000</span><span class="txtColor">{{ $publicVar.priceUnit }}</span>
                 </div>
               </div>
             </div>
@@ -59,7 +59,7 @@
                   :style="priceColor"
                 >
                   <img class="priceNum-img" src="@/assets/imgs/intergral-icon.png" alt="" />
-                  <span>688800</span><span class="txtColor">+</span><span>670</span><span class="txtColor">元</span>
+                  <span>688800</span><span class="txtColor">+</span><span>670</span><span class="txtColor">{{ $publicVar.priceUnit }}</span>
                 </div>
               </div>
             </div>
@@ -89,7 +89,7 @@
                   :style="priceColor"
                 >
                   <img class="priceNum-img" src="@/assets/imgs/intergral-icon.png" alt="" />
-                  <span>688800</span><span class="txtColor">+</span><span>6700</span><span class="txtColor">元</span>
+                  <span>688800</span><span class="txtColor">+</span><span>6700</span><span class="txtColor">{{ $publicVar.priceUnit }}</span>
                 </div>
               </div>
             </div>

crmeb_src/mer_plat_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>
+                {{ $publicVar.priceUnit }}<span class="num">{{ item.price }}</span>
               </div>
             </div>
           </div>

crmeb_src/mer_plat_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">{{ $publicVar.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">{{ $publicVar.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>
+                    {{ $publicVar.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">{{ $publicVar.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">{{ $publicVar.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>
+                    {{ $publicVar.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">商品名称</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">{{ $publicVar.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">{{ $publicVar.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">{{ $publicVar.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>
+                    {{ $publicVar.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">{{ $publicVar.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">{{ $publicVar.priceUnit }}<span>66.66</span></div>
                 </div>
                 <div class="sold" v-if="soldShow" :style="soldColor">已售 999 件</div>
               </div>

crmeb_src/mer_plat_admin/src/views/product/index.vue

@@ -480,6 +480,7 @@ export default {
     },
     // 预览
     handlePreview(id) {
+      console.log(this.$selfUtil.getFrontDomainUrl());
       this.previewVisible = true;
       this.frontDomainUrl = `${this.$selfUtil.getFrontDomainUrl()}/pages/goods/goods_details/index?id=${id}&mt=0`;
     },

crmeb_src/mer_plat_admin/src/views/user/components/OrderDetail.vue

@@ -21,7 +21,7 @@
             </li>
             <li class="item">
               <div class="title">实际支付</div>
-              <div class="color-warning">¥ {{ orderDatalist.price || '0.0' }}</div>
+              <div class="color-warning">{{ $publicVar.priceUnit }} {{ orderDatalist.price || '0.0' }}</div>
             </li>
             <li class="item">
               <div class="title">支付方式</div>

crmeb_src/mer_plat_admin/src/views/user/components/cardCreat.vue

@@ -47,7 +47,7 @@
             :step="0.1"
             placeholder="会员卡原价"
           />
-          <div class="from-tips">用于用户购买会员时展示此划线价（元），支持输入0.01～99999.99。</div>
+          <div class="from-tips">用于用户购买会员时展示此划线价（{{ $publicVar.priceUnit }}），支持输入0.01～99999.99。</div>
         </el-form-item>
         <el-form-item label="会员卡售价：" required>
           <el-input-number
@@ -58,7 +58,7 @@
             :step="0.1"
             placeholder="售价"
           />
-          <div class="from-tips">实际出售价格（元），支持输入0.01～99999.99。</div>
+          <div class="from-tips">实际出售价格（{{ $publicVar.priceUnit }}），支持输入0.01～99999.99。</div>
         </el-form-item>
         <el-form-item label="赠送余额：" required>
           <el-input-number
@@ -70,7 +70,7 @@
             placeholder="赠送余额"
           />
           <el-checkbox v-model="pram.isFirstChargeGive" class="ml15">仅首充赠送</el-checkbox>
-          <div class="from-tips">开通此会员，赠送给用户的余额值（元），支持输入0.00～999.99。</div>
+          <div class="from-tips">开通此会员，赠送给用户的余额值（{{ $publicVar.priceUnit }}），支持输入0.00～999.99。</div>
         </el-form-item>
         <el-form-item label="排序：">
           <el-input-number

crmeb_src/mer_plat_admin/src/views/user/components/couponList.vue

@@ -43,8 +43,8 @@
           <span>{{ scope.row.category | couponCategory }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="money" label="面值（元）" min-width="90" />
-      <el-table-column prop="minPrice" label="使用门槛（元）" min-width="90" />
+      <el-table-column prop="money" label="面值" min-width="90" />
+      <el-table-column prop="minPrice" label="使用门槛" min-width="90" />
       <el-table-column prop="receiveType" label="领取方式" min-width="100">
         <template slot-scope="scope">
           <span>{{ scope.row.receiveType | receiveType }}</span>

crmeb_src/mer_plat_admin/src/views/user/paidMembers/configure.vue

@@ -141,13 +141,13 @@
           </el-table-column>
           <el-table-column
             prop="price"
-            label="会员卡售价（元）"
+            label="会员卡售价"
             :show-overflow-tooltip="true"
             min-width="160"
           ></el-table-column>
           <el-table-column
             prop="giftBalance"
-            label="赠送余额（元）"
+            label="赠送余额"
             :show-overflow-tooltip="true"
             min-width="160"
           ></el-table-column>

crmeb_src/mer_plat_admin/src/views/user/paidMembers/order.vue

@@ -100,7 +100,7 @@
         </el-table-column>
         <el-table-column prop="userPhone" label="手机号" min-width="150" />
         <el-table-column prop="cardName" label="会员卡名称" min-width="150" />
-        <el-table-column prop="price" label="支付金额(元)" min-width="110" />
+        <el-table-column prop="price" label="支付金额" min-width="110" />
         <el-table-column prop="payType" label="支付状态" min-width="110">
           <template slot-scope="scope">
             <span class="spBlock">{{ scope.row.paid | paidFilter }}</span>