feat:“添加订单明细分佣隐藏显示功能”

src/assets/language/en.json

@@ -963,6 +963,9 @@
     "orderSerialNumberLabel": "Order serial number",
     "orderSerialNumberPlaceholder": "Please enter the order serial number",
     "equipmentNoPlaceholder": "Please enter the full Machine number",
+    "searchCriteria": "Please enter search criteria",
+    "searchDate": "Please enter the specified order date, no more than six months",
+    "searchDateTips": "No more than half a year",
     "orderDate": "Order Date",
     "startTime": "start time",
     "to": "to",

src/assets/language/ja.json

@@ -964,6 +964,9 @@
         "orderSerialNumberLabel": "注文のシリアルナンバー",
         "orderSerialNumberPlaceholder": "注文のシリアルナンバーを入力",
         "equipmentNoPlaceholder": "全ての機器番号の入力をお願いします。",
+        "searchCriteria": "検索条件をお願いします。",
+        "searchDate": "註文期日指定を入力してください,半年以内です",
+        "searchDateTips": "期間はせいぜい半年以内です",
         "orderDate": "注文日",
         "startTime": "開始時間",
         "to": "まで",

src/assets/language/zh.json

@@ -886,6 +886,9 @@
     "paymentPlatform": "支付平台",
     "convergence": "汇聚",
     "huifuPaymnt": "汇付",
+    "isDistribution": "分佣显示",
+    "reveal": "显示",
+    "hidden": "隐藏",
     "modificationSubmission": "修改提交",
     "merchantType": "商户类型",
     "contactName": "联系人姓名",
@@ -965,6 +968,9 @@
     "orderSerialNumberLabel": "商户单号",
     "orderSerialNumberPlaceholder": "请输入商户单号",
     "equipmentNoPlaceholder": "请输入完整的设备编号",
+    "searchCriteria": "请输入搜索条件",
+    "searchDate": "请输入指定订单日期，不超过半年",
+    "searchDateTips": "时间最多不超过半年",
     "orderDate": "订单日期",
     "startTime": "开始时间",
     "to": "至",

src/components/commom/kDialog/index.less

@@ -24,14 +24,15 @@
       .block6 {
         // width: 265px;
         // height: 34px;
-        margin: 0.5rem 0;
-        padding: 0 0.8rem;
+        margin: 20px 30px;
 
         .mod7 {
-          border-radius: 0.5rem;
-          height: 1rem;
+          border-radius: 20px;
+          height: 30px;
+          padding: 0 20px;
+          width: 60px;
           border: 1px solid rgba(77, 106, 221, 1);
-          width: 3rem;
+          // width: 3rem;
           justify-content: center;
           align-items: center;
 
@@ -51,6 +52,7 @@
           background-color: rgba(77, 106, 221, 1);
           border-radius: 20px;
           height: 30px;
+          width: 60px;
           padding: 0 20px;
           justify-content: center;
           align-items: center;

src/views/merchantManage/set.vue

@@ -87,6 +87,16 @@
                     </van-radio-group>
                   </div>
                 </div>
+                <div class="van-cell van-field">
+                  <div class="van-cell__title van-field__label"><span>{{ $t('merchantManage.isDistribution') }}</span>
+                  </div>
+                  <div class="van-cell__value van-field__value radioBox">
+                    <van-radio-group v-model="adminObj.isDistribution" direction="horizontal">
+                      <van-radio name="0" icon-size="18px">{{ $t('merchantManage.hidden') }}</van-radio>
+                      <van-radio name="1" icon-size="18px">{{ $t('merchantManage.reveal') }}</van-radio>
+                    </van-radio-group>
+                  </div>
+                </div>
               </div>
               <van-row justify="space-around" style="padding: 1em;">
                 <van-button span="5" round type="primary" style="height: 2em; padding: 0 2em;" native-type="submit">{{
@@ -265,11 +275,13 @@ export default {
           email: adminObj.value.email,
           tradeMerchantNo: adminObj.value.tradeMerchantNo,
         };
+        console.log('adminObj', adminObj.value);
         if (adminType.value === 0 || adminType.value === 1) {
           params.promoCodeOpen = adminObj.value.promoCodeOpen;
           params.applyStartTime = adminObj.value.applyStartTime;
           params.applyEndTime = adminObj.value.applyEndTime;
           params.payPlatform = adminObj.value.payPlatform;
+          params.isDistribution = adminObj.value.isDistribution;
         }
         if (adminObj.value.password !== '') {
           if (adminObj.value.checkPassword === '') { showFailToast(t('merchantManage.confirmPasswordPlaceholder')); return; }
@@ -279,6 +291,7 @@ export default {
             showFailToast(t('merchantManage.theTwoPasswordsAreDifferent'));
           }
         }
+        console.log('params', params);
         const { data } = await updateAdmin(params);
         if (data.code === "00000") {
           showSuccessToast(t('merchantManage.modificationSucceeded'));

src/views/orderCenter/index.vue

@@ -113,12 +113,12 @@
                       {{ item.refundAmount == null ? item.price.toFixed(2) : (item.price - item.refundAmount).toFixed(2)
                       }}</span>
                   </div>
-                  <span v-if="user.ifForeign === '0'" class="giveAway">
+                  <span v-if="user.ifForeign === '0' && user.isDistribution === '1'" class="giveAway">
                     {{ $t('orderCenter.dividingDomesticService') }} ：{{ currencySymbol }}{{ showSubcom(item) }}
                   </span>
                 </template>
                 <template #price-top>
-                  <span class="orderTime" :style="user.ifForeign == '0' ? '' : 'margin-top: 6vw;'">
+                  <span class="orderTime" :style="user.ifForeign == '0' && user.isDistribution === '1' ? '' : 'margin-top: 18px;'">
                     {{ $t('orderCenter.paymentTime') }}：{{ showOrderTime(item, 1) }}</span>
                 </template>
                 <template #footer>

src/views/orderCenter/orderSearch.vue

@@ -60,9 +60,11 @@
 import { ref } from 'vue';
 // import dateUtil from "@/utils/dateUtil";
 import { showToast } from 'vant';
+import { useI18n } from "vue-i18n";
 export default {
   name: 'orderSearch',
   setup(prop, context) {
+    const { t } = useI18n();
     const sheetShow = ref(false);
     const startDateShow = ref(false);
     const endDateShow = ref(false);
@@ -109,20 +111,20 @@ export default {
         //   Toast("请输入正确时间");
         //   return;
         // } else {
-        showToast("请输入搜索条件");
+        showToast(t('orderCenter.searchCriteria'));
         return;
         // }
       }
       if (clientId.value != '' || userName.value != '') {
         if (startTime.value == '' || endTime.value == '') {
-          showToast("请输入指定订单日期，不超过1个月");
+          showToast(t('orderCenter.searchDate'));
           return;
         } else {
           let start = new Date(startTime.value);
           let end = new Date(endTime.value);
           let diff = (end - start) / 1000 / 60 / 60 / 24;
           if (diff > 30) {
-            showToast("时间最多不超过1个月");
+            showToast(t('orderCenter.searchDateTips'));
             return;
           }
         }

src/views/orderExport/index.vue

@@ -1,8 +1,8 @@
 <template>
   <!-- 订单分析 -->
   <div class="orderExpotPage flex-col">
-    <s-header :name="$t('orderExport.orderAnalysis')" :noback="false"></s-header>
     <div class="Body flex-col">
+      <s-header :name="$t('orderExport.orderAnalysis')" :noback="false"></s-header>
       <div class="mod3 flex-col">
         <div class="group1 flex-col">
           <div class="titleBox flex-col">