style：“格式化一些代码”

package.json

@@ -77,4 +77,4 @@
     "last 2 versions",
     "not dead"
   ]
-}
+}

src/assets/language/en.json

@@ -413,7 +413,7 @@
     "degree": "degree",
     "volume": "volume",
     "alarmContent": "Alarm content",
-    "alarmClock":"Device alarm!",
+    "alarmClock": "Device alarm!",
     "eliminateAlarm": "Eliminate",
     "editDevice": "Device details",
     "seeMore": "See more",

src/assets/language/zh.json

@@ -40,7 +40,7 @@
     "sz": "申泽",
     "sc": "七云",
     "MG": "棉花糖",
-    "POP":"爆米花"
+    "POP": "爆米花"
   },
   "navBar": {
     "homePage": "首页",
@@ -413,7 +413,7 @@
     "degree": "度",
     "volume": "音量",
     "alarmContent": "报警内容",
-    "alarmClock":"设备报警！",
+    "alarmClock": "设备报警！",
     "eliminateAlarm": "消除",
     "editDevice": "设备详细信息",
     "seeMore": "查看更多",

src/router/index.js

@@ -221,7 +221,7 @@ const router = createRouter({
       path: "/airwallexPayout",
       name: "airwallexPayout",
       component: () => import("@/views/airwallex/payout.vue"),
-      meta: { index: 1},
+      meta: { index: 1 },
     },
     // Airwallex 去付款
     {

src/views/accountPer/index.vue

@@ -31,10 +31,12 @@
       <div class="listBox">
         <div v-for="(item, index) in accountPerList" :key="index" class="listItem" @click="accountClick(item)">
           <div class="itemBox">
-            <div class="itemRow"><span
-                class="itemTitle">{{ $t('accountPer.fullName') }}:&nbsp;</span>{{ decodeURIComponent(item.name) }}</div>
-            <div class="itemRow"><span class="itemTitle">{{ $t('accountPer.role') }}:&nbsp;</span>{{ item.roleName }}</div>
-            <div class="itemRow"><span class="itemTitle">{{ $t('accountPer.accountNumber') }}:&nbsp;</span>{{ item.username }}
+            <div class="itemRow"><span class="itemTitle">{{ $t('accountPer.fullName') }}:&nbsp;</span>{{
+              decodeURIComponent(item.name) }}</div>
+            <div class="itemRow"><span class="itemTitle">{{ $t('accountPer.role') }}:&nbsp;</span>{{ item.roleName }}
+            </div>
+            <div class="itemRow"><span class="itemTitle">{{ $t('accountPer.accountNumber') }}:&nbsp;</span>{{
+              item.username }}
             </div>
             <!-- <div class="itemRow"><span class="itemTitle">邮箱:&nbsp;</span>{{showDate(item.lastUseDate)}}</div> -->
           </div>

src/views/accountPer/search.vue

@@ -11,8 +11,8 @@
             @click="show = true" />
           <!-- 操作 -->
           <van-row justify="space-around" style="padding: 1em">
-            <van-button span="5" round type="primary" style="height: 2em; padding: 0 2em"
-              native-type="submit">{{ $t('accountPer.clickQuery') }}</van-button>
+            <van-button span="5" round type="primary" style="height: 2em; padding: 0 2em" native-type="submit">{{
+              $t('accountPer.clickQuery') }}</van-button>
           </van-row>
         </van-form>
       </div>

src/views/advertManage/advertRule/add1.vue

@@ -4,160 +4,88 @@
     <van-form show-error-message @submit="onSubmit">
       <div class="cust_vantBorder">
         <div class="kBordBott">
-          <van-field
-              colon
-              :border="false"
-              required
-              v-model="cofficentForm.name"
-              clearable
-              name="name"
-              :label="$t('advertManage.advertRule.addRule.ruleName')"
-              :placeholder="$t('advertManage.advertRule.addRule.ruleNamePlace')"
-              :rules="[
+          <van-field colon :border="false" required v-model="cofficentForm.name" clearable name="name"
+            :label="$t('advertManage.advertRule.addRule.ruleName')"
+            :placeholder="$t('advertManage.advertRule.addRule.ruleNamePlace')" :rules="[
               {
                 required: true,
                 message: $t('advertManage.advertRule.addRule.ruleNamePlace'),
               },
-            ]"
-          />
+            ]" />
         </div>
         <div class="kBordBott">
-          <van-field
-              colon
-              :border="false"
-              @click-input="busiInpClk(1)"
-              readonly
-              clearable
-              v-model="cofficentForm.Atype"
-              :placeholder="$t('advertManage.advertRule.addRule.adTypePlace')"
-              :label="$t('advertManage.advertRule.addRule.adType')"
-          >
+          <van-field colon :border="false" @click-input="busiInpClk(1)" readonly clearable v-model="cofficentForm.Atype"
+            :placeholder="$t('advertManage.advertRule.addRule.adTypePlace')"
+            :label="$t('advertManage.advertRule.addRule.adType')">
             <template #right-icon>
               <div class="l-flex-RC">
-                <van-icon
-                    v-if="cofficentForm.Atype"
-                    @click="cofficentForm.Atype = ''"
-                    class="o-mr-6"
-                    name="clear"
-                />
+                <van-icon v-if="cofficentForm.Atype" @click="cofficentForm.Atype = ''" class="o-mr-6" name="clear" />
                 <van-icon @click="busiInpClk(1)" name="arrow-down" />
               </div>
             </template>
           </van-field>
-          <van-field
-              colon
-              :border="false"
-              v-model="cofficentForm.Ausername"
-              clearable
-              :placeholder="$t('advertManage.advertRule.addRule.userNamePlace')"
-              :label="$t('advertManage.advertRule.addRule.userName')"
-          >
+          <van-field colon :border="false" v-model="cofficentForm.Ausername" clearable
+            :placeholder="$t('advertManage.advertRule.addRule.userNamePlace')"
+            :label="$t('advertManage.advertRule.addRule.userName')">
             <template #button>
               <van-button @click="searchClk(0)" type="primary">{{
-                  $t("advertManage.advertRule.addRule.search")
-                }}</van-button>
+                $t("advertManage.advertRule.addRule.search")
+              }}</van-button>
             </template>
           </van-field>
-          <van-field
-              colon
-              :border="false"
-              required
-              @click-input="busiInpClk(2)"
-              readonly
-              clearable
-              v-model="cofficentForm.AName"
-              :placeholder="$t('advertManage.advertRule.addRule.AScreenPlace')"
-              :label="$t('advertManage.advertRule.addRule.AScreen')"
-              name="AName"
-              :rules="[
+          <van-field colon :border="false" required @click-input="busiInpClk(2)" readonly clearable
+            v-model="cofficentForm.AName" :placeholder="$t('advertManage.advertRule.addRule.AScreenPlace')"
+            :label="$t('advertManage.advertRule.addRule.AScreen')" name="AName" :rules="[
               {
                 required: true,
                 message: $t('advertManage.advertRule.addRule.AScreenPlace'),
               },
-            ]"
-          >
+            ]">
             <template #right-icon>
               <div class="l-flex-RC">
-                <van-icon
-                    v-if="cofficentForm.AName"
-                    @click="
-                    cofficentForm.AName = '';
-                    cofficentForm.AId = '';
-                  "
-                    class="o-mr-6"
-                    name="clear"
-                />
+                <van-icon v-if="cofficentForm.AName" @click="
+                  cofficentForm.AName = '';
+                cofficentForm.AId = '';
+                " class="o-mr-6" name="clear" />
                 <van-icon @click="busiInpClk(2)" name="arrow-down" />
               </div>
             </template>
           </van-field>
         </div>
         <div class="kBordBott">
-          <van-field
-              colon
-              :border="false"
-              @click-input="busiInpClk(3)"
-              readonly
-              clearable
-              v-model="cofficentForm.Btype"
-              :placeholder="$t('advertManage.advertRule.addRule.adTypePlace')"
-              :label="$t('advertManage.advertRule.addRule.adType')"
-          >
+          <van-field colon :border="false" @click-input="busiInpClk(3)" readonly clearable v-model="cofficentForm.Btype"
+            :placeholder="$t('advertManage.advertRule.addRule.adTypePlace')"
+            :label="$t('advertManage.advertRule.addRule.adType')">
             <template #right-icon>
               <div class="l-flex-RC">
-                <van-icon
-                    v-if="cofficentForm.Btype"
-                    @click="cofficentForm.Btype = ''"
-                    class="o-mr-6"
-                    name="clear"
-                />
+                <van-icon v-if="cofficentForm.Btype" @click="cofficentForm.Btype = ''" class="o-mr-6" name="clear" />
                 <van-icon @click="busiInpClk(3)" name="arrow-down" />
               </div>
             </template>
           </van-field>
-          <van-field
-              colon
-              :border="false"
-              v-model="cofficentForm.Busername"
-              clearable
-              :placeholder="$t('advertManage.advertRule.addRule.userNamePlace')"
-              :label="$t('advertManage.advertRule.addRule.userName')"
-          >
+          <van-field colon :border="false" v-model="cofficentForm.Busername" clearable
+            :placeholder="$t('advertManage.advertRule.addRule.userNamePlace')"
+            :label="$t('advertManage.advertRule.addRule.userName')">
             <template #button>
               <van-button @click="searchClk(1)" type="primary">{{
-                  $t("advertManage.advertRule.addRule.search")
-                }}</van-button>
+                $t("advertManage.advertRule.addRule.search")
+              }}</van-button>
             </template>
           </van-field>
-          <van-field
-              colon
-              :border="false"
-              required
-              @click-input="busiInpClk(4)"
-              readonly
-              clearable
-              v-model="cofficentForm.BName"
-              :placeholder="$t('advertManage.advertRule.addRule.BScreennPlace')"
-              :label="$t('advertManage.advertRule.addRule.BScreen')"
-              name="BName"
-              :rules="[
+          <van-field colon :border="false" required @click-input="busiInpClk(4)" readonly clearable
+            v-model="cofficentForm.BName" :placeholder="$t('advertManage.advertRule.addRule.BScreennPlace')"
+            :label="$t('advertManage.advertRule.addRule.BScreen')" name="BName" :rules="[
               {
                 required: true,
                 message: $t('advertManage.advertRule.addRule.BScreennPlace'),
               },
-            ]"
-          >
+            ]">
             <template #right-icon>
               <div class="l-flex-RC">
-                <van-icon
-                    v-if="cofficentForm.BName"
-                    @click="
-                    cofficentForm.BName = '';
-                    cofficentForm.BId = '';
-                  "
-                    class="o-mr-6"
-                    name="clear"
-                />
+                <van-icon v-if="cofficentForm.BName" @click="
+                  cofficentForm.BName = '';
+                cofficentForm.BId = '';
+                " class="o-mr-6" name="clear" />
                 <van-icon @click="busiInpClk(4)" name="arrow-down" />
               </div>
             </template>
@@ -172,25 +100,15 @@
     </van-form>
     <!-- 广告类型选择框 -->
     <van-popup v-model:show="busiPopShow" position="bottom">
-      <van-picker
-          :default-index="busiDefaIdx"
-          :title="$t('advertManage.advertRule.addRule.adTypePlace')"
-          :columns="busiPopList"
-          :columns-field-names="busiPopFieldName"
-          @confirm="busiPopConfirm"
-          @cancel="busiPopCancel"
-      />
+      <van-picker :default-index="busiDefaIdx" :title="$t('advertManage.advertRule.addRule.adTypePlace')"
+        :columns="busiPopList" :columns-field-names="busiPopFieldName" @confirm="busiPopConfirm"
+        @cancel="busiPopCancel" />
     </van-popup>
     <!-- A屏/B屏选择框 -->
     <van-popup v-model:show="screenPopShow" position="bottom">
-      <van-picker
-          :default-index="screenDefaIdx"
-          :title="$t('advertManage.advertRule.addRule.selectAd')"
-          :columns="screenPopList"
-          :columns-field-names="screenPopFieldName"
-          @confirm="screenPopConfirm"
-          @cancel="screenPopCancel"
-      />
+      <van-picker :default-index="screenDefaIdx" :title="$t('advertManage.advertRule.addRule.selectAd')"
+        :columns="screenPopList" :columns-field-names="screenPopFieldName" @confirm="screenPopConfirm"
+        @cancel="screenPopCancel" />
     </van-popup>
   </div>
 </template>
@@ -528,536 +446,4 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
-</style><template>
-  <div class="addIdx">
-    <s-header :name="titleName" :noback="false"></s-header>
-    <van-form show-error-message @submit="onSubmit">
-      <div class="cust_vantBorder">
-        <div class="kBordBott">
-          <van-field
-              colon
-              :border="false"
-              required
-              v-model="cofficentForm.name"
-              clearable
-              name="name"
-              :label="$t('advertManage.advertRule.addRule.ruleName')"
-              :placeholder="$t('advertManage.advertRule.addRule.ruleNamePlace')"
-              :rules="[
-              {
-                required: true,
-                message: $t('advertManage.advertRule.addRule.ruleNamePlace'),
-              },
-            ]"
-          />
-        </div>
-        <div class="kBordBott">
-          <van-field
-              colon
-              :border="false"
-              @click-input="busiInpClk(1)"
-              readonly
-              clearable
-              v-model="cofficentForm.Atype"
-              :placeholder="$t('advertManage.advertRule.addRule.adTypePlace')"
-              :label="$t('advertManage.advertRule.addRule.adType')"
-          >
-            <template #right-icon>
-              <div class="l-flex-RC">
-                <van-icon
-                    v-if="cofficentForm.Atype"
-                    @click="cofficentForm.Atype = ''"
-                    class="o-mr-6"
-                    name="clear"
-                />
-                <van-icon @click="busiInpClk(1)" name="arrow-down" />
-              </div>
-            </template>
-          </van-field>
-          <van-field
-              colon
-              :border="false"
-              v-model="cofficentForm.Ausername"
-              clearable
-              :placeholder="$t('advertManage.advertRule.addRule.userNamePlace')"
-              :label="$t('advertManage.advertRule.addRule.userName')"
-          >
-            <template #button>
-              <van-button @click="searchClk(0)" type="primary">{{
-                  $t("advertManage.advertRule.addRule.search")
-                }}</van-button>
-            </template>
-          </van-field>
-          <van-field
-              colon
-              :border="false"
-              required
-              @click-input="busiInpClk(2)"
-              readonly
-              clearable
-              v-model="cofficentForm.AName"
-              :placeholder="$t('advertManage.advertRule.addRule.AScreenPlace')"
-              :label="$t('advertManage.advertRule.addRule.AScreen')"
-              name="AName"
-              :rules="[
-              {
-                required: true,
-                message: $t('advertManage.advertRule.addRule.AScreenPlace'),
-              },
-            ]"
-          >
-            <template #right-icon>
-              <div class="l-flex-RC">
-                <van-icon
-                    v-if="cofficentForm.AName"
-                    @click="
-                    cofficentForm.AName = '';
-                    cofficentForm.AId = '';
-                  "
-                    class="o-mr-6"
-                    name="clear"
-                />
-                <van-icon @click="busiInpClk(2)" name="arrow-down" />
-              </div>
-            </template>
-          </van-field>
-        </div>
-        <div class="kBordBott">
-          <van-field
-              colon
-              :border="false"
-              @click-input="busiInpClk(3)"
-              readonly
-              clearable
-              v-model="cofficentForm.Btype"
-              :placeholder="$t('advertManage.advertRule.addRule.adTypePlace')"
-              :label="$t('advertManage.advertRule.addRule.adType')"
-          >
-            <template #right-icon>
-              <div class="l-flex-RC">
-                <van-icon
-                    v-if="cofficentForm.Btype"
-                    @click="cofficentForm.Btype = ''"
-                    class="o-mr-6"
-                    name="clear"
-                />
-                <van-icon @click="busiInpClk(3)" name="arrow-down" />
-              </div>
-            </template>
-          </van-field>
-          <van-field
-              colon
-              :border="false"
-              v-model="cofficentForm.Busername"
-              clearable
-              :placeholder="$t('advertManage.advertRule.addRule.userNamePlace')"
-              :label="$t('advertManage.advertRule.addRule.userName')"
-          >
-            <template #button>
-              <van-button @click="searchClk(1)" type="primary">{{
-                  $t("advertManage.advertRule.addRule.search")
-                }}</van-button>
-            </template>
-          </van-field>
-          <van-field
-              colon
-              :border="false"
-              required
-              @click-input="busiInpClk(4)"
-              readonly
-              clearable
-              v-model="cofficentForm.BName"
-              :placeholder="$t('advertManage.advertRule.addRule.BScreennPlace')"
-              :label="$t('advertManage.advertRule.addRule.BScreen')"
-              name="BName"
-              :rules="[
-              {
-                required: true,
-                message: $t('advertManage.advertRule.addRule.BScreennPlace'),
-              },
-            ]"
-          >
-            <template #right-icon>
-              <div class="l-flex-RC">
-                <van-icon
-                    v-if="cofficentForm.BName"
-                    @click="
-                    cofficentForm.BName = '';
-                    cofficentForm.BId = '';
-                  "
-                    class="o-mr-6"
-                    name="clear"
-                />
-                <van-icon @click="busiInpClk(4)" name="arrow-down" />
-              </div>
-            </template>
-          </van-field>
-        </div>
-      </div>
-      <div style="margin: 16px">
-        <van-button round block type="primary" native-type="submit">
-          {{ $t("advertManage.advertRule.addRule.submit") }}
-        </van-button>
-      </div>
-    </van-form>
-    <!-- 广告类型选择框 -->
-    <van-popup v-model:show="busiPopShow" position="bottom">
-      <van-picker
-          :default-index="busiDefaIdx"
-          :title="$t('advertManage.advertRule.addRule.adTypePlace')"
-          :columns="busiPopList"
-          :columns-field-names="busiPopFieldName"
-          @confirm="busiPopConfirm"
-          @cancel="busiPopCancel"
-      />
-    </van-popup>
-    <!-- A屏/B屏选择框 -->
-    <van-popup v-model:show="screenPopShow" position="bottom">
-      <van-picker
-          :default-index="screenDefaIdx"
-          :title="$t('advertManage.advertRule.addRule.selectAd')"
-          :columns="screenPopList"
-          :columns-field-names="screenPopFieldName"
-          @confirm="screenPopConfirm"
-          @cancel="screenPopCancel"
-      />
-    </van-popup>
-  </div>
-</template>
-
-<script>
-// 导入接口
-import {
-  Api_getAdDetail,
-  Api_getAdRuleList,
-  Api_postAddAdRule,
-  Api_getAdRuleDetail,
-  Api_postUpdateAdRule,
-} from "@/service/advertManage";
-import sHeader from "@/components/SimpleHeader";
-import { onMounted, reactive, ref, toRefs } from "vue";
-import { Toast } from "vant";
-import { useRoute, useRouter } from "vue-router";
-import { useI18n } from "vue-i18n";
-export default {
-  components: { sHeader },
-  setup() {
-    const { t } = useI18n();
-    const titleName = ref(t("advertManage.advertRule.addRule.title"));
-    const route = useRoute();
-    // 广告规则的id
-    const adRuleId = ref("");
-    onMounted(() => {
-      const id = route.query.id || "";
-      adRuleId.value = id;
-      // 看路径有没有id，有就是编辑
-      if (id) {
-        titleName.value = t("advertManage.advertRule.addRule.editTitle");
-        getDetail(id);
-      }
-    });
-    // 获取广告规则详情
-    const getDetail = (id) => {
-      Api_getAdRuleDetail({ id }).then((res) => {
-        const resData = res.data.data;
-        cofficentForm.name = resData.name;
-        const rule = JSON.parse(resData.rule);
-        if (rule.length > 0) {
-          rule.forEach((item) => {
-            getAdDetail(item);
-          });
-        }
-      });
-    };
-    // 根据广告id获取广告详情，填充在屏幕上
-    const getAdDetail = (id) => {
-      Api_getAdDetail({ id }).then((res) => {
-        console.log("res", res);
-        if (res.data.code === "00000") {
-          const resData = res.data.data;
-          // screenType：0：A屏  1：B屏
-          if (resData.screenType === 0) {
-            cofficentForm.AId = resData.id;
-            cofficentForm.AName = resData.name;
-            cofficentForm.Atype = resData.equipmentType;
-            cofficentForm.Ausername = resData.username;
-            // 根据广告类型和商家名称获取广告实体
-            // 根据广告类型弹窗找到默认选中下标
-            if (cofficentForm.Atype) {
-              busiPopList.forEach((item, index) => {
-                if (item.id === cofficentForm.Atype) {
-                  busiDefaParam.screenA = index;
-                }
-              });
-            }
-          } else {
-            cofficentForm.BId = resData.id;
-            cofficentForm.BName = resData.name;
-            cofficentForm.Btype = resData.equipmentType;
-            cofficentForm.Busername = resData.username;
-            if (cofficentForm.Btype) {
-              busiPopList.forEach((item, index) => {
-                if (item.id === cofficentForm.Btype) {
-                  busiDefaParam.screenB = index;
-                }
-              });
-            }
-          }
-          getList(resData.screenType);
-        }
-      });
-    };
-    // 定义参数
-    const cofficentForm = reactive({
-      name: "",
-      Atype: "",
-      Ausername: "",
-      AId: "",
-      AName: "",
-      Btype: "",
-      Busername: "",
-      BId: "",
-      BName: "",
-    });
-    const router = useRouter();
-    // 点击提交规则
-    const onSubmit = () => {
-      // 如果有id就是修改
-      if (adRuleId.value) {
-        let param = {
-          id: adRuleId.value,
-          rule: JSON.stringify([cofficentForm.AId, cofficentForm.BId]),
-          name: cofficentForm.name,
-        };
-        Api_postUpdateAdRule(param).then((res) => {
-          console.log(res);
-          if (res.data.code === "00000") {
-            Toast(res.data.message);
-            setTimeout(() => {
-              router.back();
-            }, 1000);
-          }
-        });
-      } else {
-        let param = {
-          rule: JSON.stringify([cofficentForm.AId, cofficentForm.BId]),
-          name: cofficentForm.name,
-        };
-        Api_postAddAdRule(param).then((res) => {
-          console.log(res);
-          if (res.data.code === "00000") {
-            Toast(res.data.message);
-            setTimeout(() => {
-              router.back();
-            }, 1000);
-          }
-        });
-      }
-    };
-    // 选择框类型 1：a广告类型 2：a屏  3：b广告类型 4：b屏
-    const selectType = ref(1);
-    // 广告类型弹窗
-    const busiPopShow = ref(false);
-    const busiDefaIdx = ref(0);
-    // A屏和B屏不同的
-    const busiDefaParam = reactive({
-      screenA: 0,
-      screenB: 0,
-    });
-    const busiPopList = reactive([
-      {
-        name: "280",
-        id: "280",
-      },
-      {
-        name: "280en",
-        id: "280en",
-      },
-      {
-        name: "301",
-        id: "301",
-      },
-      {
-        name: "301en",
-        id: "301en",
-      },
-      {
-        name: "320",
-        id: "320",
-      },
-      {
-        name: "320en",
-        id: "320en",
-      },
-      {
-        name: "330",
-        id: "330",
-      },
-      {
-        name: "330en",
-        id: "330en",
-      },
-      {
-        name: "POP320",
-        id: "POP320",
-      },
-      {
-        name: "POP320en",
-        id: "POP320en",
-      },
-    ]);
-    const busiPopFieldName = reactive({
-      text: "name",
-      value: "id",
-    });
-    const busiInpClk = (idx) => {
-      selectType.value = idx;
-      switch (idx) {
-        case 1:
-          busiDefaIdx.value = busiDefaParam.screenA;
-          busiPopShow.value = true;
-          break;
-        case 3:
-          busiDefaIdx.value = busiDefaParam.screenB;
-          busiPopShow.value = true;
-          break;
-        case 2:
-          screenDefaIdx.value = screenDefaParam.screenA;
-          screenPopList.value = searchForm.AList;
-          screenPopShow.value = true;
-          break;
-        case 4:
-          screenDefaIdx.value = screenDefaParam.screenA;
-          screenPopList.value = searchForm.BList;
-          screenPopShow.value = true;
-          break;
-      }
-    };
-    const busiPopConfirm = (e) => {
-      busiPopShow.value = false;
-      switch (selectType.value) {
-        case 1:
-          cofficentForm.Atype = e.name;
-          // 查询广告实体
-          getList(0);
-          break;
-        case 3:
-          cofficentForm.Btype = e.name;
-          // 查询广告实体
-          getList(1);
-          break;
-      }
-    };
-    const busiPopCancel = () => {
-      busiPopShow.value = false;
-    };
-    const searchForm = reactive({
-      AList: [],
-      BList: [],
-    });
-    const ABScreen = ref(0);
-    // 根据广告类型和商家名称获取广告实体
-    const getList = (screenType) => {
-      ABScreen.value = screenType;
-      let type = "";
-      let username = "";
-      if (screenType === 0) {
-        type = cofficentForm.Atype;
-        username = cofficentForm.Ausername;
-      } else {
-        type = cofficentForm.Btype;
-        username = cofficentForm.Busername;
-      }
-      let param = {
-        screenType,
-        type,
-        username,
-      };
-      Api_getAdRuleList(param).then((res) => {
-        if (screenType === 0) {
-          console.log("a屏", res);
-          searchForm.AList = res.data.data;
-          screenPopList.value = searchForm.AList;
-          if (searchForm.AList.length > 0) {
-            searchForm.AList.forEach((item, index) => {
-              if (item.id === cofficentForm.AId) {
-                screenDefaParam.screenA = index;
-              }
-            });
-          }
-        } else {
-          console.log("b屏", res);
-          searchForm.BList = res.data.data;
-          screenPopList.value = searchForm.BList;
-          if (searchForm.BList.length > 0) {
-            searchForm.BList.forEach((item, index) => {
-              if (item.id === cofficentForm.BId) {
-                screenDefaParam.screenB = index;
-              }
-            });
-          }
-        }
-      });
-    };
-    // 屏选择弹窗
-    // 默认选择中下标
-    const screenPopShow = ref(false);
-    const screenDefaIdx = ref(0);
-    // A屏和B屏不同的
-    const screenDefaParam = reactive({
-      screenA: 0,
-      screenB: 0,
-    });
-    const screenPopList = ref([]);
-    const screenPopFieldName = reactive({
-      text: "name",
-      value: "id",
-    });
-    const screenPopConfirm = (e) => {
-      if (e) {
-        if (ABScreen.value === 0) {
-          cofficentForm.AId = e.id;
-          cofficentForm.AName = e.name;
-        } else {
-          cofficentForm.BId = e.id;
-          cofficentForm.BName = e.name;
-        }
-      }
-      screenPopShow.value = false;
-    };
-    const screenPopCancel = () => {
-      screenPopShow.value = false;
-    };
-    // 点击搜索按钮
-    const searchClk = (idx) => {
-      getList(idx);
-      screenPopShow.value = true;
-    };
-    return {
-      getList,
-      cofficentForm,
-      onSubmit,
-      busiPopShow,
-      busiPopList,
-      busiPopFieldName,
-      busiInpClk,
-      busiPopConfirm,
-      busiPopCancel,
-      ...toRefs(searchForm),
-      screenPopShow,
-      screenPopList,
-      screenPopFieldName,
-      screenPopConfirm,
-      screenPopCancel,
-      searchClk,
-      titleName,
-      screenDefaIdx,
-      busiDefaIdx,
-    };
-  },
-};
-</script>
-
-<style lang="less" scoped>
-</style>
+<style lang="less" scoped></style>

src/views/alarmHistory/historySearch.vue

@@ -5,57 +5,41 @@
       <div class="content">
         <van-form @submit="onSubmit">
           <van-field v-model="clientId" name="clientId" :label="$t('alarmHistory.equipmentNoLabel')"
-                     :placeholder="$t('alarmHistory.equipmentNoPlaceholder')" />
+            :placeholder="$t('alarmHistory.equipmentNoPlaceholder')" />
           <van-field v-model="name" name="name" :label="$t('alarmHistory.equipmentNameLabel')"
-                     :placeholder="$t('alarmHistory.equipmentNamePlaceholder')" />
+            :placeholder="$t('alarmHistory.equipmentNamePlaceholder')" />
           <div class="van-cell van-field">
             <div class="van-cell__title van-field__label">
-              <label id="van-field-4-label"
-                     for="van-field-4-input">{{$t('alarmHistory.alarmTime')}}</label>
+              <label id="van-field-4-label" for="van-field-4-input">{{ $t('alarmHistory.alarmTime') }}</label>
             </div>
             <div class="van-cell__value van-field__value">
               <div class="van-field__body">
-                <input type="text" class="van-field__control"
-                       :placeholder="$t('alarmHistory.startTime')" style="text-align: center; width: 50%;"
-                       v-model="createStartDate" @click="createStartDateClick()" />
-                <span>{{$t('alarmHistory.to')}}</span>
+                <input type="text" class="van-field__control" :placeholder="$t('alarmHistory.startTime')"
+                  style="text-align: center; width: 50%;" v-model="createStartDate" @click="createStartDateClick()" />
+                <span>{{ $t('alarmHistory.to') }}</span>
                 <input type="text" class="van-field__control" :placeholder="$t('alarmHistory.endTime')"
-                       style="text-align: center; width: 50%;" v-model="createEndDate"
-                       @click="createEndDateClick()" />
+                  style="text-align: center; width: 50%;" v-model="createEndDate" @click="createEndDateClick()" />
               </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">{{$t('alarmHistory.clickQuery')}}</van-button>
+              native-type="submit">{{ $t('alarmHistory.clickQuery') }}</van-button>
           </van-row>
         </van-form>
       </div>
     </van-popup>
     <van-popup v-model:show="createStartDateShow" round position="bottom">
-      <van-datetime-picker
-          v-model="createStartDate"
-          type="datehour"
-          :title="$t('alarmHistory.selectFullTime')"
-          :min-date="minDate"
-          :max-date="maxDate"
-          @confirm="createStartDateConFirm($event)"
-          @cancel="createStartDateCancel()"
-      />
+      <van-datetime-picker v-model="createStartDate" type="datehour" :title="$t('alarmHistory.selectFullTime')"
+        :min-date="minDate" :max-date="maxDate" @confirm="createStartDateConFirm($event)"
+        @cancel="createStartDateCancel()" />
       <!-- 			<van-datetime-picker v-model="createStartDate" type="datetime" :title="$t('alarmHistory.selectFullTime')"
               @confirm="createStartDateConFirm($event)" @cancel="createStartDateCancel()" :min-date="minDate" /> -->
     </van-popup>
     <van-popup v-model:show="createEndDateShow" round position="bottom">
-      <van-datetime-picker
-          v-model="createEndDate"
-          type="datehour"
-          :title="$t('alarmHistory.selectFullTime')"
-          :min-date="minDate"
-          :max-date="maxDate"
-          @confirm="createEndDateConFirm($event)"
-          @cancel="createEndDateCancel()"
-      />
+      <van-datetime-picker v-model="createEndDate" type="datehour" :title="$t('alarmHistory.selectFullTime')"
+        :min-date="minDate" :max-date="maxDate" @confirm="createEndDateConFirm($event)" @cancel="createEndDateCancel()" />
       <!-- 			<van-datetime-picker v-model="createEndDate" type="datetime" :title="$t('alarmHistory.selectFullTime')"
               @confirm="createEndDateConFirm($event)" @cancel="createEndDateCancel()" :min-date="minDate" /> -->
     </van-popup>
@@ -67,7 +51,7 @@ import {
   ref
 } from 'vue';
 import dateUtil from "@/utils/dateUtil";
-import {styleUrl} from "../../common/js/utils";
+import { styleUrl } from "../../common/js/utils";
 
 export default {
   name: 'historySearch',
@@ -128,7 +112,7 @@ export default {
       }
       if (createStartDate.value !== '') {
         searchParam.startDate = dateUtil.formateDate(new Date(createStartDate.value),
-            "yyyy/MM/dd hh:mm:ss");
+          "yyyy/MM/dd hh:mm:ss");
       }
       if (createEndDate.value !== '') {
         searchParam.endDate = dateUtil.formateDate(new Date(createEndDate.value), "yyyy/MM/dd hh:mm:ss");
@@ -159,5 +143,4 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
-</style>
+<style lang="less" scoped></style>

src/views/alarmHistory/index.vue

@@ -4,14 +4,14 @@
     <s-header :name="$t('alarmHistory.alarmHistory')" :noback="false"></s-header>
     <div class="alarmHistoryBox flex-col">
       <van-list v-model:loading="loading" v-model:error="error" error-text="{{$t('alarmHistory.requestFailed')}}"
-                :finished="finished" :finished-text="$t('alarmHistory.noMore')" offset="300" :immediate-check="false"
-                @load="onLoad">
+        :finished="finished" :finished-text="$t('alarmHistory.noMore')" offset="300" :immediate-check="false"
+        @load="onLoad">
         <div class="searchRow flex-row justify-between">
           <div class="flex-col">
             <div class="flex-row justify-between bd3">
               <div class="flex-col outer4"></div>
               <span class="flex-col txt2">{{ $t('alarmHistory.common') }}<span class="discountNumber">{{ alarmHistoryTotal
-                }}</span>{{ $t('alarmHistory.recordsTotal') }}</span>
+              }}</span>{{ $t('alarmHistory.recordsTotal') }}</span>
             </div>
           </div>
           <div class="flex-col">
@@ -130,12 +130,12 @@ export default {
     // 获取报警列表数据
     const getList = async () => {
       const { data } = await getAlarmHistoryList(
-          Object.assign({}, searchParams)
+        Object.assign({}, searchParams)
       );
       if (data.code === "00000") {
         // 列表值叠加
         alarmHistoryList.value = alarmHistoryList.value.concat(
-            data.data.records
+          data.data.records
         );
         alarmHistoryTotal.value = data.data.total;
         if (alarmHistoryList.value.length === data.data.total) {
@@ -148,8 +148,8 @@ export default {
     };
     const showDateTime = (date) => {
       return date
-          ? dateUtil.formateDate(new Date(date), "yyyy-MM-dd hh:mm:ss")
-          : "";
+        ? dateUtil.formateDate(new Date(date), "yyyy-MM-dd hh:mm:ss")
+        : "";
     };
     const showDeviceName = (id) => {
       const device = equipmentSourceList.value.filter((v) => v.id === id);

src/views/apkManage/add.vue

@@ -4,8 +4,8 @@
     <van-form show-error-message @submit="onSubmit">
       <div class="cust_vantBorder">
         <div class="kBordBott">
-          <van-field type="number" colon :border="false" required v-model="cofficentForm.version" clearable
-                     name="version" :label="$t('apkManage.add.version')" :placeholder="$t('apkManage.add.versionPlace')" :rules="[
+          <van-field type="number" colon :border="false" required v-model="cofficentForm.version" clearable name="version"
+            :label="$t('apkManage.add.version')" :placeholder="$t('apkManage.add.versionPlace')" :rules="[
               {
                 required: true,
                 message: $t('apkManage.add.versionPlace'),
@@ -14,7 +14,7 @@
         </div>
         <div class="kBordBott">
           <van-field colon :border="false" required v-model="cofficentForm.versionName" clearable name="versionName"
-                     :label="$t('apkManage.add.versionName')" :placeholder="$t('apkManage.add.versionNamePlace')" :rules="[
+            :label="$t('apkManage.add.versionName')" :placeholder="$t('apkManage.add.versionNamePlace')" :rules="[
               {
                 required: true,
                 message: $t('apkManage.add.versionNamePlace'),
@@ -23,8 +23,8 @@
         </div>
         <div class="kBordBott">
           <van-field colon :border="false" required @click-input="busiInpClk" readonly clearable
-                     v-model="cofficentForm.modelName" name="modelName" :label="$t('apkManage.add.model')"
-                     :placeholder="$t('apkManage.add.modelPlace')" :rules="[
+            v-model="cofficentForm.modelName" name="modelName" :label="$t('apkManage.add.model')"
+            :placeholder="$t('apkManage.add.modelPlace')" :rules="[
               {
                 required: true,
                 message: $t('apkManage.add.modelPlace'),
@@ -34,8 +34,8 @@
             <template #right-icon>
               <div class="l-flex-RC">
                 <van-icon v-if="cofficentForm.modelName" @click="
-  cofficentForm.modelName = '';
-cofficentForm.model = '';
+                  cofficentForm.modelName = '';
+                cofficentForm.model = '';
                 " class="o-mr-6" name="clear" />
                 <van-icon @click="busiInpClk" name="arrow-down" />
               </div>
@@ -45,7 +45,7 @@ cofficentForm.model = '';
       </div>
       <div class="kBordBott">
         <van-field colon :border="false" required clearable name="isForce" :label="$t('apkManage.add.forceUpdate')"
-                   :placeholder="$t('apkManage.add.forceUpdatePlace')" :rules="[
+          :placeholder="$t('apkManage.add.forceUpdatePlace')" :rules="[
             {
               required: true,
               message: $t('apkManage.add.forceUpdatePlace'),
@@ -62,8 +62,8 @@ cofficentForm.model = '';
       </div>
       <div class="cust_vantBorder">
         <div class="kBordBott">
-          <van-field type="number" colon :border="false" required v-model="cofficentForm.apkSize" clearable
-                     name="apkSize" :label="$t('apkManage.add.apkSize')" :placeholder="$t('apkManage.add.apkSizePlace')" :rules="[
+          <van-field type="number" colon :border="false" required v-model="cofficentForm.apkSize" clearable name="apkSize"
+            :label="$t('apkManage.add.apkSize')" :placeholder="$t('apkManage.add.apkSizePlace')" :rules="[
               {
                 required: true,
                 message: $t('apkManage.add.apkSizePlace'),
@@ -72,7 +72,7 @@ cofficentForm.model = '';
         </div>
         <div class="kBordBott">
           <van-field colon :border="false" required v-model="cofficentForm.downloadUrl" clearable name="downloadUrl"
-                     :label="$t('apkManage.add.downloadLink')" :placeholder="$t('apkManage.add.downloadLinkPlace')" :rules="[
+            :label="$t('apkManage.add.downloadLink')" :placeholder="$t('apkManage.add.downloadLinkPlace')" :rules="[
               {
                 required: true,
                 message: $t('apkManage.add.downloadLinkPlace'),
@@ -81,8 +81,8 @@ cofficentForm.model = '';
         </div>
         <div class="kBordBott">
           <van-field colon :border="false" required v-model="cofficentForm.versionInfo" clearable name="versionInfo"
-                     :label="$t('apkManage.add.versionIntroduction')" :placeholder="$t('apkManage.add.versionIntroductionPlace')"
-                     :rules="[
+            :label="$t('apkManage.add.versionIntroduction')" :placeholder="$t('apkManage.add.versionIntroductionPlace')"
+            :rules="[
               {
                 required: true,
                 message: $t('apkManage.add.versionIntroductionPlace'),
@@ -99,7 +99,7 @@ cofficentForm.model = '';
     <!-- 型号选择框 -->
     <van-popup v-model:show="busiPopShow" position="bottom">
       <van-picker :default-index="busiDefaIdx" :title="$t('apkManage.add.version')" :columns="busiPopList"
-                  :columns-field-names="busiPopFieldName" @confirm="busiPopConfirm" @cancel="busiPopShow = false" />
+        :columns-field-names="busiPopFieldName" @confirm="busiPopConfirm" @cancel="busiPopShow = false" />
     </van-popup>
   </div>
 </template>
@@ -113,7 +113,7 @@ import { reactive, onMounted, ref } from "vue";
 import { Toast } from "vant";
 import { useRoute, useRouter } from "vue-router";
 import { useI18n } from "vue-i18n";
-import {styleUrl} from "../../common/js/utils";
+import { styleUrl } from "../../common/js/utils";
 export default {
   components: { sHeader },
   setup() {
@@ -234,6 +234,4 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
-
-</style>
+<style lang="less" scoped></style>

src/views/apkManage/index.vue

@@ -21,10 +21,8 @@
         <!-- <img class="ruleIcon o-mr-10" src="@/assets/advertManage/ruleIcon.png" alt="" /> -->
         <div class="ruleIcon"></div>
         <div class="c-text-color c-text-b c-text-15">
-          {{ $t("advertManage.advertRule.total")
-          }}<span class="c-text-20" style="color: #df5e4c">{{
-            ruleTotal
-          }}</span>
+          {{ $t("advertManage.advertRule.total") }}
+          <span class="c-text-20" style="color: #df5e4c">{{ ruleTotal }}</span>
           {{ $t("alarmHistory.recordsTotal") }}
         </div>
       </div>
@@ -50,9 +48,9 @@
     <div class="contentCon">
       <van-pull-refresh disabled v-model="refreshing" @refresh="onRefresh">
         <van-list v-model="loading" :finished="finished" :finished-text="$t('common.noMoreTxt')" @load="onLoad"
-                  :offset="20" :immediate-check="false">
+          :offset="20" :immediate-check="false">
           <div @click.self="toEdit(item)" v-for="item in tableData" :key="item.id"
-               class="o-plr-20 o-pt-24 o-pb-12 l-flex-between kBordBott content">
+            class="o-plr-20 o-pt-24 o-pb-12 l-flex-between kBordBott content">
             <div>
               <div class="l-flex-RC">
                 <span class="c-color c-text-12">{{ $t('apkManage.version') }}：</span>
@@ -69,8 +67,8 @@
               <div class="l-flex-RC">
                 <span class="c-color c-text-12">{{ $t("advertManage.advertRule.createTime") }}：</span>
                 <span class="c-text-color c-text-12">{{
-                    $M_FormatTime(item.createDate)
-                  }}</span>
+                  $M_FormatTime(item.createDate)
+                }}</span>
               </div>
             </div>
             <div class="rightCon">
@@ -89,8 +87,8 @@
     </div>
     <!-- 删除确认弹窗 -->
     <kDialog :dialogTitle="$t('advertManage.delPopTitle')" :cancelBtnTxt="$t('advertManage.cancelTxt')"
-             :confirmBtnTxt="$t('advertManage.confirmDel')" ref="kDialogRef" :dialogContent="$t('advertManage.delPopContent')"
-             @confirmclk="confirmClk">
+      :confirmBtnTxt="$t('advertManage.confirmDel')" ref="kDialogRef" :dialogContent="$t('advertManage.delPopContent')"
+      @confirmclk="confirmClk">
     </kDialog>
   </div>
 </template>
@@ -274,5 +272,4 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
-</style>
+<style lang="less" scoped></style>

src/views/changePassword.vue

@@ -5,12 +5,12 @@
     <div class="changePasswordFormBox">
       <van-form @submit="changePasswordSubmit">
         <van-field v-model="password" name="password" type="password" :label="$t('changePassword.passwordLabel')"
-                   :placeholder="$t('changePassword.passwordPlaceholder')"
-                   :rules="[{ required: true, message: $t('changePassword.passwordRequired') }]" />
+          :placeholder="$t('changePassword.passwordPlaceholder')"
+          :rules="[{ required: true, message: $t('changePassword.passwordRequired') }]" />
         <br>
         <van-field v-model="passwordCheck" name="passwordCheck" type="password"
-                   :label="$t('changePassword.passwordCheckLabel')" :placeholder="$t('changePassword.passwordCheckPlaceholder')"
-                   :rules="[{ required: true, message: $t('changePassword.passwordCheckRequired') }]" />
+          :label="$t('changePassword.passwordCheckLabel')" :placeholder="$t('changePassword.passwordCheckPlaceholder')"
+          :rules="[{ required: true, message: $t('changePassword.passwordCheckRequired') }]" />
         <van-button round type="primary" class="register" native-type="submit">{{ $t('changePassword.registerButton') }}
         </van-button>
       </van-form>

src/views/device/deviceOper.vue

@@ -261,7 +261,7 @@ export default {
     };
     // 远程做糖
     const doSugar = () => {
-      router.push({ path: "doSugar", query: { deviceId: device.value.id , machineType: device.value.machineType } });
+      router.push({ path: "doSugar", query: { deviceId: device.value.id, machineType: device.value.machineType } });
     };
     // 定时开关
     const alarmClock = () => {

src/views/device/deviceSet.vue

@@ -107,7 +107,7 @@
             </template>
           </van-field>
         </div>
-        <!-- <van-field colon readonly :label="`${$t('device.coupon')}`" placeholder="">
+        <van-field colon readonly :label="`${$t('device.coupon')}`" placeholder="">
           <template #input>
             <div class="l-flex-RC">
               <span>{{ couponStatusNameComp }}</span>
@@ -115,7 +115,7 @@
                           inactive-value="0" />
             </div>
           </template>
-        </van-field> -->
+        </van-field>
         <div class="cust_vantBorder">
           <van-field colon required clearable v-model="deviceDetal.operationalName" name="operationalName"
             :label="`${$t('device.nameOfOperatorLabel')}`" :placeholder="$t('device.nameOfOperatorPlaceholder')" :rules="[
@@ -195,6 +195,7 @@
                   <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-group>
               </div>
             </template>

src/views/device/doSugar.vue

@@ -8,10 +8,8 @@
         <span class="info2">{{ $t('device.equipmentName') }}：{{ deviceDetal ? deviceDetal.name : '' }}</span>
       </div>
       <div v-if="machineType === '1'">
-        <van-field v-model="fieldValue" is-link readonly
-          :label="$t('device.clickToSelectTaste')"
-          :placeholder="$t('device.pleaseSelectTaste')"
-          @click="show = true" />
+        <van-field v-model="fieldValue" is-link readonly :label="$t('device.clickToSelectTaste')"
+          :placeholder="$t('device.pleaseSelectTaste')" @click="show = true" />
         <van-popup v-model:show="show" round position="bottom">
           <van-cascader v-model="cascaderValue" :title="$t('device.pleaseSelectAPattern')" :options="options"
             @close="show = false" @finish="onFinish">
@@ -24,7 +22,7 @@
           </van-cascader>
         </van-popup>
         <div class="textRow o-pr-20">
-          <span @click="pushToDaySugarList">{{ $t('device.todaysMakeList')}}>></span>
+          <span @click="pushToDaySugarList">{{ $t('device.todaysMakeList') }}>></span>
         </div>
         <div v-if="!doSugartData" class="block5 flex-col" @click="submitDoSugar"><span class="txt3">{{
           $t('device.submitToMakeSugar') }}</span></div>

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-5 kBordBott">
-                    <span class="info1 o-ptb-5 kBordBott">{{ $t("device.sleepState") }}：{{
+                  <div class="layer2 flex-row justify-between o-ptb-8 kBordBott">
+                    <span class="info1 o-ptb-8 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-10">
+                  <div class="word4 o-ptb-8">
                     <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>
@@ -132,7 +132,7 @@
                   </span> -->
                   <span class="txt1 o-ptb-8">{{ item.fullName }}</span>
                   <div>
-                    <span v-if="item.latitude" class="txt5 o-ptb-5 kBordBott l-flex-RC">
+                    <span v-if="item.latitude" class="txt5 o-ptb-8 kBordBott l-flex-RC">
                       <span class="info1">{{
                         $t("device.position") }}：</span>
                       <van-button @click="viewPosiClk(item)" type="primary">{{
@@ -140,7 +140,7 @@
                       }}</van-button>
                     </span>
                   </div>
-                  <van-row class="layer5 o-ptb-10 kBordBott" justify="space-between"
+                  <van-row class="layer5 o-ptb-8 kBordBott" justify="space-between"
                     v-if="(item.machineType == '0' || item.machineType == null) && item.equimentType != 'POP320'">
                     <van-col class="word5">{{ $t("device.furnaceHeadTemperature") }}：{{
                       item.furnaceTm
@@ -151,7 +151,7 @@
                     <van-col class="word5">{{ $t("device.humidityInCabinet") }}：{{ item.cabinetHd
                     }}{{ $t("device.degree") }}</van-col>
                   </van-row>
-                  <van-row class="layer5 o-ptb-10 kBordBott" justify="space-between" v-else>
+                  <van-row class="layer5 o-ptb-8 kBordBott" justify="space-between" v-else>
                     <van-col class="word5">{{ $t("device.stirringTemperature") }}：{{
                       item.stirTm
                     }}{{ $t("device.degree") }}</van-col>
@@ -162,7 +162,7 @@
                     }}</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-10 kBordBott">
+                    <van-row justify="space-between" class="sugarTxt o-ptb-8 kBordBott">
                       <van-col>
                         {{ $t("device.whiteSugar") }}：{{ $M_FormatCalcuDecial(item.whiteSugar) }}%
                       </van-col>
@@ -176,12 +176,12 @@
                         {{ $t("device.blueSugar") }}：{{ $M_FormatCalcuDecial(item.blueSugar) }}%
                       </van-col>
                     </van-row>
-                    <div class="sugarTxt o-ptb-10 kBordBott">
+                    <div class="sugarTxt o-ptb-8 kBordBott">
                       <span>{{ $t("device.stick") }}：{{
                         $M_FormatCalcuDecial(item.stick)
                       }}%</span>
                     </div>
-                    <van-row gutter="50" class="sugarTxt o-ptb-10 kBordBott">
+                    <van-row gutter="50" class="sugarTxt o-ptb-8 kBordBott">
                       <van-col>
                         {{ $t("device.water") }}：{{ $M_FormatCalcuDecial(item.water) }}%
                       </van-col>
@@ -189,7 +189,7 @@
                         {{ $t("device.wasteWater") }}：{{ $M_FormatCalcuDecial(item.wasteWater) }}%
                       </van-col>
                     </van-row>
-                    <span class="txt5 o-ptb-5 kBordBott l-flex-RC"><span>{{ $t("device.oneKeyFeed") }}：</span>
+                    <span class="txt5 o-ptb-8 kBordBott l-flex-RC"><span>{{ $t("device.oneKeyFeed") }}：</span>
                       <van-button @click="replenishmentClk(item)" type="primary">{{ $t("device.replenishment") }}
                       </van-button>
                     </span>
@@ -197,9 +197,9 @@
                   <span class="info1 o-ptb-8 kBordBott">{{ $t("device.lastRefreshTime") }}：{{
                     showDateTime(item.lastUpdateTime)
                   }}</span>
-                  <span class="info2 o-ptb-5 kBordBott">{{ $t("device.volume") }}：{{ item.volume }}</span>
+                  <span class="info2 o-ptb-8 kBordBott">{{ $t("device.volume") }}：{{ item.volume }}</span>
                   <div class="l-flex-RC">
-                    <span class="info3 o-ptb-2 o-pr-10 kBordBott">{{ $t("device.alarmContent") }}：{{
+                    <span class="info3 o-pr-10 kBordBott">{{ $t("device.alarmContent") }}：{{
                       item.alarmList && item.alarmList[0]
                       ? item.alarmList[0].alarmContent
                       : item.alarmContent
@@ -223,7 +223,7 @@
                     </div>
                   </div>
                 </div>
-                <div class="bd6 l-flex-center o-ptb-10" @click="item.checkType = !item.checkType">
+                <div class="bd6 l-flex-center o-ptb-8" @click="item.checkType = !item.checkType">
                   <div class="l-flex-RC">
                     <span class="info2 o-mr-2">{{
                       item.checkType ? $t("device.stow") : $t("device.seeMore")

src/views/device/showGoods/index.vue

@@ -13,9 +13,9 @@
     <van-col v-for="(item, index) in tableData" :key="index" class="goodsCon o-mr-14" span="11">
       <div class="l-flex-RC">
         <van-image width="60" height="60" fit="contain" :src="showSugerPhoto(item)" />
-        <span class="o-ml-10" style="word-wrap: break-word; width: 50px;" >{{ item.productName }}</span>
+        <span class="o-ml-10" style="word-wrap: break-word; width: 50px;">{{ item.productName }}</span>
         <van-switch class="o-ml-1" v-model="switchStates[index]" size="20px" active-color="#4dc294"
-                    @change="handleChange(index)" />
+          @change="handleChange(index)" />
       </div>
       <van-divider :style="{ color: '#1baeae', borderColor: '#1baeae', fontSize: '20px', fontWeight: 500 }" />
     </van-col>
@@ -175,5 +175,4 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
-</style>
+<style lang="less" scoped></style>

src/views/discountCode/codeSearch.vue

@@ -4,38 +4,40 @@
     <van-popup v-model:show="sheetShow" round class="codeSearchPopup">
       <div class="content">
         <van-form @submit="onSubmit">
-          <van-field v-model="code" name="code" :label="$t('discountCode.discountCodeNoLabel')" :placeholder="$t('discountCode.discountCodeNoPlaceholder')" />
+          <van-field v-model="code" name="code" :label="$t('discountCode.discountCodeNoLabel')"
+            :placeholder="$t('discountCode.discountCodeNoPlaceholder')" />
           <div class="van-cell van-field">
             <div class="van-cell__title van-field__label">
-              <label id="van-field-4-label" for="van-field-4-input">{{$t('discountCode.creationTime')}}</label>
+              <label id="van-field-4-label" for="van-field-4-input">{{ $t('discountCode.creationTime') }}</label>
             </div>
             <div class="van-cell__value van-field__value">
               <div class="van-field__body">
-                <input type="text" class="van-field__control" :placeholder="$t('discountCode.startTime')" style="text-align: center; width: 50%;"
-                       v-model="createStratDate" @click="createStratDateClick()" />
-                <span>{{$t('discountCode.to')}}</span>
-                <input type="text" class="van-field__control" :placeholder="$t('discountCode.endTime')" style="text-align: center; width: 50%;"
-                       v-model="createEndDate" @click="createEndDateClick()" />
+                <input type="text" class="van-field__control" :placeholder="$t('discountCode.startTime')"
+                  style="text-align: center; width: 50%;" v-model="createStratDate" @click="createStratDateClick()" />
+                <span>{{ $t('discountCode.to') }}</span>
+                <input type="text" class="van-field__control" :placeholder="$t('discountCode.endTime')"
+                  style="text-align: center; width: 50%;" v-model="createEndDate" @click="createEndDateClick()" />
               </div>
             </div>
           </div>
           <div class="van-cell van-field">
             <div class="van-cell__title van-field__label">
-              <label id="van-field-4-label" for="van-field-4-input">{{$t('discountCode.usageTime')}}</label>
+              <label id="van-field-4-label" for="van-field-4-input">{{ $t('discountCode.usageTime') }}</label>
             </div>
             <div class="van-cell__value van-field__value">
               <div class="van-field__body">
-                <input type="text" class="van-field__control" :placeholder="$t('discountCode.startTime')" style="text-align: center; width: 50%;"
-                       v-model="useStratDate" @click="useStratDateClick()" />
-                <span>{{$t('discountCode.to')}}</span>
-                <input type="text" class="van-field__control" :placeholder="$t('discountCode.endTime')" style="text-align: center; width: 50%;"
-                       v-model="useEndDate" @click="useEndDateClick()" />
+                <input type="text" class="van-field__control" :placeholder="$t('discountCode.startTime')"
+                  style="text-align: center; width: 50%;" v-model="useStratDate" @click="useStratDateClick()" />
+                <span>{{ $t('discountCode.to') }}</span>
+                <input type="text" class="van-field__control" :placeholder="$t('discountCode.endTime')"
+                  style="text-align: center; width: 50%;" v-model="useEndDate" @click="useEndDateClick()" />
               </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">{{$t('discountCode.clickQuery')}}
+            <van-button span="5" round type="primary" style="height: 2em; padding: 0 2em;" native-type="submit">{{
+              $t('discountCode.clickQuery') }}
             </van-button>
           </van-row>
         </van-form>
@@ -43,19 +45,19 @@
     </van-popup>
     <van-popup v-model:show="createStratDateShow" round position="bottom">
       <van-datetime-picker v-model="createStratDate" type="datetime" :title="$t('discountCode.selectFullTime')"
-                           @confirm="createStratDateConFirm($event)" @cancel="createStratDateCancel()" :min-date="minDate" />
+        @confirm="createStratDateConFirm($event)" @cancel="createStratDateCancel()" :min-date="minDate" />
     </van-popup>
     <van-popup v-model:show="createEndDateShow" round position="bottom">
       <van-datetime-picker v-model="createEndDate" type="datetime" :title="$t('discountCode.selectFullTime')"
-                           @confirm="createEndDateConFirm($event)" @cancel="createEndDateCancel()" :min-date="minDate" />
+        @confirm="createEndDateConFirm($event)" @cancel="createEndDateCancel()" :min-date="minDate" />
     </van-popup>
     <van-popup v-model:show="useStratDateShow" round position="bottom">
-      <van-datetime-picker v-model="useStratDate" type="datetime" :title="$t('discountCode.selectFullTime')" @confirm="useStratDateConFirm($event)"
-                           @cancel="useStratDateCancel()" :min-date="minDate"  />
+      <van-datetime-picker v-model="useStratDate" type="datetime" :title="$t('discountCode.selectFullTime')"
+        @confirm="useStratDateConFirm($event)" @cancel="useStratDateCancel()" :min-date="minDate" />
     </van-popup>
     <van-popup v-model:show="useEndDateShow" round position="bottom">
-      <van-datetime-picker v-model="useEndDate" type="datetime" :title="$t('discountCode.selectFullTime')" @confirm="useEndDateConFirm($event)"
-                           @cancel="useEndDateCancel()" :min-date="minDate" />
+      <van-datetime-picker v-model="useEndDate" type="datetime" :title="$t('discountCode.selectFullTime')"
+        @confirm="useEndDateConFirm($event)" @cancel="useEndDateCancel()" :min-date="minDate" />
     </van-popup>
   </div>
 </template>
@@ -63,7 +65,7 @@
 <script>
 import { ref } from 'vue';
 import dateUtil from "@/utils/dateUtil";
-import {styleUrl} from "../../common/js/utils";
+import { styleUrl } from "@/common/js/utils";
 
 export default {
   name: 'codeSearch',
@@ -78,7 +80,7 @@ export default {
     // 创建开始时间
     const createStratDate = ref('');
     const createStratDateShow = ref(false);
-    const createStratDateClick = () => {if (createStratDate.value === '') { createStratDate.value = new Date(); } createStratDateShow.value = true; }
+    const createStratDateClick = () => { if (createStratDate.value === '') { createStratDate.value = new Date(); } createStratDateShow.value = true; }
     const createStratDateConFirm = (data) => { createStratDate.value = dateUtil.formateDate(data, "yyyy-MM-dd hh:mm:ss"); createStratDateShow.value = false; }
     const createStratDateCancel = () => { createStratDate.value = dateUtil.formateDate(new Date(createStratDate.value), "yyyy-MM-dd hh:mm:ss"); createStratDateShow.value = false; }
     // 创建结束时间
@@ -142,5 +144,4 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
-</style>
+<style lang="less" scoped></style>

src/views/discountCode/index.vue

@@ -4,46 +4,52 @@
     <s-header :name="$t('discountCode.discountCode')" :noback="false"></s-header>
     <div class="discountCodeBox flex-col">
       <van-list v-model:loading="loading" v-model:error="error" :error-text="$t('public.requestFailed')"
-                :finished="finished" :finished-text="$t('public.noMore')" offset="300" :immediate-check="false" @load="onLoad">
+        :finished="finished" :finished-text="$t('public.noMore')" offset="300" :immediate-check="false" @load="onLoad">
         <div class="searchRow flex-row justify-between">
           <div class="flex-col">
             <div class="flex-row justify-between bd3">
               <div class="flex-col outer4"></div>
-              <span class="flex-col txt2">{{$t('discountCode.total')}}<span class="discountNumber">{{ discountCodeTotal }}</span>{{$t('discountCode.discountCodesInTotal')}}</span>
+              <span class="flex-col txt2">{{ $t('discountCode.total') }}<span class="discountNumber">{{ discountCodeTotal
+              }}</span>{{ $t('discountCode.discountCodesInTotal') }}</span>
             </div>
           </div>
           <div class="flex-col">
             <div class="main5 flex-row justify-between" @click="searchClick">
               <img class="label2" src="../../assets/device/searchIcon.png" />
               <div class="TextGroup2 flex-col">
-                <span class="txt3">{{$t('discountCode.search')}}</span>
+                <span class="txt3">{{ $t('discountCode.search') }}</span>
               </div>
             </div>
           </div>
         </div>
         <div class="tabButtomBox flex-row">
           <div class="tabBox flex-row">
-            <span :class="{ active: isUse === '0' }" @click="setIsUse('0')">{{$t('discountCode.notUsed')}}</span>
-            <span :class="{ active: isUse === '1' }" @click="setIsUse('1')">{{$t('discountCode.used')}}</span>
+            <span :class="{ active: isUse === '0' }" @click="setIsUse('0')">{{ $t('discountCode.notUsed') }}</span>
+            <span :class="{ active: isUse === '1' }" @click="setIsUse('1')">{{ $t('discountCode.used') }}</span>
           </div>
           <div class="buttomBox flex-row">
-            <div class="buttonItem" @click="exportClick()">{{$t('discountCode.export')}}&gt;</div>
-            <div class="buttonItem" @click="payCode()">{{$t('discountCode.apply')}}&gt;</div>
+            <div class="buttonItem" @click="exportClick()">{{ $t('discountCode.export') }}&gt;</div>
+            <div class="buttonItem" @click="payCode()">{{ $t('discountCode.apply') }}&gt;</div>
           </div>
         </div>
         <div class="intervalRow"></div>
         <div class="listBox">
           <div v-for="(item, index) in discountCodeList" :key="index" class="listItem" @click="disCountCodeClick(item)">
             <div class="itemBox">
-              <div class="itemRow"><span class="itemTitle">{{$t('discountCode.discountCode')}}:&nbsp;</span>{{ item.code }}<span
-                  class="itemTitle discount">{{$t('discountCode.discount')}}:&nbsp;</span>{{ item.discount }}</div>
-              <div class="itemRow"><span class="itemTitle">{{$t('discountCode.creationTime')}}:&nbsp;</span>{{ showDateTime(item.createDate) }}</div>
-              <div class="itemRow"><span class="itemTitle">{{$t('discountCode.usageTime')}}:&nbsp;</span>{{ showDateTime(item.useDate) }}</div>
-              <div class="itemRow"><span class="itemTitle">{{$t('discountCode.termOfValidity')}}:&nbsp;</span>{{ showDate(item.lastUseDate) }}</div>
-              <div class="itemRow"><span class="itemTitle">{{$t('discountCode.usingTheMachine')}}:&nbsp;</span>{{ item.useBy }}</div>
+              <div class="itemRow"><span class="itemTitle">{{ $t('discountCode.discountCode') }}:&nbsp;</span>{{ item.code
+              }}<span class="itemTitle discount">{{ $t('discountCode.discount') }}:&nbsp;</span>{{ item.discount }}
+              </div>
+              <div class="itemRow"><span class="itemTitle">{{ $t('discountCode.creationTime') }}:&nbsp;</span>{{
+                showDateTime(item.createDate) }}</div>
+              <div class="itemRow"><span class="itemTitle">{{ $t('discountCode.usageTime') }}:&nbsp;</span>{{
+                showDateTime(item.useDate) }}</div>
+              <div class="itemRow"><span class="itemTitle">{{ $t('discountCode.termOfValidity') }}:&nbsp;</span>{{
+                showDate(item.lastUseDate) }}</div>
+              <div class="itemRow"><span class="itemTitle">{{ $t('discountCode.usingTheMachine') }}:&nbsp;</span>{{
+                item.useBy }}</div>
             </div>
-            <div class="tipBox" v-if="item.isUse === '0'">{{$t('discountCode.notUsed')}}</div>
-            <div class="tipBox isUseTip" v-if="item.isUse === '1'">{{$t('discountCode.used')}}</div>
+            <div class="tipBox" v-if="item.isUse === '0'">{{ $t('discountCode.notUsed') }}</div>
+            <div class="tipBox isUseTip" v-if="item.isUse === '1'">{{ $t('discountCode.used') }}</div>
           </div>
         </div>
       </van-list>

src/views/discountCode/payCode.vue

@@ -4,79 +4,57 @@
     <s-header :name="$t('discountCode.applDiscCode')" :noback="false"></s-header>
     <div class="discountCodeBox flex-col">
       <van-form @submit="onSubmit">
-        <van-field
-            v-model="number"
-            name="number"
-            :label="$t('discountCode.numberOfDiscountCodesLabel')"
-            :placeholder="$t('discountCode.numberOfDiscountCodesPlaceholder')"
-        >
+        <van-field v-model="number" name="number" :label="$t('discountCode.numberOfDiscountCodesLabel')"
+          :placeholder="$t('discountCode.numberOfDiscountCodesPlaceholder')">
           <template #button>
-            <span>{{$t('discountCode.aSingleGenerationCannotExceed')}}</span>
+            <span>{{ $t('discountCode.aSingleGenerationCannotExceed') }}</span>
           </template>
         </van-field>
-        <van-field
-            v-model="month"
-            name="number"
-            :label="$t('discountCode.termOfValidity')"
-            :placeholder="$t('discountCode.pleaseEnterTheValidityPeriod')"
-        >
+        <van-field v-model="month" name="number" :label="$t('discountCode.termOfValidity')"
+          :placeholder="$t('discountCode.pleaseEnterTheValidityPeriod')">
           <template #button>
-            <span>{{$t('discountCode.Months')}}<span>{{$t('discountCode.noMoreThanMonths')}}</span></span>
+            <span>{{ $t('discountCode.Months') }}<span>{{ $t('discountCode.noMoreThanMonths') }}</span></span>
           </template>
         </van-field>
-        <van-field
-            readonly
-            v-model="validDays"
-            :label="$t('discountCode.validDays')"
-            placeholder=""
-        />
+        <van-field readonly v-model="validDays" :label="$t('discountCode.validDays')" placeholder="" />
         <div class="van-cell van-field">
-          <div class="van-cell__title van-field__label"><span>{{$t('discountCode.type')}}</span></div>
+          <div class="van-cell__title van-field__label"><span>{{ $t('discountCode.type') }}</span></div>
           <div class="van-cell__value van-field__value radioBox">
             <van-radio-group v-model="type" direction="horizontal">
-              <van-radio name="1" icon-size="18px">{{$t('discountCode.deductionRoll')}}</van-radio>
-              <van-radio name="0" icon-size="18px">{{$t('discountCode.discount2')}}</van-radio>
+              <van-radio name="1" icon-size="18px">{{ $t('discountCode.deductionRoll') }}</van-radio>
+              <van-radio name="0" icon-size="18px">{{ $t('discountCode.discount2') }}</van-radio>
             </van-radio-group>
           </div>
         </div>
-        <van-field
-            v-if='type === "1"'
-            v-model="discount"
-            name="number"
-            :label="$t('discountCode.deductionPriceLabdel')"
-            :placeholder="$t('discountCode.deductionPricePlaceholder')"
-        >
+        <van-field v-if='type === "1"' v-model="discount" name="number" :label="$t('discountCode.deductionPriceLabdel')"
+          :placeholder="$t('discountCode.deductionPricePlaceholder')">
         </van-field>
-        <van-field
-            v-if='type === "0"'
-            v-model="discount"
-            name="number"
-            :label="$t('discountCode.discount')"
-            :placeholder="$t('discountCode.enterNumber')"
-        >
+        <van-field v-if='type === "0"' v-model="discount" name="number" :label="$t('discountCode.discount')"
+          :placeholder="$t('discountCode.enterNumber')">
           <template #button>
             <span>0-10</span>
           </template>
         </van-field>
         <div class="van-cell van-field" v-if='type === "0" && discount === "0"'>
-          <div class="van-cell__title van-field__label"><span>{{$t('discountCode.paymentMethod')}}</span></div>
+          <div class="van-cell__title van-field__label"><span>{{ $t('discountCode.paymentMethod') }}</span></div>
           <div class="van-cell__value van-field__value radioBox">
             <van-radio-group v-model="frpCode" direction="horizontal">
-              <van-radio name="WEIXIN_NATIVE" icon-size="18px">{{$t('discountCode.weChat')}}</van-radio>
-              <van-radio name="ALIPAY_NATIVE" icon-size="18px">{{$t('discountCode.alipay')}}</van-radio>
+              <van-radio name="WEIXIN_NATIVE" icon-size="18px">{{ $t('discountCode.weChat') }}</van-radio>
+              <van-radio name="ALIPAY_NATIVE" icon-size="18px">{{ $t('discountCode.alipay') }}</van-radio>
             </van-radio-group>
           </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">{{$t('discountCode.apply')}}</van-button>
+          <van-button span="5" round type="primary" style="height: 2em; padding: 0 2em;"
+            native-type="submit">{{ $t('discountCode.apply') }}</van-button>
         </van-row>
       </van-form>
     </div>
     <van-popup v-model:show="payCodeType" round class="payCodePopup" @close="payCodeClose">
       <div style="text-align: center; font-size: 14px; padding: 1em; line-height: 1.8;">
-        <div>price: {{ewmObj.price||''}}</div>
-        <div>sn: {{ewmObj.sn||''}}</div>
-        <img :src="ewmObj.image"/>
+        <div>price: {{ ewmObj.price || '' }}</div>
+        <div>sn: {{ ewmObj.sn || '' }}</div>
+        <img :src="ewmObj.image" />
       </div>
     </van-popup>
   </div>
@@ -85,7 +63,7 @@
 <script>
 import sHeader from "@/components/SimpleHeader";
 import { onMounted, reactive, toRefs, ref, watch } from "vue";
-import { getLoginUser,$M_FormatCalcuDecial, styleUrl } from "@/common/js/utils";
+import { getLoginUser, $M_FormatCalcuDecial, styleUrl } from "@/common/js/utils";
 import { Toast } from "vant";
 import { addCode } from "@/service/discountCode";
 import { useRouter } from "vue-router";
@@ -96,7 +74,7 @@ export default {
   components: { sHeader },
   setup() {
     // 引入语言
-    const {t} = useI18n();
+    const { t } = useI18n();
     const router = useRouter();
     let payParams = reactive({
       number: '', // 优惠码个数
@@ -131,7 +109,7 @@ export default {
       if (parseInt(payParams.number) > 200) { Toast.fail(t('discountCode.theNumberOfDiscountCodesCannotExceed')); return; }
       if (parseInt(payParams.month) > 3) { Toast.fail(t('discountCode.theValidityPeriodCannotExceedMonths')); return; }
       if (payParams.type === '0' && parseInt(payParams.discount) > 10) { Toast.fail(t('discountCode.discountCannotBeGreaterThan')); return; }
-      const { data } = await addCode( Object.assign({}, payParams) );
+      const { data } = await addCode(Object.assign({}, payParams));
       if (payParams.type === '0') {
         ewmObj.value = data.data;
         payCodeType.value = true;
@@ -148,9 +126,9 @@ export default {
     // 有效天数
     const validDays = ref('0天');
     // 监听有效期，计算有效天数
-    watch(()=>payParams.month,(newVal)=>{
-      validDays.value = $M_FormatCalcuDecial(newVal,30)+'天';
-    },{immediate:true,deep:true});
+    watch(() => payParams.month, (newVal) => {
+      validDays.value = $M_FormatCalcuDecial(newVal, 30) + '天';
+    }, { immediate: true, deep: true });
     return {
       ...toRefs(payParams),
       payCodeType,

src/views/distributionSet/detail.vue

@@ -5,28 +5,26 @@
       <div class="cust_vantBorder">
         <div class="kBordBott">
           <template v-if="clientId">
-            <van-field disabled colon :border="false" v-model="cofficentForm.clientId" clearable
-                       label-width="110" name="clientId" :label="$t('distributionSet.addDist.clientId')"
-                       :placeholder="$t('distributionSet.addDist.autoBrought')" />
+            <van-field disabled colon :border="false" v-model="cofficentForm.clientId" clearable label-width="110"
+              name="clientId" :label="$t('distributionSet.addDist.clientId')"
+              :placeholder="$t('distributionSet.addDist.autoBrought')" />
           </template>
           <template v-else>
-            <van-field colon :border="false" required @click-input="busiInpClk" readonly clearable
-                       label-width="110" v-model="cofficentForm.clientId"
-                       :placeholder="$t('distributionSet.addDist.clientIdPlace')"
-                       :label="$t('distributionSet.addDist.clientId')" name="clientId"
-                       :rules="[{ required: true, message: $t('distributionSet.addDist.clientIdPlace') }]">
+            <van-field colon :border="false" required @click-input="busiInpClk" readonly clearable label-width="110"
+              v-model="cofficentForm.clientId" :placeholder="$t('distributionSet.addDist.clientIdPlace')"
+              :label="$t('distributionSet.addDist.clientId')" name="clientId"
+              :rules="[{ required: true, message: $t('distributionSet.addDist.clientIdPlace') }]">
               <template #right-icon>
                 <div class="l-flex-RC">
-                  <van-icon v-if="cofficentForm.clientId" @click="cofficentForm.clientId = ''"
-                            class="o-mr-6" name="clear" />
+                  <van-icon v-if="cofficentForm.clientId" @click="cofficentForm.clientId = ''" class="o-mr-6"
+                    name="clear" />
                   <van-icon @click="busiInpClk" name="arrow-down" />
                 </div>
               </template>
             </van-field>
           </template>
           <div class="l-flex-RC o-p-5 c-text-13 c-text-b">
-            <div
-                style="padding: var(--van-cell-vertical-padding) var(--van-cell-horizontal-padding);">
+            <div style="padding: var(--van-cell-vertical-padding) var(--van-cell-horizontal-padding);">
               {{ $t('distributionSet.addDist.distInof') }}
             </div>
             <!-- <div class="c-text-13 c-text-b" style="color: #A8A8C5;">{{ $t('distributionSet.addDist.distInof') }}
@@ -34,14 +32,13 @@
           </div>
           <div class="noPaddingTopCell l-flex-RC">
             <van-field type="digit" colon :border="false" required v-model="cofficentForm.distProp" clearable
-                       label-width="110" name="distProp" :label="$t('device.proportionOfPlatformDistributionLabel')"
-                       :placeholder="$t('device.proportionOfPlatformDistributionPlaceholder')"
-                       :rules="[{ required: true, message: $t('device.proportionOfPlatformDistributionPlaceholder') }, { required: true, validator: distPropVali, message: $t('distributionSet.addDist.platDistRange'), trigger: ['onChange', 'onBlur', 'onSubmit'] }]" />
+              label-width="110" name="distProp" :label="$t('device.proportionOfPlatformDistributionLabel')"
+              :placeholder="$t('device.proportionOfPlatformDistributionPlaceholder')"
+              :rules="[{ required: true, message: $t('device.proportionOfPlatformDistributionPlaceholder') }, { required: true, validator: distPropVali, message: $t('distributionSet.addDist.platDistRange'), trigger: ['onChange', 'onBlur', 'onSubmit'] }]" />
             <span class="o-pl-10 c-text-18 c-text-b" style="color: #434D74;">%</span>
           </div>
           <div class="l-flex-RC">
-            <div class="c-text-14"
-                 style="padding: var(--van-cell-vertical-padding) var(--van-cell-horizontal-padding);">
+            <div class="c-text-14" style="padding: var(--van-cell-vertical-padding) var(--van-cell-horizontal-padding);">
               &nbsp;&nbsp;{{ $t('distributionSet.addDist.myDistProport') }}：
             </div>
             <div class="c-text-13 c-text-b c-text-color">{{ myDistProp }}%</div>
@@ -49,15 +46,15 @@
         </div>
         <div v-for="(item, index) in distPropList" :key="index" class="kBordBott">
           <van-field colon :border="false" required v-model="item.name1" clearable label-width="110" name="name1"
-                     :label="$t('device.accountNoOfDistributorLabel')"
-                     :placeholder="$t('device.accountNoOfDistributorPlaceholder')"
-                     :rules="[{ required: true, message: $t('device.accountNoOfDistributorPlaceholder') }]" />
+            :label="$t('device.accountNoOfDistributorLabel')"
+            :placeholder="$t('device.accountNoOfDistributorPlaceholder')"
+            :rules="[{ required: true, message: $t('device.accountNoOfDistributorPlaceholder') }]" />
           <div class="l-flex-between noPaddingRCell">
             <div class="l-flex-RC">
-              <van-field type="digit" colon :border="false" required v-model="item.name2" clearable
-                         label-width="110" name="name2" :label="$t('device.distributionProportionLabel')"
-                         :placeholder="$t('device.distributionProportionPlaceholder')"
-                         :rules="[{ required: true, message: $t('device.distributionProportionPlaceholder') }, { required: true, validator: distPropVali, message: $t('distributionSet.addDist.distPropRange'), trigger: ['onChange', 'onBlur', 'onSubmit'] }]" />
+              <van-field type="digit" colon :border="false" required v-model="item.name2" clearable label-width="110"
+                name="name2" :label="$t('device.distributionProportionLabel')"
+                :placeholder="$t('device.distributionProportionPlaceholder')"
+                :rules="[{ required: true, message: $t('device.distributionProportionPlaceholder') }, { required: true, validator: distPropVali, message: $t('distributionSet.addDist.distPropRange'), trigger: ['onChange', 'onBlur', 'onSubmit'] }]" />
               <span class="o-pl-10 c-text-18 c-text-b" style="color: #434D74;">%</span>
             </div>
             <div v-if="index !== 0" @click="toDele(index)" class="l-flex-RC" style="color: #FE5D55;">
@@ -67,8 +64,7 @@
           </div>
         </div>
       </div>
-      <div v-if="distPropList.length <= 2" @click="toAdd"
-           class="kBordBott l-flex-center o-ptb-20 c-text-14 c-text-w6">
+      <div v-if="distPropList.length <= 2" @click="toAdd" class="kBordBott l-flex-center o-ptb-20 c-text-14 c-text-w6">
         +{{ $t('device.continueToAddDistributors') }}
       </div>
       <div style="margin: 16px;">
@@ -80,7 +76,7 @@
     <!-- 设备编码选择框 -->
     <van-popup v-model:show="busiPopShow" position="bottom">
       <van-picker :title="$t('distributionSet.addDist.clientIdPlace')" :columns="busiPopList"
-                  :columns-field-names="busiPopFieldName" @confirm="busiPopConfirm" @cancel="busiPopCancel" />
+        :columns-field-names="busiPopFieldName" @confirm="busiPopConfirm" @cancel="busiPopCancel" />
     </van-popup>
   </div>
 </template>

src/views/distributionSet/index.vue

@@ -1,117 +1,88 @@
 <template>
   <!-- 分销设置 -->
   <div class="distributionSetIdx">
-    <s-header
-        :name="$t('distributionSet.distributionSettings')"
-        :noback="false"
-    ></s-header>
+    <s-header :name="$t('distributionSet.distributionSettings')" :noback="false"></s-header>
     <div class="o-h">
       <div style="height: 75px">
         <div class="o-plr-14 o-ptb-10 kBordBott">
           <div class="headCon l-flex-between">
             <div class="leftCon l-flex-RC">
-              <img
-                  class="leftImg o-mr-6"
-                  src="../../assets//distributionSet/leftIcon.png"
-                  alt=""
-              />
+              <img class="leftImg o-mr-6" src="../../assets//distributionSet/leftIcon.png" alt="" />
               <span class="leftTxt c-text-15 c-text-w6">
-                {{$t('distributionSet.total')}}<span class="leftNum c-text-20">3</span>
-                {{$t('distributionSet.leftTitle')}}
+                {{ $t('distributionSet.total') }}<span class="leftNum c-text-20">3</span>
+                {{ $t('distributionSet.leftTitle') }}
               </span>
             </div>
             <div @click="toDetail" class="rightCon c-text-12">
-              + {{$t('distributionSet.rightAdd')}}
+              + {{ $t('distributionSet.rightAdd') }}
             </div>
           </div>
         </div>
         <kTabs tabWidth="100%" @tabchg="tabChg" :tabList="tabList"></kTabs>
       </div>
       <van-pull-refresh disabled v-model="refreshing" @refresh="onRefresh">
-        <van-list
-            v-model="loading"
-            :finished="finished"
-            :finished-text="$t('common.noMoreTxt')"
-            @load="onLoad"
-            :offset="300"
-            :immediate-check="false"
-        >
-          <div
-              v-for="item in tableData"
-              :key="item.id"
-              @click="toDetail(item)"
-              class="o-plr-14 o-ptb-16 contentCon kBordBott"
-          >
+        <van-list v-model="loading" :finished="finished" :finished-text="$t('common.noMoreTxt')" @load="onLoad"
+          :offset="300" :immediate-check="false">
+          <div v-for="item in tableData" :key="item.id" @click="toDetail(item)"
+            class="o-plr-14 o-ptb-16 contentCon kBordBott">
             <div class="content l-flex-between">
               <div>
-                <span class="titleName c-text-13">{{$t('distributionSet.equipName')}}：</span>
+                <span class="titleName c-text-13">{{ $t('distributionSet.equipName') }}：</span>
                 <span class="valueName c-text-13">{{
-                    item.equipmentName
-                  }}</span>
+                  item.equipmentName
+                }}</span>
               </div>
               <van-icon color="#B9BAD0" size="20" name="arrow" />
             </div>
             <div v-if="item.agencyProportion" class="content l-flex-RC">
               <div class="l-flex-RC">
-                <span class="titleName c-text-13">{{$t('distributionSet.partners')}}：</span>
+                <span class="titleName c-text-13">{{ $t('distributionSet.partners') }}：</span>
                 <span class="valueName valueName1 c-text-line1 c-text-13">{{
-                    item.agencyName
-                  }}</span>
+                  item.agencyName
+                }}</span>
               </div>
               <div class="o-ml-30">
-                <span class="titleName c-text-13">{{$t('distributionSet.distProp')}}：</span>
-                <span class="valueName c-text-13"
-                >{{ item.agencyProportion }}%</span
-                >
+                <span class="titleName c-text-13">{{ $t('distributionSet.distProp') }}：</span>
+                <span class="valueName c-text-13">{{ item.agencyProportion }}%</span>
               </div>
             </div>
             <div v-if="item.merchantProportion" class="content l-flex-RC">
               <div class="l-flex-RC">
-                <span class="titleName c-text-13">{{$t('distributionSet.partners')}}：</span>
+                <span class="titleName c-text-13">{{ $t('distributionSet.partners') }}：</span>
                 <span class="valueName valueName1 c-text-line1 c-text-13">{{
-                    item.merchantName
-                  }}</span>
+                  item.merchantName
+                }}</span>
               </div>
               <div class="o-ml-30">
-                <span class="titleName c-text-13">{{$t('distributionSet.distProp')}}：</span>
-                <span class="valueName c-text-13"
-                >{{ item.merchantProportion }}%</span
-                >
+                <span class="titleName c-text-13">{{ $t('distributionSet.distProp') }}：</span>
+                <span class="valueName c-text-13">{{ item.merchantProportion }}%</span>
               </div>
             </div>
             <div v-if="item.personageProportion" class="content l-flex-RC">
               <div class="l-flex-RC">
-                <span class="titleName c-text-13">{{$t('distributionSet.partners')}}：</span>
+                <span class="titleName c-text-13">{{ $t('distributionSet.partners') }}：</span>
                 <span class="valueName valueName1 c-text-line1 c-text-13">{{
-                    item.personageName
-                  }}</span>
+                  item.personageName
+                }}</span>
               </div>
               <div class="o-ml-30">
-                <span class="titleName c-text-13">{{$t('distributionSet.distProp')}}：</span>
-                <span class="valueName c-text-13"
-                >{{ item.personageProportion }}%</span
-                >
+                <span class="titleName c-text-13">{{ $t('distributionSet.distProp') }}：</span>
+                <span class="valueName c-text-13">{{ item.personageProportion }}%</span>
               </div>
             </div>
             <div class="content l-flex-RC">
               <div>
-                <span class="titleName c-text-13">{{$t('distributionSet.applTime')}}：</span>
+                <span class="titleName c-text-13">{{ $t('distributionSet.applTime') }}：</span>
                 <span class="valueName c-text-13">{{
-                    $M_FormatTime(item.createDate, "YYYY-MM-DD HH:MM")
-                  }}</span>
+                  $M_FormatTime(item.createDate, "YYYY-MM-DD HH:MM")
+                }}</span>
               </div>
-              <div
-                  v-if="tabActive === 1"
-                  class="effective c-text-15 c-text-w5 o-ml-20"
-              >
-                {{$t('distributionSet.reviewed')}}
+              <div v-if="tabActive === 1" class="effective c-text-15 c-text-w5 o-ml-20">
+                {{ $t('distributionSet.reviewed') }}
               </div>
             </div>
-            <div
-                v-if="tabActive === 0"
-                class="approval c-text-15 c-text-w5 o-mt-6"
-            >
-              {{$t('distributionSet.apprPend')}}
+            <div v-if="tabActive === 0" class="approval c-text-15 c-text-w5 o-mt-6">
+              {{ $t('distributionSet.apprPend') }}
             </div>
           </div>
         </van-list>
@@ -130,12 +101,12 @@ import sHeader from "../../components/SimpleHeader";
 import { useRouter } from "vue-router";
 import { getLoginUser, styleUrl } from "../../common/js/utils";
 import kTabs from "../../components/commom/kTabs/index.vue";
-import {useI18n} from 'vue-i18n';
+import { useI18n } from 'vue-i18n';
 
 export default {
   components: { sHeader, kTabs },
   setup() {
-    const {t} = useI18n();
+    const { t } = useI18n();
     const router = useRouter();
     // 点击去详情
     const toDetail = (e) => {

src/views/register.vue

@@ -150,15 +150,15 @@ export default {
         return false;
       }
       const { data } = await tAdminSave({
-          username: username.value,
-          name: name.value,
-          password: md5(password.value),
-          ifForeign: ifForeign.value,
-          // phone: phone.value,
-          // email: email.value,
-          phoneOrEmail: phoneOrEmailStr,
-          code: code.value,
-          companyType: '0'
+        username: username.value,
+        name: name.value,
+        password: md5(password.value),
+        ifForeign: ifForeign.value,
+        // phone: phone.value,
+        // email: email.value,
+        phoneOrEmail: phoneOrEmailStr,
+        code: code.value,
+        companyType: '0'
       });
 
       if (data.code === '00000') {

src/views/robotRanking.vue

@@ -89,7 +89,7 @@
             </template>
           </van-field>
           <van-field @click-input="machineTypeInpClk" readonly clearable v-model="searchForm.machineTypeName"
-                     :placeholder="$t('robotRanking.machineTypePlace')" :label="$t('robotRanking.machineType')">
+            :placeholder="$t('robotRanking.machineTypePlace')" :label="$t('robotRanking.machineType')">
             <template #right-icon>
               <div class="l-flex-RC">
                 <van-icon v-if="searchForm.machineTypeName" @click="
@@ -128,8 +128,9 @@
     </van-popup>
     <!-- 设备类型弹窗 -->
     <van-popup v-model:show="machineTypeShow" position="bottom">
-      <van-picker :default-index="maTypeDefaIdx" :title="$t('robotRanking.machineTypePlace')" :columns="machineTypePopList"
-        :columns-field-names="yearPopFieldName" @confirm="machineTypePopConfirm" @cancel="machineTypeShow = false" />
+      <van-picker :default-index="maTypeDefaIdx" :title="$t('robotRanking.machineTypePlace')"
+        :columns="machineTypePopList" :columns-field-names="yearPopFieldName" @confirm="machineTypePopConfirm"
+        @cancel="machineTypeShow = false" />
     </van-popup>
     <!-- 公司平台弹窗 -->
     <van-popup v-model:show="companyTypeShow" position="bottom">
@@ -748,7 +749,7 @@ export default {
       })
 
       // 如果是type<3或者是有订单数据权限M4的子商家才可以查看
-      if ( user.type < 3 || isOrderData ) {
+      if (user.type < 3 || isOrderData) {
         init();
       }
 

src/views/role/add.vue

@@ -4,39 +4,21 @@
     <s-header :name="pageTitle" :noback="false"></s-header>
     <div class="accountPerBox flex-col">
       <van-form @submit="onSubmit">
-        <van-field
-            v-model="roleName"
-            name="roleName"
-            :label="$t('role.roleNameLabel')"
-            :placeholder="$t('role.roleNamePlaceholder')"
-            :rules="[{ required: true, message: $t('role.roleNamePlaceholder') }]"
-        />
-        <van-checkbox-group
-            v-model="roleMenuCode"
-            style="
+        <van-field v-model="roleName" name="roleName" :label="$t('role.roleNameLabel')"
+          :placeholder="$t('role.roleNamePlaceholder')"
+          :rules="[{ required: true, message: $t('role.roleNamePlaceholder') }]" />
+        <van-checkbox-group v-model="roleMenuCode" style="
             display: flex;
             flex-wrap: wrap;
             align-items: center;
             justify-content: flex-start;
-          "
-        >
-          <van-checkbox
-              v-for="(item, index) in menuCodeList"
-              :key="index"
-              :name="item.value"
-              style="width: 50%; padding: 1em"
-          >{{ item.label }}</van-checkbox
-          >
+          ">
+          <van-checkbox v-for="(item, index) in menuCodeList" :key="index" :name="item.value"
+            style="width: 50%; padding: 1em">{{ item.label }}</van-checkbox>
         </van-checkbox-group>
         <!-- 操作 -->
         <van-row justify="space-around" style="padding: 1em">
-          <van-button
-              span="5"
-              round
-              type="primary"
-              style="height: 2em; padding: 0 2em"
-              native-type="submit"
-          >
+          <van-button span="5" round type="primary" style="height: 2em; padding: 0 2em" native-type="submit">
             {{ pageTitle }}
           </van-button>
         </van-row>
@@ -69,7 +51,7 @@ import sHeader from "../../components/SimpleHeader";
 import { Toast } from "vant";
 // import { getSysRoleList, getEquipmentList } from "../../service/accountPar/index";
 import { addSysRole, updateSysRole } from "../../service/role/index";
-import { getLoginUser,$M_Menus, styleUrl } from "../../common/js/utils";
+import { getLoginUser, $M_Menus, styleUrl } from "../../common/js/utils";
 import { useRouter } from "vue-router";
 import { useI18n } from "vue-i18n";
 
@@ -127,9 +109,9 @@ export default {
       // getEquipmentListFun();
     });
     // 设置菜单权限
-    const menuSet = ()=>{
+    const menuSet = () => {
       // 如果不是admin管理员权限type=0，要删除 广告管理M5，杉德分账M10，系统脱机M17，apk管理M19
-      if(user.type !== 0){
+      if (user.type !== 0) {
         delete $M_Menus['M5'];
         delete $M_Menus['M10'];
         delete $M_Menus['M17'];
@@ -141,10 +123,10 @@ export default {
         delete $M_Menus['M9'];
       }
 
-      for(const key in $M_Menus){
+      for (const key in $M_Menus) {
         menuCodeList.value.push({
-          label:$M_Menus[key],
-          value:key
+          label: $M_Menus[key],
+          value: key
         });
       }
     };

src/views/role/index.vue

@@ -8,7 +8,7 @@
           <div class="flex-row justify-between bd3">
             <div class="flex-col outer4"></div>
             <span class="flex-col txt2">{{ $t('role.total') }}<span class="discountNumber">{{ accountPerList.length
-              }}</span>{{ $t('role.inTotal') }}</span>
+            }}</span>{{ $t('role.inTotal') }}</span>
           </div>
         </div>
         <div class="flex-col">
@@ -27,7 +27,7 @@
               <div class="itemRow">{{ item.roleName }}</div>
               <div class="itemRow" style="color: #8787a6;">
                 <span v-for="(role, rindex) in item.menuCodesJson" :key="rindex" class="roleItem">{{ showRole(role)
-                  }}</span>
+                }}</span>
               </div>
             </div>
             <div class="operBox">
@@ -47,7 +47,7 @@
       </div>
     </div>
     <van-dialog v-model:show="operCheckShow" :title="$t('role.operationConfirmation')" :showConfirmButton="false"
-                :showCancelButton="false">
+      :showCancelButton="false">
       <div class="operCheckBox">
         <div class="block5 flex-col"></div>
         <span class="word10">{{ $t('role.pleaseConfirmAgainWhetherToOperate') }}</span>
@@ -74,7 +74,7 @@ import { useRouter } from "vue-router";
 import { useI18n } from 'vue-i18n';
 
 export default {
-  name:"role",
+  name: "role",
   components: { sHeader },
   setup() {
     // 引入语言

src/views/taskMessage/index.less

@@ -1,20 +1,24 @@
 .taskMessagePage {
   width: 100%;
+
   .taskMessageBox {
     width: 100%;
     height: calc(100% - 60px);
     overflow: auto;
+
     // background: #fff url('../../assets/taskMessage/pageBg.png') top center no-repeat;
     // background-size: 100%;
     .taskListRow {
       width: 100%;
       height: 53px;
       flex-wrap: wrap;
+
       .taskIcon {
         width: 13%;
         height: 100%;
         position: relative;
-        &.deviceIcon::after{
+
+        &.deviceIcon::after {
           content: '';
           position: absolute;
           background: #fff url('../../assets/taskMessage/deviceIcon.png') top center no-repeat;
@@ -24,7 +28,8 @@
           right: 0.15rem;
           top: 0.4rem;
         }
-        &.retailIcon::after{
+
+        &.retailIcon::after {
           content: '';
           position: absolute;
           background: #fff url('../../assets/taskMessage/retailIcon.png') top center no-repeat;
@@ -34,7 +39,8 @@
           right: 0.15rem;
           top: 0.4rem;
         }
-        &.withIcon::after{
+
+        &.withIcon::after {
           content: '';
           position: absolute;
           background: #fff url('../../assets/taskMessage/withIcon.png') top center no-repeat;
@@ -45,12 +51,14 @@
           top: 0.4rem;
         }
       }
+
       .taskRight {
         width: 87%;
         height: 100%;
         position: relative;
         border-bottom: 1px solid #e7eaf7;
-        &::after{
+
+        &::after {
           content: '';
           position: absolute;
           width: 6px;
@@ -60,6 +68,7 @@
           right: 0.55rem;
           top: 0.5rem;
         }
+
         .taskTitle {
           line-height: 53px;
         }
@@ -73,27 +82,33 @@
       background: rgba(255, 255, 255, 1) url("../../assets/home/line.png") bottom center no-repeat;
       background-size: 100%;
       align-items: center;
+
       .bd3 {
         width: 87px;
         height: 16px;
+
         .outer4 {
           width: 20px;
           height: 26px;
           background: url("../../assets/alarmHistory/icon.png") top center no-repeat;
           background-size: 100%;
+
           &.equipmentIcon {
             background: url("../../assets/taskMessage/deviceIcon.png") top center no-repeat;
             background-size: 100%;
           }
+
           &.joinPayMchCheckIcon {
             background: url("../../assets/taskMessage/withIcon.png") top center no-repeat;
             background-size: 100%;
           }
+
           &.proportionIcon {
             background: url("../../assets/taskMessage/retailIcon.png") top center no-repeat;
             background-size: 100%;
           }
         }
+
         .txt2 {
           width: 65px;
           height: 14px;
@@ -106,19 +121,23 @@
           line-height: 15px;
           display: block;
           font-weight: bold;
+
           .discountNumber {
             font-size: 18px;
             color: red;
           }
         }
       }
+
       .main5 {
         width: 39px;
         height: 16px;
+
         .label2 {
           width: 14px;
           height: 14px;
         }
+
         .txt3 {
           overflow-wrap: break-word;
           color: rgba(64, 77, 116, 1);
@@ -129,6 +148,7 @@
         }
       }
     }
+
     .listBox {
       .listItem {
         width: 100%;
@@ -136,15 +156,26 @@
         background-size: 100%;
         position: relative;
         display: inline-block;
+
         .itemBox {
-          width: 92%; margin: 20px auto;
+          width: 92%;
+          margin: 20px auto;
           font-size: 12px;
           line-height: 1.64;
-          .itemRow { width: 100%; }
-          .itemTitle { color: #8787a6; }
-          .discount { padding-left: 2em; }
+
+          .itemRow {
+            width: 100%;
+          }
+
+          .itemTitle {
+            color: #8787a6;
+          }
+
+          .discount {
+            padding-left: 2em;
+          }
         }
       }
     }
   }
-}
+}

src/views/taskMessage/index.vue

@@ -6,19 +6,19 @@
       <div class="taskListRow flex-col" @click="pushPageList('/taskEquipment')">
         <div class="taskIcon deviceIcon"></div>
         <div class="taskRight">
-          <div class="taskTitle">{{$t('taskMessage.equipmentInitializationApproval')}}</div>
+          <div class="taskTitle">{{ $t('taskMessage.equipmentInitializationApproval') }}</div>
         </div>
       </div>
       <div class="taskListRow flex-col" @click="pushPageList('/taskProportion')">
         <div class="taskIcon retailIcon"></div>
         <div class="taskRight">
-          <div class="taskTitle">{{$t('taskMessage.distributionApplicationApproval')}}</div>
+          <div class="taskTitle">{{ $t('taskMessage.distributionApplicationApproval') }}</div>
         </div>
       </div>
       <div class="taskListRow flex-col" @click="pushPageList('/taskJoinPayMchCheck')">
         <div class="taskIcon withIcon"></div>
         <div class="taskRight">
-          <div class="taskTitle">{{$t('taskMessage.withdrawalAccountApproval')}}</div>
+          <div class="taskTitle">{{ $t('taskMessage.withdrawalAccountApproval') }}</div>
         </div>
       </div>
     </div>
@@ -29,7 +29,7 @@
 import { onMounted } from 'vue';
 import sHeader from "@/components/SimpleHeader";
 import { useRouter } from "vue-router";
-import {styleUrl} from "../../common/js/utils";
+import { styleUrl } from "../../common/js/utils";
 
 export default {
   components: { sHeader },

src/views/taskMessage/joinpayMchCheck/index.vue

@@ -7,7 +7,8 @@
         <div class="flex-col">
           <div class="flex-row justify-between bd3">
             <div class="flex-col outer4 joinPayMchCheckIcon"></div>
-            <span class="flex-col txt2">{{ $t('taskMessage.total') }}<span class="discountNumber">{{ alarmHistoryTotal }}</span>{{ $t('taskMessage.recordsInTotal') }}</span>
+            <span class="flex-col txt2">{{ $t('taskMessage.total') }}<span class="discountNumber">{{ alarmHistoryTotal
+            }}</span>{{ $t('taskMessage.recordsInTotal') }}</span>
           </div>
         </div>
         <div class="l-flex-RC">
@@ -20,27 +21,33 @@
       <kTabs ref="kTabsRef" tabWidth="100%" @tabclk="tabClk" :tabList="tabList"></kTabs>
       <div class="flex-col">
         <van-list v-model:loading="loading" v-model:error="error" :error-text="$t('common.reqFailClkReload')"
-                  :finished="finished" :finished-text="$t('common.noMoreTxt')" offset="300" :immediate-check="false" @load="onLoad">
+          :finished="finished" :finished-text="$t('common.noMoreTxt')" offset="300" :immediate-check="false"
+          @load="onLoad">
           <div class="listBox">
             <div v-for="(item, index) in alarmHistoryList" :key="index" class="listItem" @click="pushInfo(item)">
               <div class="itemBox">
                 <div class="itemRow l-flex-between">
                   <div class="l-flex-RC">
-                    <span class="itemTitle">{{ $t('taskMessage.merchantName') }}:&nbsp;</span>{{ payType==0 ? item.altMchName:item.regName }}
+                    <span class="itemTitle">{{ $t('taskMessage.merchantName') }}:&nbsp;</span>{{ payType == 0 ?
+                      item.altMchName : item.regName }}
                   </div>
                   <van-icon color="#B9BAD0" name="arrow" />
                 </div>
                 <div class="itemRow">
-                  <span class="itemTitle">{{ $t('taskMessage.contactName') }}:&nbsp;</span>{{ payType==0 ? item.busiContactName:item.name }}
+                  <span class="itemTitle">{{ $t('taskMessage.contactName') }}:&nbsp;</span>{{ payType == 0 ?
+                    item.busiContactName : item.name }}
                 </div>
                 <div class="itemRow">
-                  <span class="itemTitle">{{ $t('taskMessage.contactPhoneNumber') }}:&nbsp;</span>{{ payType==0 ? item.busiContactMobileNo:item.phone }}
+                  <span class="itemTitle">{{ $t('taskMessage.contactPhoneNumber') }}:&nbsp;</span>{{ payType == 0 ?
+                    item.busiContactMobileNo : item.phone }}
                 </div>
                 <div class="itemRow">
-                  <span class="itemTitle">{{ $t('taskMessage.applicationTime') }}:&nbsp;</span>{{ showDateTime(item.createDate) }}
+                  <span class="itemTitle">{{ $t('taskMessage.applicationTime') }}:&nbsp;</span>{{
+                    showDateTime(item.createDate) }}
                 </div>
                 <div class="itemRow">
-                  <span class="itemTitle">{{ $t('taskMessage.approvalTime') }}:&nbsp;</span>{{ showDateTime(item.modifyDate) }}
+                  <span class="itemTitle">{{ $t('taskMessage.approvalTime') }}:&nbsp;</span>{{
+                    showDateTime(item.modifyDate) }}
                 </div>
               </div>
             </div>
@@ -50,19 +57,18 @@
     </div>
     <!-- 筛选弹窗 -->
     <kDialog :dialogTitle="$t('taskMessage.equipmentInit.searchPop.title')"
-             :confirmBtnTxt="$t('taskMessage.equipmentInit.searchPop.filterBtn')" ref="kDialogRef" @confirmclk="confirmClk">
+      :confirmBtnTxt="$t('taskMessage.equipmentInit.searchPop.filterBtn')" ref="kDialogRef" @confirmclk="confirmClk">
       <template #content>
         <div class="cust_vantBorder">
-          <van-field clearable v-model="searchForm.merchantName" :placeholder="
-            $t('taskMessage.equipmentInit.searchPop.merchantNamePlace')
-          " :label="$t('taskMessage.equipmentInit.searchPop.merchantName')" />
+          <van-field clearable v-model="searchForm.merchantName" :placeholder="$t('taskMessage.equipmentInit.searchPop.merchantNamePlace')
+            " :label="$t('taskMessage.equipmentInit.searchPop.merchantName')" />
           <van-field @click-input="busiInpClk" readonly clearable v-model="searchForm.stateName"
-                     :placeholder="$t('taskMessage.equipmentInit.searchPop.statePlace')"
-                     :label="$t('taskMessage.equipmentInit.searchPop.state')">
+            :placeholder="$t('taskMessage.equipmentInit.searchPop.statePlace')"
+            :label="$t('taskMessage.equipmentInit.searchPop.state')">
             <template #right-icon>
               <div class="l-flex-RC">
                 <van-icon v-if="searchForm.stateName" @click="searchForm.state = ''; searchForm.stateName = ''"
-                          class="o-mr-6" name="clear" />
+                  class="o-mr-6" name="clear" />
                 <van-icon @click="busiInpClk" name="arrow-down" />
               </div>
             </template>
@@ -73,7 +79,7 @@
     <!-- 状态选择框 -->
     <van-popup v-model:show="busiPopShow" position="bottom">
       <van-picker :title="$t('taskMessage.equipmentInit.searchPop.statePlace')" :columns="tabList"
-                  :columns-field-names="busiPopFieldName" @confirm="busiPopConfirm" @cancel="busiPopShow = false" />
+        :columns-field-names="busiPopFieldName" @confirm="busiPopConfirm" @cancel="busiPopShow = false" />
     </van-popup>
   </div>
 </template>
@@ -191,12 +197,12 @@ export default {
     const getList = async () => {
       searchParams.userName = searchForm.merchantName;
       const { data } = await getTaskJoinpayMchCheckList(
-          Object.assign({}, searchParams)
+        Object.assign({}, searchParams)
       );
       if (data.code === "00000") {
         // 列表值叠加
         alarmHistoryList.value = alarmHistoryList.value.concat(
-            data.data.records
+          data.data.records
         );
         alarmHistoryTotal.value = data.data.total;
         if (alarmHistoryList.value.length === data.data.total) {
@@ -218,8 +224,8 @@ export default {
     });
     const showDateTime = (date) => {
       return date
-          ? dateUtil.formateDate(new Date(date), "yyyy-MM-dd hh:mm:ss")
-          : "";
+        ? dateUtil.formateDate(new Date(date), "yyyy-MM-dd hh:mm:ss")
+        : "";
     };
     const pushInfo = (item) => {
       router.push({
@@ -254,6 +260,4 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
-@import "../../../common/style/common.less";
-</style>
+<style lang="less" scoped>@import "../../../common/style/common.less";</style>

src/views/taskMessage/joinpayMchCheck/info/index.less

@@ -1,8 +1,9 @@
 .joinpayMchCheckPage {
+  width: 100%;
+
+  .joinpayMchCheckBox {
     width: 100%;
-    .joinpayMchCheckBox {
-      width: 100%;
-      height: calc(100% - 44px);
-      overflow: auto;
-    }
+    height: calc(100% - 44px);
+    overflow: auto;
+  }
 }

src/views/taskMessage/proportion/index.vue

@@ -4,19 +4,19 @@
     <s-header :name="$t('taskMessage.distributionApplicationApproval')" :noback="false"></s-header>
     <div class="taskMessageBox flex-col">
       <van-list v-model:loading="loading" v-model:error="error" :error-text="$t('common.reqFailClkReload')"
-                :finished="finished" :finished-text="$t('common.noMoreTxt')" offset="300" :immediate-check="false" @load="onLoad">
+        :finished="finished" :finished-text="$t('common.noMoreTxt')" offset="300" :immediate-check="false" @load="onLoad">
         <div class="searchRow flex-row justify-between">
           <div class="flex-col">
             <div class="flex-row justify-between bd3">
               <div class="flex-col outer4 proportionIcon"></div>
               <span class="flex-col txt2">{{ $t('taskMessage.total') }}<span class="discountNumber">{{ alarmHistoryTotal
-                }}</span>{{ $t('taskMessage.recordsInTotal') }}</span>
+              }}</span>{{ $t('taskMessage.recordsInTotal') }}</span>
             </div>
           </div>
           <div class="l-flex-RC">
             <div @click="reviewedClk" class="label3 o-mr-30">{{
-                $t('taskMessage.toViewAppro')
-              }}</div>
+              $t('taskMessage.toViewAppro')
+            }}</div>
             <div @click="noticeClk" class="main5 l-flex-RC">
               <img class="label2 o-mr-5" src="../../../assets/device/searchIcon.png" />
               <span class="txt3">{{ $t('taskMessage.search') }}</span>
@@ -32,20 +32,20 @@
               <div class="itemRow" v-if="item.type >= 1">
                 <span class="itemTitle">{{ $t('taskMessage.partners') }}:&nbsp;</span>{{ item.agencyName
                 }}<span class="itemTitle discount">{{ $t('taskMessage.proportion') }}:&nbsp;</span>{{
-                  item.agencyProportion
-                }}%
+  item.agencyProportion
+}}%
               </div>
               <div class="itemRow" v-if="item.type >= 2">
                 <span class="itemTitle">{{ $t('taskMessage.partners') }}:&nbsp;</span>{{ item.merchantName
                 }}<span class="itemTitle discount">{{ $t('taskMessage.proportion') }}:&nbsp;</span>{{
-                  item.merchantProportion
-                }}%
+  item.merchantProportion
+}}%
               </div>
               <div class="itemRow" v-if="item.type >= 3">
                 <span class="itemTitle">{{ $t('taskMessage.partners') }}:&nbsp;</span>{{ item.personageName
                 }}<span class="itemTitle discount">{{ $t('taskMessage.proportion') }}:&nbsp;</span>{{
-                  item.personageProportion
-                }}%
+  item.personageProportion
+}}%
               </div>
               <div class="itemRow">
                 <span class="itemTitle">{{ $t('taskMessage.applicationTime') }}:&nbsp;</span>{{
@@ -58,7 +58,7 @@
                 }}
               </div>
               <div class="itemRow" style="display: flex; justify-content: flex-end"
-                   v-if="item.checkType === '0' && isOper">
+                v-if="item.checkType === '0' && isOper">
                 <van-button span="5" round type="primary" style="
                       height: 2em;
                       padding: 0 1em;
@@ -92,19 +92,18 @@
 
     <!-- 筛选弹窗 -->
     <kDialog :dialogTitle="$t('taskMessage.equipmentInit.searchPop.title')"
-             :confirmBtnTxt="$t('taskMessage.equipmentInit.searchPop.filterBtn')" ref="kDialogRef" @confirmclk="confirmClk">
+      :confirmBtnTxt="$t('taskMessage.equipmentInit.searchPop.filterBtn')" ref="kDialogRef" @confirmclk="confirmClk">
       <template #content>
         <div class="cust_vantBorder">
-          <van-field clearable v-model="searchForm.merchantName" :placeholder="
-            $t('taskMessage.equipmentInit.searchPop.merchantNamePlace')
-          " :label="$t('taskMessage.equipmentInit.searchPop.merchantName')" />
+          <van-field clearable v-model="searchForm.merchantName" :placeholder="$t('taskMessage.equipmentInit.searchPop.merchantNamePlace')
+            " :label="$t('taskMessage.equipmentInit.searchPop.merchantName')" />
           <van-field @click-input="busiInpClk" readonly clearable v-model="searchForm.stateName"
-                     :placeholder="$t('taskMessage.equipmentInit.searchPop.statePlace')"
-                     :label="$t('taskMessage.equipmentInit.searchPop.state')">
+            :placeholder="$t('taskMessage.equipmentInit.searchPop.statePlace')"
+            :label="$t('taskMessage.equipmentInit.searchPop.state')">
             <template #right-icon>
               <div class="l-flex-RC">
                 <van-icon v-if="searchForm.stateName" @click="searchForm.stateName = ''; searchForm.state = ''"
-                          class="o-mr-6" name="clear" />
+                  class="o-mr-6" name="clear" />
                 <van-icon @click="busiInpClk" name="arrow-down" />
               </div>
             </template>
@@ -115,7 +114,7 @@
     <!-- 状态选择框 -->
     <van-popup v-model:show="busiPopShow" position="bottom">
       <van-picker :title="$t('taskMessage.equipmentInit.searchPop.statePlace')" :columns="busiPopList"
-                  :columns-field-names="busiPopFieldName" @confirm="busiPopConfirm" @cancel="busiPopShow = false" />
+        :columns-field-names="busiPopFieldName" @confirm="busiPopConfirm" @cancel="busiPopShow = false" />
     </van-popup>
   </div>
 </template>
@@ -221,12 +220,12 @@ export default {
       }
       searchParams.userName = searchForm.merchantName;
       const { data } = await getTaskProportionList(
-          Object.assign({}, searchParams)
+        Object.assign({}, searchParams)
       );
       if (data.code === "00000") {
         // 列表值叠加
         alarmHistoryList.value = alarmHistoryList.value.concat(
-            data.data.records
+          data.data.records
         );
         alarmHistoryTotal.value = data.data.total;
         if (alarmHistoryList.value.length === data.data.total) {
@@ -255,8 +254,8 @@ export default {
     });
     const showDateTime = (date) => {
       return date
-          ? dateUtil.formateDate(new Date(date), "yyyy-MM-dd hh:mm:ss")
-          : "";
+        ? dateUtil.formateDate(new Date(date), "yyyy-MM-dd hh:mm:ss")
+        : "";
     };
     const changeStatusFun = async (item, type) => {
       const { data } = await changeProportionStatus({

src/views/uniPay/index.vue

@@ -4,16 +4,16 @@
     <s-header :name="$t('uniPay.selfRecharging')" :noback="false"></s-header>
     <div class="box1 flex-col">
       <van-field v-model="deviceValue" is-link readonly :label="$t('uniPay.selfRecharging')"
-                 :placeholder="$t('uniPay.pleaseSelectAMachine')" @click="deviceShow = true" />
+        :placeholder="$t('uniPay.pleaseSelectAMachine')" @click="deviceShow = true" />
       <van-popup v-model:show="deviceShow" round closeable position="bottom">
         <van-cascader v-model="deviceId" :title="$t('uniPay.pleaseSelectAMachine')" :options="deviceOptions"
-                      @close="show = false" @finish="onDeviceFinish" />
+          @close="show = false" @finish="onDeviceFinish" />
       </van-popup>
       <van-field v-model="productValue" is-link readonly :label="$t('uniPay.pattern')"
-                 :placeholder="$t('uniPay.pleaseSelectAPattern')" @click="productShow = true" />
+        :placeholder="$t('uniPay.pleaseSelectAPattern')" @click="productShow = true" />
       <van-popup v-model:show="productShow" round closeable position="bottom">
         <van-cascader v-model="productId" :title="$t('uniPay.pleaseSelectAPattern')" :options="productOptions"
-                      @close="show = false" @finish="onProductFinish">
+          @close="show = false" @finish="onProductFinish">
           <template #option="{ option }">
             <div class="cascader-item">
               <van-image :src="option.imgUrl" width="50px" height="50px"></van-image>
@@ -32,10 +32,10 @@
         </div>
       </div>
       <van-button round type="primary" class="volumeChangeButton" @click="submitForm">{{ $t('uniPay.placeOrder')
-        }}</van-button>
+      }}</van-button>
       <van-popup v-model:show="uniPayShow" position="center" :style="{ width: '90%', 'text-align': 'center' }">
         <p>{{ $t('uniPay.orderNumber') }}: {{ uniPayObj.sn }}</p>
-        <img :src="uniPayObj.rd_Pic" style="max-width: 100%; height: auto;"/>
+        <img :src="uniPayObj.rd_Pic" style="max-width: 100%; height: auto;" />
       </van-popup>
     </div>
   </div>

src/views/weChatPay.vue

@@ -24,8 +24,8 @@ export default {
 
         const wxPay = () => {
             // 处理回调接口
-            const redirectUri = encodeURIComponent('http://szwlh.sunzee.com.cn/PAY-SERVER/tOrder/callback');
-            // const redirectUri = encodeURIComponent('http://szwltest.sunzee.com.cn/PAY-SERVER/tOrder/callback');
+            // const redirectUri = encodeURIComponent('http://szwlh.sunzee.com.cn/PAY-SERVER/sz/tOrder/callback');
+            const redirectUri = encodeURIComponent('http://szwltest.sunzee.com.cn/PAY-SERVER/tOrder/callback');
             const url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appId}&redirect_uri=${redirectUri}&response_type=code&scope=snsapi_base&state=${id}&connect_redirect=1#wechat_redirect`;
             console.log(url)
             window.location.replace(url);

src/views/wxLogin.vue

@@ -3,35 +3,35 @@
 </template>
 
 <script>
-import {onMounted} from "vue";
-import {Toast, Dialog, Button} from "vant";
-import {useRoute, useRouter} from "vue-router";
-import {useI18n} from "vue-i18n";
-import {setLocal} from "../common/js/utils";
-import {getUserDetailByWxCode} from "@/service/login";
+import { onMounted } from "vue";
+import { Toast, Dialog, Button } from "vant";
+import { useRoute, useRouter } from "vue-router";
+import { useI18n } from "vue-i18n";
+import { setLocal } from "../common/js/utils";
+import { getUserDetailByWxCode } from "@/service/login";
 
 /**
  * 微信登录跳板
  */
 export default {
   setup() {
-    const { t} = useI18n();
+    const { t } = useI18n();
     const router = useRouter();
     const route = useRoute();
     const code = route.query.code;
     // 页面初始化
     onMounted(() => {
-      console.log('获取页面参数code：',code);
-      if(code){
+      console.log('获取页面参数code：', code);
+      if (code) {
         loginByCode(code);
       }
     });
     // 登录
     const loginByCode = async (code) => {
-      const {data} = await getUserDetailByWxCode(code);
+      const { data } = await getUserDetailByWxCode(code);
       if (data.code === "00000") {
         setLocal("loginUser", JSON.stringify(data.data));
-        console.log('loginUser JSON：',JSON.stringify(data.data));
+        console.log('loginUser JSON：', JSON.stringify(data.data));
         Toast.success(t('login.loginSucess'));
         setTimeout(() => {
           router.push("/home");

vue.config.js

@@ -12,7 +12,7 @@ module.exports = {
     }
   },
   devServer: {
-		open: true,
+    open: true,
     proxy: {
       '/': { //前端任何含/api的URL请求都会被反向代理。如http://localhost:8000/xxx/api/source/xxx的请求会变成服务器的反向代理请求
         target: 'http://120.25.151.99:49011', //原来请求的服务器IP地址会换成此地址，如以上地址会变成http://localhost:5000/xxx/api/source/xxx