Merge branch 'fix-109' of https://git.nianxx.cn/zoujing/YGChatCS

src/App.vue

@@ -33,7 +33,8 @@ body,
   display: none;
 }
 
-.mb12 {
-  margin-bottom: 12px;
+@font-face {
+  font-family: znicons;
+  src: url("https://oss.nianxx.cn/mp/static/fonts/znicons.ttf");
 }
 </style>

src/components/GoodDetail/styles/index.scss

@@ -1,8 +1,3 @@
-@font-face {
-  font-family: znicons;
-  src: url("@/static/fonts/znicons.ttf");
-}
-
 // 使用须知样式
 .use-notice {
   margin: 16px 0;

src/components/ModuleTitle/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="module-header mb12">
+  <view class="module-header mb-4">
     <text class="module-title">{{ title }}</text>
     <image class="underline" src="./images/wave_icon.png" mode="aspectFill" />
   </view>
@@ -16,4 +16,4 @@ defineProps({
 
 <style scoped lang="scss">
 @import "./styles/index.scss";
-</style>
+</style>

src/components/ModuleTitle/styles/index.scss

@@ -19,7 +19,3 @@
   height: 10px;
   z-index: 0;
 }
-
-.mb12 {
-  margin-bottom: 4px;
-}

src/pages-order/order/components/GoodsInfo/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="goods-info mb12">
+  <view class="goods-info mb-12">
     <view class="hotel-header">
       <image class="hotel-icon" :src="orderTypeIcon"></image>
       <text class="hotel-name">{{ orderData.storeName }}</text>

src/pages-order/order/components/NoticeInfo/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="notice-info mb12">
+  <view class="notice-info mb-12">
     <view class="notice-title"> 购买须知 </view>
     <GoodDetail :goodsData="orderData" :showTitle="false" />
   </view>

src/pages-order/order/components/UserInfo/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="user-info mb12" v-if="hasConsumerData">
+  <view class="user-info mb-12" v-if="hasConsumerData">
     <view class="user-info-title">{{ infoTitle }}</view>
     <view
       v-for="(item, index) in consumerList"

src/static/fonts/znicons.js

@@ -19,4 +19,20 @@ export const zniconsMap = {
   "zn-warning-check-in": "\ue692",
   "zn-refund": "\ue693",
   "zn-warning-circle": "\ue694",
+  "zn-dinsh": "\ue6a3",
+  "zn-clock": "\ue6a6",
+  "zn-edit": "\ue6a5",
+  "zn-forkchopsticks": "\ue6a4",
+  "zn-camera": "\ue6a2",
+  "zn-nav-room": "\ue6a1",
+  "zn-nav-ticket": "\ue6a0",
+  "zn-ticket": "\ue69b",
+  "zn-package": "\ue69d",
+  "zn-nav-meal": "\ue69c",
+  "zn-room": "\ue699",
+  "zn-coffee": "\ue698",
+  "zn-refresh": "\ue69f",
+  "zn-keyborad": "\ue697",
+  "zn-hotspring": "\ue696",
+  "zn-bell": "\ue695",
 };