feat：“添加蒸汽加湿功能和优化一些样式”

src/assets/language/en.json

@@ -410,6 +410,11 @@
     "stirringTemperature": "Stirring temperature",
     "cornGeneratorTemperature": "Corn generator temperature",
     "cupQuantity": "Cup quantity",
+    "numberOneTm": "NO.1000",
+    "candyGeneratorTm": "Generator temperature",
+    "outsideTm": "Outside temperature",
+    "outsidehd": "Humidity outside cabinet",
+    "noData": "No data available",
     "temperatureInCabinet": "Temperature in cabinet",
     "humidityInCabinet": "Humidity in cabinet",
     "showGoods": "Block or display goods",
@@ -491,9 +496,9 @@
     "turnOnSleep": "Turn on Sleep",
     "communiChannel": "Communication channel",
     "tweets": "Tweets",
-    "mq": "Mq",
+    "mq": "MQ",
     "versionNo": "Version No",
-    "url": "url",
+    "url": "URL",
     "urlPlace": "please enter the url",
     "update": "to update",
     "sureUpdate": "Are you sure you want to update",
@@ -1358,7 +1363,14 @@
     "D438": "Y Zero Compensation",
     "D440": "Z Zero Compensation",
     "M502": "Start out of material monitoring",
-    "M506": "Outer Loop Button"
+    "M506": "Outer Loop Button",
+    "D148": "No.1001",
+    "D195": "No.1002",
+    "D486": "No.1003",
+    "D487": "No.1004",
+    "D489": "No.1005",
+    "D396": "No.1006",
+    "D491": "No.1007"
   },
   "accountOperation": {
     "title": "Acount operation",

src/assets/language/zh.json

@@ -412,6 +412,11 @@
     "stirringTemperature": "搅拌温度",
     "cornGeneratorTemperature": "玉米发生器温度",
     "cupQuantity": "杯子剩余量",
+    "numberOneTm": "NO.1000",
+    "candyGeneratorTm": "发生器温度",
+    "outsideTm": "柜外温度",
+    "outsidehd": "柜外湿度",
+    "noData": "暂无数据",
     "showGoods": "屏蔽/显示商品",
     "editCheck": "是否确认更改？",
     "unknownError": "未知错误！",
@@ -508,9 +513,9 @@
     "turnOnSleep": "开启睡眠",
     "communiChannel": "通信通道",
     "tweets": "个推",
-    "mq": "Mq",
+    "mq": "MQ",
     "versionNo": "版本号",
-    "url": "url",
+    "url": "URL",
     "urlPlace": "请输入url",
     "update": "更新",
     "sureUpdate": "确定需要更新吗",
@@ -1372,7 +1377,14 @@
     "D438": "Y零点补偿",
     "D440": "Z零点补偿",
     "M502": "启动缺物料监控",
-    "M506": "外循环按钮"
+    "M506": "外循环按钮",
+    "D148": "No.1001",
+    "D195": "No.1002",
+    "D486": "No.1003",
+    "D487": "No.1004",
+    "D489": "No.1005",
+    "D396": "No.1006",
+    "D491": "No.1007"
   },
   "accountOperation": {
     "title": "账户操作",

src/styles/deviceSet/index.less

@@ -352,7 +352,7 @@
                     font-size: 13px;
                     text-align: left;
                     white-space: nowrap;
-                    line-height: 18px;
+                    line-height: 13px;
                     display: block;
                     background-color: rgba(229, 154, 109, 1);
                 }
@@ -362,7 +362,7 @@
                 height: 17px;
                 width: 50px;
                 flex: 0 0 40px;
-                margin: 6px 0 0 28px;
+                margin: 6px 0 0 30px;
 
                 .box3 {
                     width: 45px;

src/styles/orderCenter/index.less

@@ -496,11 +496,11 @@
             }
 
             .word11 {
-              height: 13px;
+              height: 14px;
               width: 4.5rem;
               overflow-wrap: break-word;
               color: rgba(64, 77, 116, 1);
-              font-size: 13px;
+              font-size: 14px;
               white-space: nowrap;
               line-height: 14px;
               margin-top: 10px;
@@ -520,8 +520,8 @@
               width: 4.375rem;
               overflow-wrap: break-word;
               color: rgba(64, 77, 116, 1);
-              font-size: 13px;
-              line-height: 14px;
+              font-size: 14px;
+              line-height: 15px;
               display: block;
               overflow: hidden;
               text-overflow: ellipsis;
@@ -535,7 +535,7 @@
               font-size: 12px;
               text-align: left;
               white-space: nowrap;
-              line-height: 14px;
+              line-height: 12px;
               display: block;
               margin-top: 40px;
             }

src/styles/orderExport/index.less

@@ -180,7 +180,7 @@
                         text-align: left;
                         white-space: nowrap;
                         line-height: 30px;
-                        display: block;
+                        display: block;                     
                     }
 
                     .word9 {
@@ -193,7 +193,7 @@
                         white-space: nowrap;
                         line-height: 13px;
                         display: block;
-                        margin: 10px 0 0 20px;
+                        margin: 10px 10px 0 0;
                     }
                 }
 

src/views/device/deviceOper.vue

@@ -75,7 +75,7 @@
         </div>
         <div class="operText">{{ $t("device.modulation") }}</div>
       </div>
-      <div class="operItem" @click="recharge()">
+      <div v-if="user.ifForeign == '0'" class="operItem" @click="recharge()">
         <div class="operIcon">
           <img class="operImg" src="../../assets/device/operIcon/recharge.png" />
         </div>
@@ -87,7 +87,7 @@
         </div>
         <div class="operText">{{ $t("device.parameterSetting") }}</div>
       </div>
-      <div class="operItem" @click="saveProportionPush()">
+      <div v-if="user.ifForeign == '0'" class="operItem" @click="saveProportionPush()">
         <div class="operIcon">
           <img class="operImg" src="../../assets/device/operIcon/saveProportion.png" />
         </div>

src/views/device/deviceSearch.vue

@@ -174,6 +174,10 @@ export default {
     const equimentTypeShow = ref(false); // 设备机型级联状态
     const equimentTypeOptions = ref([
       {
+        text: 'MG330',
+        value: 'MG330',
+      },
+      {
         text: 'MG320',
         value: 'MG320',
       },

src/views/device/deviceSet.vue

@@ -12,23 +12,23 @@
           </div>
           <div class="mod2 flex-col"></div>
         </div>
-        <van-field colon readonly v-model="deviceDetal.clientId" :label="`${$t('device.equipmentCode')}`"
+        <van-field readonly v-model="deviceDetal.clientId" :label="`${$t('device.equipmentCode')}`"
           placeholder="" />
         <div class="cust_vantBorder">
-          <van-field colon required clearable v-model="deviceDetal.name" name="name"
+          <van-field required clearable v-model="deviceDetal.name" name="name"
             :label="`${$t('device.equipmentNameLabel')}`" :placeholder="$t('device.equipmentNamePlaceholder')" :rules="[
               {
                 required: true,
                 message: $t('device.equipmentNamePlaceholder'),
               },
             ]" />
-          <van-field colon clearable v-model="deviceDetal.selfName" :label="`${$t('device.equipmentRemarksLabel')}`"
+          <van-field clearable v-model="deviceDetal.selfName" :label="`${$t('device.equipmentRemarksLabel')}`"
             :placeholder="$t('device.equipmentRemarksPlaceholder')" />
+          <div></div>
         </div>
-        <van-field colon readonly v-model="deviceDetal.adminUserName" :label="`${$t('device.affiliatedMerchant')}`"
-          placeholder="" />
+        <van-field readonly v-model="deviceDetal.adminUserName" :label="`${$t('device.affiliatedMerchant')}`" />
         <!-- 地区 -->
-        <div v-if="areaShow" class="bd7 l-flex-between">
+        <!-- <div v-if="areaShow" class="bd7 l-flex-between">
           <div class="l-flex-RC">
             <div class="cust_vantBorder">
               <div class="filedInpPad">
@@ -57,16 +57,16 @@
               <van-icon @click="areaShow = !areaShow" size="20" name="edit" />
             </template>
           </van-field>
-        </div>
-        <van-field colon readonly v-model="deviceDetal.equimentType" :label="`${$t('device.machineType')}`"
+        </div> -->
+        <van-field readonly v-model="deviceDetal.equimentType" :label="`${$t('device.machineType')}`"
           placeholder="" />
         <!-- mg280才有到期时间 -->
         <template v-if="deviceDetal?.equimentType?.indexOf('mg280') !== -1">
-          <van-field colon readonly v-model="deviceDetal.lastUseDate" :label="`${$t('device.expirationTime')}`"
+          <van-field readonly v-model="deviceDetal.lastUseDate" :label="`${$t('device.expirationTime')}`"
             placeholder="" />
         </template>
         <div class="bd9 l-f">
-          <van-field colon readonly :label="`${$t('device.equipmentLabel')}`" placeholder="">
+          <van-field readonly :label="`${$t('device.equipmentLabel')}`" placeholder="">
             <template #input>
               <div class="box2 l-flex-RC l-flex-w" v-if="tagsList.arr.length > 0">
                 <div class="word8 o-mr-6 o-p-6 c-radius-2 o-mb-10" v-for="(item, index) in tagsList.arr" :key="index">
@@ -86,11 +86,12 @@
             </template>
           </van-field>
         </div>
+        <div class="custom-line"></div>
         <div v-if="isAdmind" class="bd9 l-f">
-          <van-field colon readonly :label="`${$t('device.adRule')}`" placeholder="">
+          <van-field readonly :label="`${$t('device.adRule')}`" placeholder="">
             <template #input>
               <div class="box2 l-flex-RC l-flex-w" v-if="adRuleList.length > 0">
-                <div class="word8 o-mr-6 o-p-6 c-radius-2 o-mb-10" v-for="(item, index) in adRuleList" :key="index">
+                <div class="word8 o-mr-6 o-p-6 c-radius-2 o-mb-5" v-for="(item, index) in adRuleList" :key="index">
                   {{ item.name }}
                 </div>
               </div>
@@ -106,26 +107,28 @@
               </div>
             </template>
           </van-field>
+          <div class="custom-line"></div>
         </div>
         <!-- 优惠券 -->
-        <van-field colon readonly :label="`${$t('device.coupon')}`" placeholder=""  v-if="user.type < 2 && user.ifForeign === '0' ">
+        <van-field readonly :label="`${$t('device.coupon')}`" placeholder=""
+          v-if="user.type < 2 && user.ifForeign === '0'">
           <template #input>
             <div class="l-flex-RC">
               <span>{{ couponStatusNameComp }}</span>
-              <van-switch @change="couponStatusChg" v-model="deviceDetal.couponStatus" size="23px" active-value="1"
-                          inactive-value="0" />
+              <van-switch class="o-ml-5" @change="couponStatusChg" v-model="deviceDetal.couponStatus" size="23px"
+                active-value="1" inactive-value="0" />
             </div>
           </template>
         </van-field>
         <div class="cust_vantBorder">
-          <van-field colon required clearable v-model="deviceDetal.operationalName" name="operationalName"
+          <van-field required clearable v-model="deviceDetal.operationalName" name="operationalName"
             :label="`${$t('device.nameOfOperatorLabel')}`" :placeholder="$t('device.nameOfOperatorPlaceholder')" :rules="[
               {
                 required: true,
                 message: $t('device.nameOfOperatorPlaceholder'),
               },
             ]" />
-          <van-field colon required clearable v-model="deviceDetal.operationalPhone" name="operationalPhone"
+          <van-field required clearable v-model="deviceDetal.operationalPhone" name="operationalPhone"
             :label="`${$t('device.operatorTelephoneLabel')}`" :placeholder="$t('device.operatorTelephonePlaceholder')"
             :rules="[
               {
@@ -134,25 +137,29 @@
               },
             ]" />
 
-          <van-field clearable v-model="deviceDetal.timeRuleId" :label="`${$t('device.advertisingRulesLabel')}:`"
-            :placeholder="$t('device.advertisingRulesPlaceholder')" />
+          <!-- <van-field clearable v-model="deviceDetal.timeRuleId" :label="`${$t('device.advertisingRulesLabel')}:`"
+            :placeholder="$t('device.advertisingRulesPlaceholder')" /> -->
         </div>
+        <div class="custom-line"></div>
         <div class="cust_vantBorder">
           <van-field clearable label-width="32%" v-model="deviceDetal.messageReceiver1"
-            :label="`${$t('device.messageReceiver1')}:`"
+            :label="`${$t('device.messageReceiver1')}`"
             :placeholder="$t('device.equipmentmessageReceiverPlaceholder')" />
-        </div>
-        <div class="cust_vantBorder">
           <van-field clearable label-width="32%" v-model="deviceDetal.messageReceiver2"
-            :label="`${$t('device.messageReceiver2')}:`"
+            :label="`${$t('device.messageReceiver2')}`"
             :placeholder="$t('device.equipmentmessageReceiverPlaceholder')" />
-        </div>
-        <div class="cust_vantBorder">
           <van-field clearable label-width="32%" v-model="deviceDetal.messageReceiver3"
-            :label="`${$t('device.messageReceiver3')}:`"
+            :label="`${$t('device.messageReceiver3')}`"
             :placeholder="$t('device.equipmentmessageReceiverPlaceholder')" />
         </div>
-        <van-field colon readonly label-width="18%" :label="`${$t('device.paymentMethod')}`" placeholder="">
+        <div class="custom-line"></div>
+        <!-- <div class="cust_vantBorder">
+        </div>
+        <div class="cust_vantBorder">
+        </div> -->
+        <!-- 支付方式 -->
+        <!-- <van-field v-if="user.ifForeign == '0'" colon readonly label-width="18%" :label="`${$t('device.paymentMethod')}`"
+          placeholder="">
           <template #input>
             <div class="van-cell__value van-field__value radioBox">
               <van-radio-group v-model="deviceDetal.payType" direction="horizontal">
@@ -168,17 +175,22 @@
               </van-radio-group>
             </div>
           </template>
-        </van-field>
+        </van-field> -->
+        <!-- 新支付方式，暂时没用屏蔽掉，后续再添加 -->
+        <!-- <van-field v-model="paymentValue" is-link readonly :label="`${$t('device.paymentMethod')}`" placeholder="选择支付方式" @click="showPayment = true" />
+        <van-popup v-model:show="showPayment" round position="bottom">
+          <van-picker :columns="paymentColumns" @cancel="showPayment = false" @confirm="onConfirm" />
+        </van-popup> -->
         <!-- 通信通道 -->
         <template v-if="isAdmind">
-          <van-field colon readonly :label="`${$t('device.communiChannel')}`" placeholder="">
+          <van-field readonly :label="`${$t('device.communiChannel')}`" placeholder="">
             <template #input>
               <div class="van-cell__value van-field__value radioBox">
                 <van-radio-group v-model="deviceDetal.channel" direction="horizontal">
-                  <van-radio name="1" icon-size="18px">{{
+                  <van-radio name="1" icon-size="16px">{{
                     $t("device.tweets")
                   }}</van-radio>
-                  <van-radio name="2" icon-size="18px">{{
+                  <van-radio name="2" icon-size="16px">{{
                     $t("device.mq")
                   }}</van-radio>
                 </van-radio-group>
@@ -188,28 +200,28 @@
         </template>
         <!-- 花型种类 -->
         <template v-if="isAdmind && machineType === '0'">
-          <van-field colon readonly :label="`${$t('device.flowerType')}`" placeholder="">
+          <van-field readonly :label="`${$t('device.flowerType')}`" placeholder="">
             <template #input>
               <div class="van-cell__value van-field__value radioBox">
                 <van-radio-group v-model="deviceDetal.flowers" direction="horizontal">
-                  <van-radio name="18" icon-size="18px">18</van-radio>
-                  <van-radio name="22" icon-size="18px">22</van-radio>
-                  <van-radio name="26" icon-size="18px">26</van-radio>
-                  <van-radio name="30" icon-size="18px">30</van-radio>
-                  <van-radio name="42" icon-size="18px">42</van-radio>
+                  <van-radio name="18" icon-size="16px">18</van-radio>
+                  <van-radio name="22" icon-size="16px">22</van-radio>
+                  <van-radio name="26" icon-size="16px">26</van-radio>
+                  <van-radio name="30" icon-size="16px">30</van-radio>
+                  <van-radio name="42" icon-size="16px">42</van-radio>
                 </van-radio-group>
               </div>
             </template>
           </van-field>
         </template>
         <!-- 版本号 -->
-        <van-field colon readonly v-model="deviceDetal.apkVersion" :label="`${$t('device.versionNo')}`" placeholder="" />
+        <van-field readonly v-model="deviceDetal.apkVersion" :label="`${$t('device.versionNo')}`" placeholder="" />
         <!-- url -->
         <div v-if="isAdmind" class="cust_vantBorder">
-          <van-field colon clearable class="input1" v-model="deviceDetal.url" :label="$t('device.url')"
+          <van-field center clearable class="input1" v-model="deviceDetal.url" :label="$t('device.url')"
             :placeholder="$t('device.urlPlace')">
             <template #button>
-              <van-button @click="updateUrlClk" type="primary">&nbsp;&nbsp;{{ $t("device.update")
+              <van-button class="updateBtn" @click="updateUrlClk" type="primary">&nbsp;&nbsp;{{ $t("device.update")
               }}&nbsp;&nbsp;</van-button>
             </template>
           </van-field>
@@ -218,7 +230,6 @@
           <van-button round type="primary" class="info7" native-type="submit">{{
             $t("device.submitAndPushDeviceUpdates") }}</van-button>
         </div>
-
       </div>
     </van-form>
     <!-- 地区弹窗 -->
@@ -311,6 +322,16 @@ export default {
     const isAdmind = ref(false);
     // 设备类型
     const machineType = ref('0');
+
+    const paymentColumns = [t("device.onlinePayment"), t("device.offlinePayment"), t("device.onlineAndOfflinePayment")];
+    const paymentValue = ref('');
+    const showPayment = ref(false);
+    const onConfirm = (value, index) => {
+      paymentValue.value = value;
+      deviceDetal.value.payType = index;
+      console.log(deviceDetal.value.payType);
+      showPayment.value = false;
+    };
     // 初始化页面获取列表
     onMounted(async () => {
       // 加载样式
@@ -330,7 +351,7 @@ export default {
     const getLabelDetail = () => {
       Api_getGetEquipmentToLabel({ equipmentId: route.query.deviceId }).then(
         (res) => {
-          console.log("res", res);
+          // console.log("res", res);
           if (res.data.code === "00000") {
             tagsList.arr = res.data.data;
             // 储存数据到vuex
@@ -376,7 +397,7 @@ export default {
     const getDetail = (id) => {
       Api_getAdRuleDetail({ id }).then((res) => {
         const resData = res.data.data;
-        console.log("resData", resData);
+        // console.log("resData", resData);
         adRuleList.value = [{ name: resData.name, id: resData.id }];
       });
     };
@@ -398,9 +419,11 @@ export default {
           channel: item.channel,
           messageReceiver1: item.messageReceiver1,
           messageReceiver2: item.messageReceiver2,
-          messageReceiver3: item.messageReceiver3
+          messageReceiver3: item.messageReceiver3,
+          payType: item.payType
         };
       })[0];
+      console.log(params);
       const { data } = await updateDevice(params);
       if (data.code === "00000") {
         Toast.success(t("device.modificationSucceeded"));
@@ -506,10 +529,23 @@ export default {
       adRuleList,
       machineType,
       user,
+      paymentValue,
+      paymentColumns,
+      onConfirm,
+      showPayment,
     };
   },
 };
 </script>
 <style lang="less" scoped>
 @import "../../common/style/common";
+@import "../../styles/deviceSet/index.less";
+
+.custom-line {
+  height: 1px;
+  background-color: #ebedf0;
+  /* 设置线条颜色 */
+  // margin-bottom: 10px; /* 根据需要调整线条与上方内容的间距 */
+  margin: 0 15px;
+}
 </style>

src/views/device/paramsSet/paramsSetInfo.vue

@@ -8,7 +8,16 @@
           <div class="block1 flex-col"></div>
           <span class="txt2">{{ $t('device.equipmentName') }}：{{ deviceDetal ? deviceDetal.name : "" }}</span>
         </div>
-
+      </div>
+      <!-- <van-divider :style="{ margin: '5px 16px' }" /> -->
+      <div class="" v-if="type == '3'">
+        <van-field :label="$t('device.numberOneTm')" :model-value="(deviceDetal.numberOne == null ? $t('device.noData') : deviceDetal.numberOne + $t('device.degree'))" readonly />
+        <van-field :label="$t('device.furnaceHeadTemperature')" :model-value="(deviceDetal.furnaceTm == null ? $t('device.noData') : deviceDetal.furnaceTm + $t('device.degree'))" readonly />
+        <van-field :label="$t('device.candyGeneratorTm')" :model-value="(deviceDetal.candyGeneratorTm == null ? $t('device.noData') : deviceDetal.candyGeneratorTm + $t('device.degree'))" readonly />
+        <van-field :label="$t('device.temperatureInCabinet')" :model-value="(deviceDetal.cabinetTm == null ? $t('device.noData') : deviceDetal.cabinetTm + $t('device.degree'))" readonly />
+        <van-field :label="$t('device.humidityInCabinet')" :model-value="(deviceDetal.cabinetHd == null? $t('device.noData') : deviceDetal.cabinetHd + $t('device.humidity'))" readonly />
+        <van-field :label="$t('device.outsideTm')" :model-value="(deviceDetal.outsideTm == null ? $t('device.noData') : deviceDetal.outsideTm + $t('device.degree'))" readonly />
+        <van-field :label="$t('device.outsidehd')" :model-value="(deviceDetal.outsideHd == null? $t('device.noData') : deviceDetal.outsideHd + $t('device.humidity'))" readonly />
       </div>
       <div class="paramsList" v-for="(item, key) in paramsList" :key="key">
         <van-field v-model="item.val" v-if="item.name != 'M502' && item.name != 'M506'" name="phone" type="tel"
@@ -44,17 +53,19 @@ export default {
     const { t } = useI18n();
     const route = useRoute();
     const deviceId = route.query.deviceId;
-    const deviceDetal = ref(null);
+    const deviceDetal = ref([]);
     const paramsTitle = ref("");
     const paramsList = ref([]);
     const comParams = ref([]);
     const paramName = ref([]);
     const checked = ref([]);
+    const type = ref("");
 
     // 初始化页面获取列表
     onMounted(async () => {
       // 加载样式
       styleUrl('paramsSet');
+      type.value = route.query.type;
       if (route.query.type === "0") {
         paramsTitle.value = t('device.generalParameterConfiguration');
       }
@@ -152,10 +163,15 @@ export default {
       paramName,
       checked,
       onUpdateValue,
+      type,
     };
   },
 };
 </script>
 <style lang="less" scoped>
 @import "../../../common/style/common";
+
+.paramsValue {
+  margin: 0 40px;
+}
 </style>

src/views/merchantManage/index.vue

@@ -30,17 +30,17 @@
                 <!-- <div class="group6 flex-col"></div> -->
               </div>
               <span class="word4"
-                v-html="`${$t('merchantManage.telephone')}:` + (item.phone == null ? '' : item.phone)"></span>
+                v-html="`${$t('merchantManage.telephone')}：` + (item.phone == null ? '' : item.phone)"></span>
               <span class="word5"
-                v-html="`${$t('merchantManage.mailbox')}:` + (item.email == null ? '' : item.email)"></span>
+                v-html="`${$t('merchantManage.mailbox')}：` + (item.email == null ? '' : item.email)"></span>
               <span class="word6"
-                v-html="`${$t('merchantManage.loginTime')}:` + (item.loginDate == null ? '' : item.loginDate)"></span>
+                v-html="`${$t('merchantManage.loginTime')}：` + (item.loginDate == null ? '' : Format_time(item.loginDate))"></span>
               <span class="info6"
-                v-html="`${$t('merchantManage.loginIPAddress')}:` + (item.loginIp == null ? '' : item.loginIp)"></span>
+                v-html="`${$t('merchantManage.loginIPAddress')}：` + (item.loginIp == null ? '' : item.loginIp)"></span>
               <span class="txt2"
-                v-html="`${$t('merchantManage.managementSystemId')}:` + (item.managerId == null ? '' : item.managerId)"></span>
+                v-html="`${$t('merchantManage.managementSystemId')}：` + (item.managerId == null ? '' : item.managerId)"></span>
               <div class="box3 flex-col">
-                <span class="txt3" v-html="`${$t('merchantManage.creationTime')}:` + Format_time(item.createDate)"></span>
+                <span class="txt3" v-html="`${$t('merchantManage.creationTime')}：` + Format_time(item.createDate)"></span>
               </div>
               <div class="button-container">
                 <van-button v-if="user.type < 2" class="btn1" round type="success" @click="autoLogin(item.id)">切换登陆</van-button>

src/views/orderCenter/index.vue

@@ -108,11 +108,12 @@
                         <span class="word12" v-if="item.status === 3">{{ item.price.toFixed(2) }}</span>
                         <span class="word12" v-else>{{ item.refundAmount == null ? item.price.toFixed(2) : (item.price -
                           item.refundAmount).toFixed(2) }}</span>
-                          <!-- 分佣￥ -->
-                          <!-- <span class="word14">{{ $t('orderCenter.dividingDomesticService') }}：&yen;{{ showSubcom(item)
+                        <!-- 分佣￥ -->
+                        <!-- <span class="word14">{{ $t('orderCenter.dividingDomesticService') }}：&yen;{{ showSubcom(item)
                         }}</span> -->
-                        <span class="word14">{{ $t('orderCenter.dividingDomesticService') }}：{{ currencySymbol }}{{ showSubcom(item)
-                        }}</span>
+                        <span v-if="user.ifForeign === '0'" class="word14">{{ $t('orderCenter.dividingDomesticService')
+                        }}：{{ currencySymbol }}{{ showSubcom(item)
+}}</span>
                       </div>
                     </template>
                     <template #price-top>
@@ -418,9 +419,15 @@ export default {
     const showSugerPhoto = (row) => {
       if (row.orderDetails != null) {
         if (row.orderDetails.length > 0) {
+          if (row.orderDetails[0].productNo == 'A99') {
+            return require(`../../assets/order/spunSugar/goods/A30.png`);
+          }
           return require(`../../assets/order/spunSugar/goods/${row.orderDetails[0].productNo}.png`);
         } else {
           if (row.productNo != null) {
+            if (row.productNo == 'A99') {
+              return require(`../../assets/order/spunSugar/goods/A30.png`);
+            }
             return require(`../../assets/order/spunSugar/goods/${row.productNo}.png`);
           }
           if (row.machineType == null || row.machineType == '0') {
@@ -439,6 +446,9 @@ export default {
     };
     // 订单明细商品图片路径处理
     const showSugarPic = (row) => {
+      if (row == 'A99') {
+        return require(`../../assets/order/spunSugar/goods/A30.png`);
+      }
       return require(`../../assets/order/spunSugar/goods/${row}.png`);
     };
     // 如果是空数据

src/views/orderExport/index.vue

@@ -60,9 +60,9 @@
               <div class="mod9 flex-row">
                 <!-- 自定义货币符号￥ -->
                 <!-- <span class="info7">&yen;</span> -->
+                <span class="word9">{{ $t("orderExport.totalSales") }}</span>
                 <span class="info7">{{ currencySymbol }}</span>
                 <span class="info8">{{ item.priceTotal }}</span>
-                <span class="word9">{{ $t("orderExport.totalSales") }}</span>
               </div>
               <div class="mod10 flex-row">
                 <span class="txt3 o-mr-10">{{ item.username }}</span>