Przeglądaj źródła

feat:“同步2024.06.13“

soobin 1 rok temu
rodzic
commit
ddbd07d243

+ 8 - 2
src/assets/language/en.json

@@ -580,7 +580,7 @@
       "adminPassword": "Administrator password",
       "guestPassword": "Secondary administrator password",
       "checkDeivcePwd": "Confirm password",
-      "passwordPlaceholder": "Please enter a password of more than 6 characters",
+      "passwordPlaceholder": "Please enter a 6-digit password",
       "passwordCheckRequired": "Please enter your password again",
       "passwordMatch": "Two passwords do not match"
     },
@@ -1406,7 +1406,13 @@
     "currentChoose": "Current selection",
     "tips": "Remind",
     "changeTips": "Whether to switch payment platforms?",
-    "changeSuccess": "Switchover successful"
+    "changeSuccess": "Switchover successful",
+    "orderNotice": "Order notice",
+    "openOrderNotice": "Do you want to enable order notification?",
+    "closeOrderNotice": "Do you want to turn off order notifications?",
+    "pleaseBindWechat": "Please bind to wechat first",
+    "openSuccess": "Open successfully",
+    "closeSuccess": "Closed successfully"
   },
   "bindWechat": {
     "cancel": "Cancel",

+ 9 - 3
src/assets/language/ja.json

@@ -545,7 +545,7 @@
             "guestPassword": "ゲストパスワード",
             "devicePwd": "機器パスワード",
             "checkDevicePwd": "パスワード確認",
-            "passwordPlaceholder": "6桁以上のパスワードを入力してください",
+            "passwordPlaceholder": "6桁の数字からなるパスワードを入力します",
             "passwordCheckRequired": "確認のため再度パスワードを入力してください",
             "passwordMatch": "パスワードが一致しません"
         },
@@ -649,7 +649,7 @@
         "noMoreThanMonths": "(3ヶ月を超えてはなりません)",
         "days": "日",
         "type": "タイプ",
-        "deductionRoll": "控除ロール",
+        "deductionRoll": "クーポン",
         "discount2": "割引",
         "deductionPriceLabdel": "控除価格",
         "deductionPricePlaceholder": "控除価格を入力してください",
@@ -1431,7 +1431,13 @@
         "currentChoose": "現在の選択",
         "tips": "リマインダー",
         "changeTips": "支払いプラットフォームを切り替えますか?",
-        "changeSuccess": "切り替えに成功しました"
+        "changeSuccess": "切り替えに成功しました",
+        "orderNotice": "オーダー通知",
+        "openOrderNotice": "註文通知を開きますか?",
+        "closeOrderNotice": "註文通知を閉じますか?",
+        "pleaseBindWechat": "wechatとの連携をお願いします",
+        "openSuccess": "オン成功です",
+        "closeSuccess": "閉鎖成功です"
     },
     "bindWechat": {
         "cancel": "キャンセル",

+ 14 - 5
src/assets/language/zh.json

@@ -542,7 +542,7 @@
       "guestPassword": "次管理员密码",
       "deivcePwd": "机器密码",
       "checkDeivcePwd": "确认密码",
-      "passwordPlaceholder": "请输入6位数以上密码",
+      "passwordPlaceholder": "请输入6位数字组成的密码",
       "passwordCheckRequired": "请再次输入密码进行确认",
       "passwordMatch": "两次密码不一致"
     },
@@ -646,10 +646,10 @@
     "noMoreThanMonths": "(不超过3个月)",
     "days": "天",
     "type": "类型",
-    "deductionRoll": "抵扣卷",
+    "deductionRoll": "立减券",
     "discount2": "打折",
-    "deductionPriceLabdel": "抵扣价格",
-    "deductionPricePlaceholder": "请输入抵扣价格",
+    "deductionPriceLabdel": "立减价格",
+    "deductionPricePlaceholder": "请输入立减价格",
     "enterNumber": "输入数字",
     "paymentMethod": "支付方式",
     "weChat": "微信",
@@ -883,6 +883,9 @@
     "paymentPlatform": "支付平台",
     "convergence": "汇聚",
     "huifuPaymnt": "汇付",
+    "isDistribution": "分佣显示",
+    "reveal": "显示",
+    "hidden": "隐藏",
     "modificationSubmission": "修改提交",
     "merchantType": "商户类型",
     "contactName": "联系人姓名",
@@ -1426,7 +1429,13 @@
     "currentChoose": "当前选择",
     "tips": "提醒",
     "changeTips": "是否切换支付平台?",
-    "changeSuccess": "切换成功"
+    "changeSuccess": "修改成功",
+    "orderNotice": "订单通知",
+    "openOrderNotice": "是否开启订单通知?",
+    "closeOrderNotice": "是否关闭订单通知?",
+    "pleaseBindWechat": "请先绑定微信",
+    "openSuccess": "开启成功",
+    "closeSuccess": "关闭成功"
   },
   "bindWechat": {
     "cancel": "取消",

BIN
src/assets/order/spunSugar/goods/A99.png


+ 3 - 1
src/components/typeSelectList/index.vue

@@ -125,6 +125,7 @@ export default {
       companyType: '',
       machineType: '',
       ifForeign: '',
+      username: '',
     });
     // 商户选择
     const adminTypeShow = ref(false);
@@ -133,7 +134,8 @@ export default {
     const adminConfirm = ({ selectedOptions }) => {
       console.log('selectedOptions[0].text', selectedOptions[0].text)
       searchParams.adminType = (selectedOptions[0].text === t('typeSelectList.allSuboUsers')) ? 'all' : '';
-      searchParams.userName = (selectedOptions[0].text === t('typeSelectList.allSuboUsers')) ? 'all' : (selectedOptions[0].text === t('typeSelectList.thisMerchant')) ? user.username : selectedOptions[0].text;
+      searchParams.username = (selectedOptions[0].text === t('typeSelectList.allSuboUsers')) ? 'all' : '';
+      searchParams.userName = (selectedOptions[0].text === t('typeSelectList.allSuboUsers')) ? '' : (selectedOptions[0].text === t('typeSelectList.thisMerchant')) ? user.username : selectedOptions[0].text;
       adminTypeShow.value = false;
       console.log('searchParams.userName', searchParams.userName)
       outputDate();

+ 5 - 0
src/service/user.js

@@ -27,4 +27,9 @@ export function getIfForeign(adminId) {
 // 批量修改支付平台
 export function updatePayPlatform(params) {
   return axios.get(`/SZWL-SERVER/tAdmin/updatePayPlatform?${stringToUrl(params)}`, params);
+} 
+
+// 切换订单通知开关
+export function updateOrderNotice(params) {
+  return axios.get(`/SZWL-SERVER/tAdmin/updateOrderNotice?${stringToUrl(params)}`, params);
 } 

+ 2 - 0
src/styles/home/index.less

@@ -1,9 +1,11 @@
 .homePage {
+  width: 100%;
   .homeBox {
     width: 100%;
     height: calc(100% - 50px);
     padding-bottom: 10px;
     overflow: auto;
+    overflow-x: hidden;
 
     .intervalRow {
       width: 100%;

+ 8 - 11
src/styles/kDialog/index.less

@@ -2,10 +2,10 @@
 
     .operCheckBox {
       padding: 0 10px;
-      padding-top: 20px;
+      padding-top: 10px;
 
       .operCheckCon {
-        padding-top: 20px;
+        padding-top: 10px;
         border-top: 1px solid #D7D7E2;
 
         .word10 {
@@ -22,15 +22,14 @@
         }
 
         .block6 {
-          width: 265px;
-          height: 34px;
+          // width: 265px;
+          // height: 34px;
           margin: 20px auto;
 
           .mod7 {
-            border-radius: 17px;
-            height: 34px;
+            border-radius: 20px;
+            padding: 10px 20px;
             border: 1px solid #2c87c8;
-            width: 120px;
             justify-content: center;
             align-items: center;
 
@@ -40,7 +39,6 @@
               font-size: 15px;
               font-family: PingFangSC-Medium;
               text-align: center;
-              // white-space: nowrap;
               line-height: 15px;
               display: block;
             }
@@ -48,11 +46,10 @@
 
           .mod8 {
             background-color: #2c87c8;
-            border-radius: 17px;
-            height: 34px;
-            width: 120px;
+            border-radius: 20px;
             justify-content: center;
             align-items: center;
+            padding: 10px 20px;
 
             .info6 {
               overflow-wrap: break-word;

+ 2 - 1
src/styles/user/index.less

@@ -100,7 +100,8 @@
             }
 
             .userInfoLeft {
-                width: 76px;
+                // width: 76px;
+                padding-right: 10px;
             }
 
             .relationClass {

+ 1 - 1
src/views/device/devicePassword/index.vue

@@ -87,7 +87,7 @@ export default {
 		const guestPwd = ref();
 		const checkGuestPwd = ref();
 
-		const validator = (val) => /\w{6,}/.test(val);
+		const validator = (val) => /^\d{6}$/.test(val);
 		const themeVars = {
 			dropdownMenuTitleTextColor: '#404d74'
 		};

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

@@ -451,7 +451,7 @@ export default {
           areaId: item.areaId,
           contactName: item.contactName,
           contactPhone: item.contactPhone,
-          flowers: item.flowers,
+          flowers: user.type <= 1 ? item.flowers : '',
           operationalName: item.operationalName,
           operationalPhone: item.operationalPhone,
           timeRuleId: item.timeRuleId,
@@ -501,6 +501,7 @@ export default {
     const onFlowerConfirm = ({ selectedOptions }) => {
       showFlowerPicker.value = false;
       deviceDetal.value.flowers = selectedOptions[0].text;
+      showToast("提示:\n修改花型后需要重新设置价格");
     }
 
     // 点击去到编辑标签页

+ 1 - 1
src/views/discountCode/index.vue

@@ -196,7 +196,7 @@ export default {
     const showDateTime = (date) => { return date ? dateUtil.formateDate(new Date(date), "yyyy/MM/dd hh:mm:ss") : ''; }
     // 优惠码导出
     const exportClick = async () => {
-      searchParams.size = 1000;
+      searchParams.size = 3000;
       const { headers, data } = await discountCodeExport(Object.assign({}, searchParams));
       $M_ExportFile(data, headers);
     }

+ 2 - 2
src/views/login.vue

@@ -48,11 +48,11 @@
         <br>
         <br>
         <!-- 微信登录 -->
-        <div v-if="isInWeChat" class="loginWithWechatClass">
+        <!-- <div v-if="isInWeChat" class="loginWithWechatClass">
           <van-button class="wechat-btn" type="primary" size="large" @click="wxLoginHandler">
             <van-icon name="wechat" color="#1bd66c" size="40" class="wechat-icon"/>
           </van-button>
-        </div>
+        </div> -->
 
         <div class="buttonBox">
           <van-button

+ 11 - 0
src/views/merchantManage/set.vue

@@ -87,6 +87,16 @@
                     </van-radio-group>
                   </div>
                 </div>
+                <div class="van-cell van-field">
+                  <div class="van-cell__title van-field__label"><span>{{ $t('merchantManage.isDistribution') }}</span>
+                  </div>
+                  <div class="van-cell__value van-field__value radioBox">
+                    <van-radio-group v-model="adminObj.isDistribution" direction="horizontal">
+                      <van-radio name="0" icon-size="18px">{{ $t('merchantManage.hidden') }}</van-radio>
+                      <van-radio name="1" icon-size="18px">{{ $t('merchantManage.reveal') }}</van-radio>
+                    </van-radio-group>
+                  </div>
+                </div>
               </div>
               <van-row justify="space-around" style="padding: 1em;">
                 <van-button span="5" round type="primary" style="height: 2em; padding: 0 2em;" native-type="submit">{{
@@ -271,6 +281,7 @@ export default {
           params.applyStartTime = adminObj.value.applyStartTime;
           params.applyEndTime = adminObj.value.applyEndTime;
           params.payPlatform = adminObj.value.payPlatform;
+          params.isDistribution = adminObj.value.isDistribution;
         }
         if (adminObj.value.password !== '') {
           if (adminObj.value.checkPassword === '') { showFailToast(t('merchantManage.confirmPasswordPlaceholder')); return; }

+ 21 - 24
src/views/orderCenter/index.vue

@@ -56,7 +56,7 @@
         </div>
         <kNoData v-else></kNoData>
         <!-- 时间 -->
-        <div class="c-text-c c-text-18 o-ptb-5"  v-if="searchParams.startDate != '' || searchParams.endDate != ''">
+        <div class="c-text-c c-text-18 o-ptb-5" v-if="searchParams.startDate != '' || searchParams.endDate != ''">
           {{ Format_time(searchParams.startDate, 'YYYY-MM-DD') }}--{{ Format_time(searchParams.endDate, 'YYYY-MM-DD') }}
         </div>
         <div class="group7 flex-col justify-center">
@@ -69,7 +69,7 @@
                     <span class="info3">
                       {{ $t('orderCenter.total') }}
                       <span style="color: #df5e4c; font-size: 18px;">{{ total }}</span>
-                      {{ $t('orderCenter.records')}}
+                      {{ $t('orderCenter.records') }}
                     </span>
                   </div>
                 </div>
@@ -109,6 +109,9 @@
                         <span class="word12" v-else>{{ item.refundAmount == null ? item.price.toFixed(2) : (item.price -
       item.refundAmount).toFixed(2) }}</span>
                       </div>
+                      <!-- <span v-if="user.ifForeign === '0' && user.isDistribution === '1'" class="giveAway">
+                    {{ $t('orderCenter.dividingDomesticService') }} :{{ currencySymbol }}{{ showSubcom(item) }}
+                  </span> -->
                     </template>
                     <template #price-top>
                       <span class="time_01"
@@ -187,7 +190,9 @@
               <span class="info3">{{ showPayType(refundObject) }}</span>
             </div>
             <div class="layer3 flex-row justify-between">
-              <span class="word2">{{ refundObject.status === 1? $t('orderCenter.paymentTime') : refundObject.status === 3? $t('orderCenter.refundTime') : $t('orderCenter.creationTime') }}</span>
+              <span class="word2">{{ refundObject.status === 1 ? $t('orderCenter.paymentTime') : refundObject.status ===
+      3 ?
+      $t('orderCenter.refundTime') : $t('orderCenter.creationTime') }}</span>
               <span class="info3">{{ showOrderTime(refundObject, 1) }}</span>
             </div>
             <div v-if="refundObject.status === 3" class="layer3 flex-row justify-between">
@@ -225,12 +230,16 @@
       <template #content>
         <div class="refundBox l-flex-RC" style="overflow-y: auto; overflow-x: hidden; max-height: 40vh;">
           <div v-for="(item, index) in orderDetails" :key="index" class="card01">
-            <van-checkbox v-model="isChecked[index]" @change="checkGood(index)" icon-size="20px"></van-checkbox>
+            <van-checkbox :disabled="item.price.toFixed(2) <= 0" v-model="isChecked[index]" @change="checkGood(index)"
+              icon-size="0.5rem"></van-checkbox>
             <van-card :price="item.price.toFixed(2)" :title="item.productName" :thumb="showSugarPic(item.productNo)">
               <template #footer>
-                <van-stepper v-model="refundNum[index]" @plus="plusRefundGood(index)" @minus="minusRefundGood(index)"
-                  theme="round" button-size="22" disable-input
+                <van-stepper v-if="item.price.toFixed(2) > 0" v-model="refundNum[index]" @plus="plusRefundGood(index)"
+                  @minus="minusRefundGood(index)" theme="round" button-size="22" disable-input
                   :max="item.refundQuantity == null ? item.productNumber : (item.productNumber - item.refundQuantity)" />
+                <span v-else>
+                  已优惠减免
+                </span>
               </template>
             </van-card>
           </div>
@@ -239,7 +248,8 @@
         <van-field v-if="orderType === '3'" v-model="cofficentForm.refundReason" rows="2" autosize label="退款原因"
           type="textarea" maxlength="30" :clearable="true" placeholder="请输入退款原因" show-word-limit />
         <div class="btnFooter">
-          <van-checkbox class="checkAllBtn o-mt-5" v-model="checkedAll" @click="checkAll">全选</van-checkbox>
+          <!-- <van-checkbox class="checkAllBtn o-mt-5" v-model="checkedAll" @click="checkAll">全选</van-checkbox> -->
+          <span></span>
           <div class="o-mt-5">
             <span class="">{{ $t('orderCenter.totalRefund') }}:</span>
             <span class="totalRefund o-pr-15">{{ currencySymbol }} {{ totalRefund.toFixed(2) }}</span>
@@ -376,13 +386,6 @@ export default {
         } else {
           isChecked.value[index] = false;
         }
-        // if (isChecked.value[index]) {
-        //   isChecked.value[index] = !isChecked.value[index]
-        //   checkedAll.value = false;
-        // } else {
-        //   isChecked.value[index] = !isChecked.value[index]
-        //   checkedAll.value = true;
-        // }
       })
     }
     // 点击确定按钮
@@ -392,7 +395,7 @@ export default {
       cofficentForm.price = 0;
       isChecked.value.forEach((isCheckedValue, index) => {
         if (isCheckedValue) {
-          cofficentForm.note = cofficentForm.note + orderDetails.value[index].productNo + "-" + refundNum.value[index] + ","
+          cofficentForm.note = cofficentForm.note + orderDetails.value[index].id + "-" + refundNum.value[index] + ","
           cofficentForm.productNumber = cofficentForm.productNumber + refundNum.value[index];
         }
       })
@@ -459,15 +462,9 @@ export default {
     const showSugerPhoto = (row) => {
       if (row.orderDetails != null) {
         if (row.orderDetails.length > 0) {
-          if (row.orderDetails[0].productNo == 'A99') {
-            return require(`../../assets/order/spunSugar/goods/A30.png`);
-          }
           return require(`../../assets/order/spunSugar/goods/${row.orderDetails[0].productNo}.png`);
         } else {
           if (row.productNo != null) {
-            if (row.productNo == 'A99') {
-              return require(`../../assets/order/spunSugar/goods/A30.png`);
-            }
             return require(`../../assets/order/spunSugar/goods/${row.productNo}.png`);
           }
           if (row.machineType == null || row.machineType == '0') {
@@ -486,9 +483,6 @@ export default {
     };
     // 订单明细商品图片路径处理
     const showSugarPic = (row) => {
-      if (row == 'A99') {
-        return require(`../../assets/order/spunSugar/goods/A30.png`);
-      }
       return require(`../../assets/order/spunSugar/goods/${row}.png`);
     };
     // 如果是空数据
@@ -543,6 +537,7 @@ export default {
       companyType: "", // 公司平台
       machineType: "", // 设备类型
       ifForeign: "",
+      username: "",
     });
 
     let chartType = "day";
@@ -571,6 +566,7 @@ export default {
 
       // 获取订单列表
       const { data } = await getOrderList(Object.assign({}, params));
+      total.value = 0;
       if (data.code === "00000") {
         if (data.data.total === 0) {
           finished.value = true;
@@ -838,6 +834,7 @@ export default {
         ifForeign: searchParams.ifForeign == '' ? user.ifForeign : searchParams.ifForeign,
         startDate: searchParams.startDate,
         userName: searchParams.userName,
+        username: searchParams.username,
         clientId:
           searchParams.clientId === "" ? null : searchParams.clientId,
         equipmentId:

+ 1 - 1
src/views/orderExport/index.vue

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

+ 0 - 3
src/views/popPayment.vue

@@ -58,9 +58,6 @@ export default {
 
         };
         const showSugarPhoto = (no) => {
-            if (no == 'A99') {
-                return require(`../assets/order/spunSugar/goods/A30.png`);
-            }
             return require(`../assets/order/spunSugar/goods/${no}.png`);
         };
         const wxPay = () => {

+ 49 - 10
src/views/user.vue

@@ -35,9 +35,9 @@
                     <template #right-icon>
                       <div class="l-flex-RC">
                         <van-icon v-if="fieldValue" @click="
-                          fieldValue = '';
-                        accountDetail.areaId = '';
-                        " class="o-mr-6" name="clear" />
+        fieldValue = '';
+      accountDetail.areaId = '';
+      " class="o-mr-6" name="clear" />
                         <van-icon @click="fieldValueInpClk" name="arrow-down" />
                       </div>
                     </template>
@@ -84,7 +84,8 @@
             <div v-if="!phoneNumberShow" class="userInfo l-flex-between">
               <span class="userInfoLeft">{{ $t("user.phoneNumber") }}: </span>
               <div>
-                <van-field class="relationClass" v-model="cofficentForm.phone" :placeholder="$t('user.phoneNumberPlace')">
+                <van-field class="relationClass" v-model="cofficentForm.phone"
+                  :placeholder="$t('user.phoneNumberPlace')">
                   <template #button>
                     <van-button type="primary" @click="mailboxChg(cofficentForm.phone, 3)">{{ $t("user.confirmLog") }}
                     </van-button>
@@ -130,7 +131,7 @@
                 :placeholder="$t('user.currencySymbolPlace')">
                 <template #button>
                   <van-button type="primary" @click="mailboxChg(cofficentForm.currencySymbol, 5)">{{
-                    $t("user.confirmLog") }}
+        $t("user.confirmLog") }}
                   </van-button>
                 </template>
               </van-field>
@@ -146,7 +147,7 @@
           <!-- 切换支付平台 -->
           <div v-if="chaSzPayShow" class="userInfo l-flex-between">
             <span class="userInfoLeft">{{ $t("user.szPayType") }}: </span>
-            <div class="cust_vantBorder o-pl-15">
+            <div class="cust_vantBorder">
               <van-switch :model-value="sunzeePay" active-color="#0090fa" inactive-color="#30c25c" size="21px"
                 @update:model-value="changeSunzeePay" />
             </div>
@@ -155,12 +156,20 @@
 
           <div v-if="chaScPayShow" class="userInfo l-flex-between">
             <span class="userInfoLeft">{{ $t("user.scPayType") }}: </span>
-            <div class="cust_vantBorder o-pl-15">
+            <div class="cust_vantBorder">
               <van-switch :model-value="sevencloudPay" active-color="#0090fa" inactive-color="#30c25c" size="21px"
                 @update:model-value="changeSevenCloudPay" />
             </div>
             <span class="o-pl-50">{{ $t("user.currentChoose") }}: {{ sevencloudPay ? "汇付" : "汇聚" }}</span>
           </div>
+
+          <div v-if="isInWeChat && user.type == '2'" class="userInfo l-flex-RC">
+            <span class="userInfoLeft l-flex-RC">{{ $t("user.orderNotice") }}: </span>
+            <div class="cust_vantBorder">
+              <van-switch :model-value="orderNotice" active-color="#0090fa"
+                style="font-size: 19px;" @update:model-value="changeOrderNotice" />
+            </div>
+          </div>
         </div>
       </div>
       <div class="lineBox"></div>
@@ -180,7 +189,7 @@
           </div>
 
           <!-- 提现帐号 -->
-          <div v-if="isInland && user.type != '0'" class="taskListRow flex-col" @click="pushPageList('/settlement')">
+          <div v-if="isInland && user.type == '2'" class="taskListRow flex-col" @click="pushPageList('/settlement')">
             <div class="taskIcon joinPayMchIcon"></div>
             <div class="taskRight">
               <div class="taskTitle">{{ $t("user.settlementAccount") }}</div>
@@ -197,7 +206,6 @@
           </div> -->
           <!-- 绑定微信 -->
           <div v-if="isInWeChat" class="taskListRow flex-col" @click="pushPageList('/bindWechat')">
-            <!--          <div class="taskListRow flex-col" @click="pushPageList('/bindWechat')">-->
             <div class="taskIcon bindWechatIcon"></div>
             <div class="taskRight">
               <div class="taskTitle">
@@ -266,7 +274,7 @@ import {
   $M_PhoneTest,
 } from "@/common/js/utils";
 import { useRouter } from "vue-router";
-import { tAdminGetRelation, updatePayPlatform } from "@/service/user";
+import { tAdminGetRelation, updatePayPlatform, updateOrderNotice } from "@/service/user";
 import { showFailToast, showToast, showSuccessToast, showConfirmDialog } from 'vant';
 import { useI18n } from "vue-i18n";
 import { styleUrl } from "../common/js/utils";
@@ -290,6 +298,8 @@ export default {
     const chaSzPayShow = ref(false);
     const chaScPayShow = ref(false);
 
+    // 订单通知开关状态
+    const orderNotice = ref(false);
 
     const sunzeePay = ref(false);
     const sevencloudPay = ref(false);
@@ -446,6 +456,9 @@ export default {
       getAdmin({ id: user.id }).then((res) => {
         accountDetail.value = res.data.data;
         // 查询地址回显
+        if (accountDetail.value.orderNotice == "1") {
+          orderNotice.value = true;
+        }
         kCascaderRef.value.init(accountDetail.value.areaId);
       });
     };
@@ -546,6 +559,30 @@ export default {
       })
     }
 
+    const changeOrderNotice = (value) => {
+      showConfirmDialog({
+        title: t('user.tips'),
+        message: orderNotice.value ? t('user.closeOrderNotice') : t('user.openOrderNotice'),
+      }).then(async () => {
+        const params = reactive({
+          adminId: user.id,
+          orderNotice: value ? '1' : '0',
+        });
+        const { data } = await updateOrderNotice(params);
+        console.log("data", data)
+        if (data.code == "00000") {
+          showSuccessToast(value ? t('user.openSuccess') : t('user.closeSuccess'));
+          orderNotice.value = value;
+        } else if(data.code == "A0001") {
+          showToast(t('user.pleaseBindWechat'));
+        } else {
+          showFailToast(data.message);
+        }
+      }).catch((error) => {
+        console.error(error);
+      })
+    }
+
     // 初始化页面获取列表
     onMounted(async () => {
       // 加载样式
@@ -714,6 +751,8 @@ export default {
       sevencloudPay,
       changeSunzeePay,
       changeSevenCloudPay,
+      orderNotice,
+      changeOrderNotice,
     };
   }
 };