Browse Source

style: 1.提交支付方式的弹窗样式修改
2.订单列表的样式修改。
3.翻译新增一个 sai-er-wei-ya-yu 。

suwenjiang 3 weeks ago
parent
commit
c13bfacc26

+ 2 - 1
src/renderer/i18n/languages/ru.json

@@ -240,5 +240,6 @@
   "qing-xian-tian-jia-jie-suan-shang-pin": "Пожалуйста, сначала добавьте товары для расчета!",
   "bao-qian-ding-dan-cao-zuo-yi-chang": "Извините, операция с заказом выполнена некорректно!",
   "e-yu": "Русский язык",
-"sai-er-wei-ya-yu": "Сербский язык"
+"sai-er-wei-ya-yu": "Сербский язык",
+"ying-fu-jin-e": "Сумма к оплате"
 }

+ 2 - 1
src/renderer/i18n/languages/sr-Latn.json

@@ -240,5 +240,6 @@
   "qing-xian-tian-jia-jie-suan-shang-pin": "Пожалуйста, прво додajte производе за рачун!",
   "bao-qian-ding-dan-cao-zuo-yi-chang": "Жао нам је, операција нараudzбе је неуспешна!",
   "e-yu": "Руски језик",
-"sai-er-wei-ya-yu": "Српски језик"
+"sai-er-wei-ya-yu": "Српски језик",
+"ying-fu-jin-e": "Iznos za plaćanje"
 }

+ 3 - 1
src/renderer/i18n/languages/zh-CN.json

@@ -240,5 +240,7 @@
   "qing-xian-tian-jia-jie-suan-shang-pin": "请先添加结算商品!",
   "bao-qian-ding-dan-cao-zuo-yi-chang": "抱歉,订单操作异常!",
   "e-yu": "俄语",
-  "sai-er-wei-ya-yu": "塞尔维亚语"
+  "sai-er-wei-ya-yu": "塞尔维亚语",
+  "ying-fu-jin-e": "应付金额",
+  "yin-hang-zhi-fu": "银行支付"
 }

+ 38 - 8
src/renderer/views/cashier/components/settlementDialog.vue

@@ -63,6 +63,28 @@
               <div class="name">{{ $t('xian-jin-zhi-fu-0') }}</div>
             </div>
             <!-- <div
+              :class="'pay-item' + (payType == 'B2C' ? ' active' : '')"
+              @click="selectPayType('B2C')"
+            >
+              <svg
+                t="1656295559018"
+                class="icon"
+                viewBox="0 0 1024 1024"
+                version="1.1"
+                xmlns="http://www.w3.org/2000/svg"
+                p-id="6471"
+                width="32"
+                height="32"
+              >
+                <path
+                  d="M512 0a512 512 0 1 0 512 512A512 512 0 0 0 512 0z m286.4896 668.16a78.2336 78.2336 0 0 1-78.208 78.208H303.1808A78.2336 78.2336 0 0 1 224.9728 668.16V355.3536a78.1312 78.1312 0 0 1 78.1568-78.2336h417.1008a78.2336 78.2336 0 0 1 78.208 78.2336v91.1616h-208.5632a65.2032 65.2032 0 1 0 0 130.4064h208.6144z m-143.36-156.3904a39.1168 39.1168 0 1 1-39.1168-39.0912 39.1168 39.1168 0 0 1 39.0656 39.1936z"
+                  fill="#113a28"
+                  p-id="6472"
+                ></path>
+              </svg>
+              <div class="name">{{ $t('yin-hang-zhi-fu') }}</div>
+            </div> -->
+            <!-- <div
               :class="'pay-item' + (payType == 'BALANCE' ? ' active' : '')"
               @click="selectPayType('BALANCE')"
             >
@@ -133,6 +155,7 @@
               </svg>
               <div class="name">{{ $t('zhi-fu-bao-zhi-fu') }}</div>
             </div>
+          </div>-->
           </div>
         </div>
         <div class="main">
@@ -158,6 +181,7 @@
               <div>{{ $t('bei-zhu-xin-xi') }}:</div>
               <el-form-item class="form-item" prop="remark">
                 <el-input
+                  class="caret-[#f67f20]"
                   type="textarea"
                   v-model="remark"
                   ref="remark"
@@ -206,7 +230,8 @@
             </div>
           </div>
         </div>
-        <div class="right">
+
+        <!-- <div class="right">
           <div class="title">{{ $t('hui-yuan-xin-xi') }}</div>
           <div class="content">
             <div class="member-info" v-if="memberInfo">
@@ -221,11 +246,11 @@
               </div>
               <div class="item">
                 <div class="head">{{ $t('shou-ji-hao') }}:</div>
-                <div class="value">{{ memberInfo.mobile ? memberInfo.mobile : $('zan-wu') }}</div>
+                <div class="value">{{ memberInfo.mobile ? memberInfo.mobile : $t('zan-wu') }}</div>
               </div>
               <div class="item">
                 <div class="head">{{ $t('hui-yuan-hao') }}:</div>
-                <div class="value">{{ memberInfo.userNo ? memberInfo.userNo : $('zan-wu') }}</div>
+                <div class="value">{{ memberInfo.userNo ? memberInfo.userNo : $t('zan-wu') }}</div>
               </div>
               <div class="item">
                 <div class="head">{{ $t('ke-yong-yu-e') }}:</div>
@@ -284,7 +309,7 @@
               </el-button>
             </div>
           </div>
-        </div>
+        </div> -->
       </div>
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -566,16 +591,20 @@ export default {
       }
     }
     .active {
-      border: 3px solid #113a28;
+      border: 3px solid #f67f20;
       background: #fdf5e6;
-      color: #ffffff;
+      .name {
+        color: #f67f20;
+      }
     }
   }
   .main {
     float: left;
     padding: 10px;
-    width: 598px;
+    // width: 598px;
+    width: calc(100% - 200px);
     height: 348px;
+    box-sizing: border-box;
     position: relative;
     .title {
       margin-bottom: 10px;
@@ -583,6 +612,7 @@ export default {
     }
     .content {
       width: 100%;
+      box-sizing: border-box;
       .coupon-info {
         margin-top: 20px;
         .num {
@@ -596,7 +626,7 @@ export default {
       .amount-info {
         text-align: right;
         position: absolute;
-        width: 580px;
+        width: calc(100% - 20px);
         bottom: 10px;
         font-size: 16px;
         .discount-amount {