Sfoglia il codice sorgente

Merge branch 'sunzee-test' of http://112.74.63.148:3000/litianbiao/shenze-sysMan into sunzee-test

Ritchie 1 anno fa
parent
commit
2731d153aa

+ 50 - 51
src/assets/language/en.json

@@ -17,7 +17,7 @@
     "paymentMethod": "Payment method",
     "allDevices": "All devices",
     "commodityType": "Commodity type",
-    "machineType": "Device type",
+    "machineType": "Machine type",
     "whole": "whole",
     "noPaymentRequired": "No payment required",
     "coin": "Coin",
@@ -36,7 +36,7 @@
     "orderStatus": "Order Status",
     "allSuboUsers": "All subordinate users",
     "companies": "Company platform",
-    "machines": "Device type",
+    "machines": "Machine type",
     "sz": "Sunzee",
     "sc": "Sevencloud",
     "MG": "Marshmallow",
@@ -47,7 +47,7 @@
   },
   "navBar": {
     "homePage": "Home",
-    "deviceInformation": "Device",
+    "deviceInformation": "Machine",
     "machineRanking": "Ranking",
     "personalCenter": "My Center"
   },
@@ -187,7 +187,7 @@
     "equipmentNoLabel": "Equipment No",
     "equipmentNoPlaceholder": "Please enter the equipment number",
     "equipmentNameLabel": "Equipment name",
-    "equipmentNamePlaceholder": "Please enter the device name",
+    "equipmentNamePlaceholder": "Please enter the Machine name",
     "alarmTime": "Alarm time",
     "to": "to",
     "startTime": "start time",
@@ -234,20 +234,20 @@
     }
   },
   "device": {
-    "managementCenter": "Device Management Center",
-    "setAlarm": "set alarm",
-    "equipmentName": "Equipment name",
+    "managementCenter": "Machine Management Center",
+    "setAlarm": "Set alarm",
+    "equipmentName": "Machine name",
     "equipmentNameTips": "No name has been set",
-    "selectDevice": "Select Device",
+    "selectDevice": "Select Machine",
     "selectTime": "Select time",
     "selectTheNumberOfAlarmClockRepetitions": "Select the number of alarm clock repetitions",
     "everyDay": "Every day",
     "weekday": "Working days (Monday to Friday)",
     "weekend": "Weekend (Saturday to Sunday)",
     "custom": "custom",
-    "messageReceiver1": "Device alarm contact 1",
-    "messageReceiver2": "Device alarm contact 2",
-    "messageReceiver3": "Device alarm contact 3",
+    "messageReceiver1": "Machine alarm contact 1",
+    "messageReceiver2": "Machine alarm contact 2",
+    "messageReceiver3": "Machine alarm contact 3",
     "equipmentmessageReceiverPlaceholder": "Please enter email",
     "repetitionsLabel": "Repetitions",
     "repetitionsPlaceholder": "Please enter the number of repetitions",
@@ -255,8 +255,8 @@
     "alarmTypePlaceholder": "Please select the type of alarm clock",
     "alarmNameLabel": "Alarm name",
     "alarmNamePlaceholder": "Please enter the name of the alarm clock",
-    "effectiveImmediately": "Effective immediately",
-    "submitSettings": "Submit Settings",
+    "effectiveImmediately": "State",
+    "submitSettings": "Submit",
     "clickToSelectTheTime": "Click to select the time",
     "cancel": "cancel",
     "confirm": "confirm",
@@ -293,9 +293,9 @@
     "submitForApproval": "Submit for approval",
     "timeSwitch": "Time switch",
     "addAlarmClock": "Add alarm clock",
-    "modify": "modify",
+    "modify": "Edit",
     "furnHeadStatus": "Furnace head status",
-    "deviceStatus": "Device status",
+    "deviceStatus": "Machine status",
     "opened": "Opened",
     "closed": "Closed",
     "weekday2": "weekday",
@@ -315,9 +315,9 @@
     "sleep": "sleep",
     "openCloseFurnaceHead": "Open/close furnace head",
     "openFurnHead": "Open furnace head",
-    "openDevice": "Open device",
+    "openDevice": "Open Machine",
     "closeFurnHead": "Close furnace head",
-    "closeDevice": "Close device",
+    "closeDevice": "Close Machine",
     "remoteDoorOpening": "Remote door opening",
     "remoteSugarMaking": "Remote sugar making",
     "remoteProduction": "Remote production",
@@ -327,7 +327,7 @@
     "openRemind": "Remind",
     "openRemindOut": "Are you sure you want to switch the outer door?",
     "openRemindIn": "Are you sure you want to switch the Inner door?",
-    "modulation": "modulation",
+    "modulation": "Modulation",
     "equipmentRecharge": "Equipment recharge",
     "parameterSetting": "Parameter setting",
     "operationConfirmation": "Operation confirmation",
@@ -335,7 +335,6 @@
     "IllThinkAboutItAgain": "Cancel",
     "restartSucceeded": "Restart succeeded",
     "deleteDeviceSucceed": "Delete device successfully",
-    "deleteDeviceFailed": "Delete device failed",
     "enableMaterialSucceed": "Enable material successfully",
     "enableMaterialFailed": "Enable material failed",
     "sleepSuccessfully": "Sleep successfully",
@@ -348,19 +347,19 @@
     "equipmentCodeLabel": "Equipment code",
     "equipmentCodePlaceholder": "Please enter the equipment code",
     "equipmentNameLabel": "Equipment name",
-    "equipmentNamePlaceholder": "Please enter the device name",
+    "equipmentNamePlaceholder": "Please enter the Machine name",
     "merchantNameLabel": "Merchant name",
     "merchantNamePlaceholder": "Please enter the merchant name",
     "equipmentTypeLabel": "Equipment type",
-    "equipmentTypePlaceholder": "Please select a device type",
+    "equipmentTypePlaceholder": "Please select a Machine type",
     "companyTypeLabel": "Company type",
     "companyTypePlaceholder": "Please select a companytype",
     "equipmentModelLabel": "Equipment model",
-    "equipmentModelPlaceholder": "Please select a device model",
+    "equipmentModelPlaceholder": "Please select a Machine model",
     "powerOnStatus": "Power on status",
     "pleaseSelectThePowerOnStatus": "Please select the power on status",
     "equipmentStatus": "Equipment Status",
-    "pleaseSelectTheDeviceStatus": "Please select the device status",
+    "pleaseSelectTheDeviceStatus": "Please select the Machine status",
     "emptyingConditions": "Clear condition",
     "clickSearch": "Click search",
     "spunSugar": "Cotton candy",
@@ -371,11 +370,11 @@
     "shutdown": "Shut down",
     "enable": "Enable",
     "deactivate": "Deactivate",
-    "deviceInformation": "Device Information",
+    "deviceInformation": "Machine Information",
     "essentialInformation": "Basic Information",
     "equipmentCode": "Equipment Code",
     "equipmentRemarksLabel": "Equipment Remarks",
-    "equipmentRemarksPlaceholder": "Please enter device notes",
+    "equipmentRemarksPlaceholder": "Please enter Machine notes",
     "affiliatedMerchant": "Business Owner",
     "affiliatedArea": "Affiliated Area",
     "machineType": "Machine Type",
@@ -392,7 +391,7 @@
     "onlinePayment": "Online Payment",
     "offlinePayment": "offline payment",
     "onlineAndOfflinePayment": "Online and offline payment",
-    "submitAndPushDeviceUpdates": "Submit and push device updates",
+    "submitAndPushDeviceUpdates": "Submit and push Machine updates",
     "clickToSelectPattern": "Click to select pattern",
     "pleaseSelectAPattern": "Please select a pattern",
     "clickToSelectTaste": "Click to choose flavor",
@@ -411,8 +410,8 @@
     "sleeping": "Sleeping zzZ",
     "notSleeping": "Not sleeping",
     "lastRefreshTime": "Recent refresh time",
-    "machineUniqueCode": "Device Code",
-    "furnaceHeadTemperature": "furnace head temperature",
+    "machineUniqueCode": "Machine Code",
+    "furnaceHeadTemperature": "Furnace head temperature",
     "stirringTemperature": "Stirring temperature",
     "cornGeneratorTemperature": "Corn generator temperature",
     "cupQuantity": "Cup quantity",
@@ -429,14 +428,14 @@
     "unknownError": "Unknown error!",
     "degree": "℃",
     "humidity": "%RH",
-    "volume": "volume",
+    "volume": "Volume",
     "alarmContent": "Alarm content",
     "alarmContentNoData": "Machine is normal, no alarm.",
-    "alarmClock": "Device alarm!",
+    "alarmClock": "Machine alarm!",
     "eliminateAlarm": "Eliminate",
-    "editDevice": "Device details",
+    "editDevice": "Machine details",
     "seeMore": "See more",
-    "stow": "stow",
+    "stow": "Pack up",
     "successfullyEliminatedTheAlarm": "Successfully eliminated the alarm",
     "slideSliderToAdjustVolume": "Slide slider to adjust volume",
     "submitModification": "Submit Modification",
@@ -470,13 +469,13 @@
       "total": "Total: ",
       "goods": " goods",
       "batchModify": "Batch modification",
-      "modify": "modify",
+      "modify": "edit",
       "submit": "Submit",
       "batchPrice": "Batch price",
       "batchPricePlace": "Please enter the batch price",
       "modifySubmit": "Submit"
     },
-    "materialMonitor": "materialMonitor",
+    "materialMonitor": "Material control",
     "customLogo": {
       "customLogo": "Custom Logo",
       "logoLabel": "modify logo",
@@ -485,7 +484,7 @@
       "registerButton": "Commit",
       "customLogoSucceed": "Custom logo success"
     },
-    "deleteDevice": "Delete Device",
+    "deleteDevice": "Delete Machine",
     "viewLogs": "View logs",
     "noPosition": "No positioning",
     "equipLocation": "Equipment location",
@@ -493,14 +492,14 @@
     "viewPositioning": "View positioning",
     "view": "view",
     "oneKeyFeed": "One key feeding",
-    "replenishment": "replenishment",
-    "whiteSugar": "whiteSugar",
-    "redSugar": "redSugar",
-    "yellowSugar": "yellowSugar",
-    "blueSugar": "blueSugar",
-    "stick": "stick",
-    "water": "water",
-    "wasteWater": "wasteWater",
+    "replenishment": "Replenishment",
+    "whiteSugar": "WhiteSugar",
+    "redSugar": "RedSugar",
+    "yellowSugar": "YellowSugar",
+    "blueSugar": "BlueSugar",
+    "stick": "Stick",
+    "water": "Water",
+    "wasteWater": "Waste water",
     "sentSuccessfully": "Request sent successfully",
     "turnOffSleep": "Sleeping zzZ",
     "turnOnSleep": "Not sleeping",
@@ -516,7 +515,7 @@
     "sureUpdate": "Are you sure you want to update",
     "coupon": "coupon",
     "adRule": "Advertising rules",
-    "changePassword": "Changing device password",
+    "changePassword": "Changing Machine password",
     "editAdRule": {
       "title": "Edit Rule",
       "ruleName": "Rule Name",
@@ -529,7 +528,7 @@
       "equipmentName": "Equipment name"
     },
     "devicePasswordPage": {
-      "title": "Changing device password",
+      "title": "Changing Machine password",
       "equipmentName": "Equipment name",
       "deivcePwd": "Equipment password",
       "adminPassword": "Administrator password",
@@ -636,7 +635,7 @@
     "numberOfOrders": "Order quantity",
     "salesAmount": "Sales amount",
     "commonTools": "Common tools",
-    "deviceManagement": "Device management",
+    "deviceManagement": "Machine management",
     "discountCode": "discountCode",
     "distributionSettings": "distributionSettings",
     "accountPermission": "accountPermission",
@@ -940,8 +939,8 @@
     "addRole": "Add Role",
     "pleaseSelectARole": "Please select a role",
     "pleaseSelectAPattern": "Please select a pattern",
-    "deviceManagement": "Device management",
-    "deviceView": "Device View",
+    "deviceManagement": "Machine management",
+    "deviceView": "Machine View",
     "distributionSettings": "Distribution Settings",
     "alarmHistory": "Alarm history",
     "advertisingManagement": "Advertising management",
@@ -1281,12 +1280,12 @@
     "whole": "All",
     "sz": "Sunzee",
     "sc": "Sevencloud",
-    "machineType": "Device type",
-    "machineTypePlace": "Please select a device type",
+    "machineType": "Machine type",
+    "machineTypePlace": "Please select a Machine type",
     "MG": "Marshmallow",
     "POP": "Popcorn",
     "seleWeekDateRangeNotSeveDays": "The date range of the selected week cannot exceed 7 days!!!",
-    "rankMethod": "Ranking method"
+    "rankMethod": "Pattern"
   },
   "user": {
     "personalCenter": "Personal Center",

+ 10 - 8
src/styles/alarmClock/index.less

@@ -72,7 +72,7 @@
 
     .section6 {
       width: 100%;
-      padding: 10px 15px;
+      padding: 10px 10px;
 
       .TextGroup2 {
         width: 25%;
@@ -143,8 +143,9 @@
 
       .ImageText2 {
         height: 17px;
-        width: 10%;
-        margin: 9px 0 0 20px;
+        width: 15%;
+        // margin: 9px 0 0 5px;
+        margin-top: 5px;
 
         .group3 {
           width: 40px;
@@ -178,17 +179,18 @@
       }
 
       .bd4 {
-        width: 10%;
+        width: 15%;
         height: 36px;
-        margin: 10px 0 0 15px;
+        // margin: 10px 0 0 15px;
 
         .outer1 {
-          width: 41px;
+          width: 40px;
           height: 17px;
+          margin-left: 5px;
 
           .main3 {
-            width: 15px;
-            height: 15px;
+            width: 12px;
+            height: 12px;
             background: url('../../assets/edit.png') top center no-repeat;
             background-size: 100%;
             margin-top: 1px;

+ 8 - 1
src/styles/device/index.less

@@ -290,7 +290,7 @@
               font-size: 14px;
               text-align: left;
               white-space: nowrap;
-              line-height: 13px;
+              line-height: 14px;
             }
 
             .clickable-link {
@@ -322,6 +322,13 @@
                 display: block;
               }
 
+              // @media (max-width: 767px) {
+              //   .word5 {
+              //     width: 100%;
+              //     margin-bottom: 16px;
+              //   }
+              // }
+
               .word6 {
                 // width: 33.33%;
                 overflow-wrap: break-word;

+ 8 - 0
src/styles/deviceSet/index.less

@@ -640,6 +640,14 @@
         .van-field__body {
             width: 80%;
         }
+
+        .van-field__control {
+            height: 38px;
+            line-height: 38px;
+            padding: 6px;
+            border-radius: 1px;
+            border: 1px solid #dddde8;
+        }
     }
 
 

+ 6 - 5
src/styles/robotRanking/index.less

@@ -76,7 +76,7 @@ button:active {
 }
 
 .group5 {
-    width: 39px;
+    width: 15%;
     height: 16px;
     margin-right: 50px;
     .icon2 {
@@ -262,15 +262,16 @@ button:active {
                             .ImageText1 {
                                 height: 16px;
                                 margin-top: 1px;
-                                width: 135px;
+                                width: 55%;
 
                                 .group4 {
-                                    width: 135px;
+                                    width: 40%;
                                     height: 16px;
 
                                     .layer3 {
                                         width: 16px;
                                         height: 16px;
+                                        margin-right: 5px;
                                         background: url("../../assets/home/titleIcon.png") top center no-repeat;
                                         background-size: 100%;
                                     }
@@ -278,10 +279,10 @@ button:active {
                                     .TextGroup1 {
                                         height: 14px;
                                         margin-top: 2px;
-                                        width: 113px;
+                                        width: auto;
 
                                         .word3 {
-                                            width: 113px;
+                                            width: auto;
                                             height: 14px;
                                             overflow-wrap: break-word;
                                             color: rgba(64, 77, 116, 1);

+ 16 - 3
src/styles/user/index.less

@@ -104,7 +104,16 @@
             }
 
             .relationClass {
-                padding: 0;
+                // padding: 0;
+
+                .van-field__control {
+                    height: 38px;
+                    line-height: 38px;
+                    padding: 6px;
+                    border-radius: 2px;
+                    background: #fff;
+                    border: 1px solid #dddde8;
+                }
 
                 .van-field__button {
                     background-color: #4d6add;
@@ -116,6 +125,10 @@
         }
     }
 
+    .van-cell {
+        background: none;
+    }
+
     .lineBox {
         width: 100%;
         height: 15px;
@@ -171,8 +184,8 @@
                         right: 0.2rem;
                         top: 0.4rem;
                     }
-                    
-                    
+
+
                     &.airwallexIcon::after {
                         content: "";
                         position: absolute;

+ 4 - 2
src/views/accountOperation/index.vue

@@ -9,7 +9,7 @@
           <div class="taskTitle">{{ $t('accountOperation.accountAuthority') }}</div>
         </div>
       </div>
-      <div class="taskListRow flex-col" @click="pushPageList('/distributionSet')">
+      <div v-if="user.ifForeign != '1'" class="taskListRow flex-col" @click="pushPageList('/distributionSet')">
         <div class="taskIcon retailIcon"></div>
         <div class="taskRight">
           <div class="taskTitle">{{ $t('accountOperation.distributionSettings') }}</div>
@@ -47,13 +47,14 @@
 import { onMounted } from 'vue';
 import sHeader from "../../components/SimpleHeader";
 import { useRouter } from "vue-router";
-import { styleUrl } from "../../common/js/utils";
+import { getLoginUser, styleUrl } from "../../common/js/utils";
 
 export default {
   components: { sHeader },
   setup() {
     const router = useRouter();
     styleUrl('accountOperation');
+    const user = getLoginUser();
     // 初始化页面获取列表
     onMounted(async () => { });
     const pushPageList = (url) => {
@@ -61,6 +62,7 @@ export default {
     };
     return { 
       pushPageList,
+      user,
     };
   }
 };

+ 1 - 1
src/views/device/deviceSet.vue

@@ -213,7 +213,7 @@
         <!-- 版本号 -->
         <van-field readonly v-model="deviceDetal.apkVersion" :label="`${$t('device.versionNo')}`" placeholder="" />
         <!-- url -->
-        <div v-if="isAdmind" class="cust_vantBorder">
+        <div v-if="isAdmind">
           <van-field center clearable class="input1" v-model="deviceDetal.url" :label="$t('device.url')"
             :placeholder="$t('device.urlPlace')">
             <template #button>

+ 16 - 16
src/views/device/index.vue

@@ -83,8 +83,8 @@
                 }}</span>
                 <div class="contentBottomCon" v-if="item.checkType">
                   <img class="pic1" referrerpolicy="no-referrer" src="../../assets/home/line.png" />
-                  <div class="layer2 flex-row justify-between o-ptb-7 kBordBott">
-                    <span class="info1 o-ptb-7 kBordBott">{{ $t("device.sleepState") }}:{{
+                  <div class="word4 flex-row justify-between o-ptb-5 kBordBott">
+                    <span class="info1 o-ptb-5 kBordBott">{{ $t("device.sleepState") }}:{{
                       item.isSleep
                       ? $t("device.sleeping")
                       : $t("device.notSleeping")
@@ -116,7 +116,7 @@
                   <!-- <span class="txt5 o-ptb-10 kBordBott l-flex-RC"><span>一键重启炉头:</span>
                     <van-button type="primary">重启</van-button>
                   </span> -->
-                  <div class="word4 o-ptb-7">
+                  <div class="word4 o-ptb-5">
                     <span class="word3 o-pr-5" v-if="item.machineType == '0' || item.machineType == null">{{
                       $t("device.furnHeadStatus") }}: </span>
                     <span class="word3 o-pr-5" v-else>{{ $t("device.deviceStatus") }}: </span>
@@ -151,30 +151,30 @@
                       <a class="clickable-link o-ptb-7" @click="viewPosiClk(item)">{{ item.fullName }}</a>
                     </span>
                   </div>
-                  <van-row class="layer5 o-ptb-7 kBordBott" justify="space-between"
+                  <van-row class="layer5 o-pt-7 kBordBott" justify="space-between"
                     v-if="(item.machineType == '0' || item.machineType == null) && item.equimentType != 'P30'">
-                    <van-col class="word5">{{ $t("device.furnaceHeadTemperature") }}:{{
+                    <van-col class="word5" style="margin-bottom: 13px;">{{ $t("device.furnaceHeadTemperature") }}:{{
                       item.furnaceTm
                     }}{{ $t("device.degree") }}</van-col>
-                    <van-col class="word5">{{ $t("device.temperatureInCabinet") }}:{{
+                    <van-col class="word5" style="margin-bottom: 13px;">{{ $t("device.temperatureInCabinet") }}:{{
                       item.cabinetTm
                     }}{{ $t("device.degree") }}</van-col>
-                    <van-col class="word5">{{ $t("device.humidityInCabinet") }}:{{ item.cabinetHd
+                    <van-col class="word5" style="margin-bottom: 13px;">{{ $t("device.humidityInCabinet") }}:{{ item.cabinetHd
                     }}{{ $t("device.humidity") }}</van-col>
                   </van-row>
-                  <van-row class="layer5 o-ptb-7 kBordBott" justify="space-between" v-else>
-                    <van-col class="word5">{{ $t("device.stirringTemperature") }}:{{
+                  <van-row class="layer5 o-pt-7 kBordBott" justify="space-between" v-else>
+                    <van-col class="word5" style="margin-bottom: 13px;">{{ $t("device.stirringTemperature") }}:{{
                       item.stirTm
                     }}{{ $t("device.degree") }}</van-col>
-                    <van-col class="word5">{{ $t("device.cornGeneratorTemperature") }}:{{
+                    <van-col class="word5" style="margin-bottom: 13px;">{{ $t("device.cornGeneratorTemperature") }}:{{
                       item.cornGeneratorTm
                     }}{{ $t("device.degree") }}</van-col>
-                    <van-col class="word5">{{ $t("device.cupQuantity") }}:{{ item.cupQuantity
+                    <van-col class="word5" style="margin-bottom: 13px;">{{ $t("device.cupQuantity") }}:{{ item.cupQuantity
                     }}</van-col>
                   </van-row>
                   <template v-if="item.isMaterialUse === '1' && (item.machineType == '0' || item.machineType == null)">
-                    <van-row justify="space-between" class="sugarTxt o-ptb-7 kBordBott">
-                      <van-col>
+                    <van-row justify="space-between" class="sugarTxt o-pt-7 kBordBott">
+                      <van-col style="margin-bottom: 15px;">
                         {{ $t("device.whiteSugar") }}:{{ Format_calcuDecial(item.whiteSugar) }}%
                       </van-col>
                       <van-col>
@@ -183,11 +183,11 @@
                       <van-col>
                         {{ $t("device.yellowSugar") }}:{{ Format_calcuDecial(item.yellowSugar) }}%
                       </van-col>
-                      <van-col>
+                      <van-col style="margin-bottom: 10px;">
                         {{ $t("device.blueSugar") }}:{{ Format_calcuDecial(item.blueSugar) }}%
                       </van-col>
                     </van-row>
-                    <div class="sugarTxt o-ptb-7 kBordBott">
+                    <div class="info1 o-ptb-5 kBordBott">
                       <span>{{ $t("device.stick") }}:{{
                         Format_calcuDecial(item.stick)
                       }}%</span>
@@ -201,7 +201,7 @@
                       </van-col>
                     </van-row>
                     <!-- 一键补料 -->
-                    <span class="txt5 o-ptb-7 kBordBott l-flex-RC"><span>{{ $t("device.oneKeyFeed") }}:</span>
+                    <span class="info1 o-ptb-5 kBordBott l-flex-RC"><span>{{ $t("device.oneKeyFeed") }}:</span>
                       <!-- <van-button @click="replenishmentClk(item)" type="primary">{{ $t("device.replenishment") }}
                       </van-button> -->
                       <a class="replenishment o-ptb-7" @click="replenishmentClk(item)">{{ $t("device.replenishment")

+ 2 - 2
src/views/robotRanking.vue

@@ -17,9 +17,9 @@
                     </div>
                   </div>
                 </div>
-                <div @click="noticeClk" class="l-flex-RC">
+                <div @click="noticeClk" class="l-flex-RC o-ml-70">
                   <div class="group5 flex-row justify-between">
-                    <img class="label2 o-mr-5" src="@/assets/device/searchIcon.png" />
+                    <img class="label2" src="@/assets/device/searchIcon.png" />
                     <div class="TextGroup2 flex-col">
                       <span class="txt3">{{ $t("robotRanking.rankMethod") }}</span>
                     </div>

+ 4 - 3
src/views/taskMessage/index.vue

@@ -9,7 +9,7 @@
           <div class="taskTitle">{{ $t('taskMessage.equipmentInitializationApproval') }}</div>
         </div>
       </div>
-      <div class="taskListRow flex-col" @click="pushPageList('/taskProportion')">
+      <div v-if="user.ifForeign != '1'" class="taskListRow flex-col" @click="pushPageList('/taskProportion')">
         <div class="taskIcon retailIcon"></div>
         <div class="taskRight">
           <div class="taskTitle">{{ $t('taskMessage.distributionApplicationApproval') }}</div>
@@ -29,12 +29,13 @@
 import { onMounted } from 'vue';
 import sHeader from "@/components/SimpleHeader";
 import { useRouter } from "vue-router";
-import { styleUrl } from "../../common/js/utils";
+import { getLoginUser, styleUrl } from "../../common/js/utils";
 
 export default {
   components: { sHeader },
   setup() {
     const router = useRouter();
+    const user = getLoginUser();
     // 初始化页面获取列表
     onMounted(async () => {
       styleUrl('taskMessage');
@@ -42,7 +43,7 @@ export default {
     const pushPageList = (url) => {
       router.push(url);
     }
-    return { pushPageList };
+    return { pushPageList, user };
   }
 };
 </script>

+ 4 - 4
src/views/user.vue

@@ -56,7 +56,7 @@
           <div v-if="user.type != '0'">
             <div v-if="!phoneNumberShow" class="userInfo l-flex-between">
               <span class="userInfoLeft">{{ $t("user.phoneNumber") }}: </span>
-              <div class="cust_vantBorder">
+              <div>
                 <van-field class="relationClass" v-model="cofficentForm.phone" :placeholder="$t('user.phoneNumberPlace')">
                   <template #button>
                     <van-button type="primary" @click="mailboxChg(cofficentForm.phone, 3)">{{ $t("user.confirmLog") }}
@@ -76,7 +76,7 @@
           <div v-if="user.type != '0'">
             <div v-if="!mailboxShow" class="userInfo l-flex-between">
               <span class="userInfoLeft">{{ $t("user.mailbox") }}: </span>
-              <div class="cust_vantBorder">
+              <div>
                 <van-field class="relationClass" v-model="cofficentForm.mailBox" :placeholder="$t('user.mailboxPlace')">
                   <template #button>
                     <van-button type="primary" @click="mailboxChg(cofficentForm.mailBox, 2)">{{ $t("user.confirmLog") }}
@@ -96,7 +96,7 @@
           <div v-if="isInland && user.type == '2'">
             <div v-if="!relationType" class="userInfo l-flex-between">
               <span class="userInfoLeft">{{ $t("user.associateParent") }}: </span>
-              <div class="cust_vantBorder">
+              <div >
                 <van-field class="relationClass" v-model="cofficentForm.associateParent"
                   :placeholder="$t('user.associateParentPlace')">
                   <template #button>
@@ -118,7 +118,7 @@
           <!-- 自定义货币符号 -->
           <div v-if="!symbolShow" class="userInfo l-flex-between">
             <span class="userInfoLeft">{{ $t("user.currencySymbol") }}: </span>
-            <div class="cust_vantBorder">
+            <div>
               <van-field class="relationClass" v-model="cofficentForm.currencySymbol"
                 :placeholder="$t('user.currencySymbolPlace')">
                 <template #button>